@fonoster/streams 0.16.0 → 0.16.5

package/dist/AudioPlayer.d.ts

@@ -7,6 +7,7 @@ export declare class AudioPlayer {
     private activeStream;
     private socket;
     private isPlaying;
+    private currentSessionId;
     /**
      * Creates a new AudioPlayer.
      *

package/dist/AudioPlayer.js

@@ -63,6 +63,7 @@ exports.AudioPlayer = void 0;
  */
 const fs = __importStar(require("fs"));
 const promises_1 = require("node:timers/promises");
+const stream_1 = require("stream");
 const logger_1 = require("@fonoster/logger");
 const Message_1 = require("./Message");
 const logger = (0, logger_1.getLogger)({ service: "streams", filePath: __filename });
@@ -79,6 +80,7 @@ class AudioPlayer {
     constructor(socket) {
         this.activeStream = null;
         this.isPlaying = false;
+        this.currentSessionId = 0;
         this.socket = socket;
     }
     /**
@@ -89,16 +91,9 @@ class AudioPlayer {
      */
     play(filePath) {
         return __awaiter(this, void 0, void 0, function* () {
-            const fileStream = fs.readFileSync(filePath);
             logger.verbose("playing audio file", { filePath });
-            let offset = 0;
-            // eslint-disable-next-line no-loops/no-loops
-            while (offset < fileStream.length) {
-                const sliceSize = Math.min(fileStream.length - offset, MAX_CHUNK_SIZE);
-                const slicedChunk = fileStream.subarray(offset, offset + sliceSize);
-                yield this._processAudioChunk(slicedChunk);
-                offset += sliceSize;
-            }
+            const fileData = fs.readFileSync(filePath);
+            return this.playStream(stream_1.Readable.from(fileData));
         });
     }
     /**
@@ -110,16 +105,26 @@ class AudioPlayer {
      */
     playStream(inputStream) {
         return __awaiter(this, void 0, void 0, function* () {
+            // Stop any currently playing stream before starting a new one
+            this.stop();
             this.isPlaying = true;
+            // Increment session ID to invalidate any in-flight processing from previous streams
+            const sessionId = ++this.currentSessionId;
             this.activeStream = inputStream;
             const buffer = [];
             let isProcessing = false;
             const processBuffer = () => __awaiter(this, void 0, void 0, function* () {
-                if (!this.isPlaying || isProcessing || buffer.length === 0)
+                // Check both isPlaying AND that this session is still current
+                if (!this.isPlaying ||
+                    sessionId !== this.currentSessionId ||
+                    isProcessing ||
+                    buffer.length === 0)
                     return;
                 isProcessing = true;
                 try {
-                    while (buffer.length > 0 && this.isPlaying) {
+                    while (buffer.length > 0 &&
+                        this.isPlaying &&
+                        sessionId === this.currentSessionId) {
                         const chunk = buffer.shift();
                         yield this._processAudioChunk(chunk);
                     }
@@ -130,7 +135,8 @@ class AudioPlayer {
             });
             return new Promise((resolve, reject) => {
                 inputStream.on("data", (chunk) => __awaiter(this, void 0, void 0, function* () {
-                    if (!this.isPlaying || this.activeStream !== inputStream)
+                    // Check session ID to ensure this stream is still active
+                    if (!this.isPlaying || sessionId !== this.currentSessionId)
                         return;
                     for (let offset = 0; offset < chunk.length; offset += MAX_CHUNK_SIZE) {
                         const sliceSize = Math.min(chunk.length - offset, MAX_CHUNK_SIZE);
@@ -172,9 +178,7 @@ class AudioPlayer {
             this.activeStream.removeAllListeners("data");
             this.activeStream.removeAllListeners("error");
             this.activeStream.removeAllListeners("end");
-            if (typeof this.activeStream.pause === "function") {
-                this.activeStream.pause();
-            }
+            this.activeStream.pause();
             this.activeStream = null;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/streams",
-  "version": "0.16.0",
+  "version": "0.16.5",
   "description": "Core support for Fonoster Streams",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
@@ -18,7 +18,7 @@
     "generate:readme": "node ../../.scripts/gen-readme.cjs"
   },
   "dependencies": {
-    "@fonoster/logger": "^0.16.0",
+    "@fonoster/logger": "^0.16.5",
     "uuid": "^11.0.3"
   },
   "devDependencies": {
@@ -37,5 +37,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/fonoster/issues"
   },
-  "gitHead": "ad4212a7938ad2e219b9d1ae27a430ec60d9f841"
+  "gitHead": "a5ccfd263e40899643d1bbd298d89e729d8c4802"
 }