@ckb-ccc/core 0.0.16-alpha.1 → 0.0.16-alpha.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ckb-ccc/core
 
+## 0.0.16-alpha.3
+
+### Patch Changes
+
+- [#72](https://github.com/ckb-ecofund/ccc/pull/72) [`a3d5359`](https://github.com/ckb-ecofund/ccc/commit/a3d53595f6dd11f2f59cdf0086b3d7ce558a2fdd) Thanks [@Hanssen0](https://github.com/Hanssen0)! - fix(core): reopen websocket
+
+## 0.0.16-alpha.2
+
+### Patch Changes
+
+- [#70](https://github.com/ckb-ecofund/ccc/pull/70) [`acfc050`](https://github.com/ckb-ecofund/ccc/commit/acfc0502cd6beb48b9310dec8411dcd630507366) Thanks [@Hanssen0](https://github.com/Hanssen0)! - fix(core): websocket transport
+
 ## 0.0.16-alpha.1
 
 ### Patch Changes

package/dist/client/transports/webSocket.d.ts

@@ -4,6 +4,7 @@ export declare class TransportWebSocket implements Transport {
     private readonly timeout;
     private ongoing;
     private socket?;
+    private openSocket?;
     constructor(url: string, timeout?: number);
     request(data: JsonRpcPayload): Promise<unknown>;
 }

package/dist/client/transports/webSocket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webSocket.d.ts","sourceRoot":"","sources":["../../../src/client/transports/webSocket.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,kBAAmB,YAAW,SAAS;IAYhD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAZ1B,OAAO,CAAC,OAAO,CAOD;IACd,OAAO,CAAC,MAAM,CAAC,CAAqB;gBAGjB,GAAG,EAAE,MAAM,EACX,OAAO,SAAQ;IAGlC,OAAO,CAAC,IAAI,EAAE,cAAc;CAmE7B"}
+{"version":3,"file":"webSocket.d.ts","sourceRoot":"","sources":["../../../src/client/transports/webSocket.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,kBAAmB,YAAW,SAAS;IAahD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAb1B,OAAO,CAAC,OAAO,CAOD;IACd,OAAO,CAAC,MAAM,CAAC,CAAY;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAqB;gBAGrB,GAAG,EAAE,MAAM,EACX,OAAO,SAAQ;IAGlC,OAAO,CAAC,IAAI,EAAE,cAAc;CAkF7B"}

package/dist/client/transports/webSocket.js

@@ -6,9 +6,12 @@ export class TransportWebSocket {
         this.ongoing = new Map();
     }
     request(data) {
-        const socket = (this.socket ?? Promise.resolve(undefined)).then((existed) => {
-            if (existed && existed.readyState === existed.OPEN) {
-                return existed;
+        const socket = (() => {
+            if (this.socket &&
+                this.socket.readyState !== this.socket.CLOSING &&
+                this.socket.readyState !== this.socket.CLOSED &&
+                this.openSocket) {
+                return this.openSocket;
             }
             const socket = new WebSocket(this.url);
             const onMessage = ({ data }) => {
@@ -20,40 +23,50 @@ export class TransportWebSocket {
                 if (!req) {
                     return;
                 }
-                clearTimeout(req[2]);
+                const [resolve, _, timeout] = req;
+                clearTimeout(timeout);
                 this.ongoing.delete(res.id);
-                req[0](res);
+                resolve(res);
             };
             const onClose = () => {
-                this.socket = undefined;
-                this.ongoing.forEach(([_, onError]) => onError(new Error("Connection closed")));
+                this.ongoing.forEach(([_, reject, timeout]) => {
+                    clearTimeout(timeout);
+                    reject(new Error("Connection closed"));
+                });
                 this.ongoing.clear();
             };
             socket.onclose = onClose;
             socket.onerror = onClose;
             socket.onmessage = onMessage;
-            this.socket = new Promise((resolve) => {
+            this.socket = socket;
+            this.openSocket = new Promise((resolve) => {
                 if (socket.readyState === socket.OPEN) {
-                    resolve(undefined);
+                    resolve(socket);
                 }
                 else {
-                    socket.onopen = resolve;
+                    socket.onopen = () => {
+                        resolve(socket);
+                    };
                 }
-            }).then(() => socket);
-            return this.socket;
-        });
+            });
+            return this.openSocket;
+        })();
         return new Promise((resolve, reject) => {
-            this.ongoing.set(data.id, [
+            const req = [
                 resolve,
                 reject,
                 setTimeout(() => {
+                    this.ongoing.delete(data.id);
                     socket.then((socket) => socket.close());
                     reject(new Error("Request timeout"));
                 }, this.timeout),
-            ]);
+            ];
+            this.ongoing.set(data.id, req);
             socket.then((socket) => {
                 if (socket.readyState === socket.CLOSED ||
                     socket.readyState === socket.CLOSING) {
+                    clearTimeout(req[2]);
+                    this.ongoing.delete(data.id);
                     reject(new Error("Connection closed"));
                 }
                 else {

package/dist.commonjs/client/transports/webSocket.d.ts

@@ -4,6 +4,7 @@ export declare class TransportWebSocket implements Transport {
     private readonly timeout;
     private ongoing;
     private socket?;
+    private openSocket?;
     constructor(url: string, timeout?: number);
     request(data: JsonRpcPayload): Promise<unknown>;
 }

package/dist.commonjs/client/transports/webSocket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webSocket.d.ts","sourceRoot":"","sources":["../../../src/client/transports/webSocket.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,kBAAmB,YAAW,SAAS;IAYhD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAZ1B,OAAO,CAAC,OAAO,CAOD;IACd,OAAO,CAAC,MAAM,CAAC,CAAqB;gBAGjB,GAAG,EAAE,MAAM,EACX,OAAO,SAAQ;IAGlC,OAAO,CAAC,IAAI,EAAE,cAAc;CAmE7B"}
+{"version":3,"file":"webSocket.d.ts","sourceRoot":"","sources":["../../../src/client/transports/webSocket.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,kBAAmB,YAAW,SAAS;IAahD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAb1B,OAAO,CAAC,OAAO,CAOD;IACd,OAAO,CAAC,MAAM,CAAC,CAAY;IAC3B,OAAO,CAAC,UAAU,CAAC,CAAqB;gBAGrB,GAAG,EAAE,MAAM,EACX,OAAO,SAAQ;IAGlC,OAAO,CAAC,IAAI,EAAE,cAAc;CAkF7B"}

package/dist.commonjs/client/transports/webSocket.js

@@ -12,9 +12,12 @@ class TransportWebSocket {
         this.ongoing = new Map();
     }
     request(data) {
-        const socket = (this.socket ?? Promise.resolve(undefined)).then((existed) => {
-            if (existed && existed.readyState === existed.OPEN) {
-                return existed;
+        const socket = (() => {
+            if (this.socket &&
+                this.socket.readyState !== this.socket.CLOSING &&
+                this.socket.readyState !== this.socket.CLOSED &&
+                this.openSocket) {
+                return this.openSocket;
             }
             const socket = new isomorphic_ws_1.default(this.url);
             const onMessage = ({ data }) => {
@@ -26,40 +29,50 @@ class TransportWebSocket {
                 if (!req) {
                     return;
                 }
-                clearTimeout(req[2]);
+                const [resolve, _, timeout] = req;
+                clearTimeout(timeout);
                 this.ongoing.delete(res.id);
-                req[0](res);
+                resolve(res);
             };
             const onClose = () => {
-                this.socket = undefined;
-                this.ongoing.forEach(([_, onError]) => onError(new Error("Connection closed")));
+                this.ongoing.forEach(([_, reject, timeout]) => {
+                    clearTimeout(timeout);
+                    reject(new Error("Connection closed"));
+                });
                 this.ongoing.clear();
             };
             socket.onclose = onClose;
             socket.onerror = onClose;
             socket.onmessage = onMessage;
-            this.socket = new Promise((resolve) => {
+            this.socket = socket;
+            this.openSocket = new Promise((resolve) => {
                 if (socket.readyState === socket.OPEN) {
-                    resolve(undefined);
+                    resolve(socket);
                 }
                 else {
-                    socket.onopen = resolve;
+                    socket.onopen = () => {
+                        resolve(socket);
+                    };
                 }
-            }).then(() => socket);
-            return this.socket;
-        });
+            });
+            return this.openSocket;
+        })();
         return new Promise((resolve, reject) => {
-            this.ongoing.set(data.id, [
+            const req = [
                 resolve,
                 reject,
                 setTimeout(() => {
+                    this.ongoing.delete(data.id);
                     socket.then((socket) => socket.close());
                     reject(new Error("Request timeout"));
                 }, this.timeout),
-            ]);
+            ];
+            this.ongoing.set(data.id, req);
             socket.then((socket) => {
                 if (socket.readyState === socket.CLOSED ||
                     socket.readyState === socket.CLOSING) {
+                    clearTimeout(req[2]);
+                    this.ongoing.delete(data.id);
                     reject(new Error("Connection closed"));
                 }
                 else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "0.0.16-alpha.1",
+  "version": "0.0.16-alpha.3",
   "description": "Core of CCC - CKBer's Codebase",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",

package/src/client/transports/webSocket.ts

@@ -10,7 +10,8 @@ export class TransportWebSocket implements Transport {
       ReturnType<typeof setTimeout>,
     ]
   > = new Map();
-  private socket?: Promise<WebSocket>;
+  private socket?: WebSocket;
+  private openSocket?: Promise<WebSocket>;
 
   constructor(
     private readonly url: string,
@@ -18,65 +19,80 @@ export class TransportWebSocket implements Transport {
   ) {}
 
   request(data: JsonRpcPayload) {
-    const socket = (this.socket ?? Promise.resolve(undefined)).then(
-      (existed) => {
-        if (existed && existed.readyState === existed.OPEN) {
-          return existed;
+    const socket = (() => {
+      if (
+        this.socket &&
+        this.socket.readyState !== this.socket.CLOSING &&
+        this.socket.readyState !== this.socket.CLOSED &&
+        this.openSocket
+      ) {
+        return this.openSocket;
+      }
+      const socket = new WebSocket(this.url);
+      const onMessage = ({ data }: { data: string }) => {
+        const res = JSON.parse(data);
+        if (typeof res !== "object" || res === null) {
+          throw new Error(`Unknown response ${data}`);
         }
 
-        const socket = new WebSocket(this.url);
-        const onMessage = ({ data }: { data: string }) => {
-          const res = JSON.parse(data);
-          if (typeof res !== "object" || res === null) {
-            throw new Error(`Unknown response ${data}`);
-          }
-
-          const req = this.ongoing.get(res.id);
-          if (!req) {
-            return;
-          }
-          clearTimeout(req[2]);
-          this.ongoing.delete(res.id);
+        const req = this.ongoing.get(res.id);
+        if (!req) {
+          return;
+        }
+        const [resolve, _, timeout] = req;
+        clearTimeout(timeout);
+        this.ongoing.delete(res.id);
 
-          req[0](res);
-        };
-        const onClose = () => {
-          this.socket = undefined;
-          this.ongoing.forEach(([_, onError]) =>
-            onError(new Error("Connection closed")),
-          );
-          this.ongoing.clear();
-        };
+        resolve(res);
+      };
+      const onClose = () => {
+        this.ongoing.forEach(([_, reject, timeout]) => {
+          clearTimeout(timeout);
+          reject(new Error("Connection closed"));
+        });
+        this.ongoing.clear();
+      };
 
-        socket.onclose = onClose;
-        socket.onerror = onClose;
-        socket.onmessage = onMessage;
+      socket.onclose = onClose;
+      socket.onerror = onClose;
+      socket.onmessage = onMessage;
 
-        this.socket = new Promise((resolve) => {
-          if (socket.readyState === socket.OPEN) {
-            resolve(undefined);
-          } else {
-            socket.onopen = resolve;
-          }
-        }).then(() => socket);
-        return this.socket;
-      },
-    );
+      this.socket = socket;
+      this.openSocket = new Promise<WebSocket>((resolve) => {
+        if (socket.readyState === socket.OPEN) {
+          resolve(socket);
+        } else {
+          socket.onopen = () => {
+            resolve(socket);
+          };
+        }
+      });
+      return this.openSocket;
+    })();
 
     return new Promise((resolve, reject) => {
-      this.ongoing.set(data.id, [
+      const req: [
+        (res: unknown) => unknown,
+        (err: unknown) => unknown,
+        ReturnType<typeof setTimeout>,
+      ] = [
         resolve,
         reject,
         setTimeout(() => {
+          this.ongoing.delete(data.id);
           socket.then((socket) => socket.close());
           reject(new Error("Request timeout"));
         }, this.timeout),
-      ]);
+      ];
+      this.ongoing.set(data.id, req);
+
       socket.then((socket) => {
         if (
           socket.readyState === socket.CLOSED ||
           socket.readyState === socket.CLOSING
         ) {
+          clearTimeout(req[2]);
+          this.ongoing.delete(data.id);
           reject(new Error("Connection closed"));
         } else {
           socket.send(JSON.stringify(data));