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

package/es/lib/bridge/mobile.js

@@ -2,6 +2,7 @@ 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 _parseInt from "@babel/runtime-corejs3/core-js/parse-int";
+import _JSON$stringify from "@babel/runtime-corejs3/core-js/json/stringify";
 import Event from '../helper/event';
 import { electronResCodeMap } from '../helper/codeMap';
 import { log, bpitLog } from '../../utils';
@@ -66,6 +67,16 @@ var mobileBridgeInit = function mobileBridgeInit() {
         });
         Event.execEvent('sendMsgCommon', resData);
       });
+      bridge.registerHandler('toolbarClickEvent', function (resData, responseCallback) {
+        log("toolbarClickEvent ", {
+          resData: resData
+        });
+        var responseData = {
+          data: resData,
+          callback: responseCallback
+        };
+        Event.execEvent('toolbarClickEvent', responseData);
+      });
       resolve();
     });
   });
@@ -93,26 +104,6 @@ var mobileBridge = function mobileBridge(method, param) {
           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,
@@ -122,6 +113,27 @@ var mobileBridge = function mobileBridge(method, param) {
           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);
         }
@@ -130,6 +142,35 @@ 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});
       });
     });
   });

package/es/lib/bridge/pc.js

@@ -1,5 +1,7 @@
 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';
@@ -7,20 +9,13 @@ 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;
       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,
@@ -30,6 +25,33 @@ var pcBridge = function pcBridge(method, param) {
         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);
+          var callbackData = Object.prototype.toString.call(data) === "[object Object]" ? _Object$assign(_Object$assign({}, 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);
       }
@@ -38,6 +60,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 });
     });
   });
 };

package/es/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/es/lib/helper/pcIframe.js

@@ -21,6 +21,7 @@ var GenPostMsg = /*#__PURE__*/_createClass(function GenPostMsg(method, param, ca
     return {
       msgId: _this.id,
       methodName: _this.methodName,
+      moduleId: _this.moduleId,
       body: _this.plainMsg,
       type: 'request',
       invokeType: _this.invokeType
@@ -34,6 +35,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.moduleId = param === null || param === void 0 ? void 0 : param.moduleId;
   this.callback = callback;
   // this.result = new Promise(
   //   function (resolve, reject) {
@@ -62,12 +64,25 @@ var Frame = /*#__PURE__*/_createClass(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 = _JSON$stringify(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 = _JSON$stringify(genPostMsg.getPayload());
+      _this2.invokeAPIInModuleFederation(payload);
+    } else {
+      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 === 'browserView' ? _this2.invokeAPIInBrowserView(_payload) : _this2.invokeAPIInWebview(_payload);
+    }
+    // 调用时传入 moduleId
     _this2.addPending(genPostMsg);
     return genPostMsg;
   };
@@ -76,9 +91,11 @@ var Frame = /*#__PURE__*/_createClass(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) {
@@ -128,12 +145,19 @@ var Frame = /*#__PURE__*/_createClass(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) {
       log('electron res: ', msg);
       _this2.handleCallback(msg.data || {});
@@ -143,6 +167,8 @@ var Frame = /*#__PURE__*/_createClass(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();
 export default frame;

package/es/lib/index.js

@@ -40,12 +40,12 @@ function initSdk() {
   if (platform === 'pc') {
     bridgeInit = function bridgeInit() {
       return __awaiter(_this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
+        return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               PcBridgeInit();
               return _context.abrupt("return", pcBridge);
-            case 2:
+            case 1:
             case "end":
               return _context.stop();
           }

package/es/lib/sdk/index.js

@@ -2,7 +2,7 @@ import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
 import _Promise from "@babel/runtime-corejs3/core-js/promise";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js/instance/concat";
-import { bpitLog } from '../../utils';
+import { bpitLog, log } from '../../utils';
 import { compareVersions } from '../../utils/compareVersions';
 import packageInfo from '../../../package.json';
 var Sdk = /*#__PURE__*/function () {
@@ -70,7 +70,7 @@ var Sdk = /*#__PURE__*/function () {
       }
     };
   }
-  _createClass(Sdk, [{
+  return _createClass(Sdk, [{
     key: "setAPI",
     value: function setAPI(method, config) {
       this.invokeAPIConfigMapByMethod[method] = config;
@@ -142,10 +142,20 @@ var Sdk = /*#__PURE__*/function () {
         }
         // 主方法
         this.bridgeInitFn().then(function (fn) {
-          fn(method, p).then(function () {
+          fn(method, p).then(function (res) {
             // 调用成功
+            log("SDK \u8FD4\u56DE\u7ED3\u679C\u6210\u529F ", {
+              method: method,
+              params: p,
+              result: res
+            });
           })["catch"](function (error) {
             // 调用失败
+            log("SDK \u8FD4\u56DE\u7ED3\u679C\u5931\u8D25", {
+              method: method,
+              params: p,
+              error: error
+            });
           });
         })["catch"](function (err) {
           console.log('wenai err', err);
@@ -155,6 +165,5 @@ var Sdk = /*#__PURE__*/function () {
       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.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/es/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/es/utils/console.js

@@ -6,10 +6,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/es/utils/env.js

@@ -9,7 +9,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 = ENV_ENUM.notInYach;
   if (inIOS) {
@@ -34,10 +36,12 @@ function getENV() {
       inAndroid: inAndroid,
       inPC: inPC,
       inIpad: inIpad,
-      inIPhone: inIPhone
+      inIPhone: inIPhone,
+      inHarmonyNext: inHarmonyNext
     },
     version: version,
-    language: language
+    language: language,
+    env: isTest ? 'test' : 'online'
   };
 }
 export { getENV };

package/es/utils/index.js

@@ -4,7 +4,7 @@ import { getENV } from './env';
 import bpitLog from './bpitLog';
 import { log, error, warn } from './console';
 function staticsLog(config) {
-  var env = 'test';
+  var env = getENV().env;
   var version = getENV().version;
   var timestamp = _Date$now();
   var params = _Object$assign({

package/libs/api/biz/navigation/close.d.ts

@@ -1,5 +1,6 @@
 import { IError } from '../../common.typings';
 export interface IBizNavigationCloseParams {
+    id?: string;
     onSuccess?: () => void;
     onFail?: (err: IError) => void;
 }

package/libs/api/biz/navigation/tencentMeeting.d.ts

@@ -15,6 +15,7 @@ export interface IBizNavigationTencentMeetingParams {
     start_time: string;
     sync_status: number;
     last_sync_info: ISyncInfo;
+    record_type: number;
     onSuccess?: (data: IBizNavigationGetTencentMeetingUrl) => void;
     onFail?: (err: IError) => void;
 }

package/libs/api/biz/util/addAppToNav.d.ts

@@ -0,0 +1,9 @@
+import { IError } from '../../common.typings';
+export interface IAddAppToNavParams {
+    appId: string;
+    platfrorm?: string;
+    onSuccess?: (res: any) => void;
+    onFail?: (err: IError) => void;
+}
+declare function addAppToNav(params: IAddAppToNavParams): void;
+export { addAppToNav };

package/libs/api/biz/util/addAppToNav.js

@@ -0,0 +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.addAppToNav = addAppToNav;
+var _initAPI = _interopRequireDefault(require("../../initAPI"));
+var ios = {
+  vs: '1.8.8'
+};
+var android = {
+  vs: '1.8.8'
+};
+var pc = {
+  vs: '1.8.8'
+};
+var platform = {
+  ios: ios,
+  android: android,
+  pc: pc
+};
+var apiName = 'biz.util.addAppToNav';
+function addAppToNav(params) {
+  (0, _initAPI["default"])(apiName, {
+    params: params,
+    platform: platform
+  });
+}

package/libs/api/biz/util/copy.d.ts

@@ -0,0 +1,11 @@
+import { IError } from '../../common.typings';
+export interface IBizUtilCopyResult {
+    data?: Object;
+}
+export interface IBizUtilCopyParams {
+    text: string;
+    onSuccess?: (data: IBizUtilCopyResult) => void;
+    onFail?: (err: IError) => void;
+}
+declare function copy(params: IBizUtilCopyParams): void;
+export { copy };

package/libs/api/biz/util/copy.js

@@ -0,0 +1,26 @@
+"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.copy = copy;
+var _initAPI = _interopRequireDefault(require("../../initAPI"));
+var ios = {
+  vs: '0.0.0'
+};
+var android = {
+  vs: '0.0.0'
+};
+var platform = {
+  ios: ios,
+  android: android
+};
+var apiName = 'biz.util.copy';
+function copy(params) {
+  (0, _initAPI["default"])(apiName, {
+    params: params,
+    platform: platform
+  });
+}

package/libs/api/biz/util/focus.d.ts

@@ -0,0 +1,7 @@
+import { IError } from '../../common.typings';
+export interface IFocusParams {
+    onSuccess?: (res: any) => void;
+    onFail?: (err: IError) => void;
+}
+declare function focus(params: IFocusParams): void;
+export { focus };

package/libs/api/biz/util/focus.js

@@ -0,0 +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.focus = focus;
+var _initAPI = _interopRequireDefault(require("../../initAPI"));
+var pc = {
+  vs: '1.9.13'
+};
+var ios = {
+  vs: '1.9.13'
+};
+var android = {
+  vs: '1.9.13'
+};
+var platform = {
+  pc: pc,
+  ios: ios,
+  android: android
+};
+var apiName = 'biz.util.focus';
+function focus(params) {
+  (0, _initAPI["default"])(apiName, {
+    params: params,
+    platform: platform
+  });
+}

package/libs/api/biz/util/getConfig.d.ts

@@ -0,0 +1,13 @@
+import { IError } from '../../common.typings';
+export interface GetConfigResult {
+    code: number;
+    message: string;
+    data: any;
+}
+export interface GetConfigParams {
+    configNode: String;
+    onSuccess?: (res: GetConfigResult) => void;
+    onFail?: (err: IError) => void;
+}
+declare function getConfig(params: GetConfigParams): void;
+export { getConfig };

package/libs/api/biz/util/getConfig.js

@@ -0,0 +1,26 @@
+"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.getConfig = getConfig;
+var _initAPI = _interopRequireDefault(require("../../initAPI"));
+var ios = {
+  vs: '1.9.12'
+};
+var android = {
+  vs: '1.9.12'
+};
+var platform = {
+  ios: ios,
+  android: android
+};
+var apiName = 'biz.util.getConfig';
+function getConfig(params) {
+  (0, _initAPI["default"])(apiName, {
+    params: params,
+    platform: platform
+  });
+}