@onekeyfe/hd-transport-http 0.1.44 → 0.1.45

package/dist/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAGA,oBAAY,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;AAwBF,wBAAsB,OAAO,CAAC,OAAO,EAAE,kBAAkB,gBAuBxD"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAGA,oBAAY,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;AAwBF,wBAAsB,OAAO,CAAC,OAAO,EAAE,kBAAkB,gBA0BxD"}

package/dist/index.js

@@ -1,6 +1,13 @@
-import transport from '@onekeyfe/hd-transport';
-import { HardwareError, HardwareErrorCode, ERRORS } from '@onekeyfe/hd-shared';
-import axios from 'axios';
+'use strict';
+
+var transport = require('@onekeyfe/hd-transport');
+var hdShared = require('@onekeyfe/hd-shared');
+var axios = require('axios');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var transport__default = /*#__PURE__*/_interopDefaultLegacy(transport);
+var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -60,23 +67,39 @@ function request(options) {
             },
             timeout: (_a = options.timeout) !== null && _a !== void 0 ? _a : undefined,
         };
-        const res = yield axios.request(fetchOptions);
+        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 HardwareError({ errorCode: HardwareErrorCode.NetworkError, message: resJson.error });
+            throw new hdShared.HardwareError({
+                errorCode: hdShared.HardwareErrorCode.NetworkError,
+                message: resJson.error,
+            });
         }
         else {
-            throw new HardwareError({ errorCode: HardwareErrorCode.NetworkError, message: res.data });
+            throw new hdShared.HardwareError({ errorCode: hdShared.HardwareErrorCode.NetworkError, message: res.data });
         }
     });
 }
+axios__default["default"].interceptors.request.use(config => {
+    var _a, _b;
+    if (typeof window !== 'undefined') {
+        return config;
+    }
+    if ((_a = config.url) === null || _a === void 0 ? void 0 : _a.startsWith('http://localhost:21320')) {
+        if (!((_b = config === null || config === void 0 ? void 0 : config.headers) === null || _b === void 0 ? void 0 : _b.Origin)) {
+            console.log('set node request origin');
+            config.headers = Object.assign(Object.assign({}, config.headers), { Origin: 'https://jssdk.onekey.so' });
+        }
+    }
+    return config;
+});
 
 const DEFAULT_URL = 'http://localhost:21320';
 
-const { check, buildOne, receiveOne, parseConfigure } = transport;
+const { check, buildOne, receiveOne, parseConfigure } = transport__default["default"];
 class HttpTransport {
     constructor(url) {
         this.configured = false;
@@ -85,7 +108,7 @@ class HttpTransport {
     }
     _post(options) {
         if (this.stopped) {
-            return Promise.reject(ERRORS.TypedError('Transport stopped.'));
+            return Promise.reject(hdShared.ERRORS.TypedError('Transport stopped.'));
         }
         return request(Object.assign(Object.assign({}, options), { method: 'POST', url: this.url + options.url }));
     }
@@ -115,7 +138,7 @@ class HttpTransport {
     listen(old) {
         return __awaiter(this, void 0, void 0, function* () {
             if (old === null) {
-                throw ERRORS.TypedError('Http-Transport does not support listen without previous.');
+                throw hdShared.ERRORS.TypedError('Http-Transport does not support listen without previous.');
             }
             const devicesS = yield this._post({
                 url: '/listen',
@@ -157,7 +180,7 @@ class HttpTransport {
     call(session, name, data) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this._messages == null) {
-                throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
             const messages = this._messages;
             this.Log.debug('call-', ' name: ', name, ' data: ', data);
@@ -169,7 +192,7 @@ class HttpTransport {
                 timeout: name === 'Initialize' ? 10000 : undefined,
             });
             if (typeof resData !== 'string') {
-                throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
             }
             const jsonData = receiveOne(messages, resData);
             return check.call(jsonData);
@@ -178,7 +201,7 @@ class HttpTransport {
     post(session, name, data) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this._messages == null) {
-                throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
             const messages = this._messages;
             const outData = buildOne(messages, name, data).toString('hex');
@@ -191,14 +214,14 @@ class HttpTransport {
     read(session) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this._messages == null) {
-                throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
             const messages = this._messages;
             const resData = yield this._post({
                 url: `/read/${session}`,
             });
             if (typeof resData !== 'string') {
-                throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
             }
             const jsonData = receiveOne(messages, resData);
             return check.call(jsonData);
@@ -215,4 +238,4 @@ class HttpTransport {
     }
 }
 
-export { HttpTransport as default };
+module.exports = HttpTransport;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-http",
-  "version": "0.1.44",
+  "version": "0.1.45",
   "description": "hardware http transport",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,9 +25,9 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.1.44",
-    "@onekeyfe/hd-transport": "^0.1.44",
+    "@onekeyfe/hd-shared": "^0.1.45",
+    "@onekeyfe/hd-transport": "^0.1.45",
     "axios": "^0.27.2"
   },
-  "gitHead": "fb673918587877267cbbeca6e0c6abbc56a0d0fa"
+  "gitHead": "0436f8ff26494933124c1c6f4586d4aeb5526c30"
 }

package/src/http.ts

@@ -49,8 +49,29 @@ export async function request(options: HttpRequestOptions) {
   }
   const resJson = parseResult(res.data);
   if (typeof resJson === 'object' && resJson != null && resJson.error != null) {
-    throw new HardwareError({ errorCode: HardwareErrorCode.NetworkError, message: resJson.error });
+    throw new HardwareError({
+      errorCode: HardwareErrorCode.NetworkError,
+      message: resJson.error,
+    });
   } else {
     throw new HardwareError({ errorCode: HardwareErrorCode.NetworkError, message: res.data });
   }
 }
+
+axios.interceptors.request.use(config => {
+  if (typeof window !== 'undefined') {
+    return config;
+  }
+  // node environment
+  if (config.url?.startsWith('http://localhost:21320')) {
+    if (!config?.headers?.Origin) {
+      console.log('set node request origin');
+      // add Origin field for request headers
+      config.headers = {
+        ...config.headers,
+        Origin: 'https://jssdk.onekey.so',
+      };
+    }
+  }
+  return config;
+});