diff --git a/CHANGELOG.md b/CHANGELOG.md index 64ff383..f639d07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,13 @@ _v5.2.4_ - New update prompt for clients when server is updated. - Fix unaligned back arrow on the search panel. +_v5.2.5_ + +- STS command removed from the server. +- Minor fixes here and there. +- README.md updated. +- Documentation images resized. + # Version 5.1 This one is a big one... **Be sure to backup your config.json and your database.sqlite before updating.** diff --git a/README.md b/README.md index 2637559..4a64c8f 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,14 @@ The server side of [Rdio Scanner](https://github.com/chuot/rdio-scanner) can mon You can ask your questions or post your comments on the [Gitter Rdio Scanner Lobby](https://gitter.im/rdio-scanner/Lobby) where the community continues to grow. -## Commercial support +## Native app + +[Rdio Scanner](https://github.com/chuot/rdio-scanner) is now the perfect software-defined radio companion. Go get the native client here: + +[![Available on the App Store](./docs/images/app_store.png?raw=true "Available on the App Store")](https://apps.apple.com/us/app/rdio-scanner/id1563065667#?platform=iphone) +[![Get it on Google Play](./docs/images/google_play.png?raw=true "Get It on Google Play")](https://play.google.com/store/apps/details?id=solutions.saubeo.rdioScanner) + +# Commercial support Commercial support is available at https://saubeo.solutions/. diff --git a/client/package.json b/client/package.json index 78eae22..7afba84 100644 --- a/client/package.json +++ b/client/package.json @@ -37,5 +37,5 @@ "build": "ng build --base-href ./ --configuration production", "start": "ng serve" }, - "version": "5.2.4" + "version": "5.2.5" } diff --git a/docs/images/app_store.png b/docs/images/app_store.png new file mode 100644 index 0000000..f2d31ae Binary files /dev/null and b/docs/images/app_store.png differ diff --git a/docs/images/google_play.png b/docs/images/google_play.png new file mode 100644 index 0000000..3526ae5 Binary files /dev/null and b/docs/images/google_play.png differ diff --git a/docs/images/rdio_scanner_display.png b/docs/images/rdio_scanner_display.png index 959761f..dd55b17 100644 Binary files a/docs/images/rdio_scanner_display.png and b/docs/images/rdio_scanner_display.png differ diff --git a/docs/images/rdio_scanner_led.png b/docs/images/rdio_scanner_led.png index d0c9af2..0210888 100644 Binary files a/docs/images/rdio_scanner_led.png and b/docs/images/rdio_scanner_led.png differ diff --git a/docs/images/rdio_scanner_main.png b/docs/images/rdio_scanner_main.png index f039cc8..7dd2d0f 100644 Binary files a/docs/images/rdio_scanner_main.png and b/docs/images/rdio_scanner_main.png differ diff --git a/docs/images/rdio_scanner_search.png b/docs/images/rdio_scanner_search.png index af2b7b5..4ef75aa 100644 Binary files a/docs/images/rdio_scanner_search.png and b/docs/images/rdio_scanner_search.png differ diff --git a/docs/images/rdio_scanner_search_filter.png b/docs/images/rdio_scanner_search_filter.png index 74435e2..3b45939 100644 Binary files a/docs/images/rdio_scanner_search_filter.png and b/docs/images/rdio_scanner_search_filter.png differ diff --git a/docs/images/rdio_scanner_search_list.png b/docs/images/rdio_scanner_search_list.png index 295d8bd..288a005 100644 Binary files a/docs/images/rdio_scanner_search_list.png and b/docs/images/rdio_scanner_search_list.png differ diff --git a/docs/images/rdio_scanner_select.png b/docs/images/rdio_scanner_select.png index fc6b162..8f40b1f 100644 Binary files a/docs/images/rdio_scanner_select.png and b/docs/images/rdio_scanner_select.png differ diff --git a/docs/images/rdio_scanner_select_group.png b/docs/images/rdio_scanner_select_group.png index 83e24b2..a371fdf 100644 Binary files a/docs/images/rdio_scanner_select_group.png and b/docs/images/rdio_scanner_select_group.png differ diff --git a/docs/images/rdio_scanner_select_system.png b/docs/images/rdio_scanner_select_system.png index 7ee699a..b805cb3 100644 Binary files a/docs/images/rdio_scanner_select_system.png and b/docs/images/rdio_scanner_select_system.png differ diff --git a/package.json b/package.json index e27734c..718caf6 100644 --- a/package.json +++ b/package.json @@ -14,5 +14,5 @@ "update": "node update" }, "type": "module", - "version": "5.2.4" + "version": "5.2.5" } \ No newline at end of file diff --git a/server/lib/rdio-scanner/controller.js b/server/lib/rdio-scanner/controller.js index f67e8ed..0b731c7 100644 --- a/server/lib/rdio-scanner/controller.js +++ b/server/lib/rdio-scanner/controller.js @@ -38,7 +38,6 @@ const wsCommand = { livefeedMap: 'LFM', max: 'MAX', pin: 'PIN', - status: 'STS', ver: 'VER', }; @@ -90,7 +89,7 @@ export class Controller extends EventEmitter { broadcastConfig() { if (this.websocket) { this.websocket.getSockets().forEach(async (socket) => { - if ((this.isAccessRestricted && !socket.access) || socket.justStatus) { + if (this.isAccessRestricted && !socket.access) { return; } @@ -810,30 +809,7 @@ export class Controller extends EventEmitter { socket.scope = this.getAccessScope(); } - if (message[0] === wsCommand.status) { - if (typeof socket.status !== 'function') { - socket.status = (call) => { - if (socket.readyState !== 3) { - socket.send(JSON.stringify([ - wsCommand.status, - `${call.system},${call.talkgroup},${call.id}`, - ])); - - } else { - this.removeListener('call', socket.status); - socket.status = undefined; - } - }; - this.addListener('call', socket.status); - socket.send(JSON.stringify([wsCommand.status, true])); - - } else { - this.removeListener('call', socket.status); - socket.status = undefined; - socket.send(JSON.stringify([wsCommand.status, false])); - } - - } else if (message[0] === wsCommand.ver) { + if (message[0] === wsCommand.ver) { socket.send(JSON.stringify([wsCommand.ver, this.version])); } else if (this.isAccessRestricted && !socket.access && message[0] !== wsCommand.pin) { @@ -878,10 +854,7 @@ export class Controller extends EventEmitter { socket.livefeed = (call) => { if (socket.readyState !== 3) { - if (socket.justStatus) { - socket.send(JSON.stringify([wsCommand.status], `${call.system},${call.talkgroup},${call.id}`)); - - } else if (call.system in socket.scope && call.system in message[1]) { + if (call.system in socket.scope && call.system in message[1]) { if (socket.scope[call.system].includes(call.talkgroup)) { if (message[1][call.system] && message[1][call.system][call.talkgroup]) { socket.send(JSON.stringify([wsCommand.call, call])); @@ -942,7 +915,7 @@ export class Controller extends EventEmitter { if (typeof socket.access.limit === 'number') { const count = Array.from(this.websocket.getSockets()) - .reduce((c, s) => (!s.justStatus && s.access?.code === token) ? ++c : c, 0); + .reduce((c, s) => s.access?.code === token ? ++c : c, 0); if (count > socket.access.limit) { socket.send(JSON.stringify([wsCommand.max])); diff --git a/server/lib/rdio-scanner/version.js b/server/lib/rdio-scanner/version.js index a997ae8..d1220a6 100644 --- a/server/lib/rdio-scanner/version.js +++ b/server/lib/rdio-scanner/version.js @@ -19,6 +19,6 @@ 'use strict'; -export const version = '5.2.4'; +export const version = '5.2.5'; export default version; \ No newline at end of file diff --git a/server/lib/rdio-scanner/websocket.js b/server/lib/rdio-scanner/websocket.js index 9234428..209ffc1 100644 --- a/server/lib/rdio-scanner/websocket.js +++ b/server/lib/rdio-scanner/websocket.js @@ -86,7 +86,7 @@ export class WebSocket { } logClientsCount() { - const count = Array.from(this.wss.clients).reduce((c, s) => (!s.justStatus && s.livefeed) ? ++c : c, 0); + const count = Array.from(this.wss.clients).reduce((c, s) => s.livefeed ? ++c : c, 0); this.log.write(Log.info, `WebSocket: Listeners count is ${count}`); } diff --git a/server/package.json b/server/package.json index f91c5ec..81f5675 100644 --- a/server/package.json +++ b/server/package.json @@ -46,5 +46,5 @@ "start": "nodemon" }, "type": "module", - "version": "5.2.4" + "version": "5.2.5" }