yach.open.jssdk 4.3.6-beta2 → 4.3.6-beta3

package/es/lib/bridge/mobile.js

@@ -1,29 +1,36 @@
-import _setTimeout from "@babel/runtime-corejs3/core-js/set-timeout";
-import _Promise from "@babel/runtime-corejs3/core-js/promise";
-import _Object$assign from "@babel/runtime-corejs3/core-js/object/assign";
+import _JSON$stringify from "@babel/runtime-corejs3/core-js/json/stringify";
 import _parseInt from "@babel/runtime-corejs3/core-js/parse-int";
+import _Object$assign from "@babel/runtime-corejs3/core-js/object/assign";
+import _Promise from "@babel/runtime-corejs3/core-js/promise";
+import _setTimeout from "@babel/runtime-corejs3/core-js/set-timeout";
 import Event from '../helper/event';
 import { electronResCodeMap } from '../helper/codeMap';
 import { log, bpitLog } from '../../utils';
+
 function setupWebViewJavascriptBridge(callback) {
   if (window.WebViewJavascriptBridge) {
     return callback(WebViewJavascriptBridge);
   }
+
   if (window.WKWebViewJavascriptBridge) {
     return callback(WKWebViewJavascriptBridge);
   }
+
   if (window.WVJBCallbacks) {
     return window.WVJBCallbacks.push(callback);
   }
+
   window.WVJBCallbacks = [callback];
   var WVJBIframe = document.createElement('iframe');
   WVJBIframe.style.display = 'none';
   WVJBIframe.src = 'https://__bridge_loaded__';
   document.documentElement.appendChild(WVJBIframe);
+
   _setTimeout(function () {
     document.documentElement.removeChild(WVJBIframe);
   }, 0);
 }
+
 var mobileBridgeInit = function mobileBridgeInit() {
   return new _Promise(function (resolve, reject) {
     setupWebViewJavascriptBridge(function (bridge) {
@@ -70,14 +77,17 @@ var mobileBridgeInit = function mobileBridgeInit() {
     });
   });
 };
+
 var mobileBridge = function mobileBridge(method, param) {
   return new _Promise(function (resolve, reject) {
     var p = _Object$assign({}, param);
+
     setupWebViewJavascriptBridge(function (bridge) {
       if (param.control) {
         bridge.registerHandler(method, function (data) {
           var onSuccess = param.onSuccess;
           delete p.onSuccess;
+
           if ('function' === typeof onSuccess) {
             onSuccess(data);
             resolve({
@@ -87,31 +97,15 @@ var mobileBridge = function mobileBridge(method, param) {
           }
         });
       }
+
       bridge.callHandler(method, param, function (e) {
         var code = e.code,
-          message = e.message,
-          data = e.data;
+            message = e.message,
+            data = e.data;
+
         var _code = _parseInt(code);
+
         var callbackStr = electronResCodeMap(_code);
-        if (_code === -2 || _code === 7) {
-          bpitLog({
-            method: method,
-            errorcode: _code,
-            message: message || 'SDK执行失败回调，相关参数'
-          });
-          log("SDK\u6267\u884C\u540E\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
-            method: method,
-            param: param,
-            data: data,
-            _code: _code,
-            message: message
-          });
-          reject({
-            _code: _code,
-            message: message
-          });
-          // return;
-        }
         var callbackFun = p[callbackStr];
         log("SDK\u6267\u884C\u540E\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           method: method,
@@ -120,17 +114,71 @@ var mobileBridge = function mobileBridge(method, param) {
           _code: _code,
           message: message,
           callbackFun: callbackFun
-        });
+        }); // 请求失败
+
+        if (callbackStr === 'onFail') {
+          bpitLog({
+            method: method,
+            errorcode: _code,
+            message: message || _JSON$stringify(data) || 'SDK执行失败回调，相关参数'
+          });
+
+          if ('function' === typeof callbackFun) {
+            message ? callbackFun({
+              code: code,
+              message: message
+            }) : callbackFun(data);
+          }
+
+          reject({
+            _code: _code,
+            message: message,
+            data: data
+          });
+          return;
+        } // 请求成功
+
+
         if ('function' === typeof callbackFun) {
           callbackFun(data || message);
         }
+
         resolve({
           _code: _code,
           message: message,
           data: data
-        });
+        }); // if (_code === -2 || _code === 7) {
+        //   bpitLog({
+        //     method,
+        //     errorcode: _code,
+        //     message: message || 'SDK执行失败回调，相关参数',
+        //   });
+        //   log(`SDK执行后回调，相关参数 `, {
+        //     method,
+        //     param,
+        //     data,
+        //     _code,
+        //     message,
+        //   });
+        //   reject({_code, message});
+        //   // return;
+        // }
+        // const callbackFun = p[callbackStr];
+        // log(`SDK执行后回调，相关参数 `, {
+        //   method,
+        //   param,
+        //   data,
+        //   _code,
+        //   message,
+        //   callbackFun,
+        // });
+        // if ('function' === typeof callbackFun) {
+        //   callbackFun(data || message);
+        // }
+        // resolve({_code, message, data});
       });
     });
   });
 };
+
 export { mobileBridge, mobileBridgeInit };

package/es/lib/bridge/pc.js

@@ -1,26 +1,24 @@
-import _Promise from "@babel/runtime-corejs3/core-js/promise";
+import _JSON$stringify from "@babel/runtime-corejs3/core-js/json/stringify";
 import _parseInt from "@babel/runtime-corejs3/core-js/parse-int";
+import _Promise from "@babel/runtime-corejs3/core-js/promise";
 import PcIframe from '../helper/pcIframe';
 import { electronResCodeMap } from '../helper/codeMap';
 import { log, bpitLog } from '../../utils';
+
 var PcBridgeInit = function PcBridgeInit() {
   PcIframe.init();
 };
+
 var pcBridge = function pcBridge(method, param) {
-  return new _Promise(function (resolve) {
+  return new _Promise(function (resolve, reject) {
     return PcIframe.invokeAPI(method, param, function (_ref) {
       var data = _ref.data,
-        code = _ref.code,
-        message = _ref.message;
+          code = _ref.code,
+          message = _ref.message;
+
       var _code = _parseInt(code);
+
       var callbackStr = electronResCodeMap(_code);
-      if (_code === -2) {
-        bpitLog({
-          method: method,
-          errorcode: _code,
-          message: message || 'SDK执行失败回调，相关参数'
-        });
-      }
       var callbackFun = param[callbackStr];
       log("SDK\u6267\u884C\u540E\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
         method: method,
@@ -29,16 +27,62 @@ var pcBridge = function pcBridge(method, param) {
         _code: _code,
         message: message,
         callbackFun: callbackFun
-      });
+      }); // 请求失败
+
+      if (callbackStr === 'onFail') {
+        bpitLog({
+          method: method,
+          errorcode: _code,
+          message: message || _JSON$stringify(data) || 'SDK执行失败回调，相关参数'
+        });
+
+        if ('function' === typeof callbackFun) {
+          console.log('wenai-code', code, _code);
+          message ? callbackFun({
+            code: code,
+            message: message
+          }) : callbackFun(data);
+        }
+
+        reject({
+          _code: _code,
+          message: message,
+          data: data
+        });
+        return;
+      } // 请求成功
+
+
       if ('function' === typeof callbackFun) {
         callbackFun(data || message);
       }
+
       resolve({
         _code: _code,
         message: message,
         data: data
-      });
+      }); //  if (_code === -2) {
+      //   bpitLog({
+      //     method,
+      //     errorcode: _code,
+      //     message: message || 'SDK执行失败回调，相关参数',
+      //   });
+      // }
+      // const callbackFun = param[callbackStr];
+      // log(`SDK执行后回调，相关参数 `, {
+      //   method,
+      //   param,
+      //   data,
+      //   _code,
+      //   message,
+      //   callbackFun
+      // });
+      // if ('function' === typeof callbackFun) {
+      //   callbackFun(data || message);
+      // }
+      // resolve({ _code, message, data });
     });
   });
 };
+
 export { pcBridge, PcBridgeInit };

package/es/lib/helper/apiHelper.js

@@ -1,8 +1,10 @@
 import _Object$assign from "@babel/runtime-corejs3/core-js/object/assign";
+
 function genDefaultParamsDealFn(p) {
   return function (r) {
     return _Object$assign(_Object$assign({}, p), r);
   };
 }
+
 ;
 export { genDefaultParamsDealFn };

package/es/lib/helper/codeMap.js

@@ -1,6 +1,8 @@
 import _Map from "@babel/runtime-corejs3/core-js/map";
 var resCodeMap = new _Map([[0, 'onSuccess'], [-1, 'onCancel'], [-2, 'onFail'], [-3, 'onProgress'], [-4, 'onSubmit']]);
+
 function electronResCodeMap(code) {
   return resCodeMap.get(code) || 'onFail';
 }
+
 export { electronResCodeMap };

package/es/lib/helper/event.js

@@ -1,31 +1,41 @@
-import _createClass from "@babel/runtime-corejs3/helpers/createClass";
-import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
-import _Array$isArray from "@babel/runtime-corejs3/core-js/array/is-array";
-import _indexOfInstanceProperty from "@babel/runtime-corejs3/core-js/instance/index-of";
-import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js/instance/splice";
 import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js/instance/for-each";
-var Event = /*#__PURE__*/_createClass(function Event() {
+import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js/instance/splice";
+import _indexOfInstanceProperty from "@babel/runtime-corejs3/core-js/instance/index-of";
+import _Array$isArray from "@babel/runtime-corejs3/core-js/array/is-array";
+import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
+
+var Event = function Event() {
   var _this = this;
+
   _classCallCheck(this, Event);
+
   this.on = function (event, fn) {
     if (!event || 'function' !== typeof fn) throw 'eventName is null or handle is not a function, on fail';
     if (!_Array$isArray(_this.eventsHandle[event])) _this.eventsHandle[event] = [];
+
     _this.eventsHandle[event].push(fn);
   };
+
   this.off = function (event, fn) {
     if (!event) throw 'eventName is null, invoke off fail';
+
     if (!fn) {
       _this.eventsHandle[event] = [];
       return;
     }
+
     if (_Array$isArray(_this.eventsHandle[event])) {
       var _context, _context2;
+
       var n = _indexOfInstanceProperty(_context = _this.eventsHandle[event]).call(_context, fn);
+
       -1 !== n && _spliceInstanceProperty(_context2 = _this.eventsHandle[event]).call(_context2, n, 1);
     }
   };
+
   this.execEvent = function (event, data) {
     var _context3;
+
     _Array$isArray(this.eventsHandle[event]) && _forEachInstanceProperty(_context3 = this.eventsHandle[event]).call(_context3, function (fn) {
       try {
         fn(data);
@@ -34,7 +44,9 @@ var Event = /*#__PURE__*/_createClass(function Event() {
       }
     });
   };
+
   this.eventsHandle = {};
-});
+};
+
 var event = new Event();
 export default event;

package/es/lib/helper/pcIframe.js

@@ -1,22 +1,26 @@
-import _createClass from "@babel/runtime-corejs3/helpers/createClass";
-import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
-import _Date$now from "@babel/runtime-corejs3/core-js/date/now";
 import _JSON$stringify from "@babel/runtime-corejs3/core-js/json/stringify";
+import _Date$now from "@babel/runtime-corejs3/core-js/date/now";
+import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import { log } from '../../utils';
-import Event from './event';
-// 处理posmessage参数
-var GenPostMsg = /*#__PURE__*/_createClass(function GenPostMsg(method, param, callback) {
+import Event from './event'; // 处理posmessage参数
+
+var GenPostMsg = function GenPostMsg(method, param, callback) {
   var _this = this;
+
   _classCallCheck(this, GenPostMsg);
+
   this.genid = function () {
     var idStr = _Date$now().toString(36);
+
     idStr += Math.random().toString(36).substr(3);
     return idStr;
   };
+
   this.receiveResponse = function (data) {
     //this.PromiseObj.resolve(data);
     _this.callback(data);
   };
+
   this.getPayload = function () {
     return {
       msgId: _this.id,
@@ -26,6 +30,7 @@ var GenPostMsg = /*#__PURE__*/_createClass(function GenPostMsg(method, param, ca
       invokeType: _this.invokeType
     };
   };
+
   this.id = this.genid();
   this.PromiseObj = {
     resolve: null,
@@ -34,8 +39,7 @@ var GenPostMsg = /*#__PURE__*/_createClass(function GenPostMsg(method, param, ca
   this.methodName = method;
   this.plainMsg = param;
   this.invokeType = param === null || param === void 0 ? void 0 : param.invokeType;
-  this.callback = callback;
-  // this.result = new Promise(
+  this.callback = callback; // this.result = new Promise(
   //   function (resolve, reject) {
   //     this.PromiseObj = {
   //       resolve,
@@ -43,60 +47,81 @@ var GenPostMsg = /*#__PURE__*/_createClass(function GenPostMsg(method, param, ca
   //     };
   //   }.bind(this)
   // );
-});
-var Frame = /*#__PURE__*/_createClass(function Frame() {
+};
+
+var Frame = function Frame() {
   var _this2 = this;
+
   _classCallCheck(this, Frame);
+
   this.addPending = function (e) {
     _this2.pendingMsgs[e.id] = e;
   };
+
   this.deletePending = function (e) {
     delete _this2.pendingMsgs[e.id];
   };
+
   this.getPending = function (t) {
     return this.pendingMsgs[t];
   };
+
   this.invokeAPIInBrowserView = function (payload) {
     window.sendTo(payload);
   };
+
   this.invokeAPIInWebview = function (payload) {
     window.sendToHost(payload);
   };
+
   this.invokeAPI = function (method, param, callback) {
     var genPostMsg = new GenPostMsg(method, param, callback);
+
     var payload = _JSON$stringify(genPostMsg.getPayload());
+
     var _param$invokeType = param.invokeType,
-      invokeType = _param$invokeType === void 0 ? '' : _param$invokeType;
+        invokeType = _param$invokeType === void 0 ? '' : _param$invokeType;
     invokeType === 'browserView' ? _this2.invokeAPIInBrowserView(payload) : _this2.invokeAPIInWebview(payload);
+
     _this2.addPending(genPostMsg);
+
     return genPostMsg;
   };
+
   this.handleCallback = function (datas, invokeType) {
     var type = datas.type,
-      methodName = datas.methodName,
-      eventName = datas.eventName,
-      msgId = datas.msgId,
-      data = datas.data,
-      code = datas.code,
-      message = datas.message;
+        methodName = datas.methodName,
+        eventName = datas.eventName,
+        msgId = datas.msgId,
+        _datas$data = datas.data,
+        data = _datas$data === void 0 ? {} : _datas$data,
+        code = datas.code,
+        message = datas.message,
+        msg = datas.msg;
+
     if (type === 'request') {
       // 壳子的调用
       switch (methodName) {
         case 'refresh':
           window.location.reload();
           break;
+
         case 'back':
           window.history.back();
           break;
+
         case 'forward':
           window.history.forward();
           break;
+
         case 'event':
           Event.execEvent(eventName, data);
           break;
+
         case 'zoomInClick':
           var scrollTopVal = document.documentElement.scrollTop || document.body.scrollTop,
-            url = window.location.href;
+              url = window.location.href;
+
           if (invokeType === 'browserView') {
             window.sendTo(_JSON$stringify({
               type: type,
@@ -118,31 +143,38 @@ var Frame = /*#__PURE__*/_createClass(function Frame() {
               }
             }));
           }
+
           break;
+
         default:
           break;
       }
     } else if (type === 'response') {
       // 响应壳子的回调
       var pending = _this2.getPending(msgId);
+
       pending && pending.receiveResponse({
         data: data,
         code: code,
-        message: message
+        message: message || msg || data.msg || data.message
       });
       code != -3 && _this2.deletePending(msgId);
     }
   };
+
   this.init = function () {
     window.addEventListener('message', function (msg) {
       log('electron res: ', msg);
+
       _this2.handleCallback(msg.data || {});
     });
     window.receiveBrowserViewData && window.receiveBrowserViewData(function (e, response) {
       return _this2.handleCallback(response);
     });
   };
+
   this.pendingMsgs = {};
-});
+};
+
 var frame = new Frame();
 export default frame;

package/es/lib/index.js

@@ -1,11 +1,13 @@
 import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
 import _Promise from "@babel/runtime-corejs3/core-js/promise";
+
 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 {
@@ -14,6 +16,7 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
         reject(e);
       }
     }
+
     function rejected(value) {
       try {
         step(generator["throw"](value));
@@ -21,12 +24,15 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
         reject(e);
       }
     }
+
     function step(result) {
       result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
+
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
 };
+
 import { getENV } from '../utils';
 import Sdk from './sdk';
 import { mobileBridge, mobileBridgeInit, PcBridgeInit, pcBridge } from './bridge';
@@ -34,20 +40,26 @@ import Event from './helper/event';
 var env = getENV();
 var platform = env.platform;
 var yachSdk = new Sdk(env);
+
 function initSdk() {
   var _this = this;
+
   var bridgeInit;
+
   if (platform === 'pc') {
     bridgeInit = function bridgeInit() {
       return __awaiter(_this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              PcBridgeInit();
-              return _context.abrupt("return", pcBridge);
-            case 2:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                PcBridgeInit();
+                return _context.abrupt("return", pcBridge);
+
+              case 2:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee);
       }));
@@ -59,6 +71,7 @@ function initSdk() {
       });
     };
   }
+
   var config = {
     platform: platform,
     authMethod: 'config',
@@ -74,5 +87,6 @@ function initSdk() {
   };
   yachSdk.setPlatform(config);
 }
+
 initSdk();
 export { yachSdk, initSdk };