yach.open.jssdk 4.4.10-beta.2 → 4.4.10-beta.3

package/libs/lib/bridge/mobile.js

@@ -10,6 +10,7 @@ var _setTimeout2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-j
 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");
@@ -32,7 +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 ");
@@ -74,12 +75,21 @@ var mobileBridgeInit = function mobileBridgeInit() {
         });
         _event["default"].execEvent('sendMsgCommon', resData);
       });
+      bridge.registerHandler('toolbarClickEvent', function (resData, responseCallback) {
+        (0, _utils.log)("toolbarClickEvent ", {
+          resData: resData
+        });
+        var responseData = {
+          data: resData,
+          callback: responseCallback
+        };
+        _event["default"].execEvent('toolbarClickEvent', responseData);
+      });
       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) {
@@ -102,26 +112,6 @@ var mobileBridge = function mobileBridge(method, param) {
           data = e.data;
         var _code = (0, _parseInt2["default"])(code);
         var callbackStr = (0, _codeMap.electronResCodeMap)(_code);
-        if (_code === -2 || _code === 7) {
-          (0, _utils.bpitLog)({
-            method: method,
-            errorcode: _code,
-            message: message || 'SDK执行失败回调，相关参数'
-          });
-          (0, _utils.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];
         (0, _utils.log)("SDK\u6267\u884C\u540E\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
           method: method,
@@ -131,6 +121,27 @@ var mobileBridge = function mobileBridge(method, param) {
           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);
         }
@@ -139,8 +150,36 @@ var mobileBridge = function mobileBridge(method, param) {
           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});
       });
     });
   });
-};
-exports.mobileBridge = mobileBridge;
+};

package/libs/lib/bridge/pc.js

@@ -8,28 +8,22 @@ _Object$defineProperty(exports, "__esModule", {
 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) {
-  return new _promise["default"](function (resolve) {
+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;
       var _code = (0, _parseInt2["default"])(code);
       var callbackStr = (0, _codeMap.electronResCodeMap)(_code);
-      if (_code === -2) {
-        (0, _utils.bpitLog)({
-          method: method,
-          errorcode: _code,
-          message: message || 'SDK执行失败回调，相关参数'
-        });
-      }
       var callbackFun = param[callbackStr];
       (0, _utils.log)("SDK\u6267\u884C\u540E\u56DE\u8C03\uFF0C\u76F8\u5173\u53C2\u6570 ", {
         method: method,
@@ -39,6 +33,33 @@ var pcBridge = function pcBridge(method, param) {
         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);
+          var callbackData = Object.prototype.toString.call(data) === "[object Object]" ? (0, _assign["default"])((0, _assign["default"])({}, data), {
+            code: code,
+            message: message
+          }) : {
+            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);
       }
@@ -47,7 +68,26 @@ var pcBridge = function pcBridge(method, param) {
         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 });
     });
   });
-};
-exports.pcBridge = pcBridge;
+};

package/libs/lib/helper/event.js

@@ -45,5 +45,4 @@ 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.d.ts

@@ -3,41 +3,24 @@ declare global {
         sendToHost: any;
         sendTo: any;
         receiveBrowserViewData: any;
+        remoteSendToHost?: (payload: string) => void;
+        remoteReceiveFromHost?: (callback: (result: Record<string, any>) => void, moduleId?: string) => void;
     }
 }
-interface APIParams {
-    invokeType?: 'browserView' | '';
-    [propName: string]: any;
-}
-declare class GenPostMsg {
-    private id;
-    private PromiseObj;
-    private methodName;
-    private plainMsg;
-    callback: (v: any) => void;
-    result: Promise<any>;
-    invokeType: 'browserView' | '';
-    constructor(method: string, param: APIParams, callback: any);
-    genid: () => string;
-    receiveResponse: (data: any) => void;
-    getPayload: () => {
-        msgId: string;
-        methodName: string;
-        body: object;
-        type: string;
-        invokeType: "" | "browserView";
-    };
-}
+declare type InvokeType = 'browserView' | 'moduleFederation' | '';
 declare class Frame {
     pendingMsgs: {};
+    invokeType?: InvokeType;
+    moduleId?: string;
     constructor();
     addPending: (e: any) => void;
     deletePending: (e: any) => void;
     getPending: (t: any) => any;
     invokeAPIInBrowserView: (payload: string) => void;
     invokeAPIInWebview: (payload: string) => void;
-    invokeAPI: (method: string, param: any, callback: any) => GenPostMsg;
-    handleCallback: (datas: any, invokeType?: 'browserView' | '') => void;
+    invokeAPIInModuleFederation: (payload: string) => void;
+    invokeAPI: (method: string, param: any, callback: any) => any;
+    handleCallback: (datas: any, invokeType?: InvokeType) => void;
     init: () => void;
 }
 declare const frame: Frame;

package/libs/lib/helper/pcIframe.js

@@ -29,6 +29,7 @@ var GenPostMsg = /*#__PURE__*/(0, _createClass2["default"])(function GenPostMsg(
     return {
       msgId: _this.id,
       methodName: _this.methodName,
+      moduleId: _this.moduleId,
       body: _this.plainMsg,
       type: 'request',
       invokeType: _this.invokeType
@@ -42,6 +43,7 @@ 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.moduleId = param === null || param === void 0 ? void 0 : param.moduleId;
   this.callback = callback;
   // this.result = new Promise(
   //   function (resolve, reject) {
@@ -70,12 +72,25 @@ var Frame = /*#__PURE__*/(0, _createClass2["default"])(function Frame() {
   this.invokeAPIInWebview = function (payload) {
     window.sendToHost(payload);
   };
+  this.invokeAPIInModuleFederation = function (payload) {
+    window.remoteSendToHost(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 === 'browserView' ? _this2.invokeAPIInBrowserView(payload) : _this2.invokeAPIInWebview(payload);
+    var genPostMsg;
+    if (_this2.invokeType === 'moduleFederation') {
+      param.invokeType = _this2.invokeType;
+      param.moduleId = _this2.moduleId;
+      genPostMsg = new GenPostMsg(method, param, callback);
+      var payload = (0, _stringify["default"])(genPostMsg.getPayload());
+      _this2.invokeAPIInModuleFederation(payload);
+    } else {
+      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 === 'browserView' ? _this2.invokeAPIInBrowserView(_payload) : _this2.invokeAPIInWebview(_payload);
+    }
+    // 调用时传入 moduleId
     _this2.addPending(genPostMsg);
     return genPostMsg;
   };
@@ -84,9 +99,11 @@ var Frame = /*#__PURE__*/(0, _createClass2["default"])(function Frame() {
       methodName = datas.methodName,
       eventName = datas.eventName,
       msgId = datas.msgId,
-      data = datas.data,
+      _datas$data = datas.data,
+      data = _datas$data === void 0 ? {} : _datas$data,
       code = datas.code,
-      message = datas.message;
+      message = datas.message,
+      msg = datas.msg;
     if (type === 'request') {
       // 壳子的调用
       switch (methodName) {
@@ -136,12 +153,19 @@ var Frame = /*#__PURE__*/(0, _createClass2["default"])(function Frame() {
       pending && pending.receiveResponse({
         data: data,
         code: code,
-        message: message
+        message: message || msg || data.msg || data.message
       });
       code != -3 && _this2.deletePending(msgId);
     }
   };
   this.init = function () {
+    var _a;
+    if (_this2.invokeType === 'moduleFederation') {
+      (_a = window.remoteReceiveFromHost) === null || _a === void 0 ? void 0 : _a.call(window, function (response) {
+        _this2.handleCallback(response);
+      }, _this2.moduleId);
+      return;
+    }
     window.addEventListener('message', function (msg) {
       (0, _utils.log)('electron res: ', msg);
       _this2.handleCallback(msg.data || {});
@@ -151,7 +175,8 @@ var Frame = /*#__PURE__*/(0, _createClass2["default"])(function Frame() {
     });
   };
   this.pendingMsgs = {};
+  this.invokeType = window.remoteSendToHost && window.remoteReceiveFromHost && process ? 'moduleFederation' : '';
+  this.moduleId = Math.random().toString(36).substring(2, 15);
 });
 var frame = new Frame();
-var _default = frame;
-exports["default"] = _default;
+var _default = exports["default"] = frame;

package/libs/lib/index.js

@@ -42,20 +42,19 @@ var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P
 };
 var env = (0, _utils.getENV)();
 var platform = env.platform;
-var yachSdk = new _sdk["default"](env);
-exports.yachSdk = yachSdk;
+var yachSdk = exports.yachSdk = new _sdk["default"](env);
 function initSdk() {
   var _this = this;
   var bridgeInit;
   if (platform === 'pc') {
     bridgeInit = function bridgeInit() {
       return __awaiter(_this, void 0, void 0, /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        return _regenerator["default"].wrap(function _callee$(_context) {
+        return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               (0, _bridge.PcBridgeInit)();
               return _context.abrupt("return", _bridge.pcBridge);
-            case 2:
+            case 1:
             case "end":
               return _context.stop();
           }

package/libs/lib/sdk/index.js

@@ -78,7 +78,7 @@ var Sdk = /*#__PURE__*/function () {
       }
     };
   }
-  (0, _createClass2["default"])(Sdk, [{
+  return (0, _createClass2["default"])(Sdk, [{
     key: "setAPI",
     value: function setAPI(method, config) {
       this.invokeAPIConfigMapByMethod[method] = config;
@@ -150,10 +150,20 @@ var Sdk = /*#__PURE__*/function () {
         }
         // 主方法
         this.bridgeInitFn().then(function (fn) {
-          fn(method, p).then(function () {
+          fn(method, p).then(function (res) {
             // 调用成功
+            (0, _utils.log)("SDK \u8FD4\u56DE\u7ED3\u679C\u6210\u529F ", {
+              method: method,
+              params: p,
+              result: res
+            });
           })["catch"](function (error) {
             // 调用失败
+            (0, _utils.log)("SDK \u8FD4\u56DE\u7ED3\u679C\u5931\u8D25", {
+              method: method,
+              params: p,
+              error: error
+            });
           });
         })["catch"](function (err) {
           console.log('wenai err', err);
@@ -163,7 +173,5 @@ var Sdk = /*#__PURE__*/function () {
       this._onFail(method, '-1', (0, _concat["default"])(_context2 = "[".concat(method, "] method do not support the current platform (")).call(_context2, this.env.platform, ")"), params.onFail);
     }
   }]);
-  return Sdk;
 }();
-var _default = Sdk;
-exports["default"] = _default;
+var _default = exports["default"] = Sdk;

package/libs/lib/sdk/sdk.typings.d.ts

@@ -17,6 +17,7 @@ export interface PlatformV2Props {
     inPC: boolean;
     inIpad: boolean;
     inIPhone: boolean;
+    inHarmonyNext: boolean;
 }
 export interface IENV {
     /** current platform (ios or android or pc or notInYach) */
@@ -26,6 +27,7 @@ export interface IENV {
     /** @deprecated recommend use navigator.language to get current language */
     language?: string;
     platformV2: PlatformV2Props;
+    env: 'test' | 'online';
 }
 export interface IInvokeAPIConfigMap {
     [platform: string]: IAPIConfig | undefined;

package/libs/lib/sdk/sdk.typings.js

@@ -6,7 +6,6 @@ _Object$defineProperty(exports, "__esModule", {
 });
 exports.ENV_ENUM = void 0;
 var ENV_ENUM;
-exports.ENV_ENUM = ENV_ENUM;
 (function (ENV_ENUM) {
   ENV_ENUM["pc"] = "pc";
   ENV_ENUM["android"] = "android";

package/libs/utils/compareVersions.js

@@ -19,7 +19,7 @@ var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/in
  * @param v2 - Second version to compare
  * @returns Numeric value compatible with the [Array.sort(fn) interface](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#Parameters).
  */
-var compareVersions = function compareVersions(v1, v2) {
+var compareVersions = exports.compareVersions = function compareVersions(v1, v2) {
   // validate input and split into segments
   var n1 = validateAndParse(v1);
   var n2 = validateAndParse(v2);
@@ -50,8 +50,7 @@ var compareVersions = function compareVersions(v1, v2) {
  * validate('foo'); // return false
  * ```
  */
-exports.compareVersions = compareVersions;
-var validate = function validate(version) {
+var validate = exports.validate = function validate(version) {
   return typeof version === 'string' && /^[v\d]/.test(version) && semver.test(version);
 };
 /**
@@ -71,8 +70,7 @@ var validate = function validate(version) {
  * compare('10.1.1', '10.2.2', '>='); // return false
  * ```
  */
-exports.validate = validate;
-var compare = function compare(v1, v2, operator) {
+var compare = exports.compare = function compare(v1, v2, operator) {
   var _context;
   // validate input operator
   assertValidOperator(operator);
@@ -94,8 +92,7 @@ var compare = function compare(v1, v2, operator) {
  * satisfies('1.1.0', '~1.0.0'); // return false
  * ```
  */
-exports.compare = compare;
-var satisfies = function satisfies(version, range) {
+var satisfies = exports.satisfies = function satisfies(version, range) {
   // if no range operator then "="
   var m = range.match(/^([<>=~^]+)/);
   var op = m ? m[1] : '=';
@@ -119,7 +116,6 @@ var satisfies = function satisfies(version, range) {
   if (compareStrings(v2, r2) !== 0) return false;
   return compareStrings(v3, r3) >= 0;
 };
-exports.satisfies = satisfies;
 var semver = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([\da-z\-]+(?:\.[\da-z\-]+)*))?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?)?)?$/i;
 var validateAndParse = function validateAndParse(version) {
   if (typeof version !== 'string') {

package/libs/utils/console.d.ts

@@ -1,4 +1,4 @@
 declare function log(...args: any): any;
 declare function error(...args: any): any;
 declare function warn(...args: any): any;
-export { log, error, warn, };
+export { log, error, warn };

package/libs/utils/console.js

@@ -16,10 +16,10 @@ var myconsole = {
   warn: function warn() {},
   error: function error() {}
 };
-if (window && window.console) {
+if (typeof window !== 'undefined' && window.console) {
   myconsole = window.console;
 }
-if (document && document.body) {
+if (typeof document !== 'undefined' && document.body) {
   var iframe = document.createElement('iframe');
   if (iframe && iframe.contentWindow && iframe.contentWindow.console) {
     iframe.style.display = 'none';

package/libs/utils/env.js

@@ -16,7 +16,9 @@ function getENV() {
     inAndroid = /Android/i.test(ua) && inYach,
     inPC = /YachPc/i.test(ua),
     inIpad = /iPad/i.test(ua) && inYach,
-    inIPhone = /iPhone/i.test(ua) && inYach;
+    inIPhone = /iPhone/i.test(ua) && inYach,
+    isTest = /Yachtest/.test(ua) && inYach,
+    inHarmonyNext = /HarmonyOSNext/i.test(ua) && inYach;
   // platform
   var platform = _sdk.ENV_ENUM.notInYach;
   if (inIOS) {
@@ -41,9 +43,11 @@ function getENV() {
       inAndroid: inAndroid,
       inPC: inPC,
       inIpad: inIpad,
-      inIPhone: inIPhone
+      inIPhone: inIPhone,
+      inHarmonyNext: inHarmonyNext
     },
     version: version,
-    language: language
+    language: language,
+    env: isTest ? 'test' : 'online'
   };
 }

package/libs/utils/index.js

@@ -36,7 +36,7 @@ var _env = require("./env");
 var _bpitLog = _interopRequireDefault(require("./bpitLog"));
 var _console = require("./console");
 function staticsLog(config) {
-  var env = 'test';
+  var env = (0, _env.getENV)().env;
   var version = (0, _env.getENV)().version;
   var timestamp = (0, _now["default"])();
   var params = (0, _assign["default"])({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yach.open.jssdk",
-  "version": "4.4.10-beta.2",
+  "version": "4.4.10-beta.3",
   "description": "",
   "module": "./es/index.js",
   "main": "./libs/index.js",
@@ -15,8 +15,6 @@
     "build": "node ./tools/run compile",
     "lint": "eslint 'src/**/*.{js,ts}'",
     "lint-fix": "eslint --fix 'src/**/*.{js,ts}'",
-    "async": "npm run build && yalc push",
-    "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,scss,less --debug -x 'npm run async'",
     "p:beta": "npm publish --tag=beta --access public",
     "p": "npm publish"
   },