GP scripts and reconnecting WS on Node, fixes #21

Author: insyri

.gitpod.yml

@@ -6,8 +6,8 @@ vscode:
     - denoland.vscode-deno
 
 tasks:
-  - init: "deno run --allow-env mod.ts"
+  - init: "deno run --allow-env --allow-net mod.ts"
 
 github:
   prebuilds:
-    master: true
+    master: true

src/ws.ts

@@ -59,25 +59,25 @@ export class TpyWs {
   constructor(
     tpyInstance: Tpy,
     deploymentID: string,
-    reconnectionTimeout = 250,
+    reconnectionTimeout = 250
   ) {
     if (!tpyInstance || !(tpyInstance instanceof Tpy)) {
       throw new TpyError(
         "Missing or Invalid Required Parameter",
         parametersPrompt(
           !tpyInstance ? "missing" : "incompatible",
-          "tpyInstance",
+          "tpyInstance"
         ),
         "tpyInstance",
-        tpyInstance,
+        tpyInstance
       );
     }
     if (!deploymentID) {
       throw new TpyError(
         "Missing or Invalid Required Parameter",
         parametersPrompt("missing", "deploymentID"),
         "deploymentID",
-        deploymentID,
+        deploymentID
       );
     }
     this.tpyClient = tpyInstance;
@@ -124,20 +124,20 @@ export class TpyWs {
    */
   on<T extends unknown[]>(
     type: "message",
-    callback: (data: Unpacked<PylonWebSocket.Response<T>>) => void,
+    callback: (data: Unpacked<PylonWebSocket.Response<T>>) => void
   ): EventEmitter;
   on<T extends unknown[]>(type: messageTypes, callback: unknown) {
     if (typeof callback != "function") {
       throw new TpyError(
         "Missing or Invalid Required Parameter",
         parametersPrompt("incompatible", "callback"),
         "callback",
-        typeof callback,
+        typeof callback
       );
     }
     return this.eventEmitter.on(
       type,
-      <(data: Unpacked<PylonWebSocket.Response<T>>) => void> callback,
+      <(data: Unpacked<PylonWebSocket.Response<T>>) => void>callback
     );
   }
 
@@ -147,38 +147,46 @@ export class TpyWs {
   async connect() {
     if (!this.tryToConnect) return;
     this._websocket = new WebSocket(
-      (await this.tpyClient.getDeployment(this.deploymentID)).workbench_url,
+      (await this.tpyClient.getDeployment(this.deploymentID)).workbench_url
     );
-    this._websocket.onopen = this.onOpen.bind(this);
-    this._websocket.onclose = this.onClose.bind(this);
-    this._websocket.onerror = this.onError.bind(this);
-    this._websocket.onmessage = this.onMessage.bind(this);
-  }
 
-  private onOpen(event: Event) {
-    this.eventEmitter.emit("open", event);
-  }
+    this._websocket.onopen = ((event: Event) => {
+      this.eventEmitter.emit("open", event);
+    }).bind(this);
 
-  private onError(event: Event | ErrorEvent) {
-    if (!this.websocket) return;
-    this.eventEmitter.emit("error", event);
+    this._websocket.onclose = ((event: CloseEvent) => {
+      this.eventEmitter.emit("close", event);
+      this.timedReconnect();
 
-    try {
-      this.websocket.close();
-      // deno-lint-ignore no-empty
-    } catch {}
+      // (async () => await this.timedReconnect())();
+    }).bind(this);
 
-    setTimeout(() => {
-      this.connect();
-    }, this.reconnectionTimout);
-  }
+    this._websocket.onerror = ((event: Event | ErrorEvent) => {
+      if (!this.websocket) return;
+      this.eventEmitter.emit("error", event);
+
+      try {
+        this.websocket.close();
+        // deno-lint-ignore no-empty
+      } catch {}
+      this.timedReconnect();
+      // (async () => await this.timedReconnect())();
+    }).bind(this);
 
-  private onClose(event: CloseEvent) {
-    this.eventEmitter.emit("close", event);
+    this._websocket.onmessage = ((event: MessageEvent) => {
+      this.eventEmitter.emit("message", JSON.parse(String(event.data))[0]);
+    }).bind(this);
   }
 
-  private onMessage(event: MessageEvent) {
-    this.eventEmitter.emit("message", JSON.parse(String(event.data))[0]);
+  timedReconnect() {
+    // Check once to spare resources
+    if (!this.tryToConnect) return;
+    setTimeout(() => {
+      (async () => {
+        // Check again to ensure it hasn't changed
+        if (this.tryToConnect) await this.connect();
+      })();
+    }, this.reconnectionTimout);
   }
 
   /**