From 40bd3c9c88052bab5609d6d30a88c51ebfd9e314 Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Thu, 27 Jan 2022 10:13:18 -0500 Subject: [PATCH 01/10] update to realtimedb-helpers with support for wellsaid tts --- package-lock.json | 16 +++++++++------- package.json | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 20433a8f..b0e182a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@jambonz/db-helpers": "^0.6.16", "@jambonz/http-health-check": "^0.0.1", "@jambonz/mw-registrar": "^0.2.1", - "@jambonz/realtimedb-helpers": "^0.4.17", + "@jambonz/realtimedb-helpers": "^0.4.18", "@jambonz/stats-collector": "^0.1.6", "@jambonz/time-series": "^0.1.5", "aws-sdk": "^2.1060.0", @@ -545,13 +545,14 @@ } }, "node_modules/@jambonz/realtimedb-helpers": { - "version": "0.4.17", - "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.17.tgz", - "integrity": "sha512-ERE+VLAmbZJ4DFIHXS689xr3EDVPWvpLxx69kSb/Z+QAZtbbv7a2E7XmJ6/QxF25VgKxNHOg949qYCFoWxb2RQ==", + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.18.tgz", + "integrity": "sha512-q1nxqA/tRBlNiRWvprukapRwU2ElC/OFvz2vbBIHBW6Zkfuty3KSesXsVkYDU9zF4zKEynFEhcT1nshKQKH2ag==", "dependencies": { "@google-cloud/text-to-speech": "^3.4.0", "@jambonz/promisify-redis": "^0.0.6", "aws-sdk": "^2.1060.0", + "bent": "^7.3.12", "debug": "^4.3.3", "microsoft-cognitiveservices-speech-sdk": "^1.19.0", "redis": "^3.1.2" @@ -5875,13 +5876,14 @@ } }, "@jambonz/realtimedb-helpers": { - "version": "0.4.17", - "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.17.tgz", - "integrity": "sha512-ERE+VLAmbZJ4DFIHXS689xr3EDVPWvpLxx69kSb/Z+QAZtbbv7a2E7XmJ6/QxF25VgKxNHOg949qYCFoWxb2RQ==", + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.18.tgz", + "integrity": "sha512-q1nxqA/tRBlNiRWvprukapRwU2ElC/OFvz2vbBIHBW6Zkfuty3KSesXsVkYDU9zF4zKEynFEhcT1nshKQKH2ag==", "requires": { "@google-cloud/text-to-speech": "^3.4.0", "@jambonz/promisify-redis": "^0.0.6", "aws-sdk": "^2.1060.0", + "bent": "^7.3.12", "debug": "^4.3.3", "microsoft-cognitiveservices-speech-sdk": "^1.19.0", "redis": "^3.1.2" diff --git a/package.json b/package.json index 3a1a1004..a7e1149d 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@jambonz/db-helpers": "^0.6.16", "@jambonz/http-health-check": "^0.0.1", "@jambonz/mw-registrar": "^0.2.1", - "@jambonz/realtimedb-helpers": "^0.4.17", + "@jambonz/realtimedb-helpers": "^0.4.18", "@jambonz/stats-collector": "^0.1.6", "@jambonz/time-series": "^0.1.5", "aws-sdk": "^2.1060.0", From 25567a78421a326edb3683f92aa4cc4f85f76eeb Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Thu, 27 Jan 2022 10:34:30 -0500 Subject: [PATCH 02/10] add support for retrieving wellsaid speech credential --- lib/session/call-session.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/session/call-session.js b/lib/session/call-session.js index 8fe8aba2..4bf151f9 100644 --- a/lib/session/call-session.js +++ b/lib/session/call-session.js @@ -264,6 +264,12 @@ class CallSession extends Emitter { region: credential.region }; } + else if ('wellsaid' === vendor) { + return { + speech_credential_sid: credential.speech_credential_sid, + api_key: credential.api_key + }; + } } else { writeAlerts({ From e5821cddf8a459e3d4b8f8a87cc12c736288a547 Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Thu, 27 Jan 2022 10:46:16 -0500 Subject: [PATCH 03/10] further fix for wellsaid tts --- lib/utils/db-utils.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/utils/db-utils.js b/lib/utils/db-utils.js index 4129cd90..e0fc3324 100644 --- a/lib/utils/db-utils.js +++ b/lib/utils/db-utils.js @@ -36,6 +36,10 @@ const speechMapper = (cred) => { obj.api_key = o.api_key; obj.region = o.region; } + else if ('wellsaid' === obj.vendor) { + const o = JSON.parse(decrypt(credential)); + obj.api_key = o.api_key; + } return obj; }; From 62ff44540d8ccfcc803e53c75a49c3b3ce128fbb Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Thu, 27 Jan 2022 10:55:32 -0500 Subject: [PATCH 04/10] more changes for wellsaid --- lib/utils/db-utils.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/utils/db-utils.js b/lib/utils/db-utils.js index e0fc3324..c9febfd1 100644 --- a/lib/utils/db-utils.js +++ b/lib/utils/db-utils.js @@ -57,6 +57,7 @@ module.exports = (logger, srf) => { const haveGoogle = speech.find((s) => s.vendor === 'google'); const haveAws = speech.find((s) => s.vendor === 'aws'); const haveMicrosoft = speech.find((s) => s.vendor === 'microsoft'); + const haveWellsaid = speech.find((s) => s.vendor === 'wellsaid'); if (!haveGoogle || !haveAws || !haveMicrosoft) { const [r3] = await pp.query(sqlSpeechCredentialsForSP, account_sid); if (r3.length) { @@ -72,6 +73,10 @@ module.exports = (logger, srf) => { const ms = r3.find((s) => s.vendor === 'microsoft'); if (ms) speech.push(speechMapper(ms)); } + if (!haveWellsaid) { + const wellsaid = r3.find((s) => s.vendor === 'wellsaid'); + if (wellsaid) speech.push(speechMapper(wellsaid)); + } } } From 77a696a0dcc61bd4f7a7c2f15eef79e870646d8e Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Thu, 27 Jan 2022 13:52:35 -0500 Subject: [PATCH 05/10] update to latest synthAudio with minor fixes --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index b0e182a0..2a14bd7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@jambonz/db-helpers": "^0.6.16", "@jambonz/http-health-check": "^0.0.1", "@jambonz/mw-registrar": "^0.2.1", - "@jambonz/realtimedb-helpers": "^0.4.18", + "@jambonz/realtimedb-helpers": "^0.4.19", "@jambonz/stats-collector": "^0.1.6", "@jambonz/time-series": "^0.1.5", "aws-sdk": "^2.1060.0", @@ -545,9 +545,9 @@ } }, "node_modules/@jambonz/realtimedb-helpers": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.18.tgz", - "integrity": "sha512-q1nxqA/tRBlNiRWvprukapRwU2ElC/OFvz2vbBIHBW6Zkfuty3KSesXsVkYDU9zF4zKEynFEhcT1nshKQKH2ag==", + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.19.tgz", + "integrity": "sha512-wEc7OXogQ5SZ9mgLNxviBNY0WvUKGGztyDzze3oi44edsZp0vNneVHUmdZuDzuDvUMBqsvCa0fvri8LGaxovlw==", "dependencies": { "@google-cloud/text-to-speech": "^3.4.0", "@jambonz/promisify-redis": "^0.0.6", @@ -5876,9 +5876,9 @@ } }, "@jambonz/realtimedb-helpers": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.18.tgz", - "integrity": "sha512-q1nxqA/tRBlNiRWvprukapRwU2ElC/OFvz2vbBIHBW6Zkfuty3KSesXsVkYDU9zF4zKEynFEhcT1nshKQKH2ag==", + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.4.19.tgz", + "integrity": "sha512-wEc7OXogQ5SZ9mgLNxviBNY0WvUKGGztyDzze3oi44edsZp0vNneVHUmdZuDzuDvUMBqsvCa0fvri8LGaxovlw==", "requires": { "@google-cloud/text-to-speech": "^3.4.0", "@jambonz/promisify-redis": "^0.0.6", diff --git a/package.json b/package.json index a7e1149d..6c46b105 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@jambonz/db-helpers": "^0.6.16", "@jambonz/http-health-check": "^0.0.1", "@jambonz/mw-registrar": "^0.2.1", - "@jambonz/realtimedb-helpers": "^0.4.18", + "@jambonz/realtimedb-helpers": "^0.4.19", "@jambonz/stats-collector": "^0.1.6", "@jambonz/time-series": "^0.1.5", "aws-sdk": "^2.1060.0", From ce738a785275f5c49d3d4675a642dcc893a30273 Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Fri, 28 Jan 2022 09:16:05 -0500 Subject: [PATCH 06/10] 0.7.2 version --- Dockerfile | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd875f91..df042bcd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:17-slim +FROM node:17.4-slim WORKDIR /opt/app/ COPY package.json ./ RUN npm install diff --git a/package-lock.json b/package-lock.json index 2a14bd7a..22e87d7f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "jambonz-feature-server", - "version": "v0.7.1", + "version": "v0.7.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "jambonz-feature-server", - "version": "v0.7.1", + "version": "v0.7.2", "license": "MIT", "dependencies": { "@cognigy/socket-client": "^4.5.5", diff --git a/package.json b/package.json index 6c46b105..e1ca9cae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jambonz-feature-server", - "version": "v0.7.1", + "version": "v0.7.2", "main": "app.js", "engines": { "node": ">= 10.16.0" From 36683dc151d5821e8730f8a0e461f995ffd719d2 Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Fri, 28 Jan 2022 13:36:06 -0500 Subject: [PATCH 07/10] bugfix: include custom jambonz headers on rest outdial --- lib/http-routes/api/create-call.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/http-routes/api/create-call.js b/lib/http-routes/api/create-call.js index bd856c39..47b757ed 100644 --- a/lib/http-routes/api/create-call.js +++ b/lib/http-routes/api/create-call.js @@ -35,6 +35,8 @@ router.post('/', async(req, res) => { opts.headers = { ...opts.headers, + 'X-Jambonz-Routing': target.type, + 'X-Jambonz-FS-UUID': srf.locals.fsUUID, 'X-Call-Sid': callSid, 'X-Account-Sid': req.body.account_sid }; From 2329f0cda018e310cf9c4756151447fd0e0ff44d Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Tue, 1 Feb 2022 11:00:12 -0500 Subject: [PATCH 08/10] child tasks must remove reference to parent on kill or else entangled parent-child tasks will not be gc'ed --- lib/tasks/task.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/tasks/task.js b/lib/tasks/task.js index 7a99493d..6c2434f9 100644 --- a/lib/tasks/task.js +++ b/lib/tasks/task.js @@ -62,7 +62,9 @@ class Task extends Emitter { kill(cs) { if (this.cs && !this.cs.isConfirmCallSession) this.logger.debug(`${this.name} is being killed`); this._killInProgress = true; - // no-op + + /* remove reference to parent task or else entangled parent-child tasks will not be gc'ed */ + setImmediate(() => this.parentTask = null); } /** From dda3335060b7fa4beec94bc537a8ff6169f19549 Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Thu, 3 Feb 2022 07:31:30 -0500 Subject: [PATCH 09/10] update deps, add helmet middleware --- app.js | 3 ++ lib/tasks/dial.js | 1 + package-lock.json | 126 +++++++++++++++++++++++----------------------- package.json | 7 +-- 4 files changed, 71 insertions(+), 66 deletions(-) diff --git a/app.js b/app.js index 4be4abeb..66a52503 100644 --- a/app.js +++ b/app.js @@ -31,6 +31,7 @@ const { // HTTP const express = require('express'); +const helmet =require('helmet'); const app = express(); Object.assign(app.locals, { logger, @@ -73,6 +74,8 @@ srf.invite((req, res) => { }); // HTTP +app.use(helmet()); +app.use(helmet.hidePoweredBy()); app.use(express.urlencoded({ extended: true })); app.use(express.json()); app.use('/', httpRoutes); diff --git a/lib/tasks/dial.js b/lib/tasks/dial.js index e89810fc..f55099a5 100644 --- a/lib/tasks/dial.js +++ b/lib/tasks/dial.js @@ -179,6 +179,7 @@ class TaskDial extends Task { this._killOutdials(); if (this.sd) { this.sd.kill(); + this.sd.removeAllListeners(); this.sd = null; } if (this.callSid) sessionTracker.remove(this.callSid); diff --git a/package-lock.json b/package-lock.json index 22e87d7f..211c28dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,19 +15,20 @@ "@jambonz/mw-registrar": "^0.2.1", "@jambonz/realtimedb-helpers": "^0.4.19", "@jambonz/stats-collector": "^0.1.6", - "@jambonz/time-series": "^0.1.5", + "@jambonz/time-series": "^0.1.6", "aws-sdk": "^2.1060.0", "bent": "^7.3.12", "cidr-matcher": "^2.1.1", "debug": "^4.3.2", "deepcopy": "^2.1.0", "drachtio-fsmrf": "^2.0.13", - "drachtio-srf": "^4.4.55", + "drachtio-srf": "^4.4.61", "express": "^4.17.1", + "helmet": "^5.0.2", "ip": "^1.1.5", "moment": "^2.29.1", "parse-url": "^5.0.7", - "pino": "^6.13.2", + "pino": "^6.13.4", "to-snake-case": "^1.0.0", "uuid": "^8.3.2", "verify-aws-sns-signature": "^0.0.6", @@ -568,9 +569,9 @@ } }, "node_modules/@jambonz/time-series": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.1.5.tgz", - "integrity": "sha512-JDkAshqq9VRdIY7S/Edz9iIyKNoyCoUMfn0IUVyUG4Hf53fmhYRCnFnDTdMFAs6Y4amE39m3968nrZRr+lVIqQ==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.1.6.tgz", + "integrity": "sha512-EFO1ZFUazHLCzDYkAbpke0IfmPRogLkGg+KGWwz3SGpnuiltfohQ3TsJ5KG8Gp9mXqdpkyAioWSdaJxGDquthQ==", "dependencies": { "debug": "^4.3.1", "influx": "^5.8.0" @@ -1603,9 +1604,9 @@ } }, "node_modules/drachtio-sip": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/drachtio-sip/-/drachtio-sip-0.6.2.tgz", - "integrity": "sha512-BkiRZq3Yq2WVSGY3M7Hv4yX4dIW/o0/4xNMcm26IxT71YIRy07UtbQUHaMI3P2HfPu5zK6RoQW2MHrxPXtz6ZQ==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/drachtio-sip/-/drachtio-sip-0.6.3.tgz", + "integrity": "sha512-sQQ2JdRQ58z+WbkxORlWKZCeinu499tugfsdh7jRBWX6SO4odDevT5JL+42dMlwrL83CZUL6w2Xjgu0uaABoMQ==", "dependencies": { "debug": "^4.3.1", "eslint-plugin-promise": "^5.1.0", @@ -1613,9 +1614,9 @@ } }, "node_modules/drachtio-sip/node_modules/eslint-plugin-promise": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.1.tgz", - "integrity": "sha512-XgdcdyNzHfmlQyweOPTxmc7pIsS6dE4MvwhXWMQ2Dxs1XAL2GJDilUsjWen6TWik0aSI+zD/PqocZBblcm9rdA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz", + "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==", "engines": { "node": "^10.12.0 || >=12.0.0" }, @@ -1624,15 +1625,15 @@ } }, "node_modules/drachtio-srf": { - "version": "4.4.59", - "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.4.59.tgz", - "integrity": "sha512-hrW9bZ8TZR9JQ3pqI+nyrI1eAzEOwHuvm1lNL1fbmZmRddKJzYdylkgVoyURs/OlT/nANy/M43GrQjcGP4psPw==", + "version": "4.4.61", + "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.4.61.tgz", + "integrity": "sha512-HZwKTAR6V7dc84BV50h5xAopkQ1k8wUy04JXDmq2/O+uryANFwaklICidg1oJkIrnYUPWQn/1IfZnqGSv9O2Sw==", "dependencies": { "async": "^1.4.2", "debug": "^3.2.7", "delegates": "^0.1.0", "deprecate": "^1.1.1", - "drachtio-sip": "^0.6.2", + "drachtio-sip": "^0.6.3", "node-noop": "0.0.1", "only": "0.0.2", "sdp-transform": "^2.14.1", @@ -1640,7 +1641,7 @@ "sip-methods": "^0.3.0", "sip-status": "^0.1.0", "utils-merge": "1.0.0", - "uuid": "^3.4.0" + "uuid": "^8.3.2" }, "engines": { "node": ">= 6.9.3" @@ -1659,15 +1660,6 @@ "ms": "^2.1.1" } }, - "node_modules/drachtio-srf/node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", - "bin": { - "uuid": "bin/uuid" - } - }, "node_modules/duplexify": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz", @@ -2259,11 +2251,6 @@ "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz", "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==" }, - "node_modules/fastify-warning": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/fastify-warning/-/fastify-warning-0.2.0.tgz", - "integrity": "sha512-s1EQguBw/9qtc1p/WTY4eq9WMRIACkj+HTcOIK1in4MV5aFaQC9ZCIt0dJ7pr5bIf4lPpHvAtP2ywpTNgs7hqw==" - }, "node_modules/file-entry-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz", @@ -2719,6 +2706,14 @@ "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.2.1.tgz", "integrity": "sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=" }, + "node_modules/helmet": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.0.2.tgz", + "integrity": "sha512-QWlwUZZ8BtlvwYVTSDTBChGf8EOcQ2LkGMnQJxSzD1mUu8CCjXJZq/BXP8eWw4kikRnzlhtYo3lCk0ucmYA3Vg==", + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/hot-shots": { "version": "8.5.2", "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-8.5.2.tgz", @@ -4047,15 +4042,15 @@ "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "node_modules/pino": { - "version": "6.13.3", - "resolved": "https://registry.npmjs.org/pino/-/pino-6.13.3.tgz", - "integrity": "sha512-tJy6qVgkh9MwNgqX1/oYi3ehfl2Y9H0uHyEEMsBe74KinESIjdMrMQDWpcZPpPicg3VV35d/GLQZmo4QgU2Xkg==", + "version": "6.13.4", + "resolved": "https://registry.npmjs.org/pino/-/pino-6.13.4.tgz", + "integrity": "sha512-g4tHSISmQJYUEKEMVdaZ+ZokWwFnTwZL5JPn+lnBVZ1BuBbrSchrXwQINknkM5+Q4fF6U9NjiI8PWwwMDHt9zA==", "dependencies": { "fast-redact": "^3.0.0", "fast-safe-stringify": "^2.0.8", - "fastify-warning": "^0.2.0", "flatstr": "^1.0.12", "pino-std-serializers": "^3.1.0", + "process-warning": "^1.0.0", "quick-format-unescaped": "^4.0.3", "sonic-boom": "^1.0.2" }, @@ -4100,6 +4095,11 @@ "node": ">=8" } }, + "node_modules/process-warning": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-1.0.0.tgz", + "integrity": "sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q==" + }, "node_modules/progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", @@ -5899,9 +5899,9 @@ } }, "@jambonz/time-series": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.1.5.tgz", - "integrity": "sha512-JDkAshqq9VRdIY7S/Edz9iIyKNoyCoUMfn0IUVyUG4Hf53fmhYRCnFnDTdMFAs6Y4amE39m3968nrZRr+lVIqQ==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@jambonz/time-series/-/time-series-0.1.6.tgz", + "integrity": "sha512-EFO1ZFUazHLCzDYkAbpke0IfmPRogLkGg+KGWwz3SGpnuiltfohQ3TsJ5KG8Gp9mXqdpkyAioWSdaJxGDquthQ==", "requires": { "debug": "^4.3.1", "influx": "^5.8.0" @@ -6746,9 +6746,9 @@ } }, "drachtio-sip": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/drachtio-sip/-/drachtio-sip-0.6.2.tgz", - "integrity": "sha512-BkiRZq3Yq2WVSGY3M7Hv4yX4dIW/o0/4xNMcm26IxT71YIRy07UtbQUHaMI3P2HfPu5zK6RoQW2MHrxPXtz6ZQ==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/drachtio-sip/-/drachtio-sip-0.6.3.tgz", + "integrity": "sha512-sQQ2JdRQ58z+WbkxORlWKZCeinu499tugfsdh7jRBWX6SO4odDevT5JL+42dMlwrL83CZUL6w2Xjgu0uaABoMQ==", "requires": { "debug": "^4.3.1", "eslint-plugin-promise": "^5.1.0", @@ -6756,23 +6756,23 @@ }, "dependencies": { "eslint-plugin-promise": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.1.tgz", - "integrity": "sha512-XgdcdyNzHfmlQyweOPTxmc7pIsS6dE4MvwhXWMQ2Dxs1XAL2GJDilUsjWen6TWik0aSI+zD/PqocZBblcm9rdA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz", + "integrity": "sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==", "requires": {} } } }, "drachtio-srf": { - "version": "4.4.59", - "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.4.59.tgz", - "integrity": "sha512-hrW9bZ8TZR9JQ3pqI+nyrI1eAzEOwHuvm1lNL1fbmZmRddKJzYdylkgVoyURs/OlT/nANy/M43GrQjcGP4psPw==", + "version": "4.4.61", + "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.4.61.tgz", + "integrity": "sha512-HZwKTAR6V7dc84BV50h5xAopkQ1k8wUy04JXDmq2/O+uryANFwaklICidg1oJkIrnYUPWQn/1IfZnqGSv9O2Sw==", "requires": { "async": "^1.4.2", "debug": "^3.2.7", "delegates": "^0.1.0", "deprecate": "^1.1.1", - "drachtio-sip": "^0.6.2", + "drachtio-sip": "^0.6.3", "node-noop": "0.0.1", "only": "0.0.2", "sdp-transform": "^2.14.1", @@ -6780,7 +6780,7 @@ "sip-methods": "^0.3.0", "sip-status": "^0.1.0", "utils-merge": "1.0.0", - "uuid": "^3.4.0" + "uuid": "^8.3.2" }, "dependencies": { "async": { @@ -6795,11 +6795,6 @@ "requires": { "ms": "^2.1.1" } - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" } } }, @@ -7272,11 +7267,6 @@ "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz", "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig==" }, - "fastify-warning": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/fastify-warning/-/fastify-warning-0.2.0.tgz", - "integrity": "sha512-s1EQguBw/9qtc1p/WTY4eq9WMRIACkj+HTcOIK1in4MV5aFaQC9ZCIt0dJ7pr5bIf4lPpHvAtP2ywpTNgs7hqw==" - }, "file-entry-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz", @@ -7628,6 +7618,11 @@ } } }, + "helmet": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.0.2.tgz", + "integrity": "sha512-QWlwUZZ8BtlvwYVTSDTBChGf8EOcQ2LkGMnQJxSzD1mUu8CCjXJZq/BXP8eWw4kikRnzlhtYo3lCk0ucmYA3Vg==" + }, "hot-shots": { "version": "8.5.2", "resolved": "https://registry.npmjs.org/hot-shots/-/hot-shots-8.5.2.tgz", @@ -8632,15 +8627,15 @@ "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "pino": { - "version": "6.13.3", - "resolved": "https://registry.npmjs.org/pino/-/pino-6.13.3.tgz", - "integrity": "sha512-tJy6qVgkh9MwNgqX1/oYi3ehfl2Y9H0uHyEEMsBe74KinESIjdMrMQDWpcZPpPicg3VV35d/GLQZmo4QgU2Xkg==", + "version": "6.13.4", + "resolved": "https://registry.npmjs.org/pino/-/pino-6.13.4.tgz", + "integrity": "sha512-g4tHSISmQJYUEKEMVdaZ+ZokWwFnTwZL5JPn+lnBVZ1BuBbrSchrXwQINknkM5+Q4fF6U9NjiI8PWwwMDHt9zA==", "requires": { "fast-redact": "^3.0.0", "fast-safe-stringify": "^2.0.8", - "fastify-warning": "^0.2.0", "flatstr": "^1.0.12", "pino-std-serializers": "^3.1.0", + "process-warning": "^1.0.0", "quick-format-unescaped": "^4.0.3", "sonic-boom": "^1.0.2" } @@ -8673,6 +8668,11 @@ "fromentries": "^1.2.0" } }, + "process-warning": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-1.0.0.tgz", + "integrity": "sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q==" + }, "progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", diff --git a/package.json b/package.json index e1ca9cae..77ef48cf 100644 --- a/package.json +++ b/package.json @@ -32,19 +32,20 @@ "@jambonz/mw-registrar": "^0.2.1", "@jambonz/realtimedb-helpers": "^0.4.19", "@jambonz/stats-collector": "^0.1.6", - "@jambonz/time-series": "^0.1.5", + "@jambonz/time-series": "^0.1.6", "aws-sdk": "^2.1060.0", "bent": "^7.3.12", "cidr-matcher": "^2.1.1", "debug": "^4.3.2", "deepcopy": "^2.1.0", "drachtio-fsmrf": "^2.0.13", - "drachtio-srf": "^4.4.55", + "drachtio-srf": "^4.4.61", "express": "^4.17.1", + "helmet": "^5.0.2", "ip": "^1.1.5", "moment": "^2.29.1", "parse-url": "^5.0.7", - "pino": "^6.13.2", + "pino": "^6.13.4", "to-snake-case": "^1.0.0", "uuid": "^8.3.2", "verify-aws-sns-signature": "^0.0.6", From cfe9397502284ff5b85f8309c423abc4cb19c03b Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Thu, 3 Feb 2022 07:36:01 -0500 Subject: [PATCH 10/10] lint --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 66a52503..d4c3fa1d 100644 --- a/app.js +++ b/app.js @@ -31,7 +31,7 @@ const { // HTTP const express = require('express'); -const helmet =require('helmet'); +const helmet = require('helmet'); const app = express(); Object.assign(app.locals, { logger,