@tchain/tcabci-read-js-client 1.0.3 → 1.0.5

package/README.md

@@ -18,6 +18,9 @@ $ npm i @tchain/tcabci-read-js-client
 const tcAbciClient = require("@tchain/tcabci-read-js-client")
 
 const client = new tcAbciClient()
+// OR
+const client = new tcAbciClient(['https://read-node-01.transferchain.io',
+    'wss://read-node-01.transferchain.io/ws'])
 
 client.Start()
 

package/client.js

@@ -19,14 +19,21 @@ class TCAbciClient {
     #subscribedAddresses = []
     #connected = false
     #version = "v0.1.0"
+    #retrieverCount = 0
     errorCb = null
     listenCb = null
     #ws = null
     #httpClient = null
+    #readNodeAddress = READ_NODE_ADDRESS
+    #readNodeWSAddress = READ_NODE_WS_ADDRESS
 
-    constructor() {
+    constructor(readNodeAddresses = []) {
+        if (readNodeAddresses.length === 2) {
+            this.#readNodeAddress = readNodeAddresses[0]
+            this.#readNodeWSAddress = readNodeAddresses[1]
+        }
         this.#httpClient = axios.create({
-            baseURL: READ_NODE_ADDRESS,
+            baseURL: this.#readNodeAddress,
             timeout: 10000,
             headers: {'Client': `tcabaci-read-js-client${this.#version}`}
           })
@@ -39,26 +46,7 @@ class TCAbciClient {
         this.listenCb = cb
     }
     Start() {
-        return new Promise((resolve, reject) => {
-            if (this.#getConnected()) {
-                reject(ALREADY_CONNECTED)
-            }
-            const wsClient = this.#wsClient()
-            this.#ws = new wsClient(READ_NODE_WS_ADDRESS)
-
-            this.#ws.onerror = (event) => {
-                this.#setConnected(false)
-                if (this.errorCb) {
-                    this.errorCb(event.error)
-                }
-                reject(event)
-            }
-            this.#ws.onopen = (event) => {
-                this.#setConnected(true)
-                resolve(event)
-            }
-            this.#ws.onmessage = this.#listen
-        })
+        return this.#connect()
     }
     Stop() {
         if (!this.#getConnected()) {
@@ -160,6 +148,52 @@ class TCAbciClient {
             .catch(e => { throw TRANSACTION_NOT_BROADCAST })
     }
 
+    Disconnect(code = 1000) {
+        if (this.#getConnected()) {
+            this.#ws.close(code)
+        }
+    }
+
+    #connect() {
+        return new Promise((resolve, reject) => {
+            if (this.#getConnected()) {
+                reject(ALREADY_CONNECTED)
+            }
+            const wsClient = this.#wsClient()
+            this.#ws = new wsClient(this.#readNodeWSAddress)
+
+            this.#ws.onerror = (event) => {
+                this.#setConnected(false)
+                if (this.errorCb) {
+                    this.errorCb(event.error)
+                }
+                reject(event)
+            }
+            this.#ws.onopen = (event) => {
+                this.#setConnected(true)
+                this.#retrieverCount = 0
+                resolve(event)
+            }
+            this.#ws.onmessage = (message) => {
+                if (message.data === "OK" && message.data.length < 10) {
+                    return { status: message.data }
+                }
+                if (this.listenCb) {
+                    this.listenCb(toJSON(message.data))
+                }
+            }
+            this.#ws.onclose = (event) => {
+                this.#setConnected(false)
+                if (event.code !== 1000 && this.#retrieverCount <= 10) {
+                    this.#retrieverCount++
+                    setTimeout(() => {
+                        this.#connect().catch(() => {})
+                    }, 3000)
+                }
+            }
+        })
+    }
+
     #wsClient() {
         if (typeof window !== "undefined") {
             return window.WebSocket
@@ -167,15 +201,6 @@ class TCAbciClient {
         const { WebSocket } = require("ws")
         return WebSocket
     }
-    #listen(message) {
-        if (message.data === "OK" && message.data.length < 10) {
-            return { status: message.data }
-        }
-        const txData = toJSON(message.data)
-        if (this.listenCb) {
-            this.listenCb(new Transaction(txData).ToJSONString())
-        }
-    }
     #getConnected() {
         return this.#connected
     }

package/client_test.js

@@ -1,11 +1,25 @@
 const tcAbciClient = require("./client")
 const unitJS = require("unit.js")
-const {INVALID_ARGUMENTS, INVALID_URL, TRANSACTION_TYPE_NOT_VALID} = require("./errors")
-const { TX_TYPE } = require("./constants")
+const {INVALID_ARGUMENTS, INVALID_URL, TRANSACTION_TYPE_NOT_VALID, TRANSACTION_NOT_BROADCAST} = require("./errors")
+const { TX_TYPE, READ_NODE_ADDRESS, READ_NODE_WS_ADDRESS} = require("./constants")
 const {randomString} = require("./util")
 
 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])
+        client.Start()
+            .then(() => {
+                const { connected, subscribed } = client.Status()
+                unitJS.assert.equal(connected, true)
+                unitJS.assert.equal(subscribed, false)
+                done()
+            })
+            .catch(err => {
+                done(err)
+            })
+    })
+
     it('should start with valid parameters',(done) => {
         const client = new tcAbciClient()
         client.Start()
@@ -20,6 +34,33 @@ describe("TCAbciClient TESTS", () => {
             })
     })
 
+    it('should reconnect with start and valid parameters',(done) => {
+        const client = new tcAbciClient()
+        client.Start()
+            .then(() => {
+                const { connected, subscribed } = client.Status()
+                unitJS.assert.equal(connected, true)
+                unitJS.assert.equal(subscribed, false)
+
+                client.Disconnect(1003)
+                setTimeout(() => {
+                    const { connected: c2, subscribed: b2} = client.Status()
+                    unitJS.assert.equal(c2, false)
+                    unitJS.assert.equal(b2, false)
+
+                    setTimeout(() => {
+                        const { connected, subscribed } = client.Status()
+                        unitJS.assert.equal(connected, true)
+                        unitJS.assert.equal(subscribed, false)
+                        done()
+                    }, 3100)
+                }, 1000)
+            })
+            .catch(err => {
+                done(err)
+            })
+    })
+
     it('should subscribe with valid parameters',(done) => {
         const client = new tcAbciClient()
         client.Start()
@@ -121,7 +162,8 @@ describe("TCAbciClient TESTS", () => {
                 done()
             })
             .catch(err => {
-                done(err)
+                unitJS.assert.equal(TRANSACTION_NOT_BROADCAST, err)
+                done()
             })
     })
 

package/package.json

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