feat: 网关模式支持配置，默认关闭

hanxi · Aug 1, 2024 · 53f5e7d · 53f5e7d
1 parent 2a1fa9f
commit 53f5e7d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/xiaomusic/cli.py b/xiaomusic/cli.py
@@ -180,11 +180,12 @@ def signal_handler(sig, frame):
     # 捕获主进程的退出信号
     signal.signal(signal.SIGINT, signal_handler)
     signal.signal(signal.SIGTERM, signal_handler)
+    port = int(config.port)
     if config.enable_gate:
         run_gate()
-        run_server(config.port + 1)
+        run_server(port + 1)
     else:
-        run_server(config.port)
+        run_server(port)
 
 
 if __name__ == "__main__":

diff --git a/xiaomusic/config.py b/xiaomusic/config.py
@@ -137,7 +137,7 @@ class Config:
         os.getenv("XIAOMUSIC_REMOVE_ID3TAG", "false").lower() == "true"
     )
     delay_sec: int = int(os.getenv("XIAOMUSIC_DELAY_SEC", 3))  # 下一首歌延迟播放秒数
-    enable_gate: bool = os.getenv("XIAOMUSIC_ENABLE_GATE", "true").lower() == "true"
+    enable_gate: bool = os.getenv("XIAOMUSIC_ENABLE_GATE", "false").lower() == "true"
 
     def append_keyword(self, keys, action):
         for key in keys.split(","):

diff --git a/xiaomusic/static/setting.html b/xiaomusic/static/setting.html
@@ -127,6 +127,12 @@ <h2>小爱音箱设置面板
           <option value="false">false</option>
         </select>
 
+        <label for="enable_gate">开启网关(重启生效):</label>
+        <select id="enable_gate">
+          <option value="true">true</option>
+          <option value="false" selected>false</option>
+        </select>
+
         <label for="public_port">外网访问端口(0表示跟监听端口一致):</label>
         <input id="public_port" type="number" value="0"></input>