bump version

bugfix: mem leak
update deps
2026-10-04 18:44:38 +00:00 · 2022-04-06 08:18:22 -04:00 · 2022-04-05 19:57:03 -04:00 · 2022-04-01 13:46:16 -04:00 · 2022-03-28 09:09:14 -04:00 · 2022-03-23 09:26:04 -04:00
5 changed files with 82 additions and 38 deletions
@@ -1,4 +1,4 @@
-FROM node:17.4-slim
+FROM node:17-slim
 WORKDIR /opt/app/
 COPY package.json ./
 RUN npm install
@@ -43,7 +43,8 @@ const initCdr = (srf, req) => {
    attempted_at: Date.now(),
    direction: 'outbound',
    host: srf.locals.sipAddress,
-    remote_host: uri.host
+    remote_host: uri.host,
+    trace_id: req.get('X-Trace-ID') || '00000000000000000000000000000000'
  };
 };

@@ -286,6 +287,7 @@ class CallSession extends Emitter {
              'all',
              '-X-MS-Teams-FQDN',
              '-X-MS-Teams-Tenant-FQDN',
+              '-X-Trace-ID',
              'X-CID',
              '-Allow',
              '-Session-Expires',
@@ -379,6 +381,7 @@ class CallSession extends Emitter {
            this.emit('failed');
            this.rtpEngineResource.destroy()
              .catch((err) => this.logger.info({err}, 'Error destroying rtpe after failure'));
+            this.srf.endSession(this.req);
            const tags = ['accepted:no', `sipStatus:${status}`];
            this.stats.increment('sbc.originations', tags);

@@ -386,7 +389,7 @@ class CallSession extends Emitter {
              this.writeCdrs({...this.req.locals.cdr,
                terminated_at: Date.now(),
                termination_reason: 487 === status ? 'caller abandoned' : 'failed',
-                sip_status: status,
+                sip_status: status
              }).catch((err) => this.logger.error({err}, 'Error writing cdr for call failure'));
            }
          }
@@ -418,12 +421,14 @@ class CallSession extends Emitter {
    this.uas = uas;
    this.uac = uac;
    [uas, uac].forEach((dlg) => {
-      dlg.on('destroy', () => {
-        this.logger.info('call ended');
+      dlg.on('destroy', async() => {
+        const other = dlg.other;
        this.rtpEngineResource.destroy();
        this.activeCallIds.delete(this.req.get('Call-ID'));
        this.unsubscribeDTMF(this.logger, this.req.get('Call-ID'), this.rtpEngineOpts.uac.tag);
-        dlg.other.destroy();
+        try {
+          await other.destroy();
+        } catch (err) {}

        this.decrKey(this.callCountKey)
          .then((count) => {
@@ -444,6 +449,14 @@ class CallSession extends Emitter {
            duration: Math.floor((now - callStart) / 1000)
          }).catch((err) => this.logger.error({err}, 'Error writing cdr for completed call'));
        }
+        /* de-link the 2 Dialogs for GC */
+        dlg.removeAllListeners();
+        other.removeAllListeners();
+        dlg.other = null;
+        other.other = null;
+
+        this.logger.info(`call ended with normal termination, there are ${this.activeCallIds.size} active`);
+
        this.srf.endSession(this.req);
      });
    });
@@ -455,6 +468,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));
@@ -463,6 +477,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 {
@@ -524,6 +555,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,
@@ -537,6 +569,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');
@@ -17,7 +17,12 @@ module.exports = (srf, logger, opts) => {
    req.locals = req.locals || {};
    const callId = req.get('Call-ID');
    req.locals.account_sid = req.get('X-Account-Sid');
-    req.locals.logger = logger.child({callId, account_sid: req.locals.account_sid});
+    const traceId = req.locals.trace_id = req.get('X-Trace-ID');
+    req.locals.logger = logger.child({
+      callId,
+      traceId,
+      account_sid:
+      req.locals.account_sid});

    if (!req.locals.account_sid) {
      logger.info('missing X-Account-Sid on outbound call');
@@ -1,21 +1,21 @@
 {
  "name": "sbc-outbound",
-  "version": "v0.7.3",
+  "version": "v0.7.4",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "sbc-outbound",
-      "version": "v0.7.3",
+      "version": "v0.7.4",
      "license": "MIT",
      "dependencies": {
        "@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",
-        "@jambonz/time-series": "^0.1.6",
+        "@jambonz/time-series": "^0.1.9",
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.3",
        "drachtio-fn-b2b-sugar": "^0.0.12",
@@ -1397,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",
@@ -1448,8 +1449,9 @@
      }
    },
    "node_modules/@jambonz/time-series": {
-      "version": "0.1.6",
-      "integrity": "sha512-EFO1ZFUazHLCzDYkAbpke0IfmPRogLkGg+KGWwz3SGpnuiltfohQ3TsJ5KG8Gp9mXqdpkyAioWSdaJxGDquthQ==",
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.1.9.tgz",
+      "integrity": "sha512-FLD7mLGEMToG7s6LGWr/GtNp61753RBxyYuKSxCVI6G14bm6ydgcBdG85h8EGTVQlIp9dnwbn5ebSVsGb8a46w==",
      "dependencies": {
        "debug": "^4.3.1",
        "influx": "^5.8.0"
@@ -4092,8 +4094,9 @@
      }
    },
    "node_modules/minimist": {
-      "version": "1.2.5",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
    },
    "node_modules/mkdirp": {
      "version": "0.5.5",
@@ -4186,9 +4189,9 @@
      }
    },
    "node_modules/node-forge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
-      "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz",
+      "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==",
      "engines": {
        "node": ">= 6.13.0"
      }
@@ -5483,9 +5486,9 @@
      }
    },
    "node_modules/url-parse": {
-      "version": "1.5.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.7.tgz",
-      "integrity": "sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==",
+      "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"
@@ -6824,8 +6827,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",
@@ -6872,8 +6876,9 @@
      }
    },
    "@jambonz/time-series": {
-      "version": "0.1.6",
-      "integrity": "sha512-EFO1ZFUazHLCzDYkAbpke0IfmPRogLkGg+KGWwz3SGpnuiltfohQ3TsJ5KG8Gp9mXqdpkyAioWSdaJxGDquthQ==",
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.1.9.tgz",
+      "integrity": "sha512-FLD7mLGEMToG7s6LGWr/GtNp61753RBxyYuKSxCVI6G14bm6ydgcBdG85h8EGTVQlIp9dnwbn5ebSVsGb8a46w==",
      "requires": {
        "debug": "^4.3.1",
        "influx": "^5.8.0"
@@ -8847,8 +8852,9 @@
      }
    },
    "minimist": {
-      "version": "1.2.5",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
    },
    "mkdirp": {
      "version": "0.5.5",
@@ -8920,9 +8926,9 @@
      }
    },
    "node-forge": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz",
-      "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz",
+      "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA=="
    },
    "node-noop": {
      "version": "0.0.1",
@@ -9889,9 +9895,9 @@
      }
    },
    "url-parse": {
-      "version": "1.5.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.7.tgz",
-      "integrity": "sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==",
+      "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"
@@ -1,6 +1,6 @@
 {
  "name": "sbc-outbound",
-  "version": "v0.7.3",
+  "version": "v0.7.5",
  "main": "app.js",
  "engines": {
    "node": ">= 12.0.0"
@@ -29,11 +29,11 @@
  "dependencies": {
    "@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",
-    "@jambonz/time-series": "^0.1.6",
+    "@jambonz/time-series": "^0.1.9",
    "cidr-matcher": "^2.1.1",
    "debug": "^4.3.3",
    "drachtio-fn-b2b-sugar": "^0.0.12",
Author	SHA1	Message	Date
Dave Horton	0c8967acdb	bump version	2022-04-06 08:18:22 -04:00
Dave Horton	1dfeed3ac8	bugfix: mem leak	2022-04-05 19:57:03 -04:00
Dave Horton	d10bda2926	update deps	2022-04-01 13:46:16 -04:00
Dave Horton	3938773738	mem leak fix	2022-03-28 09:09:14 -04:00
Dave Horton	f881002943	write otel trace_id to call history	2022-03-23 09:26:04 -04:00
Dave Horton	2266b80e73	release drachtio connection on final outbound failure	2022-03-18 14:34:30 -04:00
Snyk bot	4c3d6ddf0c	fix: Dockerfile to reduce vulnerabilities (#35 ) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-DEBIAN11-GNUTLS28-2419151 - https://snyk.io/vuln/SNYK-DEBIAN11-OPENSSL-2388380 - https://snyk.io/vuln/SNYK-DEBIAN11-OPENSSL-2426309 - https://snyk.io/vuln/SNYK-DEBIAN11-UTILLINUX-2401081 - https://snyk.io/vuln/SNYK-DEBIAN11-UTILLINUX-2401081	2022-03-18 07:55:10 -04:00
Dave Horton	3d1bcb23f4	bump version	2022-03-08 20:16:19 -05:00
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