@gearbox-protocol/sdk 9.1.6 → 9.1.8

package/dist/cjs/dev/RevolverTransport.js

@@ -34,6 +34,7 @@ class RevolverTransport {
   #index = 0;
   #config;
   #rotating = false;
+  #requests = /* @__PURE__ */ new WeakMap();
   overrides;
   /**
    * Create a new RevolverTransport
@@ -90,7 +91,7 @@ class RevolverTransport {
   get value() {
     return {
       rotate: (reason) => this.rotate(reason),
-      currentTransportName: this.currentTransportName
+      currentTransportName: () => this.currentTransportName()
     };
   }
   request = async (r) => {
@@ -99,16 +100,25 @@ class RevolverTransport {
     }
     do {
       try {
+        this.#requests.set(r, this.currentTransportName);
         const resp = await this.#transport({ ...this.overrides }).request(r);
+        this.#requests.delete(r);
         return resp;
       } catch (e) {
         if (e instanceof import_viem.RpcError || e instanceof import_viem.HttpRequestError) {
-          await this.rotate(e);
+          const reqTransport = this.#requests.get(r);
+          if (reqTransport === this.currentTransportName) {
+            await this.rotate(e);
+          } else {
+            this.#logger?.debug("request made with old transport, try again");
+          }
         } else {
+          this.#requests.delete(r);
           throw e;
         }
       }
     } while (this.#hasAvailableTransports);
+    this.#requests.delete(r);
     throw new NoAvailableTransportsError();
   };
   get config() {
@@ -146,7 +156,7 @@ class RevolverTransport {
       },
       "rotating transport"
     );
-    const oldTransportName = this.currentTransportName;
+    const oldTransportName = this.currentTransportName();
     const now = Date.now();
     this.#transports[this.#index].cooldown = now + (this.#config.cooldown ?? 6e4);
     for (let i = 0; i < this.#transports.length - 1; i++) {
@@ -163,7 +173,7 @@ class RevolverTransport {
         try {
           await this.#config.onRotateSuccess?.(
             oldTransportName,
-            this.currentTransportName,
+            this.currentTransportName(),
             reason
           );
         } catch {
@@ -188,7 +198,7 @@ class RevolverTransport {
     this.#rotating = false;
     return false;
   }
-  get currentTransportName() {
+  currentTransportName() {
     return this.#transport({}).config.name;
   }
   get #logger() {

package/dist/esm/dev/RevolverTransport.js

@@ -17,6 +17,7 @@ class RevolverTransport {
   #index = 0;
   #config;
   #rotating = false;
+  #requests = /* @__PURE__ */ new WeakMap();
   overrides;
   /**
    * Create a new RevolverTransport
@@ -73,7 +74,7 @@ class RevolverTransport {
   get value() {
     return {
       rotate: (reason) => this.rotate(reason),
-      currentTransportName: this.currentTransportName
+      currentTransportName: () => this.currentTransportName()
     };
   }
   request = async (r) => {
@@ -82,16 +83,25 @@ class RevolverTransport {
     }
     do {
       try {
+        this.#requests.set(r, this.currentTransportName);
         const resp = await this.#transport({ ...this.overrides }).request(r);
+        this.#requests.delete(r);
         return resp;
       } catch (e) {
         if (e instanceof RpcError || e instanceof HttpRequestError) {
-          await this.rotate(e);
+          const reqTransport = this.#requests.get(r);
+          if (reqTransport === this.currentTransportName) {
+            await this.rotate(e);
+          } else {
+            this.#logger?.debug("request made with old transport, try again");
+          }
         } else {
+          this.#requests.delete(r);
           throw e;
         }
       }
     } while (this.#hasAvailableTransports);
+    this.#requests.delete(r);
     throw new NoAvailableTransportsError();
   };
   get config() {
@@ -129,7 +139,7 @@ class RevolverTransport {
       },
       "rotating transport"
     );
-    const oldTransportName = this.currentTransportName;
+    const oldTransportName = this.currentTransportName();
     const now = Date.now();
     this.#transports[this.#index].cooldown = now + (this.#config.cooldown ?? 6e4);
     for (let i = 0; i < this.#transports.length - 1; i++) {
@@ -146,7 +156,7 @@ class RevolverTransport {
         try {
           await this.#config.onRotateSuccess?.(
             oldTransportName,
-            this.currentTransportName,
+            this.currentTransportName(),
             reason
           );
         } catch {
@@ -171,7 +181,7 @@ class RevolverTransport {
     this.#rotating = false;
     return false;
   }
-  get currentTransportName() {
+  currentTransportName() {
     return this.#transport({}).config.name;
   }
   get #logger() {

package/dist/types/dev/RevolverTransport.d.ts

@@ -50,9 +50,9 @@ export interface RevolverTransportValue {
      */
     rotate: (reason?: BaseError) => Promise<boolean>;
     /**
-     * The name of the current transport
+     * Returns the name of the current transport
      */
-    currentTransportName: string;
+    currentTransportName: () => string;
 }
 export declare class RevolverTransport implements ReturnType<Transport<"revolver", RevolverTransportValue>> {
     #private;
@@ -76,6 +76,6 @@ export declare class RevolverTransport implements ReturnType<Transport<"revolver
      * @returns true if rotation was successful
      */
     rotate(reason?: BaseError): Promise<boolean>;
-    get currentTransportName(): string;
+    currentTransportName(): string;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "9.1.6",
+  "version": "9.1.8",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",