_

xoFeulB · Feb 17, 2024 · 8ce05aa · 8ce05aa
1 parent dceda60
commit 8ce05aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/js/websocket.awaitable.js b/src/js/websocket.awaitable.js
@@ -11,18 +11,15 @@ export class AwaitbleWebSocket {
         this.socket.addEventListener("close", this.onClose);
         this.socket.addEventListener("error", this.onError);
         this.socket.messagePool = {};
-    }
 
-    async waitOpen() {
-        let _this = this;
-        let R = new Promise((resolve, reject) => {
-            setInterval(() => {
-                if (_this.socket.isOpen) {
-                    resolve();
+        return new Promise((resolve, reject) => {
+            let interval_id = setInterval(() => {
+                if (this.socket.isOpen) {
+                    resolve(this);
+                    clearInterval(interval_id);
                 }
             }, 10);
         });
-        return R;
     }
 
     async send(message) {
@@ -51,11 +48,12 @@ export class AwaitbleWebSocket {
         }
     }
     onClose(event) {
-        log(event);
+        // this -> this.socket
         this.isOpen = false;
     }
     onError(event) {
-        log(event);
+        // this -> this.socket
+        this.isOpen = false;
     }
 
 }
diff --git a/src/tab/js/server.js b/src/tab/js/server.js
@@ -186,8 +186,7 @@ window.BlueFoxScript = BlueFoxScript;
 
 
     let start_ws = async () => {
-      let webSocket = new AwaitbleWebSocket("ws://127.0.0.1:8888");
-      await webSocket.waitOpen();
+      let webSocket = await (new AwaitbleWebSocket("ws://127.0.0.1:8888"));
 
       let webSocketMessageHandler = {
         "getFileTree": async (data) => {