voice-input 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

voice_input/__init__.py

@@ -1,4 +1,4 @@
 """跨设备语音输入传输系统 - 将手机端语音识别文本传送到电脑"""
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 __author__ = "mofanx"

voice_input/server.py

@@ -85,6 +85,54 @@ def create_app(config: AppConfig) -> Flask:
     app.voice_history_lock = threading.Lock()
     app.voice_history_counter = 0
 
+    # 预热 keyboard / pyclip，强制完成底层设备初始化
+    # keyboard 在 Linux 上首次按键时才创建 /dev/uinput 虚拟设备，
+    # 内核注册该设备需要数百毫秒，期间发送的按键事件会丢失。
+    # 因此在启动时做一次空按键，等待设备就绪后再提供服务。
+    try:
+        import pyclip
+        pyclip.paste()  # 预热剪贴板后端
+        logging.info("pyclip 模块已预热")
+    except Exception:
+        pass
+    try:
+        import keyboard
+        if platform.system() != "Windows":
+            keyboard.press_and_release("shift")
+            time.sleep(0.5)  # 等待内核注册 uinput 虚拟设备
+        logging.info("keyboard 模块已预热（uinput 设备已就绪）")
+    except Exception:
+        pass
+
+    # ==================== 认证辅助 ====================
+
+    def _check_auth():
+        """对敏感路由执行 IP 白名单 + Token 校验，返回错误响应或 None"""
+        cfg = app.voice_config
+        client_ip = get_client_ip(request)
+        if not is_ip_allowed(client_ip, cfg.allowed_ips):
+            logging.warning(f"IP未授权访问: {client_ip}")
+            return (
+                jsonify({"code": 403, "message": "IP not allowed",
+                         "error_detail": "Your IP address is not in the whitelist"}),
+                403,
+            )
+        # 对于非 POST 请求（GET/DELETE），data 为 None，token 仅从 header/query 取
+        data = None
+        if request.is_json:
+            try:
+                data = request.get_json(silent=True)
+            except Exception:
+                pass
+        if not is_token_valid(request, data, cfg.token, cfg.require_token):
+            logging.warning(f"Token校验失败: {client_ip}")
+            return (
+                jsonify({"code": 401, "message": "Unauthorized",
+                         "error_detail": "Invalid or missing token"}),
+                401,
+            )
+        return None
+
     # ==================== 路由 ====================
 
     @app.route("/", methods=["GET"])
@@ -108,7 +156,7 @@ def create_app(config: AppConfig) -> Flask:
             {
                 "code": 200,
                 "message": "service running",
-                "version": "2.0.0",
+                "version": "1.0.1",
                 "server_ip": local_ip,
                 "port": cfg.port,
                 "platform": platform.system(),
@@ -121,6 +169,9 @@ def create_app(config: AppConfig) -> Flask:
 
     @app.route("/history", methods=["GET"])
     def get_history():
+        auth_err = _check_auth()
+        if auth_err:
+            return auth_err
         with app.voice_history_lock:
             items = list(app.voice_history)
         return jsonify(
@@ -134,6 +185,9 @@ def create_app(config: AppConfig) -> Flask:
 
     @app.route("/history/<int:item_id>", methods=["DELETE"])
     def delete_history_item(item_id):
+        auth_err = _check_auth()
+        if auth_err:
+            return auth_err
         with app.voice_history_lock:
             before = len(app.voice_history)
             app.voice_history = deque(
@@ -145,6 +199,9 @@ def create_app(config: AppConfig) -> Flask:
 
     @app.route("/history", methods=["DELETE"])
     def clear_history():
+        auth_err = _check_auth()
+        if auth_err:
+            return auth_err
         with app.voice_history_lock:
             count = len(app.voice_history)
             app.voice_history.clear()
@@ -152,6 +209,9 @@ def create_app(config: AppConfig) -> Flask:
 
     @app.route("/history/export", methods=["GET"])
     def export_history():
+        auth_err = _check_auth()
+        if auth_err:
+            return auth_err
         fmt = request.args.get("format", "json")
         with app.voice_history_lock:
             items = list(app.voice_history)
@@ -192,20 +252,11 @@ def create_app(config: AppConfig) -> Flask:
     def handle_input():
         cfg = app.voice_config
 
-        # 1. IP 白名单验证
+        # 1. IP + Token 认证
+        auth_err = _check_auth()
+        if auth_err:
+            return auth_err
         client_ip = get_client_ip(request)
-        if not is_ip_allowed(client_ip, cfg.allowed_ips):
-            logging.warning(f"IP未授权访问: {client_ip}")
-            return (
-                jsonify(
-                    {
-                        "code": 403,
-                        "message": "IP not allowed",
-                        "error_detail": "Your IP address is not in the whitelist",
-                    }
-                ),
-                403,
-            )
 
         # 2. JSON 解析
         try:
@@ -223,21 +274,7 @@ def create_app(config: AppConfig) -> Flask:
                 400,
             )
 
-        # 3. Token 校验
-        if not is_token_valid(request, data, cfg.token, cfg.require_token):
-            logging.warning(f"Token校验失败: {client_ip}")
-            return (
-                jsonify(
-                    {
-                        "code": 401,
-                        "message": "Unauthorized",
-                        "error_detail": "Invalid or missing token",
-                    }
-                ),
-                401,
-            )
-
-        # 4. 必需字段
+        # 3. 必需字段
         if not data or "text" not in data:
             logging.error("缺少必需字段 'text'")
             return (

voice_input/templates/index.html

@@ -450,8 +450,7 @@
     const action = mode ? mode.value : 'paste';
     const payload = { text, timestamp: Date.now(), device_id: 'phone_web', action,
       restore_clipboard: (action !== 'copy' && restoreClipEl.checked) };
-    const headers = { 'Content-Type': 'application/json' };
-    if (tokenEl && tokenEl.value.trim()) headers['X-Auth-Token'] = tokenEl.value.trim();
+    const headers = Object.assign({'Content-Type': 'application/json'}, authHeaders());
 
     sending = true;
     $('send').disabled = true;
@@ -477,12 +476,19 @@
   }
   $('send').addEventListener('click', doSend);
 
+  // ===== Auth helper =====
+  function authHeaders() {
+    const h = {};
+    if (tokenEl && tokenEl.value.trim()) h['X-Auth-Token'] = tokenEl.value.trim();
+    return h;
+  }
+
   // ===== History =====
   let allItems = [];
 
   async function loadHistory() {
     try {
-      const res = await fetch('/history');
+      const res = await fetch('/history', { headers: authHeaders() });
       const j = await res.json();
       allItems = (j.items || []);
       renderHistory();
@@ -537,7 +543,7 @@
     if (!btn) return;
     const id = btn.getAttribute('data-id');
     try {
-      await fetch('/history/' + id, { method: 'DELETE' });
+      await fetch('/history/' + id, { method: 'DELETE', headers: authHeaders() });
       allItems = allItems.filter(i => String(i.id) !== String(id));
       renderHistory();
     } catch (ex) { toast('删除失败', false); }
@@ -547,20 +553,28 @@
   $('histClear').addEventListener('click', async () => {
     if (!confirm('确定清空全部历史记录？')) return;
     try {
-      await fetch('/history', { method: 'DELETE' });
+      await fetch('/history', { method: 'DELETE', headers: authHeaders() });
       allItems = [];
       renderHistory();
       toast('已清空', true);
     } catch (ex) { toast('清空失败', false); }
   });
 
-  // Export
-  $('histExportJson').addEventListener('click', () => {
-    window.open('/history/export?format=json', '_blank');
-  });
-  $('histExportCsv').addEventListener('click', () => {
-    window.open('/history/export?format=csv', '_blank');
-  });
+  // Export (use fetch with auth, then trigger download)
+  async function doExport(fmt) {
+    try {
+      const res = await fetch('/history/export?format=' + fmt, { headers: authHeaders() });
+      if (!res.ok) { toast('导出失败: ' + res.status, false); return; }
+      const blob = await res.blob();
+      const a = document.createElement('a');
+      a.href = URL.createObjectURL(blob);
+      a.download = 'voice_history.' + fmt;
+      a.click();
+      URL.revokeObjectURL(a.href);
+    } catch (e) { toast('导出失败', false); }
+  }
+  $('histExportJson').addEventListener('click', () => doExport('json'));
+  $('histExportCsv').addEventListener('click', () => doExport('csv'));
 
   // Auto-focus
   setTimeout(() => textEl.focus(), 300);

{voice_input-1.0.0.dist-info → voice_input-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: voice-input
-Version: 1.0.0
+Version: 1.0.1
 Summary: 跨设备语音输入传输系统 - 将手机端语音识别文本传送到电脑
 Author-email: mofanx <yanwuning@live.cn>
 Maintainer-email: mofanx <yanwuning@live.cn>
@@ -19,14 +19,12 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: flask>=2.2
 Requires-Dist: pyclip>=0.7
-Provides-Extra: keyboard
-Requires-Dist: keyboard>=0.13; extra == "keyboard"
+Requires-Dist: keyboard>=0.13
 Provides-Extra: production
 Requires-Dist: waitress>=2.1; extra == "production"
 Provides-Extra: config
 Requires-Dist: pyyaml>=6.0; extra == "config"
 Provides-Extra: all
-Requires-Dist: keyboard>=0.13; extra == "all"
 Requires-Dist: waitress>=2.1; extra == "all"
 Requires-Dist: pyyaml>=6.0; extra == "all"
 

voice_input-1.0.1.dist-info/RECORD

@@ -0,0 +1,12 @@
+voice_input/__init__.py,sha256=mQrEoy4clpVluSKc1FnLX_lPNAPt0832KLmkH7ymKR0,133
+voice_input/__main__.py,sha256=InFnKcGaQVM3WHkf2a4q3dH2IcYIKW8640LQOuYcQNY,79
+voice_input/cli.py,sha256=coH1MGUPC_qe8PO8AIdGDycDCh5KrQXWHm45VQ0AZyY,4904
+voice_input/config.py,sha256=VpW_AyHpn1KnkuzG8ueswDWJagEQXHVgTDz0G7IF_Zs,3223
+voice_input/server.py,sha256=wHKRkCJPTCT6Aro5I6FeAZE8N3CDIzTGk4i2BBp-S8Y,12857
+voice_input/utils.py,sha256=UdjC2AWjAoUEVdd5WmA383HWSZvcZImyUeCtRnke6AU,1737
+voice_input/templates/index.html,sha256=FJqncHE9fJgCEa8VsbVTUn9ad-iL3_fxFCbIF8t8mZg,20972
+voice_input-1.0.1.dist-info/METADATA,sha256=s0cgvHbCTKO8bKCcru8ILFNztXUKnZZS7Rt6pYIoNnk,8559
+voice_input-1.0.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+voice_input-1.0.1.dist-info/entry_points.txt,sha256=l75c0p_8NV2TGVTlI3hgH29_u8_MwB9Jj8-MG_OMdnI,53
+voice_input-1.0.1.dist-info/top_level.txt,sha256=WI3OWTYoGskXcN7Ok8vZ7lyRFyV21dPfIbiCsxMIyUY,12
+voice_input-1.0.1.dist-info/RECORD,,

voice_input-1.0.0.dist-info/RECORD

@@ -1,12 +0,0 @@
-voice_input/__init__.py,sha256=mfk9Ug2J6GpSS3U7Go9NDgrXhvnLZR6vPfJkS_80QUw,133
-voice_input/__main__.py,sha256=InFnKcGaQVM3WHkf2a4q3dH2IcYIKW8640LQOuYcQNY,79
-voice_input/cli.py,sha256=coH1MGUPC_qe8PO8AIdGDycDCh5KrQXWHm45VQ0AZyY,4904
-voice_input/config.py,sha256=VpW_AyHpn1KnkuzG8ueswDWJagEQXHVgTDz0G7IF_Zs,3223
-voice_input/server.py,sha256=2K2F-xR889sxN28VEDgNu5DAOz--A4oRDgOOhFcn12k,11364
-voice_input/utils.py,sha256=UdjC2AWjAoUEVdd5WmA383HWSZvcZImyUeCtRnke6AU,1737
-voice_input/templates/index.html,sha256=qzt5zKLH3u-QMpcfntQb_eJkJWo0r7dPX_uURAg2fRU,20346
-voice_input-1.0.0.dist-info/METADATA,sha256=nstZ6cBN4X3DcSjhTN5jGyFsZuWtLv-fXkOGYAPW1eg,8651
-voice_input-1.0.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-voice_input-1.0.0.dist-info/entry_points.txt,sha256=l75c0p_8NV2TGVTlI3hgH29_u8_MwB9Jj8-MG_OMdnI,53
-voice_input-1.0.0.dist-info/top_level.txt,sha256=WI3OWTYoGskXcN7Ok8vZ7lyRFyV21dPfIbiCsxMIyUY,12
-voice_input-1.0.0.dist-info/RECORD,,