bump version

.github/workflows/docker-publish.yml

@@ -20,7 +20,7 @@ jobs:
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Build image
         run: docker build . --file Dockerfile --tag $IMAGE_NAME

.github/workflows/npm-ci.yml

@@ -6,10 +6,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
         with:
-          node-version: lts/*
+          node-version: 18.x
       - run: npm ci
       - run: npm run jslint
       - run: npm test

app.js

@@ -28,7 +28,6 @@ const {
   commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
 });
 const StatsCollector = require('@jambonz/stats-collector');
-const CIDRMatcher = require('cidr-matcher');
 const stats = new StatsCollector(logger);
 const {equalsIgnoreOrder, createHealthCheckApp, systemHealth} = require('./lib/utils');
 const {LifeCycleEvents} = require('./lib/constants');
@@ -130,6 +129,7 @@ const {
 const CallSession = require('./lib/call-session');
 
 if (process.env.DRACHTIO_HOST && !process.env.K8S) {
+  const CIDRMatcher = require('cidr-matcher');
   const cidrs = process.env.JAMBONES_NETWORK_CIDR
     .split(',')
     .map((s) => s.trim());
@@ -164,23 +164,6 @@ else {
     logger.info(`listening in outbound mode on port ${process.env.DRACHTIO_PORT}`);
   });
   srf.listen({port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET});
-  srf.on('connect', (err, hp) => {
-    if (err) return this.logger.error({err}, 'Error connecting to drachtio server');
-    logger.info(`connected to drachtio listening on ${hp}`);
-
-    if (process.env.K8S_FEATURE_SERVER_TRANSPORT === 'tcp') {
-      const matcher = new CIDRMatcher(['192.168.0.0/24', '172.16.0.0/16', '10.0.0.0/8']);
-      const hostports = hp.split(',');
-      for (const hp of hostports) {
-        const arr = /^(.*)\/(.*):(\d+)$/.exec(hp);
-        if (arr && matcher.contains(arr[2])) {
-          const hostport = `${arr[2]}:${arr[3]}`;
-          logger.info(`using sbc private address when sending to feature-server: ${hostport}`);
-          srf.locals.privateSipAddress = hostport;
-        }
-      }
-    }
-  });
 }
 if (process.env.NODE_ENV === 'test') {
   srf.on('error', (err) => {

lib/call-session.js

@@ -22,8 +22,10 @@ const MS_TEAMS_SIP_ENDPOINT = 'sip.pstnhub.microsoft.com';
 const createBLegFromHeader = (req) => {
   const from = req.getParsedHeader('From');
   const uri = parseUri(from.uri);
-  if (uri && uri.user) return `<sip:${uri.user}@localhost>`;
-  return '<sip:anonymous@localhost>';
+  const name = from.name;
+  const displayName = name ? `${name} ` : '';
+  if (uri && uri.user) return `${displayName}<sip:${uri.user}@localhost>`;
+  else return `${displayName}<sip:anonymous@localhost>`;
 };
 
 const createSiprecBody = (headers, sdp, type, content) => {

lib/db-utils.js

@@ -100,7 +100,7 @@ module.exports = (srf, logger) => {
   };
 
   const getApplicationForDidAndCarrier = async(req, voip_carrier_sid) => {
-    const did = normalizeDID(req.calledNumber) || 'anonymous';
+    const did = normalizeDID(req.calledNumber);
 
     try {
       /* straight DID match */
@@ -214,7 +214,7 @@ module.exports = (srf, logger) => {
       if (matches.length) {
         /* we have one or more matches.  Now check for one with a provisioned phone number matching the DID */
         const vc_sids = matches.map((m) => `'${m.voip_carrier_sid}'`).join(',');
-        const did = normalizeDID(req.calledNumber) || 'anonymous';
+        const did = normalizeDID(req.calledNumber);
         const sql =  `SELECT * FROM phone_numbers WHERE number = '${did}' AND voip_carrier_sid IN (${vc_sids})`;
         logger.debug({matches, sql, did, vc_sids}, 'looking up DID');
 

lib/fs-tracking.js

@@ -15,9 +15,7 @@ module.exports = (srf, logger) => {
   return async() => {
     try {
       if (process.env.K8S) {
-        return process.env.K8S_FEATURE_SERVER_TRANSPORT ?
-          `${process.env.K8S_FEATURE_SERVER_SERVICE_NAME};transport=${process.env.K8S_FEATURE_SERVER_TRANSPORT}` :
-          process.env.K8S_FEATURE_SERVER_SERVICE_NAME;
+        return process.env.K8S_FEATURE_SERVER_SERVICE_NAME;
       }
       else {
         const fs = await retrieveSet(setName);

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "sbc-inbound",
-  "version": "v0.7.8",
+  "version": "v0.7.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "sbc-inbound",
-      "version": "v0.7.8",
+      "version": "v0.7.9",
       "license": "MIT",
       "dependencies": {
         "@jambonz/db-helpers": "^0.7.3",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sbc-inbound",
-  "version": "v0.7.8",
+  "version": "v0.7.9",
   "main": "app.js",
   "engines": {
     "node": ">= 12.0.0"