bump: version 0.3.97 → 0.3.98

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "MiService"]
-	path = MiService
-	url = git@github.com:hanxi/MiService.git

CHANGELOG.md

@@ -1,3 +1,15 @@
+## v0.3.98 (2025-11-02)
+
+## v0.3.97 (2025-11-01)
+
+### Feat
+
+- 升级 miservice
+
+### Fix
+
+- 优化登录问题
+
 ## v0.3.96 (2025-10-28)
 
 ### Fix

Dockerfile

@@ -7,7 +7,6 @@ COPY xiaomusic/ ./xiaomusic/
 COPY plugins/ ./plugins/
 COPY holiday/ ./holiday/
 COPY xiaomusic.py .
-COPY MiService/ ./MiService/
 RUN pdm install --prod --no-editable -v
 
 FROM hanxi/xiaomusic:runtime

Dockerfile.builder

@@ -5,12 +5,10 @@ RUN pip install -U pdm
 ENV PDM_CHECK_UPDATE=false
 WORKDIR /app
 COPY pyproject.toml README.md ./
-COPY MiService/ ./MiService/
 
 RUN pdm install --prod --no-editable -v
 
 COPY xiaomusic/ ./xiaomusic/
 COPY plugins/ ./plugins/
 COPY holiday/ ./holiday/
-COPY MiService/ ./MiService/
 COPY xiaomusic.py .

README.md

@@ -272,7 +272,7 @@ docker build -t xiaomusic .
 
 - [点击链接加入QQ频道【xiaomusic】](https://pd.qq.com/s/e2jybz0ss)
 - [点击链接加入群聊【满 xiaomusic官方交流群1】 604526973](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=13St5PLVcTxYlWTAs_iAawazjtdD1l-a&authKey=dJWEpaT2fDBDpdUUOWj%2FLt6NS1ePBfShDfz7a6seNURi05VvVnAGQzXF%2FM%2F5HgIm&noverify=0&group_code=604526973)
-- [点击链接加入群聊【xiaomusic官方交流群2】1021062499](https://qm.qq.com/q/BmVNqhDL3M)
+- [点击链接加入群聊【满 xiaomusic官方交流群2】1021062499](https://qm.qq.com/q/BmVNqhDL3M)
 - [点击链接加入群聊【xiaomusic官方交流群3】 1072151477](https://qm.qq.com/q/lxIhquqbza)
 - <https://github.com/hanxi/xiaomusic/issues>
 - [微信群二维码](https://github.com/hanxi/xiaomusic/issues/86)

docs/issues/211.md

@@ -263,5 +263,19 @@ https://tutu.to/image/1.N0FHK
 
 同样问题，但我重新使用 [视频教程-群晖1]进行部署就正常了
 
+---
+
+### 评论 28 - davedday
+
+这个支持在远程VPS上docker部署，然后本地小爱同学使用吗？
+
+---
+
+### 评论 29 - hanxi
+
+> 这个支持在远程VPS上docker部署，然后本地小爱同学使用吗？
+
+支持的，请不要在不相关的话题下面问。
+
 ---
 [链接到 GitHub Issue](https://github.com/hanxi/xiaomusic/issues/211)

docs/issues/86.md

@@ -4,7 +4,7 @@ title: 微信交流群二维码
 
 # 微信交流群二维码
 
-<img width="1031" height="1440" alt="Image" src="https://gproxy.hanxi.cc/proxy/user-attachments/assets/ea6aeb44-69cf-4a6a-a46c-ebab6dbf657a" />
+<img width="1031" height="1440" alt="Image" src="https://gproxy.hanxi.cc/proxy/user-attachments/assets/25cf3a96-06d9-485c-b37d-b9fc262636ab" />
 
 ## 评论
 

docs/issues/changelog.md

@@ -1,5 +1,15 @@
 # 版本日志
 
+## v0.3.97 (2025-11-01)
+
+### Feat
+
+- 升级 miservice
+
+### Fix
+
+- 优化登录问题
+
 ## v0.3.96 (2025-10-28)
 
 ### Fix

docs/issues/index.md

@@ -272,7 +272,7 @@ docker build -t xiaomusic .
 
 - [点击链接加入QQ频道【xiaomusic】](https://pd.qq.com/s/e2jybz0ss)
 - [点击链接加入群聊【满 xiaomusic官方交流群1】 604526973](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=13St5PLVcTxYlWTAs_iAawazjtdD1l-a&authKey=dJWEpaT2fDBDpdUUOWj%2FLt6NS1ePBfShDfz7a6seNURi05VvVnAGQzXF%2FM%2F5HgIm&noverify=0&group_code=604526973)
-- [点击链接加入群聊【xiaomusic官方交流群2】1021062499](https://qm.qq.com/q/BmVNqhDL3M)
+- [点击链接加入群聊【满 xiaomusic官方交流群2】1021062499](https://qm.qq.com/q/BmVNqhDL3M)
 - [点击链接加入群聊【xiaomusic官方交流群3】 1072151477](https://qm.qq.com/q/lxIhquqbza)
 - <https://github.com/hanxi/xiaomusic/issues>
 - [微信群二维码](https://github.com/hanxi/xiaomusic/issues/86)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xiaomusic"
-version = "0.3.96"
+version = "0.3.98"
 description = "Play Music with xiaomi AI speaker"
 authors = [
 {name = "涵曦", email = "im.hanxi@gmail.com"},
@@ -24,7 +24,7 @@ dependencies = [
     "python-socketio>=5.12.1",
     "pyjwt>=2.10.1",
     "fake-useragent>=2.2.0",
-    "miservice-fork @ file:///${PROJECT_ROOT}/MiService",
+    "miservice-fork",
     "edge-tts>=7.2.3",
 ]
 requires-python = ">=3.10"

xiaomusic/__init__.py

@@ -1 +1 @@
-__version__ = "0.3.96"
+__version__ = "0.3.98"

xiaomusic/static/default/debug.html

@@ -6,9 +6,9 @@
     <meta name="viewport" content="width=device-width">
     <title>Debug For XiaoMusic</title>
 
-    <link rel="stylesheet" type="text/css" href="./main.css?version=1761581012">
+    <link rel="stylesheet" type="text/css" href="./main.css?version=1762054408">
     <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
-    <script src="./jquery-3.7.1.min.js?version=1761581012"></script>
+    <script src="./jquery-3.7.1.min.js?version=1762054408"></script>
 
     <!-- Google tag (gtag.js) -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>

xiaomusic/static/default/downloadtool.html

@@ -4,8 +4,8 @@
 		<meta charset="UTF-8">
     <meta name="viewport" content="width=device-width">
 		<title>歌曲下载工具</title>
-    <link rel="stylesheet" type="text/css" href="./main.css?version=1761581012">
-    <script src="./jquery-3.7.1.min.js?version=1761581012"></script>
+    <link rel="stylesheet" type="text/css" href="./main.css?version=1762054408">
+    <script src="./jquery-3.7.1.min.js?version=1762054408"></script>
 
     <!-- Google tag (gtag.js) -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>

xiaomusic/static/default/index.html

@@ -5,8 +5,8 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>小爱音箱操控面板</title>
-    <script src="./jquery-3.7.1.min.js?version=1761581012"></script>
-    <link rel="stylesheet" href="./main.css?version=1761581012">
+    <script src="./jquery-3.7.1.min.js?version=1762054408"></script>
+    <link rel="stylesheet" href="./main.css?version=1762054408">
     <link rel="icon" href="./favicon.ico">
 
     <!-- Google tag (gtag.js) -->
@@ -196,7 +196,7 @@
       Powered by XiaoMusic
     </div>
 
-    <script src="./md.js?version=1761581012">
+    <script src="./md.js?version=1762054408">
     </script>
 </body>
 

xiaomusic/static/default/m3u.html

@@ -5,7 +5,7 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width">
     <title>M3U to JSON Converter</title>
-    <link rel="stylesheet" type="text/css" href="./main.css?version=1761581012">
+    <link rel="stylesheet" type="text/css" href="./main.css?version=1762054408">
 
     <!-- Google tag (gtag.js) -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>

xiaomusic/static/default/setting.html

@@ -4,9 +4,9 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width">
     <title>小爱音箱操控面板</title>
-    <script src="./jquery-3.7.1.min.js?version=1761581012"></script>
-    <script src="./setting.js?version=1761581012"></script>
-    <link rel="stylesheet" type="text/css" href="./main.css?version=1761581012">
+    <script src="./jquery-3.7.1.min.js?version=1762054408"></script>
+    <script src="./setting.js?version=1762054408"></script>
+    <link rel="stylesheet" type="text/css" href="./main.css?version=1762054408">
 
     <!-- Google tag (gtag.js) -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>

xiaomusic/xiaomusic.py

@@ -15,7 +15,7 @@ from dataclasses import asdict
 from logging.handlers import RotatingFileHandler
 
 from aiohttp import ClientSession, ClientTimeout
-from miservice import MiAccount, MiIOService, MiNAService
+from miservice import MiAccount, MiIOService, MiNAService, miio_command
 from watchdog.events import (
     FileCreatedEvent,
     FileDeletedEvent,
@@ -42,6 +42,7 @@ from xiaomusic.const import (
     PLAY_TYPE_SEQ,
     PLAY_TYPE_SIN,
     SUPPORT_MUSIC_TYPE,
+    TTS_COMMAND,
 )
 from xiaomusic.crontab import Crontab
 from xiaomusic.plugin import PluginManager
@@ -1557,6 +1558,8 @@ class XiaoMusic:
             device_list = await self.mina_service.device_list()
         except Exception as e:
             self.log.warning(f"Execption {e}")
+            # 重新初始化
+            await self.xiaomusic.reinit()
         return device_list
 
     async def debug_play_by_music_url(self, arg1=None):
@@ -2046,22 +2049,20 @@ class XiaoMusicDevice:
     async def text_to_speech(self, value):
         try:
             # 有 tts command 优先使用 tts command 说话
-            # if self.hardware in TTS_COMMAND:
-            #     tts_cmd = TTS_COMMAND[self.hardware]
-            #     self.log.info("Call MiIOService tts.")
-            #     value = value.replace(" ", ",")  # 不能有空格
-            #     await miio_command(
-            #         self.xiaomusic.miio_service,
-            #         self.did,
-            #         f"{tts_cmd} {value}",
-            #     )
-            # else:
-            self.log.debug("Call MiNAService tts.")
-            await self.xiaomusic.mina_service.text_to_speech(self.device_id, value)
+            if self.hardware in TTS_COMMAND:
+                tts_cmd = TTS_COMMAND[self.hardware]
+                self.log.info("Call MiIOService tts.")
+                value = value.replace(" ", ",")  # 不能有空格
+                await miio_command(
+                    self.xiaomusic.miio_service,
+                    self.did,
+                    f"{tts_cmd} {value}",
+                )
+            else:
+                self.log.debug("Call MiNAService tts.")
+                await self.xiaomusic.mina_service.text_to_speech(self.device_id, value)
         except Exception as e:
             self.log.exception(f"Execption {e}")
-            # 重新初始化
-            # await self.xiaomusic.reinit()
 
     # 同一组设备播放
     async def group_player_play(self, url, name=""):