@onekeyfe/hd-web-sdk 0.1.24 → 0.1.27
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/data/config.ts +1 -1
- package/build/iframe.html +1 -1
- package/build/js/iframe.018b08d876d5a3fcfde7.js +3 -0
- package/build/js/{iframe.d989798a9cd215994caa.js.LICENSE.txt → iframe.018b08d876d5a3fcfde7.js.LICENSE.txt} +0 -0
- package/build/js/iframe.018b08d876d5a3fcfde7.js.map +1 -0
- package/build/onekey-js-sdk.js +78 -8
- 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/index.d.ts.map +1 -1
- package/dist/index.js +13 -4
- package/dist/index.js.map +1 -1
- package/dist/utils/bridgeUtils.d.ts +1 -0
- package/dist/utils/bridgeUtils.d.ts.map +1 -1
- package/dist/utils/bridgeUtils.js +3 -1
- package/dist/utils/bridgeUtils.js.map +1 -1
- package/package.json +6 -6
- package/src/index.ts +16 -4
- package/src/utils/bridgeUtils.ts +7 -1
- package/build/js/iframe.d989798a9cd215994caa.js +0 -3
- package/build/js/iframe.d989798a9cd215994caa.js.map +0 -1
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA6KA,QAAA,MAAM,cAAc,qCAOlB,CAAC;AAEH,eAAe,cAAc,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -36,6 +36,9 @@ const handleMessage = (message) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
36
36
|
if (message.type === hd_core_1.DEVICE.FEATURES) {
|
|
37
37
|
eventEmitter.emit(message.type, message.payload);
|
|
38
38
|
}
|
|
39
|
+
if (message.type === hd_core_1.DEVICE.SUPPORT_FEATURES) {
|
|
40
|
+
eventEmitter.emit(message.type, message.payload);
|
|
41
|
+
}
|
|
39
42
|
break;
|
|
40
43
|
default:
|
|
41
44
|
Log.log('No need to be captured message', message.event);
|
|
@@ -57,15 +60,17 @@ const uiResponse = (response) => {
|
|
|
57
60
|
const cancel = (connectId) => {
|
|
58
61
|
(0, bridgeUtils_1.sendMessage)({ event: hd_core_1.IFRAME.CANCEL, type: hd_core_1.IFRAME.CANCEL, payload: { connectId } });
|
|
59
62
|
};
|
|
63
|
+
let prevFrameInstance = null;
|
|
60
64
|
const createJSBridge = (messageEvent) => {
|
|
61
|
-
var _a;
|
|
65
|
+
var _a, _b, _c;
|
|
62
66
|
if (messageEvent.origin !== iframe.origin) {
|
|
63
67
|
return;
|
|
64
68
|
}
|
|
65
|
-
if (!bridgeUtils_1.hostBridge) {
|
|
69
|
+
if (!bridgeUtils_1.hostBridge || prevFrameInstance !== ((_a = iframe.instance) === null || _a === void 0 ? void 0 : _a.contentWindow)) {
|
|
70
|
+
(0, bridgeUtils_1.resetListenerFlag)();
|
|
66
71
|
(0, bridgeUtils_1.createJsBridge)({
|
|
67
72
|
isHost: true,
|
|
68
|
-
remoteFrame: (
|
|
73
|
+
remoteFrame: (_b = iframe.instance) === null || _b === void 0 ? void 0 : _b.contentWindow,
|
|
69
74
|
remoteFrameName: bridge_config_1.default.iframeName,
|
|
70
75
|
selfFrameName: bridge_config_1.default.hostName,
|
|
71
76
|
channel: bridge_config_1.default.channel,
|
|
@@ -82,6 +87,7 @@ const createJSBridge = (messageEvent) => {
|
|
|
82
87
|
return response;
|
|
83
88
|
}),
|
|
84
89
|
});
|
|
90
|
+
prevFrameInstance = (_c = iframe.instance) === null || _c === void 0 ? void 0 : _c.contentWindow;
|
|
85
91
|
}
|
|
86
92
|
};
|
|
87
93
|
const init = (settings) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -107,10 +113,13 @@ const call = (params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
107
113
|
Log.debug('call : ', params);
|
|
108
114
|
if (!iframe.instance && !iframe.timeout) {
|
|
109
115
|
_settings = (0, hd_core_1.parseConnectSettings)(_settings);
|
|
116
|
+
Log.debug("Try to recreate iframe if it's initialize failed: ", _settings);
|
|
110
117
|
try {
|
|
111
|
-
init(_settings);
|
|
118
|
+
yield init(_settings);
|
|
119
|
+
Log.debug('Recreate iframe success');
|
|
112
120
|
}
|
|
113
121
|
catch (error) {
|
|
122
|
+
Log.debug('Recreate iframe failed: ', error);
|
|
114
123
|
return (0, hd_core_1.createErrorMessage)(error);
|
|
115
124
|
}
|
|
116
125
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAkC;AAClC,+CAkB2B;AAC3B,mDAA+E;AAC/E,2CAA2C;AAC3C,0DAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAkC;AAClC,+CAkB2B;AAC3B,mDAA+E;AAC/E,2CAA2C;AAC3C,0DAAoD;AACpD,qDAAiG;AAEjG,MAAM,YAAY,GAAG,IAAI,gBAAY,EAAE,CAAC;AACxC,MAAM,GAAG,GAAG,IAAA,mBAAS,EAAC,qBAAW,CAAC,OAAO,CAAC,CAAC;AAE3C,IAAI,SAAS,GAAG,IAAA,8BAAoB,GAAE,CAAC;AAEvC,MAAM,aAAa,GAAG,CAAO,OAAoB,EAAE,EAAE;IACnD,QAAQ,OAAO,CAAC,KAAK,EAAE;QACrB,KAAK,kBAAQ;YACX,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAM,CAAC,WAAW,EAAE;gBACvC,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;gBAC7B,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAC;aAClF;YAGD,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC1C,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACjD,MAAM;QACR,KAAK,mBAAS,CAAC;QACf,KAAK,wBAAc;YACjB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC1C,MAAM;QACR,KAAK,sBAAY;YACf,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAM,CAAC,QAAQ,EAAE;gBACpC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;aAClD;YACD,IAAI,OAAO,CAAC,IAAI,KAAK,gBAAM,CAAC,gBAAgB,EAAE;gBAC5C,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;aAClD;YACD,MAAM;QAER;YACE,GAAG,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;KAC5D;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAG,GAAG,EAAE;IACnB,YAAY,CAAC,kBAAkB,EAAE,CAAC;IAClC,MAAM,CAAC,OAAO,EAAE,CAAC;IACjB,SAAS,GAAG,IAAA,8BAAoB,GAAE,CAAC;IACnC,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,QAAyB,EAAE,EAAE;IAC/C,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,MAAM,kBAAM,CAAC,UAAU,CAAC,6BAAiB,CAAC,oBAAoB,CAAC,CAAC;KACjE;IACD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;IACnC,IAAA,yBAAW,EAAC,EAAE,KAAK,EAAE,kBAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,SAAkB,EAAE,EAAE;IACpC,IAAA,yBAAW,EAAC,EAAE,KAAK,EAAE,gBAAM,CAAC,MAAM,EAAE,IAAI,EAAE,gBAAM,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;AACrF,CAAC,CAAC;AAEF,IAAI,iBAAiB,GAA8B,IAAI,CAAC;AACxD,MAAM,cAAc,GAAG,CAAC,YAA8B,EAAE,EAAE;;IACxD,IAAI,YAAY,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE;QACzC,OAAO;KACR;IACD,IAAI,CAAC,wBAAU,IAAI,iBAAiB,MAAK,MAAA,MAAM,CAAC,QAAQ,0CAAE,aAAa,CAAA,EAAE;QACvE,IAAA,+BAAiB,GAAE,CAAC;QACpB,IAAA,4BAAc,EAAC;YACb,MAAM,EAAE,IAAI;YACZ,WAAW,EAAE,MAAA,MAAM,CAAC,QAAQ,0CAAE,aAAuB;YACrD,eAAe,EAAE,uBAAc,CAAC,UAAU;YAC1C,aAAa,EAAE,uBAAc,CAAC,QAAQ;YACtC,OAAO,EAAE,uBAAc,CAAC,OAAO;YAC/B,YAAY,EAAE,MAAM,CAAC,MAAM;YAE3B,cAAc,EAAE,CAAM,YAAY,EAAC,EAAE;gBACnC,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,YAAY,CAAC,CAAC;gBAC3C,IAAI,OAAO,CAAC,KAAK,KAAK,WAAW,EAAE;oBACjC,GAAG,CAAC,KAAK,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;iBACrD;gBACD,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;gBAC9C,IAAI,OAAO,CAAC,KAAK,KAAK,WAAW,EAAE;oBACjC,GAAG,CAAC,KAAK,CAAC,wBAAwB,EAAE,QAAQ,CAAC,CAAC;iBAC/C;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAA;SACF,CAAC,CAAC;QAEH,iBAAiB,GAAG,MAAA,MAAM,CAAC,QAAQ,0CAAE,aAAa,CAAC;KACpD;AACH,CAAC,CAAC;AAEF,MAAM,IAAI,GAAG,CAAO,QAAkC,EAAE,EAAE;IACxD,IAAI,MAAM,CAAC,QAAQ,EAAE;QACnB,MAAM,kBAAM,CAAC,UAAU,CAAC,6BAAiB,CAAC,wBAAwB,CAAC,CAAC;KACrE;IAED,SAAS,GAAG,IAAA,8BAAoB,kCAAM,SAAS,GAAK,QAAQ,EAAG,CAAC;IAEhE,IAAA,mBAAS,EAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5B,IAAA,8BAAoB,EAAC,aAAa,CAAC,CAAC;IAEpC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAElB,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACnD,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE3C,IAAI;QACF,MAAM,MAAM,CAAC,IAAI,iCAAM,SAAS,KAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAG,CAAC;QAClE,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAC/B,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,IAAI,GAAG,CAAO,MAAW,EAAE,EAAE;IACjC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAI7B,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;QACvC,SAAS,GAAG,IAAA,8BAAoB,EAAC,SAAS,CAAC,CAAC;QAC5C,GAAG,CAAC,KAAK,CAAC,oDAAoD,EAAE,SAAS,CAAC,CAAC;QAC3E,IAAI;YACF,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC;YACtB,GAAG,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;SACtC;QAAC,OAAO,KAAK,EAAE;YACd,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,IAAA,4BAAkB,EAAC,KAAK,CAAC,CAAC;SAClC;KACF;IAED,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,OAAO,IAAA,4BAAkB,EAAC,kBAAM,CAAC,UAAU,CAAC,6BAAiB,CAAC,cAAc,CAAC,CAAC,CAAC;KAChF;IAED,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,IAAA,yBAAW,EAAC,EAAE,KAAK,EAAE,gBAAM,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAM,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAC/F,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC;SACjB;QAED,OAAO,IAAA,4BAAkB,EAAC,kBAAM,CAAC,UAAU,CAAC,6BAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC;KACvF;IAAC,OAAO,KAAK,EAAE;QACd,GAAG,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACnC,IAAI,GAAG,GAAG,KAAK,CAAC;QAChB,IAAI,CAAC,CAAC,GAAG,YAAY,yBAAa,CAAC,EAAE;YACnC,GAAG,GAAG,kBAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAClD;QACD,OAAO,IAAA,4BAAkB,EAAC,GAAG,CAAC,CAAC;KAChC;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,cAAc,GAAG,IAAA,iBAAW,EAAC;IACjC,YAAY;IACZ,IAAI;IACJ,IAAI;IACJ,MAAM;IACN,OAAO;IACP,UAAU;CACX,CAAC,CAAC;AAEH,kBAAe,cAAc,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { IJsBridgeIframeConfig, JsBridgeIframe } from '@onekeyfe/cross-inpage-pr
|
|
|
2
2
|
import { CoreMessage } from '@onekeyfe/hd-core';
|
|
3
3
|
declare let frameBridge: JsBridgeIframe;
|
|
4
4
|
declare let hostBridge: JsBridgeIframe;
|
|
5
|
+
export declare const resetListenerFlag: () => void;
|
|
5
6
|
export declare const createJsBridge: (params: IJsBridgeIframeConfig & {
|
|
6
7
|
isHost: boolean;
|
|
7
8
|
}) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeUtils.d.ts","sourceRoot":"","sources":["../../src/utils/bridgeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"bridgeUtils.d.ts","sourceRoot":"","sources":["../../src/utils/bridgeUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,cAAc,EAEf,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,WAAW,EAA0B,MAAM,mBAAmB,CAAC;AAKxE,QAAA,IAAI,WAAW,EAAE,cAAc,CAAC;AAEhC,QAAA,IAAI,UAAU,EAAE,cAAc,CAAC;AAI/B,eAAO,MAAM,iBAAiB,YAA0C,CAAC;AAEzE,eAAO,MAAM,cAAc,WAAY,qBAAqB,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,SAOjF,CAAC;AAEF,eAAO,MAAM,WAAW,aAAoB,WAAW,uBAAkB,QAAQ,GAAG,CAmBnF,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC"}
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.hostBridge = exports.frameBridge = exports.sendMessage = exports.createJsBridge = void 0;
|
|
12
|
+
exports.hostBridge = exports.frameBridge = exports.sendMessage = exports.createJsBridge = exports.resetListenerFlag = void 0;
|
|
13
13
|
const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
|
|
14
14
|
const hd_core_1 = require("@onekeyfe/hd-core");
|
|
15
15
|
const hd_shared_1 = require("@onekeyfe/hd-shared");
|
|
@@ -19,6 +19,8 @@ exports.frameBridge = frameBridge;
|
|
|
19
19
|
let hostBridge;
|
|
20
20
|
exports.hostBridge = hostBridge;
|
|
21
21
|
const Log = (0, hd_core_1.getLogger)(hd_core_1.LoggerNames.SendMessage);
|
|
22
|
+
const resetListenerFlag = () => (0, cross_inpage_provider_core_1.setPostMessageListenerFlag)(false);
|
|
23
|
+
exports.resetListenerFlag = resetListenerFlag;
|
|
22
24
|
const createJsBridge = (params) => {
|
|
23
25
|
const bridge = new cross_inpage_provider_core_1.JsBridgeIframe(params);
|
|
24
26
|
if (params.isHost) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeUtils.js","sourceRoot":"","sources":["../../src/utils/bridgeUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"bridgeUtils.js","sourceRoot":"","sources":["../../src/utils/bridgeUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qFAI8C;AAC9C,+CAAwE;AACxE,mDAA6C;AAC7C,2DAAqD;AAGrD,IAAI,WAA2B,CAAC;AAsCvB,kCAAW;AApCpB,IAAI,UAA0B,CAAC;AAoCT,gCAAU;AAlChC,MAAM,GAAG,GAAG,IAAA,mBAAS,EAAC,qBAAW,CAAC,WAAW,CAAC,CAAC;AAExC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,IAAA,uDAA0B,EAAC,KAAK,CAAC,CAAC;AAA5D,QAAA,iBAAiB,qBAA2C;AAElE,MAAM,cAAc,GAAG,CAAC,MAAmD,EAAE,EAAE;IACpF,MAAM,MAAM,GAAG,IAAI,2CAAc,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,qBAAA,UAAU,GAAG,MAAM,CAAC;KACrB;SAAM;QACL,sBAAA,WAAW,GAAG,MAAM,CAAC;KACtB;AACH,CAAC,CAAC;AAPW,QAAA,cAAc,kBAOzB;AAEK,MAAM,WAAW,GAAG,CAAO,QAAqB,EAAE,MAAM,GAAG,IAAI,EAAgB,EAAE;IACtF,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC;IAEjD,IAAI;QACF,IAAI,QAAQ,CAAC,KAAK,KAAK,WAAW,EAAE;YAClC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;SAClC;QACD,MAAM,MAAM,GAAG,MAAM,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC;YACnC,KAAK,EAAE,uBAAc,CAAC,KAAK;YAC3B,IAAI,oBAAO,QAAQ,CAAE;SACtB,CAAC,CAAA,CAAC;QACH,IAAI,QAAQ,CAAC,KAAK,KAAK,WAAW,EAAE;YAClC,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SACjC;QACD,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,KAAK,EAAE;QACd,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjB,MAAM,kBAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KAClD;AACH,CAAC,CAAA,CAAC;AAnBW,QAAA,WAAW,eAmBtB"}
|
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.27",
|
|
4
4
|
"author": "OneKey",
|
|
5
5
|
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
|
|
6
6
|
"license": "ISC",
|
|
@@ -21,10 +21,10 @@
|
|
|
21
21
|
"test": "echo \"Error: run tests from root\" && exit 1"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@onekeyfe/cross-inpage-provider-core": "^0.0.
|
|
25
|
-
"@onekeyfe/hd-core": "^0.1.
|
|
26
|
-
"@onekeyfe/hd-shared": "^0.1.
|
|
27
|
-
"@onekeyfe/hd-transport-http": "^0.1.
|
|
24
|
+
"@onekeyfe/cross-inpage-provider-core": "^0.0.17",
|
|
25
|
+
"@onekeyfe/hd-core": "^0.1.27",
|
|
26
|
+
"@onekeyfe/hd-shared": "^0.1.27",
|
|
27
|
+
"@onekeyfe/hd-transport-http": "^0.1.27"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@babel/plugin-proposal-optional-chaining": "^7.17.12",
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"webpack-cli": "^4.9.2",
|
|
46
46
|
"webpack-plugin-serve": "^1.6.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "ef1b7644ea5ac5e94eda3e83dbf03f1d2ad1a688"
|
|
49
49
|
}
|
package/src/index.ts
CHANGED
|
@@ -21,7 +21,7 @@ import HardwareSdk, {
|
|
|
21
21
|
import { ERRORS, HardwareError, HardwareErrorCode } from '@onekeyfe/hd-shared';
|
|
22
22
|
import * as iframe from './iframe/builder';
|
|
23
23
|
import JSBridgeConfig from './iframe/bridge-config';
|
|
24
|
-
import { sendMessage, createJsBridge, hostBridge } from './utils/bridgeUtils';
|
|
24
|
+
import { sendMessage, createJsBridge, hostBridge, resetListenerFlag } from './utils/bridgeUtils';
|
|
25
25
|
|
|
26
26
|
const eventEmitter = new EventEmitter();
|
|
27
27
|
const Log = getLogger(LoggerNames.Connect);
|
|
@@ -48,6 +48,9 @@ const handleMessage = async (message: CoreMessage) => {
|
|
|
48
48
|
if (message.type === DEVICE.FEATURES) {
|
|
49
49
|
eventEmitter.emit(message.type, message.payload);
|
|
50
50
|
}
|
|
51
|
+
if (message.type === DEVICE.SUPPORT_FEATURES) {
|
|
52
|
+
eventEmitter.emit(message.type, message.payload);
|
|
53
|
+
}
|
|
51
54
|
break;
|
|
52
55
|
|
|
53
56
|
default:
|
|
@@ -74,11 +77,13 @@ const cancel = (connectId?: string) => {
|
|
|
74
77
|
sendMessage({ event: IFRAME.CANCEL, type: IFRAME.CANCEL, payload: { connectId } });
|
|
75
78
|
};
|
|
76
79
|
|
|
80
|
+
let prevFrameInstance: Window | null | undefined = null;
|
|
77
81
|
const createJSBridge = (messageEvent: PostMessageEvent) => {
|
|
78
82
|
if (messageEvent.origin !== iframe.origin) {
|
|
79
83
|
return;
|
|
80
84
|
}
|
|
81
|
-
if (!hostBridge) {
|
|
85
|
+
if (!hostBridge || prevFrameInstance !== iframe.instance?.contentWindow) {
|
|
86
|
+
resetListenerFlag();
|
|
82
87
|
createJsBridge({
|
|
83
88
|
isHost: true,
|
|
84
89
|
remoteFrame: iframe.instance?.contentWindow as Window,
|
|
@@ -99,6 +104,8 @@ const createJSBridge = (messageEvent: PostMessageEvent) => {
|
|
|
99
104
|
return response;
|
|
100
105
|
},
|
|
101
106
|
});
|
|
107
|
+
|
|
108
|
+
prevFrameInstance = iframe.instance?.contentWindow;
|
|
102
109
|
}
|
|
103
110
|
};
|
|
104
111
|
|
|
@@ -128,12 +135,17 @@ const init = async (settings: Partial<ConnectSettings>) => {
|
|
|
128
135
|
|
|
129
136
|
const call = async (params: any) => {
|
|
130
137
|
Log.debug('call : ', params);
|
|
131
|
-
|
|
138
|
+
/**
|
|
139
|
+
* Try to recreate iframe if it's initialize failed
|
|
140
|
+
*/
|
|
132
141
|
if (!iframe.instance && !iframe.timeout) {
|
|
133
142
|
_settings = parseConnectSettings(_settings);
|
|
143
|
+
Log.debug("Try to recreate iframe if it's initialize failed: ", _settings);
|
|
134
144
|
try {
|
|
135
|
-
init(_settings);
|
|
145
|
+
await init(_settings);
|
|
146
|
+
Log.debug('Recreate iframe success');
|
|
136
147
|
} catch (error) {
|
|
148
|
+
Log.debug('Recreate iframe failed: ', error);
|
|
137
149
|
return createErrorMessage(error);
|
|
138
150
|
}
|
|
139
151
|
}
|
package/src/utils/bridgeUtils.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
IJsBridgeIframeConfig,
|
|
3
|
+
JsBridgeIframe,
|
|
4
|
+
setPostMessageListenerFlag,
|
|
5
|
+
} from '@onekeyfe/cross-inpage-provider-core';
|
|
2
6
|
import { CoreMessage, getLogger, LoggerNames } from '@onekeyfe/hd-core';
|
|
3
7
|
import { ERRORS } from '@onekeyfe/hd-shared';
|
|
4
8
|
import JSBridgeConfig from '../iframe/bridge-config';
|
|
@@ -10,6 +14,8 @@ let hostBridge: JsBridgeIframe;
|
|
|
10
14
|
|
|
11
15
|
const Log = getLogger(LoggerNames.SendMessage);
|
|
12
16
|
|
|
17
|
+
export const resetListenerFlag = () => setPostMessageListenerFlag(false);
|
|
18
|
+
|
|
13
19
|
export const createJsBridge = (params: IJsBridgeIframeConfig & { isHost: boolean }) => {
|
|
14
20
|
const bridge = new JsBridgeIframe(params);
|
|
15
21
|
if (params.isHost) {
|