תיקון פונקציונליות timeout

איפוס הטיימר בכל בקשה חדשה, ותיקונים נוספים

Author: ShlomoCode

README.md

@@ -54,6 +54,9 @@ npm i yemot-router2
 **5.1.2**
 תוקנה התמיכה בבקשות POST (ההגדרה api_url_post=yes בשלוחה), שבהן הפרמטרים נשלחים בbody ולא בquery
 נוסף פרוקסי שמיירט נסיון גישה לreq.query בבקשות POST או לreq.body בבקשות GET, ומציג הסבר מפורט לתיקון.
+
+**5.1.3**
+תוקנה האופציה timeout באתחול הראוטר.
 </details>
 
 <details>

lib/call.js

@@ -46,8 +46,6 @@ class Call {
                 this.globalResponseTxt = '';
             }
 
-            await this.blockRunningUntilNextRequest();
-
             this.send(responseText);
 
             await this.blockRunningUntilNextRequest();
@@ -155,34 +153,29 @@ class Call {
     }
 
     async blockRunningUntilNextRequest () {
-        if (!this.res._headerSent) return; // TODO: check if this is needed. legacy code
-        if (this.ops.printLog) this.logger('🔒 fn running blocked - wait to next request from yemot');
+        if (this.ops.printLog) this.logger('🔒 fn running blocked - waiting to next request from yemot');
         return new Promise((resolve, reject) => {
+            if (this.ops.timeout) {
+                clearTimeout(this._timeoutId);
+                this._timeoutId = setTimeout(() => {
+                    if (!this.res._headerSent) this.res.json({ message: 'timeout' });
+                    reject(new TimeoutError(this));
+                }, this.ops.timeout);
+            }
             this.eventsEmitter.once(this.callId, (isHangup) => {
                 this.logger('🔓 fn running unblocked');
-                if (this.ops.timeout) {
-                    setTimeout(() => {
-                        this.onTimeout(reject);
-                    }, this.ops.timeout);
-                }
+                if (this._timeoutId) {
+                    clearTimeout(this._timeoutId);
+                };
                 if (isHangup) {
-                    this.onHangup(reject);
+                    if (!this.res._headerSent) this.res.json({ message: 'hangup' });
+                    reject(new HangupError(this));
                 } else {
                     resolve(isHangup);
                 }
             });
         });
     }
-
-    onHangup (reject) {
-        this.res.json({ message: 'hangup' });
-        reject(new HangupError(this));
-    }
-
-    onTimeout (reject) {
-        this.res.json({ message: 'timeout' });
-        reject(new TimeoutError(this));
-    }
 }
 
 module.exports = Call;

lib/yemot_router.js

@@ -21,6 +21,11 @@ function YemotRouter (options = {}) {
         timeout: options.timeout || 0,
         uncaughtErrorsHandler: options.uncaughtErrorsHandler || null
     };
+
+    if (ops.timeout && Number.isNaN(ops.timeout)) {
+        throw new Error('YemotRouter: if you set timeout option, it must be a number');
+    }
+
     const activeCalls = {};
     const eventsEmitter = new EventEmitter();
 
@@ -29,43 +34,32 @@ function YemotRouter (options = {}) {
         console.log(colors[color](`[${callId}]: ${msg}`));
     }
 
-    function onFnDone (callId) {
-        delete activeCalls[callId];
-        logger(callId, '🆗 the function is done');
-    }
-
-    function onExit (callId) {
-        delete activeCalls[callId];
-        logger(callId, '👋 call is exit');
-    }
-
-    function onHangup (callId) {
-        delete activeCalls[callId];
-        logger(callId, '👋 call is hangup');
-    }
-
-    function onTimeout (callId) {
+    function deleteCall (callId) {
+        if (activeCalls[callId]?._timeoutId) {
+            clearTimeout(activeCalls[callId]._timeoutId);
+        }
         delete activeCalls[callId];
-        logger(callId, 'timeout for receiving a response from the caller. the call has been deleted from active calls', 'red');
     }
 
     async function makeNewCall (fn, callId, call) {
         try {
             await fn(call);
-            onFnDone(callId);
+            deleteCall(callId);
+            logger(callId, '🆗 the function is done');
         } catch (error) {
+            deleteCall(callId);
+
             // טיפול בשגיאות מלאכותיות שנועדו לעצור את ריצת הפונקציה - בניתוק לדוגמה
             if (error instanceof HangupError) {
-                onHangup(callId);
+                logger(callId, '👋 call is hangup');
             } else if (error instanceof TimeoutError) {
-                onTimeout(callId);
+                logger(callId, 'the timeout for the caller\'s answer has expired. the call function has killed and been removed from the active calls');
             } else if (error instanceof ExitError) {
-                onExit(callId);
+                logger(callId, '👋 call is exit');
             } else {
                 if (ops.uncaughtErrorsHandler) {
                     logger(callId, '💥 Uncaught error. applying uncaughtErrorsHandler', 'red');
                     ops.uncaughtErrorsHandler(error, call);
-                    delete activeCalls[callId];
                 } else {
                     logger(callId, '💥 Uncaught error. no uncaughtErrorsHandler, throwing error', 'red');
                     throw error;
@@ -90,7 +84,7 @@ function YemotRouter (options = {}) {
                         const values = req.method === 'POST' ? req.body : req.query;
                         const requiredValues = ['ApiPhone', 'ApiDID', 'ApiExtension', 'ApiCallId'];
                         if (requiredValues.some((key) => !Object.prototype.hasOwnProperty.call(values, key))) {
-                            return res.json({ message: 'request is not valid yemot request' });
+                            return res.json({ message: 'the request is not valid yemot request' });
                         }
 
                         if (req.method === 'POST') {