yach.open.jssdk 4.3.8 → 4.4.0-beta.1

package/libs/lib/bridge/index.js

@@ -1,39 +1,32 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 _Object$defineProperty(exports, "PcBridgeInit", {
   enumerable: true,
   get: function get() {
     return _pc.PcBridgeInit;
   }
 });
-
 _Object$defineProperty(exports, "mobileBridge", {
   enumerable: true,
   get: function get() {
     return _mobile.mobileBridge;
   }
 });
-
 _Object$defineProperty(exports, "mobileBridgeInit", {
   enumerable: true,
   get: function get() {
     return _mobile.mobileBridgeInit;
   }
 });
-
 _Object$defineProperty(exports, "pcBridge", {
   enumerable: true,
   get: function get() {
     return _pc.pcBridge;
   }
 });
-
 var _mobile = require("./mobile");
-
 var _pc = require("./pc");

package/libs/lib/bridge/mobile.js

@@ -1,44 +1,29 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports.mobileBridgeInit = exports.mobileBridge = void 0;
-
 var _setTimeout2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/set-timeout"));
-
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/promise"));
-
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/assign"));
-
 var _parseInt2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/parse-int"));
-
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/json/stringify"));
-
 var _event = _interopRequireDefault(require("../helper/event"));
-
 var _codeMap = require("../helper/codeMap");
-
 var _utils = require("../../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';
@@ -48,8 +33,7 @@ function setupWebViewJavascriptBridge(callback) {
     document.documentElement.removeChild(WVJBIframe);
   }, 0);
 }
-
-var mobileBridgeInit = function mobileBridgeInit() {
+var mobileBridgeInit = exports.mobileBridgeInit = function mobileBridgeInit() {
   return new _promise["default"](function (resolve, reject) {
     setupWebViewJavascriptBridge(function (bridge) {
       (0, _utils.log)("\u6CE8\u518Cresume\u4E8B\u4EF6 ");
@@ -57,7 +41,6 @@ var mobileBridgeInit = function mobileBridgeInit() {
         (0, _utils.log)("resume\u76D1\u542C\u5230\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           resData: resData
         });
-
         _event["default"].execEvent('resume', resData);
       });
       (0, _utils.log)("\u6CE8\u518CunreadMsgAction\u4E8B\u4EF6 ");
@@ -65,7 +48,6 @@ var mobileBridgeInit = function mobileBridgeInit() {
         (0, _utils.log)("unreadMsgAction\u76D1\u542C\u5230\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           resData: resData
         });
-
         _event["default"].execEvent('unreadMsgAction', resData);
       });
       (0, _utils.log)("\u6CE8\u518CwebViewMsgReceive\u4E8B\u4EF6 ");
@@ -73,38 +55,31 @@ var mobileBridgeInit = function mobileBridgeInit() {
         (0, _utils.log)("webViewMsgReceive\u76D1\u542C\u5230\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           resData: resData
         });
-
         _event["default"].execEvent('webViewMsgReceive', resData);
       });
       bridge.registerHandler('pushWorkMsg', function (resData) {
         (0, _utils.log)("pushWorkMsg\u76D1\u542C\u5230\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           resData: resData
         });
-
         _event["default"].execEvent('pushWorkMsg', resData);
       });
       bridge.registerHandler('getTogetherCallback', function (resData) {
         (0, _utils.log)("getTogetherCallback\u76D1\u542C\u5230\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           resData: resData
         });
-
         _event["default"].execEvent('getTogetherCallback', resData);
       });
       bridge.registerHandler('sendMsgCommon', function (resData) {
         (0, _utils.log)("sendMsgCommon ", {
           resData: resData
         });
-
         _event["default"].execEvent('sendMsgCommon', resData);
       });
       resolve();
     });
   });
 };
-
-exports.mobileBridgeInit = mobileBridgeInit;
-
-var mobileBridge = function mobileBridge(method, param) {
+var mobileBridge = exports.mobileBridge = function mobileBridge(method, param) {
   return new _promise["default"](function (resolve, reject) {
     var p = (0, _assign["default"])({}, param);
     setupWebViewJavascriptBridge(function (bridge) {
@@ -112,7 +87,6 @@ var mobileBridge = function mobileBridge(method, param) {
         bridge.registerHandler(method, function (data) {
           var onSuccess = param.onSuccess;
           delete p.onSuccess;
-
           if ('function' === typeof onSuccess) {
             onSuccess(data);
             resolve({
@@ -122,14 +96,11 @@ 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 = (0, _parseInt2["default"])(code);
-
         var callbackStr = (0, _codeMap.electronResCodeMap)(_code);
         var callbackFun = p[callbackStr];
         (0, _utils.log)("SDK\u6267\u884C\u540E\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
@@ -139,40 +110,37 @@ var mobileBridge = function mobileBridge(method, param) {
           _code: _code,
           message: message,
           callbackFun: callbackFun
-        }); // 请求失败
-
+        });
+        // 请求失败
         if (callbackStr === 'onFail') {
           (0, _utils.bpitLog)({
             method: method,
             errorcode: _code,
             message: message || (0, _stringify["default"])(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) {
+        });
+        // if (_code === -2 || _code === 7) {
         //   bpitLog({
         //     method,
         //     errorcode: _code,
@@ -204,6 +172,4 @@ var mobileBridge = function mobileBridge(method, param) {
       });
     });
   });
-};
-
-exports.mobileBridge = mobileBridge;
+};

package/libs/lib/bridge/pc.js

@@ -1,42 +1,28 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports.pcBridge = exports.PcBridgeInit = void 0;
-
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/promise"));
-
 var _parseInt2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/parse-int"));
-
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/json/stringify"));
-
+var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/assign"));
 var _pcIframe = _interopRequireDefault(require("../helper/pcIframe"));
-
 var _codeMap = require("../helper/codeMap");
-
 var _utils = require("../../utils");
-
-var PcBridgeInit = function PcBridgeInit() {
+var PcBridgeInit = exports.PcBridgeInit = function PcBridgeInit() {
   _pcIframe["default"].init();
 };
-
-exports.PcBridgeInit = PcBridgeInit;
-
-var pcBridge = function pcBridge(method, param) {
+var pcBridge = exports.pcBridge = function pcBridge(method, param) {
   return new _promise["default"](function (resolve, reject) {
     return _pcIframe["default"].invokeAPI(method, param, function (_ref) {
       var data = _ref.data,
-          code = _ref.code,
-          message = _ref.message;
-
+        code = _ref.code,
+        message = _ref.message;
       var _code = (0, _parseInt2["default"])(code);
-
       var callbackStr = (0, _codeMap.electronResCodeMap)(_code);
       var callbackFun = param[callbackStr];
       (0, _utils.log)("SDK\u6267\u884C\u540E\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
@@ -46,41 +32,43 @@ var pcBridge = function pcBridge(method, param) {
         _code: _code,
         message: message,
         callbackFun: callbackFun
-      }); // 请求失败
-
+      });
+      // 请求失败
       if (callbackStr === 'onFail') {
         (0, _utils.bpitLog)({
           method: method,
           errorcode: _code,
           message: message || (0, _stringify["default"])(data) || 'SDK执行失败回调，相关参数'
         });
-
         if ('function' === typeof callbackFun) {
           console.log('wenai-code', code, _code);
-          message ? callbackFun({
+          var callbackData = Object.prototype.toString.call(data) === "[object Object]" ? (0, _assign["default"])((0, _assign["default"])({}, data), {
             code: code,
             message: message
-          }) : callbackFun(data);
+          }) : {
+            data: data,
+            code: code,
+            message: message
+          };
+          message ? callbackFun(callbackData) : 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) {
+      });
+      //  if (_code === -2) {
       //   bpitLog({
       //     method,
       //     errorcode: _code,
@@ -102,6 +90,4 @@ var pcBridge = function pcBridge(method, param) {
       // resolve({ _code, message, data });
     });
   });
-};
-
-exports.pcBridge = pcBridge;
+};

package/libs/lib/helper/apiHelper.js

@@ -1,21 +1,15 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports.genDefaultParamsDealFn = genDefaultParamsDealFn;
-
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/object/assign"));
-
 function genDefaultParamsDealFn(p) {
   return function (r) {
     return (0, _assign["default"])((0, _assign["default"])({}, p), r);
   };
 }
-
 ;

package/libs/lib/helper/codeMap.js

@@ -1,19 +1,13 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports.electronResCodeMap = electronResCodeMap;
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/map"));
-
 var resCodeMap = new _map["default"]([[0, 'onSuccess'], [-1, 'onCancel'], [-2, 'onFail'], [-3, 'onProgress'], [-4, 'onSubmit']]);
-
 function electronResCodeMap(code) {
   return resCodeMap.get(code) || 'onFail';
 }

package/libs/lib/helper/event.js

@@ -1,58 +1,39 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports["default"] = void 0;
-
 var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/array/is-array"));
-
 var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/index-of"));
-
 var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/splice"));
-
 var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/for-each"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
-
 var Event = /*#__PURE__*/(0, _createClass2["default"])(function Event() {
   var _this = this;
-
   (0, _classCallCheck2["default"])(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 (!(0, _isArray["default"])(_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 ((0, _isArray["default"])(_this.eventsHandle[event])) {
       var _context, _context2;
-
       var n = (0, _indexOf["default"])(_context = _this.eventsHandle[event]).call(_context, fn);
       -1 !== n && (0, _splice["default"])(_context2 = _this.eventsHandle[event]).call(_context2, n, 1);
     }
   };
-
   this.execEvent = function (event, data) {
     var _context3;
-
     (0, _isArray["default"])(this.eventsHandle[event]) && (0, _forEach["default"])(_context3 = this.eventsHandle[event]).call(_context3, function (fn) {
       try {
         fn(data);
@@ -61,9 +42,7 @@ var Event = /*#__PURE__*/(0, _createClass2["default"])(function Event() {
       }
     });
   };
-
   this.eventsHandle = {};
 });
 var event = new Event();
-var _default = event;
-exports["default"] = _default;
+var _default = exports["default"] = event;

package/libs/lib/helper/pcIframe.js

@@ -1,44 +1,30 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports["default"] = void 0;
-
 var _now = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/date/now"));
-
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/json/stringify"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
-
 var _utils = require("../../utils");
-
 var _event = _interopRequireDefault(require("./event"));
-
 // 处理posmessage参数
 var GenPostMsg = /*#__PURE__*/(0, _createClass2["default"])(function GenPostMsg(method, param, callback) {
   var _this = this;
-
   (0, _classCallCheck2["default"])(this, GenPostMsg);
-
   this.genid = function () {
     var idStr = (0, _now["default"])().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,
@@ -48,7 +34,6 @@ var GenPostMsg = /*#__PURE__*/(0, _createClass2["default"])(function GenPostMsg(
       invokeType: _this.invokeType
     };
   };
-
   this.id = this.genid();
   this.PromiseObj = {
     resolve: null,
@@ -57,7 +42,8 @@ var GenPostMsg = /*#__PURE__*/(0, _createClass2["default"])(function GenPostMsg(
   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,
@@ -68,76 +54,59 @@ var GenPostMsg = /*#__PURE__*/(0, _createClass2["default"])(function GenPostMsg(
 });
 var Frame = /*#__PURE__*/(0, _createClass2["default"])(function Frame() {
   var _this2 = this;
-
   (0, _classCallCheck2["default"])(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 = (0, _stringify["default"])(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,
-        _datas$data = datas.data,
-        data = _datas$data === void 0 ? {} : _datas$data,
-        code = datas.code,
-        message = datas.message,
-        msg = datas.msg;
-
+      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["default"].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((0, _stringify["default"])({
               type: type,
@@ -159,16 +128,13 @@ var Frame = /*#__PURE__*/(0, _createClass2["default"])(function Frame() {
               }
             }));
           }
-
           break;
-
         default:
           break;
       }
     } else if (type === 'response') {
       // 响应壳子的回调
       var pending = _this2.getPending(msgId);
-
       pending && pending.receiveResponse({
         data: data,
         code: code,
@@ -177,20 +143,16 @@ var Frame = /*#__PURE__*/(0, _createClass2["default"])(function Frame() {
       code != -3 && _this2.deletePending(msgId);
     }
   };
-
   this.init = function () {
     window.addEventListener('message', function (msg) {
       (0, _utils.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();
-var _default = frame;
-exports["default"] = _default;
+var _default = exports["default"] = frame;