dsh-xrxs-lingting 0.4.0-dev.50 → 0.4.0-dev.51

package/README.md

@@ -110,3 +110,5 @@ npm run smoke:client -- /path/to/cinlyn-desktop
 该检查不代替安装后对授权、录音、转写和回放的人工验证。
 
 布局回归验证：`node scripts/smoke-layout-browser.mjs <playwright/index.mjs 路径>`，使用 Chrome 无头浏览器运行真实插件产物，验证页面边界、弹窗居中、转写面板层级、窗口缩放与卸载后聊天恢复。使用合成录音状态，不访问业务数据、不采集声音。
+
+设备切换：支持的桌面原生模块会在默认输出变化时重新连接系统采集，插件重新采样并替换默认麦克风输入，保留同一录音与转写连接。操作系统切换设备期间可能存在短暂音频缺口；持续无法恢复才报错暂停。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-xrxs-lingting",
-  "version": "0.4.0-dev.50",
+  "version": "0.4.0-dev.51",
   "type": "module",
   "scripts": {
     "dev": "vite --host 127.0.0.1",

package/plugin-dist/client.js

@@ -1606,6 +1606,117 @@ function toSegment(segment) {
   return { id: segment.id, speaker: speakerLabel(segment.speakerId), text: segment.text, final: segment.final };
 }
 
+// src/audio/microphone-switch.ts
+function followDefaultMicrophone(options) {
+  let current = options.initial;
+  let stopped = false;
+  let running = false;
+  let queued = false;
+  let cancelAcquire;
+  let cancelDelay;
+  const delay = () => new Promise((resolve) => {
+    const timer = setTimeout(() => {
+      cancelDelay = void 0;
+      resolve();
+    }, 250);
+    cancelDelay = () => {
+      clearTimeout(timer);
+      cancelDelay = void 0;
+      resolve();
+    };
+  });
+  const watch = (stream) => {
+    stream.getAudioTracks().forEach((track) => {
+      track.onended = () => {
+        void reconnect();
+      };
+    });
+  };
+  const reconnect = async () => {
+    if (stopped) return;
+    if (running) {
+      queued = true;
+      return;
+    }
+    running = true;
+    const began = Date.now();
+    try {
+      do {
+        queued = false;
+        try {
+          const next = await new Promise((resolve, reject) => {
+            let settled = false;
+            const finishError = (error) => {
+              if (settled) return;
+              settled = true;
+              clearTimeout(timer);
+              cancelAcquire = void 0;
+              reject(error);
+            };
+            const timer = setTimeout(() => finishError(new Error("Microphone recovery timed out")), Math.max(0, 8e3 - (Date.now() - began)));
+            cancelAcquire = () => finishError(new Error("Recording stopped"));
+            Promise.resolve().then(options.acquire).then((stream) => {
+              if (settled || stopped) {
+                stream.getTracks().forEach((track) => track.stop());
+                return;
+              }
+              settled = true;
+              clearTimeout(timer);
+              cancelAcquire = void 0;
+              resolve(stream);
+            }, finishError);
+          });
+          if (stopped) {
+            next.getTracks().forEach((track) => track.stop());
+            return;
+          }
+          if (!next.getAudioTracks().some((track) => track.readyState === "live")) {
+            next.getTracks().forEach((track) => track.stop());
+            throw new Error("Microphone is not live");
+          }
+          const previous = current;
+          try {
+            options.replace(next, previous);
+          } catch (error) {
+            next.getTracks().forEach((track) => track.stop());
+            throw error;
+          }
+          current = next;
+          previous.getTracks().forEach((track) => {
+            track.onended = null;
+            track.stop();
+          });
+          watch(current);
+        } catch {
+          if (stopped) return;
+          if (Date.now() - began >= 8e3) {
+            if (!current.getAudioTracks().some((track) => track.readyState === "live")) options.failed();
+            return;
+          }
+          await delay();
+          queued = true;
+        }
+      } while (queued && !stopped);
+    } finally {
+      running = false;
+    }
+  };
+  const changed = () => {
+    void reconnect();
+  };
+  watch(current);
+  options.devices.addEventListener?.("devicechange", changed);
+  return () => {
+    stopped = true;
+    cancelDelay?.();
+    cancelAcquire?.();
+    options.devices.removeEventListener?.("devicechange", changed);
+    current.getTracks().forEach((track) => {
+      track.onended = null;
+    });
+  };
+}
+
 // src/audio/worklet-source.ts
 var captureWorkletSource = `
 class LingtingCaptureProcessor extends AudioWorkletProcessor {
@@ -1691,7 +1802,7 @@ class NativeSystemSource extends AudioWorkletProcessor {
   accept(data) {
       if (this.failed) return;
       if (!data || !(data.samples instanceof Float32Array) || !Number.isFinite(data.sampleRate) || data.sampleRate < 8000 || data.sampleRate > 192000) return;
-      if (this.rate && this.rate !== data.sampleRate) { this.fail('\u7CFB\u7EDF\u58F0\u97F3\u91C7\u6837\u7387\u5DF2\u53D8\u5316\uFF0C\u8BF7\u91CD\u65B0\u5F00\u59CB\u5F55\u97F3\u3002'); return; }
+      if (this.rate && this.rate !== data.sampleRate) { this.read = 0; this.write = 0; this.started = false; this.buffer.fill(0); }
       this.rate = data.sampleRate;
       // Bound latency, not just memory. After a render stall, retain the newest
       // 100 ms instead of spending minutes playing stale audio or killing capture.
@@ -1784,6 +1895,7 @@ var MeetingCapture = class {
   emitting = false;
   stopSystem = null;
   systemNode = null;
+  stopMicrophoneSwitch = null;
   async start(onChunk, onError) {
     if (this.context || this.starting) throw new Error("\u91C7\u96C6\u5DF2\u5728\u8FDB\u884C\u4E2D\u3002");
     this.starting = true;
@@ -1822,7 +1934,6 @@ var MeetingCapture = class {
       for (const stream of this.streams) {
         for (const track of stream.getAudioTracks()) {
           if (track.readyState !== "live") throw new Error("\u97F3\u9891\u8BBE\u5907\u5DF2\u65AD\u5F00\uFF0C\u8BF7\u91CD\u65B0\u5F00\u59CB\u5F55\u97F3\u3002");
-          track.onended = () => fail(stream === microphone ? "\u9EA6\u514B\u98CE\u5DF2\u65AD\u5F00\uFF0C\u5F55\u97F3\u5DF2\u6682\u505C\uFF0C\u8BF7\u68C0\u67E5\u8BBE\u5907\u540E\u7EE7\u7EED\u3002" : "\u7CFB\u7EDF\u58F0\u97F3\u91C7\u96C6\u5DF2\u505C\u6B62\uFF0C\u5F55\u97F3\u5DF2\u6682\u505C\uFF0C\u8BF7\u91CD\u65B0\u6388\u6743\u540E\u7EE7\u7EED\u3002");
         }
       }
       const context = new AudioContext();
@@ -1836,7 +1947,7 @@ var MeetingCapture = class {
           return;
         }
         stalledSince ??= Date.now();
-        if (Date.now() - stalledSince >= 5e3) {
+        if (Date.now() - stalledSince >= 8e3) {
           fail("\u97F3\u9891\u5904\u7406\u6062\u590D\u8D85\u65F6\uFF0C\u8BF7\u91CD\u65B0\u5F00\u59CB\u5F55\u97F3\u3002");
           return;
         }
@@ -1846,7 +1957,8 @@ var MeetingCapture = class {
           return;
         }
         recovering = true;
-        void context.resume().catch(() => fail("\u97F3\u9891\u5904\u7406\u65E0\u6CD5\u6062\u590D\uFF0C\u8BF7\u91CD\u65B0\u5F00\u59CB\u5F55\u97F3\u3002")).finally(() => {
+        void context.resume().catch(() => {
+        }).finally(() => {
           recovering = false;
         });
       };
@@ -1924,6 +2036,24 @@ var MeetingCapture = class {
         this.nodes.push(source, analyser, gain);
         analysers.push(analyser);
       }
+      this.stopMicrophoneSwitch = followDefaultMicrophone({
+        devices,
+        initial: microphone,
+        acquire: () => devices.getUserMedia({ audio: { channelCount: 1, echoCancellation: true, noiseSuppression: true, autoGainControl: true } }),
+        replace: (next, previous) => {
+          if (generation !== this.generation) throw new Error("\u5F55\u97F3\u5DF2\u53D6\u6D88\u3002");
+          const replacement = context.createMediaStreamSource(next);
+          replacement.connect(analysers[0]);
+          const oldSource = sources[0];
+          oldSource.disconnect();
+          sources[0] = replacement;
+          this.nodes = this.nodes.filter((item) => item !== oldSource);
+          this.nodes.push(replacement);
+          this.streams = this.streams.filter((item) => item !== previous);
+          this.streams.push(next);
+        },
+        failed: () => fail("\u9EA6\u514B\u98CE\u5207\u6362\u540E\u672A\u80FD\u6062\u590D\uFF0C\u5F55\u97F3\u5DF2\u6682\u505C\uFF0C\u8BF7\u68C0\u67E5\u8BBE\u5907\u8FDE\u63A5\u3002")
+      });
       const mute = context.createGain();
       mute.gain.value = 0;
       node.connect(mute);
@@ -1970,6 +2100,8 @@ var MeetingCapture = class {
   }
   async stop() {
     ++this.generation;
+    this.stopMicrophoneSwitch?.();
+    this.stopMicrophoneSwitch = null;
     this.emitting = false;
     if (this.timer) clearInterval(this.timer);
     this.timer = null;
@@ -5450,7 +5582,7 @@ function mountBusinessSurface(doc) {
     else center.style.removeProperty("position");
   } };
 }
-function BusinessSurface({ children }) {
+function BusinessSurface({ children, onClose }) {
   const [target, setTarget] = (0, import_react22.useState)(null);
   (0, import_react22.useLayoutEffect)(() => {
     let mounted = null;
@@ -5461,9 +5593,18 @@ function BusinessSurface({ children }) {
       setTarget(mounted?.target ?? null);
     };
     attach();
+    const onSidebarClick = (event) => {
+      const element = event.target instanceof Element ? event.target : null;
+      const button = element?.closest("button");
+      if (!button?.closest('[data-slot="sidebar"]')) return;
+      const label = button.getAttribute("aria-label")?.trim();
+      if (label && /^(新会话|新建会话|New session)$/i.test(label)) onClose();
+    };
+    document.addEventListener("click", onSidebarClick, true);
     const observer = new MutationObserver(attach);
     observer.observe(document.body, { childList: true, subtree: true });
     return () => {
+      document.removeEventListener("click", onSidebarClick, true);
       observer.disconnect();
       mounted?.dispose();
     };
@@ -5537,7 +5678,7 @@ async function apply(ctx) {
   function Overlay() {
     const page = (0, import_react23.useSyncExternalStore)(business.subscribe, business.getSnapshot, business.getSnapshot);
     return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(import_jsx_runtime21.Fragment, { children: [
-      !hostBusiness && page.activeId === ID && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(BusinessSurface, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Page, { activeId: page.activeId }) }),
+      !hostBusiness && page.activeId === ID && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(BusinessSurface, { onClose: () => business.close(), children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Page, { activeId: page.activeId }) }),
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(PanelBoundary, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(XinHostNotice, { store: hostState }) }),
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(PanelBoundary, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(LingtingSidebar, { service, controller, onOpenPage: () => business.open(ID) }) }),
       /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(PanelBoundary, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(MeetingPrompt, { service }) })