@mingxy/ocosay 1.1.9 → 1.1.11

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mingxy/ocosay",
-"version": "1.1.9",
+"version": "1.1.10",
   "description": "OpenCode TTS 播放插件 - 支持豆包模式边接收边朗读",
   "type": "module",
   "main": "dist/plugin.js",

package/dist/plugin.js

@@ -9587,6 +9587,83 @@ function markNaudiodonSkipped() {
   } catch {
   }
 }
+async function verifyNaudiodonLoad() {
+  try {
+    require2("naudiodon");
+    logger8.info("naudiodon loaded successfully");
+    return true;
+  } catch (err) {
+    logger8.warn({ err }, "naudiodon load failed after rebuild");
+    return false;
+  }
+}
+async function rebuildNaudiodonDependency(dep) {
+  const naudiodonPath = dirname2(require2.resolve("naudiodon"));
+  try {
+    notificationService.info(`\u6B63\u5728\u7F16\u8BD1 ${dep}...`, "Ocosay \u4F9D\u8D56", 4e3);
+    execSync(`npm rebuild ${dep}`, {
+      cwd: naudiodonPath,
+      stdio: "inherit"
+    });
+    logger8.info(`${dep} rebuilt successfully`);
+    return true;
+  } catch (err) {
+    logger8.warn({ err }, `${dep} rebuild failed`);
+    return false;
+  }
+}
+async function fixNaudiodonDependencies(maxRetries = 5) {
+  const naudiodonPath = dirname2(require2.resolve("naudiodon"));
+  const criticalDeps = ["segfault-handler", "bindings", "node-pre-gyp"];
+  for (let attempt = 0; attempt < maxRetries; attempt++) {
+    if (await verifyNaudiodonLoad()) {
+      return true;
+    }
+    logger8.info({ attempt }, "naudiodon not loadable, trying dependency rebuild");
+    notificationService.info(`\u6B63\u5728\u68C0\u67E5\u4F9D\u8D56 (${attempt + 1}/${maxRetries})...`, "Ocosay", 3e3);
+    let anySuccess = false;
+    for (const dep of criticalDeps) {
+      try {
+        require2.resolve(dep, { paths: [naudiodonPath] });
+        if (await rebuildNaudiodonDependency(dep)) {
+          anySuccess = true;
+        }
+      } catch {
+        try {
+          notificationService.info(`\u6B63\u5728\u5B89\u88C5 ${dep}...`, "Ocosay", 4e3);
+          execSync(`npm install ${dep}`, {
+            cwd: naudiodonPath,
+            stdio: "inherit"
+          });
+          logger8.info(`${dep} installed successfully`);
+          anySuccess = true;
+        } catch (installErr) {
+          logger8.warn({ err: installErr }, `${dep} install failed`);
+        }
+      }
+    }
+    if (!anySuccess || !await verifyNaudiodonLoad()) {
+      try {
+        notificationService.info("\u6B63\u5728\u91CD\u65B0\u7F16\u8BD1 naudiodon...", "Ocosay", 4e3);
+        execSync("npm rebuild naudiodon", {
+          cwd: naudiodonPath,
+          stdio: "inherit"
+        });
+        logger8.info("naudiodon rebuilt");
+        anySuccess = true;
+      } catch (err) {
+        logger8.warn({ err }, "naudiodon rebuild failed");
+      }
+    }
+    if (await verifyNaudiodonLoad()) {
+      return true;
+    }
+    if (anySuccess) {
+      await new Promise((resolve) => setTimeout(resolve, 1e3));
+    }
+  }
+  return await verifyNaudiodonLoad();
+}
 async function ensureNaudiodonCompiled() {
   if (shouldSkipNaudiodon()) {
     logger8.info("naudiodon skipped previously");
@@ -9598,7 +9675,7 @@ async function ensureNaudiodonCompiled() {
     return;
   } catch {
     logger8.info("naudiodon not compiled, will attempt to compile");
-    notificationService.info("\u6B63\u5728\u7F16\u8BD1 naudiodon...", "Ocosay \u97F3\u9891\u540E\u7AEF");
+    notificationService.info("\u6B63\u5728\u7F16\u8BD1 naudiodon...", "Ocosay \u97F3\u9891\u540E\u7AEF", 5e3);
   }
   try {
     const naudiodonPath = dirname2(require2.resolve("naudiodon"));
@@ -9607,30 +9684,52 @@ async function ensureNaudiodonCompiled() {
       cwd: naudiodonPath,
       stdio: "inherit"
     });
-    logger8.info("naudiodon compiled successfully");
-    notificationService.success("naudiodon \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA");
+    logger8.info("naudiodon compiled, verifying...");
+    const loadSuccess = await verifyNaudiodonLoad();
+    if (loadSuccess) {
+      notificationService.success("naudiodon \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
+    } else {
+      notificationService.warning("naudiodon \u52A0\u8F7D\u5931\u8D25", "\u6B63\u5728\u68C0\u67E5\u4F9D\u8D56...", 5e3);
+      const fixed = await fixNaudiodonDependencies();
+      if (fixed) {
+        notificationService.success("naudiodon \u4F9D\u8D56\u4FEE\u590D\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
+      } else {
+        throw new Error("naudiodon dependencies could not be fixed");
+      }
+    }
   } catch (err) {
     logger8.warn({ err }, "naudiodon rebuild failed, checking for PortAudio");
-    notificationService.warning("naudiodon \u7F16\u8BD1\u5931\u8D25", "\u6B63\u5728\u5C1D\u8BD5\u5B89\u88C5 PortAudio...");
+    notificationService.warning("naudiodon \u7F16\u8BD1\u5931\u8D25", "\u6B63\u5728\u5C1D\u8BD5\u5B89\u88C5 PortAudio...", 5e3);
     const installed = await installPortAudio();
     if (installed.success) {
       try {
         const naudiodonPath = dirname2(require2.resolve("naudiodon"));
-        notificationService.info("\u6B63\u5728\u91CD\u65B0\u7F16\u8BD1 naudiodon...", "Ocosay");
+        notificationService.info("\u6B63\u5728\u91CD\u65B0\u7F16\u8BD1 naudiodon...", "Ocosay", 5e3);
         execSync("npm rebuild naudiodon", {
           cwd: naudiodonPath,
           stdio: "inherit"
         });
         logger8.info("naudiodon compiled successfully after PortAudio install");
-        notificationService.success("naudiodon \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA");
+        const loadSuccess = await verifyNaudiodonLoad();
+        if (loadSuccess) {
+          notificationService.success("naudiodon \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
+        } else {
+          notificationService.warning("naudiodon \u52A0\u8F7D\u5931\u8D25", "\u6B63\u5728\u68C0\u67E5\u4F9D\u8D56...", 5e3);
+          const fixed = await fixNaudiodonDependencies();
+          if (fixed) {
+            notificationService.success("naudiodon \u4F9D\u8D56\u4FEE\u590D\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
+          } else {
+            throw new Error("naudiodon dependencies could not be fixed");
+          }
+        }
       } catch (retryErr) {
         logger8.error({ err: retryErr }, "naudiodon compile failed even after PortAudio install");
-        notificationService.error("naudiodon \u7F16\u8BD1\u5931\u8D25", "\u81EA\u52A8\u5B89\u88C5\u5931\u8D25\uFF0C\u8BF7\u5C1D\u8BD5\u624B\u52A8\u5B89\u88C5");
+        notificationService.error("naudiodon \u7F16\u8BD1\u5931\u8D25", "\u81EA\u52A8\u5B89\u88C5\u5931\u8D25\uFF0C\u8BF7\u5C1D\u8BD5\u624B\u52A8\u5B89\u88C5", 8e3);
         markNaudiodonSkipped();
       }
     } else {
       logger8.error("PortAudio install failed");
-      notificationService.error("PortAudio \u5B89\u88C5\u5931\u8D25", "\u81EA\u52A8\u5B89\u88C5\u5931\u8D25\uFF0C\u8BF7\u5C1D\u8BD5\u624B\u52A8\u5B89\u88C5");
+      notificationService.error("PortAudio \u5B89\u88C5\u5931\u8D25", "\u81EA\u52A8\u5B89\u88C5\u5931\u8D25\uFF0C\u8BF7\u5C1D\u8BD5\u624B\u52A8\u5B89\u88C5", 8e3);
       markNaudiodonSkipped();
     }
   }
@@ -9663,7 +9762,7 @@ async function installPortAudio() {
   logger8.info({ platform, wsl }, "installing PortAudio");
   const runInstall = async (cmd, desc) => {
     logger8.info(`Running: ${cmd}`);
-    notificationService.info(desc, "\u6B63\u5728\u5B89\u88C5...");
+    notificationService.info(desc, "\u6B63\u5728\u5B89\u88C5...", 5e3);
     try {
       execSync(cmd, { stdio: "inherit" });
       return true;
@@ -9672,7 +9771,8 @@ async function installPortAudio() {
       if (msg.includes("sudo") || msg.includes("password") || msg.includes("Password")) {
         notificationService.error(
           "\u9700\u8981 sudo \u6743\u9650",
-          "\u8BF7\u624B\u52A8\u8FD0\u884C: sudo apt-get update && sudo apt-get install -y alsa-utils"
+          "\u8BF7\u624B\u52A8\u8FD0\u884C: sudo apt-get update && sudo apt-get install -y alsa-utils",
+          8e3
         );
         logger8.error({ err }, "sudo password required");
         return false;
@@ -9681,41 +9781,41 @@ async function installPortAudio() {
         logger8.info("already installed");
         return true;
       }
-      notificationService.error(desc + " \u5931\u8D25", msg.substring(0, 100));
+      notificationService.error(desc + " \u5931\u8D25", msg.substring(0, 100), 8e3);
       logger8.error({ err }, `install failed: ${desc}`);
       return false;
     }
   };
   if (platform === "linux" || wsl) {
-    notificationService.info("\u68C0\u6D4B\u97F3\u9891\u8BBE\u5907...", "\u97F3\u9891\u540E\u7AEF");
+    notificationService.info("\u68C0\u6D4B\u97F3\u9891\u8BBE\u5907...", "\u97F3\u9891\u540E\u7AEF", 5e3);
     if (checkAlsa()) {
       logger8.info("alsa-utils already available and working");
-      notificationService.success("alsa-utils \u5C31\u7EEA", "\u97F3\u9891\u540E\u7AEF\u5DF2\u53EF\u7528");
+      notificationService.success("alsa-utils \u5C31\u7EEA", "\u97F3\u9891\u540E\u7AEF\u5DF2\u53EF\u7528", 5e3);
       return { success: true, message: "alsa" };
     }
-    notificationService.info("\u5B89\u88C5 alsa-utils...", "\u97F3\u9891\u540E\u7AEF");
+    notificationService.info("\u5B89\u88C5 alsa-utils...", "\u97F3\u9891\u540E\u7AEF", 5e3);
     const alsaInstalled = await runInstall(
       "sudo apt-get update && sudo apt-get install -y alsa-utils",
       "\u5B89\u88C5 alsa-utils"
     );
     if (alsaInstalled) {
       if (checkAlsa()) {
-        notificationService.success("alsa-utils \u5B89\u88C5\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA");
+        notificationService.success("alsa-utils \u5B89\u88C5\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
         return { success: true, message: "alsa" };
       } else {
-        notificationService.warning("alsa-utils \u5B89\u88C5\u540E\u68C0\u6D4B\u5931\u8D25", "\u7EE7\u7EED\u5C1D\u8BD5\u5176\u4ED6\u65B9\u6848");
+        notificationService.warning("alsa-utils \u5B89\u88C5\u540E\u68C0\u6D4B\u5931\u8D25", "\u7EE7\u7EED\u5C1D\u8BD5\u5176\u4ED6\u65B9\u6848", 5e3);
       }
     }
-    notificationService.info("\u5B89\u88C5 libportaudio-dev...", "\u97F3\u9891\u540E\u7AEF");
+    notificationService.info("\u5B89\u88C5 libportaudio-dev...", "\u97F3\u9891\u540E\u7AEF", 5e3);
     const portaudioInstalled = await runInstall(
       "sudo apt-get update && sudo apt-get install -y libportaudio-dev",
       "\u5B89\u88C5 libportaudio-dev"
     );
     if (portaudioInstalled) {
-      notificationService.success("libportaudio-dev \u5B89\u88C5\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA");
+      notificationService.success("libportaudio-dev \u5B89\u88C5\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
       return { success: true, message: "portaudio" };
     }
-    notificationService.warning("PortAudio \u5B89\u88C5\u5931\u8D25", "\u97F3\u9891\u53EF\u80FD\u65E0\u6CD5\u6B63\u5E38\u5DE5\u4F5C");
+    notificationService.warning("PortAudio \u5B89\u88C5\u5931\u8D25", "\u97F3\u9891\u53EF\u80FD\u65E0\u6CD5\u6B63\u5E38\u5DE5\u4F5C", 5e3);
     markNaudiodonSkipped();
     return { success: false, message: "linux install failed" };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mingxy/ocosay",
-"version": "1.1.9",
+"version": "1.1.11",
   "description": "OpenCode TTS 播放插件 - 支持豆包模式边接收边朗读",
   "type": "module",
   "main": "dist/plugin.js",