neo.mjs 4.0.7 → 4.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "4.0.7",
+    "version": "4.0.8",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {
@@ -49,7 +49,7 @@
         "neo-jsdoc": "^1.0.1",
         "neo-jsdoc-x": "^1.0.4",
         "postcss": "^8.4.12",
-        "sass": "^1.50.0",
+        "sass": "^1.50.1",
         "webpack": "^5.72.0",
         "webpack-cli": "^4.9.2",
         "webpack-dev-server": "4.8.1",

package/src/data/connection/WebSocket.mjs

@@ -57,7 +57,7 @@ class Socket extends Base {
      */
     construct(config) {
         super.construct(config);
-        this.socket = new WebSocket(this.serverAddress);
+        this.createSocket();
     }
 
     /**
@@ -70,7 +70,7 @@ class Socket extends Base {
         me.reconnectAttempts++;
 
         if (me.reconnectAttempts < me.maxReconnectAttempts) {
-            me.socket = new WebSocket(me.serverAddress);
+            me.createSocket();
 
             callback && me.on('open', {
                 callback,
@@ -89,7 +89,7 @@ class Socket extends Base {
         let me      = this,
             channel = me.channel;
 
-        console.debug('WS: Sending message', (channel ? '\nChannel: ' + channel : ''), '\nData:', data);
+        console.log('WS: Sending message', (channel ? '\nChannel: ' + channel : ''), '\nData:', data);
 
         return JSON.stringify(channel ? {channel, data} : data);
     }
@@ -118,6 +118,29 @@ class Socket extends Base {
         return value;
     }
 
+    /**
+     * @param {Number} [code] defaults to 1000
+     * @param {String} [reason]
+     */
+    close(code, reason) {
+        this.socket.close(code, reason);
+    }
+
+    /**
+     *
+     */
+    createSocket() {
+        this.socket = new WebSocket(this.serverAddress);
+    }
+
+    /**
+     *
+     */
+    destroy(...args) {
+        this.close();
+        super.destroy(...args);
+    }
+
     /**
      * @param {CloseEvent} event The Websocket generated CloseEvent
      * @param {Number}     event.code The WebSocket connection close code provided by the server
@@ -151,10 +174,12 @@ class Socket extends Base {
     }
 
     /**
-     * @param {Object} event
+     * @param {MessageEvent} event
      */
     onMessage(event) {
-        console.log('onMessage', event);
+        let data = JSON.parse(event.data);
+
+        console.log('onMessage', data);
     }
 
     /**
@@ -167,7 +192,7 @@ class Socket extends Base {
     /**
      * @param {Object} data
      */
-    send(data) {
+    sendMessage(data) {
         let me     = this,
             socket = me.socket,
             d      = data;