Small changes and (hopefully) properly catching errors properly for all situations

Author: smithkyle

DoricoRemote.js

@@ -1,4 +1,4 @@
-// const fs = nativeRequire('fs');
+const fs = nativeRequire('fs');
 
 const WebSocketClient = require('./WebSocketClient.js')
 
@@ -14,7 +14,7 @@ class DoricoRemote extends WebSocketClient {
     }
 
     onOpen(resolve) {
-        this.on('handshakeDone', () => super.onOpen(resolve));
+        this.once('handshakeDone', () => super.onOpen(resolve));
 
         this._sendHandshake();
 
@@ -82,39 +82,42 @@ class DoricoRemote extends WebSocketClient {
     onClose(event) {
         if (event.code === 1000) {
             console.log('Connection closing cleanly - will attempt a fresh connection');
-            // this.sessionToken = null;
-            // this.handshakeDone = false;
+            
+            this._removeSessionFile(`${__dirname}/${DOR_SESSION_FILE}`);
+            this.sessionToken = null;
+            
             this.cleanupSocket();
-            // this.shouldReconnect = true;
 
-            // this._removeSessionFile(`${__dirname}/${DOR_SESSION_FILE}`);
+            this.shouldReconnect = true;
         }
 
+        this.handshakeDone = false;
+
         super.onClose(event)
     }
 
-    // _removeSessionFile(file) {
-    //     if (!fs.existsSync(file)) {
-    //         return;
-    //     }
-    //     fs.unlink(file, (error) => {
-    //         if (error) {
-    //             console.warn(`Error removing ${file}`, error);
-    //             this.shouldReconnect = false;
-    //             return;
-    //         }
-
-    //         console.log(`Removed ${file}`);
-    //     })
-    // }
-
-    send(message) {
+    _removeSessionFile(file) {
+        if (!fs.existsSync(file)) {
+            return;
+        }
+        fs.unlink(file, (error) => {
+            if (error) {
+                console.warn(`Error removing ${file}`, error);
+                this.shouldReconnect = false;
+                return;
+            }
+
+            console.log(`Removed ${file}`);
+        })
+    }
+
+    async send(message) {
         if (!this.socket) {
             this.connect();
         }
 
         try {
-            super.send(message);
+            await super.send(message)//.catch(e => console.error(e.message));
         }
         catch (e) {
             console.error(e.message)

SibeliusConnect.js

@@ -48,6 +48,7 @@ class SibeliusConnect extends WebSocketClient {
         if (message.sessionToken) {
             // Sibelius doesn't send a response if reconnecting with a sessionToken,
             // so we will simulate receiving the sessionToken again
+            this.handshakeDone = false;
             this.onMessage({ data: JSON.stringify(sessionData) })
         }
     }
@@ -84,14 +85,17 @@ class SibeliusConnect extends WebSocketClient {
     onClose(event) {
         if (event.code === 1000) {
             console.log('Connection closing cleanly - will attempt a fresh connection');
+
+            this._removeSessionFile(`${__dirname}/${SIB_SESSION_FILE}`);
             this.sessionToken = null;
-            this.handshakeDone = false;
+
             this.cleanupSocket();
-            this.shouldReconnect = true;
 
-            this._removeSessionFile(`${__dirname}/${SIB_SESSION_FILE}`);
+            this.shouldReconnect = true;
         }
 
+        this.handshakeDone = false;
+
         super.onClose(event)
     }
 
@@ -110,13 +114,13 @@ class SibeliusConnect extends WebSocketClient {
         })
     }
 
-    send(message) {
+    async send(message) {
         if (!this.socket) {
             this.connect();
         }
 
         try {
-            super.send(message);
+            await super.send(message)//.catch(e => console.error(e.message));
         }
         catch (e) {
             console.error(e.message)

WebSocketClient.js

@@ -44,6 +44,7 @@ class WebSocketClient extends EventEmitter {
 
         if (this.reconnectAttempts >= this.maxReconnectAttempts) {
             console.error("Max reconnect attempts reached");
+            this.shouldReconnect = false;
             this.cleanupSocket();
             this.emit("reconnect_failed");
             return;
@@ -87,7 +88,7 @@ class WebSocketClient extends EventEmitter {
         this.reconnectAttempts = 0;
         this.shouldReconnect = false;
         this.processingQueue = false;
-
+        
         // Reject pending promises in the message queue
         while (this.messageQueue.length) {
             const { reject } = this.messageQueue.shift();
@@ -104,7 +105,6 @@ class WebSocketClient extends EventEmitter {
         this.emit("open");
         resolve();
         this.processingQueue = false;
-        console.log(this.messageQueue);
         this._processQueue();
     }