@rabby-wallet/rabby-action 0.1.10-beta.1 → 0.1.10

package/dist/actions/common/fetchData.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import PQueue from 'p-queue';
 import { waitQueueFinished } from '../../utils/waitQueueFinished';
+import { catchTimeoutError } from '../../utils/catchTimeoutError';
 export const fetchDataCommon = (options, likeAction) => __awaiter(void 0, void 0, void 0, function* () {
     const { walletProvider, actionData, sender, apiProvider, chainId } = options;
     const queue = new PQueue();
@@ -78,7 +79,9 @@ export const fetchDataCommon = (options, likeAction) => __awaiter(void 0, void 0
                     name: null,
                     onTransferWhitelist: false,
                 };
-                const { has_transfer } = yield apiProvider.hasTransfer(chainId, sender, addr);
+                const { has_transfer } = yield catchTimeoutError(apiProvider.hasTransfer(chainId, sender, addr), {
+                    has_transfer: false,
+                });
                 receiverData.hasTransfer = has_transfer;
                 const { desc } = yield apiProvider.addrDesc(addr);
                 if ((_b = desc.cex) === null || _b === void 0 ? void 0 : _b.id) {

package/dist/actions/contractCall/fetchData.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import PQueue from 'p-queue';
 import { getProtocol } from '../../utils/getProtocol';
 import { waitQueueFinished } from '../../utils/waitQueueFinished';
+import { catchTimeoutError } from '../../utils/catchTimeoutError';
 export const fetchDataContractCall = (options) => __awaiter(void 0, void 0, void 0, function* () {
     if (options.type !== 'transaction') {
         return {};
@@ -77,7 +78,9 @@ export const fetchDataContractCall = (options) => __awaiter(void 0, void 0, void
                 name: null,
                 onTransferWhitelist: false,
             };
-            const { has_transfer } = yield apiProvider.hasTransfer(chainId, sender, addr);
+            const { has_transfer } = yield catchTimeoutError(apiProvider.hasTransfer(chainId, sender, addr), {
+                has_transfer: false,
+            });
             receiverData.hasTransfer = has_transfer;
             const { desc } = yield apiProvider.addrDesc(addr);
             if ((_b = desc.cex) === null || _b === void 0 ? void 0 : _b.id) {

package/dist/actions/send/fetchData.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import PQueue from 'p-queue';
 import { waitQueueFinished } from '../../utils/waitQueueFinished';
 import { KEYRING_TYPE } from '../../utils/keyring';
+import { catchTimeoutError } from '../../utils/catchTimeoutError';
 // send, sendNFT, typedData.send
 export const fetchDataSend = (options, likeSendAction) => __awaiter(void 0, void 0, void 0, function* () {
     const queue = new PQueue();
@@ -42,7 +43,9 @@ export const fetchDataSend = (options, likeSendAction) => __awaiter(void 0, void
             hasPrivateKeyInWallet === KEYRING_TYPE.HdKeyring;
     }
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
-        const { has_transfer } = yield apiProvider.hasTransfer(chainId, sender, sendAction.to);
+        const { has_transfer } = yield catchTimeoutError(apiProvider.hasTransfer(chainId, sender, sendAction.to), {
+            has_transfer: false,
+        });
         result.hasTransfer = has_transfer;
     }));
     queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
@@ -56,11 +59,6 @@ export const fetchDataSend = (options, likeSendAction) => __awaiter(void 0, void
                 bornAt: desc.born_at,
                 isDeposit: desc.cex.is_deposit,
             };
-            if (options.cex) {
-                result.cex.logo = options.cex.logo;
-                result.cex.name = options.cex.name;
-                result.cex.id = options.cex.id;
-            }
         }
         if (desc.contract && Object.keys(desc.contract).length > 0) {
             result.contract = desc.contract;

package/dist/actions/transferOwner/fetchData.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import PQueue from 'p-queue';
 import { waitQueueFinished } from '../../utils/waitQueueFinished';
+import { catchTimeoutError } from '../../utils/catchTimeoutError';
 export const fetchDataTransferOwner = (options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if (!options.actionData.transferOwner) {
@@ -37,7 +38,9 @@ export const fetchDataTransferOwner = (options) => __awaiter(void 0, void 0, voi
             onTransferWhitelist: false,
         };
         queue.add(() => __awaiter(void 0, void 0, void 0, function* () {
-            const { has_transfer } = yield apiProvider.hasTransfer(chainId, sender, addr);
+            const { has_transfer } = yield catchTimeoutError(apiProvider.hasTransfer(chainId, sender, addr), {
+                has_transfer: false,
+            });
             receiverData.hasTransfer = has_transfer;
         }));
         queue.add(() => __awaiter(void 0, void 0, void 0, function* () {

package/dist/types/fetchActionRequiredData.d.ts

@@ -9,11 +9,6 @@ type BaseFetchActionRequiredDataParameters<T extends 'typed_data' | 'transaction
     walletProvider: WalletProvider;
     apiProvider: OpenApiService;
     chainId: string;
-    cex?: {
-        id: string;
-        name: string;
-        logo: string;
-    };
 };
 export type FetchTransactionRequiredDataParameters = BaseFetchActionRequiredDataParameters<'transaction'> & {
     type: 'transaction';

package/dist/utils/catchTimeoutError.d.ts

@@ -0,0 +1 @@
+export declare const catchTimeoutError: <T>(promise: Promise<T>, timeoutResponse: T) => Promise<T>;

package/dist/utils/catchTimeoutError.js

@@ -0,0 +1,23 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { AxiosError } from 'axios';
+export const catchTimeoutError = (promise, timeoutResponse) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        return yield promise;
+    }
+    catch (error) {
+        if (error instanceof AxiosError &&
+            (error.code === AxiosError.ECONNABORTED ||
+                error.code === AxiosError.ETIMEDOUT)) {
+            return timeoutResponse;
+        }
+        throw error;
+    }
+});

package/dist/utils/catchTimeoutError.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/catchTimeoutError.test.js

@@ -0,0 +1,24 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+// test catchTimeoutError
+import { catchTimeoutError } from './catchTimeoutError';
+import axios from 'axios';
+test('catchTimeoutError should return timeoutResponse on timeout', () => __awaiter(void 0, void 0, void 0, function* () {
+    const timeoutResponse = { has_transfer: false };
+    const promise = axios
+        .get('http://www.google.com:81/', {
+        timeout: 1,
+    })
+        .then((response) => {
+        return response.data;
+    });
+    const result = yield catchTimeoutError(promise, timeoutResponse);
+    expect(result).toEqual(timeoutResponse);
+}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rabby-wallet/rabby-action",
-  "version": "0.1.10-beta.1",
+  "version": "0.1.10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -12,7 +12,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.19.1",
     "@debank/common": "^0.3.60",
-    "@rabby-wallet/rabby-api": "0.7.33",
+    "@rabby-wallet/rabby-api": "0.9.19",
     "@rabby-wallet/rabby-security-engine": "2.0.7",
     "@types/jest": "^29.0.3",
     "@types/lodash": "^4.14.185",