From 53caddffec4569ec29c4d61a8cff791b4dc528aa Mon Sep 17 00:00:00 2001
From: Chrystian Huot <chrystian.huot@saubeo.solutions>
Date: Sun, 27 Sep 2020 11:46:52 -0400
Subject: [PATCH] Version 4.7.3

---
 client/package-lock.json             |  2 +-
 client/package.json                  |  2 +-
 package.json                         |  2 +-
 server/.gitignore                    |  2 ++
 server/lib/rdio-scanner/websocket.js | 15 ++++++---------
 server/package-lock.json             |  2 +-
 server/package.json                  |  2 +-
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 36f5812..4d8deeb 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "rdio-scanner-client",
-    "version": "4.7.2",
+    "version": "4.7.3",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/client/package.json b/client/package.json
index 1fd53ea..32337a9 100644
--- a/client/package.json
+++ b/client/package.json
@@ -32,5 +32,5 @@
         "build": "ng build --base-href ./ --prod",
         "start": "ng serve"
     },
-    "version": "4.7.2"
+    "version": "4.7.3"
 }
diff --git a/package.json b/package.json
index 953b4d8..6e0815b 100644
--- a/package.json
+++ b/package.json
@@ -11,5 +11,5 @@
         "start": "node run",
         "update": "node update"
     },
-    "version": "4.7.2"
+    "version": "4.7.3"
 }
diff --git a/server/.gitignore b/server/.gitignore
index 95cd9f1..4a59dbe 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -1,4 +1,6 @@
 /.env
+/*.pem
+/*.key
 /config.json*
 /database.sqlite*
 /dist
diff --git a/server/lib/rdio-scanner/websocket.js b/server/lib/rdio-scanner/websocket.js
index d1dc269..2f5be68 100644
--- a/server/lib/rdio-scanner/websocket.js
+++ b/server/lib/rdio-scanner/websocket.js
@@ -19,7 +19,6 @@
 
 'use strict';
 
-const { Server } = require('http');
 const url = require('url');
 const WS = require('ws');
 
@@ -66,15 +65,13 @@ class WebSocket {
             this.heartbeat = undefined;
         });
 
-        if (this.httpServer instanceof Server) {
-            this.httpServer.on('upgrade', (request, socket, head) => {
-                const pathname = url.parse(request.url).pathname;
+        this.httpServer.on('upgrade', (request, socket, head) => {
+            const pathname = url.parse(request.url).pathname;
 
-                if (pathname === '/' || pathname === '/index.html') {
-                    this.wss.handleUpgrade(request, socket, head, (ws) => this.wss.emit('connection', ws, request));
-                }
-            });
-        }
+            if (pathname === '/' || pathname === '/index.html') {
+                this.wss.handleUpgrade(request, socket, head, (ws) => this.wss.emit('connection', ws, request));
+            }
+        });
     }
 
     logClientsCount() {
diff --git a/server/package-lock.json b/server/package-lock.json
index 949df17..162a2b6 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "rdio-scanner-server",
-    "version": "4.7.2",
+    "version": "4.7.3",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/server/package.json b/server/package.json
index 1b540a6..f683f06 100644
--- a/server/package.json
+++ b/server/package.json
@@ -39,5 +39,5 @@
         "build": "webpack",
         "start": "nodemon"
     },
-    "version": "4.7.2"
+    "version": "4.7.3"
 }