@pisell/utils 1.0.40 → 1.0.42

package/es/jsBridge/index.d.ts

@@ -102,7 +102,7 @@ declare type WebPrintParams = WebPrint0 | WebPrint1 | WebPrint2;
  * @param params
  * @param callback
  */
-export declare function webPrint(params: WebPrintParams, callback: (...arg: any) => void): void;
+export declare function webPrint(params: WebPrintParams, callback: (...arg: any) => void, onError: () => void): void;
 declare type DataManagerParams = {
     module: "set" | "get";
     key: string;

package/es/jsBridge/index.js

@@ -5,14 +5,15 @@ import regDeviceApi from "./regDeviceApi";
  * @param params
  * @param callback
  */
-export function webPrint(params, _callback) {
-  regDeviceApi().then(function (jsBridge) {
+export function webPrint(params, _callback, onError) {
+  regDeviceApi(true).then(function (jsBridge) {
     jsBridge.callDeviceApi({
       apiName: "webPrint",
       params: params,
       callback: function callback() {
         _callback && _callback.apply(void 0, arguments);
-      }
+      },
+      onError: onError
     });
   });
 }
@@ -29,7 +30,8 @@ export function dataManager(params, _callback2, onError) {
       params: params,
       callback: function callback() {
         _callback2 && _callback2.apply(void 0, arguments);
-      }
+      },
+      onError: onError
     });
   }).catch(onError);
 }

package/es/jsBridge/regDeviceApi.d.ts

@@ -10,6 +10,6 @@ type ComposedJSBridge = {
     calledByDevice: (a: { apiName: string; callback: Functon }) => void;
 };
 
-const regDeviceApi: () => Promise<ComposedJSBridge>;
+const regDeviceApi: (isWebPrint?: boolean) => Promise<ComposedJSBridge>;
 
 export default regDeviceApi;

package/es/jsBridge/regDeviceApi.js

@@ -4,10 +4,12 @@ var iosRegStatus = false;
 var androidBridge;
 var iosBridge;
 var composedBridge;
-function regIosJsBridge(callback) {
+function regIosJsBridge(callback, reject) {
   if (window.WebViewJavascriptBridge) {
     callback(window.WebViewJavascriptBridge);
     return;
+  } else {
+    reject();
   }
   if (window.WVJBCallbacks) {
     window.WVJBCallbacks.push(callback);
@@ -44,6 +46,10 @@ function regAndroidJsBridge(extraInit) {
     extraInit(bridge);
   }, false);
 }
+function checkApiName(apiNames, apiName) {
+  var _apiNames = apiNames || ['webPrint'];
+  return _apiNames.includes(apiName);
+}
 
 /**
  * 通用jsBridge
@@ -78,20 +84,31 @@ function getComposedBridge(deviceType) {
         inCb.apply(void 0, [result].concat(args));
       };
       if (deviceType === 'iphone') {
+        var _iosBridge;
+        if (!checkApiName((_iosBridge = iosBridge) === null || _iosBridge === void 0 ? void 0 : _iosBridge.apiNames, apiName)) {
+          onError === null || onError === void 0 ? void 0 : onError();
+          return;
+        }
         iosBridge.callHandler(apiName, params, callback, function (e) {
           console.log(e, '--- 调用ios api报错：', apiName);
           if (onError) {
-            onError(e);
+            onError === null || onError === void 0 ? void 0 : onError(e);
           }
         });
       } else if (deviceType === 'android') {
+        var _androidBridge;
+        if (!checkApiName((_androidBridge = androidBridge) === null || _androidBridge === void 0 ? void 0 : _androidBridge.apiNames, apiName)) {
+          onError === null || onError === void 0 ? void 0 : onError();
+          return;
+        }
         androidBridge.callHandler(apiName, params, callback, function (e) {
           console.log(e, '--- 调用android api报错：', apiName);
           if (onError) {
-            onError(e);
+            onError === null || onError === void 0 ? void 0 : onError(e);
           }
         });
       } else {
+        onError === null || onError === void 0 ? void 0 : onError();
         console.log('--- 没获取到js bridge ---');
       }
     },
@@ -108,15 +125,23 @@ function getComposedBridge(deviceType) {
   };
   return composedBridge;
 }
-export default function regDeviceApi() {
+export default function regDeviceApi(isWebPrint) {
   return new Promise(function (resolve, reject) {
+    // 旧版本只能用WebPrint
+    var isOld = !navigator.userAgent.includes('jsBridge');
+    if (isOld) {
+      if (!isWebPrint) {
+        reject();
+        return;
+      }
+    }
     if (isIos() && !iosRegStatus) {
       regIosJsBridge(function (bridge) {
         iosRegStatus = true;
         iosBridge = bridge;
         var realBridge = getComposedBridge('iphone');
         resolve(realBridge);
-      });
+      }, reject);
     } else if (isIos() && iosRegStatus) {
       var realBridge = getComposedBridge('iphone');
       resolve(realBridge);

package/lib/jsBridge/index.d.ts

@@ -102,7 +102,7 @@ declare type WebPrintParams = WebPrint0 | WebPrint1 | WebPrint2;
  * @param params
  * @param callback
  */
-export declare function webPrint(params: WebPrintParams, callback: (...arg: any) => void): void;
+export declare function webPrint(params: WebPrintParams, callback: (...arg: any) => void, onError: () => void): void;
 declare type DataManagerParams = {
     module: "set" | "get";
     key: string;

package/lib/jsBridge/index.js

@@ -34,14 +34,15 @@ __export(jsBridge_exports, {
 });
 module.exports = __toCommonJS(jsBridge_exports);
 var import_regDeviceApi = __toESM(require("./regDeviceApi"));
-function webPrint(params, callback) {
-  (0, import_regDeviceApi.default)().then((jsBridge) => {
+function webPrint(params, callback, onError) {
+  (0, import_regDeviceApi.default)(true).then((jsBridge) => {
     jsBridge.callDeviceApi({
       apiName: "webPrint",
       params,
       callback: (...arg) => {
         callback && callback(...arg);
-      }
+      },
+      onError
     });
   });
 }
@@ -52,7 +53,8 @@ function dataManager(params, callback, onError) {
       params,
       callback: (...arg) => {
         callback && callback(...arg);
-      }
+      },
+      onError
     });
   }).catch(onError);
 }

package/lib/jsBridge/regDeviceApi.d.ts

@@ -10,6 +10,6 @@ type ComposedJSBridge = {
     calledByDevice: (a: { apiName: string; callback: Functon }) => void;
 };
 
-const regDeviceApi: () => Promise<ComposedJSBridge>;
+const regDeviceApi: (isWebPrint?: boolean) => Promise<ComposedJSBridge>;
 
 export default regDeviceApi;

package/lib/jsBridge/regDeviceApi.js

@@ -28,10 +28,12 @@ var iosRegStatus = false;
 var androidBridge;
 var iosBridge;
 var composedBridge;
-function regIosJsBridge(callback) {
+function regIosJsBridge(callback, reject) {
   if (window.WebViewJavascriptBridge) {
     callback(window.WebViewJavascriptBridge);
     return;
+  } else {
+    reject();
   }
   if (window.WVJBCallbacks) {
     window.WVJBCallbacks.push(callback);
@@ -72,6 +74,10 @@ function regAndroidJsBridge(extraInit) {
     false
   );
 }
+function checkApiName(apiNames, apiName) {
+  let _apiNames = apiNames || ["webPrint"];
+  return _apiNames.includes(apiName);
+}
 function getComposedBridge(deviceType) {
   if (composedBridge) {
     return composedBridge;
@@ -92,20 +98,29 @@ function getComposedBridge(deviceType) {
         inCb(result, ...args);
       };
       if (deviceType === "iphone") {
+        if (!checkApiName(iosBridge == null ? void 0 : iosBridge.apiNames, apiName)) {
+          onError == null ? void 0 : onError();
+          return;
+        }
         iosBridge.callHandler(apiName, params, callback, (e) => {
           console.log(e, "--- \u8C03\u7528ios api\u62A5\u9519\uFF1A", apiName);
           if (onError) {
-            onError(e);
+            onError == null ? void 0 : onError(e);
           }
         });
       } else if (deviceType === "android") {
+        if (!checkApiName(androidBridge == null ? void 0 : androidBridge.apiNames, apiName)) {
+          onError == null ? void 0 : onError();
+          return;
+        }
         androidBridge.callHandler(apiName, params, callback, (e) => {
           console.log(e, "--- \u8C03\u7528android api\u62A5\u9519\uFF1A", apiName);
           if (onError) {
-            onError(e);
+            onError == null ? void 0 : onError(e);
           }
         });
       } else {
+        onError == null ? void 0 : onError();
         console.log("--- \u6CA1\u83B7\u53D6\u5230js bridge ---");
       }
     },
@@ -120,15 +135,22 @@ function getComposedBridge(deviceType) {
   };
   return composedBridge;
 }
-function regDeviceApi() {
+function regDeviceApi(isWebPrint) {
   return new Promise((resolve, reject) => {
+    const isOld = !navigator.userAgent.includes("jsBridge");
+    if (isOld) {
+      if (!isWebPrint) {
+        reject();
+        return;
+      }
+    }
     if ((0, import_platform.isIos)() && !iosRegStatus) {
       regIosJsBridge((bridge) => {
         iosRegStatus = true;
         iosBridge = bridge;
         const realBridge = getComposedBridge("iphone");
         resolve(realBridge);
-      });
+      }, reject);
     } else if ((0, import_platform.isIos)() && iosRegStatus) {
       const realBridge = getComposedBridge("iphone");
       resolve(realBridge);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/utils",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",