update deps

* fix race condition with call counts when quick cancel is received

* wip

* update dractio-srf and mrf to main branch releases

app.js

@@ -68,7 +68,6 @@ const {
 const {
   client: redisClient,
   addKey,
-  deleteKey,
   retrieveKey,
   createSet,
   retrieveSet,
@@ -112,7 +111,6 @@ srf.locals = {...srf.locals,
   },
   realtimeDbHelpers: {
     addKey,
-    deleteKey,
     retrieveKey,
     createSet,
     incrKey,

lib/call-session.js

@@ -454,15 +454,13 @@ class CallSession extends Emitter {
         if (process.env.JAMBONES_HOSTING || trackingOn) {
           const {writeCallCount, writeCallCountSP, writeCallCountApp} = this.req.srf.locals;
           if (!this.req.locals.callCountNudged) {
-            const {callId} = this.req.locals;
             this.req.locals.callCountNudged = true;
-            this.logger.info('decrementing call count at end of call due to normal termination');
+            this.logger.debug('decrementing call count at end of call');
             await nudgeCallCounts(this.logger, {
               service_provider_sid: this.service_provider_sid,
               account_sid: this.account_sid,
-              application_sid: this.application_sid,
-              callId
-            }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp}, -1)
+              application_sid: this.application_sid
+            }, this.decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
               .catch((err) => this.logger.error(err, 'Error decrementing call counts'));
           }
         }

lib/middleware.js

@@ -248,7 +248,6 @@ module.exports = function(srf, logger) {
   };
 
   const checkLimits = async(req, res, next) => {
-    const {callId} = req.locals;
     const trackingOn = process.env.JAMBONES_TRACK_ACCOUNT_CALLS ||
     process.env.JAMBONES_TRACK_SP_CALLS ||
     process.env.JAMBONES_TRACK_APP_CALLS;
@@ -260,17 +259,23 @@ module.exports = function(srf, logger) {
     assert(account_sid);
     assert(service_provider_sid);
 
+    /* if quick cancel then we are done */
+    if (req.canceled) {
+      logger.info('checkLimits: call was immediately canceled, no need to increment call count as we are done');
+      return;
+    }
+
     /* decrement count if INVITE is later rejected */
     res.once('end', async({status}) => {
       if (status > 200 && !req.locals.callCountNudged) {
         req.locals.callCountNudged = true;
-        logger.debug('decrementing call count due to call rejection');
+        logger.info('decrementing call count due to call rejection');
+
         nudgeCallCounts(logger, {
           service_provider_sid,
           account_sid,
-          application_sid,
-          callId
-        }, decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp}, -1)
+          application_sid
+        }, decrKey, {writeCallCountSP, writeCallCount, writeCallCountApp})
           .catch((err) => logger.error(err, 'Error decrementing call counts'));
       }
     });
@@ -280,9 +285,8 @@ module.exports = function(srf, logger) {
       const  {callsSP, calls} = await nudgeCallCounts(logger, {
         service_provider_sid,
         account_sid,
-        application_sid,
-        callId
-      }, incrKey, {writeCallCountSP, writeCallCount, writeCallCountApp}, 1);
+        application_sid
+      }, incrKey, {writeCallCountSP, writeCallCount, writeCallCountApp});
 
       /* compare to account's limit, though avoid db hit when call count is low */
       const minLimit = process.env.MIN_CALL_LIMIT ?

lib/utils.js

@@ -117,8 +117,8 @@ const createHealthCheckApp = (port, logger) => {
   });
 };
 
-const nudgeCallCounts = async(logger, sids, nudgeOperator, writers, direction) => {
-  const { service_provider_sid, account_sid, callId, application_sid } = sids;
+const nudgeCallCounts = async(logger, sids, nudgeOperator, writers) => {
+  const { service_provider_sid, account_sid, application_sid } = sids;
   const { writeCallCount, writeCallCountSP, writeCallCountApp } = writers;
   const nudges = [];
   const writes = [];
@@ -149,24 +149,10 @@ const nudgeCallCounts = async(logger, sids, nudgeOperator, writers, direction) =
 
   try {
     const [callsSP, calls, callsApp] = await Promise.all(nudges);
-    logger.info({
+    logger.debug({
       calls, callsSP, callsApp,
       service_provider_sid, account_sid, application_sid
-    }, `call counts after ${direction > 0 ? 'increment' : 'decrement'}`);
-
-    //if (process.env.JAMBONES_DEBUG_CALL_COUNTS) {
-    const {srf} = require('..');
-    const {addKey, deleteKey} = srf.locals.realtimeDbHelpers;
-
-    if (direction > 0) {
-      // save for 3 days
-      await addKey(`debug:incalls:${account_sid}:${callId}`, new Date().toISOString(), 259200);
-    }
-    else {
-      await deleteKey(`debug:incalls:${account_sid}:${callId}`);
-    }
-    //}
-
+    }, 'call counts after adjustment');
     if (process.env.JAMBONES_TRACK_SP_CALLS) {
       writes.push(writeCallCountSP({ service_provider_sid, calls_in_progress: callsSP }));
     }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "sbc-inbound",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "sbc-inbound",
-      "version": "0.9.2",
+      "version": "0.9.3",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-auto-scaling": "^3.549.0",
@@ -22,8 +22,8 @@
         "bent": "^7.3.12",
         "cidr-matcher": "^2.1.1",
         "debug": "^4.3.4",
-        "drachtio-fn-b2b-sugar": "0.1.0",
-        "drachtio-srf": "^4.5.38",
+        "drachtio-fn-b2b-sugar": "0.2.1",
+        "drachtio-srf": "^5.0.1",
         "express": "^4.19.2",
         "pino": "^8.20.0",
         "verify-aws-sns-signature": "^0.1.0",
@@ -2686,9 +2686,9 @@
       "dev": true
     },
     "node_modules/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -2704,9 +2704,9 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
@@ -2943,23 +2943,20 @@
       }
     },
     "node_modules/drachtio-fn-b2b-sugar": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/drachtio-fn-b2b-sugar/-/drachtio-fn-b2b-sugar-0.1.0.tgz",
-      "integrity": "sha512-3m5oVLJzXhtrGFAYuMV4BPhnB0f4sEn9+NZSopFOcwBq1f4Z1Pi6NlyfAPg2LgDJfdop5VqGFbcgKJhzkp3dFA==",
-      "peerDependencies": {
-        "drachtio-srf": "^4.5.x"
-      }
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/drachtio-fn-b2b-sugar/-/drachtio-fn-b2b-sugar-0.2.1.tgz",
+      "integrity": "sha512-bMtje8GWVTze+UG6WSGnlUfBaYCuFiApNXl/XxWc+X9uATZiZkV2jIqhf+Y4SY3nS8dZclJIVKd9qwoCa+i+Vw=="
     },
     "node_modules/drachtio-srf": {
-      "version": "4.5.38",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.38.tgz",
-      "integrity": "sha512-dEafgn1OPfkc30Gq3JwJBF4Q7O96fsuqMnE2OO1NqRG0DkwworMIPsusWDo0ePbi+NH74rMjLPmVyC/owA0HXg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.1.tgz",
+      "integrity": "sha512-HMPn+xLm2TCYY6cJoRpTlhCRakyKgPD93lM1gg6nNIlO9gPSKlUjX3mxL4iaFKuh+UFMMTAoB26fj892A6Lr4Q==",
       "dependencies": {
         "debug": "^3.2.7",
         "delegates": "^0.1.0",
         "node-noop": "^0.0.1",
         "only": "^0.0.2",
-        "sdp-transform": "^2.14.1",
+        "sdp-transform": "^2.15.0",
         "short-uuid": "^4.2.2",
         "sip-methods": "^0.3.0",
         "sip-status": "^0.1.0",
@@ -3425,16 +3422,16 @@
       }
     },
     "node_modules/express": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
-      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
         "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.6.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -3448,7 +3445,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -3463,6 +3460,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express/node_modules/debug": {
@@ -5393,9 +5394,9 @@
       "dev": true
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "node_modules/picocolors": {
       "version": "1.0.0",
@@ -5821,9 +5822,9 @@
       "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="
     },
     "node_modules/sdp-transform": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/sdp-transform/-/sdp-transform-2.14.1.tgz",
-      "integrity": "sha512-RjZyX3nVwJyCuTo5tGPx+PZWkDMCg7oOLpSlhjDdZfwUoNqG1mM8nyj31IGHyaPWXhjbP7cdK3qZ2bmkJ1GzRw==",
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/sdp-transform/-/sdp-transform-2.15.0.tgz",
+      "integrity": "sha512-KrOH82c/W+GYQ0LHqtr3caRpM3ITglq3ljGUIb8LTki7ByacJZ9z+piSGiwZDsRyhQbYBOBJgr2k6X4BZXi3Kw==",
       "bin": {
         "sdp-verify": "checker.js"
       }
@@ -8881,9 +8882,9 @@
       "dev": true
     },
     "cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w=="
     },
     "cookie-signature": {
       "version": "1.0.6",
@@ -8896,9 +8897,9 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
     },
     "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "requires": {
         "path-key": "^3.1.0",
@@ -9060,21 +9061,20 @@
       }
     },
     "drachtio-fn-b2b-sugar": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/drachtio-fn-b2b-sugar/-/drachtio-fn-b2b-sugar-0.1.0.tgz",
-      "integrity": "sha512-3m5oVLJzXhtrGFAYuMV4BPhnB0f4sEn9+NZSopFOcwBq1f4Z1Pi6NlyfAPg2LgDJfdop5VqGFbcgKJhzkp3dFA==",
-      "requires": {}
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/drachtio-fn-b2b-sugar/-/drachtio-fn-b2b-sugar-0.2.1.tgz",
+      "integrity": "sha512-bMtje8GWVTze+UG6WSGnlUfBaYCuFiApNXl/XxWc+X9uATZiZkV2jIqhf+Y4SY3nS8dZclJIVKd9qwoCa+i+Vw=="
     },
     "drachtio-srf": {
-      "version": "4.5.38",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.38.tgz",
-      "integrity": "sha512-dEafgn1OPfkc30Gq3JwJBF4Q7O96fsuqMnE2OO1NqRG0DkwworMIPsusWDo0ePbi+NH74rMjLPmVyC/owA0HXg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.1.tgz",
+      "integrity": "sha512-HMPn+xLm2TCYY6cJoRpTlhCRakyKgPD93lM1gg6nNIlO9gPSKlUjX3mxL4iaFKuh+UFMMTAoB26fj892A6Lr4Q==",
       "requires": {
         "debug": "^3.2.7",
         "delegates": "^0.1.0",
         "node-noop": "^0.0.1",
         "only": "^0.0.2",
-        "sdp-transform": "^2.14.1",
+        "sdp-transform": "^2.15.0",
         "short-uuid": "^4.2.2",
         "sip-methods": "^0.3.0",
         "sip-status": "^0.1.0",
@@ -9436,16 +9436,16 @@
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
     },
     "express": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
-      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
         "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.6.0",
+        "cookie": "0.7.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -9459,7 +9459,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -10869,9 +10869,9 @@
       "dev": true
     },
     "path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "picocolors": {
       "version": "1.0.0",
@@ -11169,9 +11169,9 @@
       "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="
     },
     "sdp-transform": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/sdp-transform/-/sdp-transform-2.14.1.tgz",
-      "integrity": "sha512-RjZyX3nVwJyCuTo5tGPx+PZWkDMCg7oOLpSlhjDdZfwUoNqG1mM8nyj31IGHyaPWXhjbP7cdK3qZ2bmkJ1GzRw=="
+      "version": "2.15.0",
+      "resolved": "https://registry.npmjs.org/sdp-transform/-/sdp-transform-2.15.0.tgz",
+      "integrity": "sha512-KrOH82c/W+GYQ0LHqtr3caRpM3ITglq3ljGUIb8LTki7ByacJZ9z+piSGiwZDsRyhQbYBOBJgr2k6X4BZXi3Kw=="
     },
     "semver": {
       "version": "7.5.4",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sbc-inbound",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "main": "app.js",
   "engines": {
     "node": ">= 18.0.0"
@@ -39,8 +39,8 @@
     "bent": "^7.3.12",
     "cidr-matcher": "^2.1.1",
     "debug": "^4.3.4",
-    "drachtio-fn-b2b-sugar": "0.1.0",
-    "drachtio-srf": "^4.5.38",
+    "drachtio-fn-b2b-sugar": "0.2.1",
+    "drachtio-srf": "^5.0.1",
     "express": "^4.19.2",
     "pino": "^8.20.0",
     "verify-aws-sns-signature": "^0.1.0",