@mingxy/ocosay 1.1.19 → 1.1.21

package/dist/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",

package/dist/plugin.js

@@ -9899,6 +9899,8 @@ import { execSync as execSync2 } from "child_process";
 import { createRequire } from "module";
 var logger8 = createModuleLogger("Plugin");
 var require2 = createRequire(import.meta.url);
+var opencodeNodeModules = join8(dirname2(require2.resolve("@opencode-ai/plugin")), "..", "..");
+var pluginRequire = createRequire(join8(opencodeNodeModules, "package.json"));
 function getSkipFilePath() {
   return join8(homedir3(), ".config", "opencode", ".naudiodon_skip");
 }
@@ -10062,9 +10064,17 @@ async function ensureNaudiodonCompiled() {
     }
   }
 }
+function isModuleInstalled(moduleName) {
+  try {
+    pluginRequire.resolve(moduleName);
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function verifyModuleLoad(dep) {
   try {
-    require2(dep);
+    pluginRequire(dep);
     logger8.info(`${dep} loaded successfully`);
     return true;
   } catch (err) {
@@ -10074,64 +10084,79 @@ async function verifyModuleLoad(dep) {
 }
 async function ensureSpeakerCompiled(maxRetries = 5) {
   const dep = "speaker";
-  const basePath = dirname2(require2.resolve("./package.json"));
-  if (await verifyModuleLoad(dep)) {
-    return;
-  }
-  try {
-    require2.resolve(dep);
-    logger8.info("speaker found, rebuilding");
+  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);
-    execSync2("npm rebuild speaker", {
-      cwd: basePath,
-      stdio: "inherit"
-    });
-    logger8.info("speaker rebuilt, verifying...");
-  } catch {
-    logger8.info("speaker not found or rebuild failed, installing");
-    notificationService.info("\u6B63\u5728\u5B89\u88C5 speaker...", "Ocosay \u97F3\u9891\u540E\u7AEF", 5e3);
-  }
-  for (let attempt = 0; attempt < maxRetries; attempt++) {
+    try {
+      execSync2("npm rebuild speaker", {
+        cwd: opencodeNodeModules,
+        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;
     }
-    logger8.info({ attempt, dep }, "speaker not loadable, trying reinstall");
-    notificationService.info(`\u6B63\u5728\u91CD\u65B0\u5B89\u88C5 speaker (${attempt + 1}/${maxRetries})...`, "Ocosay", 3e3);
+  } 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,
+        cwd: opencodeNodeModules,
         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)) {
-      notificationService.success("speaker \u5B89\u88C5\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
+      notificationService.success("speaker \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
+      return;
+    }
+    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 speaker", {
+        cwd: opencodeNodeModules,
+        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;
     }
     if (attempt < maxRetries - 1) {
       await new Promise((resolve) => setTimeout(resolve, 1e3));
     }
   }
-  if (await verifyModuleLoad(dep)) {
-    notificationService.success("speaker \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
-  } else {
-    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);
-  }
+  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 ensurePlaySoundInstalled() {
   const dep = "play-sound";
-  const basePath = dirname2(require2.resolve("./package.json"));
-  if (await verifyModuleLoad(dep)) {
-    return;
+  if (isModuleInstalled(dep)) {
+    logger8.info("play-sound already installed");
+    if (await verifyModuleLoad(dep)) {
+      return;
+    }
   }
+  logger8.info("play-sound not found, installing");
   notificationService.info("\u6B63\u5728\u5B89\u88C5 play-sound...", "Ocosay \u97F3\u9891\u540E\u7AEF", 5e3);
   try {
     execSync2("npm install play-sound", {
-      cwd: basePath,
+      cwd: opencodeNodeModules,
       stdio: "inherit"
     });
     logger8.info("play-sound installed");

package/package.json

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