updates to latest drachtio-srf and drachtio-fsmrf

README.md

@@ -86,5 +86,7 @@ module.exports = {
 ```
 
 #### Running the test suite
-
-Please [see this]](./docs/contributing.md#run-the-regression-test-suite).
+The test suite currently only consists of JSON-parsing unit tests.  A full end-to-end sip test suite should be added.
+```
+npm test
+```

docs/contributing.md

@@ -89,9 +89,7 @@ f80adda48eb5   jambonz/webhook-test-scaffold:latest            "/entrypoint.sh"
 
 #### Run the regression test suite
 
-The test suite has a dependency that the mysql client is installed on your laptop/machine where the test will be run.  This is needed in order to seed the mysql database that is running in the docker network.
-
-Assuming you have installed the mysql client, and done the above steps, you should now be able to run the tests:
+At this point you should be able to run the tests:
 
 ```bash
 ./run-tests.sh

lib/tasks/conference.js

@@ -551,8 +551,7 @@ class Conference extends Task {
         accountInfo: cs.accountInfo,
         memberId: this.memberId,
         confName: this.confName,
-        tasks,
-        rootSpan: cs.rootSpan
+        tasks
       });
       await this._playSession.exec();
       this._playSession = null;

lib/tasks/enqueue.js

@@ -349,8 +349,7 @@ class TaskEnqueue extends Task {
         ep: cs.ep,
         callInfo: cs.callInfo,
         accountInfo: cs.accountInfo,
-        tasks: tasksToRun,
-        rootSpan: cs.rootSpan
+        tasks: tasksToRun
       });
       await this._playSession.exec();
       this._playSession = null;

lib/tasks/gather.js

@@ -349,9 +349,7 @@ class TaskGather extends Task {
     }
     assert(!this._timeoutTimer);
     this.logger.debug(`Gather:_startTimer: timeout ${this.timeout}`);
-    this._timeoutTimer = setTimeout(() => {
-      this._resolve(this.digitBuffer.length >= this.minDigits ? 'dtmf-num-digits' : 'timeout');
-    }, this.timeout);
+    this._timeoutTimer = setTimeout(() => this._resolve('timeout'), this.timeout);
   }
 
   _clearTimer() {

package.json

@@ -26,46 +26,46 @@
     "jslint": "eslint app.js lib"
   },
   "dependencies": {
-    "@jambonz/db-helpers": "^0.6.18",
+    "@jambonz/db-helpers": "^0.6.16",
     "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.4.29",
+    "@jambonz/realtimedb-helpers": "^0.4.27",
     "@jambonz/stats-collector": "^0.1.6",
-    "@jambonz/time-series": "^0.1.9",
+    "@jambonz/time-series": "^0.1.6",
     "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/exporter-jaeger": "^1.3.1",
+    "@opentelemetry/exporter-jaeger": "^1.1.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.27.0",
-    "@opentelemetry/exporter-zipkin": "^1.3.1",
+    "@opentelemetry/exporter-zipkin": "^1.1.0",
     "@opentelemetry/instrumentation": "^0.27.0",
-    "@opentelemetry/resources": "^1.3.1",
-    "@opentelemetry/sdk-trace-base": "^1.3.1",
-    "@opentelemetry/sdk-trace-node": "^1.3.1",
-    "@opentelemetry/semantic-conventions": "^1.3.1",
-    "aws-sdk": "^2.1152.0",
+    "@opentelemetry/resources": "^1.1.0",
+    "@opentelemetry/sdk-trace-base": "^1.1.0",
+    "@opentelemetry/sdk-trace-node": "^1.1.0",
+    "@opentelemetry/semantic-conventions": "^1.1.0",
+    "aws-sdk": "^2.1073.0",
     "bent": "^7.3.12",
-    "debug": "^4.3.4",
+    "debug": "^4.3.2",
     "deepcopy": "^2.1.0",
     "drachtio-fsmrf": "^3.0.0",
     "drachtio-srf": "^4.5.0",
-    "express": "^4.18.1",
-    "helmet": "^5.1.0",
-    "ip": "^1.1.8",
-    "moment": "^2.29.3",
-    "parse-url": "^5.0.8",
-    "pino": "^6.14.0",
+    "express": "^4.17.1",
+    "helmet": "^5.0.2",
+    "ip": "^1.1.5",
+    "moment": "^2.29.2",
+    "parse-url": "^5.0.7",
+    "pino": "^6.13.4",
     "sdp-transform": "^2.14.1",
     "short-uuid": "^4.2.0",
     "to-snake-case": "^1.0.0",
     "uuid": "^8.3.2",
     "verify-aws-sns-signature": "^0.0.6",
-    "ws": "^8.8.0",
+    "ws": "^8.5.0",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
-    "clear-module": "^4.1.2",
-    "eslint": "^7.32.0",
+    "clear-module": "^4.1.1",
+    "eslint": "^7.20.0",
     "eslint-plugin-promise": "^4.3.1",
     "nyc": "^15.1.0",
-    "tape": "^5.5.3"
+    "tape": "^5.2.2"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.6",

test/sip-tests.js

@@ -1,5 +1,7 @@
 const test = require('tape');
-const { sippUac } = require('./sipp')('test_sbc-inbound');
+const { output, sippUac } = require('./sipp')('test_sbc-inbound');
+const debug = require('debug')('drachtio:sbc-inbound');
+const clearModule = require('clear-module');
 
 process.on('unhandledRejection', (reason, p) => {
   console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);