@livekit/rtc-node 0.13.10 → 0.13.12

package/dist/audio_filter.cjs

@@ -0,0 +1,48 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var audio_filter_exports = {};
+__export(audio_filter_exports, {
+  AudioFilter: () => AudioFilter
+});
+module.exports = __toCommonJS(audio_filter_exports);
+var import_ffi_client = require("./ffi_client.cjs");
+var import_audio_frame_pb = require("./proto/audio_frame_pb.cjs");
+class AudioFilter {
+  constructor(moduleId, path, dependencies = []) {
+    const req = new import_audio_frame_pb.LoadAudioFilterPluginRequest({
+      moduleId,
+      pluginPath: path,
+      dependencies
+    });
+    const res = import_ffi_client.FfiClient.instance.request({
+      message: {
+        case: "loadAudioFilterPlugin",
+        value: req
+      }
+    });
+    if (res.error) {
+      throw new Error(`Failed to initialize audio filter: ${res.error}`);
+    }
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AudioFilter
+});
+//# sourceMappingURL=audio_filter.cjs.map

package/dist/audio_filter.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/audio_filter.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport { FfiClient } from './ffi_client.js';\nimport type { LoadAudioFilterPluginResponse } from './proto/audio_frame_pb.js';\nimport { LoadAudioFilterPluginRequest } from './proto/audio_frame_pb.js';\n\nexport class AudioFilter {\n  constructor(moduleId: string, path: string, dependencies: string[] = []) {\n    const req = new LoadAudioFilterPluginRequest({\n      moduleId,\n      pluginPath: path,\n      dependencies,\n    });\n\n    const res = FfiClient.instance.request<LoadAudioFilterPluginResponse>({\n      message: {\n        case: 'loadAudioFilterPlugin',\n        value: req,\n      },\n    });\n\n    if (res.error) {\n      throw new Error(`Failed to initialize audio filter: ${res.error}`);\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,wBAA0B;AAE1B,4BAA6C;AAEtC,MAAM,YAAY;AAAA,EACvB,YAAY,UAAkB,MAAc,eAAyB,CAAC,GAAG;AACvE,UAAM,MAAM,IAAI,mDAA6B;AAAA,MAC3C;AAAA,MACA,YAAY;AAAA,MACZ;AAAA,IACF,CAAC;AAED,UAAM,MAAM,4BAAU,SAAS,QAAuC;AAAA,MACpE,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,QAAI,IAAI,OAAO;AACb,YAAM,IAAI,MAAM,sCAAsC,IAAI,KAAK,EAAE;AAAA,IACnE;AAAA,EACF;AACF;","names":[]}

package/dist/audio_filter.d.cts

@@ -0,0 +1,5 @@
+declare class AudioFilter {
+    constructor(moduleId: string, path: string, dependencies?: string[]);
+}
+
+export { AudioFilter };

package/dist/audio_filter.d.ts

@@ -0,0 +1,5 @@
+declare class AudioFilter {
+    constructor(moduleId: string, path: string, dependencies?: string[]);
+}
+
+export { AudioFilter };

package/dist/audio_filter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"audio_filter.d.ts","sourceRoot":"","sources":["../src/audio_filter.ts"],"names":[],"mappings":"AAOA,qBAAa,WAAW;gBACV,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,GAAE,MAAM,EAAO;CAkBxE"}

package/dist/audio_filter.js

@@ -0,0 +1,24 @@
+import { FfiClient } from "./ffi_client.js";
+import { LoadAudioFilterPluginRequest } from "./proto/audio_frame_pb.js";
+class AudioFilter {
+  constructor(moduleId, path, dependencies = []) {
+    const req = new LoadAudioFilterPluginRequest({
+      moduleId,
+      pluginPath: path,
+      dependencies
+    });
+    const res = FfiClient.instance.request({
+      message: {
+        case: "loadAudioFilterPlugin",
+        value: req
+      }
+    });
+    if (res.error) {
+      throw new Error(`Failed to initialize audio filter: ${res.error}`);
+    }
+  }
+}
+export {
+  AudioFilter
+};
+//# sourceMappingURL=audio_filter.js.map

package/dist/audio_filter.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/audio_filter.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport { FfiClient } from './ffi_client.js';\nimport type { LoadAudioFilterPluginResponse } from './proto/audio_frame_pb.js';\nimport { LoadAudioFilterPluginRequest } from './proto/audio_frame_pb.js';\n\nexport class AudioFilter {\n  constructor(moduleId: string, path: string, dependencies: string[] = []) {\n    const req = new LoadAudioFilterPluginRequest({\n      moduleId,\n      pluginPath: path,\n      dependencies,\n    });\n\n    const res = FfiClient.instance.request<LoadAudioFilterPluginResponse>({\n      message: {\n        case: 'loadAudioFilterPlugin',\n        value: req,\n      },\n    });\n\n    if (res.error) {\n      throw new Error(`Failed to initialize audio filter: ${res.error}`);\n    }\n  }\n}\n"],"mappings":"AAGA,SAAS,iBAAiB;AAE1B,SAAS,oCAAoC;AAEtC,MAAM,YAAY;AAAA,EACvB,YAAY,UAAkB,MAAc,eAAyB,CAAC,GAAG;AACvE,UAAM,MAAM,IAAI,6BAA6B;AAAA,MAC3C;AAAA,MACA,YAAY;AAAA,MACZ;AAAA,IACF,CAAC;AAED,UAAM,MAAM,UAAU,SAAS,QAAuC;AAAA,MACpE,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,QAAI,IAAI,OAAO;AACb,YAAM,IAAI,MAAM,sCAAsC,IAAI,KAAK,EAAE;AAAA,IACnE;AAAA,EACF;AACF;","names":[]}

package/dist/audio_source.cjs

@@ -83,12 +83,16 @@ class AudioSource {
       this.lastCapture = 0;
       this.currentQueueSize = 0;
       this.promise = this.newPromise();
+      this.timeout = void 0;
     });
   }
   async captureFrame(frame) {
     if (this.closed) {
       throw new Error("AudioSource is closed");
     }
+    if (frame.samplesPerChannel === 0) {
+      return;
+    }
     const now = Number(process.hrtime.bigint() / BigInt(1e6));
     const elapsed = this.lastCapture === 0 ? 0 : now - this.lastCapture;
     const frameDurationMs = frame.samplesPerChannel / frame.sampleRate * 1e3;
@@ -97,7 +101,7 @@ class AudioSource {
     if (this.timeout) {
       clearTimeout(this.timeout);
     }
-    this.timeout = setTimeout(this.release, this.currentQueueSize - 50);
+    this.timeout = setTimeout(this.release, this.currentQueueSize);
     const req = new import_audio_frame_pb.CaptureAudioFrameRequest({
       sourceHandle: this.ffiHandle.handle,
       buffer: frame.protoInfo()

package/dist/audio_source.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/audio_source.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { AudioFrame } from './audio_frame.js';\nimport { FfiClient } from './ffi_client.js';\nimport { FfiHandle } from './napi/native.js';\nimport type {\n  AudioSourceInfo,\n  CaptureAudioFrameCallback,\n  CaptureAudioFrameResponse,\n  ClearAudioBufferResponse,\n  NewAudioSourceResponse,\n} from './proto/audio_frame_pb.js';\nimport {\n  AudioSourceType,\n  CaptureAudioFrameRequest,\n  ClearAudioBufferRequest,\n  NewAudioSourceRequest,\n} from './proto/audio_frame_pb.js';\n\nexport class AudioSource {\n  /** @internal */\n  info: AudioSourceInfo;\n  /** @internal */\n  ffiHandle: FfiHandle;\n  /** @internal */\n  lastCapture: number;\n  /** @internal */\n  currentQueueSize: number;\n  /** @internal */\n  release = () => {};\n  promise = this.newPromise();\n  /** @internal */\n  timeout?: ReturnType<typeof setTimeout> = undefined;\n  /** @internal */\n  closed = false;\n\n  sampleRate: number;\n  numChannels: number;\n  queueSize: number;\n\n  constructor(sampleRate: number, numChannels: number, queueSize = 1000) {\n    this.sampleRate = sampleRate;\n    this.numChannels = numChannels;\n    this.queueSize = queueSize;\n\n    this.lastCapture = 0;\n    this.currentQueueSize = 0;\n\n    const req = new NewAudioSourceRequest({\n      type: AudioSourceType.AUDIO_SOURCE_NATIVE,\n      sampleRate: sampleRate,\n      numChannels: numChannels,\n      queueSizeMs: queueSize,\n    });\n\n    const res = FfiClient.instance.request<NewAudioSourceResponse>({\n      message: {\n        case: 'newAudioSource',\n        value: req,\n      },\n    });\n\n    this.info = res.source!.info!;\n    this.ffiHandle = new FfiHandle(res.source!.handle!.id!);\n  }\n\n  get queuedDuration(): number {\n    return Math.max(\n      this.currentQueueSize - Number(process.hrtime.bigint() / BigInt(1000000)) + this.lastCapture,\n      0,\n    );\n  }\n\n  clearQueue() {\n    const req = new ClearAudioBufferRequest({\n      sourceHandle: this.ffiHandle.handle,\n    });\n\n    FfiClient.instance.request<ClearAudioBufferResponse>({\n      message: {\n        case: 'clearAudioBuffer',\n        value: req,\n      },\n    });\n\n    this.release();\n  }\n\n  /** @internal */\n  async newPromise() {\n    return new Promise<void>((resolve) => {\n      this.release = resolve;\n    });\n  }\n\n  async waitForPlayout() {\n    return this.promise.then(() => {\n      this.lastCapture = 0;\n      this.currentQueueSize = 0;\n      this.promise = this.newPromise();\n    });\n  }\n\n  async captureFrame(frame: AudioFrame) {\n    if (this.closed) {\n      throw new Error('AudioSource is closed');\n    }\n    const now = Number(process.hrtime.bigint() / BigInt(1000000));\n    const elapsed = this.lastCapture === 0 ? 0 : now - this.lastCapture;\n    const frameDurationMs = (frame.samplesPerChannel / frame.sampleRate) * 1000;\n    this.currentQueueSize += frameDurationMs - elapsed;\n\n    this.lastCapture = now;\n\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    // remove 50ms to account for processing time\n    // (e.g. using wait_for_playout for very small chunks)\n    this.timeout = setTimeout(this.release, this.currentQueueSize - 50);\n\n    const req = new CaptureAudioFrameRequest({\n      sourceHandle: this.ffiHandle.handle,\n      buffer: frame.protoInfo(),\n    });\n\n    const res = FfiClient.instance.request<CaptureAudioFrameResponse>({\n      message: { case: 'captureAudioFrame', value: req },\n    });\n\n    const cb = await FfiClient.instance.waitFor<CaptureAudioFrameCallback>((ev) => {\n      return ev.message.case == 'captureAudioFrame' && ev.message.value.asyncId == res.asyncId;\n    });\n\n    if (cb.error) {\n      throw new Error(cb.error);\n    }\n  }\n\n  async close() {\n    this.ffiHandle.dispose();\n    this.closed = true;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,wBAA0B;AAC1B,oBAA0B;AAQ1B,4BAKO;AAEA,MAAM,YAAY;AAAA,EAqBvB,YAAY,YAAoB,aAAqB,YAAY,KAAM;AAXvE;AAAA,mBAAU,MAAM;AAAA,IAAC;AACjB,mBAAU,KAAK,WAAW;AAE1B;AAAA,mBAA0C;AAE1C;AAAA,kBAAS;AAOP,SAAK,aAAa;AAClB,SAAK,cAAc;AACnB,SAAK,YAAY;AAEjB,SAAK,cAAc;AACnB,SAAK,mBAAmB;AAExB,UAAM,MAAM,IAAI,4CAAsB;AAAA,MACpC,MAAM,sCAAgB;AAAA,MACtB;AAAA,MACA;AAAA,MACA,aAAa;AAAA,IACf,CAAC;AAED,UAAM,MAAM,4BAAU,SAAS,QAAgC;AAAA,MAC7D,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,OAAO,IAAI,OAAQ;AACxB,SAAK,YAAY,IAAI,wBAAU,IAAI,OAAQ,OAAQ,EAAG;AAAA,EACxD;AAAA,EAEA,IAAI,iBAAyB;AAC3B,WAAO,KAAK;AAAA,MACV,KAAK,mBAAmB,OAAO,QAAQ,OAAO,OAAO,IAAI,OAAO,GAAO,CAAC,IAAI,KAAK;AAAA,MACjF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,aAAa;AACX,UAAM,MAAM,IAAI,8CAAwB;AAAA,MACtC,cAAc,KAAK,UAAU;AAAA,IAC/B,CAAC;AAED,gCAAU,SAAS,QAAkC;AAAA,MACnD,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,QAAQ;AAAA,EACf;AAAA;AAAA,EAGA,MAAM,aAAa;AACjB,WAAO,IAAI,QAAc,CAAC,YAAY;AACpC,WAAK,UAAU;AAAA,IACjB,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,iBAAiB;AACrB,WAAO,KAAK,QAAQ,KAAK,MAAM;AAC7B,WAAK,cAAc;AACnB,WAAK,mBAAmB;AACxB,WAAK,UAAU,KAAK,WAAW;AAAA,IACjC,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,aAAa,OAAmB;AACpC,QAAI,KAAK,QAAQ;AACf,YAAM,IAAI,MAAM,uBAAuB;AAAA,IACzC;AACA,UAAM,MAAM,OAAO,QAAQ,OAAO,OAAO,IAAI,OAAO,GAAO,CAAC;AAC5D,UAAM,UAAU,KAAK,gBAAgB,IAAI,IAAI,MAAM,KAAK;AACxD,UAAM,kBAAmB,MAAM,oBAAoB,MAAM,aAAc;AACvE,SAAK,oBAAoB,kBAAkB;AAE3C,SAAK,cAAc;AAEnB,QAAI,KAAK,SAAS;AAChB,mBAAa,KAAK,OAAO;AAAA,IAC3B;AAIA,SAAK,UAAU,WAAW,KAAK,SAAS,KAAK,mBAAmB,EAAE;AAElE,UAAM,MAAM,IAAI,+CAAyB;AAAA,MACvC,cAAc,KAAK,UAAU;AAAA,MAC7B,QAAQ,MAAM,UAAU;AAAA,IAC1B,CAAC;AAED,UAAM,MAAM,4BAAU,SAAS,QAAmC;AAAA,MAChE,SAAS,EAAE,MAAM,qBAAqB,OAAO,IAAI;AAAA,IACnD,CAAC;AAED,UAAM,KAAK,MAAM,4BAAU,SAAS,QAAmC,CAAC,OAAO;AAC7E,aAAO,GAAG,QAAQ,QAAQ,uBAAuB,GAAG,QAAQ,MAAM,WAAW,IAAI;AAAA,IACnF,CAAC;AAED,QAAI,GAAG,OAAO;AACZ,YAAM,IAAI,MAAM,GAAG,KAAK;AAAA,IAC1B;AAAA,EACF;AAAA,EAEA,MAAM,QAAQ;AACZ,SAAK,UAAU,QAAQ;AACvB,SAAK,SAAS;AAAA,EAChB;AACF;","names":[]}
+{"version":3,"sources":["../src/audio_source.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { AudioFrame } from './audio_frame.js';\nimport { FfiClient } from './ffi_client.js';\nimport { FfiHandle } from './napi/native.js';\nimport type {\n  AudioSourceInfo,\n  CaptureAudioFrameCallback,\n  CaptureAudioFrameResponse,\n  ClearAudioBufferResponse,\n  NewAudioSourceResponse,\n} from './proto/audio_frame_pb.js';\nimport {\n  AudioSourceType,\n  CaptureAudioFrameRequest,\n  ClearAudioBufferRequest,\n  NewAudioSourceRequest,\n} from './proto/audio_frame_pb.js';\n\nexport class AudioSource {\n  /** @internal */\n  info: AudioSourceInfo;\n  /** @internal */\n  ffiHandle: FfiHandle;\n  /** @internal */\n  lastCapture: number;\n  /** @internal */\n  currentQueueSize: number;\n  /** @internal */\n  release = () => {};\n  promise = this.newPromise();\n  /** @internal */\n  timeout?: ReturnType<typeof setTimeout> = undefined;\n  /** @internal */\n  closed = false;\n\n  sampleRate: number;\n  numChannels: number;\n  queueSize: number;\n\n  constructor(sampleRate: number, numChannels: number, queueSize = 1000) {\n    this.sampleRate = sampleRate;\n    this.numChannels = numChannels;\n    this.queueSize = queueSize;\n\n    this.lastCapture = 0;\n    this.currentQueueSize = 0;\n\n    const req = new NewAudioSourceRequest({\n      type: AudioSourceType.AUDIO_SOURCE_NATIVE,\n      sampleRate: sampleRate,\n      numChannels: numChannels,\n      queueSizeMs: queueSize,\n    });\n\n    const res = FfiClient.instance.request<NewAudioSourceResponse>({\n      message: {\n        case: 'newAudioSource',\n        value: req,\n      },\n    });\n\n    this.info = res.source!.info!;\n    this.ffiHandle = new FfiHandle(res.source!.handle!.id!);\n  }\n\n  get queuedDuration(): number {\n    return Math.max(\n      this.currentQueueSize - Number(process.hrtime.bigint() / BigInt(1000000)) + this.lastCapture,\n      0,\n    );\n  }\n\n  clearQueue() {\n    const req = new ClearAudioBufferRequest({\n      sourceHandle: this.ffiHandle.handle,\n    });\n\n    FfiClient.instance.request<ClearAudioBufferResponse>({\n      message: {\n        case: 'clearAudioBuffer',\n        value: req,\n      },\n    });\n\n    this.release();\n  }\n\n  /** @internal */\n  async newPromise() {\n    return new Promise<void>((resolve) => {\n      this.release = resolve;\n    });\n  }\n\n  async waitForPlayout() {\n    return this.promise.then(() => {\n      this.lastCapture = 0;\n      this.currentQueueSize = 0;\n      this.promise = this.newPromise();\n      this.timeout = undefined;\n    });\n  }\n\n  async captureFrame(frame: AudioFrame) {\n    if (this.closed) {\n      throw new Error('AudioSource is closed');\n    }\n\n    if (frame.samplesPerChannel === 0) {\n      return;\n    }\n\n    const now = Number(process.hrtime.bigint() / BigInt(1000000));\n    const elapsed = this.lastCapture === 0 ? 0 : now - this.lastCapture;\n    const frameDurationMs = (frame.samplesPerChannel / frame.sampleRate) * 1000;\n    this.currentQueueSize += frameDurationMs - elapsed;\n\n    this.lastCapture = now;\n\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    this.timeout = setTimeout(this.release, this.currentQueueSize);\n\n    const req = new CaptureAudioFrameRequest({\n      sourceHandle: this.ffiHandle.handle,\n      buffer: frame.protoInfo(),\n    });\n\n    const res = FfiClient.instance.request<CaptureAudioFrameResponse>({\n      message: { case: 'captureAudioFrame', value: req },\n    });\n\n    const cb = await FfiClient.instance.waitFor<CaptureAudioFrameCallback>((ev) => {\n      return ev.message.case == 'captureAudioFrame' && ev.message.value.asyncId == res.asyncId;\n    });\n\n    if (cb.error) {\n      throw new Error(cb.error);\n    }\n  }\n\n  async close() {\n    this.ffiHandle.dispose();\n    this.closed = true;\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/audio_source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audio_source.d.ts","sourceRoot":"","sources":["../src/audio_source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EACV,eAAe,EAKhB,MAAM,2BAA2B,CAAC;AAQnC,qBAAa,WAAW;IACtB,gBAAgB;IAChB,IAAI,EAAE,eAAe,CAAC;IACtB,gBAAgB;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB;IAChB,OAAO,aAAY;IACnB,OAAO,gBAAqB;IAC5B,gBAAgB;IAChB,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAa;IACpD,gBAAgB;IAChB,MAAM,UAAS;IAEf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;gBAEN,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,SAAO;IA0BrE,IAAI,cAAc,IAAI,MAAM,CAK3B;IAED,UAAU;IAeV,gBAAgB;IACV,UAAU;IAMV,cAAc;IAQd,YAAY,CAAC,KAAK,EAAE,UAAU;IAqC9B,KAAK;CAIZ"}
+{"version":3,"file":"audio_source.d.ts","sourceRoot":"","sources":["../src/audio_source.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EACV,eAAe,EAKhB,MAAM,2BAA2B,CAAC;AAQnC,qBAAa,WAAW;IACtB,gBAAgB;IAChB,IAAI,EAAE,eAAe,CAAC;IACtB,gBAAgB;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB;IAChB,OAAO,aAAY;IACnB,OAAO,gBAAqB;IAC5B,gBAAgB;IAChB,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAa;IACpD,gBAAgB;IAChB,MAAM,UAAS;IAEf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;gBAEN,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,SAAO;IA0BrE,IAAI,cAAc,IAAI,MAAM,CAK3B;IAED,UAAU;IAeV,gBAAgB;IACV,UAAU;IAMV,cAAc;IASd,YAAY,CAAC,KAAK,EAAE,UAAU;IAwC9B,KAAK;CAIZ"}

package/dist/audio_source.js

@@ -65,12 +65,16 @@ class AudioSource {
       this.lastCapture = 0;
       this.currentQueueSize = 0;
       this.promise = this.newPromise();
+      this.timeout = void 0;
     });
   }
   async captureFrame(frame) {
     if (this.closed) {
       throw new Error("AudioSource is closed");
     }
+    if (frame.samplesPerChannel === 0) {
+      return;
+    }
     const now = Number(process.hrtime.bigint() / BigInt(1e6));
     const elapsed = this.lastCapture === 0 ? 0 : now - this.lastCapture;
     const frameDurationMs = frame.samplesPerChannel / frame.sampleRate * 1e3;
@@ -79,7 +83,7 @@ class AudioSource {
     if (this.timeout) {
       clearTimeout(this.timeout);
     }
-    this.timeout = setTimeout(this.release, this.currentQueueSize - 50);
+    this.timeout = setTimeout(this.release, this.currentQueueSize);
     const req = new CaptureAudioFrameRequest({
       sourceHandle: this.ffiHandle.handle,
       buffer: frame.protoInfo()

package/dist/audio_source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/audio_source.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { AudioFrame } from './audio_frame.js';\nimport { FfiClient } from './ffi_client.js';\nimport { FfiHandle } from './napi/native.js';\nimport type {\n  AudioSourceInfo,\n  CaptureAudioFrameCallback,\n  CaptureAudioFrameResponse,\n  ClearAudioBufferResponse,\n  NewAudioSourceResponse,\n} from './proto/audio_frame_pb.js';\nimport {\n  AudioSourceType,\n  CaptureAudioFrameRequest,\n  ClearAudioBufferRequest,\n  NewAudioSourceRequest,\n} from './proto/audio_frame_pb.js';\n\nexport class AudioSource {\n  /** @internal */\n  info: AudioSourceInfo;\n  /** @internal */\n  ffiHandle: FfiHandle;\n  /** @internal */\n  lastCapture: number;\n  /** @internal */\n  currentQueueSize: number;\n  /** @internal */\n  release = () => {};\n  promise = this.newPromise();\n  /** @internal */\n  timeout?: ReturnType<typeof setTimeout> = undefined;\n  /** @internal */\n  closed = false;\n\n  sampleRate: number;\n  numChannels: number;\n  queueSize: number;\n\n  constructor(sampleRate: number, numChannels: number, queueSize = 1000) {\n    this.sampleRate = sampleRate;\n    this.numChannels = numChannels;\n    this.queueSize = queueSize;\n\n    this.lastCapture = 0;\n    this.currentQueueSize = 0;\n\n    const req = new NewAudioSourceRequest({\n      type: AudioSourceType.AUDIO_SOURCE_NATIVE,\n      sampleRate: sampleRate,\n      numChannels: numChannels,\n      queueSizeMs: queueSize,\n    });\n\n    const res = FfiClient.instance.request<NewAudioSourceResponse>({\n      message: {\n        case: 'newAudioSource',\n        value: req,\n      },\n    });\n\n    this.info = res.source!.info!;\n    this.ffiHandle = new FfiHandle(res.source!.handle!.id!);\n  }\n\n  get queuedDuration(): number {\n    return Math.max(\n      this.currentQueueSize - Number(process.hrtime.bigint() / BigInt(1000000)) + this.lastCapture,\n      0,\n    );\n  }\n\n  clearQueue() {\n    const req = new ClearAudioBufferRequest({\n      sourceHandle: this.ffiHandle.handle,\n    });\n\n    FfiClient.instance.request<ClearAudioBufferResponse>({\n      message: {\n        case: 'clearAudioBuffer',\n        value: req,\n      },\n    });\n\n    this.release();\n  }\n\n  /** @internal */\n  async newPromise() {\n    return new Promise<void>((resolve) => {\n      this.release = resolve;\n    });\n  }\n\n  async waitForPlayout() {\n    return this.promise.then(() => {\n      this.lastCapture = 0;\n      this.currentQueueSize = 0;\n      this.promise = this.newPromise();\n    });\n  }\n\n  async captureFrame(frame: AudioFrame) {\n    if (this.closed) {\n      throw new Error('AudioSource is closed');\n    }\n    const now = Number(process.hrtime.bigint() / BigInt(1000000));\n    const elapsed = this.lastCapture === 0 ? 0 : now - this.lastCapture;\n    const frameDurationMs = (frame.samplesPerChannel / frame.sampleRate) * 1000;\n    this.currentQueueSize += frameDurationMs - elapsed;\n\n    this.lastCapture = now;\n\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    // remove 50ms to account for processing time\n    // (e.g. using wait_for_playout for very small chunks)\n    this.timeout = setTimeout(this.release, this.currentQueueSize - 50);\n\n    const req = new CaptureAudioFrameRequest({\n      sourceHandle: this.ffiHandle.handle,\n      buffer: frame.protoInfo(),\n    });\n\n    const res = FfiClient.instance.request<CaptureAudioFrameResponse>({\n      message: { case: 'captureAudioFrame', value: req },\n    });\n\n    const cb = await FfiClient.instance.waitFor<CaptureAudioFrameCallback>((ev) => {\n      return ev.message.case == 'captureAudioFrame' && ev.message.value.asyncId == res.asyncId;\n    });\n\n    if (cb.error) {\n      throw new Error(cb.error);\n    }\n  }\n\n  async close() {\n    this.ffiHandle.dispose();\n    this.closed = true;\n  }\n}\n"],"mappings":"AAIA,SAAS,iBAAiB;AAC1B,SAAS,iBAAiB;AAQ1B;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEA,MAAM,YAAY;AAAA,EAqBvB,YAAY,YAAoB,aAAqB,YAAY,KAAM;AAXvE;AAAA,mBAAU,MAAM;AAAA,IAAC;AACjB,mBAAU,KAAK,WAAW;AAE1B;AAAA,mBAA0C;AAE1C;AAAA,kBAAS;AAOP,SAAK,aAAa;AAClB,SAAK,cAAc;AACnB,SAAK,YAAY;AAEjB,SAAK,cAAc;AACnB,SAAK,mBAAmB;AAExB,UAAM,MAAM,IAAI,sBAAsB;AAAA,MACpC,MAAM,gBAAgB;AAAA,MACtB;AAAA,MACA;AAAA,MACA,aAAa;AAAA,IACf,CAAC;AAED,UAAM,MAAM,UAAU,SAAS,QAAgC;AAAA,MAC7D,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,OAAO,IAAI,OAAQ;AACxB,SAAK,YAAY,IAAI,UAAU,IAAI,OAAQ,OAAQ,EAAG;AAAA,EACxD;AAAA,EAEA,IAAI,iBAAyB;AAC3B,WAAO,KAAK;AAAA,MACV,KAAK,mBAAmB,OAAO,QAAQ,OAAO,OAAO,IAAI,OAAO,GAAO,CAAC,IAAI,KAAK;AAAA,MACjF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,aAAa;AACX,UAAM,MAAM,IAAI,wBAAwB;AAAA,MACtC,cAAc,KAAK,UAAU;AAAA,IAC/B,CAAC;AAED,cAAU,SAAS,QAAkC;AAAA,MACnD,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,QAAQ;AAAA,EACf;AAAA;AAAA,EAGA,MAAM,aAAa;AACjB,WAAO,IAAI,QAAc,CAAC,YAAY;AACpC,WAAK,UAAU;AAAA,IACjB,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,iBAAiB;AACrB,WAAO,KAAK,QAAQ,KAAK,MAAM;AAC7B,WAAK,cAAc;AACnB,WAAK,mBAAmB;AACxB,WAAK,UAAU,KAAK,WAAW;AAAA,IACjC,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,aAAa,OAAmB;AACpC,QAAI,KAAK,QAAQ;AACf,YAAM,IAAI,MAAM,uBAAuB;AAAA,IACzC;AACA,UAAM,MAAM,OAAO,QAAQ,OAAO,OAAO,IAAI,OAAO,GAAO,CAAC;AAC5D,UAAM,UAAU,KAAK,gBAAgB,IAAI,IAAI,MAAM,KAAK;AACxD,UAAM,kBAAmB,MAAM,oBAAoB,MAAM,aAAc;AACvE,SAAK,oBAAoB,kBAAkB;AAE3C,SAAK,cAAc;AAEnB,QAAI,KAAK,SAAS;AAChB,mBAAa,KAAK,OAAO;AAAA,IAC3B;AAIA,SAAK,UAAU,WAAW,KAAK,SAAS,KAAK,mBAAmB,EAAE;AAElE,UAAM,MAAM,IAAI,yBAAyB;AAAA,MACvC,cAAc,KAAK,UAAU;AAAA,MAC7B,QAAQ,MAAM,UAAU;AAAA,IAC1B,CAAC;AAED,UAAM,MAAM,UAAU,SAAS,QAAmC;AAAA,MAChE,SAAS,EAAE,MAAM,qBAAqB,OAAO,IAAI;AAAA,IACnD,CAAC;AAED,UAAM,KAAK,MAAM,UAAU,SAAS,QAAmC,CAAC,OAAO;AAC7E,aAAO,GAAG,QAAQ,QAAQ,uBAAuB,GAAG,QAAQ,MAAM,WAAW,IAAI;AAAA,IACnF,CAAC;AAED,QAAI,GAAG,OAAO;AACZ,YAAM,IAAI,MAAM,GAAG,KAAK;AAAA,IAC1B;AAAA,EACF;AAAA,EAEA,MAAM,QAAQ;AACZ,SAAK,UAAU,QAAQ;AACvB,SAAK,SAAS;AAAA,EAChB;AACF;","names":[]}
+{"version":3,"sources":["../src/audio_source.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { AudioFrame } from './audio_frame.js';\nimport { FfiClient } from './ffi_client.js';\nimport { FfiHandle } from './napi/native.js';\nimport type {\n  AudioSourceInfo,\n  CaptureAudioFrameCallback,\n  CaptureAudioFrameResponse,\n  ClearAudioBufferResponse,\n  NewAudioSourceResponse,\n} from './proto/audio_frame_pb.js';\nimport {\n  AudioSourceType,\n  CaptureAudioFrameRequest,\n  ClearAudioBufferRequest,\n  NewAudioSourceRequest,\n} from './proto/audio_frame_pb.js';\n\nexport class AudioSource {\n  /** @internal */\n  info: AudioSourceInfo;\n  /** @internal */\n  ffiHandle: FfiHandle;\n  /** @internal */\n  lastCapture: number;\n  /** @internal */\n  currentQueueSize: number;\n  /** @internal */\n  release = () => {};\n  promise = this.newPromise();\n  /** @internal */\n  timeout?: ReturnType<typeof setTimeout> = undefined;\n  /** @internal */\n  closed = false;\n\n  sampleRate: number;\n  numChannels: number;\n  queueSize: number;\n\n  constructor(sampleRate: number, numChannels: number, queueSize = 1000) {\n    this.sampleRate = sampleRate;\n    this.numChannels = numChannels;\n    this.queueSize = queueSize;\n\n    this.lastCapture = 0;\n    this.currentQueueSize = 0;\n\n    const req = new NewAudioSourceRequest({\n      type: AudioSourceType.AUDIO_SOURCE_NATIVE,\n      sampleRate: sampleRate,\n      numChannels: numChannels,\n      queueSizeMs: queueSize,\n    });\n\n    const res = FfiClient.instance.request<NewAudioSourceResponse>({\n      message: {\n        case: 'newAudioSource',\n        value: req,\n      },\n    });\n\n    this.info = res.source!.info!;\n    this.ffiHandle = new FfiHandle(res.source!.handle!.id!);\n  }\n\n  get queuedDuration(): number {\n    return Math.max(\n      this.currentQueueSize - Number(process.hrtime.bigint() / BigInt(1000000)) + this.lastCapture,\n      0,\n    );\n  }\n\n  clearQueue() {\n    const req = new ClearAudioBufferRequest({\n      sourceHandle: this.ffiHandle.handle,\n    });\n\n    FfiClient.instance.request<ClearAudioBufferResponse>({\n      message: {\n        case: 'clearAudioBuffer',\n        value: req,\n      },\n    });\n\n    this.release();\n  }\n\n  /** @internal */\n  async newPromise() {\n    return new Promise<void>((resolve) => {\n      this.release = resolve;\n    });\n  }\n\n  async waitForPlayout() {\n    return this.promise.then(() => {\n      this.lastCapture = 0;\n      this.currentQueueSize = 0;\n      this.promise = this.newPromise();\n      this.timeout = undefined;\n    });\n  }\n\n  async captureFrame(frame: AudioFrame) {\n    if (this.closed) {\n      throw new Error('AudioSource is closed');\n    }\n\n    if (frame.samplesPerChannel === 0) {\n      return;\n    }\n\n    const now = Number(process.hrtime.bigint() / BigInt(1000000));\n    const elapsed = this.lastCapture === 0 ? 0 : now - this.lastCapture;\n    const frameDurationMs = (frame.samplesPerChannel / frame.sampleRate) * 1000;\n    this.currentQueueSize += frameDurationMs - elapsed;\n\n    this.lastCapture = now;\n\n    if (this.timeout) {\n      clearTimeout(this.timeout);\n    }\n\n    this.timeout = setTimeout(this.release, this.currentQueueSize);\n\n    const req = new CaptureAudioFrameRequest({\n      sourceHandle: this.ffiHandle.handle,\n      buffer: frame.protoInfo(),\n    });\n\n    const res = FfiClient.instance.request<CaptureAudioFrameResponse>({\n      message: { case: 'captureAudioFrame', value: req },\n    });\n\n    const cb = await FfiClient.instance.waitFor<CaptureAudioFrameCallback>((ev) => {\n      return ev.message.case == 'captureAudioFrame' && ev.message.value.asyncId == res.asyncId;\n    });\n\n    if (cb.error) {\n      throw new Error(cb.error);\n    }\n  }\n\n  async close() {\n    this.ffiHandle.dispose();\n    this.closed = true;\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/audio_stream.cjs

@@ -21,19 +21,16 @@ __export(audio_stream_exports, {
   AudioStream: () => AudioStream
 });
 module.exports = __toCommonJS(audio_stream_exports);
-var import_mutex = require("@livekit/mutex");
+var import_web = require("node:stream/web");
 var import_audio_frame = require("./audio_frame.cjs");
 var import_ffi_client = require("./ffi_client.cjs");
 var import_audio_frame_pb = require("./proto/audio_frame_pb.cjs");
-class AudioStream {
-  constructor(track, sampleRate = 48e3, numChannels = 1) {
-    /** @internal */
-    this.eventQueue = [];
-    /** @internal */
-    this.queueResolve = null;
-    /** @internal */
-    this.mutex = new import_mutex.Mutex();
+class AudioStreamSource {
+  constructor(track, sampleRateOrOptions, numChannels) {
     this.onEvent = (ev) => {
+      if (!this.controller) {
+        throw new Error("Stream controller not initialized");
+      }
       if (ev.message.case != "audioStreamEvent" || ev.message.value.streamHandle != this.ffiHandle.handle) {
         return;
       }
@@ -41,26 +38,31 @@ class AudioStream {
       switch (streamEvent.case) {
         case "frameReceived":
           const frame = import_audio_frame.AudioFrame.fromOwnedInfo(streamEvent.value.frame);
-          if (this.queueResolve) {
-            this.queueResolve({ done: false, value: frame });
-            this.queueResolve = null;
-          } else {
-            this.eventQueue.push(frame);
-          }
+          this.controller.enqueue(frame);
           break;
         case "eos":
           import_ffi_client.FfiClient.instance.off(import_ffi_client.FfiClientEvent.FfiEvent, this.onEvent);
+          this.controller.close();
           break;
       }
     };
-    this.track = track;
-    this.sampleRate = sampleRate;
-    this.numChannels = numChannels;
+    if (sampleRateOrOptions !== void 0 && typeof sampleRateOrOptions !== "number") {
+      this.sampleRate = sampleRateOrOptions.sampleRate ?? 48e3;
+      this.numChannels = sampleRateOrOptions.numChannels ?? 1;
+      this.ncOptions = sampleRateOrOptions.noiseCancellation;
+    } else {
+      this.sampleRate = sampleRateOrOptions ?? 48e3;
+      this.numChannels = numChannels ?? 1;
+    }
     const req = new import_audio_frame_pb.NewAudioStreamRequest({
       type: import_audio_frame_pb.AudioStreamType.AUDIO_STREAM_NATIVE,
       trackHandle: track.ffi_handle.handle,
-      sampleRate,
-      numChannels
+      sampleRate: this.sampleRate,
+      numChannels: this.numChannels,
+      ...this.ncOptions ? {
+        audioFilterModuleId: this.ncOptions.moduleId,
+        audioFilterOptions: JSON.stringify(this.ncOptions.options)
+      } : {}
     });
     const res = import_ffi_client.FfiClient.instance.request({
       message: {
@@ -68,33 +70,20 @@ class AudioStream {
         value: req
       }
     });
-    this.info = res.stream.info;
     this.ffiHandle = new import_ffi_client.FfiHandle(res.stream.handle.id);
     import_ffi_client.FfiClient.instance.on(import_ffi_client.FfiClientEvent.FfiEvent, this.onEvent);
   }
-  async next() {
-    const unlock = await this.mutex.lock();
-    if (this.eventQueue.length > 0) {
-      unlock();
-      const value = this.eventQueue.shift();
-      if (value) {
-        return { done: false, value };
-      } else {
-        return { done: true, value: void 0 };
-      }
-    }
-    const promise = new Promise(
-      (resolve) => this.queueResolve = resolve
-    );
-    unlock();
-    return promise;
+  start(controller) {
+    this.controller = controller;
   }
-  close() {
-    this.eventQueue.push(null);
+  cancel() {
+    import_ffi_client.FfiClient.instance.off(import_ffi_client.FfiClientEvent.FfiEvent, this.onEvent);
     this.ffiHandle.dispose();
   }
-  [Symbol.asyncIterator]() {
-    return this;
+}
+class AudioStream extends import_web.ReadableStream {
+  constructor(track, sampleRateOrOptions, numChannels) {
+    super(new AudioStreamSource(track, sampleRateOrOptions, numChannels));
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/audio_stream.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/audio_stream.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport { Mutex } from '@livekit/mutex';\nimport { AudioFrame } from './audio_frame.js';\nimport type { FfiEvent } from './ffi_client.js';\nimport { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';\nimport type { AudioStreamInfo, NewAudioStreamResponse } from './proto/audio_frame_pb.js';\nimport { AudioStreamType, NewAudioStreamRequest } from './proto/audio_frame_pb.js';\nimport type { Track } from './track.js';\n\nexport class AudioStream implements AsyncIterableIterator<AudioFrame> {\n  /** @internal */\n  info: AudioStreamInfo;\n  /** @internal */\n  ffiHandle: FfiHandle;\n  /** @internal */\n  eventQueue: (AudioFrame | null)[] = [];\n  /** @internal */\n  queueResolve: ((value: IteratorResult<AudioFrame>) => void) | null = null;\n  /** @internal */\n  mutex = new Mutex();\n\n  track: Track;\n  sampleRate: number;\n  numChannels: number;\n\n  constructor(track: Track, sampleRate: number = 48000, numChannels: number = 1) {\n    this.track = track;\n    this.sampleRate = sampleRate;\n    this.numChannels = numChannels;\n\n    const req = new NewAudioStreamRequest({\n      type: AudioStreamType.AUDIO_STREAM_NATIVE,\n      trackHandle: track.ffi_handle.handle,\n      sampleRate: sampleRate,\n      numChannels: numChannels,\n    });\n\n    const res = FfiClient.instance.request<NewAudioStreamResponse>({\n      message: {\n        case: 'newAudioStream',\n        value: req,\n      },\n    });\n\n    this.info = res.stream!.info!;\n    this.ffiHandle = new FfiHandle(res.stream!.handle!.id!);\n\n    FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);\n  }\n\n  private onEvent = (ev: FfiEvent) => {\n    if (\n      ev.message.case != 'audioStreamEvent' ||\n      ev.message.value.streamHandle != this.ffiHandle.handle\n    ) {\n      return;\n    }\n\n    const streamEvent = ev.message.value.message;\n    switch (streamEvent.case) {\n      case 'frameReceived':\n        const frame = AudioFrame.fromOwnedInfo(streamEvent.value.frame!);\n        if (this.queueResolve) {\n          this.queueResolve({ done: false, value: frame });\n          this.queueResolve = null;\n        } else {\n          this.eventQueue.push(frame);\n        }\n        break;\n      case 'eos':\n        FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n        break;\n    }\n  };\n\n  async next(): Promise<IteratorResult<AudioFrame>> {\n    const unlock = await this.mutex.lock();\n    if (this.eventQueue.length > 0) {\n      unlock();\n      const value = this.eventQueue.shift();\n      if (value) {\n        return { done: false, value };\n      } else {\n        return { done: true, value: undefined };\n      }\n    }\n    const promise = new Promise<IteratorResult<AudioFrame>>(\n      (resolve) => (this.queueResolve = resolve),\n    );\n    unlock();\n    return promise;\n  }\n\n  close() {\n    this.eventQueue.push(null);\n    this.ffiHandle.dispose();\n  }\n\n  [Symbol.asyncIterator](): AudioStream {\n    return this;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,mBAAsB;AACtB,yBAA2B;AAE3B,wBAAqD;AAErD,4BAAuD;AAGhD,MAAM,YAAyD;AAAA,EAgBpE,YAAY,OAAc,aAAqB,MAAO,cAAsB,GAAG;AAV/E;AAAA,sBAAoC,CAAC;AAErC;AAAA,wBAAqE;AAErE;AAAA,iBAAQ,IAAI,mBAAM;AA+BlB,SAAQ,UAAU,CAAC,OAAiB;AAClC,UACE,GAAG,QAAQ,QAAQ,sBACnB,GAAG,QAAQ,MAAM,gBAAgB,KAAK,UAAU,QAChD;AACA;AAAA,MACF;AAEA,YAAM,cAAc,GAAG,QAAQ,MAAM;AACrC,cAAQ,YAAY,MAAM;AAAA,QACxB,KAAK;AACH,gBAAM,QAAQ,8BAAW,cAAc,YAAY,MAAM,KAAM;AAC/D,cAAI,KAAK,cAAc;AACrB,iBAAK,aAAa,EAAE,MAAM,OAAO,OAAO,MAAM,CAAC;AAC/C,iBAAK,eAAe;AAAA,UACtB,OAAO;AACL,iBAAK,WAAW,KAAK,KAAK;AAAA,UAC5B;AACA;AAAA,QACF,KAAK;AACH,sCAAU,SAAS,IAAI,iCAAe,UAAU,KAAK,OAAO;AAC5D;AAAA,MACJ;AAAA,IACF;AA/CE,SAAK,QAAQ;AACb,SAAK,aAAa;AAClB,SAAK,cAAc;AAEnB,UAAM,MAAM,IAAI,4CAAsB;AAAA,MACpC,MAAM,sCAAgB;AAAA,MACtB,aAAa,MAAM,WAAW;AAAA,MAC9B;AAAA,MACA;AAAA,IACF,CAAC;AAED,UAAM,MAAM,4BAAU,SAAS,QAAgC;AAAA,MAC7D,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,OAAO,IAAI,OAAQ;AACxB,SAAK,YAAY,IAAI,4BAAU,IAAI,OAAQ,OAAQ,EAAG;AAEtD,gCAAU,SAAS,GAAG,iCAAe,UAAU,KAAK,OAAO;AAAA,EAC7D;AAAA,EA2BA,MAAM,OAA4C;AAChD,UAAM,SAAS,MAAM,KAAK,MAAM,KAAK;AACrC,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,aAAO;AACP,YAAM,QAAQ,KAAK,WAAW,MAAM;AACpC,UAAI,OAAO;AACT,eAAO,EAAE,MAAM,OAAO,MAAM;AAAA,MAC9B,OAAO;AACL,eAAO,EAAE,MAAM,MAAM,OAAO,OAAU;AAAA,MACxC;AAAA,IACF;AACA,UAAM,UAAU,IAAI;AAAA,MAClB,CAAC,YAAa,KAAK,eAAe;AAAA,IACpC;AACA,WAAO;AACP,WAAO;AAAA,EACT;AAAA,EAEA,QAAQ;AACN,SAAK,WAAW,KAAK,IAAI;AACzB,SAAK,UAAU,QAAQ;AAAA,EACzB;AAAA,EAEA,CAAC,OAAO,aAAa,IAAiB;AACpC,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../src/audio_stream.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport { ReadableStream, type UnderlyingSource } from 'node:stream/web';\nimport { AudioFrame } from './audio_frame.js';\nimport type { FfiEvent } from './ffi_client.js';\nimport { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';\nimport type { NewAudioStreamResponse } from './proto/audio_frame_pb.js';\nimport { AudioStreamType, NewAudioStreamRequest } from './proto/audio_frame_pb.js';\nimport type { Track } from './track.js';\n\nexport interface AudioStreamOptions {\n  noiseCancellation?: NoiseCancellationOptions;\n  sampleRate?: number;\n  numChannels?: number;\n}\n\nexport interface NoiseCancellationOptions {\n  moduleId: string;\n  options: Record<string, any>;\n}\n\nclass AudioStreamSource implements UnderlyingSource<AudioFrame> {\n  private controller?: ReadableStreamDefaultController<AudioFrame>;\n  private ffiHandle: FfiHandle;\n  private sampleRate: number;\n  private numChannels: number;\n  private ncOptions?: NoiseCancellationOptions;\n\n  constructor(\n    track: Track,\n    sampleRateOrOptions?: number | AudioStreamOptions,\n    numChannels?: number,\n  ) {\n    if (sampleRateOrOptions !== undefined && typeof sampleRateOrOptions !== 'number') {\n      this.sampleRate = sampleRateOrOptions.sampleRate ?? 48000;\n      this.numChannels = sampleRateOrOptions.numChannels ?? 1;\n      this.ncOptions = sampleRateOrOptions.noiseCancellation;\n    } else {\n      this.sampleRate = (sampleRateOrOptions as number) ?? 48000;\n      this.numChannels = numChannels ?? 1;\n    }\n\n    const req = new NewAudioStreamRequest({\n      type: AudioStreamType.AUDIO_STREAM_NATIVE,\n      trackHandle: track.ffi_handle.handle,\n      sampleRate: this.sampleRate,\n      numChannels: this.numChannels,\n      ...(this.ncOptions\n        ? {\n            audioFilterModuleId: this.ncOptions.moduleId,\n            audioFilterOptions: JSON.stringify(this.ncOptions.options),\n          }\n        : {}),\n    });\n\n    const res = FfiClient.instance.request<NewAudioStreamResponse>({\n      message: {\n        case: 'newAudioStream',\n        value: req,\n      },\n    });\n\n    this.ffiHandle = new FfiHandle(res.stream!.handle!.id!);\n\n    FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);\n  }\n\n  private onEvent = (ev: FfiEvent) => {\n    if (!this.controller) {\n      throw new Error('Stream controller not initialized');\n    }\n\n    if (\n      ev.message.case != 'audioStreamEvent' ||\n      ev.message.value.streamHandle != this.ffiHandle.handle\n    ) {\n      return;\n    }\n\n    const streamEvent = ev.message.value.message;\n    switch (streamEvent.case) {\n      case 'frameReceived':\n        const frame = AudioFrame.fromOwnedInfo(streamEvent.value.frame!);\n        this.controller.enqueue(frame);\n        break;\n      case 'eos':\n        FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n        this.controller.close();\n        break;\n    }\n  };\n\n  start(controller: ReadableStreamDefaultController<AudioFrame>) {\n    this.controller = controller;\n  }\n\n  cancel() {\n    FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n    this.ffiHandle.dispose();\n  }\n}\n\nexport class AudioStream extends ReadableStream<AudioFrame> {\n  constructor(track: Track);\n  constructor(track: Track, sampleRate: number);\n  constructor(track: Track, sampleRate: number, numChannels: number);\n  constructor(track: Track, options: AudioStreamOptions);\n  constructor(\n    track: Track,\n    sampleRateOrOptions?: number | AudioStreamOptions,\n    numChannels?: number,\n  ) {\n    super(new AudioStreamSource(track, sampleRateOrOptions, numChannels));\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,iBAAsD;AACtD,yBAA2B;AAE3B,wBAAqD;AAErD,4BAAuD;AAcvD,MAAM,kBAA0D;AAAA,EAO9D,YACE,OACA,qBACA,aACA;AAmCF,SAAQ,UAAU,CAAC,OAAiB;AAClC,UAAI,CAAC,KAAK,YAAY;AACpB,cAAM,IAAI,MAAM,mCAAmC;AAAA,MACrD;AAEA,UACE,GAAG,QAAQ,QAAQ,sBACnB,GAAG,QAAQ,MAAM,gBAAgB,KAAK,UAAU,QAChD;AACA;AAAA,MACF;AAEA,YAAM,cAAc,GAAG,QAAQ,MAAM;AACrC,cAAQ,YAAY,MAAM;AAAA,QACxB,KAAK;AACH,gBAAM,QAAQ,8BAAW,cAAc,YAAY,MAAM,KAAM;AAC/D,eAAK,WAAW,QAAQ,KAAK;AAC7B;AAAA,QACF,KAAK;AACH,sCAAU,SAAS,IAAI,iCAAe,UAAU,KAAK,OAAO;AAC5D,eAAK,WAAW,MAAM;AACtB;AAAA,MACJ;AAAA,IACF;AAzDE,QAAI,wBAAwB,UAAa,OAAO,wBAAwB,UAAU;AAChF,WAAK,aAAa,oBAAoB,cAAc;AACpD,WAAK,cAAc,oBAAoB,eAAe;AACtD,WAAK,YAAY,oBAAoB;AAAA,IACvC,OAAO;AACL,WAAK,aAAc,uBAAkC;AACrD,WAAK,cAAc,eAAe;AAAA,IACpC;AAEA,UAAM,MAAM,IAAI,4CAAsB;AAAA,MACpC,MAAM,sCAAgB;AAAA,MACtB,aAAa,MAAM,WAAW;AAAA,MAC9B,YAAY,KAAK;AAAA,MACjB,aAAa,KAAK;AAAA,MAClB,GAAI,KAAK,YACL;AAAA,QACE,qBAAqB,KAAK,UAAU;AAAA,QACpC,oBAAoB,KAAK,UAAU,KAAK,UAAU,OAAO;AAAA,MAC3D,IACA,CAAC;AAAA,IACP,CAAC;AAED,UAAM,MAAM,4BAAU,SAAS,QAAgC;AAAA,MAC7D,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,YAAY,IAAI,4BAAU,IAAI,OAAQ,OAAQ,EAAG;AAEtD,gCAAU,SAAS,GAAG,iCAAe,UAAU,KAAK,OAAO;AAAA,EAC7D;AAAA,EA2BA,MAAM,YAAyD;AAC7D,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,SAAS;AACP,gCAAU,SAAS,IAAI,iCAAe,UAAU,KAAK,OAAO;AAC5D,SAAK,UAAU,QAAQ;AAAA,EACzB;AACF;AAEO,MAAM,oBAAoB,0BAA2B;AAAA,EAK1D,YACE,OACA,qBACA,aACA;AACA,UAAM,IAAI,kBAAkB,OAAO,qBAAqB,WAAW,CAAC;AAAA,EACtE;AACF;","names":[]}

package/dist/audio_stream.d.cts

@@ -1,37 +1,32 @@
-import { Mutex } from '@livekit/mutex';
+import { ReadableStream } from 'node:stream/web';
 import { AudioFrame } from './audio_frame.cjs';
-import { FfiHandle } from './napi/native.d.cjs';
-import { AudioStreamInfo } from './proto/audio_frame_pb.cjs';
 import { Track } from './track.cjs';
+import './proto/audio_frame_pb.cjs';
 import '@bufbuild/protobuf';
 import './proto/track_pb.cjs';
 import './proto/stats_pb.cjs';
 import './proto/e2ee_pb.cjs';
 import './proto/handle_pb.cjs';
 import './audio_source.cjs';
+import './napi/native.d.cjs';
 import './video_source.cjs';
 import './proto/video_frame_pb.cjs';
 import './video_frame.cjs';
 
-declare class AudioStream implements AsyncIterableIterator<AudioFrame> {
-    /** @internal */
-    info: AudioStreamInfo;
-    /** @internal */
-    ffiHandle: FfiHandle;
-    /** @internal */
-    eventQueue: (AudioFrame | null)[];
-    /** @internal */
-    queueResolve: ((value: IteratorResult<AudioFrame>) => void) | null;
-    /** @internal */
-    mutex: Mutex;
-    track: Track;
-    sampleRate: number;
-    numChannels: number;
-    constructor(track: Track, sampleRate?: number, numChannels?: number);
-    private onEvent;
-    next(): Promise<IteratorResult<AudioFrame>>;
-    close(): void;
-    [Symbol.asyncIterator](): AudioStream;
+interface AudioStreamOptions {
+    noiseCancellation?: NoiseCancellationOptions;
+    sampleRate?: number;
+    numChannels?: number;
+}
+interface NoiseCancellationOptions {
+    moduleId: string;
+    options: Record<string, any>;
+}
+declare class AudioStream extends ReadableStream<AudioFrame> {
+    constructor(track: Track);
+    constructor(track: Track, sampleRate: number);
+    constructor(track: Track, sampleRate: number, numChannels: number);
+    constructor(track: Track, options: AudioStreamOptions);
 }
 
-export { AudioStream };
+export { AudioStream, type AudioStreamOptions, type NoiseCancellationOptions };

package/dist/audio_stream.d.ts

@@ -1,37 +1,32 @@
-import { Mutex } from '@livekit/mutex';
+import { ReadableStream } from 'node:stream/web';
 import { AudioFrame } from './audio_frame.js';
-import { FfiHandle } from './napi/native.d.js';
-import { AudioStreamInfo } from './proto/audio_frame_pb.js';
 import { Track } from './track.js';
+import './proto/audio_frame_pb.js';
 import '@bufbuild/protobuf';
 import './proto/track_pb.js';
 import './proto/stats_pb.js';
 import './proto/e2ee_pb.js';
 import './proto/handle_pb.js';
 import './audio_source.js';
+import './napi/native.d.js';
 import './video_source.js';
 import './proto/video_frame_pb.js';
 import './video_frame.js';
 
-declare class AudioStream implements AsyncIterableIterator<AudioFrame> {
-    /** @internal */
-    info: AudioStreamInfo;
-    /** @internal */
-    ffiHandle: FfiHandle;
-    /** @internal */
-    eventQueue: (AudioFrame | null)[];
-    /** @internal */
-    queueResolve: ((value: IteratorResult<AudioFrame>) => void) | null;
-    /** @internal */
-    mutex: Mutex;
-    track: Track;
-    sampleRate: number;
-    numChannels: number;
-    constructor(track: Track, sampleRate?: number, numChannels?: number);
-    private onEvent;
-    next(): Promise<IteratorResult<AudioFrame>>;
-    close(): void;
-    [Symbol.asyncIterator](): AudioStream;
+interface AudioStreamOptions {
+    noiseCancellation?: NoiseCancellationOptions;
+    sampleRate?: number;
+    numChannels?: number;
+}
+interface NoiseCancellationOptions {
+    moduleId: string;
+    options: Record<string, any>;
+}
+declare class AudioStream extends ReadableStream<AudioFrame> {
+    constructor(track: Track);
+    constructor(track: Track, sampleRate: number);
+    constructor(track: Track, sampleRate: number, numChannels: number);
+    constructor(track: Track, options: AudioStreamOptions);
 }
 
-export { AudioStream };
+export { AudioStream, type AudioStreamOptions, type NoiseCancellationOptions };

package/dist/audio_stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audio_stream.d.ts","sourceRoot":"","sources":["../src/audio_stream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAA6B,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAA0B,MAAM,2BAA2B,CAAC;AAEzF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,qBAAa,WAAY,YAAW,qBAAqB,CAAC,UAAU,CAAC;IACnE,gBAAgB;IAChB,IAAI,EAAE,eAAe,CAAC;IACtB,gBAAgB;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB;IAChB,UAAU,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAM;IACvC,gBAAgB;IAChB,YAAY,EAAE,CAAC,CAAC,KAAK,EAAE,cAAc,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IAC1E,gBAAgB;IAChB,KAAK,QAAe;IAEpB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;gBAER,KAAK,EAAE,KAAK,EAAE,UAAU,GAAE,MAAc,EAAE,WAAW,GAAE,MAAU;IAyB7E,OAAO,CAAC,OAAO,CAuBb;IAEI,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAkBjD,KAAK;IAKL,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,WAAW;CAGtC"}
+{"version":3,"file":"audio_stream.d.ts","sourceRoot":"","sources":["../src/audio_stream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAyB,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAK9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC9B;AAmFD,qBAAa,WAAY,SAAQ,cAAc,CAAC,UAAU,CAAC;gBAC7C,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM;gBAChC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;gBACrD,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,kBAAkB;CAQtD"}

package/dist/audio_stream.js

@@ -1,16 +1,13 @@
-import { Mutex } from "@livekit/mutex";
+import { ReadableStream } from "node:stream/web";
 import { AudioFrame } from "./audio_frame.js";
 import { FfiClient, FfiClientEvent, FfiHandle } from "./ffi_client.js";
 import { AudioStreamType, NewAudioStreamRequest } from "./proto/audio_frame_pb.js";
-class AudioStream {
-  constructor(track, sampleRate = 48e3, numChannels = 1) {
-    /** @internal */
-    this.eventQueue = [];
-    /** @internal */
-    this.queueResolve = null;
-    /** @internal */
-    this.mutex = new Mutex();
+class AudioStreamSource {
+  constructor(track, sampleRateOrOptions, numChannels) {
     this.onEvent = (ev) => {
+      if (!this.controller) {
+        throw new Error("Stream controller not initialized");
+      }
       if (ev.message.case != "audioStreamEvent" || ev.message.value.streamHandle != this.ffiHandle.handle) {
         return;
       }
@@ -18,26 +15,31 @@ class AudioStream {
       switch (streamEvent.case) {
         case "frameReceived":
           const frame = AudioFrame.fromOwnedInfo(streamEvent.value.frame);
-          if (this.queueResolve) {
-            this.queueResolve({ done: false, value: frame });
-            this.queueResolve = null;
-          } else {
-            this.eventQueue.push(frame);
-          }
+          this.controller.enqueue(frame);
           break;
         case "eos":
           FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
+          this.controller.close();
           break;
       }
     };
-    this.track = track;
-    this.sampleRate = sampleRate;
-    this.numChannels = numChannels;
+    if (sampleRateOrOptions !== void 0 && typeof sampleRateOrOptions !== "number") {
+      this.sampleRate = sampleRateOrOptions.sampleRate ?? 48e3;
+      this.numChannels = sampleRateOrOptions.numChannels ?? 1;
+      this.ncOptions = sampleRateOrOptions.noiseCancellation;
+    } else {
+      this.sampleRate = sampleRateOrOptions ?? 48e3;
+      this.numChannels = numChannels ?? 1;
+    }
     const req = new NewAudioStreamRequest({
       type: AudioStreamType.AUDIO_STREAM_NATIVE,
       trackHandle: track.ffi_handle.handle,
-      sampleRate,
-      numChannels
+      sampleRate: this.sampleRate,
+      numChannels: this.numChannels,
+      ...this.ncOptions ? {
+        audioFilterModuleId: this.ncOptions.moduleId,
+        audioFilterOptions: JSON.stringify(this.ncOptions.options)
+      } : {}
     });
     const res = FfiClient.instance.request({
       message: {
@@ -45,33 +47,20 @@ class AudioStream {
         value: req
       }
     });
-    this.info = res.stream.info;
     this.ffiHandle = new FfiHandle(res.stream.handle.id);
     FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);
   }
-  async next() {
-    const unlock = await this.mutex.lock();
-    if (this.eventQueue.length > 0) {
-      unlock();
-      const value = this.eventQueue.shift();
-      if (value) {
-        return { done: false, value };
-      } else {
-        return { done: true, value: void 0 };
-      }
-    }
-    const promise = new Promise(
-      (resolve) => this.queueResolve = resolve
-    );
-    unlock();
-    return promise;
+  start(controller) {
+    this.controller = controller;
   }
-  close() {
-    this.eventQueue.push(null);
+  cancel() {
+    FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
     this.ffiHandle.dispose();
   }
-  [Symbol.asyncIterator]() {
-    return this;
+}
+class AudioStream extends ReadableStream {
+  constructor(track, sampleRateOrOptions, numChannels) {
+    super(new AudioStreamSource(track, sampleRateOrOptions, numChannels));
   }
 }
 export {