@onekeyfe/onekey-cross-webview 1.1.2 → 1.1.4

package/dist/DesktopWebView.d.ts

@@ -1,4 +1,11 @@
 import React from 'react';
 import { InpageProviderWebViewProps } from '@onekeyfe/cross-inpage-provider-types';
+export declare function waitAsync(timeout: number): Promise<unknown>;
+export declare function waitForDataLoaded({ data, wait, logName, timeout, }: {
+    data: (...args: any) => any;
+    wait?: number;
+    logName: string;
+    timeout?: number;
+}): Promise<void>;
 declare const DesktopWebView: React.ForwardRefExoticComponent<Pick<React.ClassAttributes<HTMLWebViewElement> & React.WebViewHTMLAttributes<HTMLWebViewElement> & InpageProviderWebViewProps, "slot" | "style" | "title" | "src" | "receiveHandler" | "onSrcChange" | "key" | "allowFullScreen" | "allowpopups" | "autoFocus" | "autosize" | "blinkfeatures" | "disableblinkfeatures" | "disableguestresize" | "disablewebsecurity" | "guestinstance" | "httpreferrer" | "nodeintegration" | "partition" | "plugins" | "preload" | "useragent" | "webpreferences" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "className" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "children" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture"> & React.RefAttributes<unknown>>;
 export { DesktopWebView };

package/dist/DesktopWebView.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -14,6 +23,10 @@ import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo
 import { consts } from '@onekeyfe/cross-inpage-provider-core';
 import { JsBridgeDesktopHost } from './JsBridgeDesktopHost';
 import { useIsIpcReady } from './useIsIpcReady';
+import isNil from 'lodash/isNil';
+import isEmpty from 'lodash/isEmpty';
+import isPlainObject from 'lodash/isPlainObject';
+import isArray from 'lodash/isArray';
 const isDev = process.env.NODE_ENV !== 'production';
 const isBrowser = true;
 function usePreloadJsUrl() {
@@ -36,6 +49,64 @@ function usePreloadJsUrl() {
 }
 // Used for webview type referencing
 const WEBVIEW_TAG = 'webview';
+export function waitAsync(timeout) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, timeout);
+    });
+}
+export function waitForDataLoaded({ data, wait = 600, logName, timeout = 0, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            void (() => __awaiter(this, void 0, void 0, function* () {
+                let timeoutReject = false;
+                let timer = null;
+                const getDataArrFunc = [].concat(data);
+                if (timeout) {
+                    timer = setTimeout(() => {
+                        timeoutReject = true;
+                    }, timeout);
+                }
+                // eslint-disable-next-line no-constant-condition
+                while (true) {
+                    let isAllLoaded = true;
+                    yield Promise.all(getDataArrFunc.map((getData) => __awaiter(this, void 0, void 0, function* () {
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+                        const d = yield getData();
+                        if (d === false) {
+                            isAllLoaded = false;
+                            return;
+                        }
+                        if (isNil(d)) {
+                            isAllLoaded = false;
+                            return;
+                        }
+                        if (isEmpty(d)) {
+                            if (isPlainObject(d) || isArray(d)) {
+                                isAllLoaded = false;
+                                return;
+                            }
+                        }
+                    })));
+                    if (isAllLoaded || timeoutReject) {
+                        break;
+                    }
+                    yield waitAsync(wait);
+                    if (logName) {
+                        console.log(`waitForDataLoaded: ${logName}`);
+                    }
+                }
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                clearTimeout(timer);
+                if (timeoutReject) {
+                    reject(new Error(`waitForDataLoaded: ${logName !== null && logName !== void 0 ? logName : ''} timeout`));
+                }
+                else {
+                    resolve();
+                }
+            }))();
+        });
+    });
+}
 const DesktopWebView = forwardRef((_a, ref) => {
     var { src, style, receiveHandler, onSrcChange } = _a, props = __rest(_a, ["src", "style", "receiveHandler", "onSrcChange"]);
     const [isWebviewReady, setIsWebviewReady] = useState(false);
@@ -87,16 +158,53 @@ const DesktopWebView = forwardRef((_a, ref) => {
         if (!webview || !isIpcReady || !isWebviewReady) {
             return;
         }
-        const handleMessage = (event) => {
-            var _a;
+        const handleMessage = (event) => __awaiter(void 0, void 0, void 0, function* () {
+            var _a, _b;
             if (event.channel === consts.JS_BRIDGE_MESSAGE_IPC_CHANNEL) {
                 const data = (_a = event === null || event === void 0 ? void 0 : event.args) === null || _a === void 0 ? void 0 : _a[0];
+                let originInRequest = '';
+                try {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                    originInRequest = (_b = JSON.parse(data)) === null || _b === void 0 ? void 0 : _b.origin;
+                }
+                catch (error) {
+                    // noop
+                }
+                finally {
+                    // noop
+                }
                 let origin = '';
-                // url initial value is empty after webview mounted first time
-                const url = event.target.getURL() || event.target.src || src;
-                if (url) {
-                    const uri = new URL(url);
-                    origin = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
+                yield waitForDataLoaded({
+                    wait: 600,
+                    logName: 'DesktopWebView waitForDataLoaded if origin matched',
+                    timeout: 5000,
+                    data: () => {
+                        let originInUrl = '';
+                        // url initial value is empty after webview mounted first time
+                        const url1 = event.target.getURL(); // url won't update immediately when goForward or goBack
+                        const url2 = event.target.src;
+                        const url3 = src;
+                        const url = url1 || url2 || url3;
+                        if (url) {
+                            try {
+                                const uri = new URL(url);
+                                originInUrl = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
+                            }
+                            catch (error) {
+                                // noop
+                            }
+                            finally {
+                                // noop
+                            }
+                        }
+                        if (originInUrl && originInRequest && originInUrl === originInRequest) {
+                            origin = originInRequest;
+                            return true;
+                        }
+                        return false;
+                    },
+                });
+                if (origin) {
                     // - receive
                     jsBridgeHost.receive(data, { origin });
                 }
@@ -106,7 +214,7 @@ const DesktopWebView = forwardRef((_a, ref) => {
             }
             // response back
             // webview.send();
-        };
+        });
         webview.addEventListener('ipc-message', handleMessage);
         return () => {
             webview.removeEventListener('ipc-message', handleMessage);
@@ -132,7 +240,7 @@ const DesktopWebView = forwardRef((_a, ref) => {
                 setDevToolsAtLeft(!devToolsAtLeft);
                 (_a = webviewRef.current) === null || _a === void 0 ? void 0 : _a.openDevTools();
             } }, "DevTools")),
-        isBrowser && (React.createElement("webview", Object.assign({ ref: initWebviewByRef, preload: preloadJsUrl, src: src, style: Object.assign({ 'width': '100%', 'height': '100%' }, style), 
+        isBrowser && (React.createElement("webview", Object.assign({ ref: initWebviewByRef, preload: preloadJsUrl, src: isIpcReady && isWebviewReady ? src : undefined, style: Object.assign({ 'width': '100%', 'height': '100%' }, style), 
             // @ts-ignore
             allowpopups: "true", 
             // @ts-ignore

package/dist/cjs/DesktopWebView.js

@@ -18,6 +18,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -29,13 +38,20 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DesktopWebView = void 0;
+exports.DesktopWebView = exports.waitForDataLoaded = exports.waitAsync = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment, @typescript-eslint/no-explicit-any */
 const react_1 = __importStar(require("react"));
 const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
 const JsBridgeDesktopHost_1 = require("./JsBridgeDesktopHost");
 const useIsIpcReady_1 = require("./useIsIpcReady");
+const isNil_1 = __importDefault(require("lodash/isNil"));
+const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
+const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
+const isArray_1 = __importDefault(require("lodash/isArray"));
 const isDev = process.env.NODE_ENV !== 'production';
 const isBrowser = true;
 function usePreloadJsUrl() {
@@ -58,6 +74,66 @@ function usePreloadJsUrl() {
 }
 // Used for webview type referencing
 const WEBVIEW_TAG = 'webview';
+function waitAsync(timeout) {
+    return new Promise((resolve) => {
+        setTimeout(resolve, timeout);
+    });
+}
+exports.waitAsync = waitAsync;
+function waitForDataLoaded({ data, wait = 600, logName, timeout = 0, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            void (() => __awaiter(this, void 0, void 0, function* () {
+                let timeoutReject = false;
+                let timer = null;
+                const getDataArrFunc = [].concat(data);
+                if (timeout) {
+                    timer = setTimeout(() => {
+                        timeoutReject = true;
+                    }, timeout);
+                }
+                // eslint-disable-next-line no-constant-condition
+                while (true) {
+                    let isAllLoaded = true;
+                    yield Promise.all(getDataArrFunc.map((getData) => __awaiter(this, void 0, void 0, function* () {
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+                        const d = yield getData();
+                        if (d === false) {
+                            isAllLoaded = false;
+                            return;
+                        }
+                        if ((0, isNil_1.default)(d)) {
+                            isAllLoaded = false;
+                            return;
+                        }
+                        if ((0, isEmpty_1.default)(d)) {
+                            if ((0, isPlainObject_1.default)(d) || (0, isArray_1.default)(d)) {
+                                isAllLoaded = false;
+                                return;
+                            }
+                        }
+                    })));
+                    if (isAllLoaded || timeoutReject) {
+                        break;
+                    }
+                    yield waitAsync(wait);
+                    if (logName) {
+                        console.log(`waitForDataLoaded: ${logName}`);
+                    }
+                }
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                clearTimeout(timer);
+                if (timeoutReject) {
+                    reject(new Error(`waitForDataLoaded: ${logName !== null && logName !== void 0 ? logName : ''} timeout`));
+                }
+                else {
+                    resolve();
+                }
+            }))();
+        });
+    });
+}
+exports.waitForDataLoaded = waitForDataLoaded;
 const DesktopWebView = (0, react_1.forwardRef)((_a, ref) => {
     var { src, style, receiveHandler, onSrcChange } = _a, props = __rest(_a, ["src", "style", "receiveHandler", "onSrcChange"]);
     const [isWebviewReady, setIsWebviewReady] = (0, react_1.useState)(false);
@@ -109,16 +185,53 @@ const DesktopWebView = (0, react_1.forwardRef)((_a, ref) => {
         if (!webview || !isIpcReady || !isWebviewReady) {
             return;
         }
-        const handleMessage = (event) => {
-            var _a;
+        const handleMessage = (event) => __awaiter(void 0, void 0, void 0, function* () {
+            var _a, _b;
             if (event.channel === cross_inpage_provider_core_1.consts.JS_BRIDGE_MESSAGE_IPC_CHANNEL) {
                 const data = (_a = event === null || event === void 0 ? void 0 : event.args) === null || _a === void 0 ? void 0 : _a[0];
+                let originInRequest = '';
+                try {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                    originInRequest = (_b = JSON.parse(data)) === null || _b === void 0 ? void 0 : _b.origin;
+                }
+                catch (error) {
+                    // noop
+                }
+                finally {
+                    // noop
+                }
                 let origin = '';
-                // url initial value is empty after webview mounted first time
-                const url = event.target.getURL() || event.target.src || src;
-                if (url) {
-                    const uri = new URL(url);
-                    origin = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
+                yield waitForDataLoaded({
+                    wait: 600,
+                    logName: 'DesktopWebView waitForDataLoaded if origin matched',
+                    timeout: 5000,
+                    data: () => {
+                        let originInUrl = '';
+                        // url initial value is empty after webview mounted first time
+                        const url1 = event.target.getURL(); // url won't update immediately when goForward or goBack
+                        const url2 = event.target.src;
+                        const url3 = src;
+                        const url = url1 || url2 || url3;
+                        if (url) {
+                            try {
+                                const uri = new URL(url);
+                                originInUrl = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
+                            }
+                            catch (error) {
+                                // noop
+                            }
+                            finally {
+                                // noop
+                            }
+                        }
+                        if (originInUrl && originInRequest && originInUrl === originInRequest) {
+                            origin = originInRequest;
+                            return true;
+                        }
+                        return false;
+                    },
+                });
+                if (origin) {
                     // - receive
                     jsBridgeHost.receive(data, { origin });
                 }
@@ -128,7 +241,7 @@ const DesktopWebView = (0, react_1.forwardRef)((_a, ref) => {
             }
             // response back
             // webview.send();
-        };
+        });
         webview.addEventListener('ipc-message', handleMessage);
         return () => {
             webview.removeEventListener('ipc-message', handleMessage);
@@ -154,7 +267,7 @@ const DesktopWebView = (0, react_1.forwardRef)((_a, ref) => {
                 setDevToolsAtLeft(!devToolsAtLeft);
                 (_a = webviewRef.current) === null || _a === void 0 ? void 0 : _a.openDevTools();
             } }, "DevTools")),
-        isBrowser && (react_1.default.createElement("webview", Object.assign({ ref: initWebviewByRef, preload: preloadJsUrl, src: src, style: Object.assign({ 'width': '100%', 'height': '100%' }, style), 
+        isBrowser && (react_1.default.createElement("webview", Object.assign({ ref: initWebviewByRef, preload: preloadJsUrl, src: isIpcReady && isWebviewReady ? src : undefined, style: Object.assign({ 'width': '100%', 'height': '100%' }, style), 
             // @ts-ignore
             allowpopups: "true", 
             // @ts-ignore

package/dist/cjs/index.js

@@ -10,9 +10,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./DesktopWebView"), exports);
+// DesktopWebView, NativeWebView moved to monorepo-app
+// export * from './DesktopWebView';
+// export * from './NativeWebView';
 __exportStar(require("./JsBridgeDesktopHost"), exports);
-__exportStar(require("./NativeWebView"), exports);
 __exportStar(require("./JsBridgeNativeHost"), exports);
 __exportStar(require("./useIsIpcReady"), exports);
 __exportStar(require("./useWebViewBridge"), exports);

package/dist/index.d.ts

@@ -1,6 +1,4 @@
-export * from './DesktopWebView';
 export * from './JsBridgeDesktopHost';
-export * from './NativeWebView';
 export * from './JsBridgeNativeHost';
 export * from './useIsIpcReady';
 export * from './useWebViewBridge';

package/dist/index.js

@@ -1,6 +1,7 @@
-export * from './DesktopWebView';
+// DesktopWebView, NativeWebView moved to monorepo-app
+// export * from './DesktopWebView';
+// export * from './NativeWebView';
 export * from './JsBridgeDesktopHost';
-export * from './NativeWebView';
 export * from './JsBridgeNativeHost';
 export * from './useIsIpcReady';
 export * from './useWebViewBridge';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onekeyfe/onekey-cross-webview",
-	"version": "1.1.2",
+	"version": "1.1.4",
 	"keywords": [
 		"cross-inpage-provider"
 	],
@@ -34,9 +34,9 @@
 		"electron": "^17.2.0"
 	},
 	"dependencies": {
-		"@onekeyfe/cross-inpage-provider-core": "1.1.2",
-		"@onekeyfe/cross-inpage-provider-types": "1.1.2",
+		"@onekeyfe/cross-inpage-provider-core": "1.1.4",
+		"@onekeyfe/cross-inpage-provider-types": "1.1.4",
 		"react-native-webview": "^11.17.2"
 	},
-	"gitHead": "08aef327a2fec587de325b1f9dc69caa97a86686"
+	"gitHead": "3dac702516b0f256787a29d2dd373440d3a60f8c"
 }