@exodus/solana-api 2.5.18 → 2.5.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-api",
-  "version": "2.5.18",
+  "version": "2.5.19",
   "description": "Exodus internal Solana asset API wrapper",
   "main": "src/index.js",
   "files": [
@@ -34,5 +34,5 @@
   "devDependencies": {
     "@exodus/assets-testing": "file:../../../__testing__"
   },
-  "gitHead": "1210a44d1b6a8fc0375589f7e2439aa3fd0f6b01"
+  "gitHead": "90e76fd28a32060fd779a487dab6bbaf4d19208f"
 }

package/src/api.js

@@ -189,7 +189,7 @@ export class Api {
       // get txs details in parallel
       const txsDetails = await Promise.all(txsId.map((tx) => this.getTransactionById(tx.signature)))
       txsDetails.forEach((txDetail) => {
-        if (txDetail === null) return
+        if (!txDetail) return
 
         const timestamp = txDetail.blockTime * 1000
         const parsedTx = this.parseTransaction(address, txDetail, tokenAccountsByOwner, {

package/src/connection.js

@@ -3,6 +3,7 @@ import delay from 'delay'
 import lodash from 'lodash'
 import debugLogger from 'debug'
 import { WebSocket } from '@exodus/fetch'
+import makeConcurrent from 'make-concurrent'
 
 // WS subscriptions: https://docs.solana.com/developing/clients/jsonrpc-api#subscription-websocket
 
@@ -37,6 +38,26 @@ export class Connection {
     this.pingTimeout = null
     this.reconnectTimeout = null
     this.txCache = {}
+
+    this.sendMessage = makeConcurrent(
+      async (method, params = []) => {
+        return new Promise((resolve, reject) => {
+          if (this.isClosed || this.shutdown) return reject(new Error('connection not started'))
+          const id = Math.floor(Math.random() * 1e7) + 1
+
+          this.rpcQueue[id] = { resolve, reject }
+          this.rpcQueue[id].timeout = setTimeout(() => {
+            delete this.rpcQueue[id]
+            console.log(`solana ws: reply timeout (${method}) - ${JSON.stringify(params)} - ${id}`)
+            resolve(null)
+          }, TIMEOUT)
+          if (typeof this.rpcQueue[id].timeout.unref === 'function')
+            this.rpcQueue[id].timeout.unref()
+          this.ws.send(JSON.stringify({ jsonrpc: '2.0', method, params, id }))
+        })
+      },
+      { concurrency: 15 }
+    )
   }
 
   newSocket(reqUrl) {
@@ -174,22 +195,6 @@ export class Connection {
     }
   }
 
-  async sendMessage(method, params = []) {
-    return new Promise((resolve, reject) => {
-      if (this.isClosed || this.shutdown) return reject(new Error('connection not started'))
-      const id = Math.floor(Math.random() * 1e7) + 1
-
-      this.rpcQueue[id] = { resolve, reject }
-      this.rpcQueue[id].timeout = setTimeout(() => {
-        delete this.rpcQueue[id]
-        debug(`ws timeout command: ${method} - ${JSON.stringify(params)} - ${id}`)
-        reject(new Error('solana ws: reply timeout'))
-      }, TIMEOUT)
-      if (typeof this.rpcQueue[id].timeout.unref === 'function') this.rpcQueue[id].timeout.unref()
-      this.ws.send(JSON.stringify({ jsonrpc: '2.0', method, params, id }))
-    })
-  }
-
   async processMessages() {
     if (this.inProcessMessages) return null
     this.inProcessMessages = true