@onekeyfe/hd-transport-http 0.1.5 → 0.1.8

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 (6) hide show
  1. package/dist/http.d.ts.map +1 -1
  2. package/dist/index.d.ts.map +1 -1
  3. package/dist/index.js +10 -9
  4. package/package.json +4 -3
  5. package/src/http.ts +3 -2
  6. package/src/index.ts +8 -8
package/dist/http.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAEA,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;CACxB,CAAC;AAwBF,wBAAsB,OAAO,CAAC,OAAO,EAAE,kBAAkB,gBAsBxD"}
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;CACxB,CAAC;AAwBF,wBAAsB,OAAO,CAAC,OAAO,EAAE,kBAAkB,gBAsBxD"}
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;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAMxF,aAAK,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;CACb,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,GAAG,EAAE,MAAM,CAAC;gBAEA,GAAG,CAAC,EAAE,MAAM;IAIxB,KAAK,CAAC,OAAO,EAAE,wBAAwB;IAYjC,IAAI;IAKJ,WAAW;IASjB,SAAS,CAAC,UAAU,EAAE,GAAG;IAMnB,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,2BAA2B,CAAC;IAY/C,SAAS;IAMf,aAAa,CAAC,KAAK,EAAE,YAAY;IAO3B,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;IA4BjE,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,SAAS,MAAM,wBAAwB,CAAC;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAMxF,aAAK,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;CACb,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,GAAG,EAAE,MAAM,CAAC;gBAEA,GAAG,CAAC,EAAE,MAAM;IAIxB,KAAK,CAAC,OAAO,EAAE,wBAAwB;IAWjC,IAAI;IAKJ,WAAW;IASjB,SAAS,CAAC,UAAU,EAAE,GAAG;IAMnB,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,2BAA2B,CAAC;IAY/C,SAAS;IAMf,aAAa,CAAC,KAAK,EAAE,YAAY;IAO3B,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;IA4BjE,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
@@ -1,6 +1,7 @@
1
1
  'use strict';
2
2
 
3
3
  var transport = require('@onekeyfe/hd-transport');
4
+ var hdShared = require('@onekeyfe/hd-shared');
4
5
  var axios = require('axios');
5
6
 
6
7
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -70,10 +71,10 @@ function request(options) {
70
71
  }
71
72
  const resJson = parseResult(res.data);
72
73
  if (typeof resJson === 'object' && resJson != null && resJson.error != null) {
73
- throw new Error(resJson.error);
74
+ throw new hdShared.HardwareError({ errorCode: hdShared.HardwareErrorCode.NetworkError, message: resJson.error });
74
75
  }
75
76
  else {
76
- throw new Error(res.data);
77
+ throw new hdShared.HardwareError({ errorCode: hdShared.HardwareErrorCode.NetworkError, message: res.data });
77
78
  }
78
79
  });
79
80
  }
@@ -89,7 +90,7 @@ class HttpTransport {
89
90
  }
90
91
  _post(options) {
91
92
  if (this.stopped) {
92
- return Promise.reject('Transport stopped.');
93
+ return Promise.reject(hdShared.ERRORS.TypedError('Transport stopped.'));
93
94
  }
94
95
  return request(Object.assign(Object.assign({}, options), { method: 'POST', url: this.url + options.url }));
95
96
  }
@@ -117,7 +118,7 @@ class HttpTransport {
117
118
  listen(old) {
118
119
  return __awaiter(this, void 0, void 0, function* () {
119
120
  if (old === null) {
120
- throw new Error('Http-Transport does not support listen without previous.');
121
+ throw hdShared.ERRORS.TypedError('Http-Transport does not support listen without previous.');
121
122
  }
122
123
  const devicesS = yield this._post({
123
124
  url: '/listen',
@@ -159,7 +160,7 @@ class HttpTransport {
159
160
  call(session, name, data) {
160
161
  return __awaiter(this, void 0, void 0, function* () {
161
162
  if (this._messages == null) {
162
- throw new Error('Transport not configured.');
163
+ throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
163
164
  }
164
165
  const messages = this._messages;
165
166
  console.log('transport-http', 'call-', 'messages: ', messages, ' name: ', name, ' data: ', data);
@@ -170,7 +171,7 @@ class HttpTransport {
170
171
  body: outData,
171
172
  });
172
173
  if (typeof resData !== 'string') {
173
- throw new Error('Returning data is not string.');
174
+ throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
174
175
  }
175
176
  const jsonData = receiveOne(messages, resData);
176
177
  return check.call(jsonData);
@@ -179,7 +180,7 @@ class HttpTransport {
179
180
  post(session, name, data) {
180
181
  return __awaiter(this, void 0, void 0, function* () {
181
182
  if (this._messages == null) {
182
- throw new Error('Transport not configured.');
183
+ throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
183
184
  }
184
185
  const messages = this._messages;
185
186
  const outData = buildOne(messages, name, data).toString('hex');
@@ -192,14 +193,14 @@ class HttpTransport {
192
193
  read(session) {
193
194
  return __awaiter(this, void 0, void 0, function* () {
194
195
  if (this._messages == null) {
195
- throw new Error('Transport not configured.');
196
+ throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
196
197
  }
197
198
  const messages = this._messages;
198
199
  const resData = yield this._post({
199
200
  url: `/read/${session}`,
200
201
  });
201
202
  if (typeof resData !== 'string') {
202
- throw new Error('Returning data is not string.');
203
+ throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Returning data is not string.');
203
204
  }
204
205
  const jsonData = receiveOne(messages, resData);
205
206
  return check.call(jsonData);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-transport-http",
3
- "version": "0.1.5",
3
+ "version": "0.1.8",
4
4
  "description": "hardware http transport",
5
5
  "author": "OneKey",
6
6
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,9 @@
24
24
  "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
25
25
  },
26
26
  "dependencies": {
27
- "@onekeyfe/hd-transport": "^0.1.5",
27
+ "@onekeyfe/hd-shared": "^0.1.8",
28
+ "@onekeyfe/hd-transport": "^0.1.8",
28
29
  "axios": "^0.27.2"
29
30
  },
30
- "gitHead": "26a2b960d5e1917d3f2217cef449269200a1a376"
31
+ "gitHead": "d9514ac6207a2561ad107910ab005b3f9e12d794"
31
32
  }
package/src/http.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import axios, { AxiosRequestConfig } from 'axios';
2
+ import { HardwareError, HardwareErrorCode } from '@onekeyfe/hd-shared';
2
3
 
3
4
  export type HttpRequestOptions = {
4
5
  body?: Array<any> | Record<string, unknown> | string;
@@ -46,8 +47,8 @@ export async function request(options: HttpRequestOptions) {
46
47
  }
47
48
  const resJson = parseResult(res.data);
48
49
  if (typeof resJson === 'object' && resJson != null && resJson.error != null) {
49
- throw new Error(resJson.error);
50
+ throw new HardwareError({ errorCode: HardwareErrorCode.NetworkError, message: resJson.error });
50
51
  } else {
51
- throw new Error(res.data);
52
+ throw new HardwareError({ errorCode: HardwareErrorCode.NetworkError, message: res.data });
52
53
  }
53
54
  }
package/src/index.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import transport from '@onekeyfe/hd-transport';
2
+ import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
2
3
  import type { AcquireInput, OneKeyDeviceInfoWithSession } from '@onekeyfe/hd-transport';
3
4
  import { request as http } from './http';
4
5
  import { DEFAULT_URL } from './constants';
@@ -25,8 +26,7 @@ export default class HttpTransport {
25
26
 
26
27
  _post(options: IncompleteRequestOptions) {
27
28
  if (this.stopped) {
28
- // eslint-disable-next-line prefer-promise-reject-errors
29
- return Promise.reject('Transport stopped.');
29
+ return Promise.reject(ERRORS.TypedError('Transport stopped.'));
30
30
  }
31
31
  return http({
32
32
  ...options,
@@ -57,7 +57,7 @@ export default class HttpTransport {
57
57
 
58
58
  async listen(old?: Array<OneKeyDeviceInfoWithSession>) {
59
59
  if (old === null) {
60
- throw new Error('Http-Transport does not support listen without previous.');
60
+ throw ERRORS.TypedError('Http-Transport does not support listen without previous.');
61
61
  }
62
62
  const devicesS = await this._post({
63
63
  url: '/listen',
@@ -97,7 +97,7 @@ export default class HttpTransport {
97
97
 
98
98
  async call(session: string, name: string, data: Record<string, unknown>) {
99
99
  if (this._messages == null) {
100
- throw new Error('Transport not configured.');
100
+ throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
101
101
  }
102
102
  const messages = this._messages;
103
103
  console.log(
@@ -117,7 +117,7 @@ export default class HttpTransport {
117
117
  body: outData,
118
118
  });
119
119
  if (typeof resData !== 'string') {
120
- throw new Error('Returning data is not string.');
120
+ throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
121
121
  }
122
122
  const jsonData = receiveOne(messages, resData);
123
123
  return check.call(jsonData);
@@ -125,7 +125,7 @@ export default class HttpTransport {
125
125
 
126
126
  async post(session: string, name: string, data: Record<string, unknown>) {
127
127
  if (this._messages == null) {
128
- throw new Error('Transport not configured.');
128
+ throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
129
129
  }
130
130
  const messages = this._messages;
131
131
  const outData = buildOne(messages, name, data).toString('hex');
@@ -137,14 +137,14 @@ export default class HttpTransport {
137
137
 
138
138
  async read(session: string) {
139
139
  if (this._messages == null) {
140
- throw new Error('Transport not configured.');
140
+ throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
141
141
  }
142
142
  const messages = this._messages;
143
143
  const resData = await this._post({
144
144
  url: `/read/${session}`,
145
145
  });
146
146
  if (typeof resData !== 'string') {
147
- throw new Error('Returning data is not string.');
147
+ throw ERRORS.TypedError(HardwareErrorCode.NetworkError, 'Returning data is not string.');
148
148
  }
149
149
  const jsonData = receiveOne(messages, resData);
150
150
  return check.call(jsonData);