fix reconnect, bump version

Author: skadefro

OpenFlowNodeRED/src/WebSocketClient.ts

@@ -41,7 +41,7 @@ export class WebSocketClient {
             WebSocketClient.instance = this;
         }
 
-        setInterval(this.pingServer, 10000);
+        setInterval(this.pingServer.bind(this), 10000);
     }
     public connect(): void {
         try {
@@ -80,20 +80,19 @@ export class WebSocketClient {
         return true;
     }
     private pingServer(): void {
-        var me: WebSocketClient = WebSocketClient.instance;
         try {
-            if (me._socketObject !== null && me._socketObject.readyState === me._socketObject.OPEN) {
+            if (this._socketObject !== null && this._socketObject.readyState === this._socketObject.OPEN) {
                 let msg: SocketMessage = SocketMessage.fromcommand("ping");
-                me._socketObject.send(JSON.stringify(msg));
+                this._socketObject.send(JSON.stringify(msg));
             }
-            if (me._socketObject === null ||
-                me._socketObject.readyState !== me._socketObject.CONNECTING || me._socketObject.readyState !== me._socketObject.OPEN) {
-                me.connect();
+            if (this._socketObject === null ||
+                this._socketObject.readyState !== this._socketObject.CONNECTING || this._socketObject.readyState !== this._socketObject.OPEN) {
+                this.connect();
             }
         } catch (error) {
-            me._logger.error(error.message);
+            this._logger.error(error.message);
             console.error(error);
-            me.connect();
+            this.connect();
         }
     }
     private async onopen(evt: Event): Promise<void> {

OpenFlowNodeRED/src/nodered/nodes/NoderedUtil.ts

@@ -329,7 +329,7 @@ export class NoderedUtil {
         });
     }
     public static async QueueMessage(websocket: WebSocketClient, queuename: string, replyto: string, data: any, correlationId: string, expiration: number): Promise<void> {
-        if (!WebSocketClient.instance.isConnected()) throw new Error("Cannot send, not connected");
+        if (!websocket.isConnected()) throw new Error("Cannot send, not connected");
         await this._QueueMessage(websocket, queuename, replyto, data, correlationId, expiration);
     }
 }

OpenFlowNodeRED/src/nodered/nodes/amqp_nodes.ts

@@ -237,9 +237,10 @@ export class amqp_publisher_node {
             // if (this.localqueue !== null && this.localqueue !== undefined && this.localqueue !== "") { this.localqueue = Config.queue_prefix + this.localqueue; }
             var expiration: number = Config.amqp_workflow_out_expiration;
             if (!NoderedUtil.IsNullEmpty(msg.expiration)) expiration = msg.expiration;
+            this.node.status({ fill: "blue", shape: "dot", text: "Sending message ..." });
             await NoderedUtil.QueueMessage(this.websocket, queue, this.localqueue, data, null, expiration);
             // this.con.SendMessage(JSON.stringify(data), this.config.queue, null, true);
-            this.node.status({});
+            this.node.status({ fill: "green", shape: "dot", text: "Connected" });
         } catch (error) {
             NoderedUtil.HandleError(this, error);
         }

VERSION

@@ -1 +1 @@
-0.0.577
+1.0.1