quick rpc

helix-bridge · Aug 1, 2024 · 1f6344f · 1f6344f
1 parent 63af2cf
commit 1f6344f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/template/ts/files/package.json b/template/ts/files/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@helixbridge/helixconf",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "Helix conf",
   "main": "dist/src/index.js",
   "publishConfig": {

diff --git a/template/ts/files/src/helixconf.ts b/template/ts/files/src/helixconf.ts
@@ -58,10 +58,16 @@ export interface PickRPCOptions {
   picker?: (rpcs: string[]) => Promise<string>,
 }
 
+export interface PickRPCOptionsSync {
+  strategy: PickRPCStrategy,
+  picker?: (rpcs: string[]) => string,
+}
+
 export enum PickRPCStrategy {
   Custom,
   First,
   Best,
+  Random,
 }
 
 export interface HelixChainConfType {
@@ -119,6 +125,10 @@ export class HelixChainConf {
     return this._data.couples;
   }
 
+  get rpc(): string {
+    return this.pickRpcSync();
+  }
+
   get<K extends keyof HelixChainConfType>(key: K): HelixChainConfType[K] {
     return this._data[key];
   }
@@ -127,26 +137,37 @@ export class HelixChainConf {
   //   this._data[key] = value;
   // }
 
-  rpc(): string {
-    return this.rpcs[0];
-  }
-
-  async pickRpc(options?: PickRPCOptions): Promise<string> {
+  pickRpcSync(options?: PickRPCOptionsSync): string {
     const strategy = options?.strategy ?? PickRPCStrategy.First;
     switch (strategy) {
       case PickRPCStrategy.Custom: {
         if (!(options?.picker)) {
           return this.rpcs[0];
         }
-        return await options.picker(this.rpcs);
+        return options.picker(this.rpcs);
       }
+      case PickRPCStrategy.Random: {
+        const len = this.rpcs.length;
+        return this.rpcs[Math.floor(Math.random() * len)];
+      }
+      case PickRPCStrategy.Best: // todo: pick best rpc url, maybe check latency
       case PickRPCStrategy.First:
-      case PickRPCStrategy.Best:
       default:
         return this.rpcs[0];
     }
   }
 
+  async pickRpc(options?: PickRPCOptions): Promise<string> {
+    const strategy = options?.strategy ?? PickRPCStrategy.First;
+    if (strategy === PickRPCStrategy.Custom) {
+      if (!(options?.picker)) {
+        return this.rpcs[0];
+      }
+      return await options.picker(this.rpcs);
+    }
+    return this.pickRpcSync({strategy: strategy});
+  }
+
   keys(): Array<keyof HelixChainConfType> {
     return Object.keys(this._data) as Array<keyof HelixChainConfType>;
   }