@andresaya/edge-tts 1.6.0 → 1.6.2

package/dist/services/EdgeTTS.js

@@ -114,19 +114,25 @@ class EdgeTTS {
             this.audio_stream = [];
             const reqId = this.generateUUID();
             const url = `${constants_1.Constants.WSS_URL}?Ocp-Apim-Subscription-Key=${constants_1.Constants.TRUSTED_CLIENT_TOKEN}&Sec-MS-GEC=${secMsGEC}&Sec-MS-GEC-Version=${constants_1.Constants.VERSION_MS_GEC}&ConnectionId=${reqId}`;
-            console.log('WebSocket URL:', url);
             this.ws = new ws_1.default(url, {
                 headers: constants_1.Constants.getBaseHeaders(),
                 rejectUnauthorized: false
             });
             const SSML_text = this.getSSML(text, voice, options);
-            const timeout = setTimeout(() => {
-                if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
-                    this.ws.close();
-                }
-                reject(new Error("Synthesis timeout"));
-            }, 30000);
+            let timedOut = false;
+            let inactivityTimeout;
+            const resetInactivityTimeout = () => {
+                clearTimeout(inactivityTimeout);
+                inactivityTimeout = setTimeout(() => {
+                    timedOut = true;
+                    if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
+                        this.ws.close();
+                    }
+                    reject(new Error("WebSocket inactivity timeout - no response from server"));
+                }, 30000); // 30 seconds of inactivity
+            };
             this.ws.on('open', () => {
+                resetInactivityTimeout(); // start the inactivity timeout
                 const message = this.buildTTSConfigMessage();
                 this.ws.send(message);
                 const timestamp = this.nowRFC1123();
@@ -134,18 +140,21 @@ class EdgeTTS {
                 this.ws.send(speechMessage);
             });
             this.ws.on('message', (data) => {
+                resetInactivityTimeout(); // restart inactivity timeout
                 this.processAudioData(data);
             });
             this.ws.on('error', (err) => {
-                clearTimeout(timeout);
+                clearTimeout(inactivityTimeout);
                 if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
                     this.ws.close();
                 }
                 reject(err);
             });
             this.ws.on('close', () => {
-                clearTimeout(timeout);
-                resolve();
+                clearTimeout(inactivityTimeout);
+                if (!timedOut) {
+                    resolve();
+                }
             });
         });
     }
@@ -271,12 +280,25 @@ class EdgeTTS {
                 notify = null;
             }
         };
-        const timeout = setTimeout(() => {
-            if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
-                this.ws.close();
-            }
-        }, 30000);
+        let timedOut = false;
+        let inactivityTimeout;
+        const resetInactivityTimeout = () => {
+            clearTimeout(inactivityTimeout);
+            inactivityTimeout = setTimeout(() => {
+                timedOut = true;
+                error = new Error("WebSocket inactivity timeout - no response from server");
+                done = true;
+                if (this.ws && this.ws.readyState === ws_1.default.OPEN) {
+                    this.ws.close();
+                }
+                if (notify) {
+                    notify();
+                    notify = null;
+                }
+            }, 30000); // 30 seconds of inactivity
+        };
         this.ws.on('open', () => {
+            resetInactivityTimeout(); // start the inactivity timeout
             const message = this.buildTTSConfigMessage();
             this.ws.send(message);
             const timestamp = this.nowRFC1123();
@@ -284,6 +306,7 @@ class EdgeTTS {
             this.ws.send(speechMessage);
         });
         this.ws.on('message', (data) => {
+            resetInactivityTimeout(); // restart inactivity timeout
             const buffer = ensureBuffer(data);
             const needle = buffer_1.Buffer.from('Path:audio\r\n');
             const audioStartIndex = buffer.indexOf(new Uint8Array(needle));
@@ -307,6 +330,7 @@ class EdgeTTS {
             }
         });
         this.ws.on('error', (err) => {
+            clearTimeout(inactivityTimeout);
             error = err;
             done = true;
             if (notify) {
@@ -315,7 +339,7 @@ class EdgeTTS {
             }
         });
         this.ws.on('close', () => {
-            clearTimeout(timeout);
+            clearTimeout(inactivityTimeout);
             done = true;
             if (notify) {
                 notify();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andresaya/edge-tts",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Edge TTS is a package that allows access to the online text-to-speech service used by Microsoft Edge without the need for Microsoft Edge, Windows, or an API key.",
   "main": "dist/index.js",
   "browser": "dist/browser/edge-tts.esm.js",