@xelis/sdk 0.5.3 → 0.5.5

package/daemon/rpc.d.ts

@@ -1,4 +1,4 @@
-import { Balance, Block, TopoHeightRangeParams, GetInfoResult, HeightRangeParams, GetLastBalanceResult, P2PStatusResult, Transaction, GetLastBalanceParams, GetBalanceAtTopoHeightParams, GetAccountsParams, GetBlockAtTopoHeightParams, GetBlockByHashParams, GetBlocksAtHeightParams, GetTopBlockParams, GetNonceResult, GetNonceParams } from './types';
+import { Balance, Block, TopoHeightRangeParams, GetInfoResult, HeightRangeParams, GetLastBalanceResult, P2PStatusResult, Transaction, GetLastBalanceParams, GetBalanceAtTopoHeightParams, GetAccountsParams, GetBlockAtTopoHeightParams, GetBlockByHashParams, GetBlocksAtHeightParams, GetTopBlockParams, GetNonceResult, GetNonceParams, GetAccountHistoryParams, GetAccountHistoryResult } from './types';
 import { RPC as BaseRPC } from '../lib/rpc';
 declare class RPC extends BaseRPC {
     getVersion(): Promise<import("../lib/types").RPCResponse<string>>;
@@ -29,5 +29,7 @@ declare class RPC extends BaseRPC {
     getAccounts(params: GetAccountsParams): Promise<import("../lib/types").RPCResponse<string[]>>;
     submitBlock(blockTemplate: string): Promise<import("../lib/types").RPCResponse<boolean>>;
     submitTransaction(hexData: string): Promise<import("../lib/types").RPCResponse<boolean>>;
+    getAccountHistory(params: GetAccountHistoryParams): Promise<import("../lib/types").RPCResponse<GetAccountHistoryResult>>;
+    getAccountAssets(address: string): Promise<import("../lib/types").RPCResponse<string[]>>;
 }
 export default RPC;

package/daemon/rpc.js

@@ -85,5 +85,11 @@ class RPC extends BaseRPC {
     submitTransaction(hexData) {
         return this.post(RPCMethod.SubmitTransaction, { data: hexData });
     }
+    getAccountHistory(params) {
+        return this.post(RPCMethod.GetAccountHistory, params);
+    }
+    getAccountAssets(address) {
+        return this.post(RPCMethod.GetAccountAssets, { address });
+    }
 }
 export default RPC;

package/daemon/types.d.ts

@@ -129,6 +129,29 @@ export interface GetBlockByHashParams {
 export interface GetTopBlockParams {
     include_txs?: boolean;
 }
+export interface GetAccountHistoryParams {
+    address: string;
+    asset?: string;
+    minimum_topoheight?: number;
+    maximum_topoheight?: number;
+}
+export interface GetAccountHistoryResult {
+    topoheight: number;
+    block_timestamp: number;
+    hash: string;
+    mining?: {
+        reward: number;
+    };
+    burn?: {
+        amount: number;
+    };
+    outgoing?: {
+        amount: number;
+    };
+    incoming?: {
+        amount: number;
+    };
+}
 export declare enum RPCMethod {
     GetVersion = "get_version",
     GetInfo = "get_info",
@@ -157,7 +180,9 @@ export declare enum RPCMethod {
     GetAccounts = "get_accounts",
     SubmitBlock = "submit_block",
     SubmitTransaction = "submit_transaction",
-    CountAccounts = "count_accounts"
+    CountAccounts = "count_accounts",
+    GetAccountHistory = "get_account_history",
+    GetAccountAssets = "get_account_assets"
 }
 export declare enum RPCEvent {
     NewBlock = "NewBlock",

package/daemon/types.js

@@ -28,6 +28,8 @@ export var RPCMethod;
     RPCMethod["SubmitBlock"] = "submit_block";
     RPCMethod["SubmitTransaction"] = "submit_transaction";
     RPCMethod["CountAccounts"] = "count_accounts";
+    RPCMethod["GetAccountHistory"] = "get_account_history";
+    RPCMethod["GetAccountAssets"] = "get_account_assets";
 })(RPCMethod || (RPCMethod = {}));
 export var RPCEvent;
 (function (RPCEvent) {

package/daemon/websocket.d.ts

@@ -1,5 +1,5 @@
 import { MessageEvent } from 'ws';
-import { Block, GetInfoResult, RPCEventResult, Transaction, TopoHeightRangeParams, P2PStatusResult, Balance, GetBalanceAtTopoHeightParams, GetLastBalanceResult, HeightRangeParams, BlockOrdered, GetLastBalanceParams, GetAccountsParams, GetBlockAtTopoHeightParams, GetBlockByHashParams, GetBlocksAtHeightParams, GetTopBlockParams, GetNonceParams, GetNonceResult } from './types';
+import { Block, GetInfoResult, RPCEventResult, Transaction, TopoHeightRangeParams, P2PStatusResult, Balance, GetBalanceAtTopoHeightParams, GetLastBalanceResult, HeightRangeParams, BlockOrdered, GetLastBalanceParams, GetAccountsParams, GetBlockAtTopoHeightParams, GetBlockByHashParams, GetBlocksAtHeightParams, GetTopBlockParams, GetNonceParams, GetNonceResult, GetAccountHistoryParams, GetAccountHistoryResult } from './types';
 import { WS as BaseWS } from '../lib/websocket';
 declare class WS extends BaseWS {
     onNewBlock(onData: (msgEvent: MessageEvent, data?: Block & RPCEventResult, err?: Error) => void): Promise<() => Promise<void>>;
@@ -33,5 +33,7 @@ declare class WS extends BaseWS {
     submitBlock(blockTemplate: string): Promise<boolean>;
     submitTransaction(hexData: string): Promise<boolean>;
     countAccounts(): Promise<number>;
+    getAccountHistory(params: GetAccountHistoryParams): Promise<GetAccountHistoryResult>;
+    getAccountAssets(address: string): Promise<string[]>;
 }
 export default WS;

package/daemon/websocket.js

@@ -94,5 +94,11 @@ class WS extends BaseWS {
     countAccounts() {
         return this.dataCall(RPCMethod.CountAccounts);
     }
+    getAccountHistory(params) {
+        return this.dataCall(RPCMethod.GetAccountHistory, params);
+    }
+    getAccountAssets(address) {
+        return this.dataCall(RPCMethod.GetAccountAssets, { address });
+    }
 }
 export default WS;

package/lib/websocket.js

@@ -23,6 +23,7 @@ export class WS {
         if (this.socket && this.socket.readyState === WebSocket.OPEN) {
             this.socket.close();
         }
+        this.events = {};
         this.connectionTries = 0;
         return new Promise((resolve, reject) => {
             this.socket = new WebSocket(endpoint);
@@ -33,7 +34,7 @@ export class WS {
             this.socket.addEventListener(`close`, (event) => {
                 if (this.reconnectOnConnectionLoss && !event.wasClean) {
                     this.tryReconnect();
-                    reject(new Error(`Reconnecting.`));
+                    reject(new Error(`Unhandled close. Reconnecting...`));
                 }
                 else {
                     reject(event);
@@ -50,6 +51,9 @@ export class WS {
             return;
         }
         this.socket = new WebSocket(this.endpoint);
+        this.socket.addEventListener(`open`, () => {
+            this.connectionTries = 0;
+        });
         this.socket.addEventListener(`close`, (event) => {
             this.tryReconnect();
         });
@@ -101,7 +105,7 @@ export class WS {
             this.events[event].listeners.push(onMessage);
         }
         else {
-            // important if multiple listenEvent are called without await atleast we store listener before getting id
+            // important if multiple listenEvent are called without await at least we store listener before getting id
             this.events[event] = { listeners: [onMessage] };
             const [err, res] = await to(this.call(`subscribe`, { notify: event }));
             if (err) {
@@ -121,12 +125,19 @@ export class WS {
                         break;
                     }
                 }
+                // no more listener so we unsubscribe from daemon websocket if socket still open
                 if (listeners.length === 0) {
-                    this.events[event].unsubscribeTimeoutId = setTimeout(async () => {
-                        // no more listener so we unsubscribe from daemon websocket
-                        this.call(`unsubscribe`, { notify: event });
+                    if (this.socket && this.socket.readyState === WebSocket.OPEN) {
+                        // we use a grace period to unsubscribe (mostly because of react useEffect and avoid unecessary subscribe)
+                        this.events[event].unsubscribeTimeoutId = setTimeout(async () => {
+                            this.call(`unsubscribe`, { notify: event });
+                            Reflect.deleteProperty(this.events, event);
+                        }, this.unsubscribeSuspense);
+                    }
+                    else {
+                        // socket is closed so we don't send unsubscribe and no grace period delete right away
                         Reflect.deleteProperty(this.events, event);
-                    }, this.unsubscribeSuspense);
+                    }
                 }
             }
             this.socket && this.socket.removeEventListener(`message`, onMessage);

package/package.json

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