From e8d0f495c12ad0ae66b3c4fe4e14bf27c0dab86f Mon Sep 17 00:00:00 2001 From: Chrystian Huot Date: Wed, 6 Jan 2021 08:17:23 -0500 Subject: [PATCH] Version 4.9.1 --- CHANGELOG.md | 6 ++++++ client/package-lock.json | 22 +++++++++++++++------- client/package.json | 6 +++--- package.json | 2 +- server/lib/rdio-scanner/controller.js | 4 +++- server/lib/rdio-scanner/dir-watch.js | 4 ++++ server/lib/rdio-scanner/downstream.js | 2 +- server/package-lock.json | 16 ++++++++-------- server/package.json | 4 ++-- 9 files changed, 43 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2227daf..39942b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ - Add an no link indicator when websocket connection is down. - Node modules update. +_v4.9.1_ + +- Add EBU R128 loudness normalization. +- dirWatch.type="trunk-recorder" now deletes the JSON file in case the audio file is missing. +- Fix downstream sending wrong talkgroup id. + # Version 4.8 - Add downstream.system.id_as property to allow export system with a different id. diff --git a/client/package-lock.json b/client/package-lock.json index 40fd583..1c33c0f 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,6 +1,6 @@ { "name": "rdio-scanner-client", - "version": "4.9.0", + "version": "4.9.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -102,6 +102,14 @@ "tslib": "2.0.3", "typescript": "4.0.5", "webpack-sources": "2.0.1" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==", + "dev": true + } } }, "@angular-devkit/build-webpack": { @@ -1609,9 +1617,9 @@ "dev": true }, "@types/node": { - "version": "14.14.19", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.19.tgz", - "integrity": "sha512-4nhBPStMK04rruRVtVc6cDqhu7S9GZai0fpXgPXrFpcPX6Xul8xnrjSdGB4KPBVYG/R5+fXWdCM8qBoiULWGPQ==", + "version": "14.14.20", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz", + "integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==", "dev": true }, "@types/parse-json": { @@ -10558,9 +10566,9 @@ "dev": true }, "tslib": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", - "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==" }, "tslint": { "version": "6.1.3", diff --git a/client/package.json b/client/package.json index 5e59d49..7af6d0f 100644 --- a/client/package.json +++ b/client/package.json @@ -12,14 +12,14 @@ "@angular/platform-browser-dynamic": "~11.0.5", "@angular/service-worker": "~11.0.5", "rxjs": "~6.6.3", - "tslib": "^2.0.3", + "tslib": "^2.1.0", "zone.js": "~0.11.3" }, "devDependencies": { "@angular-devkit/build-angular": "~0.1100.5", "@angular/cli": "^11.0.5", "@angular/compiler-cli": "~11.0.5", - "@types/node": "~14.14.19", + "@types/node": "~14.14.20", "codelyzer": "^6.0.1", "ts-node": "~9.1.1", "tslint": "~6.1.3", @@ -32,5 +32,5 @@ "build": "ng build --base-href ./ --prod", "start": "ng serve" }, - "version": "4.9.0" + "version": "4.9.1" } diff --git a/package.json b/package.json index 3495aaa..04759be 100644 --- a/package.json +++ b/package.json @@ -10,5 +10,5 @@ "start": "node run", "update": "node update" }, - "version": "4.9.0" + "version": "4.9.1" } diff --git a/server/lib/rdio-scanner/controller.js b/server/lib/rdio-scanner/controller.js index ecf232f..b98f80d 100644 --- a/server/lib/rdio-scanner/controller.js +++ b/server/lib/rdio-scanner/controller.js @@ -155,6 +155,8 @@ class Controller extends EventEmitter { const proc = spawn('ffmpeg', [ '-i', '-', + '-af', + 'loudnorm=I=-16:dual_mono=true:TP=-1.5:LRA=11', ...metadata, '-c:a', 'aac', @@ -515,7 +517,7 @@ class Controller extends EventEmitter { return; } - if (!this.config.disableAudioConversion && call.audioType !== 'audio/aac') { + if (!this.config.disableAudioConversion) { try { call = await this.convertCallAudio(call); diff --git a/server/lib/rdio-scanner/dir-watch.js b/server/lib/rdio-scanner/dir-watch.js index e62880d..a575431 100644 --- a/server/lib/rdio-scanner/dir-watch.js +++ b/server/lib/rdio-scanner/dir-watch.js @@ -410,6 +410,10 @@ class DirWatch { } else { console.error(`DirWatch: Error missing file ${audioFile}`); + if (dirWatch.deleteAfter) { + this.unlink(filename); + } + return; } } diff --git a/server/lib/rdio-scanner/downstream.js b/server/lib/rdio-scanner/downstream.js index e5c163e..8f1ba55 100644 --- a/server/lib/rdio-scanner/downstream.js +++ b/server/lib/rdio-scanner/downstream.js @@ -188,7 +188,7 @@ class Downstream { if (Array.isArray(system)) { system = system.find((sys) => sys !== null && typeof sys === 'object' && sys.id === call.system); - return system ? parseSystem(system) : call.system; + return system ? parseSystem(system) : call.talkgroup; } else if (system !== null && typeof system === 'object') { return system.id === call.system ? parseTalkgroup(system.talkgroups) : call.talkgroup; diff --git a/server/package-lock.json b/server/package-lock.json index fc7d699..9cef47a 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,6 +1,6 @@ { "name": "rdio-scanner-server", - "version": "4.9.0", + "version": "4.9.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -763,13 +763,13 @@ } }, "chokidar": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", - "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.0.tgz", + "integrity": "sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q==", "requires": { "anymatch": "~3.1.1", "braces": "~3.0.2", - "fsevents": "~2.1.2", + "fsevents": "~2.3.1", "glob-parent": "~5.1.0", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -1608,9 +1608,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz", + "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==", "optional": true }, "fstream": { diff --git a/server/package.json b/server/package.json index 1c4f05a..f387526 100644 --- a/server/package.json +++ b/server/package.json @@ -1,7 +1,7 @@ { "author": "Chrystian Huot ", "dependencies": { - "chokidar": "^3.4.3", + "chokidar": "^3.5.0", "cors": "^2.8.5", "dotenv": "^8.2.0", "express": "^4.17.1", @@ -39,5 +39,5 @@ "build": "webpack", "start": "nodemon" }, - "version": "4.9.0" + "version": "4.9.1" }