@leofcoin/endpoint-clients 0.2.2 → 0.2.4

package/exports/http.js

@@ -1,4 +1,6 @@
-class http {
+class Client {
+    url;
+    networkVersion;
     get isHttpClient() {
         return true;
     }
@@ -6,10 +8,19 @@ class http {
         this.url = url;
         this.networkVersion = networkVersion;
     }
-    async _fetch(method, params) {
+    async _fetch(method, params, type = 'json') {
         params = new URLSearchParams(params).toString();
         const response = await fetch(`${this.url}/${method}?${params}`);
-        return response.json();
+        return response[type]();
+    }
+    async _fetchString(method, params) {
+        return String(await this._fetch(method, params, 'text'));
+    }
+    async _fetchNumber(method, params) {
+        return Number(await this._fetchString(method, params));
+    }
+    async _fetchBoolean(method, params) {
+        return Boolean((await this._fetchString(method, params)) === 'true');
     }
     balances() {
         return this._fetch('balances');
@@ -18,7 +29,7 @@ class http {
         return this._fetch(`balanceOf`, { address, format });
     }
     selectedAccount() {
-        return this._fetch('selectedAccount');
+        return this._fetchString('selectedAccount');
     }
     selectAccount(address) {
         return this._fetch('selectAccount', { address });
@@ -27,7 +38,7 @@ class http {
         return this._fetch('accounts');
     }
     hasTransactionToHandle() {
-        return this._fetch('hasTransactionToHandle');
+        return this._fetchBoolean('hasTransactionToHandle');
     }
     getBlock(index) {
         return this._fetch('getBlock', { index });
@@ -39,7 +50,7 @@ class http {
         return this._fetch('sendTransaction', transaction);
     }
     peerId() {
-        return this._fetch('peerId');
+        return this._fetchString('peerId');
     }
     peers() {
         return this._fetch('peers');
@@ -54,34 +65,34 @@ class http {
         return this._fetch('staticCall', { contract, method, params });
     }
     nativeBurns() {
-        return this._fetch('nativeBurns');
+        return this._fetchNumber('nativeBurns');
     }
     contracts() {
         return this._fetch('contracts');
     }
     nativeMints() {
-        return this._fetch('nativeMints');
+        return this._fetchNumber('nativeMints');
     }
     nativeToken() {
-        return this._fetch('nativeToken');
+        return this._fetchString('nativeToken');
     }
     nativeTransfers() {
-        return this._fetch('nativeTransfers');
+        return this._fetchNumber('nativeTransfers');
     }
     totalSize() {
-        return this._fetch('totalSize');
+        return this._fetchNumber('totalSize');
     }
     totalTransactions() {
-        return this._fetch('totalTransactions');
+        return this._fetchNumber('totalTransactions');
     }
     totalBlocks() {
-        return this._fetch('totalBlocks');
+        return this._fetchNumber('totalBlocks');
     }
     nativeCalls() {
-        return this._fetch('nativeCalls');
+        return this._fetchNumber('nativeCalls');
     }
     participating() {
-        return this._fetch('participating');
+        return this._fetchBoolean('participating');
     }
     participate(address) {
         return this._fetch('participate', { address });
@@ -92,6 +103,12 @@ class http {
     deployContract(code, params) {
         return this._fetch('deployContract', { code, params });
     }
+    network() {
+        return this._fetch('network');
+    }
+    networkStats() {
+        return this._fetch('networkStats');
+    }
 }
 
-export { http as default };
+export { Client as default };

package/exports/index.js

@@ -1,2 +1,3 @@
 export { default as ws } from './ws.js';
 export { default as http } from './http.js';
+import 'socket-request-client';

package/exports/types/http.d.ts

@@ -1,32 +1,47 @@
-export default class {
+type responseType = 'json' | 'text' | 'arrayBuffer' | 'clone' | 'formData' | 'blob';
+type networkVersion = 'peach' | string;
+export default class Client {
+    url: URL;
+    networkVersion: networkVersion;
     get isHttpClient(): boolean;
     constructor(url: any, networkVersion: any);
-    _fetch(method: any, params: any): Promise<any>;
+    _fetch(method: any, params?: any, type?: responseType): Promise<any>;
+    _fetchString(method: string, params?: any): Promise<string>;
+    _fetchNumber(method: string, params?: any): Promise<number>;
+    _fetchBoolean(method: string, params?: any): Promise<boolean>;
     balances(): Promise<any>;
     balanceOf(address: any, format: any): Promise<any>;
-    selectedAccount(): Promise<any>;
+    selectedAccount(): Promise<string>;
     selectAccount(address: any): Promise<any>;
     accounts(): Promise<any>;
-    hasTransactionToHandle(): Promise<any>;
+    hasTransactionToHandle(): Promise<boolean>;
     getBlock(index: any): Promise<any>;
     blocks(amount: any): Promise<any>;
     sendTransaction(transaction: any): Promise<any>;
-    peerId(): Promise<any>;
+    peerId(): Promise<string>;
     peers(): Promise<any>;
     validators(): Promise<any>;
     lookup(name: any): Promise<any>;
     staticCall(contract: any, method: any, params: any): Promise<any>;
-    nativeBurns(): Promise<any>;
+    nativeBurns(): Promise<number>;
     contracts(): Promise<any>;
-    nativeMints(): Promise<any>;
-    nativeToken(): Promise<any>;
-    nativeTransfers(): Promise<any>;
-    totalSize(): Promise<any>;
-    totalTransactions(): Promise<any>;
-    totalBlocks(): Promise<any>;
-    nativeCalls(): Promise<any>;
-    participating(): Promise<any>;
+    nativeMints(): Promise<number>;
+    nativeToken(): Promise<string>;
+    nativeTransfers(): Promise<number>;
+    totalSize(): Promise<number>;
+    totalTransactions(): Promise<number>;
+    totalBlocks(): Promise<number>;
+    nativeCalls(): Promise<number>;
+    participating(): Promise<boolean>;
     participate(address: any): Promise<any>;
     createContractAddress(owner: any, code: any, params: any): Promise<any>;
     deployContract(code: any, params: any): Promise<any>;
+    network(): Promise<any>;
+    networkStats(): {
+        version: string;
+        peers: {}[];
+        accounts: number;
+        accountsHolding: number;
+    };
 }
+export {};

package/exports/types/ws.d.ts

@@ -37,4 +37,11 @@ export default class Client {
     participate(address: string): {};
     createContractAddress(owner: string, code: string, params: {}): {};
     deployContract(code: string, params: {}): {};
+    network(): any;
+    networkStats(): {
+        version: string;
+        peers: {}[];
+        accounts: number;
+        accountsHolding: number;
+    };
 }

package/exports/ws.js

@@ -101,6 +101,12 @@ class Client {
     deployContract(code, params) {
         return this.request('deployContract', { code, params });
     }
+    network() {
+        return this.request('network');
+    }
+    networkStats() {
+        return this.request('networkStats');
+    }
 }
 
 export { Client as default };

package/package.json

@@ -1,10 +1,22 @@
 {
   "name": "@leofcoin/endpoint-clients",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "",
   "exports": {
-    "./ws": "./exports/ws.js",
-    "./http": "./exports/http.js"
+    ".": {
+      "import": "./exports/index.js",
+      "types": "./exports/types/index.d.ts"
+    },
+    "./ws": {
+      "import": "./exports/ws.js",
+      "types": "./exports/types/ws.d.ts"
+    },
+    "./http": {
+      "import": "./exports/http.js",
+      "types": "./exports/types/http.d.ts"
+    },
+    "./ws.js": "./exports/ws.js",
+    "./http.js": "./exports/http.js"
   },
   "types": "./exports/types/index.d.ts",
   "type": "module",

package/src/http.ts

@@ -1,16 +1,36 @@
-export default class {
+
+// see https://developer.mozilla.org/en-US/docs/Web/API/Response#instance_methods
+type responseType = 'json' | 'text' | 'arrayBuffer' | 'clone' | 'formData' | 'blob';
+type networkVersion = 'peach' | string;
+
+export default class Client {
+  url: URL;
+  networkVersion: networkVersion;
   get isHttpClient() {
     return true
   }
+
   constructor(url, networkVersion) {
     this.url = url
     this.networkVersion = networkVersion
   }
   
-  async _fetch(method, params) {
+  async _fetch(method, params?, type: responseType = 'json') {
     params = new URLSearchParams(params).toString()
     const response = await fetch(`${this.url}/${method}?${params}`)
-    return response.json()
+    return response[type]()
+  }
+
+  async _fetchString(method: string, params?) {
+    return String(await this._fetch(method, params, 'text'))
+  }
+
+  async _fetchNumber(method: string, params?) {
+    return Number(await this._fetchString(method, params))
+  }
+
+  async _fetchBoolean(method: string, params?) {
+    return Boolean((await this._fetchString(method, params)) === 'true')
   }
 
   balances() {
@@ -22,7 +42,7 @@ export default class {
   }
 
   selectedAccount() {
-    return this._fetch('selectedAccount')
+    return this._fetchString('selectedAccount')
   }
 
   selectAccount(address) {
@@ -34,7 +54,7 @@ export default class {
   }
     
   hasTransactionToHandle() {
-    return this._fetch('hasTransactionToHandle')
+    return this._fetchBoolean('hasTransactionToHandle')
   }
 
   getBlock(index) {
@@ -48,7 +68,7 @@ export default class {
     return this._fetch('sendTransaction', transaction)
   }
   peerId() {
-    return this._fetch('peerId')
+    return this._fetchString('peerId')
   }
   peers() {
     return this._fetch('peers')
@@ -64,34 +84,34 @@ export default class {
     return this._fetch('staticCall', {contract, method, params})
   }
   nativeBurns() {
-    return this._fetch('nativeBurns')
+    return this._fetchNumber('nativeBurns')
   }
   contracts() {
     return this._fetch('contracts')
   }
   nativeMints() {
-    return this._fetch('nativeMints')
+    return this._fetchNumber('nativeMints')
   }
   nativeToken() {
-    return this._fetch('nativeToken')
+    return this._fetchString('nativeToken')
   }
   nativeTransfers() {
-    return this._fetch('nativeTransfers')
+    return this._fetchNumber('nativeTransfers')
   }
   totalSize() {
-    return this._fetch('totalSize')
+    return this._fetchNumber('totalSize')
   }
   totalTransactions() {
-    return this._fetch('totalTransactions')
+    return this._fetchNumber('totalTransactions')
   }
   totalBlocks() {
-    return this._fetch('totalBlocks')
+    return this._fetchNumber('totalBlocks')
   }
   nativeCalls() {
-    return this._fetch('nativeCalls')
+    return this._fetchNumber('nativeCalls')
   }
   participating() {
-    return this._fetch('participating')
+    return this._fetchBoolean('participating')
   }
   participate(address) {
     return this._fetch('participate', { address })
@@ -100,7 +120,16 @@ export default class {
   createContractAddress(owner, code, params) {
     return this._fetch('createContractAddress', { owner, code, params })
   }
+
   deployContract(code, params) {
     return this._fetch('deployContract', { code, params })
   }
+
+  network() {
+    return this._fetch('network')
+  }
+
+  networkStats(): { version: string; peers: {}[]; accounts: number; accountsHolding: number; } {
+    return this._fetch('networkStats')
+  }
 }

package/src/ws.ts

@@ -114,4 +114,11 @@ export default class Client {
   deployContract(code: string, params: {}): {} {
     return this.request('deployContract', { code, params })
   }
+  network() {
+    return this.request('network')
+  }
+
+  networkStats(): { version: string; peers: {}[]; accounts: number; accountsHolding: number } {
+    return this.request('networkStats')
+  }
 }