upgrade drachtio srf (#121)

* upgrade drachtio srf

* fix review comments

app.js

@@ -67,7 +67,6 @@ const {LifeCycleEvents} = require('./lib/constants');
 const setNameRtp = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-rtp`;
 const rtpServers = [];
 const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-sip`;
-const Registrar = require('@jambonz/mw-registrar');
 
 const {
   pool,
@@ -81,8 +80,7 @@ const {
   lookupAccountBySid,
   lookupAccountCapacitiesBySid,
   queryCallLimits,
-  lookupClientByAccountAndUsername,
-  lookupAppBySid
+  lookupClientByAccountAndUsername
 } = require('@jambonz/db-helpers')({
   host: process.env.JAMBONES_MYSQL_HOST,
   port: process.env.JAMBONES_MYSQL_PORT || 3306,
@@ -102,7 +100,6 @@ const {
   host: process.env.JAMBONES_REDIS_HOST,
   port: process.env.JAMBONES_REDIS_PORT || 6379
 }, logger);
-const registrar = new Registrar(logger, redisClient);
 
 const ngProtocol = process.env.JAMBONES_NG_PROTOCOL || 'udp';
 const ngPort = process.env.RTPENGINE_PORT || ('udp' === ngProtocol ? 22222 : 8080);
@@ -123,7 +120,6 @@ srf.locals = {...srf.locals,
   activeCallIds: new Map(),
   getRtpEngine,
   dbHelpers: {
-    registrar,
     pool,
     ping,
     lookupAuthHook,
@@ -134,8 +130,7 @@ srf.locals = {...srf.locals,
     lookupAccountBySipRealm,
     lookupAccountCapacitiesBySid,
     queryCallLimits,
-    lookupClientByAccountAndUsername,
-    lookupAppBySid
+    lookupClientByAccountAndUsername
   },
   realtimeDbHelpers: {
     createSet,

lib/call-session.js

@@ -224,12 +224,6 @@ class CallSession extends Emitter {
       if (this.req.locals.application_sid) {
         Object.assign(headers, {'X-Application-Sid': this.req.locals.application_sid});
       }
-      if (this.req.locals.queue_name) {
-        Object.assign(headers, {'X-Queue-Name': this.req.locals.queue_name});
-      }
-      if (this.req.locals.called_user) {
-        Object.assign(headers, {'X-Called-User': this.req.locals.called_user});
-      }
       if (this.req.authorization) {
         if (this.req.authorization.grant && this.req.authorization.grant.application_sid) {
           Object.assign(headers, {'X-Application-Sid': this.req.authorization.grant.application_sid});
@@ -254,7 +248,8 @@ class CallSession extends Emitter {
           '-Max-Forwards',
           '-Record-Route',
           '-Session-Expires',
-          '-X-Subspace-Forwarded-For',
+          '-X-Application-Sid',
+          '-X-Authenticated-User'
         ],
         proxyResponseHeaders: ['all', '-X-Trace-ID'],
         localSdpB: spdOfferB,

lib/middleware.js

@@ -28,9 +28,7 @@ module.exports = function(srf, logger) {
     lookupAccountBySipRealm,
     lookupAccountBySid,
     lookupAccountCapacitiesBySid,
-    queryCallLimits,
-    lookupAppBySid,
-    registrar
+    queryCallLimits
   }  = srf.locals.dbHelpers;
   const {stats, writeCdrs} = srf.locals;
 
@@ -198,32 +196,11 @@ module.exports = function(srf, logger) {
           res.send(404);
           return req.srf.endSession(req);
         }
-        let deviceAppSid = null;
-        let called_user = null;
-        const queue_name = uri.user.startsWith('queue-') ? uri.user.match(/queue-(.*)/)[1] : null;
-        if (uri.user.startsWith('app-')) {
-          // Call from registered device to test application.
-          const appSid = uri.user.match(/app-(.*)/)[1];
-          const app = await lookupAppBySid(appSid);
-          if (app && app.account_sid === account.account_sid) {
-            deviceAppSid = app.application_sid;
-          }
-        } else if (!queue_name) {
-          // check if call to registered user
-          const {realm} = this.req.authorization.challengeResponse;
-          const calledAor = `${req.calledNumber}@${realm}`;
-          const reg = await registrar.query(calledAor);
-          if (reg) {
-            called_user = calledAor;
-          }
-        }
         req.locals = {
           service_provider_sid: account.service_provider_sid,
           account_sid: account.account_sid,
           account,
-          application_sid: deviceAppSid || account.device_calling_application_sid,
-          ...(queue_name && ({queue_name})),
-          ...(called_user && ({called_user})),
+          application_sid: account.device_calling_application_sid,
           webhook_secret: account.webhook_secret,
           realm: uri.host,
           ...(account.registration_hook && {

package.json

@@ -33,14 +33,13 @@
     "@jambonz/stats-collector": "^0.1.9",
     "@jambonz/time-series": "^0.2.5",
     "@jambonz/digest-utils": "^0.0.3",
-    "@jambonz/mw-registrar": "^0.2.4",
     "@aws-sdk/client-sns": "^3.360.0",
     "@aws-sdk/client-auto-scaling": "^3.360.0",
     "bent": "^7.3.12",
     "cidr-matcher": "^2.1.1",
     "debug": "^4.3.4",
     "drachtio-fn-b2b-sugar": "0.0.12",
-    "drachtio-srf": "^4.5.21",
+    "drachtio-srf": "^4.5.30",
     "express": "^4.18.1",
     "pino": "^7.11.0",
     "verify-aws-sns-signature": "^0.1.0",

test/scenarios/uac-pcap-pbx-success.xml

@@ -36,6 +36,8 @@
       Subject: uac-pcap-carrier-success
       Content-Type: application/sdp
       Content-Length: [len]
+      X-Authenticated-User: xhoaluu@jambonz.org
+      X-Application-Sid: APP_ID_1
 
       v=0
       o=user1 53655765 2353687637 IN IP[local_ip_type] [local_ip]