@onekeyfe/hd-transport-http 1.1.34-alpha.3 → 1.1.34-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 +11 -9
  4. package/package.json +4 -4
  5. package/src/index.ts +12 -17
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,SAAS,MAAM,wBAAwB,CAAC;AAM/C,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;IAqBjE,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;
@@ -216,8 +213,13 @@ class HttpTransport {
216
213
  throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
217
214
  }
218
215
  const messages = this._messages;
219
- this.Log.debug('transport call', { name, protocol: 'V1' });
220
- const o = ProtocolV1.encodeEnvelope(messages, name, data);
216
+ if (transport.LogBlockCommand.has(name)) {
217
+ this.Log.debug('call-', ' name: ', name);
218
+ }
219
+ else {
220
+ this.Log.debug('call-', ' name: ', name, ' data: ', data);
221
+ }
222
+ const o = buildOne(messages, name, data);
221
223
  const outData = o.toString('hex');
222
224
  const resData = yield this._post({
223
225
  url: `/call/${session}`,
@@ -227,7 +229,7 @@ class HttpTransport {
227
229
  if (typeof resData !== 'string') {
228
230
  throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
229
231
  }
230
- const jsonData = ProtocolV1.decodeMessage(messages, resData);
232
+ const jsonData = receiveOne(messages, resData);
231
233
  return check.call(jsonData);
232
234
  });
233
235
  }
@@ -237,7 +239,7 @@ class HttpTransport {
237
239
  throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
238
240
  }
239
241
  const messages = this._messages;
240
- const outData = ProtocolV1.encodeEnvelope(messages, name, data).toString('hex');
242
+ const outData = buildOne(messages, name, data).toString('hex');
241
243
  yield this._post({
242
244
  url: `/post/${session}`,
243
245
  body: outData,
@@ -256,7 +258,7 @@ class HttpTransport {
256
258
  if (typeof resData !== 'string') {
257
259
  throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
258
260
  }
259
- const jsonData = ProtocolV1.decodeMessage(messages, resData);
261
+ const jsonData = receiveOne(messages, resData);
260
262
  return check.call(jsonData);
261
263
  });
262
264
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-transport-http",
3
- "version": "1.1.34-alpha.3",
3
+ "version": "1.1.34-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.34-alpha.3",
28
- "@onekeyfe/hd-transport": "1.1.34-alpha.3",
27
+ "@onekeyfe/hd-shared": "1.1.34-alpha.4",
28
+ "@onekeyfe/hd-transport": "1.1.34-alpha.4",
29
29
  "axios": "1.15.2",
30
30
  "secure-json-parse": "^4.0.0"
31
31
  },
32
- "gitHead": "3688bc8495eeb2ffd5616270d13fa29e8967623a"
32
+ "gitHead": "d546bc55410990351d34009230aefea77725d0d6"
33
33
  }
package/src/index.ts CHANGED
@@ -1,16 +1,12 @@
1
- import transport from '@onekeyfe/hd-transport';
1
+ import transport, { LogBlockCommand } from '@onekeyfe/hd-transport';
2
2
  import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
3
3
 
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
  }
@@ -120,9 +111,13 @@ export default class HttpTransport {
120
111
  throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
121
112
  }
122
113
  const messages = this._messages;
123
- this.Log.debug('transport call', { name, protocol: 'V1' });
114
+ if (LogBlockCommand.has(name)) {
115
+ this.Log.debug('call-', ' name: ', name);
116
+ } else {
117
+ this.Log.debug('call-', ' name: ', name, ' data: ', data);
118
+ }
124
119
 
125
- const o = ProtocolV1.encodeEnvelope(messages, name, data);
120
+ const o = buildOne(messages, name, data);
126
121
  const outData = o.toString('hex');
127
122
  const resData = await this._post({
128
123
  url: `/call/${session}`,
@@ -132,7 +127,7 @@ export default class HttpTransport {
132
127
  if (typeof resData !== 'string') {
133
128
  throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
134
129
  }
135
- const jsonData = ProtocolV1.decodeMessage(messages, resData);
130
+ const jsonData = receiveOne(messages, resData);
136
131
  return check.call(jsonData);
137
132
  }
138
133
 
@@ -141,7 +136,7 @@ export default class HttpTransport {
141
136
  throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
142
137
  }
143
138
  const messages = this._messages;
144
- const outData = ProtocolV1.encodeEnvelope(messages, name, data).toString('hex');
139
+ const outData = buildOne(messages, name, data).toString('hex');
145
140
  await this._post({
146
141
  url: `/post/${session}`,
147
142
  body: outData,
@@ -159,7 +154,7 @@ export default class HttpTransport {
159
154
  if (typeof resData !== 'string') {
160
155
  throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
161
156
  }
162
- const jsonData = ProtocolV1.decodeMessage(messages, resData);
157
+ const jsonData = receiveOne(messages, resData);
163
158
  return check.call(jsonData);
164
159
  }
165
160