@hd-front-end/jsbridge-sdk 1.0.4 → 1.0.6

package/dist/index.js

@@ -225,9 +225,20 @@ class Bridge {
                 const timeoutId = setTimeout(() => {
                     reject(new Error(`${method} 调用超时`));
                 }, 10000);
+                // 核心防御：防止 DataCloneError 和 Vue Proxy 序列化失败
+                // 剥离可能存在的不可序列化对象（如 success/fail 回调函数，或者 Vue 的 Proxy 对象）
+                let safeData = data;
+                if (data && typeof data === 'object') {
+                    try {
+                        safeData = JSON.parse(JSON.stringify(data));
+                    }
+                    catch (e) {
+                        // 忽略异常，保留原数据
+                    }
+                }
                 // Android 调用
                 if (this.platform === 'android' && this.bridge) {
-                    this.bridge.callHandler(method, data, (result) => {
+                    this.bridge.callHandler(method, safeData, (result) => {
                         clearTimeout(timeoutId);
                         resolve(result);
                     });
@@ -249,17 +260,6 @@ class Bridge {
                                 reject(err);
                             }
                         };
-                        // 核心防御：防止 DataCloneError
-                        // 剥离可能存在的不可序列化对象（如 success/fail 回调函数）
-                        let safeData = data;
-                        if (data && typeof data === 'object') {
-                            try {
-                                safeData = JSON.parse(JSON.stringify(data));
-                            }
-                            catch (e) {
-                                // 忽略异常，保留原数据
-                            }
-                        }
                         handler.postMessage({
                             handlerName: method,
                             data: safeData,
@@ -1341,6 +1341,140 @@ async function logout() {
     }
 }
 
+// @ts-nocheck
+class JsBridge {
+    static setup() {
+        if (this.isInitialized) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve, reject) => {
+            // Android 原生环境：按原有逻辑初始化 WKWebViewJavascriptBridge
+            if (JsBridge.isSoaAndroid) {
+                if (window.WKWebViewJavascriptBridge) {
+                    JsBridge.bridge = window.WKWebViewJavascriptBridge;
+                    JsBridge.isInitialized = true;
+                    resolve();
+                    return;
+                }
+                window.WKWVJBCallbacks = [
+                    (bridge) => {
+                        JsBridge.bridge = bridge;
+                        JsBridge.isInitialized = true;
+                        resolve();
+                    }
+                ];
+                if (!window.InjectJavascript) {
+                    reject(new Error('调用失败：InjectJavascript不存在，请检查Android端注入逻辑'));
+                    return;
+                }
+                window.InjectJavascript.init();
+                return;
+            }
+            // iOS 原生环境：只要 JsBridge 通道存在即可认为初始化成功
+            if (JsBridge.isIosApp()) {
+                JsBridge.isInitialized = true;
+                resolve();
+                return;
+            }
+            // 其它环境：明确失败，方便 H5 判断
+            reject(new Error('调用失败：当前不是 SoaAndroid 或 Soa iOS 环境'));
+        });
+    }
+    static async registerHandler(method, handler) {
+        if (!JsBridge.inAndroidApp() && !JsBridge.isIosApp())
+            return;
+        if (!JsBridge.isInitialized) {
+            await JsBridge.setup();
+        }
+        if (JsBridge.inAndroidApp()) {
+            JsBridge.bridge.registerHandler(method, handler);
+        }
+        else {
+            // iOS 环境下，对接由 JSBridge.swift 注入的底层 bridge
+            const w = window;
+            if (w.WebViewJavascriptBridge) {
+                w.WebViewJavascriptBridge.registerHandler(method, handler);
+            }
+        }
+    }
+    static _handleMessageFromNative(messageJSON) {
+        const w = window;
+        if (w.WebViewJavascriptBridge && w.WebViewJavascriptBridge._handleMessageFromNative) {
+            w.WebViewJavascriptBridge._handleMessageFromNative(messageJSON);
+        }
+    }
+    static async callHandler(method, data = null) {
+        // Android
+        if (JsBridge.inAndroidApp()) {
+            if (!JsBridge.isInitialized) {
+                await JsBridge.setup();
+            }
+            return new Promise((resolve) => {
+                JsBridge.bridge.callHandler(method, data, (result) => {
+                    resolve(result);
+                });
+            });
+        }
+        // iOS
+        if (JsBridge.isIosApp()) {
+            return new Promise((resolve, reject) => {
+                const w = window;
+                const handler = w.webkit && w.webkit.messageHandlers && w.webkit.messageHandlers.JsBridge;
+                if (!handler || typeof handler.postMessage !== 'function') {
+                    reject(new Error('调用失败：iOS JsBridge handler 不存在'));
+                    return;
+                }
+                const callbackId = 'cb_' + JsBridge.seq++;
+                JsBridge.callbacks[callbackId] = { resolve, reject };
+                handler.postMessage({
+                    handlerName: method,
+                    data,
+                    callbackId
+                });
+            });
+        }
+        return Promise.reject(new Error('调用失败：当前环境不支持 JsBridge.callHandler'));
+    }
+    static _invokeCallback(callbackId, result, error) {
+        const entry = JsBridge.callbacks[callbackId];
+        if (!entry)
+            return;
+        delete JsBridge.callbacks[callbackId];
+        if (error) {
+            entry.reject(error);
+        }
+        else {
+            entry.resolve(result);
+        }
+    }
+    static isReady() {
+        return JsBridge.isInitialized;
+    }
+    static inAndroidApp() {
+        return JsBridge.isSoaAndroid;
+    }
+    static isIosApp() {
+        if (typeof window === 'undefined')
+            return false;
+        const w = window;
+        return !!(w.webkit && w.webkit.messageHandlers && w.webkit.messageHandlers.JsBridge);
+    }
+}
+JsBridge.bridge = null;
+JsBridge.isInitialized = false;
+// #ifndef H5
+JsBridge.isSoaAndroid = false;
+// #endif
+// #ifdef H5
+JsBridge.isSoaAndroid = Boolean(navigator.userAgent.match(/SoaAndroid/gi));
+// #endif
+JsBridge.callbacks = {};
+JsBridge.seq = 1;
+// 关键：把 JsBridge 挂到 window 上，给原生回调用
+if (typeof window !== 'undefined') {
+    window.JsBridge = JsBridge;
+}
+
 class PageLifeCycle {
     constructor(state, route) {
         this.state = state;
@@ -1371,54 +1505,54 @@ class JsBridgeHandlers {
      * @param from
      */
     static handleRouterAfterEach(to, from) {
-        return bridge.call('routerAfterEach', { to, from });
+        return JsBridge.callHandler('routerAfterEach', { to, from });
     }
     /**
      * 获取app端信息
      */
     static handleGetAppInfo() {
-        return bridge.call('getAppInfo');
+        return JsBridge.callHandler('getAppInfo');
     }
     /**
      * 页面生命周期通知原生
      * @param lifecycle
      */
     static handlePageLifeCycle(lifecycle) {
-        return bridge.call('uniPageLifeCycle', lifecycle);
+        return JsBridge.callHandler('uniPageLifeCycle', lifecycle);
     }
     /**
      * 注册路由跳转调用
      * @param handler
      */
     static registerOnRoute(handler) {
-        return bridge.register('route', handler);
+        return JsBridge.registerHandler('route', handler);
     }
     /**
      * 注册获取路由信息调用
      */
     static registerOnGetRouteInfo(handler) {
-        return bridge.register('getRouteInfo', handler);
+        return JsBridge.registerHandler('getRouteInfo', handler);
     }
     /**
      * 注册刷新store数据
      * @param handler
      */
     static registerOnRefreshStore(handler) {
-        return bridge.register('refreshStore', handler);
+        return JsBridge.registerHandler('refreshStore', handler);
     }
     /**
      * 注册PDA扫码回调
      * @param handler
      */
     static registerOnPdaScan(handler) {
-        return bridge.register('pdaScan', handler);
+        return JsBridge.registerHandler('pdaScan', handler);
     }
     /**
      * 调用原生扫码
      * @param request
      */
     static handleScan(request = new UniScanRequest()) {
-        return bridge.call('scan', request).then((res) => {
+        return JsBridge.callHandler('scan', request).then((res) => {
             const json = JSON.parse(res);
             const result = new UniScanResult();
             // eslint-disable-next-line @typescript-eslint/camelcase
@@ -1435,7 +1569,7 @@ class JsBridgeHandlers {
      * @param request
      */
     static handleChooseMedia(request) {
-        return bridge.call('chooseMedia', request).then((res) => {
+        return JsBridge.callHandler('chooseMedia', request).then((res) => {
             if (res) {
                 const result = JSON.parse(res);
                 return result;
@@ -1449,7 +1583,7 @@ class JsBridgeHandlers {
      * @param request
      */
     static handleGetImageInfo(request) {
-        return bridge.call('getImageInfo', request).then((res) => {
+        return JsBridge.callHandler('getImageInfo', request).then((res) => {
             const result = JSON.parse(res);
             return result;
         });
@@ -1459,7 +1593,7 @@ class JsBridgeHandlers {
      * @param request
      */
     static handleUploadFile(request) {
-        return bridge.call('uploadFile', request).then((res) => {
+        return JsBridge.callHandler('uploadFile', request).then((res) => {
             const result = JSON.parse(res);
             return result;
         });
@@ -1469,28 +1603,28 @@ class JsBridgeHandlers {
      * @param request
      */
     static handleCloseWebView() {
-        return bridge.call('closeWebView');
+        return JsBridge.callHandler('closeWebView');
     }
     /**
      * 打电话
      * @param request
      */
     static handleMakePhoneCall(request) {
-        return bridge.call('makePhoneCall', request);
+        return JsBridge.callHandler('makePhoneCall', request);
     }
     /**
      * 动态设置标题
      * @param request
      */
     static handleSetNavigationBar(request) {
-        return bridge.call('setNavigationBar', request);
+        return JsBridge.callHandler('setNavigationBar', request);
     }
     /**
      * 打日志
      * @param request
      */
     static handleLog(request) {
-        return bridge.call('log', request);
+        return JsBridge.callHandler('log', request);
     }
     /**
      * 通知原生APP已加载完成
@@ -1504,28 +1638,28 @@ class JsBridgeHandlers {
      * @param data
      */
     static handleLogout() {
-        return bridge.call('logout');
+        return JsBridge.callHandler('logout');
     }
     /**
      * 通知原生APP打开链接
      * @param data
      */
     static handleOpenSchemeUrl(request) {
-        return bridge.call('openSchemeUrl', request);
+        return JsBridge.callHandler('openSchemeUrl', request);
     }
     /**
      * 图片路径转换成base64格式
      * @param path
      */
     static handlePathToBase64(request) {
-        return bridge.call('pathToBase64', request).then((res) => {
+        return JsBridge.callHandler('pathToBase64', request).then((res) => {
             const result = JSON.parse(res);
             return result;
         });
     }
     static handleBluetoothPrintImage(request) {
         console.log(request);
-        return bridge.call('printImage', request).then((res) => {
+        return JsBridge.callHandler('printImage', request).then((res) => {
             if (!res)
                 return res;
             if (typeof res === 'string') {
@@ -1544,7 +1678,7 @@ class JsBridgeHandlers {
      * @param data
      */
     static handleBluetoothPrint(request) {
-        return bridge.call('bluetoothPrint', request).then((res) => {
+        return JsBridge.callHandler('bluetoothPrint', request).then((res) => {
             if (!res)
                 return res;
             if (typeof res === 'string') {
@@ -1563,7 +1697,7 @@ class JsBridgeHandlers {
      * @param request
      */
     static handleReloadModule(request) {
-        return bridge.call('reloadModule', request);
+        return JsBridge.callHandler('reloadModule', request);
     }
 }