@xelis/sdk 0.5.7 → 0.5.9

package/daemon/types.d.ts

@@ -75,16 +75,17 @@ export interface RPCEventResult {
     event: string;
 }
 export interface Peer {
-    addr: string;
-    cumulative_difficulty: number;
-    height: number;
     id: number;
-    last_ping: number;
-    pruned_topoheight: number;
+    addr: string;
     tag: string;
+    version: string;
     top_block_hash: string;
     topoheight: number;
-    version: string;
+    height: number;
+    last_ping: number;
+    pruned_topoheight: number;
+    peers: string[];
+    cumulative_difficulty: number;
 }
 export interface BlockOrdered {
     topoheight: number;
@@ -161,6 +162,14 @@ export interface AccounHistory {
         amount: number;
     };
 }
+export interface PeerPeerListUpdated {
+    peer_id: number;
+    peerlist: string[];
+}
+export interface PeerPeerDisconnected {
+    peer_id: number;
+    peer_addr: string;
+}
 export declare enum RPCMethod {
     GetVersion = "get_version",
     GetInfo = "get_info",
@@ -198,5 +207,9 @@ export declare enum RPCEvent {
     NewBlock = "NewBlock",
     TransactionAddedInMempool = "TransactionAddedInMempool",
     TransactionExecuted = "TransactionExecuted",
-    BlockOrdered = "BlockOrdered"
+    BlockOrdered = "BlockOrdered",
+    PeerConnected = "PeerConnected",
+    PeerDisconnected = "PeerDisconnected",
+    PeerPeerListUpdated = "PeerPeerListUpdated",
+    PeerPeerDisconnected = "PeerPeerDisconnected"
 }

package/daemon/types.js

@@ -38,4 +38,8 @@ export var RPCEvent;
     RPCEvent["TransactionAddedInMempool"] = "TransactionAddedInMempool";
     RPCEvent["TransactionExecuted"] = "TransactionExecuted";
     RPCEvent["BlockOrdered"] = "BlockOrdered";
+    RPCEvent["PeerConnected"] = "PeerConnected";
+    RPCEvent["PeerDisconnected"] = "PeerDisconnected";
+    RPCEvent["PeerPeerListUpdated"] = "PeerPeerListUpdated";
+    RPCEvent["PeerPeerDisconnected"] = "PeerPeerDisconnected";
 })(RPCEvent || (RPCEvent = {}));

package/daemon/websocket.d.ts

@@ -1,11 +1,15 @@
 import { MessageEvent } from 'ws';
-import { Block, GetInfoResult, RPCEventResult, Transaction, TopoHeightRangeParams, P2PStatusResult, Balance, GetBalanceAtTopoHeightParams, GetLastBalanceResult, HeightRangeParams, BlockOrdered, GetLastBalanceParams, GetAccountsParams, GetBlockAtTopoHeightParams, GetBlockByHashParams, GetBlocksAtHeightParams, GetTopBlockParams, GetNonceParams, GetNonceResult, GetAccountHistoryParams, AccounHistory, Peer } from './types';
+import { Block, GetInfoResult, RPCEventResult, Transaction, TopoHeightRangeParams, P2PStatusResult, Balance, GetBalanceAtTopoHeightParams, GetLastBalanceResult, HeightRangeParams, BlockOrdered, GetLastBalanceParams, GetAccountsParams, GetBlockAtTopoHeightParams, GetBlockByHashParams, GetBlocksAtHeightParams, GetTopBlockParams, GetNonceParams, GetNonceResult, GetAccountHistoryParams, AccounHistory, Peer, PeerPeerListUpdated, PeerPeerDisconnected } 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>>;
     onTransactionAddedInMempool(onData: (msgEvent: MessageEvent, data?: Transaction & RPCEventResult, err?: Error) => void): Promise<() => Promise<void>>;
     onTransactionExecuted(onData: (msgEvent: MessageEvent, data?: Transaction & RPCEventResult, err?: Error) => void): Promise<() => Promise<void>>;
     onBlockOrdered(onData: (msgEvent: MessageEvent, data?: BlockOrdered & RPCEventResult, err?: Error) => void): Promise<() => Promise<void>>;
+    onPeerConnected(onData: (msgEvent: MessageEvent, data?: Peer & RPCEventResult, err?: Error) => void): Promise<() => Promise<void>>;
+    onPeerDisconnected(onData: (msgEvent: MessageEvent, data?: number & RPCEventResult, err?: Error) => void): Promise<() => Promise<void>>;
+    onPeerPeerListUpdated(onData: (msgEvent: MessageEvent, data?: PeerPeerListUpdated & RPCEventResult, err?: Error) => void): Promise<() => Promise<void>>;
+    onPeerPeerDisconnected(onData: (msgEvent: MessageEvent, data?: PeerPeerDisconnected & RPCEventResult, err?: Error) => void): Promise<() => Promise<void>>;
     getVersion(): Promise<string>;
     getInfo(): Promise<GetInfoResult>;
     getHeight(): Promise<number>;

package/daemon/websocket.js

@@ -13,6 +13,18 @@ class WS extends BaseWS {
     onBlockOrdered(onData) {
         return this.listenEvent(RPCEvent.BlockOrdered, onData);
     }
+    onPeerConnected(onData) {
+        return this.listenEvent(RPCEvent.PeerConnected, onData);
+    }
+    onPeerDisconnected(onData) {
+        return this.listenEvent(RPCEvent.PeerDisconnected, onData);
+    }
+    onPeerPeerListUpdated(onData) {
+        return this.listenEvent(RPCEvent.PeerPeerListUpdated, onData);
+    }
+    onPeerPeerDisconnected(onData) {
+        return this.listenEvent(RPCEvent.PeerPeerDisconnected, onData);
+    }
     getVersion() {
         return this.dataCall(RPCMethod.GetVersion);
     }

package/lib/websocket.d.ts

@@ -9,13 +9,19 @@ export declare class WS {
     reconnectOnConnectionLoss: boolean;
     maxConnectionTries: number;
     connectionTries: number;
+    methodIdIncrement: number;
     private events;
     constructor();
     connect(endpoint: string): Promise<unknown>;
     tryReconnect(): void;
+    close(): void;
     private clearEvent;
     closeAllListens(event: string): Promise<void>;
     listenEvent<T>(event: string, onData: (msgEvent: MessageEvent, data?: T, err?: Error) => void): Promise<() => Promise<void>>;
     call<T>(method: string, params?: any): Promise<RPCResponse<T>>;
     dataCall<T>(method: string, params?: any): Promise<T>;
+    createRequestMethod(method: string, params?: any): {
+        data: string;
+        id: number;
+    };
 }

package/lib/websocket.js

@@ -1,16 +1,9 @@
 import WebSocket from 'isomorphic-ws';
 import to from 'await-to-js';
-function createRequestMethod(method, params) {
-    const id = Math.floor(Date.now() * Math.random());
-    const request = { id: id, jsonrpc: `2.0`, method };
-    if (params)
-        request.params = params;
-    const data = JSON.stringify(request);
-    return { data, id };
-}
 export class WS {
     constructor() {
         this.connectionTries = 0;
+        this.methodIdIncrement = 0;
         this.endpoint = "";
         this.timeout = 3000;
         this.events = {};
@@ -58,6 +51,11 @@ export class WS {
             this.tryReconnect();
         });
     }
+    close() {
+        if (!this.socket)
+            return;
+        this.socket.close();
+    }
     clearEvent(event) {
         this.events[event].listeners.forEach(listener => {
             this.socket && this.socket.removeEventListener(`message`, listener);
@@ -147,7 +145,7 @@ export class WS {
     }
     call(method, params) {
         return new Promise((resolve, reject) => {
-            const { data, id } = createRequestMethod(method, params);
+            const { data, id } = this.createRequestMethod(method, params);
             let timeoutId = null;
             const onMessage = (msgEvent) => {
                 if (typeof msgEvent.data === `string`) {
@@ -181,4 +179,12 @@ export class WS {
             return resolve(res.result);
         });
     }
+    createRequestMethod(method, params) {
+        const id = this.methodIdIncrement++;
+        const request = { id: id, jsonrpc: `2.0`, method };
+        if (params)
+            request.params = params;
+        const data = JSON.stringify(request);
+        return { data, id };
+    }
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.5.7",
+  "version": "0.5.9",
   "name": "@xelis/sdk",
   "description": "Xelis software development kit for JS",
   "repository": {
@@ -9,7 +9,7 @@
   "homepage": "https://github.com/xelis-project/xelis-js-sdk#readme",
   "scripts": {
     "test": "jest",
-    "build": "npx tsc --declaration && cp package.json ./dist && cp README.md ./dist",
+    "build": "rm -r ./dist && npx tsc --declaration && cp package.json ./dist && cp README.md ./dist",
     "publish": "cd ./dist && npm publish"
   },
   "devDependencies": {