From e2ad0dca0e3e96881d309ac7b681993663411335 Mon Sep 17 00:00:00 2001 From: Dave Horton Date: Wed, 28 Dec 2022 10:40:26 -0600 Subject: [PATCH] faster uuid --- lib/http-routes/api/create-call.js | 2 +- lib/middleware.js | 2 +- lib/session/call-info.js | 2 +- lib/tasks/message.js | 2 +- lib/tasks/task.js | 2 +- lib/utils/place-outdial.js | 2 +- lib/utils/sbc-pinger.js | 2 +- lib/utils/siprec-utils.js | 2 +- package-lock.json | 85 ++++++++++++++---------------- package.json | 10 ++-- 10 files changed, 51 insertions(+), 60 deletions(-) diff --git a/lib/http-routes/api/create-call.js b/lib/http-routes/api/create-call.js index efff6ec9..07555725 100644 --- a/lib/http-routes/api/create-call.js +++ b/lib/http-routes/api/create-call.js @@ -3,7 +3,7 @@ const makeTask = require('../../tasks/make_task'); const RestCallSession = require('../../session/rest-call-session'); const CallInfo = require('../../session/call-info'); const {CallDirection, CallStatus} = require('../../utils/constants'); -const uuidv4 = require('random-uuid'); +const uuidv4 = require('uuid-random'); const SipError = require('drachtio-srf').SipError; const sysError = require('./error'); const HttpRequestor = require('../../utils/http-requestor'); diff --git a/lib/middleware.js b/lib/middleware.js index 8629d832..738e860a 100644 --- a/lib/middleware.js +++ b/lib/middleware.js @@ -1,4 +1,4 @@ -const uuidv4 = require('random-uuid'); +const uuidv4 = require('uuid-random'); const {CallDirection, AllowedSipRecVerbs} = require('./utils/constants'); const {parseSiprecPayload} = require('./utils/siprec-utils'); const CallInfo = require('./session/call-info'); diff --git a/lib/session/call-info.js b/lib/session/call-info.js index f172b781..4f056018 100644 --- a/lib/session/call-info.js +++ b/lib/session/call-info.js @@ -1,6 +1,6 @@ const {CallDirection, CallStatus} = require('../utils/constants'); const parseUri = require('drachtio-srf').parseUri; -const uuidv4 = require('random-uuid'); +const uuidv4 = require('uuid-random'); /** * @classdesc Represents the common information for all calls * that is provided in call status webhooks diff --git a/lib/tasks/message.js b/lib/tasks/message.js index 4a3ad18b..523736c2 100644 --- a/lib/tasks/message.js +++ b/lib/tasks/message.js @@ -1,7 +1,7 @@ const Task = require('./task'); const {TaskName, TaskPreconditions} = require('../utils/constants'); const bent = require('bent'); -const uuidv4 = require('random-uuid'); +const uuidv4 = require('uuid-random'); class TaskMessage extends Task { constructor(logger, opts) { diff --git a/lib/tasks/task.js b/lib/tasks/task.js index f8e18248..e23bf361 100644 --- a/lib/tasks/task.js +++ b/lib/tasks/task.js @@ -1,5 +1,5 @@ const Emitter = require('events'); -const uuidv4 = require('random-uuid'); +const uuidv4 = require('uuid-random'); const debug = require('debug')('jambonz:feature-server'); const assert = require('assert'); const {TaskPreconditions} = require('../utils/constants'); diff --git a/lib/utils/place-outdial.js b/lib/utils/place-outdial.js index 7cc38660..a6f3b841 100644 --- a/lib/utils/place-outdial.js +++ b/lib/utils/place-outdial.js @@ -12,7 +12,7 @@ const deepcopy = require('deepcopy'); const moment = require('moment'); const stripCodecs = require('./strip-ancillary-codecs'); const RootSpan = require('./call-tracer'); -const uuidv4 = require('random-uuid'); +const uuidv4 = require('uuid-random'); class SingleDialer extends Emitter { constructor({logger, sbcAddress, target, opts, application, callInfo, accountInfo, rootSpan, startSpan}) { diff --git a/lib/utils/sbc-pinger.js b/lib/utils/sbc-pinger.js index 10c04200..ae0b5509 100644 --- a/lib/utils/sbc-pinger.js +++ b/lib/utils/sbc-pinger.js @@ -1,5 +1,5 @@ const assert = require('assert'); -const uuidv4 = require('random-uuid'); +const uuidv4 = require('uuid-random'); const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./constants'); const Emitter = require('events'); const debug = require('debug')('jambonz:feature-server'); diff --git a/lib/utils/siprec-utils.js b/lib/utils/siprec-utils.js index f2f25d56..3d9c5edf 100644 --- a/lib/utils/siprec-utils.js +++ b/lib/utils/siprec-utils.js @@ -1,5 +1,5 @@ const xmlParser = require('xml2js').parseString; -const uuidv4 = require('random-uuid'); +const uuidv4 = require('uuid-random'); const parseUri = require('drachtio-srf').parseUri; const transform = require('sdp-transform'); const debug = require('debug')('jambonz:feature-server'); diff --git a/package-lock.json b/package-lock.json index 06a48916..9bc1d213 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,19 +27,25 @@ "bent": "^7.3.12", "debug": "^4.3.4", "deepcopy": "^2.1.0", +<<<<<<< HEAD "drachtio-fsmrf": "^3.0.12", "drachtio-srf": "^4.5.19", "express": "^4.18.1", "helmet": "^5.1.0", +======= + "drachtio-fsmrf": "^3.0.15", + "drachtio-srf": "^4.5.20", + "express": "^4.18.2", +>>>>>>> 29f578f (faster uuid) "ip": "^1.1.8", "moment": "^2.29.4", "parse-url": "^8.1.0", "pino": "^6.14.0", - "random-uuid": "^1.0.2", "sdp-transform": "^2.14.1", "short-uuid": "^4.2.0", "to-snake-case": "^1.0.0", "undici": "^5.11.0", + "uuid-random": "^1.3.2", "verify-aws-sns-signature": "^0.1.0", "ws": "^8.8.0", "xml2js": "^0.4.23" @@ -2018,19 +2024,19 @@ } }, "node_modules/drachtio-fsmrf": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.12.tgz", - "integrity": "sha512-wpBqlNMj6mKSdMI03mFI5nBZbCmohiLWYBQdSJqSum/slW9kIsigDISwjLATboWbgzI+dpoImvoTB9CgGUm2bQ==", + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.15.tgz", + "integrity": "sha512-+UPlPLBCjAAqCDG9rkGrMZpn7B2oGfZGQrnGkDxiUnfmmr56zZbElB7rPfiAKvwEOV6e3dTP+GASiZe/jIIWoQ==", "dependencies": { "camel-case": "^4.1.2", "debug": "^2.6.9", "delegates": "^0.1.0", "drachtio-modesl": "^1.2.7", - "drachtio-srf": "^4.5.19", + "drachtio-srf": "^4.5.20", "only": "^0.0.2", - "random-uuid": "^1.0.2", "sdp-transform": "^2.14.1", - "snake-case": "^3.0.4" + "snake-case": "^3.0.4", + "uuid-random": "^1.3.2" }, "engines": { "node": ">= 6.9.3" @@ -2073,9 +2079,9 @@ } }, "node_modules/drachtio-srf": { - "version": "4.5.19", - "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.19.tgz", - "integrity": "sha512-U12haYDpG8hvKJOtoPhAQDKnI8cwBiuJR1bBbQ6O1+MeaRZVBwNLT4ZPmifXKt7YWzeG53kN7jiMOWBppYrLIw==", + "version": "4.5.20", + "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.20.tgz", + "integrity": "sha512-ZlKJaHeuTb/t6uD0EUuZcsvYac8YvXY7IvzqY2YDtV4BNywOtOqE7VhGgaVEvamBA3dTTRllThIKJv6f8Mhglw==", "dependencies": { "debug": "^3.2.7", "delegates": "^0.1.0", @@ -2083,12 +2089,12 @@ "eslint-plugin-promise": "^6.1.1", "node-noop": "^0.0.1", "only": "^0.0.2", - "random-uuid": "^1.0.2", "sdp-transform": "^2.14.1", "short-uuid": "^4.2.0", "sip-methods": "^0.3.0", "sip-status": "^0.1.0", - "utils-merge": "^1.0.0" + "utils-merge": "^1.0.0", + "uuid-random": "^1.3.2" }, "engines": { "node": ">= 6.9.3" @@ -3606,14 +3612,6 @@ "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.2.1.tgz", "integrity": "sha512-Rf4YVNYpKjZ6ASAmibcwTNciQ5Co5Ztq6iZPEykHpkoflnD/K5ryE/rHehFsTm4NJj8nKDhbi3eKBWGogmNnkg==" }, - "node_modules/helmet": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.1.1.tgz", - "integrity": "sha512-/yX0oVZBggA9cLJh8aw3PPCfedBnbd7J2aowjzsaWwZh7/UFY0nccn/aHAggIgWUFfnykX8GKd3a1pSbrmlcVQ==", - "engines": { - "node": ">=12.0.0" - } - }, "node_modules/hexer": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/hexer/-/hexer-1.5.0.tgz", @@ -5579,11 +5577,6 @@ "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz", "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==" }, - "node_modules/random-uuid": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/random-uuid/-/random-uuid-1.0.2.tgz", - "integrity": "sha512-WcfhSG5bcJg9M0Fv7R6ISs/BqCrZqUAiGtpYrIsX/8kV/afx02pehG9f8Awszy/rTKqZNidHMc4oKdIzI21olg==" - }, "node_modules/range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", @@ -6711,6 +6704,11 @@ "uuid": "dist/bin/uuid" } }, + "node_modules/uuid-random": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/uuid-random/-/uuid-random-1.3.2.tgz", + "integrity": "sha512-UOzej0Le/UgkbWEO8flm+0y+G+ljUon1QWTEZOq1rnMAsxo2+SckbiZdKzAHHlVh6gJqI1TjC/xwgR50MuCrBQ==" + }, "node_modules/v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", @@ -8467,19 +8465,19 @@ } }, "drachtio-fsmrf": { - "version": "3.0.12", - "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.12.tgz", - "integrity": "sha512-wpBqlNMj6mKSdMI03mFI5nBZbCmohiLWYBQdSJqSum/slW9kIsigDISwjLATboWbgzI+dpoImvoTB9CgGUm2bQ==", + "version": "3.0.15", + "resolved": "https://registry.npmjs.org/drachtio-fsmrf/-/drachtio-fsmrf-3.0.15.tgz", + "integrity": "sha512-+UPlPLBCjAAqCDG9rkGrMZpn7B2oGfZGQrnGkDxiUnfmmr56zZbElB7rPfiAKvwEOV6e3dTP+GASiZe/jIIWoQ==", "requires": { "camel-case": "^4.1.2", "debug": "^2.6.9", "delegates": "^0.1.0", "drachtio-modesl": "^1.2.7", - "drachtio-srf": "^4.5.19", + "drachtio-srf": "^4.5.20", "only": "^0.0.2", - "random-uuid": "^1.0.2", "sdp-transform": "^2.14.1", - "snake-case": "^3.0.4" + "snake-case": "^3.0.4", + "uuid-random": "^1.3.2" }, "dependencies": { "debug": { @@ -8516,9 +8514,9 @@ } }, "drachtio-srf": { - "version": "4.5.19", - "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.19.tgz", - "integrity": "sha512-U12haYDpG8hvKJOtoPhAQDKnI8cwBiuJR1bBbQ6O1+MeaRZVBwNLT4ZPmifXKt7YWzeG53kN7jiMOWBppYrLIw==", + "version": "4.5.20", + "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-4.5.20.tgz", + "integrity": "sha512-ZlKJaHeuTb/t6uD0EUuZcsvYac8YvXY7IvzqY2YDtV4BNywOtOqE7VhGgaVEvamBA3dTTRllThIKJv6f8Mhglw==", "requires": { "debug": "^3.2.7", "delegates": "^0.1.0", @@ -8526,12 +8524,12 @@ "eslint-plugin-promise": "^6.1.1", "node-noop": "^0.0.1", "only": "^0.0.2", - "random-uuid": "^1.0.2", "sdp-transform": "^2.14.1", "short-uuid": "^4.2.0", "sip-methods": "^0.3.0", "sip-status": "^0.1.0", - "utils-merge": "^1.0.0" + "utils-merge": "^1.0.0", + "uuid-random": "^1.3.2" }, "dependencies": { "@eslint/eslintrc": { @@ -9673,11 +9671,6 @@ } } }, - "helmet": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-5.1.1.tgz", - "integrity": "sha512-/yX0oVZBggA9cLJh8aw3PPCfedBnbd7J2aowjzsaWwZh7/UFY0nccn/aHAggIgWUFfnykX8GKd3a1pSbrmlcVQ==" - }, "hexer": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/hexer/-/hexer-1.5.0.tgz", @@ -11150,11 +11143,6 @@ "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz", "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==" }, - "random-uuid": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/random-uuid/-/random-uuid-1.0.2.tgz", - "integrity": "sha512-WcfhSG5bcJg9M0Fv7R6ISs/BqCrZqUAiGtpYrIsX/8kV/afx02pehG9f8Awszy/rTKqZNidHMc4oKdIzI21olg==" - }, "range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", @@ -12001,6 +11989,11 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" }, + "uuid-random": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/uuid-random/-/uuid-random-1.3.2.tgz", + "integrity": "sha512-UOzej0Le/UgkbWEO8flm+0y+G+ljUon1QWTEZOq1rnMAsxo2+SckbiZdKzAHHlVh6gJqI1TjC/xwgR50MuCrBQ==" + }, "v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", diff --git a/package.json b/package.json index db3ffdfc..9abad21d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ }, "dependencies": { "@jambonz/http-health-check": "^0.0.1", - "@jambonz/db-helpers": "^0.7.3", "@jambonz/realtimedb-helpers": "^0.5.9", "@jambonz/stats-collector": "^0.1.6", "@jambonz/time-series": "^0.2.5", @@ -42,19 +41,18 @@ "bent": "^7.3.12", "debug": "^4.3.4", "deepcopy": "^2.1.0", - "drachtio-fsmrf": "^3.0.12", - "drachtio-srf": "^4.5.19", - "express": "^4.18.1", - "helmet": "^5.1.0", + "drachtio-fsmrf": "^3.0.15", + "drachtio-srf": "^4.5.20", + "express": "^4.18.2", "ip": "^1.1.8", "moment": "^2.29.4", "parse-url": "^8.1.0", "pino": "^6.14.0", - "random-uuid": "^1.0.2", "sdp-transform": "^2.14.1", "short-uuid": "^4.2.0", "to-snake-case": "^1.0.0", "undici": "^5.11.0", + "uuid-random": "^1.3.2", "verify-aws-sns-signature": "^0.1.0", "ws": "^8.8.0", "xml2js": "^0.4.23"