@onekeyfe/hd-web-sdk 0.1.3 → 0.1.6
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/build/iframe.html +1 -1
- package/build/js/iframe.0e15f0de728fe9dcfcab.js +3 -0
- package/build/js/{iframe.435f82a3bee253ffd1d3.js.LICENSE.txt → iframe.0e15f0de728fe9dcfcab.js.LICENSE.txt} +0 -0
- package/build/js/iframe.0e15f0de728fe9dcfcab.js.map +1 -0
- package/build/onekey-js-sdk.js +395 -177
- package/build/onekey-js-sdk.js.map +1 -1
- package/build/onekey-js-sdk.min.js +1 -1
- package/build/onekey-js-sdk.min.js.map +1 -1
- package/dist/iframe/builder.d.ts +1 -1
- package/dist/iframe/builder.d.ts.map +1 -1
- package/dist/iframe/builder.js +5 -5
- package/dist/iframe/builder.js.map +1 -1
- package/dist/index.js +5 -4
- package/dist/index.js.map +1 -1
- package/package.json +5 -4
- package/src/iframe/builder.ts +3 -3
- package/src/index.ts +5 -5
- package/webpack/iframe.webpack.config.ts +6 -1
- package/build/js/iframe.435f82a3bee253ffd1d3.js +0 -3
- package/build/js/iframe.435f82a3bee253ffd1d3.js.map +0 -1
package/dist/iframe/builder.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/iframe/builder.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/iframe/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA6C,MAAM,qBAAqB,CAAC;AAI1F,eAAO,IAAI,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAC;AAC9C,eAAO,IAAI,MAAM,EAAE,MAAM,CAAC;AAC1B,eAAO,IAAI,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAoB,CAAC;AAC1D,eAAO,IAAI,OAAO,QAAI,CAAC;AAGvB,eAAO,MAAM,IAAI,aAAoB,GAAG,kBA0EvC,CAAC;AAEF,eAAO,MAAM,OAAO,YAUnB,CAAC"}
|
package/dist/iframe/builder.js
CHANGED
|
@@ -10,12 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.dispose = exports.init = exports.timeout = exports.initPromise = exports.origin = exports.instance = void 0;
|
|
13
|
-
const
|
|
13
|
+
const hd_shared_1 = require("@onekeyfe/hd-shared");
|
|
14
14
|
const urlUtils_1 = require("../utils/urlUtils");
|
|
15
|
-
exports.initPromise = (0,
|
|
15
|
+
exports.initPromise = (0, hd_shared_1.createDeferred)();
|
|
16
16
|
exports.timeout = 0;
|
|
17
17
|
const init = (settings) => __awaiter(void 0, void 0, void 0, function* () {
|
|
18
|
-
exports.initPromise = (0,
|
|
18
|
+
exports.initPromise = (0, hd_shared_1.createDeferred)();
|
|
19
19
|
const existedFrame = document.getElementById('onekey-connect');
|
|
20
20
|
if (existedFrame) {
|
|
21
21
|
exports.instance = existedFrame;
|
|
@@ -37,12 +37,12 @@ const init = (settings) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
37
37
|
exports.instance.setAttribute('src', src);
|
|
38
38
|
exports.origin = (0, urlUtils_1.getOrigin)(exports.instance.src);
|
|
39
39
|
exports.timeout = window.setTimeout(() => {
|
|
40
|
-
exports.initPromise.reject(
|
|
40
|
+
exports.initPromise.reject(hd_shared_1.ERRORS.TypedError(hd_shared_1.HardwareErrorCode.IframeTimeout));
|
|
41
41
|
}, 10000);
|
|
42
42
|
const onLoad = () => {
|
|
43
43
|
var _a;
|
|
44
44
|
if (!exports.instance) {
|
|
45
|
-
exports.initPromise.reject(
|
|
45
|
+
exports.initPromise.reject(hd_shared_1.ERRORS.TypedError(hd_shared_1.HardwareErrorCode.IframeBlocked));
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
48
|
(_a = exports.instance.contentWindow) === null || _a === void 0 ? void 0 : _a.postMessage({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/iframe/builder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/iframe/builder.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
const events_1 = require("events");
|
|
13
13
|
const hd_core_1 = require("@onekeyfe/hd-core");
|
|
14
|
+
const hd_shared_1 = require("@onekeyfe/hd-shared");
|
|
14
15
|
const iframe = require("./iframe/builder");
|
|
15
16
|
const bridge_config_1 = require("./iframe/bridge-config");
|
|
16
17
|
const bridgeUtils_1 = require("./utils/bridgeUtils");
|
|
@@ -39,7 +40,7 @@ const dispose = () => {
|
|
|
39
40
|
};
|
|
40
41
|
const uiResponse = (response) => {
|
|
41
42
|
if (!iframe.instance) {
|
|
42
|
-
throw
|
|
43
|
+
throw hd_shared_1.ERRORS.TypedError(hd_shared_1.HardwareErrorCode.IFrameNotInitialized);
|
|
43
44
|
}
|
|
44
45
|
const { type, payload } = response;
|
|
45
46
|
(0, bridgeUtils_1.sendMessage)({ event: hd_core_1.UI_EVENT, type, payload });
|
|
@@ -72,7 +73,7 @@ const createJSBridge = (messageEvent) => {
|
|
|
72
73
|
};
|
|
73
74
|
const init = (settings) => __awaiter(void 0, void 0, void 0, function* () {
|
|
74
75
|
if (iframe.instance) {
|
|
75
|
-
throw
|
|
76
|
+
throw hd_shared_1.ERRORS.TypedError(hd_shared_1.HardwareErrorCode.IFrameAleradyInitialized);
|
|
76
77
|
}
|
|
77
78
|
_settings = (0, hd_core_1.parseConnectSettings)(Object.assign(Object.assign({}, _settings), settings));
|
|
78
79
|
(0, hd_core_1.enableLog)(!!settings.debug);
|
|
@@ -100,14 +101,14 @@ const call = (params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
100
101
|
}
|
|
101
102
|
}
|
|
102
103
|
if (iframe.timeout) {
|
|
103
|
-
return (0, hd_core_1.createErrorMessage)(
|
|
104
|
+
return (0, hd_core_1.createErrorMessage)(hd_shared_1.ERRORS.TypedError(hd_shared_1.HardwareErrorCode.IFrameLoadFail));
|
|
104
105
|
}
|
|
105
106
|
try {
|
|
106
107
|
const response = yield (0, bridgeUtils_1.sendMessage)({ event: hd_core_1.IFRAME.CALL, type: hd_core_1.IFRAME.CALL, payload: params });
|
|
107
108
|
if (response) {
|
|
108
109
|
return response;
|
|
109
110
|
}
|
|
110
|
-
return (0, hd_core_1.createErrorMessage)(
|
|
111
|
+
return (0, hd_core_1.createErrorMessage)(hd_shared_1.ERRORS.TypedError(hd_shared_1.HardwareErrorCode.CallMethodNotResponse));
|
|
111
112
|
}
|
|
112
113
|
catch (error) {
|
|
113
114
|
Log.error('__call error: ', error);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAkC;AAClC,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-web-sdk",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.6",
|
|
4
4
|
"author": "OneKey",
|
|
5
5
|
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
|
|
6
6
|
"license": "ISC",
|
|
@@ -22,8 +22,9 @@
|
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@onekeyfe/cross-inpage-provider-core": "^0.0.14",
|
|
25
|
-
"@onekeyfe/hd-core": "^0.1.
|
|
26
|
-
"@onekeyfe/hd-
|
|
25
|
+
"@onekeyfe/hd-core": "^0.1.6",
|
|
26
|
+
"@onekeyfe/hd-shared": "^0.1.6",
|
|
27
|
+
"@onekeyfe/hd-transport-http": "^0.1.6"
|
|
27
28
|
},
|
|
28
29
|
"devDependencies": {
|
|
29
30
|
"@babel/plugin-proposal-optional-chaining": "^7.17.12",
|
|
@@ -44,5 +45,5 @@
|
|
|
44
45
|
"webpack-cli": "^4.9.2",
|
|
45
46
|
"webpack-plugin-serve": "^1.6.0"
|
|
46
47
|
},
|
|
47
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "ebe2789fa24cbfb798c9be445678e71e67e33d71"
|
|
48
49
|
}
|
package/src/iframe/builder.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Deferred, createDeferred, HardwareErrorCode, ERRORS } from '@onekeyfe/hd-shared';
|
|
2
2
|
import { getOrigin } from '../utils/urlUtils';
|
|
3
3
|
|
|
4
4
|
/* eslint-disable import/no-mutable-exports */
|
|
@@ -33,12 +33,12 @@ export const init = async (settings: any) => {
|
|
|
33
33
|
|
|
34
34
|
origin = getOrigin(instance.src);
|
|
35
35
|
timeout = window.setTimeout(() => {
|
|
36
|
-
initPromise.reject(ERRORS.TypedError(
|
|
36
|
+
initPromise.reject(ERRORS.TypedError(HardwareErrorCode.IframeTimeout));
|
|
37
37
|
}, 10000);
|
|
38
38
|
|
|
39
39
|
const onLoad = () => {
|
|
40
40
|
if (!instance) {
|
|
41
|
-
initPromise.reject(ERRORS.TypedError(
|
|
41
|
+
initPromise.reject(ERRORS.TypedError(HardwareErrorCode.IframeBlocked));
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
44
|
|
package/src/index.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import EventEmitter from 'events';
|
|
2
2
|
import HardwareSdk, {
|
|
3
|
-
ERRORS,
|
|
4
3
|
parseConnectSettings,
|
|
5
4
|
initLog,
|
|
6
5
|
enableLog,
|
|
@@ -13,6 +12,7 @@ import HardwareSdk, {
|
|
|
13
12
|
ConnectSettings,
|
|
14
13
|
UiResponseEvent,
|
|
15
14
|
} from '@onekeyfe/hd-core';
|
|
15
|
+
import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
|
|
16
16
|
import * as iframe from './iframe/builder';
|
|
17
17
|
import JSBridgeConfig from './iframe/bridge-config';
|
|
18
18
|
import { sendMessage, createJsBridge, hostBridge } from './utils/bridgeUtils';
|
|
@@ -49,7 +49,7 @@ const dispose = () => {
|
|
|
49
49
|
|
|
50
50
|
const uiResponse = (response: UiResponseEvent) => {
|
|
51
51
|
if (!iframe.instance) {
|
|
52
|
-
throw ERRORS.TypedError(
|
|
52
|
+
throw ERRORS.TypedError(HardwareErrorCode.IFrameNotInitialized);
|
|
53
53
|
}
|
|
54
54
|
const { type, payload } = response;
|
|
55
55
|
sendMessage({ event: UI_EVENT, type, payload });
|
|
@@ -85,7 +85,7 @@ const createJSBridge = (messageEvent: PostMessageEvent) => {
|
|
|
85
85
|
|
|
86
86
|
const init = async (settings: Partial<ConnectSettings>) => {
|
|
87
87
|
if (iframe.instance) {
|
|
88
|
-
throw ERRORS.TypedError(
|
|
88
|
+
throw ERRORS.TypedError(HardwareErrorCode.IFrameAleradyInitialized);
|
|
89
89
|
}
|
|
90
90
|
|
|
91
91
|
_settings = parseConnectSettings({ ..._settings, ...settings });
|
|
@@ -119,7 +119,7 @@ const call = async (params: any) => {
|
|
|
119
119
|
}
|
|
120
120
|
|
|
121
121
|
if (iframe.timeout) {
|
|
122
|
-
return createErrorMessage(ERRORS.TypedError(
|
|
122
|
+
return createErrorMessage(ERRORS.TypedError(HardwareErrorCode.IFrameLoadFail));
|
|
123
123
|
}
|
|
124
124
|
|
|
125
125
|
try {
|
|
@@ -128,7 +128,7 @@ const call = async (params: any) => {
|
|
|
128
128
|
return response;
|
|
129
129
|
}
|
|
130
130
|
|
|
131
|
-
return createErrorMessage(ERRORS.TypedError(
|
|
131
|
+
return createErrorMessage(ERRORS.TypedError(HardwareErrorCode.CallMethodNotResponse));
|
|
132
132
|
} catch (error) {
|
|
133
133
|
Log.error('__call error: ', error);
|
|
134
134
|
return createErrorMessage(error);
|
|
@@ -5,6 +5,7 @@ import CopyWebpackPlugin from 'copy-webpack-plugin';
|
|
|
5
5
|
import config from './webpack.config';
|
|
6
6
|
|
|
7
7
|
const BUILD = path.resolve(__dirname, '../build');
|
|
8
|
+
const PUBLIC_PATH = process.env.PUBLIC_PATH || './';
|
|
8
9
|
|
|
9
10
|
export default {
|
|
10
11
|
target: 'web',
|
|
@@ -16,7 +17,7 @@ export default {
|
|
|
16
17
|
output: {
|
|
17
18
|
filename: 'js/[name].[contenthash].js',
|
|
18
19
|
path: BUILD,
|
|
19
|
-
publicPath:
|
|
20
|
+
publicPath: PUBLIC_PATH,
|
|
20
21
|
},
|
|
21
22
|
module: {
|
|
22
23
|
rules: [
|
|
@@ -62,5 +63,9 @@ export default {
|
|
|
62
63
|
minify: false,
|
|
63
64
|
inject: false,
|
|
64
65
|
}),
|
|
66
|
+
|
|
67
|
+
new webpack.DefinePlugin({
|
|
68
|
+
'process.env.PUBLIC_PATH': JSON.stringify(PUBLIC_PATH),
|
|
69
|
+
}),
|
|
65
70
|
],
|
|
66
71
|
};
|