@orbinum/sdk 0.13.0 → 0.14.1

package/dist/index.js

@@ -172,18 +172,10 @@ var DEFAULT_MAX_RETRIES = 5;
 var DEFAULT_BASE_BACKOFF_MS = 250;
 var DEFAULT_MAX_BACKOFF_MS = 4e3;
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-async function jsonRpcBatch(httpUrl, calls, options = {}) {
-  if (calls.length === 0) return [];
+async function postJsonWithRetry(httpUrl, payload, options = {}) {
   const maxRetries = options.maxRetries ?? DEFAULT_MAX_RETRIES;
   const baseBackoffMs = options.baseBackoffMs ?? DEFAULT_BASE_BACKOFF_MS;
   const maxBackoffMs = options.maxBackoffMs ?? DEFAULT_MAX_BACKOFF_MS;
-  const body = calls.map((c, i) => ({
-    id: i,
-    jsonrpc: "2.0",
-    method: c.method,
-    params: c.params ?? []
-  }));
-  const payload = JSON.stringify(body);
   let attempt = 0;
   for (; ; ) {
     const res = await fetch(httpUrl, {
@@ -191,21 +183,28 @@ async function jsonRpcBatch(httpUrl, calls, options = {}) {
       headers: { "Content-Type": "application/json" },
       body: payload
     });
-    if (res.ok) {
-      const arr = await res.json();
-      const byId = new Map(arr.map((r) => [r.id, r]));
-      return calls.map((_, i) => byId.get(i)?.result ?? null);
-    }
     const retryable = res.status === 429 || res.status === 503;
-    if (!retryable || attempt >= maxRetries) {
-      throw new Error(`JSON-RPC HTTP ${res.status}: ${res.statusText}`);
-    }
+    if (!retryable || attempt >= maxRetries) return res;
     const retryAfter = Number(res.headers.get("retry-after"));
     const delayMs = Number.isFinite(retryAfter) && retryAfter > 0 ? retryAfter * 1e3 : Math.min(baseBackoffMs * 2 ** attempt, maxBackoffMs);
     await sleep(delayMs);
     attempt++;
   }
 }
+async function jsonRpcBatch(httpUrl, calls, options = {}) {
+  if (calls.length === 0) return [];
+  const body = calls.map((c, i) => ({
+    id: i,
+    jsonrpc: "2.0",
+    method: c.method,
+    params: c.params ?? []
+  }));
+  const res = await postJsonWithRetry(httpUrl, JSON.stringify(body), options);
+  if (!res.ok) throw new Error(`JSON-RPC HTTP ${res.status}: ${res.statusText}`);
+  const arr = await res.json();
+  const byId = new Map(arr.map((r) => [r.id, r]));
+  return calls.map((_, i) => byId.get(i)?.result ?? null);
+}
 function wsUrlToHttp(wsUrl) {
   if (wsUrl.startsWith("wss://")) return "https://" + wsUrl.slice("wss://".length);
   if (wsUrl.startsWith("ws://")) return "http://" + wsUrl.slice("ws://".length);
@@ -227,17 +226,28 @@ var SubstrateClient = class _SubstrateClient {
    * Throws if the node does not respond within `timeoutMs`.
    */
   static async connect(wsUrl, timeoutMs = 15e3) {
-    const provider = (0, import_ws.getWsProvider)(wsUrl);
+    const provider = (0, import_ws.getWsProvider)(wsUrl, { heartbeatTimeout: 3e4 });
     const papi = (0, import_polkadot_api.createClient)(provider);
-    await Promise.race([
-      papi._request("system_name", []),
-      new Promise(
-        (_, reject) => setTimeout(
-          () => reject(new Error(`Connection timeout (${timeoutMs}ms) to ${wsUrl}`)),
-          timeoutMs
-        )
-      )
-    ]);
+    let timer;
+    try {
+      await Promise.race([
+        papi._request("system_name", []),
+        new Promise((_, reject) => {
+          timer = setTimeout(
+            () => reject(new Error(`Connection timeout (${timeoutMs}ms) to ${wsUrl}`)),
+            timeoutMs
+          );
+        })
+      ]);
+    } catch (err) {
+      try {
+        papi.destroy();
+      } catch {
+      }
+      throw err;
+    } finally {
+      clearTimeout(timer);
+    }
     return new _SubstrateClient(papi, wsUrlToHttp(wsUrl));
   }
   /**
@@ -612,11 +622,10 @@ var EvmClient = class {
    * Throws on HTTP errors, RPC-level errors, or a `null` result.
    */
   async request(method, params = []) {
-    const res = await fetch(this.rpcUrl, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ id: 1, jsonrpc: "2.0", method, params })
-    });
+    const res = await postJsonWithRetry(
+      this.rpcUrl,
+      JSON.stringify({ id: 1, jsonrpc: "2.0", method, params })
+    );
     if (!res.ok) throw new Error(`EVM HTTP ${res.status}: ${res.statusText}`);
     const json = await res.json();
     if (json.error) {
@@ -638,11 +647,7 @@ var EvmClient = class {
       method: c.method,
       params: c.params ?? []
     }));
-    const res = await fetch(this.rpcUrl, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body)
-    });
+    const res = await postJsonWithRetry(this.rpcUrl, JSON.stringify(body));
     if (!res.ok) throw new Error(`EVM HTTP ${res.status}: ${res.statusText}`);
     const arr = await res.json();
     arr.sort((a, b) => (a.id ?? 0) - (b.id ?? 0));
@@ -691,16 +696,15 @@ var EvmClient = class {
   }
   /** Returns a transaction receipt by hash, or `null` if the transaction has not been mined yet. */
   async getTransactionReceipt(txHash) {
-    const res = await fetch(this.rpcUrl, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
+    const res = await postJsonWithRetry(
+      this.rpcUrl,
+      JSON.stringify({
         id: 1,
         jsonrpc: "2.0",
         method: "eth_getTransactionReceipt",
         params: [txHash]
       })
-    });
+    );
     if (!res.ok) throw new Error(`EVM HTTP ${res.status}: ${res.statusText}`);
     const json = await res.json();
     if (json.error) {
@@ -3416,14 +3420,16 @@ var OrbinumClientProvider = class {
         this.connectTimeoutMs
       );
     });
+    let clientPromise = null;
     try {
       const connectConfig = {
-        substrateWs: this.config.substrateWs
+        substrateWs: this.config.substrateWs,
+        connectTimeoutMs: this.connectTimeoutMs
       };
       if (this.config.evmRpc) connectConfig.evmRpc = this.config.evmRpc;
       if (this.config.circuitsBaseUrl)
         connectConfig.circuitsBaseUrl = this.config.circuitsBaseUrl;
-      const clientPromise = OrbinumClient.connect(connectConfig);
+      clientPromise = OrbinumClient.connect(connectConfig);
       const client = await Promise.race([clientPromise, timeoutPromise]);
       orphanClient = client;
       clearTimeout(timeoutId);
@@ -3441,6 +3447,17 @@ var OrbinumClientProvider = class {
           orphanClient.destroy();
         } catch {
         }
+      } else if (clientPromise) {
+        clientPromise.then(
+          (c) => {
+            try {
+              c.destroy();
+            } catch {
+            }
+          },
+          () => {
+          }
+        );
       }
       this._connectingPromise = null;
       this.setStatus(

package/dist/index.mjs

@@ -41,18 +41,10 @@ var DEFAULT_MAX_RETRIES = 5;
 var DEFAULT_BASE_BACKOFF_MS = 250;
 var DEFAULT_MAX_BACKOFF_MS = 4e3;
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-async function jsonRpcBatch(httpUrl, calls, options = {}) {
-  if (calls.length === 0) return [];
+async function postJsonWithRetry(httpUrl, payload, options = {}) {
   const maxRetries = options.maxRetries ?? DEFAULT_MAX_RETRIES;
   const baseBackoffMs = options.baseBackoffMs ?? DEFAULT_BASE_BACKOFF_MS;
   const maxBackoffMs = options.maxBackoffMs ?? DEFAULT_MAX_BACKOFF_MS;
-  const body = calls.map((c, i) => ({
-    id: i,
-    jsonrpc: "2.0",
-    method: c.method,
-    params: c.params ?? []
-  }));
-  const payload = JSON.stringify(body);
   let attempt = 0;
   for (; ; ) {
     const res = await fetch(httpUrl, {
@@ -60,21 +52,28 @@ async function jsonRpcBatch(httpUrl, calls, options = {}) {
       headers: { "Content-Type": "application/json" },
       body: payload
     });
-    if (res.ok) {
-      const arr = await res.json();
-      const byId = new Map(arr.map((r) => [r.id, r]));
-      return calls.map((_, i) => byId.get(i)?.result ?? null);
-    }
     const retryable = res.status === 429 || res.status === 503;
-    if (!retryable || attempt >= maxRetries) {
-      throw new Error(`JSON-RPC HTTP ${res.status}: ${res.statusText}`);
-    }
+    if (!retryable || attempt >= maxRetries) return res;
     const retryAfter = Number(res.headers.get("retry-after"));
     const delayMs = Number.isFinite(retryAfter) && retryAfter > 0 ? retryAfter * 1e3 : Math.min(baseBackoffMs * 2 ** attempt, maxBackoffMs);
     await sleep(delayMs);
     attempt++;
   }
 }
+async function jsonRpcBatch(httpUrl, calls, options = {}) {
+  if (calls.length === 0) return [];
+  const body = calls.map((c, i) => ({
+    id: i,
+    jsonrpc: "2.0",
+    method: c.method,
+    params: c.params ?? []
+  }));
+  const res = await postJsonWithRetry(httpUrl, JSON.stringify(body), options);
+  if (!res.ok) throw new Error(`JSON-RPC HTTP ${res.status}: ${res.statusText}`);
+  const arr = await res.json();
+  const byId = new Map(arr.map((r) => [r.id, r]));
+  return calls.map((_, i) => byId.get(i)?.result ?? null);
+}
 function wsUrlToHttp(wsUrl) {
   if (wsUrl.startsWith("wss://")) return "https://" + wsUrl.slice("wss://".length);
   if (wsUrl.startsWith("ws://")) return "http://" + wsUrl.slice("ws://".length);
@@ -96,17 +95,28 @@ var SubstrateClient = class _SubstrateClient {
    * Throws if the node does not respond within `timeoutMs`.
    */
   static async connect(wsUrl, timeoutMs = 15e3) {
-    const provider = getWsProvider(wsUrl);
+    const provider = getWsProvider(wsUrl, { heartbeatTimeout: 3e4 });
     const papi = createClient(provider);
-    await Promise.race([
-      papi._request("system_name", []),
-      new Promise(
-        (_, reject) => setTimeout(
-          () => reject(new Error(`Connection timeout (${timeoutMs}ms) to ${wsUrl}`)),
-          timeoutMs
-        )
-      )
-    ]);
+    let timer;
+    try {
+      await Promise.race([
+        papi._request("system_name", []),
+        new Promise((_, reject) => {
+          timer = setTimeout(
+            () => reject(new Error(`Connection timeout (${timeoutMs}ms) to ${wsUrl}`)),
+            timeoutMs
+          );
+        })
+      ]);
+    } catch (err) {
+      try {
+        papi.destroy();
+      } catch {
+      }
+      throw err;
+    } finally {
+      clearTimeout(timer);
+    }
     return new _SubstrateClient(papi, wsUrlToHttp(wsUrl));
   }
   /**
@@ -481,11 +491,10 @@ var EvmClient = class {
    * Throws on HTTP errors, RPC-level errors, or a `null` result.
    */
   async request(method, params = []) {
-    const res = await fetch(this.rpcUrl, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ id: 1, jsonrpc: "2.0", method, params })
-    });
+    const res = await postJsonWithRetry(
+      this.rpcUrl,
+      JSON.stringify({ id: 1, jsonrpc: "2.0", method, params })
+    );
     if (!res.ok) throw new Error(`EVM HTTP ${res.status}: ${res.statusText}`);
     const json = await res.json();
     if (json.error) {
@@ -507,11 +516,7 @@ var EvmClient = class {
       method: c.method,
       params: c.params ?? []
     }));
-    const res = await fetch(this.rpcUrl, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body)
-    });
+    const res = await postJsonWithRetry(this.rpcUrl, JSON.stringify(body));
     if (!res.ok) throw new Error(`EVM HTTP ${res.status}: ${res.statusText}`);
     const arr = await res.json();
     arr.sort((a, b) => (a.id ?? 0) - (b.id ?? 0));
@@ -560,16 +565,15 @@ var EvmClient = class {
   }
   /** Returns a transaction receipt by hash, or `null` if the transaction has not been mined yet. */
   async getTransactionReceipt(txHash) {
-    const res = await fetch(this.rpcUrl, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
+    const res = await postJsonWithRetry(
+      this.rpcUrl,
+      JSON.stringify({
         id: 1,
         jsonrpc: "2.0",
         method: "eth_getTransactionReceipt",
         params: [txHash]
       })
-    });
+    );
     if (!res.ok) throw new Error(`EVM HTTP ${res.status}: ${res.statusText}`);
     const json = await res.json();
     if (json.error) {
@@ -3288,14 +3292,16 @@ var OrbinumClientProvider = class {
         this.connectTimeoutMs
       );
     });
+    let clientPromise = null;
     try {
       const connectConfig = {
-        substrateWs: this.config.substrateWs
+        substrateWs: this.config.substrateWs,
+        connectTimeoutMs: this.connectTimeoutMs
       };
       if (this.config.evmRpc) connectConfig.evmRpc = this.config.evmRpc;
       if (this.config.circuitsBaseUrl)
         connectConfig.circuitsBaseUrl = this.config.circuitsBaseUrl;
-      const clientPromise = OrbinumClient.connect(connectConfig);
+      clientPromise = OrbinumClient.connect(connectConfig);
       const client = await Promise.race([clientPromise, timeoutPromise]);
       orphanClient = client;
       clearTimeout(timeoutId);
@@ -3313,6 +3319,17 @@ var OrbinumClientProvider = class {
           orphanClient.destroy();
         } catch {
         }
+      } else if (clientPromise) {
+        clientPromise.then(
+          (c) => {
+            try {
+              c.destroy();
+            } catch {
+            }
+          },
+          () => {
+          }
+        );
       }
       this._connectingPromise = null;
       this.setStatus(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbinum/sdk",
-  "version": "0.13.0",
+  "version": "0.14.1",
   "description": "Official TypeScript SDK for Orbinum.",
   "author": "Orbinum",
   "license": "MIT",