@onekeyfe/hd-transport-http 1.1.13 → 1.1.14-alpha.1

package/dist/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IACrD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AA4BF,wBAAsB,OAAO,CAAC,OAAO,EAAE,kBAAkB,gBA6BxD"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAQA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IACrD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AA4BF,wBAAsB,OAAO,CAAC,OAAO,EAAE,kBAAkB,gBA+CxD"}

package/dist/index.js

@@ -66,7 +66,7 @@ function parseResult(text) {
     }
 }
 function request(options) {
-    var _a;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const fetchOptions = {
             url: options.url,
@@ -79,20 +79,37 @@ function request(options) {
             timeout: (_a = options.timeout) !== null && _a !== void 0 ? _a : undefined,
             transformResponse: data => data,
         };
-        const res = yield axios__default["default"].request(fetchOptions);
-        if (+res.status === 200) {
-            return parseResult(res.data);
+        try {
+            const res = yield axios__default["default"].request(fetchOptions);
+            if (+res.status === 200) {
+                return parseResult(res.data);
+            }
+            const resJson = parseResult(res.data);
+            if (typeof resJson === 'object' && resJson != null && resJson.error != null) {
+                throw new hdShared.HardwareError({
+                    errorCode: hdShared.HardwareErrorCode.NetworkError,
+                    message: resJson.error,
+                });
+            }
+            else {
+                throw new hdShared.HardwareError({ errorCode: hdShared.HardwareErrorCode.NetworkError, message: res.data });
+            }
         }
-        const resJson = parseResult(res.data);
-        if (typeof resJson === 'object' && resJson != null && resJson.error != null) {
+        catch (err) {
+            const axiosErr = err;
+            const respData = (_b = axiosErr === null || axiosErr === void 0 ? void 0 : axiosErr.response) === null || _b === void 0 ? void 0 : _b.data;
+            if (typeof respData === 'string') {
+                const parsed = parseResult(respData);
+                if (typeof parsed === 'object' && parsed !== null && parsed.error) {
+                    throw hdShared.CreateHardwareErrorByBridgeError(String(parsed.error));
+                }
+                throw hdShared.CreateHardwareErrorByBridgeError(respData);
+            }
             throw new hdShared.HardwareError({
-                errorCode: hdShared.HardwareErrorCode.NetworkError,
-                message: resJson.error,
+                errorCode: hdShared.HardwareErrorCode.BridgeNetworkError,
+                message: (axiosErr === null || axiosErr === void 0 ? void 0 : axiosErr.message) || 'Bridge network error',
             });
         }
-        else {
-            throw new hdShared.HardwareError({ errorCode: hdShared.HardwareErrorCode.NetworkError, message: res.data });
-        }
     });
 }
 axios__default["default"].interceptors.request.use((config) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-http",
-  "version": "1.1.13",
+  "version": "1.1.14-alpha.1",
   "description": "hardware http transport",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,10 +24,10 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.13",
-    "@onekeyfe/hd-transport": "1.1.13",
+    "@onekeyfe/hd-shared": "1.1.14-alpha.1",
+    "@onekeyfe/hd-transport": "1.1.14-alpha.1",
     "axios": "1.12.2",
     "secure-json-parse": "^4.0.0"
   },
-  "gitHead": "7eaf49349763fb6c63fbd0c2ecb69663c443a72c"
+  "gitHead": "f17128ce7511e7dab0998d11839c0a4172bf32cf"
 }

package/src/http.ts

@@ -1,5 +1,9 @@
-import axios, { AxiosRequestConfig, InternalAxiosRequestConfig } from 'axios';
-import { HardwareError, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import axios, { AxiosError, AxiosRequestConfig, InternalAxiosRequestConfig } from 'axios';
+import {
+  HardwareError,
+  HardwareErrorCode,
+  CreateHardwareErrorByBridgeError,
+} from '@onekeyfe/hd-shared';
 import secureJSON from 'secure-json-parse';
 
 export type HttpRequestOptions = {
@@ -50,19 +54,37 @@ export async function request(options: HttpRequestOptions) {
     transformResponse: data => data,
   };
 
-  const res = await axios.request(fetchOptions);
+  try {
+    const res = await axios.request(fetchOptions);
+
+    if (+res.status === 200) {
+      return parseResult(res.data);
+    }
+    const resJson = parseResult(res.data);
+    if (typeof resJson === 'object' && resJson != null && resJson.error != null) {
+      throw new HardwareError({
+        errorCode: HardwareErrorCode.NetworkError,
+        message: resJson.error,
+      });
+    } else {
+      throw new HardwareError({ errorCode: HardwareErrorCode.NetworkError, message: res.data });
+    }
+  } catch (err) {
+    const axiosErr = err as AxiosError<string>;
+    const respData = axiosErr?.response?.data;
+
+    if (typeof respData === 'string') {
+      const parsed = parseResult(respData);
+      if (typeof parsed === 'object' && parsed !== null && parsed.error) {
+        throw CreateHardwareErrorByBridgeError(String(parsed.error));
+      }
+      throw CreateHardwareErrorByBridgeError(respData);
+    }
 
-  if (+res.status === 200) {
-    return parseResult(res.data);
-  }
-  const resJson = parseResult(res.data);
-  if (typeof resJson === 'object' && resJson != null && resJson.error != null) {
     throw new HardwareError({
-      errorCode: HardwareErrorCode.NetworkError,
-      message: resJson.error,
+      errorCode: HardwareErrorCode.BridgeNetworkError,
+      message: axiosErr?.message || 'Bridge network error',
     });
-  } else {
-    throw new HardwareError({ errorCode: HardwareErrorCode.NetworkError, message: res.data });
   }
 }