[release] @subql/[email protected]

* feat: simplely add http version score * try update http version logic * style: remove debug * [release] @subql/[email protected] --------- Co-authored-by: Jacob <[email protected]>
subquery · May 16, 2024 · 6a6817b · 6a6817b
1 parent d52a18f
commit 6a6817b
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 36 deletions.
diff --git a/packages/network-support/CHANGELOG.md b/packages/network-support/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.5] 2024-05-16
+
 ## [1.2.4] 2024-05-13
 
 ## [1.2.3] 2024-05-12
@@ -35,7 +37,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - It's a internal library.
 
-[unreleased]: https://github.com/subquery/network-support/compare/v1.2.4...HEAD
+[unreleased]: https://github.com/subquery/network-support/compare/v1.2.5...HEAD
+[1.2.5]: https://github.com/subquery/network-support/releases/tag/v1.2.5
 [1.2.4]: https://github.com/subquery/network-support/releases/tag/v1.2.4
 [1.2.3]: https://github.com/subquery/network-support/releases/tag/v1.2.3
 [1.2.2]: https://github.com/subquery/network-support/releases/tag/v1.2.2

diff --git a/packages/network-support/package.json b/packages/network-support/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@subql/network-support",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "main": "dist/index.js",
   "author": "SubQuery Pte Limited",
   "license": "Apache-2.0",

diff --git a/packages/network-support/src/fetch.ts b/packages/network-support/src/fetch.ts
@@ -64,6 +64,8 @@ export function createFetch(
         }
       }
       const { url, headers, type, runner, channelId } = requestParams;
+      let httpVersion = 1;
+
       try {
         const _res = await customFetch(
           url,
@@ -77,6 +79,9 @@ export function createFetch(
           },
           overrideFetch
         );
+
+        httpVersion = Number(_res.headers.get('httpVersion')) || 1;
+
         let res: object;
         if (type === OrderType.flexPlan) {
           [res] = orderManager.extractChannelState(
@@ -97,7 +102,7 @@ export function createFetch(
           res = await _res.json();
         }
 
-        orderManager.updateScore(runner, ScoreType.SUCCESS);
+        orderManager.updateScore(runner, ScoreType.SUCCESS, httpVersion);
 
         return {
           status: _res.status,

diff --git a/packages/network-support/src/orderManager.ts b/packages/network-support/src/orderManager.ts
@@ -351,7 +351,7 @@ export class OrderManager {
 
   private async selectRunner(orders: Order[]): Promise<Order | undefined> {
     if (!orders.length) return;
-    const scores = await Promise.all(orders.map((o) => this.scoreManager.getScore(o.indexer)));
+    const scores = await Promise.all(orders.map((o) => this.scoreManager.getBonusScore(o.indexer)));
     const random = Math.random() * scores.reduce((a, b) => a + b, 0);
     this.logger?.debug(`selectRunner: indexers: ${orders.map((o) => o.indexer)}`);
     this.logger?.debug(`selectRunner: scores: ${scores}`);
@@ -405,8 +405,8 @@ export class OrderManager {
     return this.scoreManager.getScore(runner);
   }
 
-  async updateScore(runner: string, errorType: ScoreType) {
-    await this.scoreManager.updateScore(runner, errorType);
+  async updateScore(runner: string, errorType: ScoreType, httpVersion?: number) {
+    await this.scoreManager.updateScore(runner, errorType, httpVersion);
   }
 
   cleanup() {

diff --git a/packages/network-support/src/scoreManager.ts b/packages/network-support/src/scoreManager.ts
@@ -27,6 +27,7 @@ const scoresDelta = {
 
 type ScoreStoreType = {
   score: number;
+  httpVersion?: number;
   lastUpdate: number;
   lastFailed: number;
 };
@@ -46,44 +47,36 @@ export class ScoreManager {
 
   async getScore(runner: string) {
     const key = this.getCacheKey(runner);
-    let score = await this.scoreStore.get<number | ScoreStoreType>(key);
-
-    if (score === undefined) {
-      score = {
-        score: 100,
-        lastUpdate: 0,
-        lastFailed: 0,
-      };
-      this.scoreStore.set(key, score);
-    }
-
-    if (typeof score === 'number') {
-      return Math.max(score, this.minScore);
-    }
-
+    const score = (await this.scoreStore.get<ScoreStoreType>(key)) || {
+      score: 100,
+      httpVersion: 1,
+      lastUpdate: 0,
+      lastFailed: 0,
+    };
     return this.calculatedScore(score);
   }
 
   private calculatedScore(score: ScoreStoreType) {
     return Math.min(score.score + Math.floor((Date.now() - score.lastUpdate) / 600_000), 100);
   }
 
-  async updateScore(runner: string, errorType: ScoreType) {
+  async getBonusScore(runner: string) {
+    return (await this.getScore(runner)) * ((await this.getHttpVersion(runner)) == 2 ? 10 : 1);
+  }
+
+  async updateScore(runner: string, errorType: ScoreType, httpVersion?: number) {
     if (!runner) {
       this.logger?.debug('updateScore: runner is empty');
       return;
     }
 
     const key = this.getCacheKey(runner);
-    let score = (await this.scoreStore.get<number | ScoreStoreType>(key)) ?? 100;
-
-    if (typeof score === 'number') {
-      score = {
-        score: score,
-        lastUpdate: 0,
-        lastFailed: 0,
-      };
-    }
+    const score = (await this.scoreStore.get<ScoreStoreType>(key)) || {
+      score: 100,
+      httpVersion,
+      lastUpdate: 0,
+      lastFailed: 0,
+    };
 
     if (errorType !== ScoreType.SUCCESS) {
       this.logger?.debug(`updateScore type: ${runner} ${errorType}`);
@@ -92,17 +85,21 @@ export class ScoreManager {
 
     const delta = scoresDelta[errorType];
 
-    score = {
-      score: Math.min(Math.max(score.score + delta, this.minScore), 100),
-      lastUpdate: Date.now(),
-      lastFailed: errorType === ScoreType.SUCCESS ? 0 : Date.now(),
-    };
+    score.score = Math.min(Math.max(score.score + delta, this.minScore), 100);
+    score.httpVersion = httpVersion || score.httpVersion;
+    score.lastUpdate = Date.now();
+    score.lastFailed = errorType === ScoreType.SUCCESS ? 0 : Date.now();
 
     this.logger?.debug(`updateScore after: ${runner} ${JSON.stringify(score)}`);
 
     this.scoreStore.set(key, score);
   }
 
+  async getHttpVersion(runner: string) {
+    const key = this.getCacheKey(runner);
+    return (await this.scoreStore.get<ScoreStoreType>(key))?.httpVersion || 1;
+  }
+
   private getCacheKey(runner: string): string {
     return `$query-score-${runner}-${this.projectId}`;
   }