new version v0.1.34

# 第一代小爱，型号MDZ-25-DA

README.md

@@ -137,6 +137,19 @@ services:
 - 新功能
     - 显示正在播放的歌曲
     - 模糊搜索本地歌曲
+    - 设置页面
+
+
+采用新的设置页面之后，必须在启动前配置的环境变量只剩下:
+- MI_USER
+- MI_PASS
+- XIAOMUSIC_HOSTNAME
+
+其他的这些可以在网页里配置:
+- MI_DID
+- MI_HARDWARE
+- XIAOMUSIC_SEARCH
+- XIAOMUSIC_PROXY
 
 ## 讨论区
 

newversion.sh

@@ -3,6 +3,7 @@
 set -e
 
 version_file=./pyproject.toml
+init_file=./xiaomusic/__init__.py
 # 获取当前版本号
 current_version=$(grep -oE "version = \"[0-9]+\.[0-9]+\.[0-9]+\"" $version_file | cut -d'"' -f2)
 echo "当前版本号: "$current_version
@@ -24,11 +25,13 @@ new_version="$major.$minor.$patch"
 
 # 将新版本号写入文件
 sed -i "s/version.*/version = \"$new_version\"/g" $version_file
+sed -i "s/__version__.*/__version__ = \"$new_version\"/g" $init_file
 
 echo "新版本号：$new_version"
 
 git diff
 git add $version_file
+git add $init_file
 git commit -m "new version v$new_version"
 git tag v$new_version
 git push -u origin main --tags

pdm.lock

@@ -5,7 +5,7 @@
 groups = ["default"]
 strategy = ["cross_platform"]
 lock_version = "4.4.1"
-content_hash = "sha256:ef2667ea2d19174a0be9e4d6442b8c749f0ac3be48bbccf5f604ee436aaf4d22"
+content_hash = "sha256:d771311a452ca58665efe3b74af341cb202d75d83a250896c293ea9c696e5696"
 
 [[package]]
 name = "aiohttp"
@@ -507,8 +507,8 @@ files = [
 
 [[package]]
 name = "miservice-fork"
-version = "2.4.4"
-requires_python = ">=3.7"
+version = "2.5.0"
+requires_python = ">=3.8"
 summary = "XiaoMi Cloud Service fork from https://github.com/Yonsm/MiService"
 dependencies = [
     "aiohttp",
@@ -516,8 +516,8 @@ dependencies = [
     "rich",
 ]
 files = [
-    {file = "miservice_fork-2.4.4-py3-none-any.whl", hash = "sha256:72aa5c13df290e1582104848743a2bda1bce8165e86f089c3a41d99835c70f13"},
-    {file = "miservice_fork-2.4.4.tar.gz", hash = "sha256:381838c11c7f9a36fb358ad5bb9e2554975f91716897fa9395a5edf2014f6587"},
+    {file = "miservice_fork-2.5.0-py3-none-any.whl", hash = "sha256:97b6360ea53c34fe035ac9d94e8705f305b8fa7fc2b44a7aea182449a76cb622"},
+    {file = "miservice_fork-2.5.0.tar.gz", hash = "sha256:8ca2d370d5b32f7e330add38aa1912d734aefa7880f16cef9eac110a5a3029e2"},
 ]
 
 [[package]]
@@ -668,6 +668,16 @@ files = [
     {file = "urllib3-2.0.6.tar.gz", hash = "sha256:b19e1a85d206b56d7df1d5e683df4a7725252a964e3993648dd0fb5a1c157564"},
 ]
 
+[[package]]
+name = "waitress"
+version = "3.0.0"
+requires_python = ">=3.8.0"
+summary = "Waitress WSGI server"
+files = [
+    {file = "waitress-3.0.0-py3-none-any.whl", hash = "sha256:2a06f242f4ba0cc563444ca3d1998959447477363a2d7e9b8b4d75d35cfd1669"},
+    {file = "waitress-3.0.0.tar.gz", hash = "sha256:005da479b04134cdd9dd602d1ee7c49d79de0537610d653674cc6cbde222b8a1"},
+]
+
 [[package]]
 name = "websockets"
 version = "12.0"
@@ -784,7 +794,7 @@ files = [
 
 [[package]]
 name = "yt-dlp"
-version = "2024.5.13.232704.dev0"
+version = "2024.5.16.232713.dev0"
 requires_python = ">=3.8"
 summary = "A feature-rich command-line audio/video downloader"
 dependencies = [
@@ -798,6 +808,6 @@ dependencies = [
     "websockets>=12.0",
 ]
 files = [
-    {file = "yt_dlp-2024.5.13.232704.dev0-py3-none-any.whl", hash = "sha256:3fa43b489ce80f1d065c6d15a389e4e7d553252069c54eb21e739a6921de5fe1"},
-    {file = "yt_dlp-2024.5.13.232704.dev0.tar.gz", hash = "sha256:67f615650843a6663d1dc127f6367f0cc08ef515ea4fe96bbd8a00772743a8ca"},
+    {file = "yt_dlp-2024.5.16.232713.dev0-py3-none-any.whl", hash = "sha256:42d3c27ab77583ff67ee2ddc94e376ea2a76a561ed8b1836ee04fd1cd23ad88c"},
+    {file = "yt_dlp-2024.5.16.232713.dev0.tar.gz", hash = "sha256:d431187fa703c9f52225080ae56471272679e44d9363f97b7b3187d37a5e6480"},
 ]

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xiaomusic"
-version = "0.1.28"
+version = "0.1.34"
 description = "Play Music with xiaomi AI speaker"
 authors = [
     {name = "涵曦", email = "im.hanxi@gmail.com"},
@@ -9,10 +9,11 @@ dependencies = [
     "rich>=13.6.0",
     "requests>=2.31.0",
     "aiohttp>=3.8.6",
-    "miservice-fork>=2.4.4",
+    "miservice-fork>=2.5.0",
     "mutagen>=1.47.0",
     "yt-dlp>=2024.04.09",
     "flask[async]>=3.0.1",
+    "waitress>=3.0.0",
 ]
 requires-python = ">=3.10"
 readme = "README.md"
@@ -21,3 +22,5 @@ license = {text = "MIT"}
 [build-system]
 requires = ["pdm-backend"]
 build-backend = "pdm.backend"
+
+[tool.pdm]

requirements.txt

@@ -302,9 +302,9 @@ MarkupSafe==2.1.4 \
 mdurl==0.1.2 \
     --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \
     --hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba
-miservice-fork==2.4.4 \
-    --hash=sha256:381838c11c7f9a36fb358ad5bb9e2554975f91716897fa9395a5edf2014f6587 \
-    --hash=sha256:72aa5c13df290e1582104848743a2bda1bce8165e86f089c3a41d99835c70f13
+miservice-fork==2.5.0 \
+    --hash=sha256:8ca2d370d5b32f7e330add38aa1912d734aefa7880f16cef9eac110a5a3029e2 \
+    --hash=sha256:97b6360ea53c34fe035ac9d94e8705f305b8fa7fc2b44a7aea182449a76cb622
 multidict==6.0.4 \
     --hash=sha256:01a3a55bd90018c9c080fbb0b9f4891db37d148a0a18722b42f94694f8b6d4c9 \
     --hash=sha256:0b1a97283e0c85772d613878028fec909f003993e1007eafa715b24b377cb9b8 \
@@ -380,6 +380,9 @@ typing-extensions==4.9.0; python_version < "3.11" \
 urllib3==2.0.6 \
     --hash=sha256:7a7c7003b000adf9e7ca2a377c9688bbc54ed41b985789ed576570342a375cd2 \
     --hash=sha256:b19e1a85d206b56d7df1d5e683df4a7725252a964e3993648dd0fb5a1c157564
+waitress==3.0.0 \
+    --hash=sha256:005da479b04134cdd9dd602d1ee7c49d79de0537610d653674cc6cbde222b8a1 \
+    --hash=sha256:2a06f242f4ba0cc563444ca3d1998959447477363a2d7e9b8b4d75d35cfd1669
 websockets==12.0 \
     --hash=sha256:00700340c6c7ab788f176d118775202aadea7602c5cc6be6ae127761c16d6b0b \
     --hash=sha256:0bee75f400895aef54157b36ed6d3b308fcab62e5260703add87f44cee9c82a6 \
@@ -466,6 +469,6 @@ yarl==1.9.2 \
     --hash=sha256:d4e2c6d555e77b37288eaf45b8f60f0737c9efa3452c6c44626a5455aeb250b9 \
     --hash=sha256:e9fdc7ac0d42bc3ea78818557fab03af6181e076a2944f43c38684b4b6bed8e3 \
     --hash=sha256:ee4afac41415d52d53a9833ebae7e32b344be72835bbb589018c9e938045a560
-yt-dlp==2024.5.13.232704.dev0 \
-    --hash=sha256:3fa43b489ce80f1d065c6d15a389e4e7d553252069c54eb21e739a6921de5fe1 \
-    --hash=sha256:67f615650843a6663d1dc127f6367f0cc08ef515ea4fe96bbd8a00772743a8ca
+yt-dlp==2024.5.16.232713.dev0 \
+    --hash=sha256:42d3c27ab77583ff67ee2ddc94e376ea2a76a561ed8b1836ee04fd1cd23ad88c \
+    --hash=sha256:d431187fa703c9f52225080ae56471272679e44d9363f97b7b3187d37a5e6480

xiaomusic/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.34"

xiaomusic/config.py

@@ -10,11 +10,11 @@ from xiaomusic.utils import validate_proxy
 
 LATEST_ASK_API = "https://userprofile.mina.mi.com/device_profile/v2/conversation?source=dialogu&hardware={hardware}&timestamp={timestamp}&limit=2"
 COOKIE_TEMPLATE = "deviceId={device_id}; serviceToken={service_token}; userId={user_id}"
-
 HARDWARE_COMMAND_DICT = {
     # hardware: (tts_command, wakeup_command, volume_command)
     "LX06": ("5-1", "5-5", "2-1"),
-    "L05B": ("5-3", "5-4", "2-1"),
+    "L05B": ("5-3", "5-4", "2-1"),    
+    "S12": ("5-1", "5-5", "2-1"),  # 第一代小爱，型号MDZ-25-DA
     "S12A": ("5-1", "5-5", "2-1"),
     "LX01": ("5-1", "5-5", "2-1"),
     "L06A": ("5-1", "5-5", "2-1"),
@@ -44,6 +44,7 @@ KEY_WORD_DICT = {
     "停止播放": "stop",
     "分钟后关机": "stop_after_minute",
     "set_volume#": "set_volume",
+    "get_volume#": "get_volume",
 }
 
 # 命令参数在前面
@@ -54,6 +55,7 @@ KEY_WORD_ARG_BEFORE_DICT = {
 # 匹配优先级
 KEY_MATCH_ORDER = [
     "set_volume#",
+    "get_volume#",
     "分钟后关机",
     "播放歌曲",
     "放歌曲",

xiaomusic/httpserver.py

@@ -1,14 +1,26 @@
 #!/usr/bin/env python3
 import os
+import sys
 import traceback
+import asyncio
 
 from flask import Flask, request, send_from_directory
+from waitress import serve
 from threading import Thread
 
 from xiaomusic.config import (
     KEY_WORD_DICT,
 )
 
+from xiaomusic import (
+    __version__,
+)
+
+# 隐藏 flask 启动告警
+# https://gist.github.com/jerblack/735b9953ba1ab6234abb43174210d356
+#from flask import cli
+#cli.show_server_banner = lambda *_: None
+
 app = Flask(__name__)
 host = "0.0.0.0"
 port = 8090
@@ -21,11 +33,18 @@ log = None
 def allcmds():
     return KEY_WORD_DICT
 
+@app.route("/getversion", methods=["GET"])
+def getversion():
+    log.debug("getversion %s", __version__)
+    return {
+        "version": __version__,
+    }
 
 @app.route("/getvolume", methods=["GET"])
 def getvolume():
+    volume = xiaomusic.get_volume_ret()
     return {
-        "volume": xiaomusic.get_volume(),
+        "volume": volume,
     }
 
 @app.route("/searchmusic", methods=["GET"])
@@ -52,6 +71,29 @@ async def do_cmd():
         return {"ret": "OK"}
     return {"ret": "Unknow cmd"}
 
+@app.route("/getsetting", methods=["GET"])
+async def getsetting():
+    config = xiaomusic.getconfig()
+    log.debug(config)
+
+    alldevices = await xiaomusic.call_main_thread_function(xiaomusic.getalldevices)
+    log.info(alldevices)
+    data = {
+        "mi_did": config.mi_did,
+        "mi_did_list": alldevices["did_list"],
+        "mi_hardware": config.hardware,
+        "mi_hardware_list": alldevices["hardware_list"],
+        "xiaomusic_search": config.search_prefix,
+        "xiaomusic_proxy": config.proxy,
+    }
+    return data
+
+@app.route("/savesetting", methods=["POST"])
+async def savesetting():
+    data = request.get_json()
+    log.info(data)
+    await xiaomusic.saveconfig(data)
+    return "save success"
 
 def static_path_handler(filename):
     log.debug(filename)
@@ -60,10 +102,8 @@ def static_path_handler(filename):
     log.debug(absolute_path)
     return send_from_directory(absolute_path, filename)
 
-
 def run_app():
-    app.run(host=host, port=port)
-
+    serve(app, host=host, port=port)
 
 def StartHTTPServer(_port, _static_path, _xiaomusic):
     global port, static_path, xiaomusic, log

xiaomusic/static/app.js

@@ -14,11 +14,19 @@ $(function(){
   append_op_button_name("60分钟后关机");
 
   // 拉取声音
+  sendcmd("get_volume#");
   $.get("/getvolume", function(data, status) {
     console.log(data, status, data["volume"]);
     $("#volume").val(data.volume);
   });
 
+  // 拉取版本
+  $.get("/getversion", function(data, status) {
+    console.log(data, status, data["version"]);
+    $("#version").text(`(${data.version})`);
+  });
+
+
   function append_op_button_name(name) {
     append_op_button(name, name);
   }

xiaomusic/static/index.html

@@ -1,74 +1,25 @@
 <!DOCTYPE html>
 <html>
-<head>
+  <head>
     <meta name="viewport" content="width=device-width">
     <title>小爱音箱操控面板</title>
     <script src="/static/jquery-3.7.1.min.js"></script>
     <script src="/static/app.js"></script>
-    <style>
-      button {
-          margin: 10px;
-          width: 100px;
-          height: 50px;
-          border: none;
-          color: white;
-          text-align: center;
-          text-decoration: none;
-          display: inline-block;
-          border-radius: 10px;
-          background-color: #008CBA;
-      }
-      button:active {
-          font-weight:bold;
-          background-color: #007CBA;
-          transform: translateY(2px);
-      }
-      input {
-          margin: 10px;
-          width: 300px;
-          height: 40px;
-      }
-
-      .container{
-          width: 280px;
-          overflow: hidden;
-          display: inline-block;
-      }
-      @keyframes text-scroll {
-          0% {
-              left: 100%;
-          }
-          25% {
-              left: 50%;
-          }
-          50% {
-              left: 0%;
-          }
-          75% {
-              left: -50%;
-          }
-          100% {
-              left: -100%;
-          }
-      }
-      .text {
-          white-space: nowrap;
-          font-weight: bold;
-          position: relative;
-          animation: text-scroll 10s linear infinite;
-      }
-    </style>
-</head>
-<body>
-    <h2>小爱音箱操控面板</h2>
+    <link rel="stylesheet" type="text/css" href="/static/style.css">
+  </head>
+  <body>
+    <h2>小爱音箱操控面板<span id="version">(版本未知)</span></h2>
     <hr>
     <div id="cmds">
     </div>
     <hr>
-    <div style="margin-left: 20px;">
+    <div style="margin: 20px;">
       <div style="display: flex; align-items: center;">
-        <svg class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="#8e43e7" style="height: 48px; width: 48px;"><path d="M550.826667 154.666667a47.786667 47.786667 0 0 0-19.84 4.48L298.666667 298.666667H186.453333A80 80 0 0 0 106.666667 378.453333v267.093334A80 80 0 0 0 186.453333 725.333333H298.666667l232.32 139.52a47.786667 47.786667 0 0 0 19.84 4.48A46.506667 46.506667 0 0 0 597.333333 822.826667V201.173333a46.506667 46.506667 0 0 0-46.506666-46.506666zM554.666667 822.826667c0 3.413333-3.84 3.84-3.84 3.84L320 688.853333l-9.6-6.186666H186.453333A37.12 37.12 0 0 1 149.333333 645.546667V378.453333A37.12 37.12 0 0 1 186.453333 341.333333h123.946667l10.24-6.186666 229.546667-137.6s3.84 0 3.84 3.84zM667.52 346.026667a21.333333 21.333333 0 0 0 0 30.293333 192 192 0 0 1 0 271.36 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 234.666667 234.666667 0 0 0 0-331.946666 21.333333 21.333333 0 0 0-30.293333 0z"></path><path d="M804.48 219.52a21.333333 21.333333 0 0 0-30.293333 30.293333 370.986667 370.986667 0 0 1 0 524.373334 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 414.08 414.08 0 0 0 0-584.96z"></path></svg>
+        <svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="#8e43e7" style="height: 48px; width: 48px;"><path d="M550.826667 154.666667a47.786667 47.786667 0 0 0-19.84 4.48L298.666667 298.666667H186.453333A80 80 0 0 0 106.666667 378.453333v267.093334A80 80 0 0 0 186.453333 725.333333H298.666667l232.32 139.52a47.786667 47.786667 0 0 0 19.84 4.48A46.506667 46.506667 0 0 0 597.333333 822.826667V201.173333a46.506667 46.506667 0 0 0-46.506666-46.506666zM554.666667 822.826667c0 3.413333-3.84 3.84-3.84 3.84L320 688.853333l-9.6-6.186666H186.453333A37.12 37.12 0 0 1 149.333333 645.546667V378.453333A37.12 37.12 0 0 1 186.453333 341.333333h123.946667l10.24-6.186666 229.546667-137.6s3.84 0 3.84 3.84zM667.52 346.026667a21.333333 21.333333 0 0 0 0 30.293333 192 192 0 0 1 0 271.36 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 234.666667 234.666667 0 0 0 0-331.946666 21.333333 21.333333 0 0 0-30.293333 0z"></path><path d="M804.48 219.52a21.333333 21.333333 0 0 0-30.293333 30.293333 370.986667 370.986667 0 0 1 0 524.373334 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 414.08 414.08 0 0 0 0-584.96z"></path></svg>
         <input id="volume" type="range"></input>
+        <a href="/static/setting.html">
+        <svg fill="#8e43e7" height="64px" width="64px" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="-11.88 -11.88 77.76 77.76" xml:space="preserve" stroke="#8e43e7" transform="rotate(0)matrix(1, 0, 0, 1, 0, 0)" stroke-width="0.00054"><g id="SVGRepo_bgCarrier" stroke-width="0" transform="translate(0,0), scale(1)"><rect x="-11.88" y="-11.88" width="77.76" height="77.76" rx="18.6624" fill="#addcff" strokewidth="0"></rect></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round" stroke="#CCCCCC" stroke-width="1.512"></g><g id="SVGRepo_iconCarrier"> <g> <path d="M51.22,21h-5.052c-0.812,0-1.481-0.447-1.792-1.197s-0.153-1.54,0.42-2.114l3.572-3.571 c0.525-0.525,0.814-1.224,0.814-1.966c0-0.743-0.289-1.441-0.814-1.967l-4.553-4.553c-1.05-1.05-2.881-1.052-3.933,0l-3.571,3.571 c-0.574,0.573-1.366,0.733-2.114,0.421C33.447,9.313,33,8.644,33,7.832V2.78C33,1.247,31.753,0,30.22,0H23.78 C22.247,0,21,1.247,21,2.78v5.052c0,0.812-0.447,1.481-1.197,1.792c-0.748,0.313-1.54,0.152-2.114-0.421l-3.571-3.571 c-1.052-1.052-2.883-1.05-3.933,0l-4.553,4.553c-0.525,0.525-0.814,1.224-0.814,1.967c0,0.742,0.289,1.44,0.814,1.966l3.572,3.571 c0.573,0.574,0.73,1.364,0.42,2.114S8.644,21,7.832,21H2.78C1.247,21,0,22.247,0,23.78v6.439C0,31.753,1.247,33,2.78,33h5.052 c0.812,0,1.481,0.447,1.792,1.197s0.153,1.54-0.42,2.114l-3.572,3.571c-0.525,0.525-0.814,1.224-0.814,1.966 c0,0.743,0.289,1.441,0.814,1.967l4.553,4.553c1.051,1.051,2.881,1.053,3.933,0l3.571-3.572c0.574-0.573,1.363-0.731,2.114-0.42 c0.75,0.311,1.197,0.98,1.197,1.792v5.052c0,1.533,1.247,2.78,2.78,2.78h6.439c1.533,0,2.78-1.247,2.78-2.78v-5.052 c0-0.812,0.447-1.481,1.197-1.792c0.751-0.312,1.54-0.153,2.114,0.42l3.571,3.572c1.052,1.052,2.883,1.05,3.933,0l4.553-4.553 c0.525-0.525,0.814-1.224,0.814-1.967c0-0.742-0.289-1.44-0.814-1.966l-3.572-3.571c-0.573-0.574-0.73-1.364-0.42-2.114 S45.356,33,46.168,33h5.052c1.533,0,2.78-1.247,2.78-2.78V23.78C54,22.247,52.753,21,51.22,21z M52,30.22 C52,30.65,51.65,31,51.22,31h-5.052c-1.624,0-3.019,0.932-3.64,2.432c-0.622,1.5-0.295,3.146,0.854,4.294l3.572,3.571 c0.305,0.305,0.305,0.8,0,1.104l-4.553,4.553c-0.304,0.304-0.799,0.306-1.104,0l-3.571-3.572c-1.149-1.149-2.794-1.474-4.294-0.854 c-1.5,0.621-2.432,2.016-2.432,3.64v5.052C31,51.65,30.65,52,30.22,52H23.78C23.35,52,23,51.65,23,51.22v-5.052 c0-1.624-0.932-3.019-2.432-3.64c-0.503-0.209-1.021-0.311-1.533-0.311c-1.014,0-1.997,0.4-2.761,1.164l-3.571,3.572 c-0.306,0.306-0.801,0.304-1.104,0l-4.553-4.553c-0.305-0.305-0.305-0.8,0-1.104l3.572-3.571c1.148-1.148,1.476-2.794,0.854-4.294 C10.851,31.932,9.456,31,7.832,31H2.78C2.35,31,2,30.65,2,30.22V23.78C2,23.35,2.35,23,2.78,23h5.052 c1.624,0,3.019-0.932,3.64-2.432c0.622-1.5,0.295-3.146-0.854-4.294l-3.572-3.571c-0.305-0.305-0.305-0.8,0-1.104l4.553-4.553 c0.304-0.305,0.799-0.305,1.104,0l3.571,3.571c1.147,1.147,2.792,1.476,4.294,0.854C22.068,10.851,23,9.456,23,7.832V2.78 C23,2.35,23.35,2,23.78,2h6.439C30.65,2,31,2.35,31,2.78v5.052c0,1.624,0.932,3.019,2.432,3.64 c1.502,0.622,3.146,0.294,4.294-0.854l3.571-3.571c0.306-0.305,0.801-0.305,1.104,0l4.553,4.553c0.305,0.305,0.305,0.8,0,1.104 l-3.572,3.571c-1.148,1.148-1.476,2.794-0.854,4.294c0.621,1.5,2.016,2.432,3.64,2.432h5.052C51.65,23,52,23.35,52,23.78V30.22z"></path> <path d="M27,18c-4.963,0-9,4.037-9,9s4.037,9,9,9s9-4.037,9-9S31.963,18,27,18z M27,34c-3.859,0-7-3.141-7-7s3.141-7,7-7 s7,3.141,7,7S30.859,34,27,34z"></path> </g> </g></svg>
+        </a>
       </div>
     </div>
     <hr>
@@ -81,5 +32,9 @@
     <div class="container">
       <div id="playering-music" class="text"></div>
     </div>
-</body>
+
+    <footer>
+      <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
+    </footer>
+  </body>
 </html>

xiaomusic/static/setting.html

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width">
+    <title>小爱音箱操控面板</title>
+    <script src="/static/jquery-3.7.1.min.js"></script>
+    <script src="/static/setting.js"></script>
+    <link rel="stylesheet" type="text/css" href="/static/style.css">
+  </head>
+  <body>
+    <h2>小爱音箱设置面板<span id="version">(版本未知)</span></h2>
+    <hr>
+    <div class="rows">
+      <label for="mi_did">MI_DID:</label>
+      <select id="mi_did"></select>
+      <label for="mi_hardware">MI_HARDWARE:</label>
+      <select id="mi_hardware"></select>
+      <label for="xiaomusic_search">XIAOMUSIC_SEARCH:</label>
+      <select id="xiaomusic_search">
+        <option value="ytsearch:">ytsearch:</option>
+        <option value="bilisearch:">bilisearch:</option>
+      </select>
+      <label for="xiaomusic_proxy">XIAOMUSIC_PROXY(ytsearch需要):</label>
+      <input id="xiaomusic_proxy" type="text" placeholder="http://192.168.2.5:8080"></input>
+    </div>
+    <hr>
+    <button onclick="location.href='/';">返回首页</button>
+    <button id="save">保存</button>
+
+    <footer>
+      <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
+    </footer>
+  </body>
+</html>

xiaomusic/static/setting.js

@@ -0,0 +1,73 @@
+$(function(){
+  // 拉取版本
+  $.get("/getversion", function(data, status) {
+    console.log(data, status, data["version"]);
+    $("#version").text(`(${data.version})`);
+  });
+
+  // 拉取现有配置
+  $.get("/getsetting", function(data, status) {
+    console.log(data, status);
+
+    var mi_did_div = $("#mi_did")
+    mi_did_div.empty();
+    $.each(data.mi_did_list, function(index, option){
+      mi_did_div.append($('<option>', {
+        value:option,
+        text:option,
+      }));
+      if (data.mi_did == option) {
+        mi_did_div.val(option);
+      }
+    });
+
+    var mi_hardware_div = $("#mi_hardware")
+    mi_hardware_div.empty();
+    $.each(data.mi_hardware_list, function(index, option){
+      mi_hardware_div.append($('<option>', {
+        value:option,
+        text:option,
+      }));
+      if (data.mi_hardware == option) {
+        mi_hardware_div.val(option);
+      }
+    });
+
+    if (data.xiaomusic_search != "") {
+      $("#xiaomusic_search").val(data.xiaomusic_search);
+    }
+
+    if (data.xiaomusic_proxy != "") {
+      $("#xiaomusic_proxy").val(data.xiaomusic_proxy);
+    }
+  });
+
+  $("#save").on("click", () => {
+    var mi_did = $("#mi_did").val();
+    var mi_hardware = $("#mi_hardware").val();
+    var xiaomusic_search = $("#xiaomusic_search").val();
+    var xiaomusic_proxy = $("#xiaomusic_proxy").val();
+    console.log("mi_did", mi_did);
+    console.log("mi_hardware", mi_hardware);
+    console.log("xiaomusic_search", xiaomusic_search);
+    console.log("xiaomusic_proxy", xiaomusic_proxy);
+    var data = {
+      mi_did: mi_did,
+      mi_hardware: mi_hardware,
+      xiaomusic_search: xiaomusic_search,
+      xiaomusic_proxy: xiaomusic_proxy,
+    };
+    $.ajax({
+      type: "POST",
+      url: "/savesetting",
+      contentType: "application/json",
+      data: JSON.stringify(data),
+      success: (msg) => {
+        alert(msg);
+      },
+      error: (msg) => {
+        alert(msg);
+      }
+    });
+  });
+});

xiaomusic/static/style.css

@@ -0,0 +1,70 @@
+button {
+  margin: 10px;
+  width: 100px;
+  height: 50px;
+  border: none;
+  color: white;
+  text-align: center;
+  text-decoration: none;
+  display: inline-block;
+  border-radius: 10px;
+  background-color: #008CBA;
+}
+button:active {
+  font-weight:bold;
+  background-color: #007CBA;
+  transform: translateY(2px);
+}
+label {
+  margin-left: 10px;
+  width: 300px;
+}
+input,select {
+  margin: 10px;
+  width: 300px;
+  height: 40px;
+}
+
+.container{
+  width: 280px;
+  overflow: hidden;
+  display: inline-block;
+}
+@keyframes text-scroll {
+  0% {
+    left: 100%;
+  }
+  25% {
+    left: 50%;
+  }
+  50% {
+    left: 0%;
+  }
+  75% {
+    left: -50%;
+  }
+  100% {
+    left: -100%;
+  }
+}
+.text {
+  white-space: nowrap;
+  font-weight: bold;
+  position: relative;
+  animation: text-scroll 10s linear infinite;
+}
+
+.rows {
+  display: flex;
+  flex-direction: column;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+
+footer {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  padding: 10px 0;
+}

xiaomusic/xiaomusic.py

@@ -9,6 +9,7 @@ import time
 import urllib.parse
 import traceback
 import mutagen
+import queue
 from xiaomusic.httpserver import StartHTTPServer
 
 from pathlib import Path
@@ -28,17 +29,19 @@ from xiaomusic.config import (
     Config,
 )
 from xiaomusic.utils import (
-    calculate_tts_elapse,
     parse_cookie_string,
     fuzzyfinder,
 )
 
+from xiaomusic import (
+    __version__,
+)
+
 EOF = object()
 
 PLAY_TYPE_ONE = 0  # 单曲循环
 PLAY_TYPE_ALL = 1  # 全部循环
 
-
 class XiaoMusic:
     def __init__(self, config: Config):
         self.config = config
@@ -52,6 +55,7 @@ class XiaoMusic:
         self.miio_service = None
         self.polling_event = asyncio.Event()
         self.new_record_event = asyncio.Event()
+        self.queue = queue.Queue()
 
         self.music_path = config.music_path
         self.hostname = config.hostname
@@ -68,7 +72,7 @@ class XiaoMusic:
         self.cur_music = ""
         self._next_timer = None
         self._timeout = 0
-        self._volume = 50
+        self._volume = 0
         self._all_music = {}
         self._play_list = []
         self._playing = False
@@ -77,14 +81,24 @@ class XiaoMusic:
         self._stop_timer = None
 
         # setup logger
+        logging.basicConfig(
+            format=f"[{__version__}]\t%(message)s",
+            datefmt="[%X]",
+            handlers=[RichHandler(rich_tracebacks=True)]
+        )
         self.log = logging.getLogger("xiaomusic")
         self.log.setLevel(logging.DEBUG if config.verbose else logging.INFO)
-        self.log.addHandler(RichHandler())
         self.log.debug(config)
 
+        # 尝试从设置里加载配置
+        self.try_init_setting()
+
         # 启动时重新生成一次播放列表
         self.gen_all_music_list()
 
+        # 启动时初始化获取声音
+        self.set_last_record("get_volume#")
+
         self.log.debug("ffmpeg_location: %s", self.ffmpeg_location)
 
     async def poll_latest_ask(self):
@@ -121,10 +135,7 @@ class XiaoMusic:
         self.mina_service = MiNAService(account)
         self.miio_service = MiIOService(account)
 
-    async def _init_data_hardware(self):
-        if self.config.cookie:
-            # if use cookie do not need init
-            return
+    async def try_update_device_id(self):
         hardware_data = await self.mina_service.device_list()
         # fix multi xiaoai problems we check did first
         # why we use this way to fix?
@@ -146,6 +157,12 @@ class XiaoMusic:
             raise Exception(
                 f"we have no hardware: {self.config.hardware} please use `micli mina` to check"
             )
+
+    async def _init_data_hardware(self):
+        if self.config.cookie:
+            # if use cookie do not need init
+            return
+        await self.try_update_device_id()
         if not self.config.mi_did:
             devices = await self.miio_service.device_list()
             try:
@@ -225,11 +242,11 @@ class XiaoMusic:
         }
         self.new_record_event.set()
 
-    async def do_tts(self, value, wait_for_finish=False):
+    async def do_tts(self, value):
         self.log.info("do_tts: %s", value)
 
         if self.config.mute_xiaoai:
-            await self.stop_if_xiaoai_is_playing()
+            await self.force_stop_xiaoai()
         else:
             # waiting for xiaoai speaker done
             await asyncio.sleep(8)
@@ -245,13 +262,11 @@ class XiaoMusic:
                 self.config.mi_did,
                 f"{self.config.tts_command} {value}",
             )
-        if wait_for_finish:
-            elapse = calculate_tts_elapse(value)
-            await asyncio.sleep(elapse)
-            await self.wait_for_tts_finish()
 
     async def do_set_volume(self, value):
         value = int(value)
+        self._volume = value
+        self.log.info(f"声音设置为{value}")
         if not self.config.use_command:
             try:
                 self.log.debug("do_set_volume not use_command value:%d", value)
@@ -266,33 +281,8 @@ class XiaoMusic:
                 f"{self.config.volume_command}=#{value}",
             )
 
-    async def wait_for_tts_finish(self):
-        while True:
-            if not await self.get_if_xiaoai_is_playing():
-                break
-            await asyncio.sleep(1)
-
-    async def get_if_xiaoai_is_playing(self):
-        playing_info = await self.mina_service.player_get_status(self.device_id)
-        # WTF xiaomi api
-        is_playing = (
-            json.loads(playing_info.get("data", {}).get("info", "{}")).get("status", -1)
-            == 1
-        )
-        return is_playing
-
-    async def stop_if_xiaoai_is_playing(self):
-        is_playing = await self.get_if_xiaoai_is_playing()
-        if is_playing:
-            # stop it
-            await self.mina_service.player_pause(self.device_id)
-
-    async def wakeup_xiaoai(self):
-        return await miio_command(
-            self.miio_service,
-            self.config.mi_did,
-            f"{self.config.wakeup_command} {WAKEUP_KEYWORD} 0",
-        )
+    async def force_stop_xiaoai(self):
+        await self.mina_service.player_stop(self.device_id)
 
     # 是否在下载中
     def is_downloading(self):
@@ -430,14 +420,16 @@ class XiaoMusic:
         self.log.info(f"{sec}秒后将会播放下一首")
 
     async def run_forever(self):
+        StartHTTPServer(self.port, self.music_path, self)
         async with ClientSession() as session:
             self.session = session
             await self.init_all_data(session)
-            StartHTTPServer(self.port, self.music_path, self)
             task = asyncio.create_task(self.poll_latest_ask())
             assert task is not None  # to keep the reference to task, do not remove this
+            filtered_keywords = [keyword for keyword in KEY_MATCH_ORDER if "#" not in keyword]
+            joined_keywords = "/".join(filtered_keywords)
             self.log.info(
-                f"Running xiaomusic now, 用`{'/'.join(KEY_WORD_DICT.keys())}`开头来控制"
+                f"Running xiaomusic now, 用`{joined_keywords}`开头来控制"
             )
 
             while True:
@@ -445,6 +437,15 @@ class XiaoMusic:
                 await self.new_record_event.wait()
                 self.new_record_event.clear()
                 new_record = self.last_record
+                if new_record is None:
+                    # 其他线程的函数调用
+                    try:
+                        func, callback, arg1 = self.queue.get(False)
+                        ret = await func(arg1=arg1)
+                        callback(ret)
+                    except queue.Empty:
+                        pass
+                    continue
                 self.polling_event.clear()  # stop polling when processing the question
                 query = new_record.get("query", "").strip()
                 ctrl_panel = new_record.get("ctrl_panel", False)
@@ -522,7 +523,7 @@ class XiaoMusic:
         self.log.info("cur_music %s", self.cur_music)
         url = self.get_file_url(name)
         self.log.info("播放 %s", url)
-        await self.stop_if_xiaoai_is_playing()
+        await self.force_stop_xiaoai()
         await self.mina_service.play_by_url(self.device_id, url)
         self.log.info("已经开始播放了")
         # 设置下一首歌曲的播放定时器
@@ -563,7 +564,7 @@ class XiaoMusic:
         if self._next_timer:
             self._next_timer.cancel()
             self.log.info(f"定时器已取消")
-        await self.stop_if_xiaoai_is_playing()
+        await self.force_stop_xiaoai()
 
     async def stop_after_minute(self, **kwargs):
         if self._stop_timer:
@@ -584,10 +585,14 @@ class XiaoMusic:
     async def set_volume(self, **kwargs):
         value = kwargs["arg1"]
         await self.do_set_volume(value)
-        self._volume = int(value)
-        self.log.info(f"声音设置为{value}")
 
-    def get_volume(self):
+    async def get_volume(self, **kwargs):
+        playing_info = await self.mina_service.player_get_status(self.device_id)
+        self.log.debug("get_volume. playing_info:%s", playing_info)
+        self._volume = json.loads(playing_info.get("data", {}).get("info", "{}")).get("volume", 5)
+        self.log.info("get_volume. volume:%s", self._volume)
+
+    def get_volume_ret(self):
         return self._volume
 
     # 搜索音乐
@@ -600,3 +605,77 @@ class XiaoMusic:
     def playingmusic(self):
         self.log.debug("playingmusic. cur_music:%s", self.cur_music)
         return self.cur_music
+
+    # 获取当前配置
+    def getconfig(self):
+        return self.config
+
+    def try_init_setting(self):
+        try:
+            filename = os.path.join(self.music_path, "setting.json")
+            with open(filename) as f:
+                data = json.loads(f.read())
+                self.update_config_from_setting(data)
+        except FileNotFoundError:
+            self.log.info(f"The file {filename} does not exist.")
+        except json.JSONDecodeError:
+            self.log.warning(f"The file {filename} contains invalid JSON.")
+
+    # 保存配置并重新启动
+    async def saveconfig(self, data):
+        # 默认暂时配置保存到 music 目录下
+        filename = os.path.join(self.music_path, "setting.json")
+        with open(filename, 'w', encoding='utf-8') as f:
+            json.dump(data, f, ensure_ascii=False, indent=4)
+        self.update_config_from_setting(data)
+        await self.call_main_thread_function(self.reinit)
+
+    def update_config_from_setting(self, data):
+        self.config.mi_did = data["mi_did"]
+        self.config.hardware = data["mi_hardware"]
+        self.config.search_prefix = data["xiaomusic_search"]
+        self.config.proxy = data["xiaomusic_proxy"]
+
+        self.search_prefix = self.config.search_prefix
+        self.proxy = self.config.proxy
+        self.log.info("update_config_from_setting ok. data:%s", data)
+
+    # 重新初始化
+    async def reinit(self, **kwargs):
+        await self.try_update_device_id()
+        self.log.info("reinit success")
+
+    # 获取所有设备
+    async def getalldevices(self, **kwargs):
+        arg1 = kwargs["arg1"]
+        self.log.debug("getalldevices. arg1:%s", arg1)
+        did_list = []
+        hardware_list = []
+        hardware_data = await self.mina_service.device_list()
+        for h in hardware_data:
+            did = h.get("miotDID", "")
+            if did != "":
+                did_list.append(did)
+            hardware = h.get("hardware", "")
+            if h.get("hardware", "") != "":
+                hardware_list.append(hardware)
+        alldevices = {
+            "did_list": did_list,
+            "hardware_list": hardware_list,
+        }
+        return alldevices
+
+    # 用于在web线程里调用
+    # 获取所有设备
+    async def call_main_thread_function(self, func, arg1=None):
+        loop = asyncio.get_event_loop()
+        future = loop.create_future()
+        def callback(ret):
+            nonlocal future
+            loop.call_soon_threadsafe(future.set_result, ret)
+        self.queue.put((func, callback, arg1))
+        self.last_record = None
+        self.new_record_event.set()
+        result = await future
+        return result
+