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

package/package.json

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

package/plugin-dist/client.js

@@ -1384,7 +1384,21 @@ var XinLingtingService = class {
       this.emit({ operation: null });
     }
   };
-  finish = async () => {
+  finish = async (recordId) => {
+    if (recordId && this.snapshot.active?.id !== recordId) {
+      if (this.snapshot.operation) throw new Error("\u6B63\u5728\u5904\u7406\u5176\u4ED6\u5F55\u97F3\u64CD\u4F5C\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002");
+      this.emit({ operation: "finishing" });
+      try {
+        const record = await this.loadDetail(recordId);
+        if (record.id !== recordId || record.status !== "paused") throw new Error("\u8BB0\u5F55\u72B6\u6001\u5DF2\u53D8\u5316\uFF0C\u8BF7\u5237\u65B0\u540E\u91CD\u8BD5\u3002");
+        await this.http.send(this.requests.stop(recordId, msToSeconds(record.durationMs)));
+        this.emit({ catalogVersion: this.snapshot.catalogVersion + 1 });
+        recordProgress(this).track(recordId);
+      } finally {
+        this.emit({ operation: null });
+      }
+      return;
+    }
     const active = this.snapshot.active;
     if (this.snapshot.operation || !active || active.status === "finishing") return;
     const needTeardown = active.status !== "finish-error";
@@ -1774,6 +1788,12 @@ function publishAudioStatus(next) {
   status = next;
   listeners.forEach((listener) => listener());
 }
+var recoveries = [];
+function noteAudioRecovery(samples, rate) {
+  if (!Number.isFinite(samples) || samples <= 0 || !Number.isFinite(rate) || rate < 8e3) return;
+  recoveries.push({ at: Date.now(), droppedMs: samples / rate * 1e3 });
+  if (recoveries.length > 50) recoveries.shift();
+}
 
 // src/audio/native-system.ts
 function nativeSystemAudio() {
@@ -1982,7 +2002,6 @@ var MeetingCapture = class {
       const sources = [context.createMediaStreamSource(microphone)];
       this.nodes.push(sources[0]);
       let startSystem;
-      let recoveryWarning;
       if (system) {
         const sessionId = crypto.randomUUID();
         const source = new AudioWorkletNode(context, "lingting-native-system", {
@@ -1996,8 +2015,7 @@ var MeetingCapture = class {
           if (generation !== this.generation) return;
           if (event.data?.error) fail(event.data.error);
           if (event.data?.droppedSamples > 0) {
-            recoveryWarning = "\u7CFB\u7EDF\u58F0\u97F3\u5904\u7406\u66FE\u77ED\u6682\u79EF\u538B\uFF0C\u5DF2\u6062\u590D\u5B9E\u65F6\u5F55\u97F3\uFF1B\u90E8\u5206\u7CFB\u7EDF\u58F0\u97F3\u53EF\u80FD\u7F3A\u5931\u3002";
-            publishAudioStatus({ mode: this.mode, microphone: 0, system: 0, warning: recoveryWarning });
+            noteAudioRecovery(event.data.droppedSamples, event.data.sampleRate);
           }
         };
         const receivePort = (event) => {
@@ -2074,12 +2092,7 @@ var MeetingCapture = class {
           analyser.getFloatTimeDomainData(samples);
           return Math.min(1, Math.sqrt(samples.reduce((sum, sample) => sum + sample * sample, 0) / samples.length) * 4);
         });
-        publishAudioStatus({
-          mode: this.mode,
-          microphone: this.emitting ? levels[0] : 0,
-          system: this.emitting ? levels[1] ?? 0 : 0,
-          warning: recoveryWarning
-        });
+        publishAudioStatus({ mode: this.mode, microphone: this.emitting ? levels[0] : 0, system: this.emitting ? levels[1] ?? 0 : 0 });
       }, 200);
     } catch (error) {
       if (generation === this.generation) await this.stop();
@@ -3140,6 +3153,23 @@ function RecordViewer({ service, recordId, onLoaded }) {
   const [refreshing, setRefreshing] = (0, import_react13.useState)(false);
   const [summaryError, setSummaryError] = (0, import_react13.useState)("");
   const [resuming, setResuming] = (0, import_react13.useState)(false);
+  const [confirmFinish, setConfirmFinish] = (0, import_react13.useState)(false);
+  const [finishing, setFinishing] = (0, import_react13.useState)(false);
+  const finishRecording = async () => {
+    if (finishing || resuming) return;
+    setFinishing(true);
+    setResumeError("");
+    try {
+      await service.finish(recordId);
+      setLoaded((current) => current ? { ...current, status: "finishing" } : current);
+      setConfirmFinish(false);
+    } catch (e) {
+      setResumeError(e instanceof Error ? e.message : "\u7ED3\u675F\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\u3002");
+      setConfirmFinish(false);
+    } finally {
+      setFinishing(false);
+    }
+  };
   const [resumeError, setResumeError] = (0, import_react13.useState)("");
   const [shareOpen, setShareOpen] = (0, import_react13.useState)(false);
   (0, import_react13.useEffect)(() => {
@@ -3272,12 +3302,20 @@ function RecordViewer({ service, recordId, onLoaded }) {
       ] })
     ] }),
     loaded.status === "paused" && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: "lt-resume", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("button", { className: "lt-primary", onClick: () => void resumeRecording(), disabled: resuming, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("button", { className: "lt-primary", onClick: () => void resumeRecording(), disabled: resuming || finishing, children: [
         resuming ? /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Spinner, { size: 15 }) : /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Mic, { size: 15 }),
         resuming ? "\u6B63\u5728\u7EE7\u7EED\u2026" : "\u7EE7\u7EED\u5F55\u97F3"
       ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("button", { className: "button danger", disabled: resuming || finishing, onClick: () => setConfirmFinish(true), children: "\u7ED3\u675F\u7075\u542C" }),
       /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { children: "\u7EE7\u7EED\u540E\u5B9E\u65F6\u8F6C\u5199\u56DE\u5230\u8FD9\u4E2A\u9762\u677F" })
     ] }),
+    confirmFinish && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(Modal, { title: "\u7ED3\u675F\u8FD9\u573A\u7075\u542C\uFF1F", busy: finishing, onClose: () => setConfirmFinish(false), children: [
+      /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("p", { children: "\u7ED3\u675F\u540E\u5C06\u6574\u7406\u5DF2\u6709\u8F6C\u5199\uFF0C\u65E0\u6CD5\u7EE7\u7EED\u8FD9\u573A\u5F55\u97F3\u3002" }),
+      /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: "modal-actions", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("button", { className: "button", disabled: finishing, onClick: () => setConfirmFinish(false), children: "\u6682\u4E0D\u7ED3\u675F" }),
+        /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("button", { className: "button danger", disabled: finishing, onClick: () => void finishRecording(), children: finishing ? "\u6B63\u5728\u7ED3\u675F\u2026" : "\u7ED3\u675F\u7075\u542C" })
+      ] })
+    ] }),
     resumeError && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: "lt-resume-error", children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(ErrorNotice, { action: "\u77E5\u9053\u4E86", onAction: () => setResumeError(""), children: resumeError }) }),
     (loaded.status === "finishing" || loaded.status === "interrupted") && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: "lt-settling", children: [
       /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(Spinner, { size: 13 }),
@@ -4424,7 +4462,7 @@ function MeetingPrompt({ service }) {
   const meeting = useMeetingPrompt({ service });
   if (!meeting.prompt) return null;
   const appName = meeting.prompt.appName;
-  const headline = meeting.pending ? "\u6B63\u5728\u5F00\u542F\u7075\u542C" : meeting.error ? "\u7075\u542C\u542F\u52A8\u672A\u5B8C\u6210" : meeting.confidence === "suspected" ? `\u68C0\u6D4B\u5230\u53EF\u80FD\u7684\u901A\u8BDD\u6D3B\u52A8\uFF08${appName}\uFF09` : `\u68C0\u6D4B\u5230${appName}\u4F1A\u8BAE`;
+  const headline = meeting.pending ? "\u6B63\u5728\u5F00\u542F\u7075\u542C" : meeting.error ? "\u7075\u542C\u542F\u52A8\u672A\u5B8C\u6210" : meeting.confidence === "suspected" ? `\u68C0\u6D4B\u5230\u53EF\u80FD\u7684\u901A\u8BDD\u6D3B\u52A8\uFF08${appName}\uFF09` : `${appName}\u53EF\u80FD\u6B63\u5728\u901A\u8BDD`;
   return /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("aside", { className: "lingting-root lt-meeting", "aria-label": "\u4F1A\u8BAE\u63D0\u9192", children: [
     /* @__PURE__ */ (0, import_jsx_runtime15.jsxs)("div", { className: "lt-meeting-head", children: [
       /* @__PURE__ */ (0, import_jsx_runtime15.jsx)(Headphones, { size: 16 }),

package/plugin-dist/index.js

@@ -756,7 +756,7 @@ function createMeetingPolicy(options = {}) {
     }
     if (!config.enabled) return { prompt: null, suppressed: "disabled" };
     const candidates = sessions.filter(
-      (session) => session.state === "meeting" && session.confidence !== "none" && (restartSuppression.get(session.appId) ?? 0) <= at && (config.apps.length === 0 || config.apps.includes(session.appId)) && !config.mutedApps.includes(session.appId)
+      (session) => session.state === "meeting" && session.confidence === "high" && (restartSuppression.get(session.appId) ?? 0) <= at && (config.apps.length === 0 || config.apps.includes(session.appId)) && !config.mutedApps.includes(session.appId)
     );
     if (candidates.length === 0) return { prompt: null, suppressed: null };
     if (inQuietHours(config, new Date(at))) return { prompt: null, suppressed: "quiet-hours" };
@@ -929,7 +929,7 @@ function createMeetingRuntime(options = {}) {
       const result = await supervisor.command("prompt.show", {
         promptId: record.promptId,
         title: "\u7075\u542C",
-        subtitle: `\u68C0\u6D4B\u5230${record.appName}\u4F1A\u8BAE`,
+        subtitle: `${record.appName}\u53EF\u80FD\u6B63\u5728\u901A\u8BDD`,
         message: "\u9700\u8981\u6211\u5E2E\u4F60\u5F00\u542F\u5F55\u97F3\u8F6C\u5199\u5417\uFF1F\u53EF\u4EE5\u751F\u6210\u5F55\u97F3\u7EAA\u8981\u5E76\u5BF9\u5185\u5BB9\u63D0\u95EE",
         acceptLabel: "\u5F00\u542F\u5F55\u97F3\u8F6C\u5199",
         ignoreLabel: "\u5FFD\u7565",