@xelis/sdk 0.3.0 → 0.3.2

package/daemon/rpc.js

@@ -9,6 +9,9 @@ class RPC {
             const res = await fetch(this.endpoint, { method: `POST`, body });
             if (res.ok) {
                 const data = await res.json();
+                if (data.error) {
+                    return Promise.reject(new Error(data.error.message));
+                }
                 return Promise.resolve(data);
             }
             else {

package/daemon/types.d.ts

@@ -11,7 +11,7 @@ export interface RPCError {
 export interface RPCResponse<T> {
     id: number;
     result: T;
-    error: RPCError;
+    error?: RPCError;
 }
 export interface GetInfoResult {
     block_time_target: number;

package/daemon/websocket.d.ts

@@ -7,6 +7,7 @@ declare class WS {
     socket?: WebSocket;
     timeout: number;
     connected: boolean;
+    unsubscribeSuspense: number;
     private events;
     constructor();
     connect(endpoint: string): Promise<unknown>;

package/daemon/websocket.js

@@ -15,6 +15,7 @@ class WS {
         this.timeout = 3000;
         this.connected = false;
         this.events = {};
+        this.unsubscribeSuspense = 1000;
     }
     connect(endpoint) {
         if (this.socket && this.socket.readyState !== WebSocket.CLOSED) {
@@ -92,6 +93,12 @@ class WS {
             }
         };
         if (this.events[event]) {
+            const { unsubscribeTimeoutId } = this.events[event];
+            if (unsubscribeTimeoutId) {
+                // clear timeout to unsubscribe 
+                // because we got a new registered event and want to cancel the pending unsubscribe grace period
+                clearTimeout(unsubscribeTimeoutId);
+            }
             this.events[event].listeners.push(onMessage);
         }
         else {
@@ -105,13 +112,23 @@ class WS {
             this.events[event].id = res.id;
         }
         this.socket && this.socket.addEventListener(`message`, onMessage);
-        const closeListen = async () => {
-            if (this.events[event] && this.events[event].listeners.length === 1) {
-                // this is the last listen callback so we unsubscribe from daemon ws
-                const [err, _] = await to(this.call(`unsubscribe`, { notify: event }));
-                if (err)
-                    return Promise.reject(err);
-                Reflect.deleteProperty(this.events, event);
+        const closeListen = () => {
+            const eventData = this.events[event];
+            if (eventData) {
+                const listeners = eventData.listeners;
+                for (let i = 0; i < listeners.length; i++) {
+                    if (listeners[i] === onMessage) {
+                        listeners.splice(i, 1);
+                        break;
+                    }
+                }
+                if (listeners.length === 0) {
+                    this.events[event].unsubscribeTimeoutId = setTimeout(async () => {
+                        // no more listener so we unsubscribe from daemon websocket
+                        this.call(`unsubscribe`, { notify: event });
+                        Reflect.deleteProperty(this.events, event);
+                    }, this.unsubscribeSuspense);
+                }
             }
             this.socket && this.socket.removeEventListener(`message`, onMessage);
             return Promise.resolve();

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.0",
+  "version": "0.3.2",
   "name": "@xelis/sdk",
   "description": "Xelis software development kit for JS",
   "repository": {