@mingxy/ocosay 1.1.4 → 1.1.6

package/dist/core/backends/naudiodon-backend.d.ts

@@ -1,31 +1,41 @@
 /**
  * Naudiodon Backend - 基于 PortAudio 的跨平台音频播放后端
  * 支持真正的流式播放（边收边播）
+ *
+ * 注意：naudiodon v2 API 变化：
+ * - v1: new naudiodon({sampleRate, channels, bitDepth})
+ * - v2: AudioIO({outOptions: {sampleRate, channelCount, sampleFormat}})
  */
 import { AudioBackend, BackendOptions } from './base';
-interface NaudiodonAudioOutput {
+interface IoStreamWrite {
     start(): void;
-    write(chunk: Buffer): void;
+    write(chunk: Buffer, callback?: (err?: Error) => void): void;
     end(): void;
-    quit(): void;
-    on(event: string, callback: (error: Error) => void): void;
+    quit(callback?: () => void): void;
+    on(event: 'error', callback: (error: Error) => void): void;
+    on(event: 'close', callback: () => void): void;
+}
+interface AudioOptions {
+    sampleRate?: number;
+    channelCount?: number;
+    sampleFormat?: number;
 }
-interface Naudiodon {
-    new (options: {
-        sampleRate?: number;
-        channels?: number;
-        bitDepth?: number;
-    }): NaudiodonAudioOutput;
+interface AudioIO {
+    (options: {
+        outOptions: AudioOptions;
+    }): IoStreamWrite;
 }
 declare global {
     interface NodeModule {
-        require(id: 'naudiodon'): Naudiodon;
+        require(id: 'naudiodon'): {
+            AudioIO: AudioIO;
+        };
     }
 }
 export declare class NaudiodonBackend implements AudioBackend {
     readonly name = "naudiodon";
     readonly supportsStreaming = true;
-    private audioOutput?;
+    private audioStream?;
     private events?;
     private _started;
     private _paused;

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

@@ -1,6 +1,10 @@
 /**
  * Naudiodon Backend - 基于 PortAudio 的跨平台音频播放后端
  * 支持真正的流式播放（边收边播）
+ *
+ * 注意：naudiodon v2 API 变化：
+ * - v1: new naudiodon({sampleRate, channels, bitDepth})
+ * - v2: AudioIO({outOptions: {sampleRate, channelCount, sampleFormat}})
  */
 class UnsupportedError extends Error {
     constructor(message) {
@@ -11,7 +15,7 @@ class UnsupportedError extends Error {
 export class NaudiodonBackend {
     name = 'naudiodon';
     supportsStreaming = true;
-    audioOutput;
+    audioStream;
     events;
     _started = false;
     _paused = false;
@@ -31,16 +35,17 @@ export class NaudiodonBackend {
             return;
         try {
             const naudiodon = require('naudiodon');
-            const AudioOutput = naudiodon;
-            this.audioOutput = new AudioOutput({
-                sampleRate: this.sampleRate,
-                channels: this.channels,
-                bitDepth: 16
+            this.audioStream = naudiodon.AudioIO({
+                outOptions: {
+                    sampleRate: this.sampleRate,
+                    channelCount: this.channels,
+                    sampleFormat: 16
+                }
             });
-            this.audioOutput.on('error', (error) => {
+            this.audioStream.on('error', (error) => {
                 this.handleError(error);
             });
-            this.audioOutput.start();
+            this.audioStream.start();
             this._started = true;
             this._stopped = false;
             this.events?.onStart?.();
@@ -55,16 +60,16 @@ export class NaudiodonBackend {
     write(chunk) {
         if (!this._started || this._stopped)
             return;
-        if (this.audioOutput) {
+        if (this.audioStream) {
             const adjustedChunk = this.adjustVolume(chunk);
-            this.audioOutput.write(adjustedChunk);
+            this.audioStream.write(adjustedChunk);
             this.bytesWritten += chunk.length;
             this.events?.onProgress?.(this.bytesWritten);
         }
     }
     end() {
-        if (this.audioOutput) {
-            this.audioOutput.end();
+        if (this.audioStream) {
+            this.audioStream.end();
         }
     }
     pause() {
@@ -82,14 +87,14 @@ export class NaudiodonBackend {
         this._stopped = true;
         this._started = false;
         this._paused = false;
-        if (this.audioOutput) {
+        if (this.audioStream) {
             try {
-                this.audioOutput.quit();
+                this.audioStream.quit();
             }
             catch (e) {
                 // 忽略退出错误
             }
-            this.audioOutput = undefined;
+            this.audioStream = undefined;
         }
         this.bytesWritten = 0;
         this.events?.onStop?.();

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mingxy/ocosay",
-"version": "1.1.4",
+"version": "1.1.6",
   "description": "OpenCode TTS 播放插件 - 支持豆包模式边接收边朗读",
   "type": "module",
   "main": "dist/plugin.js",
@@ -48,7 +48,7 @@
     "zod": "^4.3.6"
   },
   "optionalDependencies": {
-    "naudiodon": "^1.0.0"
+    "naudiodon": "^2.0.0"
   },
   "devDependencies": {
     "@types/howler": "^2.2.12",

package/dist/plugin.js

@@ -6750,7 +6750,7 @@ var UnsupportedError = class extends Error {
 var NaudiodonBackend = class {
   name = "naudiodon";
   supportsStreaming = true;
-  audioOutput;
+  audioStream;
   events;
   _started = false;
   _paused = false;
@@ -6769,16 +6769,17 @@ var NaudiodonBackend = class {
     if (this._started) return;
     try {
       const naudiodon = __require("naudiodon");
-      const AudioOutput = naudiodon;
-      this.audioOutput = new AudioOutput({
-        sampleRate: this.sampleRate,
-        channels: this.channels,
-        bitDepth: 16
+      this.audioStream = naudiodon.AudioIO({
+        outOptions: {
+          sampleRate: this.sampleRate,
+          channelCount: this.channels,
+          sampleFormat: 16
+        }
       });
-      this.audioOutput.on("error", (error) => {
+      this.audioStream.on("error", (error) => {
         this.handleError(error);
       });
-      this.audioOutput.start();
+      this.audioStream.start();
       this._started = true;
       this._stopped = false;
       this.events?.onStart?.();
@@ -6791,16 +6792,16 @@ var NaudiodonBackend = class {
   }
   write(chunk) {
     if (!this._started || this._stopped) return;
-    if (this.audioOutput) {
+    if (this.audioStream) {
       const adjustedChunk = this.adjustVolume(chunk);
-      this.audioOutput.write(adjustedChunk);
+      this.audioStream.write(adjustedChunk);
       this.bytesWritten += chunk.length;
       this.events?.onProgress?.(this.bytesWritten);
     }
   }
   end() {
-    if (this.audioOutput) {
-      this.audioOutput.end();
+    if (this.audioStream) {
+      this.audioStream.end();
     }
   }
   pause() {
@@ -6816,12 +6817,12 @@ var NaudiodonBackend = class {
     this._stopped = true;
     this._started = false;
     this._paused = false;
-    if (this.audioOutput) {
+    if (this.audioStream) {
       try {
-        this.audioOutput.quit();
+        this.audioStream.quit();
       } catch (e) {
       }
-      this.audioOutput = void 0;
+      this.audioStream = void 0;
     }
     this.bytesWritten = 0;
     this.events?.onStop?.();
@@ -9577,7 +9578,7 @@ function markNaudiodonSkipped() {
 }
 async function ensureNaudiodonCompiled() {
   if (shouldSkipNaudiodon()) {
-    logger7.info("naudiodon skipped previously, skipping compile attempt");
+    logger7.info("naudiodon skipped previously");
     return;
   }
   try {
@@ -9585,12 +9586,12 @@ async function ensureNaudiodonCompiled() {
     logger7.info("naudiodon already compiled");
     return;
   } catch {
-    logger7.info("naudiodon not compiled, attempting to compile...");
+    logger7.info("naudiodon not compiled, will attempt to compile");
+    notificationService.info("\u6B63\u5728\u7F16\u8BD1 naudiodon...", "Ocosay \u97F3\u9891\u540E\u7AEF");
   }
   try {
     const naudiodonPath = dirname2(require2.resolve("naudiodon"));
-    logger7.info({ naudiodonPath }, "found naudiodon at");
-    notificationService.info("\u6B63\u5728\u7F16\u8BD1 naudiodon...", "Ocosay \u97F3\u9891\u540E\u7AEF");
+    logger7.info({ naudiodonPath }, "found naudiodon, rebuilding");
     execSync("npm rebuild naudiodon", {
       cwd: naudiodonPath,
       stdio: "inherit"
@@ -9598,7 +9599,7 @@ async function ensureNaudiodonCompiled() {
     logger7.info("naudiodon compiled successfully");
     notificationService.success("naudiodon \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA");
   } catch (err) {
-    logger7.warn({ err }, "naudiodon rebuild failed, checking for PortAudio...");
+    logger7.warn({ err }, "naudiodon rebuild failed, checking for PortAudio");
     notificationService.warning("naudiodon \u7F16\u8BD1\u5931\u8D25", "\u6B63\u5728\u5C1D\u8BD5\u5B89\u88C5 PortAudio...");
     const installed = installPortAudio();
     if (installed) {
@@ -9612,12 +9613,13 @@ async function ensureNaudiodonCompiled() {
         logger7.info("naudiodon compiled successfully after PortAudio install");
         notificationService.success("naudiodon \u7F16\u8BD1\u6210\u529F", "\u97F3\u9891\u540E\u7AEF\u5DF2\u5C31\u7EEA");
       } catch (retryErr) {
-        logger7.error({ err: retryErr }, "failed to compile naudiodon even after PortAudio install");
-        notificationService.error("naudiodon \u7F16\u8BD1\u5931\u8D25", "\u5DF2\u8DF3\u8FC7\uFF0C\u4E4B\u540E\u4E0D\u518D\u91CD\u8BD5");
+        logger7.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");
         markNaudiodonSkipped();
       }
     } else {
-      notificationService.error("PortAudio \u5B89\u88C5\u5931\u8D25", "\u5DF2\u8DF3\u8FC7\uFF0C\u4E4B\u540E\u4E0D\u518D\u91CD\u8BD5");
+      logger7.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");
       markNaudiodonSkipped();
     }
   }
@@ -9771,7 +9773,6 @@ var server = (async (input, _options) => {
   const opencodeTui = input.client?.tui;
   global.__opencode_tui__ = opencodeTui;
   notificationService.setTui(opencodeTui);
-  await ensureNaudiodonCompiled();
   const config = loadOrCreateConfig();
   try {
     await initialize({
@@ -9788,6 +9789,7 @@ var server = (async (input, _options) => {
     initError = err instanceof Error ? err : new Error(String(err));
     logger7.error({ error: initError }, "initialization failed");
   }
+  await ensureNaudiodonCompiled();
   setTimeout(() => {
     if (initError) {
       notificationService.error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mingxy/ocosay",
-"version": "1.1.4",
+"version": "1.1.6",
   "description": "OpenCode TTS 播放插件 - 支持豆包模式边接收边朗读",
   "type": "module",
   "main": "dist/plugin.js",
@@ -48,7 +48,7 @@
     "zod": "^4.3.6"
   },
   "optionalDependencies": {
-    "naudiodon": "^1.0.0"
+    "naudiodon": "^2.0.0"
   },
   "devDependencies": {
     "@types/howler": "^2.2.12",