@mingxy/ocosay 1.1.18 → 1.1.20

package/dist/package.json

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

package/dist/plugin.js

@@ -10062,6 +10062,14 @@ async function ensureNaudiodonCompiled() {
     }
   }
 }
+function isModuleInstalled(moduleName) {
+  try {
+    require2.resolve(moduleName);
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function verifyModuleLoad(dep) {
   try {
     require2(dep);
@@ -10072,90 +10080,109 @@ async function verifyModuleLoad(dep) {
     return false;
   }
 }
-async function fixOptionalDep(dep, depPath, maxRetries = 5) {
+async function ensureSpeakerCompiled(maxRetries = 5) {
+  const dep = "speaker";
+  const basePath = dirname2(require2.resolve("./package.json"));
+  if (isModuleInstalled(dep)) {
+    logger8.info("speaker already installed");
+    if (await verifyModuleLoad(dep)) {
+      return;
+    }
+    logger8.info("speaker installed but not loadable, rebuilding");
+    notificationService.info("\u6B63\u5728\u7F16\u8BD1 speaker...", "Ocosay \u97F3\u9891\u540E\u7AEF", 5e3);
+    try {
+      execSync2("npm rebuild speaker", {
+        cwd: basePath,
+        stdio: "inherit"
+      });
+      logger8.info("speaker rebuilt");
+    } catch (err) {
+      logger8.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 {
+    logger8.info("speaker not found, installing");
+    notificationService.info("\u6B63\u5728\u5B89\u88C5 speaker...", "Ocosay \u97F3\u9891\u540E\u7AEF", 5e3);
+    try {
+      execSync2("npm install speaker", {
+        cwd: basePath,
+        stdio: "inherit"
+      });
+      logger8.info("speaker installed");
+    } catch (err) {
+      logger8.warn({ err }, "speaker install failed");
+    }
+  }
   for (let attempt = 0; attempt < maxRetries; attempt++) {
     if (await verifyModuleLoad(dep)) {
-      return true;
+      notificationService.success("speaker \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
+      return;
     }
-    logger8.info({ attempt, dep }, "module not loadable, trying rebuild");
-    notificationService.info(`\u6B63\u5728\u7F16\u8BD1 ${dep} (${attempt + 1}/${maxRetries})...`, "Ocosay", 3e3);
+    logger8.info({ attempt, dep }, "speaker not loadable, trying rebuild");
+    notificationService.info(`\u6B63\u5728\u91CD\u65B0\u7F16\u8BD1 speaker (${attempt + 1}/${maxRetries})...`, "Ocosay", 3e3);
     try {
-      execSync2("npm rebuild", {
-        cwd: depPath,
+      execSync2("npm rebuild speaker", {
+        cwd: basePath,
         stdio: "inherit"
       });
-      logger8.info(`${dep} rebuilt`);
+      logger8.info("speaker rebuilt");
     } catch (err) {
-      logger8.warn({ err }, `${dep} rebuild failed`);
+      logger8.warn({ err }, "speaker rebuild failed");
     }
     if (await verifyModuleLoad(dep)) {
-      return true;
+      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));
     }
-    await new Promise((resolve) => setTimeout(resolve, 1e3));
   }
-  return await verifyModuleLoad(dep);
+  logger8.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 ensureOptionalDepsInstalled() {
-  const optionalDeps = ["play-sound", "speaker"];
-  const missingDeps = [];
+async function ensurePlaySoundInstalled() {
+  const dep = "play-sound";
   const basePath = dirname2(require2.resolve("./package.json"));
-  for (const dep of optionalDeps) {
+  if (isModuleInstalled(dep)) {
+    logger8.info("play-sound already installed");
     if (await verifyModuleLoad(dep)) {
-      continue;
+      return;
     }
-    missingDeps.push(dep);
   }
-  if (missingDeps.length === 0) {
-    return;
-  }
-  notificationService.info(
-    `\u6B63\u5728\u5B89\u88C5\u53EF\u9009\u4F9D\u8D56: ${missingDeps.join(", ")}...`,
-    "Ocosay \u97F3\u9891\u540E\u7AEF",
-    5e3
-  );
+  logger8.info("play-sound not found, installing");
+  notificationService.info("\u6B63\u5728\u5B89\u88C5 play-sound...", "Ocosay \u97F3\u9891\u540E\u7AEF", 5e3);
   try {
-    const depsStr = missingDeps.join(" ");
-    logger8.info({ deps: depsStr }, "installing optional dependencies");
-    execSync2(`npm install ${depsStr}`, {
+    execSync2("npm install play-sound", {
       cwd: basePath,
       stdio: "inherit"
     });
-    logger8.info("optional dependencies installed");
+    logger8.info("play-sound installed");
   } catch (err) {
-    logger8.warn({ err }, "optional dependencies install failed");
+    logger8.warn({ err }, "play-sound install failed");
     notificationService.warning(
-      "\u53EF\u9009\u4F9D\u8D56\u5B89\u88C5\u5931\u8D25",
-      `\u8BF7\u624B\u52A8\u8FD0\u884C: npm install ${missingDeps.join(" ")}`,
+      "play-sound \u5B89\u88C5\u5931\u8D25",
+      "\u8BF7\u624B\u52A8\u8FD0\u884C: npm install play-sound",
       8e3
     );
     return;
   }
-  let allLoaded = true;
-  for (const dep of missingDeps) {
-    const depPath = dirname2(require2.resolve(dep, { paths: [basePath] }));
-    if (await verifyModuleLoad(dep)) {
-      continue;
-    }
-    notificationService.warning(`${dep} \u52A0\u8F7D\u5931\u8D25\uFF0C\u6B63\u5728\u5C1D\u8BD5\u7F16\u8BD1...`, "Ocosay", 5e3);
-    const fixed = await fixOptionalDep(dep, depPath);
-    if (!fixed) {
-      allLoaded = false;
-    }
-  }
-  if (allLoaded) {
-    notificationService.success(
-      "\u53EF\u9009\u4F9D\u8D56\u5B89\u88C5\u6210\u529F",
-      "play-sound & speaker \u5DF2\u5C31\u7EEA",
-      5e3
-    );
+  if (await verifyModuleLoad(dep)) {
+    notificationService.success("play-sound \u5B89\u88C5\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
   } else {
     notificationService.warning(
-      "\u90E8\u5206\u53EF\u9009\u4F9D\u8D56\u5B89\u88C5\u5931\u8D25",
-      `\u8BF7\u624B\u52A8\u8FD0\u884C: npm install ${missingDeps.join(" ")} && npm rebuild`,
+      "play-sound \u5B89\u88C5\u5931\u8D25",
+      "\u8BF7\u624B\u52A8\u8FD0\u884C: npm install play-sound",
       8e3
     );
   }
 }
+async function ensureOptionalDepsInstalled() {
+  await ensureSpeakerCompiled();
+  await ensurePlaySoundInstalled();
+}
 function execCmd2(cmd) {
   try {
     const output = execSync2(cmd, { stdio: "pipe", encoding: "utf8" });

package/package.json

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