@onekeyfe/hd-transport-http 1.1.27-alpha.34 → 1.1.27-alpha.4

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.
Files changed (5) hide show
  1. package/dist/index.d.ts +1 -2
  2. package/dist/index.d.ts.map +1 -1
  3. package/dist/index.js +5 -8
  4. package/package.json +4 -4
  5. package/src/index.ts +6 -15
package/dist/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import * as _onekeyfe_hd_transport from '@onekeyfe/hd-transport';
2
- import _onekeyfe_hd_transport__default, { ProtocolType, OneKeyDeviceInfoWithSession, AcquireInput } from '@onekeyfe/hd-transport';
2
+ import _onekeyfe_hd_transport__default, { OneKeyDeviceInfoWithSession, AcquireInput } from '@onekeyfe/hd-transport';
3
3
 
4
4
  type IncompleteRequestOptions = {
5
5
  body?: Array<any> | Record<string, unknown> | string;
@@ -13,7 +13,6 @@ declare class HttpTransport {
13
13
  stopped: boolean;
14
14
  url: string;
15
15
  Log?: any;
16
- getProtocolType(_path: string): ProtocolType;
17
16
  constructor(url?: string);
18
17
  _post(options: IncompleteRequestOptions): Promise<any>;
19
18
  init(logger: any): Promise<string>;
package/dist/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAA8B,MAAM,wBAAwB,CAAC;AAMpE,OAAO,KAAK,EACV,YAAY,EACZ,2BAA2B,EAC3B,YAAY,EACb,MAAM,wBAAwB,CAAC;AAIhC,KAAK,wBAAwB,GAAG;IAC9B,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IACrD,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAAmB;IAEvB,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,GAAG,EAAE,MAAM,CAAC;IAEZ,GAAG,CAAC,EAAE,GAAG,CAAC;IAGV,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;gBAIhC,GAAG,CAAC,EAAE,MAAM;IAIxB,KAAK,CAAC,OAAO,EAAE,wBAAwB;IAWjC,IAAI,CAAC,MAAM,EAAE,GAAG;IAMhB,WAAW;IAUjB,SAAS,CAAC,UAAU,EAAE,GAAG;IAMnB,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,2BAA2B,CAAC;IAY/C,SAAS;;;;;;;IAMf,aAAa,CAAC,KAAK,EAAE,YAAY;IAS3B,OAAO,CAAC,KAAK,EAAE,YAAY;IAK3B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAUzC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAyBjE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAYjE,IAAI,CAAC,OAAO,EAAE,MAAM;IAe1B,aAAa;IAKb,IAAI;IAIJ,MAAM;CAGP"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAA8B,MAAM,wBAAwB,CAAC;AAMpE,OAAO,KAAK,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAIxF,KAAK,wBAAwB,GAAG;IAC9B,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;IACrD,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAAmB;IAEvB,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,GAAG,EAAE,MAAM,CAAC;IAEZ,GAAG,CAAC,EAAE,GAAG,CAAC;gBAEE,GAAG,CAAC,EAAE,MAAM;IAIxB,KAAK,CAAC,OAAO,EAAE,wBAAwB;IAWjC,IAAI,CAAC,MAAM,EAAE,GAAG;IAMhB,WAAW;IAUjB,SAAS,CAAC,UAAU,EAAE,GAAG;IAMnB,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,2BAA2B,CAAC;IAY/C,SAAS;;;;;;;IAMf,aAAa,CAAC,KAAK,EAAE,YAAY;IAS3B,OAAO,CAAC,KAAK,EAAE,YAAY;IAK3B,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAUzC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAyBjE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAYjE,IAAI,CAAC,OAAO,EAAE,MAAM;IAe1B,aAAa;IAKb,IAAI;IAIJ,MAAM;CAGP"}
package/dist/index.js CHANGED
@@ -127,11 +127,8 @@ axios__default["default"].interceptors.request.use((config) => {
127
127
 
128
128
  const DEFAULT_URL = 'http://localhost:21320';
129
129
 
130
- const { check, ProtocolV1, parseConfigure } = transport__default["default"];
130
+ const { check, buildOne, receiveOne, parseConfigure } = transport__default["default"];
131
131
  class HttpTransport {
132
- getProtocolType(_path) {
133
- return 'V1';
134
- }
135
132
  constructor(url) {
136
133
  this.name = 'HttpTransport';
137
134
  this.configured = false;
@@ -222,7 +219,7 @@ class HttpTransport {
222
219
  else {
223
220
  this.Log.debug('call-', ' name: ', name, ' data: ', data);
224
221
  }
225
- const o = ProtocolV1.encodeEnvelope(messages, name, data);
222
+ const o = buildOne(messages, name, data);
226
223
  const outData = o.toString('hex');
227
224
  const resData = yield this._post({
228
225
  url: `/call/${session}`,
@@ -232,7 +229,7 @@ class HttpTransport {
232
229
  if (typeof resData !== 'string') {
233
230
  throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
234
231
  }
235
- const jsonData = ProtocolV1.decodeMessage(messages, resData);
232
+ const jsonData = receiveOne(messages, resData);
236
233
  return check.call(jsonData);
237
234
  });
238
235
  }
@@ -242,7 +239,7 @@ class HttpTransport {
242
239
  throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
243
240
  }
244
241
  const messages = this._messages;
245
- const outData = ProtocolV1.encodeEnvelope(messages, name, data).toString('hex');
242
+ const outData = buildOne(messages, name, data).toString('hex');
246
243
  yield this._post({
247
244
  url: `/post/${session}`,
248
245
  body: outData,
@@ -261,7 +258,7 @@ class HttpTransport {
261
258
  if (typeof resData !== 'string') {
262
259
  throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
263
260
  }
264
- const jsonData = ProtocolV1.decodeMessage(messages, resData);
261
+ const jsonData = receiveOne(messages, resData);
265
262
  return check.call(jsonData);
266
263
  });
267
264
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-transport-http",
3
- "version": "1.1.27-alpha.34",
3
+ "version": "1.1.27-alpha.4",
4
4
  "description": "hardware http transport",
5
5
  "author": "OneKey",
6
6
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,10 +24,10 @@
24
24
  "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
25
25
  },
26
26
  "dependencies": {
27
- "@onekeyfe/hd-shared": "1.1.27-alpha.34",
28
- "@onekeyfe/hd-transport": "1.1.27-alpha.34",
27
+ "@onekeyfe/hd-shared": "1.1.27-alpha.4",
28
+ "@onekeyfe/hd-transport": "1.1.27-alpha.4",
29
29
  "axios": "1.15.2",
30
30
  "secure-json-parse": "^4.0.0"
31
31
  },
32
- "gitHead": "ff1863a1ff300ada1314b7315e5ab827663d9f4c"
32
+ "gitHead": "93d0e7734f8c3a6380be10f74de203f0ba785bb8"
33
33
  }
package/src/index.ts CHANGED
@@ -4,13 +4,9 @@ import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
4
4
  import { request as http } from './http';
5
5
  import { DEFAULT_URL } from './constants';
6
6
 
7
- import type {
8
- AcquireInput,
9
- OneKeyDeviceInfoWithSession,
10
- ProtocolType,
11
- } from '@onekeyfe/hd-transport';
7
+ import type { AcquireInput, OneKeyDeviceInfoWithSession } from '@onekeyfe/hd-transport';
12
8
 
13
- const { check, ProtocolV1, parseConfigure } = transport;
9
+ const { check, buildOne, receiveOne, parseConfigure } = transport;
14
10
 
15
11
  type IncompleteRequestOptions = {
16
12
  body?: Array<any> | Record<string, unknown> | string;
@@ -31,11 +27,6 @@ export default class HttpTransport {
31
27
 
32
28
  Log?: any;
33
29
 
34
- // HttpTransport (Bridge) speaks Protocol V1 only.
35
- getProtocolType(_path: string): ProtocolType {
36
- return 'V1';
37
- }
38
-
39
30
  constructor(url?: string) {
40
31
  this.url = url == null ? DEFAULT_URL : url;
41
32
  }
@@ -126,7 +117,7 @@ export default class HttpTransport {
126
117
  this.Log.debug('call-', ' name: ', name, ' data: ', data);
127
118
  }
128
119
 
129
- const o = ProtocolV1.encodeEnvelope(messages, name, data);
120
+ const o = buildOne(messages, name, data);
130
121
  const outData = o.toString('hex');
131
122
  const resData = await this._post({
132
123
  url: `/call/${session}`,
@@ -136,7 +127,7 @@ export default class HttpTransport {
136
127
  if (typeof resData !== 'string') {
137
128
  throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
138
129
  }
139
- const jsonData = ProtocolV1.decodeMessage(messages, resData);
130
+ const jsonData = receiveOne(messages, resData);
140
131
  return check.call(jsonData);
141
132
  }
142
133
 
@@ -145,7 +136,7 @@ export default class HttpTransport {
145
136
  throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
146
137
  }
147
138
  const messages = this._messages;
148
- const outData = ProtocolV1.encodeEnvelope(messages, name, data).toString('hex');
139
+ const outData = buildOne(messages, name, data).toString('hex');
149
140
  await this._post({
150
141
  url: `/post/${session}`,
151
142
  body: outData,
@@ -163,7 +154,7 @@ export default class HttpTransport {
163
154
  if (typeof resData !== 'string') {
164
155
  throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
165
156
  }
166
- const jsonData = ProtocolV1.decodeMessage(messages, resData);
157
+ const jsonData = receiveOne(messages, resData);
167
158
  return check.call(jsonData);
168
159
  }
169
160