add env JAMBONES_RECORD_ALL_CALLS to enable global call recording

minor logging
fix test
2026-10-04 02:04:19 +00:00 · 2022-12-02 13:53:29 -05:00 · 2022-12-01 14:05:23 -05:00 · 2022-11-29 13:05:51 -05:00 · 2022-11-28 16:45:21 -05:00 · 2022-11-11 11:26:42 -05:00
7 changed files with 32 additions and 14 deletions
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:18.9.0-alpine3.16 as base
+FROM --platform=linux/amd64 node:18.12.1-alpine3.16 as base

 RUN apk --update --no-cache add --virtual .builds-deps build-base python3

@@ -184,7 +184,6 @@ if ('test' !== process.env.NODE_ENV) {
 }

 const lookupRtpServiceEndpoints = (lookup, serviceName) => {
-  logger.debug(`dns lookup for ${serviceName}..`);
  lookup(serviceName, {family: 4, all: true}, (err, addresses) => {
    if (err) {
      logger.error({err}, `Error looking up ${serviceName}`);
@@ -40,11 +40,13 @@ const initCdr = (srf, req) => {
  const to = arr ? arr[1] : req.calledNumber;
  arr = regex.exec(req.callingNumber);
  const from = arr ? arr[1] : req.callingNumber;
+  const applicationSid = req.get('X-Application-Sid');

  return {
    account_sid: req.get('X-Account-Sid'),
    call_sid: req.get('X-Call-Sid'),
    sip_callid: req.get('Call-ID'),
+    ...(applicationSid && {application_sid: applicationSid}),
    from,
    to,
    duration: 0,
@@ -327,8 +329,8 @@ class CallSession extends Emitter {
              '-X-Requested-Carrier-Sid',
              '-X-Jambonz-Routing',
              '-X-Jambonz-FS-UUID',
-              '-X-Preferred-User',
-              '-X-Preferred-Host',
+              '-X-Preferred-From-User',
+              'X-Preferred-From-Host',
              '-X-Jambonz-FS-UUID',
            ],
            proxyResponseHeaders: [
@@ -429,6 +431,7 @@ class CallSession extends Emitter {
                sip_status: status
              }).catch((err) => this.logger.error({err}, 'Error writing cdr for call failure'));
            }
+            return;
          }
          else {
            this.logger.info(`got ${err.status}, cranking back to next destination`);
@@ -17,7 +17,8 @@ function makeRtpEngineOpts(req, srcIsUsingSrtp, dstIsUsingSrtp, teams = false) {
  }
  const common = {
    'call-id': req.get('Call-ID'),
-    'replace': ['origin', 'session-connection']
+    'replace': ['origin', 'session-connection'],
+    'record call': process.env.JAMBONES_RECORD_ALL_CALLS ? 'yes' : 'no'
  };
  return {
    common,
@@ -9,7 +9,7 @@
      "version": "v0.7.7",
      "license": "MIT",
      "dependencies": {
-        "@jambonz/db-helpers": "^0.6.19",
+        "@jambonz/db-helpers": "^0.7.3",
        "@jambonz/http-health-check": "^0.0.1",
        "@jambonz/mw-registrar": "0.2.2",
        "@jambonz/realtimedb-helpers": "^0.4.35",
@@ -560,13 +560,14 @@
      }
    },
    "node_modules/@jambonz/db-helpers": {
-      "version": "0.6.19",
-      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.6.19.tgz",
-      "integrity": "sha512-mR9PqPY4aEoeTtUuZI1+4r+k1BFKoe0Dl9pyeAEvm7KSlRMHCVWbOzVE8WfoifC9dZ9541iW5pseqqip3QMkyw==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.7.3.tgz",
+      "integrity": "sha512-FXQPnl5AGV3P6RhvdSKfjIOdEXShYe7aKJayJjaPARPTCTGqLTDhV2tfsWirCrpQhn+vanJHAiOyzOTmbDIfzA==",
      "dependencies": {
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.3",
        "mysql2": "^2.3.3",
+        "node-object-hash": "^2.3.10",
        "uuid": "^8.3.2"
      }
    },
@@ -3763,6 +3764,14 @@
      "resolved": "https://registry.npmjs.org/node-noop/-/node-noop-0.0.1.tgz",
      "integrity": "sha512-kAUvIRxZyDYFTLqGj+7zqXduG89vtqGmNMt9qDMvYH3H8uNTCOTz5ZN1q2Yg8++fWbzv+ERtYVqaOH42Ag5OpA=="
    },
+    "node_modules/node-object-hash": {
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.10.tgz",
+      "integrity": "sha512-jY5dPJzw6NHd/KPSfPKJ+IHoFS81/tJ43r34ZeNMXGzCOM8jwQDCD12HYayKIB6MuznrnqIYy2e891NA2g0ibA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/node-preload": {
      "version": "0.2.1",
      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
@@ -5942,13 +5951,14 @@
      "dev": true
    },
    "@jambonz/db-helpers": {
-      "version": "0.6.19",
-      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.6.19.tgz",
-      "integrity": "sha512-mR9PqPY4aEoeTtUuZI1+4r+k1BFKoe0Dl9pyeAEvm7KSlRMHCVWbOzVE8WfoifC9dZ9541iW5pseqqip3QMkyw==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.7.3.tgz",
+      "integrity": "sha512-FXQPnl5AGV3P6RhvdSKfjIOdEXShYe7aKJayJjaPARPTCTGqLTDhV2tfsWirCrpQhn+vanJHAiOyzOTmbDIfzA==",
      "requires": {
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.3",
        "mysql2": "^2.3.3",
+        "node-object-hash": "^2.3.10",
        "uuid": "^8.3.2"
      }
    },
@@ -8375,6 +8385,11 @@
      "resolved": "https://registry.npmjs.org/node-noop/-/node-noop-0.0.1.tgz",
      "integrity": "sha512-kAUvIRxZyDYFTLqGj+7zqXduG89vtqGmNMt9qDMvYH3H8uNTCOTz5ZN1q2Yg8++fWbzv+ERtYVqaOH42Ag5OpA=="
    },
+    "node-object-hash": {
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.10.tgz",
+      "integrity": "sha512-jY5dPJzw6NHd/KPSfPKJ+IHoFS81/tJ43r34ZeNMXGzCOM8jwQDCD12HYayKIB6MuznrnqIYy2e891NA2g0ibA=="
+    },
    "node-preload": {
      "version": "0.2.1",
      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
@@ -27,7 +27,7 @@
    "jslint": "eslint app.js lib"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.6.19",
+    "@jambonz/db-helpers": "^0.7.3",
    "@jambonz/realtimedb-helpers": "^0.4.35",
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/mw-registrar": "0.2.2",
@@ -84,7 +84,7 @@ test('sbc-outbound tests', async(t) => {

    const res = await queryCdrs({account_sid: 'ed649e33-e771-403a-8c99-1780eabbc803'});
    //console.log(`cdrs: ${JSON.stringify(res)}`);
-    t.ok(res.total === 6, 'wrote 6 cdrs');
+    t.ok(res.total === 5, 'wrote 5 cdrs');

    srf.disconnect();
  } catch (err) {
Author	SHA1	Message	Date
Dave Horton	d9c4e01c36	add env JAMBONES_RECORD_ALL_CALLS to enable global call recording	2022-12-02 13:53:29 -05:00
Dave Horton	3d902c65a4	minor logging	2022-12-01 14:05:23 -05:00
Dave Horton	d641504797	fix test	2022-11-29 13:05:51 -05:00
Dave Horton	b871812a70	bugfix: was incorrectly making additional attempts after caller hung up or other failures on first attempt	2022-11-28 16:45:21 -05:00
Guilherme RauenandGuilherme Rauen	e123a2ef88	update node image to the latest and most secure (#56 ) Co-authored-by: Guilherme Rauen <g.rauen@cognigy.com>	2022-11-11 11:26:42 -05:00
Dave Horton	775e63518a	include application_sid in cdr	2022-11-07 18:34:13 -05:00
Dave Horton	307cf9bd65	update deps	2022-11-02 13:38:02 -04:00
Dave Horton	f48ca4821e	update db-helpers	2022-11-01 21:22:55 -04:00
Dave Horton	43ed2bafe1	strip X-Preferred-From-User and X-Preferred-From-Host from outgoing call	2022-10-26 09:35:11 -04:00