#63: dont select a carrier from a different account in LCR

app.js

@@ -65,8 +65,6 @@ const {
 }, logger);
 
 const activeCallIds = new Map();
-const Emitter = require('events');
-const idleEmitter = new Emitter();
 
 srf.locals = {...srf.locals,
   stats,
@@ -78,7 +76,6 @@ srf.locals = {...srf.locals,
   AlertType,
   queryCdrs,
   activeCallIds,
-  idleEmitter,
   dbHelpers: {
     ping,
     performLcr,
@@ -241,20 +238,4 @@ else {
 
 pingMsTeamsGateways(logger, srf);
 
-process.on('SIGUSR2', handle.bind(null));
-process.on('SIGTERM', handle.bind(null));
-
-function handle(signal) {
-  logger.info(`got signal ${signal}`);
-  if (process.env.K8S) {
-    if (0 === activeCallIds.size) {
-      logger.info('exiting immediately since we have no calls in progress');
-      process.exit(0);
-    }
-    else {
-      idleEmitter.once('idle', () => process.exit(0));
-    }
-  }
-}
-
 module.exports = {srf};

lib/call-session.js

@@ -77,7 +77,6 @@ class CallSession extends Emitter {
     this.logger = logger.child({callId: req.get('Call-ID')});
     this.useWss = req.locals.registration && req.locals.registration.protocol === 'wss';
     this.stats = this.srf.locals.stats;
-    this.idleEmitter = this.srf.locals.idleEmitter;
     this.activeCallIds = this.srf.locals.activeCallIds;
     this.writeCdrs = this.srf.locals.writeCdrs;
 
@@ -526,7 +525,7 @@ class CallSession extends Emitter {
         }
 
         this.logger.info(`call ended with normal termination, there are ${this.activeCallIds.size} active`);
-        if (this.activeCallIds.size === 0) this.idleEmitter.emit('idle');
+
         this.srf.endSession(this.req);
       });
     });
@@ -854,7 +853,6 @@ Duration=${payload.duration} `
         this.logger.info('call ended with normal termination');
         this.rtpEngineResource.destroy();
         this.activeCallIds.delete(this.req.get('Call-ID'));
-        if (this.activeCallIds.size === 0) this.idleEmitter.emit('idle');
         this.uas.other.destroy();
         this.srf.endSession(this.req);
       });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sbc-outbound",
-  "version": "v0.8.0",
+  "version": "v0.7.9",
   "main": "app.js",
   "engines": {
     "node": ">= 12.0.0"
@@ -32,7 +32,7 @@
     "@jambonz/http-health-check": "^0.0.1",
     "@jambonz/mw-registrar": "0.2.2",
     "@jambonz/rtpengine-utils": "^0.4.3",
-    "@jambonz/siprec-client-utils": "^0.2.4",
+    "@jambonz/siprec-client-utils": "^0.2.0",
     "@jambonz/stats-collector": "^0.1.6",
     "@jambonz/time-series": "^0.2.5",
     "cidr-matcher": "^2.1.1",

test/sip-tests.js

@@ -84,7 +84,7 @@ test('sbc-outbound tests', async(t) => {
     await sippUac('uac-pcap-carrier-fail-limits.xml');
     t.pass('fails when max calls in progress');
       
-    await waitFor(25);
+    await waitFor(18);
 
     const res = await queryCdrs({account_sid: 'ed649e33-e771-403a-8c99-1780eabbc803'});
     console.log(`cdrs: ${JSON.stringify(res)}`);