@mingxy/ocosay 1.1.26 → 1.1.28

package/dist/package.json

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

package/dist/plugin.js

@@ -10295,15 +10295,14 @@ async function verifyNaudiodonLoad() {
 }
 async function rebuildNaudiodonDependency(dep) {
   const naudiodonPath = dirname2(require3.resolve("naudiodon"));
-  try {
-    notificationService.info(`\u6B63\u5728\u7F16\u8BD1 ${dep}...`, "Ocosay \u4F9D\u8D56", 4e3);
-    await execAsync(`npm rebuild ${dep}`, naudiodonPath);
-    logger9.info(`${dep} rebuilt successfully`);
-    return true;
-  } catch (err) {
-    logger9.warn({ err }, `${dep} rebuild failed`);
+  notificationService.info(`\u6B63\u5728\u7F16\u8BD1 ${dep}...`, "Ocosay \u4F9D\u8D56", 4e3);
+  const result = await execAsync(`npm rebuild ${dep}`, naudiodonPath);
+  if (result.error) {
+    logger9.warn({ err: result.error }, `${dep} rebuild failed`);
     return false;
   }
+  logger9.info(`${dep} rebuilt successfully`);
+  return true;
 }
 async function fixNaudiodonDependencies(maxRetries = 5) {
   const naudiodonPath = dirname2(require3.resolve("naudiodon"));
@@ -10322,24 +10321,24 @@ async function fixNaudiodonDependencies(maxRetries = 5) {
           anySuccess = true;
         }
       } catch {
-        try {
-          notificationService.info(`\u6B63\u5728\u5B89\u88C5 ${dep}...`, "Ocosay", 4e3);
-          await execAsync(`npm install ${dep}`, naudiodonPath);
+        notificationService.info(`\u6B63\u5728\u5B89\u88C5 ${dep}...`, "Ocosay", 4e3);
+        const installResult = await execAsync(`npm install ${dep}`, naudiodonPath);
+        if (installResult.error) {
+          logger9.warn({ err: installResult.error }, `${dep} install failed`);
+        } else {
           logger9.info(`${dep} installed successfully`);
           anySuccess = true;
-        } catch (installErr) {
-          logger9.warn({ err: installErr }, `${dep} install failed`);
         }
       }
     }
     if (!anySuccess || !await verifyNaudiodonLoad()) {
-      try {
-        notificationService.info("\u6B63\u5728\u91CD\u65B0\u7F16\u8BD1 naudiodon...", "Ocosay", 4e3);
-        await execAsync("npm rebuild naudiodon", naudiodonPath);
+      notificationService.info("\u6B63\u5728\u91CD\u65B0\u7F16\u8BD1 naudiodon...", "Ocosay", 4e3);
+      const rebuildResult = await execAsync("npm rebuild naudiodon", naudiodonPath);
+      if (rebuildResult.error) {
+        logger9.warn({ err: rebuildResult.error }, "naudiodon rebuild failed");
+      } else {
         logger9.info("naudiodon rebuilt");
         anySuccess = true;
-      } catch (err) {
-        logger9.warn({ err }, "naudiodon rebuild failed");
       }
     }
     if (await verifyNaudiodonLoad()) {
@@ -10367,18 +10366,52 @@ async function ensureNaudiodonCompiled() {
   try {
     const naudiodonPath = dirname2(require3.resolve("naudiodon"));
     logger9.info({ naudiodonPath }, "found naudiodon, rebuilding");
-    await execAsync("npm rebuild naudiodon", naudiodonPath);
-    logger9.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);
+    const rebuildResult = await execAsync("npm rebuild naudiodon", naudiodonPath);
+    if (rebuildResult.error) {
+      logger9.warn({ err: rebuildResult.error }, "naudiodon rebuild failed, checking for PortAudio");
+      notificationService.warning("naudiodon \u7F16\u8BD1\u5931\u8D25", "\u6B63\u5728\u5C1D\u8BD5\u5B89\u88C5 PortAudio...", 5e3);
+      const installed = await installPortAudio();
+      if (installed.success) {
+        const retryPath = dirname2(require3.resolve("naudiodon"));
+        notificationService.info("\u6B63\u5728\u91CD\u65B0\u7F16\u8BD1 naudiodon...", "Ocosay", 5e3);
+        const retryResult = await execAsync("npm rebuild naudiodon", retryPath);
+        if (retryResult.error) {
+          logger9.error({ err: retryResult.error }, "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", 8e3);
+          markNaudiodonSkipped();
+        } else {
+          logger9.info("naudiodon compiled successfully after PortAudio install");
+          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 {
+              markNaudiodonSkipped();
+            }
+          }
+        }
+      } else {
+        logger9.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", 8e3);
+        markNaudiodonSkipped();
+      }
     } 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);
+      logger9.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 {
-        throw new Error("naudiodon dependencies could not be fixed");
+        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 {
+          markNaudiodonSkipped();
+        }
       }
     }
   } catch (err) {
@@ -10386,10 +10419,14 @@ async function ensureNaudiodonCompiled() {
     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(require3.resolve("naudiodon"));
-        notificationService.info("\u6B63\u5728\u91CD\u65B0\u7F16\u8BD1 naudiodon...", "Ocosay", 5e3);
-        await execAsync("npm rebuild naudiodon", naudiodonPath);
+      const retryPath = dirname2(require3.resolve("naudiodon"));
+      notificationService.info("\u6B63\u5728\u91CD\u65B0\u7F16\u8BD1 naudiodon...", "Ocosay", 5e3);
+      const retryResult = await execAsync("npm rebuild naudiodon", retryPath);
+      if (retryResult.error) {
+        logger9.error({ err: retryResult.error }, "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", 8e3);
+        markNaudiodonSkipped();
+      } else {
         logger9.info("naudiodon compiled successfully after PortAudio install");
         const loadSuccess = await verifyNaudiodonLoad();
         if (loadSuccess) {
@@ -10400,13 +10437,9 @@ async function ensureNaudiodonCompiled() {
           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");
+            markNaudiodonSkipped();
           }
         }
-      } catch (retryErr) {
-        logger9.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", 8e3);
-        markNaudiodonSkipped();
       }
     } else {
       logger9.error("PortAudio install failed");
@@ -10443,18 +10476,17 @@ async function tryCompileSpeaker() {
     }
   }
   if (!isModuleInstalled(dep)) {
-    try {
-      await execAsync("npm install speaker", opencodeNodeModules);
-    } catch {
+    const installResult = await execAsync("npm install speaker", opencodeNodeModules);
+    if (installResult.error) {
+      logger9.warn({ err: installResult.error }, "speaker install failed");
     }
   }
-  try {
-    await execAsync("npm rebuild speaker", opencodeNodeModules);
-    if (await verifyModuleLoad(dep)) {
-      result.success = true;
-    }
-  } catch (err) {
-    result.stderr = err.stderr?.toString() || err.message || "";
+  const rebuildResult = await execAsync("npm rebuild speaker", opencodeNodeModules);
+  if (rebuildResult.error) {
+    result.stderr = rebuildResult.stderr || rebuildResult.error.message || "";
+  }
+  if (await verifyModuleLoad(dep)) {
+    result.success = true;
   }
   return result;
 }
@@ -10494,59 +10526,6 @@ async function initAsync() {
     await ensureSpeakerInstalledAsync();
   }, 100);
 }
-async function ensureSpeakerCompiled(maxRetries = 5) {
-  const dep = "speaker";
-  if (isModuleInstalled(dep)) {
-    logger9.info("speaker already installed");
-    if (await verifyModuleLoad(dep)) {
-      return;
-    }
-    logger9.info("speaker installed but not loadable, rebuilding");
-    notificationService.info("\u6B63\u5728\u7F16\u8BD1 speaker...", "Ocosay \u97F3\u9891\u540E\u7AEF", 5e3);
-    try {
-      await execAsync("npm rebuild speaker", opencodeNodeModules);
-      logger9.info("speaker rebuilt");
-    } catch (err) {
-      logger9.warn({ err }, "speaker rebuild failed");
-    }
-    if (await verifyModuleLoad(dep)) {
-      notificationService.success("speaker \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
-      return;
-    }
-  } else {
-    logger9.info("speaker not found, installing");
-    notificationService.info("\u6B63\u5728\u5B89\u88C5 speaker...", "Ocosay \u97F3\u9891\u540E\u7AEF", 5e3);
-    try {
-      await execAsync("npm install speaker", opencodeNodeModules);
-      logger9.info("speaker installed");
-    } catch (err) {
-      logger9.warn({ err }, "speaker install failed");
-    }
-  }
-  for (let attempt = 0; attempt < maxRetries; attempt++) {
-    if (await verifyModuleLoad(dep)) {
-      notificationService.success("speaker \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
-      return;
-    }
-    logger9.info({ attempt, dep }, "speaker not loadable, trying rebuild");
-    notificationService.info(`\u6B63\u5728\u91CD\u65B0\u7F16\u8BD1 speaker (${attempt + 1}/${maxRetries})...`, "Ocosay", 3e3);
-    try {
-      await execAsync("npm rebuild speaker", opencodeNodeModules);
-      logger9.info("speaker rebuilt");
-    } catch (err) {
-      logger9.warn({ err }, "speaker rebuild failed");
-    }
-    if (await verifyModuleLoad(dep)) {
-      notificationService.success("speaker \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
-      return;
-    }
-    if (attempt < maxRetries - 1) {
-      await new Promise((resolve) => setTimeout(resolve, 1e3));
-    }
-  }
-  logger9.error({ dep }, "speaker could not be compiled");
-  notificationService.error("speaker \u7F16\u8BD1\u5931\u8D25", "\u8BF7\u624B\u52A8\u8FD0\u884C: npm install speaker && npm rebuild speaker", 8e3);
-}
 async function ensurePlaySoundInstalled() {
   const dep = "play-sound";
   if (isModuleInstalled(dep)) {
@@ -10557,11 +10536,9 @@ async function ensurePlaySoundInstalled() {
   }
   logger9.info("play-sound not found, installing");
   notificationService.info("\u6B63\u5728\u5B89\u88C5 play-sound...", "Ocosay \u97F3\u9891\u540E\u7AEF", 5e3);
-  try {
-    await execAsync("npm install play-sound", opencodeNodeModules);
-    logger9.info("play-sound installed");
-  } catch (err) {
-    logger9.warn({ err }, "play-sound install failed");
+  const installResult = await execAsync("npm install play-sound", opencodeNodeModules);
+  if (installResult.error) {
+    logger9.warn({ err: installResult.error }, "play-sound install failed");
     notificationService.warning(
       "play-sound \u5B89\u88C5\u5931\u8D25",
       "\u8BF7\u624B\u52A8\u8FD0\u884C: npm install play-sound",
@@ -10569,6 +10546,7 @@ async function ensurePlaySoundInstalled() {
     );
     return;
   }
+  logger9.info("play-sound installed");
   if (await verifyModuleLoad(dep)) {
     notificationService.success("play-sound \u5B89\u88C5\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
   } else {
@@ -10580,7 +10558,9 @@ async function ensurePlaySoundInstalled() {
   }
 }
 async function ensureOptionalDepsInstalled() {
-  await ensureSpeakerCompiled();
+  ensureSpeakerCompiledAsync().catch((err) => {
+    logger9.warn({ err }, "ensureSpeakerCompiledAsync failed");
+  });
   await ensurePlaySoundInstalled();
 }
 function execCmd2(cmd) {
@@ -10635,18 +10615,16 @@ async function installPortAudio() {
   const runInstall = async (cmd, desc) => {
     logger9.info(`Running: ${cmd}`);
     notificationService.info(desc, "\u6B63\u5728\u5B89\u88C5...", 5e3);
-    try {
-      await execAsync(cmd);
-      return true;
-    } catch (err) {
-      const msg = err.message || "";
+    const result = await execAsync(cmd);
+    if (result.error) {
+      const msg = result.error.message || "";
       if (msg.includes("sudo") || msg.includes("password") || msg.includes("Password")) {
         notificationService.error(
           "\u9700\u8981 sudo \u6743\u9650",
           "# \u8BF7\u5728WSL\u7EC8\u7AEF\u6267\u884C\u4E00\u6B21\nsudo visudo\n# \u6DFB\u52A0\u884C\uFF1Ayour user name ALL=(ALL) NOPASSWD: ALL",
           1e4
         );
-        logger9.error({ err }, "\u9700\u8981 sudo \u6743\u9650 \u8BF7\u5728WSL\u7EC8\u7AEF\u6267\u884C\u4E00\u6B21sudo visudo # \u6DFB\u52A0\u884C\uFF1Ayour user name ALL=(ALL) NOPASSWD: ALL");
+        logger9.error({ err: result.error }, "\u9700\u8981 sudo \u6743\u9650 \u8BF7\u5728WSL\u7EC8\u7AEF\u6267\u884C\u4E00\u6B21sudo visudo # \u6DFB\u52A0\u884C\uFF1Ayour user name ALL=(ALL) NOPASSWD: ALL");
         return false;
       }
       if (msg.includes("already") || msg.includes("is already")) {
@@ -10654,9 +10632,10 @@ async function installPortAudio() {
         return true;
       }
       notificationService.error(desc + " \u5931\u8D25", msg.substring(0, 100), 8e3);
-      logger9.error({ err }, `install failed: ${desc}`);
+      logger9.error({ err: result.error }, `install failed: ${desc}`);
       return false;
     }
+    return true;
   };
   if (platform === "linux" || wsl) {
     notificationService.info("\u68C0\u6D4B ffmpeg...", "\u97F3\u9891\u540E\u7AEF", 5e3);

package/package.json

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