@pisell/utils 1.0.53 → 2.0.2

package/es/jsBridge/index.d.ts

@@ -0,0 +1,22 @@
+import { WebPrintParams, DataManagerParams, WebPaymentParams } from './types';
+/**
+ * webView页面中调用打印机打印
+ * 此api暂时只支持native app平台下ios手机
+ * @param params
+ * @param callback
+ */
+export declare function webPrint(params: WebPrintParams, callback: (...arg: any) => void, onError?: (error: any) => void): void;
+/**
+ * webView页面中调用APP内的数据
+ * 此api暂时只支持native app平台下ios手机
+ * @param params
+ * @param callback
+ */
+export declare function dataManager(params: DataManagerParams, callback: (...arg: any) => void, onError: () => void): void;
+/**
+ * webView页面中调用APP内的支付
+ * 此api暂时只支持native app平台下ios
+ * @param params
+ * @param callback
+ */
+export declare function webPayment(params: WebPaymentParams, callback: (...arg: any) => void, onError?: (error: any) => void): void;

package/es/jsBridge/index.js

@@ -33,8 +33,7 @@ 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: (isWebPrint?: boolean) => Promise<ComposedJSBridge>;
+const regDeviceApi: () => Promise<ComposedJSBridge>;
 
 export default regDeviceApi;

package/es/jsBridge/regDeviceApi.js

@@ -4,12 +4,10 @@ var iosRegStatus = false;
 var androidBridge;
 var iosBridge;
 var composedBridge;
-function regIosJsBridge(callback, reject) {
+function regIosJsBridge(callback) {
   if (window.WebViewJavascriptBridge) {
     callback(window.WebViewJavascriptBridge);
     return;
-  } else {
-    reject();
   }
   if (window.WVJBCallbacks) {
     window.WVJBCallbacks.push(callback);
@@ -46,10 +44,6 @@ function regAndroidJsBridge(extraInit) {
     extraInit(bridge);
   }, false);
 }
-function checkApiName(apiNames, apiName) {
-  var _apiNames = apiNames || ['webPrint'];
-  return _apiNames.includes(apiName);
-}
 
 /**
  * 通用jsBridge
@@ -84,27 +78,16 @@ 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 || onError();
-          return;
-        }
         iosBridge.callHandler(apiName, params, callback, function (e) {
           console.log(e, '--- 调用ios api报错：', apiName);
           if (onError) {
-            onError === null || onError === void 0 || onError(e);
+            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 || onError();
-          return;
-        }
         var res = androidBridge.callHandler(apiName, JSON.stringify(params));
         callback(res);
       } else {
-        onError === null || onError === void 0 || onError();
         console.log('--- 没获取到js bridge ---');
       }
     },
@@ -121,23 +104,15 @@ function getComposedBridge(deviceType) {
   };
   return composedBridge;
 }
-export default function regDeviceApi(isWebPrint) {
+export default function regDeviceApi() {
   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

@@ -0,0 +1,22 @@
+import { WebPrintParams, DataManagerParams, WebPaymentParams } from './types';
+/**
+ * webView页面中调用打印机打印
+ * 此api暂时只支持native app平台下ios手机
+ * @param params
+ * @param callback
+ */
+export declare function webPrint(params: WebPrintParams, callback: (...arg: any) => void, onError?: (error: any) => void): void;
+/**
+ * webView页面中调用APP内的数据
+ * 此api暂时只支持native app平台下ios手机
+ * @param params
+ * @param callback
+ */
+export declare function dataManager(params: DataManagerParams, callback: (...arg: any) => void, onError: () => void): void;
+/**
+ * webView页面中调用APP内的支付
+ * 此api暂时只支持native app平台下ios
+ * @param params
+ * @param callback
+ */
+export declare function webPayment(params: WebPaymentParams, callback: (...arg: any) => void, onError?: (error: any) => void): void;

package/lib/jsBridge/index.js

@@ -56,8 +56,7 @@ 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: (isWebPrint?: boolean) => Promise<ComposedJSBridge>;
+const regDeviceApi: () => Promise<ComposedJSBridge>;
 
 export default regDeviceApi;

package/lib/jsBridge/regDeviceApi.js

@@ -28,12 +28,10 @@ var iosRegStatus = false;
 var androidBridge;
 var iosBridge;
 var composedBridge;
-function regIosJsBridge(callback, reject) {
+function regIosJsBridge(callback) {
   if (window.WebViewJavascriptBridge) {
     callback(window.WebViewJavascriptBridge);
     return;
-  } else {
-    reject();
   }
   if (window.WVJBCallbacks) {
     window.WVJBCallbacks.push(callback);
@@ -73,10 +71,6 @@ function regAndroidJsBridge(extraInit) {
     false
   );
 }
-function checkApiName(apiNames, apiName) {
-  let _apiNames = apiNames || ["webPrint"];
-  return _apiNames.includes(apiName);
-}
 function getComposedBridge(deviceType) {
   if (composedBridge) {
     return composedBridge;
@@ -94,25 +88,16 @@ 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, "--- 调用ios api报错：", apiName);
           if (onError) {
-            onError == null ? void 0 : onError(e);
+            onError(e);
           }
         });
       } else if (deviceType === "android") {
-        if (!checkApiName(androidBridge == null ? void 0 : androidBridge.apiNames, apiName)) {
-          onError == null ? void 0 : onError();
-          return;
-        }
         const res = androidBridge.callHandler(apiName, JSON.stringify(params));
         callback(res);
       } else {
-        onError == null ? void 0 : onError();
         console.log("--- 没获取到js bridge ---");
       }
     },
@@ -127,22 +112,15 @@ function getComposedBridge(deviceType) {
   };
   return composedBridge;
 }
-function regDeviceApi(isWebPrint) {
+function regDeviceApi() {
   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,10 @@
 {
   "name": "@pisell/utils",
-  "version": "1.0.53",
+  "version": "2.0.2",
+  "scripts": {
+    "build": "father build",
+    "dev": "father dev"
+  },
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",
@@ -24,9 +28,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "father build",
-    "dev": "father dev"
   }
 }