@mclean-capital/neura 2.1.3 → 2.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core/version.txt +1 -1
- package/dist/audio/playback.d.ts.map +1 -1
- package/dist/audio/playback.js +75 -22
- package/dist/audio/playback.js.map +1 -1
- package/package.json +1 -1
package/core/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.1.
|
|
1
|
+
2.1.4
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playback.d.ts","sourceRoot":"","sources":["../../src/audio/playback.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA8FH,MAAM,WAAW,aAAa;IAC5B,KAAK,IAAI,IAAI,CAAC;IACd,IAAI,IAAI,IAAI,CAAC;IACb,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;
|
|
1
|
+
{"version":3,"file":"playback.d.ts","sourceRoot":"","sources":["../../src/audio/playback.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA8FH,MAAM,WAAW,aAAa;IAC5B,KAAK,IAAI,IAAI,CAAC;IACd,IAAI,IAAI,IAAI,CAAC;IACb,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAqUD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAgDlE"}
|
package/dist/audio/playback.js
CHANGED
|
@@ -257,43 +257,97 @@ function createNodeSpeakerPlayback() {
|
|
|
257
257
|
* Secondary playback: @picovoice/pvspeaker-node
|
|
258
258
|
*
|
|
259
259
|
* Kept as a fallback for platforms where the `speaker` native build is
|
|
260
|
-
* unavailable
|
|
261
|
-
*
|
|
260
|
+
* unavailable (it's the primary backend on Windows — node-speaker's
|
|
261
|
+
* mpg123 underflow warnings can't be silenced there).
|
|
262
|
+
*
|
|
263
|
+
* PvSpeaker's `write()` contract (from
|
|
264
|
+
* `node_modules/@picovoice/pvspeaker-node/test/pv_speaker.test.ts`):
|
|
265
|
+
*
|
|
266
|
+
* - Accepts an `ArrayBuffer` of raw PCM bytes. NOT a `number[]`,
|
|
267
|
+
* NOT a Node `Buffer` without unwrapping, NOT a `Uint8Array` view.
|
|
268
|
+
* Passing anything else crashes with `RUNTIME_ERROR: Unable to
|
|
269
|
+
* get buffer` because the native N-API binding calls
|
|
270
|
+
* `napi_get_arraybuffer_info` on the argument.
|
|
271
|
+
* - Returns the number of **samples** (frames) successfully written,
|
|
272
|
+
* NOT the number of bytes. With 16-bit mono audio, 1 sample = 2
|
|
273
|
+
* bytes, so the byte-level slice for partial writes must multiply
|
|
274
|
+
* the returned sample count by `BYTES_PER_SAMPLE`.
|
|
275
|
+
*
|
|
276
|
+
* An earlier revision of this function missed both constraints — it
|
|
277
|
+
* built a `number[]` queue of samples and treated the sample-count
|
|
278
|
+
* return as bytes. That worked in theory for `createSoxPlayback`'s
|
|
279
|
+
* stdin pipe but not for PvSpeaker. It was also never caught in
|
|
280
|
+
* practice because an unrelated port bug (fixed in core v2.1.1)
|
|
281
|
+
* prevented `neura listen` from ever reaching audio playback, so the
|
|
282
|
+
* crash only surfaced the moment the port fix shipped.
|
|
262
283
|
*/
|
|
263
284
|
async function createPvSpeakerPlayback() {
|
|
264
285
|
const { PvSpeaker } = await import('@picovoice/pvspeaker-node');
|
|
265
286
|
let speaker = null;
|
|
266
|
-
// Pending
|
|
267
|
-
|
|
287
|
+
// Pending PCM chunks, each a Node Buffer of raw 16-bit PCM bytes.
|
|
288
|
+
// Stored as a queue of Buffers (rather than one concatenated Buffer)
|
|
289
|
+
// to avoid O(n) reallocations on every incoming audio chunk.
|
|
290
|
+
let pendingQueue = [];
|
|
268
291
|
let draining = false;
|
|
269
|
-
//
|
|
270
|
-
|
|
292
|
+
// 16-bit mono → 2 bytes per sample/frame.
|
|
293
|
+
const BYTES_PER_SAMPLE = 2;
|
|
294
|
+
// Hard ceiling on consecutive "nothing drained" iterations so a
|
|
295
|
+
// stuck or zombie speaker can't spin the drain loop forever.
|
|
271
296
|
const MAX_STALL_ITERATIONS = 200; // 200 * 10ms = 2s max stuck time
|
|
297
|
+
/**
|
|
298
|
+
* Copy a Node Buffer slice into a fresh standalone ArrayBuffer.
|
|
299
|
+
*
|
|
300
|
+
* Why not `chunk.buffer.slice(...)`: Node Buffers created by
|
|
301
|
+
* `Buffer.from(..., 'base64')` may use a pooled underlying
|
|
302
|
+
* ArrayBuffer containing unrelated bytes, so we can't hand
|
|
303
|
+
* `chunk.buffer` to pvspeaker's native binding directly — we'd
|
|
304
|
+
* leak garbage into the audio stream. `chunk.buffer.slice()`
|
|
305
|
+
* would give us a fresh ArrayBuffer, but Node's `Buffer.buffer`
|
|
306
|
+
* is typed as `ArrayBuffer | SharedArrayBuffer`, and TypeScript
|
|
307
|
+
* can't narrow to ArrayBuffer without an unsafe cast.
|
|
308
|
+
*
|
|
309
|
+
* Allocating a fresh `new ArrayBuffer(length)` and copying via
|
|
310
|
+
* `Uint8Array.set` is type-safe (always ArrayBuffer), has the
|
|
311
|
+
* same runtime cost (one byte-level copy), and is the idiomatic
|
|
312
|
+
* way to hand Buffer bytes to native bindings that require a
|
|
313
|
+
* strict ArrayBuffer.
|
|
314
|
+
*/
|
|
315
|
+
function chunkToArrayBuffer(chunk) {
|
|
316
|
+
const out = new ArrayBuffer(chunk.byteLength);
|
|
317
|
+
new Uint8Array(out).set(chunk);
|
|
318
|
+
return out;
|
|
319
|
+
}
|
|
272
320
|
async function drain() {
|
|
273
321
|
if (draining)
|
|
274
322
|
return;
|
|
275
323
|
draining = true;
|
|
276
324
|
let stallCount = 0;
|
|
277
325
|
try {
|
|
278
|
-
while (speaker &&
|
|
279
|
-
const chunk =
|
|
280
|
-
|
|
281
|
-
const
|
|
282
|
-
if (
|
|
283
|
-
//
|
|
284
|
-
//
|
|
285
|
-
|
|
286
|
-
|
|
326
|
+
while (speaker && pendingQueue.length > 0) {
|
|
327
|
+
const chunk = pendingQueue.shift();
|
|
328
|
+
const samplesWritten = speaker.write(chunkToArrayBuffer(chunk));
|
|
329
|
+
const bytesWritten = samplesWritten * BYTES_PER_SAMPLE;
|
|
330
|
+
if (bytesWritten < chunk.byteLength) {
|
|
331
|
+
// Partial write — pvspeaker's ring buffer didn't have room
|
|
332
|
+
// for the whole chunk. Requeue the tail at the FRONT of the
|
|
333
|
+
// queue so the next iteration continues in order. Using
|
|
334
|
+
// `subarray` here keeps the same underlying memory rather
|
|
335
|
+
// than copying.
|
|
336
|
+
const tail = chunk.subarray(bytesWritten);
|
|
337
|
+
pendingQueue.unshift(tail);
|
|
338
|
+
if (samplesWritten === 0) {
|
|
287
339
|
stallCount++;
|
|
288
340
|
if (stallCount >= MAX_STALL_ITERATIONS) {
|
|
289
|
-
|
|
290
|
-
|
|
341
|
+
const droppedBytes = pendingQueue.reduce((n, b) => n + b.byteLength, 0);
|
|
342
|
+
console.error(`[playback] pvspeaker stalled after ${MAX_STALL_ITERATIONS} iterations, dropping ${droppedBytes} bytes`);
|
|
343
|
+
pendingQueue = [];
|
|
291
344
|
return;
|
|
292
345
|
}
|
|
293
346
|
}
|
|
294
347
|
else {
|
|
295
348
|
stallCount = 0; // Made progress
|
|
296
349
|
}
|
|
350
|
+
// Yield so the speaker can consume what it already has
|
|
297
351
|
await new Promise((r) => setTimeout(r, 10));
|
|
298
352
|
}
|
|
299
353
|
else {
|
|
@@ -313,7 +367,7 @@ async function createPvSpeakerPlayback() {
|
|
|
313
367
|
speaker.start();
|
|
314
368
|
},
|
|
315
369
|
stop() {
|
|
316
|
-
|
|
370
|
+
pendingQueue = [];
|
|
317
371
|
if (speaker) {
|
|
318
372
|
try {
|
|
319
373
|
speaker.flush();
|
|
@@ -330,10 +384,9 @@ async function createPvSpeakerPlayback() {
|
|
|
330
384
|
if (!speaker)
|
|
331
385
|
return;
|
|
332
386
|
const buffer = Buffer.from(base64Pcm, 'base64');
|
|
333
|
-
|
|
334
|
-
//
|
|
335
|
-
|
|
336
|
-
pending.push(sample);
|
|
387
|
+
// Queue the raw PCM Buffer — drain() converts to ArrayBuffer
|
|
388
|
+
// only at the point it hands bytes to the native speaker.
|
|
389
|
+
pendingQueue.push(buffer);
|
|
337
390
|
void drain();
|
|
338
391
|
},
|
|
339
392
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playback.js","sourceRoot":"","sources":["../../src/audio/playback.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"playback.js","sourceRoot":"","sources":["../../src/audio/playback.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED