@mingxy/ocosay 1.1.10 → 1.1.12

package/dist/core/backends/index.d.ts

@@ -19,13 +19,6 @@ export declare enum BackendType {
     HOWLER = "howler",
     AUTO = "auto"
 }
-export declare function isWsl(): boolean;
-/**
- * 创建音频后端
- * @param type 后端类型，默认 AUTO（自动选择）
- * @param options 后端配置选项
- * @returns 音频后端实例
- */
 export declare function createBackend(type?: BackendType, options?: BackendOptions): AudioBackend;
 export declare function supportsStreaming(type: BackendType): boolean;
 export declare function getDefaultBackendType(): BackendType;

package/dist/core/backends/index.js

@@ -7,12 +7,25 @@ export { AfplayBackend } from './afplay-backend';
 export { AplayBackend } from './aplay-backend';
 export { PowerShellBackend } from './powershell-backend';
 export { HowlerBackend } from './howler-backend';
+import { execSync } from 'child_process';
 import { NaudiodonBackend } from './naudiodon-backend';
 import { AfplayBackend } from './afplay-backend';
 import { AplayBackend } from './aplay-backend';
 import { PowerShellBackend } from './powershell-backend';
 import { HowlerBackend } from './howler-backend';
 import { logger } from '../../utils/logger';
+function execCmd(cmd) {
+    try {
+        const output = execSync(cmd, { stdio: 'pipe', encoding: 'utf8' });
+        return { success: true, output };
+    }
+    catch (err) {
+        return { success: false, output: err.message || '' };
+    }
+}
+function isCommandAvailable(cmd) {
+    return execCmd(`which ${cmd}`).success;
+}
 /**
  * 后端类型枚举
  */
@@ -50,22 +63,6 @@ function isNaudiodonAvailable() {
         return false;
     }
 }
-export function isWsl() {
-    if (process.platform !== 'linux')
-        return false;
-    try {
-        return require('fs').readFileSync('/proc/version', 'utf8').toLowerCase().includes('microsoft');
-    }
-    catch {
-        return false;
-    }
-}
-/**
- * 创建音频后端
- * @param type 后端类型，默认 AUTO（自动选择）
- * @param options 后端配置选项
- * @returns 音频后端实例
- */
 export function createBackend(type = BackendType.AUTO, options = {}) {
     const platform = process.platform;
     if (type !== BackendType.AUTO) {
@@ -90,10 +87,13 @@ export function createBackend(type = BackendType.AUTO, options = {}) {
         case 'darwin':
             return new AfplayBackend(options);
         case 'linux':
-            if (isWsl()) {
-                return new PowerShellBackend(options);
+            if (isCommandAvailable('aplay')) {
+                const test = execCmd('aplay -l');
+                if (test.success && !test.output.includes('no soundcards')) {
+                    return new AplayBackend(options);
+                }
             }
-            return new AplayBackend(options);
+            return new HowlerBackend(options);
         case 'win32':
             return new PowerShellBackend(options);
         default:

package/dist/core/backends/powershell-backend.js

@@ -6,7 +6,16 @@ import { spawn } from 'child_process';
 import { tmpdir } from 'os';
 import { join } from 'path';
 import { writeFileSync, unlinkSync, existsSync } from 'fs';
-import { isWsl } from './index';
+function isWsl() {
+    if (process.platform !== 'linux')
+        return false;
+    try {
+        return require('fs').readFileSync('/proc/version', 'utf8').toLowerCase().includes('microsoft');
+    }
+    catch {
+        return false;
+    }
+}
 // 白名单：Windows/WSL 路径格式（禁止 - 防止命令注入）
 // 允许: 字母数字 \w, Windows盘符 : \:, 反斜杠 \\, 下划线 _, 点 ., $ @ /, 以及 -
 const SAFE_PATH_REGEX = /^[\w\:\\_.\-$@\/]+$/i;

package/dist/package.json

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

package/dist/plugin.js

@@ -7156,6 +7156,14 @@ import { spawn } from "child_process";
 import { tmpdir as tmpdir3 } from "os";
 import { join as join4 } from "path";
 import { writeFileSync as writeFileSync3, unlinkSync as unlinkSync3, existsSync as existsSync4 } from "fs";
+function isWsl() {
+  if (process.platform !== "linux") return false;
+  try {
+    return __require("fs").readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft");
+  } catch {
+    return false;
+  }
+}
 var SAFE_PATH_REGEX3 = /^[\w\:\\_.\-$@\/]+$/i;
 function wslPathToWindows(wslPath) {
   if (wslPath.startsWith("//wsl$/")) {
@@ -7459,6 +7467,18 @@ var HowlerBackend = class {
 };
 
 // src/core/backends/index.ts
+import { execSync } from "child_process";
+function execCmd(cmd) {
+  try {
+    const output = execSync(cmd, { stdio: "pipe", encoding: "utf8" });
+    return { success: true, output };
+  } catch (err) {
+    return { success: false, output: err.message || "" };
+  }
+}
+function isCommandAvailable(cmd) {
+  return execCmd(`which ${cmd}`).success;
+}
 function isNaudiodonAvailable() {
   try {
     __require.resolve("naudiodon");
@@ -7468,14 +7488,6 @@ function isNaudiodonAvailable() {
     return false;
   }
 }
-function isWsl() {
-  if (process.platform !== "linux") return false;
-  try {
-    return __require("fs").readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft");
-  } catch {
-    return false;
-  }
-}
 function createBackend(type = "auto" /* AUTO */, options = {}) {
   const platform = process.platform;
   if (type !== "auto" /* AUTO */) {
@@ -7499,10 +7511,13 @@ function createBackend(type = "auto" /* AUTO */, options = {}) {
     case "darwin":
       return new AfplayBackend(options);
     case "linux":
-      if (isWsl()) {
-        return new PowerShellBackend(options);
+      if (isCommandAvailable("aplay")) {
+        const test = execCmd("aplay -l");
+        if (test.success && !test.output.includes("no soundcards")) {
+          return new AplayBackend(options);
+        }
       }
-      return new AplayBackend(options);
+      return new HowlerBackend(options);
     case "win32":
       return new PowerShellBackend(options);
     default:
@@ -9567,7 +9582,7 @@ import { readFileSync as readFileSync2, existsSync as existsSync6, writeFileSync
 import { fileURLToPath } from "url";
 import { dirname as dirname2, join as join7 } from "path";
 import { homedir as homedir3 } from "os";
-import { execSync } from "child_process";
+import { execSync as execSync2 } from "child_process";
 import { createRequire } from "module";
 var logger8 = createModuleLogger("Plugin");
 var require2 = createRequire(import.meta.url);
@@ -9581,12 +9596,89 @@ function markNaudiodonSkipped() {
   try {
     const dir = join7(homedir3(), ".config", "opencode");
     if (!existsSync6(dir)) {
-      execSync("mkdir -p", { cwd: dir });
+      execSync2("mkdir -p", { cwd: dir });
     }
     writeFileSync5(getSkipFilePath(), Date.now().toString(), "utf-8");
   } 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);
+    execSync2(`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);
+          execSync2(`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);
+        execSync2("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");
@@ -9603,12 +9695,23 @@ async function ensureNaudiodonCompiled() {
   try {
     const naudiodonPath = dirname2(require2.resolve("naudiodon"));
     logger8.info({ naudiodonPath }, "found naudiodon, rebuilding");
-    execSync("npm rebuild naudiodon", {
+    execSync2("npm rebuild naudiodon", {
       cwd: naudiodonPath,
       stdio: "inherit"
     });
-    logger8.info("naudiodon compiled successfully");
-    notificationService.success("naudiodon \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA", 5e3);
+    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...", 5e3);
@@ -9617,12 +9720,23 @@ async function ensureNaudiodonCompiled() {
       try {
         const naudiodonPath = dirname2(require2.resolve("naudiodon"));
         notificationService.info("\u6B63\u5728\u91CD\u65B0\u7F16\u8BD1 naudiodon...", "Ocosay", 5e3);
-        execSync("npm rebuild naudiodon", {
+        execSync2("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", 5e3);
+        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", 8e3);
@@ -9635,9 +9749,9 @@ async function ensureNaudiodonCompiled() {
     }
   }
 }
-function execCmd(cmd) {
+function execCmd2(cmd) {
   try {
-    const output = execSync(cmd, { stdio: "pipe", encoding: "utf8" });
+    const output = execSync2(cmd, { stdio: "pipe", encoding: "utf8" });
     return { success: true, output };
   } catch (err) {
     return { success: false, output: err.message || "" };
@@ -9652,9 +9766,9 @@ function isWsl2() {
   }
 }
 function checkAlsa() {
-  const result = execCmd("which aplay");
+  const result = execCmd2("which aplay");
   if (!result.success) return false;
-  const test = execCmd("aplay -l");
+  const test = execCmd2("aplay -l");
   return test.success && !test.output.includes("no soundcards");
 }
 async function installPortAudio() {
@@ -9665,7 +9779,7 @@ async function installPortAudio() {
     logger8.info(`Running: ${cmd}`);
     notificationService.info(desc, "\u6B63\u5728\u5B89\u88C5...", 5e3);
     try {
-      execSync(cmd, { stdio: "inherit" });
+      execSync2(cmd, { stdio: "inherit" });
       return true;
     } catch (err) {
       const msg = err.message || "";

package/package.json

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