@blocklet/sdk 1.16.34-beta-20241214-102147-410be539 → 1.16.34-beta-20241218-045149-150af879

package/lib/component/index.d.ts

@@ -1,6 +1,14 @@
 import type { AxiosResponse, Method } from 'axios';
 import { IncomingMessage } from 'http';
 import type { Resource } from './util';
+type RetryOptions = {
+    retries?: number;
+    factor?: number;
+    randomize?: boolean;
+    minTimeout?: number;
+    maxTimeout?: number;
+    onFailedAttempt?: (error: any) => void | Promise<void>;
+};
 declare const getComponentWebEndpoint: (keyword: string) => string;
 type CallComponentOptions<D = any, P = any> = {
     name?: string;
@@ -15,8 +23,8 @@ type CallComponentOptions<D = any, P = any> = {
 type CallComponent = {
     (options: CallComponentOptions & {
         responseType: 'stream';
-    }): Promise<AxiosResponse<IncomingMessage>>;
-    <T = any, D = any, P = any>(options: CallComponentOptions<D, P>): Promise<AxiosResponse<T, D>>;
+    }, retryOptions?: RetryOptions): Promise<AxiosResponse<IncomingMessage>>;
+    <T = any, D = any, P = any>(options: CallComponentOptions<D, P>, retryOptions?: RetryOptions): Promise<AxiosResponse<T, D>>;
 };
 declare const call: CallComponent;
 declare const getComponentMountPoint: (keyword: string) => string;

package/lib/component/index.js

@@ -39,23 +39,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPackResources = exports.getResources = exports.getReleaseExportDir = exports.getResourceExportDir = exports.waitForComponentRunning = exports.getComponentWebEndpoint = exports.getComponentMountPoint = exports.getRelativeUrl = exports.getUrl = exports.call = void 0;
 const path_1 = require("path");
 const get_1 = __importDefault(require("lodash/get"));
+const noop_1 = __importDefault(require("lodash/noop"));
 const ufo_1 = require("ufo");
+const p_retry_1 = __importDefault(require("p-retry"));
 const wait_port_1 = __importDefault(require("wait-port"));
 const constant_1 = require("@blocklet/constant");
 const config_1 = require("../config");
 const Util = __importStar(require("./util"));
 const component_api_1 = __importDefault(require("../util/component-api"));
 const parse_docker_endpoint_1 = require("../util/parse-docker-endpoint");
-const doCall = async ({ url, headers = {}, ...options }) => {
+// eslint-disable-next-line require-await
+const doCall = async ({ url, headers = {}, ...options }, retryOptions = {}) => (0, p_retry_1.default)(async () => {
     try {
-        const resp = await (0, component_api_1.default)({
+        const res = await (0, component_api_1.default)({
             url,
             timeout: 60 * 1000,
             ...options,
             headers,
         });
         config_1.logger.info(`call ${url} api success`);
-        return resp;
+        return res;
     }
     catch (error) {
         config_1.logger.error(`call ${url} api failed`, {
@@ -64,9 +67,20 @@ const doCall = async ({ url, headers = {}, ...options }) => {
             responseData: (0, get_1.default)(error, 'response.data'),
             error: (0, get_1.default)(error, 'message'),
         });
+        // Do not retry if the response status indicates a client error
+        if (error.response && error.response.status < 500 && error.response.status >= 400) {
+            throw new p_retry_1.default.AbortError(error);
+        }
         throw error;
     }
-};
+}, {
+    retries: typeof retryOptions.retries === 'undefined' ? 3 : retryOptions.retries,
+    factor: retryOptions.factor || 2,
+    randomize: retryOptions.randomize || true,
+    minTimeout: retryOptions.minTimeout || 500,
+    maxTimeout: retryOptions.maxTimeout || 5000,
+    onFailedAttempt: retryOptions.onFailedAttempt || noop_1.default,
+});
 const getComponent = (name) => {
     const item = config_1.components.find((x) => [x.title, x.name, x.did].includes(name));
     return item;
@@ -77,7 +91,7 @@ const getComponentWebEndpoint = (keyword) => {
     return (0, parse_docker_endpoint_1.parseDockerComponentEndpoint)(endpoint, item);
 };
 exports.getComponentWebEndpoint = getComponentWebEndpoint;
-const call = async ({ name, method = 'POST', path: _path, ...options }) => {
+const call = async ({ name, method = 'POST', path: _path, ...options }, retryOptions = {}) => {
     if (!name) {
         throw new Error('component.call: name is required');
     }
@@ -91,7 +105,7 @@ const call = async ({ name, method = 'POST', path: _path, ...options }) => {
     }
     const url = (0, ufo_1.joinURL)(baseURL, _path);
     try {
-        const resp = await doCall({ url, method, ...options });
+        const resp = await doCall({ url, method, ...options }, retryOptions);
         return resp;
     }
     catch (error) {

package/lib/middlewares/auth.js

@@ -2,10 +2,10 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-const lru_cache_1 = __importDefault(require("lru-cache"));
+const lru_cache_1 = require("lru-cache");
 const auth_1 = __importDefault(require("../service/auth"));
 const login_1 = require("../util/login");
-const cache = new lru_cache_1.default({ max: 10, maxAge: 60 * 1000 });
+const cache = new lru_cache_1.LRUCache({ max: 10, ttl: 60 * 1000 });
 const clients = {};
 const getServiceClient = () => {
     const appId = process.env.BLOCKLET_APP_ID;

package/lib/wallet.js

@@ -1,14 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 const wallet_1 = require("@ocap/wallet");
 const mcrypto_1 = require("@ocap/mcrypto");
 const did_1 = require("@arcblock/did");
-const lru_cache_1 = __importDefault(require("lru-cache"));
+const lru_cache_1 = require("lru-cache");
 // NOTICE: 1 个应用的 sdk 运行时最多 4 个钱包
 // 此处 cache 只是优化性能的手段，即使 miss 也不会造成任何错误，最终决定设置 size 为 4
-const cacheWallet = new lru_cache_1.default({ max: 4, maxAge: 60 * 1000 });
+const cacheWallet = new lru_cache_1.LRUCache({ max: 4, ttl: 60 * 1000 });
 /**
  * @param {string} [type=process.env.CHAIN_TYPE] can only be 'eth|ethereum' or 'default|arcblock'
  * @param {string} [appSk=process.env.BLOCKLET_APP_SK] must be hex

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.34-beta-20241214-102147-410be539",
+  "version": "1.16.34-beta-20241218-045149-150af879",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,21 +27,21 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.34-beta-20241214-102147-410be539",
-    "@abtnode/constant": "1.16.34-beta-20241214-102147-410be539",
-    "@abtnode/util": "1.16.34-beta-20241214-102147-410be539",
-    "@arcblock/did": "1.18.161",
-    "@arcblock/did-auth": "1.18.161",
-    "@arcblock/jwt": "1.18.161",
-    "@arcblock/ws": "1.18.161",
-    "@blocklet/constant": "1.16.34-beta-20241214-102147-410be539",
-    "@blocklet/env": "1.16.34-beta-20241214-102147-410be539",
-    "@blocklet/meta": "1.16.34-beta-20241214-102147-410be539",
+    "@abtnode/client": "1.16.34-beta-20241218-045149-150af879",
+    "@abtnode/constant": "1.16.34-beta-20241218-045149-150af879",
+    "@abtnode/util": "1.16.34-beta-20241218-045149-150af879",
+    "@arcblock/did": "1.18.162",
+    "@arcblock/did-auth": "1.18.162",
+    "@arcblock/jwt": "1.18.162",
+    "@arcblock/ws": "1.18.162",
+    "@blocklet/constant": "1.16.34-beta-20241218-045149-150af879",
+    "@blocklet/env": "1.16.34-beta-20241218-045149-150af879",
+    "@blocklet/meta": "1.16.34-beta-20241218-045149-150af879",
     "@did-connect/authenticator": "^2.2.4",
     "@did-connect/handler": "^2.2.4",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.18.161",
-    "@ocap/wallet": "1.18.161",
+    "@ocap/mcrypto": "1.18.162",
+    "@ocap/wallet": "1.18.162",
     "axios": "^1.7.5",
     "cheerio": "1.0.0-rc.12",
     "debug": "^4.3.7",
@@ -50,7 +50,8 @@
     "json-stable-stringify": "^1.0.1",
     "jsonwebtoken": "^9.0.0",
     "lodash": "^4.17.21",
-    "lru-cache": "^6.0.0",
+    "lru-cache": "^11.0.2",
+    "p-retry": "^4.6.2",
     "qs": "^6.13.0",
     "semver": "^7.6.3",
     "sitemap": "^8.0.0",
@@ -80,5 +81,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "7f14bf890cebd9294f3953a7adc64608c078771b"
+  "gitHead": "91907df23611fc7d41194669bc0831af1909114c"
 }