yach.open.jssdk 4.3.8 → 4.3.9

package/es/lib/bridge/pc.js

@@ -1,23 +1,20 @@
 import _Promise from "@babel/runtime-corejs3/core-js/promise";
 import _parseInt from "@babel/runtime-corejs3/core-js/parse-int";
 import _JSON$stringify from "@babel/runtime-corejs3/core-js/json/stringify";
+import _Object$assign from "@babel/runtime-corejs3/core-js/object/assign";
 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, 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);
       var callbackFun = param[callbackStr];
       log("SDK\u6267\u884C\u540E\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
@@ -27,41 +24,43 @@ 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({
+          var callbackData = Object.prototype.toString.call(data) === "[object Object]" ? _Object$assign(_Object$assign({}, 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,

package/es/lib/helper/apiHelper.js

@@ -1,10 +1,8 @@
 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,8 +1,6 @@
 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

@@ -4,39 +4,28 @@ 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() {
   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);
@@ -45,9 +34,7 @@ var Event = /*#__PURE__*/_createClass(function Event() {
       }
     });
   };
-
   this.eventsHandle = {};
 });
-
 var event = new Event();
 export default event;

package/es/lib/helper/pcIframe.js

@@ -3,25 +3,20 @@ 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 { log } from '../../utils';
-import Event from './event'; // 处理posmessage参数
-
+import Event from './event';
+// 处理posmessage参数
 var GenPostMsg = /*#__PURE__*/_createClass(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,
@@ -31,7 +26,6 @@ var GenPostMsg = /*#__PURE__*/_createClass(function GenPostMsg(method, param, ca
       invokeType: _this.invokeType
     };
   };
-
   this.id = this.genid();
   this.PromiseObj = {
     resolve: null,
@@ -40,7 +34,8 @@ 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,
@@ -49,80 +44,61 @@ var GenPostMsg = /*#__PURE__*/_createClass(function GenPostMsg(method, param, ca
   //   }.bind(this)
   // );
 });
-
 var Frame = /*#__PURE__*/_createClass(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,
-        _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.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,
@@ -144,16 +120,13 @@ 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,
@@ -162,20 +135,16 @@ var Frame = /*#__PURE__*/_createClass(function Frame() {
       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,13 +1,11 @@
 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 {
@@ -16,7 +14,6 @@ var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, gene
         reject(e);
       }
     }
-
     function rejected(value) {
       try {
         step(generator["throw"](value));
@@ -24,15 +21,12 @@ 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';
@@ -40,26 +34,20 @@ 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);
       }));
@@ -71,7 +59,6 @@ function initSdk() {
       });
     };
   }
-
   var config = {
     platform: platform,
     authMethod: 'config',
@@ -87,6 +74,5 @@ function initSdk() {
   };
   yachSdk.setPlatform(config);
 }
-
 initSdk();
 export { yachSdk, initSdk };

package/es/lib/sdk/index.js

@@ -5,13 +5,10 @@ import _concatInstanceProperty from "@babel/runtime-corejs3/core-js/instance/con
 import { bpitLog, log } from '../../utils';
 import { compareVersions } from '../../utils/compareVersions';
 import packageInfo from '../../../package.json';
-
 var Sdk = /*#__PURE__*/function () {
   function Sdk(env) {
     var _this = this;
-
     _classCallCheck(this, Sdk);
-
     this.invokeAPIConfigMapByMethod = {};
     this.configJsApiList = [];
     this.platformConfigMap = {};
@@ -32,11 +29,9 @@ var Sdk = /*#__PURE__*/function () {
       platformV2: env.platformV2,
       config: function config() {
         var _config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
         // 鉴权
         var _config$jsApiList = _config.jsApiList,
-            jsApiList = _config$jsApiList === void 0 ? [] : _config$jsApiList;
-
+          jsApiList = _config$jsApiList === void 0 ? [] : _config$jsApiList;
         if (_this.hadConfig) {
           console.log('Config has been executed');
         } else {
@@ -44,7 +39,6 @@ var Sdk = /*#__PURE__*/function () {
             fn('config', _config).then(function (value) {
               // 鉴权成功
               _this.cacheP.resolve(value);
-
               _this.hadConfig = true;
               _this.configJsApiList = jsApiList;
             })["catch"](function (error) {
@@ -76,19 +70,19 @@ var Sdk = /*#__PURE__*/function () {
       }
     };
   }
-
   _createClass(Sdk, [{
     key: "setAPI",
     value: function setAPI(method, config) {
       this.invokeAPIConfigMapByMethod[method] = config;
-    } // 确定端的同事初始化bridge
-
+    }
+    // 确定端的同事初始化bridge
   }, {
     key: "setPlatform",
     value: function setPlatform(value) {
       var platform = value.platform,
-          bridgeInit = value.bridgeInit;
-      this.platformConfigMap[platform] = value; // if (this.env.platform === platform) bridgeInit();
+        bridgeInit = value.bridgeInit;
+      this.platformConfigMap[platform] = value;
+      // if (this.env.platform === platform) bridgeInit();
     }
   }, {
     key: "bridgeInitFn",
@@ -97,16 +91,13 @@ var Sdk = /*#__PURE__*/function () {
       if (this.bridgeInitFnPromise) {
         return this.bridgeInitFnPromise;
       }
-
       var o = this.platformConfigMap[this.env.platform];
-
       if (o) {
         this.bridgeInitFnPromise = o.bridgeInit();
       } else {
         var n = 'Do not support the current environment�' + this.env.platform;
         this.bridgeInitFnPromise = _Promise.reject(new Error(n));
       }
-
       return this.bridgeInitFnPromise;
     }
   }, {
@@ -126,39 +117,30 @@ var Sdk = /*#__PURE__*/function () {
     key: "invokeAPI",
     value: function invokeAPI(method, params) {
       var _context2;
-
       if (!params) params = {};
-      if (!method) return; // 验证方法是否可用
-
+      if (!method) return;
+      // 验证方法是否可用
       var apiConfigs = this.invokeAPIConfigMapByMethod[method];
-
       if (!apiConfigs) {
         return this._onFail(method, '-1', "[".concat(method, "] method is not exist"), params.onFail);
       }
-
       var apiConfig = apiConfigs[this.env.platform];
-
       if (apiConfig) {
         var supportVersion = apiConfig.vs || '0.0.0';
-
         if (compareVersions(this.env.version, supportVersion) < 0) {
           var _context;
-
           return this._onFail(method, '-1', _concatInstanceProperty(_context = "The current application version is ".concat(this.env.version, ". This method does not support versions less than ")).call(_context, supportVersion), params.onFail);
-        } // 确定参数
-
-
-        var p = apiConfig.paramsDeal ? apiConfig.paramsDeal(params) : params; // 确定回调
-
+        }
+        // 确定参数
+        var p = apiConfig.paramsDeal ? apiConfig.paramsDeal(params) : params;
+        // 确定回调
         if ('function' == typeof p.onSuccess) {
           var v = p.onSuccess;
-
           p.onSuccess = function (e) {
             v(e);
           };
-        } // 主方法
-
-
+        }
+        // 主方法
         this.bridgeInitFn().then(function (fn) {
           fn(method, p).then(function (res) {
             // 调用成功
@@ -180,12 +162,9 @@ var Sdk = /*#__PURE__*/function () {
         });
         return;
       }
-
       this._onFail(method, '-1', _concatInstanceProperty(_context2 = "[".concat(method, "] method do not support the current platform (")).call(_context2, this.env.platform, ")"), params.onFail);
     }
   }]);
-
   return Sdk;
 }();
-
 export default Sdk;

package/es/lib/sdk/sdk.typings.js

@@ -1,5 +1,4 @@
 export var ENV_ENUM;
-
 (function (ENV_ENUM) {
   ENV_ENUM["pc"] = "pc";
   ENV_ENUM["android"] = "android";

package/es/utils/bpitLog.js

@@ -1,7 +1,6 @@
 function loadScript(url) {
   var script = document.createElement('script');
   script.type = 'text/javascript';
-
   if (script.readyState) {
     // ie 浏览器
     script.onreadystatechange = function () {
@@ -16,38 +15,31 @@ function loadScript(url) {
       document.getElementsByTagName('head')[0].removeChild(script);
     };
   }
-
   script.src = url;
   document.getElementsByTagName('head')[0].appendChild(script);
 }
-
 export default function bpitLog(options) {
   if (!options) {
     console.log('bpit error: need options');
     return;
   }
-
   if (!options.group) {
     console.log('bpit error: need options.group');
     return;
   }
-
   if (!options.project) {
     console.log('bpit error: need options.project');
     return;
   }
-
   if (!options.hasOwnProperty('env')) {
     console.log('bpit error: need options.env');
     return;
   }
-
   if (!options.hasOwnProperty('version')) {
     console.log('bpit error: need options.version');
     return;
-  } // upload data
-
-
+  }
+  // upload data
   var uploadData = ['https://es.zhiyinlou.com/log.js?'];
   uploadData.push('group=' + options.group);
   uploadData.push('&project=' + options.project);
@@ -58,13 +50,12 @@ export default function bpitLog(options) {
   if (options.workcode) uploadData.push('&workcode=' + options.workcode);
   if (options.timestamp) uploadData.push('&timestamp=' + options.timestamp);
   if (options.errorcode) uploadData.push('&errorcode=' + options.errorcode);
-  if (options.message) uploadData.push('&message=' + options.message); // api load time
-
+  if (options.message) uploadData.push('&message=' + options.message);
+  // api load time
   if (options.api && options.time) {
     uploadData.push('&api=' + options.api);
     uploadData.push('&load_time=' + options.time);
   }
-
   var uploadDataUrl = uploadData.join('');
   loadScript(uploadDataUrl);
   if (options.env != 'online') console.log(uploadDataUrl);