@onekeyfe/hd-transport-http 0.1.40 → 0.1.41
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +15 -22
- package/package.json +4 -4
package/dist/index.js
CHANGED
|
@@ -1,13 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var hdShared = require('@onekeyfe/hd-shared');
|
|
5
|
-
var axios = require('axios');
|
|
6
|
-
|
|
7
|
-
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
8
|
-
|
|
9
|
-
var transport__default = /*#__PURE__*/_interopDefaultLegacy(transport);
|
|
10
|
-
var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
|
|
1
|
+
import transport from '@onekeyfe/hd-transport';
|
|
2
|
+
import { HardwareError, HardwareErrorCode, ERRORS } from '@onekeyfe/hd-shared';
|
|
3
|
+
import axios from 'axios';
|
|
11
4
|
|
|
12
5
|
/******************************************************************************
|
|
13
6
|
Copyright (c) Microsoft Corporation.
|
|
@@ -67,23 +60,23 @@ function request(options) {
|
|
|
67
60
|
},
|
|
68
61
|
timeout: (_a = options.timeout) !== null && _a !== void 0 ? _a : undefined,
|
|
69
62
|
};
|
|
70
|
-
const res = yield
|
|
63
|
+
const res = yield axios.request(fetchOptions);
|
|
71
64
|
if (+res.status === 200) {
|
|
72
65
|
return parseResult(res.data);
|
|
73
66
|
}
|
|
74
67
|
const resJson = parseResult(res.data);
|
|
75
68
|
if (typeof resJson === 'object' && resJson != null && resJson.error != null) {
|
|
76
|
-
throw new
|
|
69
|
+
throw new HardwareError({ errorCode: HardwareErrorCode.NetworkError, message: resJson.error });
|
|
77
70
|
}
|
|
78
71
|
else {
|
|
79
|
-
throw new
|
|
72
|
+
throw new HardwareError({ errorCode: HardwareErrorCode.NetworkError, message: res.data });
|
|
80
73
|
}
|
|
81
74
|
});
|
|
82
75
|
}
|
|
83
76
|
|
|
84
77
|
const DEFAULT_URL = 'http://localhost:21320';
|
|
85
78
|
|
|
86
|
-
const { check, buildOne, receiveOne, parseConfigure } =
|
|
79
|
+
const { check, buildOne, receiveOne, parseConfigure } = transport;
|
|
87
80
|
class HttpTransport {
|
|
88
81
|
constructor(url) {
|
|
89
82
|
this.configured = false;
|
|
@@ -92,7 +85,7 @@ class HttpTransport {
|
|
|
92
85
|
}
|
|
93
86
|
_post(options) {
|
|
94
87
|
if (this.stopped) {
|
|
95
|
-
return Promise.reject(
|
|
88
|
+
return Promise.reject(ERRORS.TypedError('Transport stopped.'));
|
|
96
89
|
}
|
|
97
90
|
return request(Object.assign(Object.assign({}, options), { method: 'POST', url: this.url + options.url }));
|
|
98
91
|
}
|
|
@@ -122,7 +115,7 @@ class HttpTransport {
|
|
|
122
115
|
listen(old) {
|
|
123
116
|
return __awaiter(this, void 0, void 0, function* () {
|
|
124
117
|
if (old === null) {
|
|
125
|
-
throw
|
|
118
|
+
throw ERRORS.TypedError('Http-Transport does not support listen without previous.');
|
|
126
119
|
}
|
|
127
120
|
const devicesS = yield this._post({
|
|
128
121
|
url: '/listen',
|
|
@@ -164,7 +157,7 @@ class HttpTransport {
|
|
|
164
157
|
call(session, name, data) {
|
|
165
158
|
return __awaiter(this, void 0, void 0, function* () {
|
|
166
159
|
if (this._messages == null) {
|
|
167
|
-
throw
|
|
160
|
+
throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
|
|
168
161
|
}
|
|
169
162
|
const messages = this._messages;
|
|
170
163
|
this.Log.debug('call-', ' name: ', name, ' data: ', data);
|
|
@@ -176,7 +169,7 @@ class HttpTransport {
|
|
|
176
169
|
timeout: name === 'Initialize' ? 10000 : undefined,
|
|
177
170
|
});
|
|
178
171
|
if (typeof resData !== 'string') {
|
|
179
|
-
throw
|
|
172
|
+
throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
|
|
180
173
|
}
|
|
181
174
|
const jsonData = receiveOne(messages, resData);
|
|
182
175
|
return check.call(jsonData);
|
|
@@ -185,7 +178,7 @@ class HttpTransport {
|
|
|
185
178
|
post(session, name, data) {
|
|
186
179
|
return __awaiter(this, void 0, void 0, function* () {
|
|
187
180
|
if (this._messages == null) {
|
|
188
|
-
throw
|
|
181
|
+
throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
|
|
189
182
|
}
|
|
190
183
|
const messages = this._messages;
|
|
191
184
|
const outData = buildOne(messages, name, data).toString('hex');
|
|
@@ -198,14 +191,14 @@ class HttpTransport {
|
|
|
198
191
|
read(session) {
|
|
199
192
|
return __awaiter(this, void 0, void 0, function* () {
|
|
200
193
|
if (this._messages == null) {
|
|
201
|
-
throw
|
|
194
|
+
throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
|
|
202
195
|
}
|
|
203
196
|
const messages = this._messages;
|
|
204
197
|
const resData = yield this._post({
|
|
205
198
|
url: `/read/${session}`,
|
|
206
199
|
});
|
|
207
200
|
if (typeof resData !== 'string') {
|
|
208
|
-
throw
|
|
201
|
+
throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
|
|
209
202
|
}
|
|
210
203
|
const jsonData = receiveOne(messages, resData);
|
|
211
204
|
return check.call(jsonData);
|
|
@@ -222,4 +215,4 @@ class HttpTransport {
|
|
|
222
215
|
}
|
|
223
216
|
}
|
|
224
217
|
|
|
225
|
-
|
|
218
|
+
export { HttpTransport as default };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-transport-http",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.41",
|
|
4
4
|
"description": "hardware http transport",
|
|
5
5
|
"author": "OneKey",
|
|
6
6
|
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
|
|
@@ -25,9 +25,9 @@
|
|
|
25
25
|
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@onekeyfe/hd-shared": "^0.1.
|
|
29
|
-
"@onekeyfe/hd-transport": "^0.1.
|
|
28
|
+
"@onekeyfe/hd-shared": "^0.1.41",
|
|
29
|
+
"@onekeyfe/hd-transport": "^0.1.41",
|
|
30
30
|
"axios": "^0.27.2"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "0c5bf8f29b26ee02a5587aa716db4dfd7b17defd"
|
|
33
33
|
}
|