syttunnel 0.1.5-3 → 0.1.5-5

package/core/basic/appCommon.d.ts

@@ -66,6 +66,9 @@ interface ISaveImageToLocalResponse {
 export interface ISFAddressParams {
     encryptKey: string;
 }
+interface IPasteStringParams {
+    content: string;
+}
 export declare class AppCommon {
     openScan(params: IOpenCodeScanParams): Promise<string>;
     shareMsgToWXAPI(params: IShareMsgToWXParams): Promise<IShareMsgToWXResponse>;
@@ -79,5 +82,9 @@ export declare class AppCommon {
      * @returns 返回为json string加密的字符串，需密钥解密
      */
     getSFAddress(params: ISFAddressParams): Promise<string>;
+    /**
+     * 复制字符串
+     */
+    pasteString(params: IPasteStringParams): Promise<boolean>;
 }
 export {};

package/core/basic/appNavigator.d.ts

@@ -95,5 +95,10 @@ export declare class AppNavigator {
      * 返回上一页
      */
     onGoBack(): void;
+    /**
+     * 监听返回事件
+     * @param callback
+     */
+    onBackPressedListener(callback: (data: any) => boolean): void;
 }
 export {};

package/core/basic/bridge.d.ts

@@ -10,19 +10,21 @@ export interface IRequestCompletion<T> {
     success?: (res: T) => void;
     failure?: (err: IError) => void;
 }
-declare class FuncCallBack {
-    success?: (res: any) => void;
-    failure?: (err: IError) => void;
-    uId: string;
-    constructor(uId: string, suc?: (res: any) => void, fal?: (err: IError) => void);
-}
+declare type SubscribeEventFunction = (params?: any, callback?: (data: any) => void) => void;
 declare class Bridge {
-    static cbArr: FuncCallBack[];
-    static funCallCount: number;
+    messageHandlers: {
+        [key: string]: any;
+    };
+    subscribers: {
+        [key: string]: SubscribeEventFunction[];
+    };
+    uniqueId: number;
     constructor();
-    private onMessage;
-    postMessage<T>(params: IPostParams): Promise<T>;
+    onMessage: (msg: any) => void;
+    postMessage: <T>(params: IPostParams) => Promise<T>;
     private dealPostMessage;
+    subscribeEvent: (handlerName: string, handler: any) => void;
+    unsubscribeEvent: (handlerName: string, handler: any) => void;
 }
 declare const bridge: Bridge;
 export default bridge;

package/core/basic/eventsName.d.ts

@@ -2,7 +2,7 @@
  * 基本的调用事件
  */
 import { IPostParams } from "./bridge";
-export declare type CommonEvents = "getUserInfo" | "sytFetch" | "authorize" | "backToBefore" | "setTitle" | "setStyle" | "getNavigationFrame" | "loadUrl" | "payByWeChat" | "payByAli" | "startScanCode" | "shareMessageToWXReq" | "currentLocation" | "appVersion" | "selectContacts" | "saveImageToLocal" | "getEnvironment" | "goBack" | "selectAddress";
+export declare type CommonEvents = "getUserInfo" | "sytFetch" | "authorize" | "backToBefore" | "setTitle" | "setStyle" | "getNavigationFrame" | "loadUrl" | "payByWeChat" | "payByAli" | "startScanCode" | "shareMessageToWXReq" | "currentLocation" | "appVersion" | "selectContacts" | "saveImageToLocal" | "getEnvironment" | "goBack" | "selectAddress" | "pasteString";
 export interface IPostBasicParams extends IPostParams {
     method: CommonEvents;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "syttunnel",
-  "version": "0.1.5-3",
+  "version": "0.1.5-5",
   "description": "",
   "main": "syttunnel.js",
   "types": "index.d.ts",

package/syttunnel.js

@@ -358,14 +358,14 @@ var sytFetch = function (config) {
     };
     var appFunc = {
         method: "sytFetch",
-        params: data,
+        params: request,
     };
     return new Promise(function (resolve, reject) {
         bridge_1.default
             .postMessage(appFunc)
             .then(function (result) {
             var resData = result.data;
-            if (!data) {
+            if (!resData) {
                 reject({
                     errCode: "-1",
                     errMessage: "没有返回data数据",
@@ -402,94 +402,156 @@ exports.sytFetch = sytFetch;
 
 /***/ }),
 /* 6 */
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 var tools_1 = __webpack_require__(7);
-var FuncCallBack = /** @class */ (function () {
-    function FuncCallBack(uId, suc, fal) {
-        this.uId = uId;
-        this.success = suc;
-        this.failure = fal;
-    }
-    return FuncCallBack;
-}());
+var EventType;
+(function (EventType) {
+    EventType["CALL"] = "call";
+    EventType["REGISTER"] = "register";
+    EventType["UNREGISTER"] = "unregister";
+    EventType["CALLBACK"] = "callback";
+})(EventType || (EventType = {}));
 var Bridge = /** @class */ (function () {
     function Bridge() {
+        var _this = this;
+        this.onMessage = function (msg) {
+            var message = typeof msg.data === "string"
+                ? JSON.parse(msg.data || "")
+                : msg.data || {};
+            var method = message.method;
+            var value = message.value;
+            var uniqueId = message.uniqueId;
+            var errCode = message.errCode;
+            var errMessage = message.errMessage;
+            var callbackId = message.callbackId;
+            if (!method) {
+                return;
+            }
+            if (uniqueId) {
+                // js call native callback
+                var callback_1 = _this.messageHandlers[uniqueId];
+                if (callback_1) {
+                    // 成功的回调
+                    if (value != null && value != undefined) {
+                        callback_1(null, value);
+                    }
+                    else {
+                        var error = {
+                            errCode: errCode,
+                            errMessage: errMessage,
+                        };
+                        callback_1(error, null);
+                    }
+                    delete _this.messageHandlers[uniqueId];
+                }
+            }
+            else {
+                // native call js
+                if (!method) {
+                    return;
+                }
+                var callback;
+                if (callbackId) {
+                    callback = function (response) {
+                        _this.dealPostMessage({
+                            responseId: callbackId,
+                            method: method,
+                            params: {
+                                result: response,
+                            },
+                            type: EventType.CALLBACK,
+                        });
+                    };
+                }
+                var subscribers = _this.subscribers[method];
+                if (subscribers && subscribers.length > 0) {
+                    subscribers.forEach(function (handler) {
+                        handler(value, callback);
+                    });
+                }
+            }
+        };
+        this.postMessage = function (params) {
+            return new Promise(function (resolve, reject) {
+                _this.dealPostMessage(__assign({ type: EventType.CALL }, params), function (error, result) {
+                    if (error) {
+                        reject(error);
+                    }
+                    else {
+                        if (result !== null && result !== undefined) {
+                            resolve(result);
+                        }
+                        else {
+                            reject(new Error("返回的数据错误"));
+                        }
+                    }
+                });
+            });
+        };
+        this.dealPostMessage = function (params, callback) {
+            if (window.ReactNativeWebView) {
+                var postParams = params;
+                if (callback) {
+                    var uniqueId = "cb_" + (_this.uniqueId++).toString() + Date.now().toString();
+                    _this.messageHandlers[uniqueId] = callback;
+                    postParams.uniqueId = uniqueId;
+                }
+                window.ReactNativeWebView.postMessage(JSON.stringify(postParams));
+            }
+        };
+        // 注册方法
+        this.subscribeEvent = function (handlerName, handler) {
+            var subscribers = _this.subscribers[handlerName] || [];
+            subscribers.push(handler);
+            _this.subscribers[handlerName] = subscribers;
+            // 监听者数量大于1，发送注册事件，通知native
+            if (subscribers.length > 0) {
+                _this.dealPostMessage({
+                    method: handlerName,
+                    type: EventType.REGISTER,
+                });
+            }
+        };
+        // 移除注册方法
+        this.unsubscribeEvent = function (handlerName, handler) {
+            var subscribers = _this.subscribers[handlerName];
+            var index = subscribers.indexOf(handler);
+            if (index > -1) {
+                subscribers.splice(index, 1);
+                _this.subscribers[handlerName] = subscribers;
+            }
+            if (subscribers.length <= 0) {
+                // 监听者数量小于等于0，发送移除注册事件，通知native
+                _this.dealPostMessage({
+                    method: handlerName,
+                    type: EventType.UNREGISTER,
+                });
+            }
+        };
         if (tools_1.isSfAppIOS()) {
             window.addEventListener("message", this.onMessage);
         }
         else if (tools_1.isSfAppAndroid()) {
             document.addEventListener("message", this.onMessage);
         }
-        this.onMessage = this.onMessage.bind(this);
+        this.messageHandlers = {};
+        this.subscribers = {};
+        this.uniqueId = 0;
     }
-    Bridge.prototype.onMessage = function (msg) {
-        var message = typeof msg.data === "string"
-            ? JSON.parse(msg.data || "")
-            : msg.data || {};
-        var method = message.method;
-        var value = message.value;
-        var uniqueId = message.uniqueId;
-        var errCode = message.errCode;
-        var errMessage = message.errMessage;
-        if (!method || !uniqueId) {
-            return;
-        }
-        var obj = Bridge.cbArr.find(function (item) { return item.uId === uniqueId; });
-        var success = obj === null || obj === void 0 ? void 0 : obj.success;
-        var failure = obj === null || obj === void 0 ? void 0 : obj.failure;
-        if ((errCode || errMessage) && failure) {
-            var error = {
-                errCode: errCode,
-                errMessage: errMessage,
-            };
-            failure(error);
-            var delIndex_1 = Bridge.cbArr.findIndex(function (item) { return item.uId === uniqueId; });
-            if (delIndex_1 > -1) {
-                Bridge.cbArr.splice(delIndex_1, 1);
-            }
-            return;
-        }
-        if (value != null && success) {
-            success(value);
-        }
-        var delIndex = Bridge.cbArr.findIndex(function (item) { return item.uId === uniqueId; });
-        if (delIndex > -1) {
-            Bridge.cbArr.splice(delIndex, 1);
-        }
-    };
-    Bridge.prototype.postMessage = function (params) {
-        return new Promise(function (resolve, reject) {
-            bridge.dealPostMessage(params, function (result) {
-                if (result !== null && result !== undefined) {
-                    resolve(result);
-                }
-                else {
-                    reject(new Error("返回的数据错误"));
-                }
-            }, function (err) {
-                reject(err);
-            });
-        });
-    };
-    Bridge.prototype.dealPostMessage = function (params, success, failure) {
-        if (window.ReactNativeWebView) {
-            var uniqueId = params.method + Bridge.funCallCount.toString() + Date.now().toString();
-            var funcCbObj = new FuncCallBack(uniqueId, success, failure);
-            Bridge.cbArr.push(funcCbObj);
-            Bridge.funCallCount++;
-            var postParams = {
-                method: params.method,
-                params: params.params,
-                uniqueId: uniqueId,
-            };
-            window.ReactNativeWebView.postMessage(JSON.stringify(postParams));
-        }
-    };
-    Bridge.cbArr = [];
-    Bridge.funCallCount = 0;
     return Bridge;
 }());
 var bridge = new Bridge();
@@ -676,6 +738,16 @@ var AppCommon = /** @class */ (function () {
         };
         return bridge_1.default.postMessage(appFunc);
     };
+    /**
+     * 复制字符串
+     */
+    AppCommon.prototype.pasteString = function (params) {
+        var appFunc = {
+            method: "pasteString",
+            params: params,
+        };
+        return bridge_1.default.postMessage(appFunc);
+    };
     return AppCommon;
 }());
 exports.AppCommon = AppCommon;
@@ -752,6 +824,16 @@ var AppNavigator = /** @class */ (function () {
         };
         bridge_1.default.postMessage(appFunc).then().catch();
     };
+    /**
+     * 监听返回事件
+     * @param callback
+     */
+    AppNavigator.prototype.onBackPressedListener = function (callback) {
+        bridge_1.default.subscribeEvent("onBackPressed", function (params, responseCallback) {
+            var res = callback(params);
+            responseCallback(res);
+        });
+    };
     return AppNavigator;
 }());
 exports.AppNavigator = AppNavigator;