@chainflip/rpc 2.1.3 → 2.1.5

package/dist/Client.cjs

@@ -1,5 +1,6 @@
 const require_common = require('./common.cjs');
 let _chainflip_utils_async = require("@chainflip/utils/async");
+let timers_promises = require("timers/promises");
 
 //#region src/Client.ts
 var Client = class {
@@ -7,10 +8,12 @@ var Client = class {
 	timer = null;
 	requestMap = /* @__PURE__ */ new Map();
 	archiveNodeUrl;
+	retryOnHeaderNotFound;
 	eventTarget = new EventTarget();
 	constructor(url, opts = {}) {
 		this.url = url;
 		this.archiveNodeUrl = opts.archiveNodeUrl;
+		this.retryOnHeaderNotFound = opts.retryOnHeaderNotFound ?? false;
 	}
 	getRequestId() {
 		try {
@@ -54,7 +57,7 @@ var Client = class {
 			item.deferred.reject(/* @__PURE__ */ new Error("Could not find the result for the request"));
 		});
 	}
-	sendRequest(method, ...params) {
+	enqueueRequest(method, params) {
 		if (!require_common.rpcResult[method]) return Promise.reject(/* @__PURE__ */ new Error(`Unknown method: ${method}`));
 		const deferred = (0, _chainflip_utils_async.deferredPromise)();
 		const body = this.formatRequest(method, params);
@@ -67,19 +70,36 @@ var Client = class {
 			this.timer = null;
 			this.handleBatch();
 		}, 0);
-		return deferred.promise.catch((error) => {
-			if (error instanceof Error) {
-				if (this.archiveNodeUrl && error.message.includes("Unknown block: State already discarded")) {
-					this.eventTarget.dispatchEvent(new CustomEvent("archiveNodeFallback", { detail: {
-						method,
-						params
-					} }));
-					return new this.constructor(this.archiveNodeUrl).sendRequest(method, ...params);
-				}
-				Error.captureStackTrace(error);
+		return deferred.promise;
+	}
+	async sendRequest(method, ...params) {
+		const retries = this.retryOnHeaderNotFound ? 5 : 0;
+		let lastError;
+		for (let i = 0; i <= retries; i += 1) {
+			const result = await this.enqueueRequest(method, params).then((value) => ({
+				ok: true,
+				value
+			}), (error) => ({
+				ok: false,
+				error
+			}));
+			if (result.ok) return result.value;
+			lastError = result.error;
+			if (i < retries && lastError.message.includes("Unknown block: Header was not found in the database")) {
+				await (0, timers_promises.setTimeout)(6e3);
+				continue;
 			}
-			throw error;
-		});
+			break;
+		}
+		if (this.archiveNodeUrl && lastError.message.includes("Unknown block: State already discarded")) {
+			this.eventTarget.dispatchEvent(new CustomEvent("archiveNodeFallback", { detail: {
+				method,
+				params
+			} }));
+			return new this.constructor(this.archiveNodeUrl).sendRequest(method, ...params);
+		}
+		if (lastError instanceof Error) Error.captureStackTrace(lastError);
+		throw lastError;
 	}
 	methods() {
 		return Object.keys(require_common.rpcResult).sort();

package/dist/Client.d.cts

@@ -18,6 +18,7 @@ type RequestMap = Map<string, {
 }>;
 type ClientOpts = {
   archiveNodeUrl?: string;
+  retryOnHeaderNotFound?: boolean;
 };
 declare abstract class Client {
   protected readonly url: string;
@@ -25,6 +26,7 @@ declare abstract class Client {
   private timer;
   private requestMap;
   private readonly archiveNodeUrl?;
+  private readonly retryOnHeaderNotFound;
   readonly eventTarget: EventTarget;
   constructor(url: string, opts?: ClientOpts);
   protected abstract send<const T extends RpcMethod>(data: JsonRpcRequest<T>[], clonedMap: RequestMap): Promise<void>;
@@ -33,6 +35,7 @@ declare abstract class Client {
   protected handleResponse(response: Response, clonedMap: RequestMap): void;
   protected handleErrorResponse(error: Error, clonedMap: RequestMap): void;
   private handleBatch;
+  private enqueueRequest;
   sendRequest<const T extends RpcMethod>(method: T, ...params: RpcRequest[T]): Promise<RpcResult<T>>;
   methods(): RpcMethod[];
 }

package/dist/Client.d.mts

@@ -18,6 +18,7 @@ type RequestMap = Map<string, {
 }>;
 type ClientOpts = {
   archiveNodeUrl?: string;
+  retryOnHeaderNotFound?: boolean;
 };
 declare abstract class Client {
   protected readonly url: string;
@@ -25,6 +26,7 @@ declare abstract class Client {
   private timer;
   private requestMap;
   private readonly archiveNodeUrl?;
+  private readonly retryOnHeaderNotFound;
   readonly eventTarget: EventTarget;
   constructor(url: string, opts?: ClientOpts);
   protected abstract send<const T extends RpcMethod>(data: JsonRpcRequest<T>[], clonedMap: RequestMap): Promise<void>;
@@ -33,6 +35,7 @@ declare abstract class Client {
   protected handleResponse(response: Response, clonedMap: RequestMap): void;
   protected handleErrorResponse(error: Error, clonedMap: RequestMap): void;
   private handleBatch;
+  private enqueueRequest;
   sendRequest<const T extends RpcMethod>(method: T, ...params: RpcRequest[T]): Promise<RpcResult<T>>;
   methods(): RpcMethod[];
 }

package/dist/Client.mjs

@@ -1,5 +1,6 @@
 import { rpcResult } from "./common.mjs";
 import { deferredPromise } from "@chainflip/utils/async";
+import { setTimeout as setTimeout$1 } from "timers/promises";
 
 //#region src/Client.ts
 var Client = class {
@@ -7,10 +8,12 @@ var Client = class {
 	timer = null;
 	requestMap = /* @__PURE__ */ new Map();
 	archiveNodeUrl;
+	retryOnHeaderNotFound;
 	eventTarget = new EventTarget();
 	constructor(url, opts = {}) {
 		this.url = url;
 		this.archiveNodeUrl = opts.archiveNodeUrl;
+		this.retryOnHeaderNotFound = opts.retryOnHeaderNotFound ?? false;
 	}
 	getRequestId() {
 		try {
@@ -54,7 +57,7 @@ var Client = class {
 			item.deferred.reject(/* @__PURE__ */ new Error("Could not find the result for the request"));
 		});
 	}
-	sendRequest(method, ...params) {
+	enqueueRequest(method, params) {
 		if (!rpcResult[method]) return Promise.reject(/* @__PURE__ */ new Error(`Unknown method: ${method}`));
 		const deferred = deferredPromise();
 		const body = this.formatRequest(method, params);
@@ -67,19 +70,36 @@ var Client = class {
 			this.timer = null;
 			this.handleBatch();
 		}, 0);
-		return deferred.promise.catch((error) => {
-			if (error instanceof Error) {
-				if (this.archiveNodeUrl && error.message.includes("Unknown block: State already discarded")) {
-					this.eventTarget.dispatchEvent(new CustomEvent("archiveNodeFallback", { detail: {
-						method,
-						params
-					} }));
-					return new this.constructor(this.archiveNodeUrl).sendRequest(method, ...params);
-				}
-				Error.captureStackTrace(error);
+		return deferred.promise;
+	}
+	async sendRequest(method, ...params) {
+		const retries = this.retryOnHeaderNotFound ? 5 : 0;
+		let lastError;
+		for (let i = 0; i <= retries; i += 1) {
+			const result = await this.enqueueRequest(method, params).then((value) => ({
+				ok: true,
+				value
+			}), (error) => ({
+				ok: false,
+				error
+			}));
+			if (result.ok) return result.value;
+			lastError = result.error;
+			if (i < retries && lastError.message.includes("Unknown block: Header was not found in the database")) {
+				await setTimeout$1(6e3);
+				continue;
 			}
-			throw error;
-		});
+			break;
+		}
+		if (this.archiveNodeUrl && lastError.message.includes("Unknown block: State already discarded")) {
+			this.eventTarget.dispatchEvent(new CustomEvent("archiveNodeFallback", { detail: {
+				method,
+				params
+			} }));
+			return new this.constructor(this.archiveNodeUrl).sendRequest(method, ...params);
+		}
+		if (lastError instanceof Error) Error.captureStackTrace(lastError);
+		throw lastError;
 	}
 	methods() {
 		return Object.keys(rpcResult).sort();

package/dist/common.cjs

@@ -50,7 +50,8 @@ const rpcResult = {
 	cf_lending_config: require_parsers.cfLendingConfig,
 	cf_loan_accounts: require_parsers.cfLoanAccounts,
 	cf_lending_pool_supply_balances: require_parsers.cfLendingPoolSupplyBalances,
-	cf_get_vault_addresses: require_parsers.cfVaultAddresses
+	cf_get_vault_addresses: require_parsers.cfVaultAddresses,
+	cf_ingress_egress_events: require_parsers.cfIngressEgressEvents
 };
 
 //#endregion