@tchain/tcabci-read-js-client 2.5.3 → 2.5.5

package/client.js

@@ -4,6 +4,7 @@ import {
   BLOCK_NOT_FOUND,
   ERR_NETWORK,
   FetchError,
+  INVALID_ARGUMENT_WITH_CS,
   INVALID_ARGUMENTS,
   NOT_CONNECTED,
   NOT_SUBSCRIBED,
@@ -14,13 +15,12 @@ import {
   MESSAGE_TYPE,
   READ_NODE_ADDRESS,
   READ_NODE_WS_ADDRESS,
-  TX_TYPE,
 } from './constants.js'
 import Message from './message.js'
 import { isJSON, toJSON } from './util.js'
 import { Options } from './websocketOptions.js'
 import { TWebSocket } from './websocket.js'
-import pkg from './package.json' with { type: 'json' }
+import { TX_TYPE, TX_TYPE_LIST } from './transaction.js'
 
 /**
  * @callback successCallback
@@ -49,7 +49,7 @@ export default class TCaBCIClient {
   _connected = false
   _chainName = 'transferchain'
   _chainVersion = 'v1'
-  _version = `v${pkg.version}`
+  _version = `v2.5.5`
   /**
    * @type {?successCallback}
    */
@@ -191,33 +191,29 @@ export default class TCaBCIClient {
    * @throws {Error}
    */
   Subscribe(addresses, signedData, txTypes = null) {
-    if (!Array.isArray(addresses)) {
-      throw new Error(INVALID_ARGUMENTS)
-    }
+    if (!Array.isArray(addresses) || addresses.length === 0)
+      throw new Error(INVALID_ARGUMENT_WITH_CS('addresses'))
 
-    if (typeof signedData !== 'object') {
-      throw new Error(INVALID_ARGUMENTS)
-    }
+    if (typeof signedData !== 'object') throw new Error(INVALID_ARGUMENTS)
 
-    if (txTypes && !Array.isArray(addresses)) {
-      throw new Error(INVALID_ARGUMENTS)
-    }
+    if (txTypes && Array.isArray(txTypes)) {
+      if (!Array.isArray(txTypes))
+        throw new Error(INVALID_ARGUMENT_WITH_CS('txTypes'))
 
-    if (txTypes && txTypes.length > Object.values(TX_TYPE).length) {
-      throw new Error(INVALID_ARGUMENTS)
-    }
+      if (txTypes.length > TX_TYPE_LIST.length)
+        throw new Error(INVALID_ARGUMENT_WITH_CS('txTypes'))
 
-    if (!this.getConnected()) {
-      throw new Error(NOT_CONNECTED)
+      for (let i = 0; i < txTypes.length; i++) {
+        if (!TX_TYPE[txTypes[i]])
+          throw new Error(INVALID_ARGUMENT_WITH_CS('txType ', txTypes[i]))
+      }
     }
 
+    if (!this.getConnected()) throw new Error(NOT_CONNECTED)
+
     let addrs = [],
       sdata = {}
 
-    if (addresses.length === 0) {
-      throw new Error(ADDRESSES_IS_EMPTY)
-    }
-
     addrs = addresses
     sdata = signedData
 
@@ -544,7 +540,7 @@ export default class TCaBCIClient {
     sync = false,
     commit = false,
   ) {
-    if (Object.values(TX_TYPE).indexOf(type) < 0) {
+    if (!TX_TYPE_LIST.includes(type)) {
       throw new Error(TRANSACTION_TYPE_NOT_VALID)
     }
 

package/client_test.js

@@ -36,6 +36,9 @@ describe('TCaBCIClient', () => {
       .catch((err) => {
         done(err)
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
 
   it('start with valid parameters and read node addresses', (done) => {
@@ -66,6 +69,9 @@ describe('TCaBCIClient', () => {
       .catch((err) => {
         done(err)
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
 
   it('reconnect with start and valid parameters', (done) => {
@@ -116,6 +122,9 @@ describe('TCaBCIClient', () => {
       .catch((err) => {
         done(err)
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
 
   it('subscribe with valid parameters', (done) => {
@@ -150,6 +159,9 @@ describe('TCaBCIClient', () => {
       .catch((err) => {
         done(err)
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
 
   it('should error subscribe with invalid tx type parameter', (done) => {
@@ -166,6 +178,7 @@ describe('TCaBCIClient', () => {
             '2mSCzresfg8Gwu7LZ9k9BTWkQAcQEkvYHFUSCZE2ubM4QV89PTeSYwQDqBas3ykq2emHEK6VRvxdgoe1vrhBbQGN',
             '2mSCzresfg8Gwu7LZ9k9BTWkQAcQEkvYHFUSCZE2ubM4QV89PTeSYwQDqBas3ykq2emHEK6VRvxdgoe1vrhBbQGU',
           ],
+          {},
           ['invalid'],
         )
 
@@ -177,6 +190,9 @@ describe('TCaBCIClient', () => {
       .catch(() => {
         done()
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
 
   it('unsubscribe with valid parameters', (done) => {
@@ -219,6 +235,9 @@ describe('TCaBCIClient', () => {
       .catch((err) => {
         done(err)
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
 
   it('last block', (done) => {
@@ -226,14 +245,17 @@ describe('TCaBCIClient', () => {
 
     client
       .LastBlock()
-      .then((data) => {
-        unitJS.value(data.blocks).hasLength(1)
-        unitJS.value(data.total_count).isGreaterThan(1)
+      .then(({ blocks, total_count }) => {
+        unitJS.array(blocks).hasLength(1)
+        unitJS.assert.equal(total_count, 1)
         done()
       })
       .catch((err) => {
         done(err)
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
 
   it('transaction search result', (done) => {
@@ -258,6 +280,9 @@ describe('TCaBCIClient', () => {
       .catch((err) => {
         done(err)
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
   //
   it('transaction summary result', (done) => {
@@ -281,6 +306,9 @@ describe('TCaBCIClient', () => {
       .catch((err) => {
         done(err)
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
 
   it('should error not broadcast transaction if type is incorrect', (done) => {
@@ -299,6 +327,8 @@ describe('TCaBCIClient', () => {
       unitJS.assert.equal(TRANSACTION_TYPE_NOT_VALID, err.message)
       done()
     }
+
+    client.Stop()
   })
 
   it('should error not broadcast transaction', (done) => {
@@ -325,6 +355,9 @@ describe('TCaBCIClient', () => {
         unitJS.assert.equal(TRANSACTION_NOT_BROADCAST, err.message)
         done()
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
 
   it('should error in bulk tx if addresses count is zero', (done) => {
@@ -339,6 +372,9 @@ describe('TCaBCIClient', () => {
         unitJS.assert.equal(400, err.response.status)
         done()
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
 
   it('should error in bulk tx if addresses count is greater than 251', (done) => {
@@ -361,5 +397,8 @@ describe('TCaBCIClient', () => {
         unitJS.assert.equal(400, err.response.status)
         done()
       })
+      .finally(() => {
+        client.Stop()
+      })
   })
 })

package/message.js

@@ -1,5 +1,6 @@
 import { INVALID_ARGUMENTS, INVALID_ARGUMENT_WITH_CS } from './errors.js'
-import { MESSAGE_TYPE, TX_TYPE } from './constants.js'
+import { MESSAGE_TYPE } from './constants.js'
+import { TX_TYPE_LIST } from './transaction.js'
 
 export default class Message {
   _is_web = false
@@ -60,15 +61,11 @@ export default class Message {
     }
 
     if (this._txTypes.length) {
-      let vals = Object.values(TX_TYPE)
-
       for (let i = 0; i < this._txTypes.length; i++) {
-        if (vals.indexOf(this._txTypes[i]) === -1) {
+        if (!TX_TYPE_LIST.includes(this._txTypes[i])) {
           throw new Error(INVALID_ARGUMENT_WITH_CS('tx_types'))
         }
       }
-
-      vals = []
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tchain/tcabci-read-js-client",
-  "version": "2.5.3",
+  "version": "2.5.5",
   "description": "TransferChain Fastest Read Network WebSocket Client",
   "main": "client.js",
   "type": "module",

package/websocketOptions.js

@@ -1,5 +1,3 @@
-import pkg from './package.json' with { type: 'json' }
-
 export const HTTPSPort = 443,
   HTTPPort = 80
 
@@ -15,7 +13,7 @@ export class Options {
   _protocols = []
   _customWS
   _endpoints = ['ws', 'longpoll']
-  _version = `v${pkg.version}`
+  _version = `v2.5.5`
 
   _maxConnectionDelay = 10000
   _minReconnectionDelay = 1000 + Math.random() * 4000