add support for redis auth

forward incoming REFER to FS (#34 )
use registered contact as uri when sending to user (#32 )
2026-10-04 02:04:19 +00:00 · 2022-03-08 09:30:44 -05:00 · 2022-03-05 15:21:49 -05:00 · 2022-02-23 15:09:18 -05:00 · 2022-02-17 21:35:19 -05:00 · 2022-02-14 13:18:46 -05:00
4 changed files with 70 additions and 26 deletions
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run jslint
@@ -126,7 +126,7 @@ class CallSession extends Emitter {
      if (this.req.locals.registration) {
        debug(`sending call to registered user ${JSON.stringify(this.req.locals.registration)}`);
        const contact = this.req.locals.registration.contact;
-        let destUri = this.req.uri;
+        let destUri = contact;
        if (this.req.has('X-Override-To')) {
          const dest = this.req.get('X-Override-To');
          const uri = parseUri(contact);
@@ -134,12 +134,9 @@ class CallSession extends Emitter {
          destUri = stringifyUri(uri);
          this.logger.info(`overriding destination user with ${dest}, so final uri is ${destUri}`);
        }
-        if (contact.includes('transport=ws')) {
-          uris = [contact];
-        }
-        else {
+        uris = [destUri];
+        if (!contact.includes('transport=ws')) {
          proxy = this.req.locals.registration.proxy;
-          uris = [destUri];
        }
      }
      else if (this.req.locals.target === 'forward') {
@@ -458,6 +455,7 @@ class CallSession extends Emitter {
    uac.on('modify', this._onReinvite.bind(this, uac));

    uas.on('refer', this._onFeatureServerTransfer.bind(this, uas));
+    uac.on('refer', this._onRefer.bind(this, uac));

    uas.on('info', this._onInfo.bind(this, uas));
    uac.on('info', this._onInfo.bind(this, uac));
@@ -466,6 +464,23 @@ class CallSession extends Emitter {
    forwardInDialogRequests(uac,  ['notify', 'options', 'message']);
  }

+  async _onRefer(dlg, req, res) {
+    /* REFER coming in from a sip device, forward to feature server */
+    try {
+      const response = await dlg.other.request({
+        method: 'REFER',
+        headers: {
+          'Refer-To': req.get('Refer-To'),
+          'Referred-By': req.get('Referred-By'),
+          'User-Agent': req.get('User-Agent')
+        }
+      });
+      res.send(response.status, response.reason);
+    } catch (err) {
+      this.logger.error({err}, 'CallSession:_onRefer: error handling incoming REFER');
+    }
+  }
+
  async _onDTMF(dlg, payload) {
    this.logger.info({payload}, '_onDTMF');
    try {
@@ -527,6 +542,7 @@ Duration=${payload.duration} `
      }
      else {
        sdp = await dlg.other.modify(response.sdp);
+        this.logger.info({sdp}, 'CallSession:_onReinvite: got sdp from 200 OK to invite we sent');
      }
      opts = {
        ...this.rtpEngineOpts.common,
@@ -540,6 +556,7 @@ Duration=${payload.duration} `
        res.send(488);
        throw new Error(`_onReinvite: rtpengine failed: ${JSON.stringify(response)}`);
      }
+      this.logger.info({sdp: response.sdp}, 'CallSession:_onReinvite: sending back upstream');
      res.send(200, {body: response.sdp});
    } catch (err) {
      this.logger.error(err, 'Error handling reinvite');
@@ -9,9 +9,9 @@
      "version": "v0.7.3",
      "license": "MIT",
      "dependencies": {
-        "@jambonz/db-helpers": "^0.6.16",
+        "@jambonz/db-helpers": "^0.6.17",
        "@jambonz/http-health-check": "^0.0.1",
-        "@jambonz/mw-registrar": "0.2.1",
+        "@jambonz/mw-registrar": "0.2.2",
        "@jambonz/realtimedb-helpers": "^0.4.24",
        "@jambonz/rtpengine-utils": "^0.3.1",
        "@jambonz/stats-collector": "^0.1.6",
@@ -20,6 +20,7 @@
        "debug": "^4.3.3",
        "drachtio-fn-b2b-sugar": "^0.0.12",
        "drachtio-srf": "^4.4.59",
+        "husky": "^7.0.4",
        "pino": "^7.4.1"
      },
      "devDependencies": {
@@ -1374,9 +1375,9 @@
      }
    },
    "node_modules/@jambonz/db-helpers": {
-      "version": "0.6.16",
-      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.6.16.tgz",
-      "integrity": "sha512-jvQULOgoRorevFoZ4RbKIF7QvswSor5sk+THigEId7uPAlaq/GRKCWdEA1rxEizzhfOAiRT6Qg2tyisZ9eg3aA==",
+      "version": "0.6.17",
+      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.6.17.tgz",
+      "integrity": "sha512-3L5F6SFVpjn59CO23MpqMydTy1ox2FRe/kry9Zfv8kjTNTSMmfn01c51hjoXcX1v2kdx61qkGvCN6pHlc2LoSQ==",
      "dependencies": {
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.3",
@@ -1396,8 +1397,9 @@
      }
    },
    "node_modules/@jambonz/mw-registrar": {
-      "version": "0.2.1",
-      "integrity": "sha512-OMUvyVgFlZVQ7NzyjT7FUJlfEBhvfxFzkVjiixC19GxeMZODwoIwk6CM3cC2hBr3iTt/hlO7CKyLe0JdYqHRdQ==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@jambonz/mw-registrar/-/mw-registrar-0.2.2.tgz",
+      "integrity": "sha512-CG0MUVRZZ+tBgB5kvjn5IS1R/OdNV5PpAsxCKE0ehe6XVJ1ap4ch9hSZmEh2q7qPnWu8sR451peF33dnoSeaPA==",
      "dependencies": {
        "@jambonz/promisify-redis": "^0.0.6",
        "debug": "^4.3.1",
@@ -3288,6 +3290,20 @@
        "node": ">= 6"
      }
    },
+    "node_modules/husky": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
+      "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
+      "bin": {
+        "husky": "lib/bin.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/typicode"
+      }
+    },
    "node_modules/iconv-lite": {
      "version": "0.6.3",
      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
@@ -5468,9 +5484,9 @@
      }
    },
    "node_modules/url-parse": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz",
-      "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
      "dependencies": {
        "querystringify": "^2.1.1",
        "requires-port": "^1.0.0"
@@ -6790,9 +6806,9 @@
      "dev": true
    },
    "@jambonz/db-helpers": {
-      "version": "0.6.16",
-      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.6.16.tgz",
-      "integrity": "sha512-jvQULOgoRorevFoZ4RbKIF7QvswSor5sk+THigEId7uPAlaq/GRKCWdEA1rxEizzhfOAiRT6Qg2tyisZ9eg3aA==",
+      "version": "0.6.17",
+      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.6.17.tgz",
+      "integrity": "sha512-3L5F6SFVpjn59CO23MpqMydTy1ox2FRe/kry9Zfv8kjTNTSMmfn01c51hjoXcX1v2kdx61qkGvCN6pHlc2LoSQ==",
      "requires": {
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.3",
@@ -6809,8 +6825,9 @@
      }
    },
    "@jambonz/mw-registrar": {
-      "version": "0.2.1",
-      "integrity": "sha512-OMUvyVgFlZVQ7NzyjT7FUJlfEBhvfxFzkVjiixC19GxeMZODwoIwk6CM3cC2hBr3iTt/hlO7CKyLe0JdYqHRdQ==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@jambonz/mw-registrar/-/mw-registrar-0.2.2.tgz",
+      "integrity": "sha512-CG0MUVRZZ+tBgB5kvjn5IS1R/OdNV5PpAsxCKE0ehe6XVJ1ap4ch9hSZmEh2q7qPnWu8sR451peF33dnoSeaPA==",
      "requires": {
        "@jambonz/promisify-redis": "^0.0.6",
        "debug": "^4.3.1",
@@ -8267,6 +8284,11 @@
        "debug": "4"
      }
    },
+    "husky": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
+      "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ=="
+    },
    "iconv-lite": {
      "version": "0.6.3",
      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
@@ -9869,9 +9891,9 @@
      }
    },
    "url-parse": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz",
-      "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==",
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
      "requires": {
        "querystringify": "^2.1.1",
        "requires-port": "^1.0.0"
@@ -27,9 +27,9 @@
    "jslint": "eslint app.js lib"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.6.16",
+    "@jambonz/db-helpers": "^0.6.17",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/mw-registrar": "0.2.1",
+    "@jambonz/mw-registrar": "0.2.2",
    "@jambonz/realtimedb-helpers": "^0.4.24",
    "@jambonz/rtpengine-utils": "^0.3.1",
    "@jambonz/stats-collector": "^0.1.6",
@@ -38,6 +38,7 @@
    "debug": "^4.3.3",
    "drachtio-fn-b2b-sugar": "^0.0.12",
    "drachtio-srf": "^4.4.59",
+    "husky": "^7.0.4",
    "pino": "^7.4.1"
  },
  "devDependencies": {
Author	SHA1	Message	Date
Dave Horton	98ecfa20aa	add support for redis auth	2022-03-08 09:30:44 -05:00
Dave Horton	56efe50aec	forward incoming REFER to FS (#34 )	2022-03-05 15:21:49 -05:00
Dave Horton	891d0ff38b	use registered contact as uri when sending to user (#32 )	2022-02-23 15:09:18 -05:00
Dave Horton	78d6cb5f22	use registered contact as uri when sending to user (#31 )	2022-02-17 21:35:19 -05:00
Dave Horton	23255a71db	added pre-commit hook for linting	2022-02-14 13:18:46 -05:00