@tchain/tcabci-read-js-client 2.0.3 → 2.1.0

package/client.js

@@ -24,19 +24,23 @@ export default class TCAbciClient {
   subscribed = false
   subscribedAddresses = []
   connected = false
-  version = 'v2.0.3'
+  version = 'v2.1.0'
   errorCb = null
   listenCb = null
+  wsLibrary = null
   ws = null
   readNodeAddress = READ_NODE_ADDRESS
   readNodeWSAddress = READ_NODE_WS_ADDRESS
 
   /**
-   *
    * @param {Array<String>} readNodeAddresses
+   * @param {WebSocket} wsLibrary
    */
-  constructor(readNodeAddresses = []) {
-    if (readNodeAddresses.length === 2) {
+  constructor(readNodeAddresses = [], wsLibrary) {
+    if (!wsLibrary) throw INVALID_ARGUMENTS
+    this.wsLibrary = wsLibrary
+
+    if (Array.isArray(readNodeAddresses) && readNodeAddresses.length === 2) {
       this.readNodeAddress = readNodeAddresses[0]
       this.readNodeWSAddress = readNodeAddresses[1]
 
@@ -54,7 +58,6 @@ export default class TCAbciClient {
     req.cache = 'no-cache'
     req.headers = {
       Client: `tcabaci-read-js-client${this.version}`,
-      'X-Client': `tcabaci-read-js-client${this.version}`,
     }
 
     if (typeof AbortSignal !== 'undefined') {
@@ -63,13 +66,7 @@ export default class TCAbciClient {
 
     req.priority = 'high'
 
-    return fetch(this.readNodeAddress + uri, req).then((response) => {
-      if (response.ok) return response.json()
-
-      return Promise.reject(
-        new FetchError(response.statusText).setCode(response.status),
-      )
-    })
+    return fetch(this.readNodeAddress + uri, req).then((response) => this.handleResponse(response))
   }
 
   Socket() {
@@ -296,7 +293,7 @@ export default class TCAbciClient {
       }),
     })
       .then((res) => {
-        return { data: res.data.data }
+        return { data: res.data }
       })
       .catch((e) => this.handleRestError(e, { 400: TRANSACTION_NOT_BROADCAST }))
   }
@@ -321,15 +318,13 @@ export default class TCAbciClient {
   }
 
   async connect() {
-    const wsClient = await this.wsClient()
-
     return new Promise((resolve, reject) => {
       if (this.getConnected()) {
         reject(ALREADY_CONNECTED)
       }
 
       const options = {
-        WebSocket: wsClient,
+        WebSocket: this.wsLibrary,
         connectionTimeout: 1000,
         maxRetries: 10,
       }
@@ -364,18 +359,6 @@ export default class TCAbciClient {
     })
   }
 
-  async wsClient() {
-    if (
-      typeof window !== 'undefined' &&
-      typeof window.WebSocket !== 'undefined'
-    ) {
-      return window.WebSocket
-    }
-    const { WebSocket } = await import('ws')
-
-    return WebSocket
-  }
-
   getConnected() {
     return this.connected
   }
@@ -405,6 +388,30 @@ export default class TCAbciClient {
     this.subscribedAddresses = addresses
   }
 
+  /**
+   * @param {Response} response
+   * @return {Promise<*>}
+   */
+  async handleResponse(response) {
+    if (response.status >= 200 && response.status < 400) {
+      return response.json()
+    }
+
+    let data = await response.text()
+
+    try {
+      data = JSON.parse(data)
+
+      return Promise.reject(
+        new FetchError(data.message).setCode(response.status).setResponse(data)
+      )
+    } catch (e) {
+      return Promise.reject(
+        new FetchError(response.statusText)
+      )
+    }
+  }
+
   /**
    * @param {Error} err
    * @param {?Object|Error} custom

package/client_test.js

@@ -1,4 +1,5 @@
 import TCAbciClient from './client.js'
+import { WebSocket } from 'ws'
 import unitJS from 'unit.js'
 import {
   TRANSACTION_NOT_BROADCAST,
@@ -20,7 +21,7 @@ import {
 
 describe('TCAbciClient TESTS', () => {
   it('should start with valid parameters', (done) => {
-    const client = new TCAbciClient()
+    const client = new TCAbciClient([], WebSocket)
 
     client
       .Start()
@@ -37,7 +38,7 @@ describe('TCAbciClient TESTS', () => {
   })
 
   it('should start with valid parameters and read node addresses', (done) => {
-    const client = new TCAbciClient([READ_NODE_ADDRESS, READ_NODE_WS_ADDRESS])
+    const client = new TCAbciClient([READ_NODE_ADDRESS, READ_NODE_WS_ADDRESS], WebSocket)
 
     client
       .Start()
@@ -54,7 +55,7 @@ describe('TCAbciClient TESTS', () => {
   })
 
   it('should reconnect with start and valid parameters', (done) => {
-    const client = new TCAbciClient()
+    const client = new TCAbciClient([], WebSocket)
 
     client
       .Start()
@@ -84,7 +85,7 @@ describe('TCAbciClient TESTS', () => {
   })
 
   it('should subscribe with valid parameters', (done) => {
-    const client = new TCAbciClient()
+    const client = new TCAbciClient([], WebSocket)
 
     client
       .Start()
@@ -107,7 +108,7 @@ describe('TCAbciClient TESTS', () => {
   })
 
   it('should error subscribe with invalid tx type parameter', (done) => {
-    const client = new TCAbciClient()
+    const client = new TCAbciClient([], WebSocket)
 
     client
       .Start()
@@ -126,7 +127,7 @@ describe('TCAbciClient TESTS', () => {
   })
 
   it('should unsubscribe with valid parameters', (done) => {
-    const client = new TCAbciClient()
+    const client = new TCAbciClient([], WebSocket)
 
     client
       .Start()
@@ -155,7 +156,7 @@ describe('TCAbciClient TESTS', () => {
   })
 
   it('should return last block', (done) => {
-    const client = new TCAbciClient()
+    const client = new TCAbciClient([], WebSocket)
 
     client
       .LastBlock()
@@ -170,7 +171,7 @@ describe('TCAbciClient TESTS', () => {
   })
 
   it('should return transaction search result', (done) => {
-    const client = new TCAbciClient()
+    const client = new TCAbciClient([], WebSocket)
 
     client
       .TxSearch({
@@ -194,7 +195,7 @@ describe('TCAbciClient TESTS', () => {
   })
   //
   it('should return transaction summary result', (done) => {
-    const client = new TCAbciClient()
+    const client = new TCAbciClient([], WebSocket)
 
     client
       .TxSummary({
@@ -216,7 +217,7 @@ describe('TCAbciClient TESTS', () => {
   })
 
   it('should not broadcast transaction if type is incorrect', (done) => {
-    const client = new TCAbciClient()
+    const client = new TCAbciClient([], WebSocket)
 
     try {
       client.Broadcast({
@@ -234,7 +235,7 @@ describe('TCAbciClient TESTS', () => {
   })
 
   it('should not broadcast transaction', (done) => {
-    const client = new TCAbciClient()
+    const client = new TCAbciClient([], WebSocket)
 
     client
       .Broadcast({
@@ -260,7 +261,7 @@ describe('TCAbciClient TESTS', () => {
   })
 
   it('should error in bulk tx if addresses count is zero', (done) => {
-    const client = new TCAbciClient()
+    const client = new TCAbciClient([], WebSocket)
 
     client
       .Bulk([])
@@ -282,7 +283,7 @@ describe('TCAbciClient TESTS', () => {
       )
     }
 
-    const client = new TCAbciClient()
+    const client = new TCAbciClient(null, WebSocket)
 
     client
       .Bulk(addresses)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tchain/tcabci-read-js-client",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "TransferChain Fastest Read Network WebSocket Client",
   "main": "client.js",
   "type": "module",
@@ -31,10 +31,10 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^6.1.1",
-    "prettier": "^3.2.4"
+    "prettier": "^3.2.4",
+    "ws": "^8.18.0"
   },
   "dependencies": {
-    "reconnecting-websocket": "^4.4.0",
-    "ws": "^8.18.0"
+    "reconnecting-websocket": "^4.4.0"
   }
 }