fix: upgrade aws-sdk from 2.848.0 to 2.1036.0

Snyk has created this PR to upgrade aws-sdk from 2.848.0 to 2.1036.0. See this package in npm: https://www.npmjs.com/package/aws-sdk See this project in Snyk: https://app.snyk.io/org/davehorton/project/cec90d0e-0ded-433e-a42e-fe78b28ae489?utm_source=github&utm_medium=referral&page=upgrade-pr
clean up handlers
2026-02-09 15:10:14 +00:00 · 2021-12-17 18:36:55 +00:00 · 2021-12-15 19:33:31 -05:00 · 2021-12-14 12:28:02 -05:00 · 2021-12-13 18:08:53 -05:00 · 2021-12-13 17:59:23 -05:00
12 changed files with 173 additions and 219 deletions
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -0,0 +1,51 @@
+name: Docker
+
+on:
+  push:
+    # Publish `main` as Docker `latest` image.
+    branches:
+      - main
+
+    # Publish `v1.2.3` tags as releases.
+    tags:
+      - v*
+
+env:
+  IMAGE_NAME: feature-server
+
+jobs:
+  push:
+
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build image
+        run: docker build . --file Dockerfile --tag $IMAGE_NAME
+
+      - name: Log into registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push image
+        run: |
+          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
+
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+
+          # Strip "v" prefix from tag name
+          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "main" ] && VERSION=latest
+
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION
--- a/app.js
+++ b/app.js
@@ -105,4 +105,15 @@ const disconnect = () => {
  });
 };

+process.on('SIGUSR2', handle);
+process.on('SIGTERM', handle);
+
+function handle(signal) {
+  const {removeFromSet} = srf.locals.dbHelpers;
+  const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
+  logger.info(`got signal ${signal}, removing ${srf.locals.localSipAddress} from set ${setName}`);
+  removeFromSet(setName, srf.locals.localSipAddress);
+  srf.locals.disabled = true;
+}
+
 module.exports = {srf, logger, disconnect};
--- a/lib/session/call-session.js
+++ b/lib/session/call-session.js
@@ -632,7 +632,7 @@ class CallSession extends Emitter {
    try {
      if (!this.ms) this.ms = this.getMS();
      const ep = await this.ms.createEndpoint({remoteSdp: this.req.body});
-      ep.cs = this;
+      //ep.cs = this;
      this.ep = ep;
      ep.set({
        hangup_after_bridge: false,
@@ -716,14 +716,12 @@ class CallSession extends Emitter {
  /**
   * Hang up the call and free the media endpoint
   */
-  async _clearResources() {
+  _clearResources() {
    for (const resource of [this.dlg, this.ep]) {
-      try {
-        if (resource && resource.connected) await resource.destroy();
-      } catch (err) {
-        this.logger.error(err, 'CallSession:_clearResources error');
-      }
+      if (resource && resource.connected) resource.destroy();
    }
+    this.dlg = null;
+    this.ep = null;

    // remove any temporary tts files that were created (audio is still cached in redis)
    for (const path of this.tmpFiles) {
--- a/lib/session/inbound-call-session.js
+++ b/lib/session/inbound-call-session.js
@@ -21,15 +21,17 @@ class InboundCallSession extends CallSession {
    this.req = req;
    this.res = res;

-    req.on('cancel', () => {
-      this._notifyCallStatusChange({callStatus: CallStatus.NoAnswer, sipStatus: 487});
-      this._callReleased();
-    });
+    req.once('cancel', this._onCancel.bind(this));

    this.on('callStatusChange', this._notifyCallStatusChange.bind(this));
    this._notifyCallStatusChange({callStatus: CallStatus.Trying, sipStatus: 100});
  }

+  _onCancel() {
+    this._notifyCallStatusChange({callStatus: CallStatus.NoAnswer, sipStatus: 487});
+    this._callReleased();
+  }
+
  _onTasksDone() {
    if (!this.res.finalResponseSent) {
      if (this._mediaServerFailure) {
@@ -45,6 +47,7 @@ class InboundCallSession extends CallSession {
        this.res.send(603);
      }
    }
+    this.req.removeAllListeners('cancel');
  }

  /**
@@ -56,6 +59,7 @@ class InboundCallSession extends CallSession {
    this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
    this.logger.debug('InboundCallSession: caller hung up');
    this._callReleased();
+    this.req.removeAllListeners('cancel');
  }
 }

--- a/lib/tasks/dial.js
+++ b/lib/tasks/dial.js
@@ -166,6 +166,10 @@ class TaskDial extends Task {
      clearTimeout(this.timerMaxCallDuration);
      this.timerMaxCallDuration = null;
    }
+    if (this.timerRing) {
+      clearTimeout(this.timerRing);
+      this.timerRing = null;
+    }
    this._removeDtmfDetection(cs.dlg);
    this._removeDtmfDetection(this.dlg);
    this._killOutdials();
@@ -231,10 +235,19 @@ class TaskDial extends Task {
    }
  }

+  _removeHandlers(sd) {
+    sd.removeAllListeners('accept');
+    sd.removeAllListeners('decline');
+    sd.removeAllListeners('adulting');
+    sd.removeAllListeners('callStatusChange');
+    sd.removeAllListeners('callCreateFail');
+  }
+
  _killOutdials() {
    for (const [callSid, sd] of Array.from(this.dials)) {
      this.logger.debug(`Dial:_killOutdials killing callSid ${callSid}`);
      sd.kill().catch((err) => this.logger.info(err, `Dial:_killOutdials Error killing ${callSid}`));
+      this._removeHandlers(sd);
    }
    this.dials.clear();
  }
@@ -319,8 +332,9 @@ class TaskDial extends Task {
    }

    const ms = await cs.getMS();
-    const timerRing = setTimeout(() => {
+    this.timerRing = setTimeout(() => {
      this.logger.info(`Dial:_attemptCall: ring no answer timer ${this.timeout}s exceeded`);
+      this.timerRing = null;
      this._killOutdials();
    }, this.timeout * 1000);

@@ -387,7 +401,8 @@ class TaskDial extends Task {
                break;
              case CallStatus.InProgress:
                this.logger.debug('Dial:_attemptCall -- call was answered');
-                clearTimeout(timerRing);
+                clearTimeout(this.timerRing);
+                this.timerRing = null;
                break;
              case CallStatus.Failed:
              case CallStatus.Busy:
@@ -395,7 +410,8 @@ class TaskDial extends Task {
                this.dials.delete(sd.callSid);
                if (this.dials.size === 0 && !this.sd) {
                  this.logger.debug('Dial:_attemptCalls - all calls failed after call failure, ending task');
-                  clearTimeout(timerRing);
+                  clearTimeout(this.timerRing);
+                  this.timerRing = null;
                  this.kill(cs);
                }
                break;
@@ -448,6 +464,12 @@ class TaskDial extends Task {
    this._killOutdials();       // NB: order is important
  }

+  _onMaxCallDuration(cs) {
+    this.logger.info(`Dial:_onMaxCallDuration tearing down call as it has reached ${this.timeLimit}s`);
+    this.ep && this.ep.unbridge();
+    this.kill(cs);
+  }
+
  /**
   * We now have a call leg produced by the Dial action, so
   * - hangup any simrings in progress
@@ -468,11 +490,7 @@ class TaskDial extends Task {
      await cs.propagateAnswer();
    }
    if (this.timeLimit) {
-      this.timerMaxCallDuration = setTimeout(() => {
-        this.logger.info(`Dial:_selectSingleDial tearing down call as it has reached ${this.timeLimit}s`);
-        this.ep && this.ep.unbridge();
-        this.kill(cs);
-      }, this.timeLimit * 1000);
+      this.timerMaxCallDuration = setTimeout(this._onMaxCallDuration.bind(this, cs), this.timeLimit * 1000);
    }
    sessionTracker.add(this.callSid, cs);
    this.dlg.on('destroy', () => {
@@ -523,9 +541,9 @@ class TaskDial extends Task {
    assert(cs.ep && sd.ep);

    try {
-      this.logger.info('Dial:_releaseMedia - releasing media from freewitch');
      const aLegSdp = cs.ep.remote.sdp;
-      const bLegSdp = sd.ep.remote.sdp;
+      const bLegSdp = sd.dlg.remote.sdp;
+      this.logger.debug({aLegSdp, bLegSdp}, 'Dial:_releaseMedia - releasing media from freewitch');
      await Promise.all[sd.releaseMediaToSBC(aLegSdp), cs.releaseMediaToSBC(bLegSdp)];
      this.epOther = null;
      this.logger.info('Dial:_releaseMedia - successfully released media from freewitch');
--- a/lib/tasks/enqueue.js
+++ b/lib/tasks/enqueue.js
@@ -337,7 +337,7 @@ class TaskEnqueue extends Task {
      }
      tasksToRun.push(o);
    }
-
+    const cloneTasks = [...tasksToRun];
    if (this.killed) return [];
    else if (tasksToRun.length > 0) {
      this._playSession = new ConfirmCallSession({
@@ -356,7 +356,7 @@ class TaskEnqueue extends Task {
      this.state = QueueResults.Leave;
      this.kill(cs);
    }
-    return tasksToRun;
+    return cloneTasks;
  }
 }

--- a/lib/tasks/listen.js
+++ b/lib/tasks/listen.js
@@ -64,6 +64,7 @@ class TaskListen extends Task {
      this.results.dialCallDuration = duration;
    }
    if (this.transcribeTask) await this.transcribeTask.kill(cs);
+    this.ep && this._removeListeners(this.ep);
    this.notifyTaskDone();
  }

@@ -136,6 +137,10 @@ class TaskListen extends Task {
    if (this.finishOnKey || this.passDtmf) {
      ep.removeListener('dtmf', this._dtmfHandler);
    }
+    ep.removeCustomEventListener(ListenEvents.PlayAudio);
+    ep.removeCustomEventListener(ListenEvents.KillAudio);
+    ep.removeCustomEventListener(ListenEvents.Disconnect);
+
  }

  _onDtmf(evt) {
--- a/lib/utils/encrypt-decrypt.js
+++ b/lib/utils/encrypt-decrypt.js
@@ -1,5 +1,5 @@
 const crypto = require('crypto');
-const algorithm = 'aes-256-cbc';
+const algorithm = process.env.LEGACY_CRYPTO ? 'aes-256-ctr' : 'aes-256-cbc';
 const iv = crypto.randomBytes(16);
 const secretKey = crypto.createHash('sha256')
  .update(String(process.env.JWT_SECRET))
--- a/lib/utils/install-srf-locals.js
+++ b/lib/utils/install-srf-locals.js
@@ -20,6 +20,13 @@ function initMS(logger, wrapper, ms) {
      wrapper.connects = 1;
      wrapper.active = true;
    });
+
+  ms.on('channel::open', (evt) => {
+    logger.debug({evt}, `mediaserver ${ms.address} added endpoint`);
+  });
+  ms.on('channel::close', (evt) => {
+    logger.debug({evt}, `mediaserver ${ms.address} removed endpoint`);
+  });
 }

 function installSrfLocals(srf, logger) {
--- a/lib/utils/sbc-pinger.js
+++ b/lib/utils/sbc-pinger.js
@@ -95,7 +95,7 @@ module.exports = (logger) => {
  setInterval(() => {
    const {srf} = require('../..');
    pingProxies(srf);
-  }, 20000);
+  }, process.env.OPTIONS_PING_INTERVAL || 30000);

  // initial ping once we are up
  setTimeout(async() => {
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,24 +1,25 @@
 {
  "name": "jambonz-feature-server",
-  "version": "0.6.7-rc5",
+  "version": "v0.7.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
-      "version": "0.6.7-rc5",
+      "name": "jambonz-feature-server",
+      "version": "v0.7.0",
      "license": "MIT",
      "dependencies": {
        "@jambonz/db-helpers": "^0.6.14",
        "@jambonz/mw-registrar": "^0.2.1",
-        "@jambonz/realtimedb-helpers": "^0.4.9",
+        "@jambonz/realtimedb-helpers": "^0.4.10",
        "@jambonz/stats-collector": "^0.1.5",
        "@jambonz/time-series": "^0.1.5",
-        "aws-sdk": "^2.846.0",
+        "aws-sdk": "^2.1036.0",
        "bent": "^7.3.12",
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.1",
        "deepcopy": "^2.1.0",
-        "drachtio-fsmrf": "^2.0.11",
+        "drachtio-fsmrf": "^2.0.13",
        "drachtio-srf": "^4.4.55",
        "express": "^4.17.1",
        "ip": "^1.1.5",
@@ -502,9 +503,9 @@
      }
    },
    "node_modules/@jambonz/realtimedb-helpers": {
-      "version": "0.4.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.9.tgz",
-      "integrity": "sha512-hkxOSwD3LNzCGgiQNaHfwwzBnD07fxPSm81Lx8TY6Klc6dyi3RcnBXjdyEobblhJkwEwyb4qbPKKqev9CaS/3A==",
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.10.tgz",
+      "integrity": "sha512-9dv0VRnVBmxV6ulzTnypBaZ7x/OpCQRQTloTNrCHxrTzMI9avGHx80S9299/gQUnqnoT0kTigV0JoCLuF3mN4A==",
      "dependencies": {
        "@google-cloud/text-to-speech": "^3.1.3",
        "@jambonz/promisify-redis": "0.0.6",
@@ -853,9 +854,9 @@
      }
    },
    "node_modules/aws-sdk": {
-      "version": "2.848.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.848.0.tgz",
-      "integrity": "sha512-c/e5kaEFl+9aYkrYDkmu5mSZlL+EfP6DnBOMD06fH12gIsaFSMBGtbsDTHABhvSu++LxeI1dJAD148O17MuZvg==",
+      "version": "2.1036.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1036.0.tgz",
+      "integrity": "sha512-K0f4uXL32ZdoPmWiuSQEAC5ae5v7gNmhjzoEB7VonE5E8l2umWsoU0Ahm8WPr14LgsvtkeyBuqBjphbxLz6hIw==",
      "dependencies": {
        "buffer": "4.9.2",
        "events": "1.1.1",
@@ -868,7 +869,7 @@
        "xml2js": "0.4.19"
      },
      "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 10.0.0"
      }
    },
    "node_modules/aws-sdk/node_modules/sax": {
@@ -1205,18 +1206,6 @@
        "wrap-ansi": "^6.2.0"
      }
    },
-    "node_modules/cliui/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
    "node_modules/color-convert": {
      "version": "1.9.3",
      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -1466,14 +1455,14 @@
      }
    },
    "node_modules/drachtio-fsmrf": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-2.0.11.tgz",
-      "integrity": "sha512-3U1tHBh2fJd8cGbUMV+Gc2laq5VxIynmP3Ue0eRW35Za7Sp7/ucPfxbJ2OZc0PlokRCQYGvCyjTdTv8SPzoajQ==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-2.0.13.tgz",
+      "integrity": "sha512-LYHE/y7d1fBsKltcHmbLLCQ2MNUmJNURkXkAz4BfWZHyavEDGMwrmkrBAMDbOSZV1H87FstdfEzc54Ym1SsQbA==",
      "dependencies": {
        "async": "^1.4.2",
        "debug": "^2.6.9",
        "delegates": "^0.1.0",
-        "drachtio-modesl": "^1.2.2",
+        "drachtio-modesl": "^1.2.4",
        "drachtio-srf": "^4.4.59",
        "lodash": "^4.17.21",
        "minimist": "^1.2.5",
@@ -1513,9 +1502,9 @@
      }
    },
    "node_modules/drachtio-modesl": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/drachtio-modesl/-/drachtio-modesl-1.2.2.tgz",
-      "integrity": "sha512-4+SVtMahFfqbxP+TIBN0usc9iMJX5Sl/vkJ3lMj3OmIRto18lkUUpFOBbj/PZbFZMoeXLz4tAWNzlzEBCC7bBw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/drachtio-modesl/-/drachtio-modesl-1.2.4.tgz",
+      "integrity": "sha512-Le6/iAuRhJU2fbxuRksXMXPknjU8GN5vpw1p211CmaH/dZxJ5FSghksD9ubV7Kqc6qE73M/K/boDtu14V/GjeQ==",
      "dependencies": {
        "debug": "^4.1.1",
        "eventemitter2": "^6.4.4",
@@ -3073,21 +3062,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/istanbul-lib-processinfo/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/istanbul-lib-processinfo/node_modules/uuid": {
      "version": "3.4.0",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
@@ -3231,9 +3205,9 @@
      }
    },
    "node_modules/json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
    },
    "node_modules/json-schema-traverse": {
      "version": "0.4.1",
@@ -3261,17 +3235,17 @@
      }
    },
    "node_modules/jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "engines": [
-        "node >=0.6.0"
-      ],
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
      "dependencies": {
        "assert-plus": "1.0.0",
        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
+        "json-schema": "0.4.0",
        "verror": "1.10.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
      }
    },
    "node_modules/jwa": {
@@ -3659,21 +3633,6 @@
        "node": ">=8.9"
      }
    },
-    "node_modules/nyc/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/object-hash": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz",
@@ -4523,21 +4482,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/spawn-wrap/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
    "node_modules/sprintf-js": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -4585,17 +4529,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
    "node_modules/string.prototype.trim": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz",
@@ -5142,18 +5075,6 @@
      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
      "dev": true
    },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
    "node_modules/wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -5657,9 +5578,9 @@
      }
    },
    "@jambonz/realtimedb-helpers": {
-      "version": "0.4.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.9.tgz",
-      "integrity": "sha512-hkxOSwD3LNzCGgiQNaHfwwzBnD07fxPSm81Lx8TY6Klc6dyi3RcnBXjdyEobblhJkwEwyb4qbPKKqev9CaS/3A==",
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.10.tgz",
+      "integrity": "sha512-9dv0VRnVBmxV6ulzTnypBaZ7x/OpCQRQTloTNrCHxrTzMI9avGHx80S9299/gQUnqnoT0kTigV0JoCLuF3mN4A==",
      "requires": {
        "@google-cloud/text-to-speech": "^3.1.3",
        "@jambonz/promisify-redis": "0.0.6",
@@ -5948,9 +5869,9 @@
      }
    },
    "aws-sdk": {
-      "version": "2.848.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.848.0.tgz",
-      "integrity": "sha512-c/e5kaEFl+9aYkrYDkmu5mSZlL+EfP6DnBOMD06fH12gIsaFSMBGtbsDTHABhvSu++LxeI1dJAD148O17MuZvg==",
+      "version": "2.1036.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1036.0.tgz",
+      "integrity": "sha512-K0f4uXL32ZdoPmWiuSQEAC5ae5v7gNmhjzoEB7VonE5E8l2umWsoU0Ahm8WPr14LgsvtkeyBuqBjphbxLz6hIw==",
      "requires": {
        "buffer": "4.9.2",
        "events": "1.1.1",
@@ -6220,17 +6141,6 @@
        "string-width": "^4.2.0",
        "strip-ansi": "^6.0.0",
        "wrap-ansi": "^6.2.0"
-      },
-      "dependencies": {
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
      }
    },
    "color-convert": {
@@ -6444,14 +6354,14 @@
      }
    },
    "drachtio-fsmrf": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-2.0.11.tgz",
-      "integrity": "sha512-3U1tHBh2fJd8cGbUMV+Gc2laq5VxIynmP3Ue0eRW35Za7Sp7/ucPfxbJ2OZc0PlokRCQYGvCyjTdTv8SPzoajQ==",
+      "version": "2.0.13",
+      "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-2.0.13.tgz",
+      "integrity": "sha512-LYHE/y7d1fBsKltcHmbLLCQ2MNUmJNURkXkAz4BfWZHyavEDGMwrmkrBAMDbOSZV1H87FstdfEzc54Ym1SsQbA==",
      "requires": {
        "async": "^1.4.2",
        "debug": "^2.6.9",
        "delegates": "^0.1.0",
-        "drachtio-modesl": "^1.2.2",
+        "drachtio-modesl": "^1.2.4",
        "drachtio-srf": "^4.4.59",
        "lodash": "^4.17.21",
        "minimist": "^1.2.5",
@@ -6486,9 +6396,9 @@
      }
    },
    "drachtio-modesl": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/drachtio-modesl/-/drachtio-modesl-1.2.2.tgz",
-      "integrity": "sha512-4+SVtMahFfqbxP+TIBN0usc9iMJX5Sl/vkJ3lMj3OmIRto18lkUUpFOBbj/PZbFZMoeXLz4tAWNzlzEBCC7bBw==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/drachtio-modesl/-/drachtio-modesl-1.2.4.tgz",
+      "integrity": "sha512-Le6/iAuRhJU2fbxuRksXMXPknjU8GN5vpw1p211CmaH/dZxJ5FSghksD9ubV7Kqc6qE73M/K/boDtu14V/GjeQ==",
      "requires": {
        "debug": "^4.1.1",
        "eventemitter2": "^6.4.4",
@@ -7677,15 +7587,6 @@
        "uuid": "^3.3.3"
      },
      "dependencies": {
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
        "uuid": {
          "version": "3.4.0",
          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
@@ -7795,9 +7696,9 @@
      }
    },
    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
    },
    "json-schema-traverse": {
      "version": "0.4.1",
@@ -7819,13 +7720,13 @@
      }
    },
    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
      "requires": {
        "assert-plus": "1.0.0",
        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
+        "json-schema": "0.4.0",
        "verror": "1.10.0"
      }
    },
@@ -8138,17 +8039,6 @@
        "spawn-wrap": "^2.0.0",
        "test-exclude": "^6.0.0",
        "yargs": "^15.0.2"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
      }
    },
    "object-hash": {
@@ -8797,17 +8687,6 @@
        "rimraf": "^3.0.0",
        "signal-exit": "^3.0.2",
        "which": "^2.0.1"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
      }
    },
    "sprintf-js": {
@@ -8846,16 +8725,6 @@
        "emoji-regex": "^8.0.0",
        "is-fullwidth-code-point": "^3.0.0",
        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        }
      }
    },
    "string.prototype.trim": {
@@ -9287,15 +9156,6 @@
          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
          "dev": true
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
        }
      }
    },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "jambonz-feature-server",
-  "version": "0.6.7-rc5",
+  "version": "v0.7.0",
  "main": "app.js",
  "engines": {
    "node": ">= 10.16.0"
@@ -28,15 +28,15 @@
  "dependencies": {
    "@jambonz/db-helpers": "^0.6.14",
    "@jambonz/mw-registrar": "^0.2.1",
-    "@jambonz/realtimedb-helpers": "^0.4.9",
+    "@jambonz/realtimedb-helpers": "^0.4.10",
    "@jambonz/stats-collector": "^0.1.5",
    "@jambonz/time-series": "^0.1.5",
-    "aws-sdk": "^2.846.0",
+    "aws-sdk": "^2.1036.0",
    "bent": "^7.3.12",
    "cidr-matcher": "^2.1.1",
    "debug": "^4.3.1",
    "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^2.0.11",
+    "drachtio-fsmrf": "^2.0.13",
    "drachtio-srf": "^4.4.55",
    "express": "^4.17.1",
    "ip": "^1.1.5",
Author	SHA1	Message	Date
snyk-bot	d786a029d0	fix: upgrade aws-sdk from 2.848.0 to 2.1036.0 Snyk has created this PR to upgrade aws-sdk from 2.848.0 to 2.1036.0. See this package in npm: https://www.npmjs.com/package/aws-sdk See this project in Snyk: https://app.snyk.io/org/davehorton/project/cec90d0e-0ded-433e-a42e-fe78b28ae489?utm_source=github&utm_medium=referral&page=upgrade-pr	2021-12-17 18:36:55 +00:00
Dave Horton	2b9cb5105f	clean up handlers	2021-12-15 19:33:31 -05:00
Dave Horton	afbbed3f5c	default options ping interval to 30s, with env override if desired	2021-12-14 12:28:02 -05:00
Dave Horton	f642967f02	add SIGTERM handler	2021-12-13 18:08:53 -05:00
Dave Horton	fbe2aa2c06	add SIGUSR2 handler to remove fs from redis set	2021-12-13 17:59:23 -05:00
Dave Horton	5321b5c651	minor change to dial _releaseMedia	2021-12-13 13:22:09 -05:00
Dave Horton	83c114803f	minor logging	2021-12-13 11:48:43 -05:00
Dave Horton	0663174f46	additional logging	2021-12-12 09:30:36 -05:00
Dave Horton	3d4359fbe4	fix bug from prev checkin, destroy does not return a promise	2021-12-09 11:24:52 -05:00
Dave Horton	10382573fa	clean up some retainers	2021-12-09 10:44:50 -05:00
Dave Horton	c190279927	bugfix: enqueue task was only invoking waitUrl a single time	2021-12-06 21:18:51 -05:00
Dave Horton	114f65b36a	add env LEGACY_CRYPTO	2021-11-29 09:03:43 -05:00