component-shipinlv 1.1.8 → 1.1.9

package/dist/VideoPublish/index.d.ts

@@ -7,7 +7,7 @@ interface Props {
     productType: VideoPublish.ProductType;
     apiUrl: string;
     env?: Global.Env;
-    clientUniqueKey: string;
+    clientIdentity: string;
 }
 declare const VideoPublish: React.FC<Props>;
 export default VideoPublish;

package/dist/VideoPublish/index.js

@@ -22,7 +22,7 @@ var VideoPublish = function VideoPublish(_ref) {
     productType = _ref.productType,
     apiUrl = _ref.apiUrl,
     env = _ref.env,
-    clientUniqueKey = _ref.clientUniqueKey;
+    clientIdentity = _ref.clientIdentity;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     menuList = _useState2[0],
@@ -100,7 +100,7 @@ var VideoPublish = function VideoPublish(_ref) {
     forceRender: canPublish,
     children: /*#__PURE__*/_jsx(VideoPublishLog, {
       env: env,
-      clientUniqueKey: clientUniqueKey
+      clientIdentity: clientIdentity
     })
   }];
   var _onMenu = function _onMenu(key) {
@@ -169,7 +169,7 @@ var VideoPublish = function VideoPublish(_ref) {
       })]
     }), /*#__PURE__*/_jsx(VideoPublishPublishVideoPlan, {
       env: env,
-      clientUniqueKey: clientUniqueKey
+      clientIdentity: clientIdentity
     })]
   });
 };

package/dist/VideoPublish/log/index.d.ts

@@ -2,7 +2,7 @@ import React from "react";
 import './index.less';
 interface Props {
     env?: Global.Env;
-    clientUniqueKey: string;
+    clientIdentity: string;
 }
 declare const VideoPublishLog: React.FC<Props>;
 export default VideoPublishLog;

package/dist/VideoPublish/log/index.js

@@ -14,7 +14,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var MaxLine = 10000;
 var VideoPublishLog = function VideoPublishLog(_ref) {
-  var clientUniqueKey = _ref.clientUniqueKey,
+  var clientIdentity = _ref.clientIdentity,
     env = _ref.env;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -52,7 +52,7 @@ var VideoPublishLog = function VideoPublishLog(_ref) {
         case 'not-login':
           // 上报
           VideoPublishVideoAccountController.saveLoginStatus({
-            clientUniqueKey: clientUniqueKey,
+            clientIdentity: clientIdentity,
             platformVideoAccountId: data.platformAccountId,
             platform: data.platform,
             isLogin: false,

package/dist/VideoPublish/publish-task-plan/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import './index.less';
 interface Props {
     env?: Global.Env;
-    clientUniqueKey: string;
+    clientIdentity: string;
 }
 declare const VideoPublishPublishVideoPlan: React.FC<Props>;
 export default VideoPublishPublishVideoPlan;

package/dist/VideoPublish/publish-task-plan/index.js

@@ -4,9 +4,9 @@ import PublishTaskPlanClass from "./tool";
 import { jsx as _jsx } from "react/jsx-runtime";
 var VideoPublishPublishVideoPlan = function VideoPublishPublishVideoPlan(_ref) {
   var env = _ref.env,
-    clientUniqueKey = _ref.clientUniqueKey;
+    clientIdentity = _ref.clientIdentity;
   useEffect(function () {
-    var publishTaskPlan = new PublishTaskPlanClass(env, clientUniqueKey);
+    var publishTaskPlan = new PublishTaskPlanClass(env, clientIdentity);
     publishTaskPlan.onInit();
   }, []);
   return /*#__PURE__*/_jsx("div", {

package/dist/VideoPublish/publish-task-plan/tool.d.ts

@@ -2,8 +2,8 @@ declare class PublishTaskPlanClass {
     timeLoopMillisecond: number;
     isPublishing: boolean;
     env: Global.Env | undefined;
-    clientUniqueKey: string;
-    constructor(env?: Global.Env, clientUniqueKey?: string);
+    clientIdentity: string;
+    constructor(env?: Global.Env, clientIdentity?: string);
     onInit(): void;
     getWork(): Promise<void>;
     doWork(taskDetail: PublishTaskPlan.TaskDetail): Promise<void>;

package/dist/VideoPublish/publish-task-plan/tool.js

@@ -10,14 +10,14 @@ import event from "../../lib/event";
 import AccountManageSettingConfig from "../../lib/accountManageSettingConfig";
 var PublishTaskPlanClass = /*#__PURE__*/function () {
   function PublishTaskPlanClass(env) {
-    var clientUniqueKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    var clientIdentity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
     _classCallCheck(this, PublishTaskPlanClass);
     _defineProperty(this, "timeLoopMillisecond", 15 * 1e3);
     _defineProperty(this, "isPublishing", false);
     _defineProperty(this, "env", '');
-    _defineProperty(this, "clientUniqueKey", '');
+    _defineProperty(this, "clientIdentity", '');
     this.env = env;
-    this.clientUniqueKey = clientUniqueKey;
+    this.clientIdentity = clientIdentity;
   }
   _createClass(PublishTaskPlanClass, [{
     key: "onInit",

package/dist/lib/request.js

@@ -1,91 +1,119 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 // 二次封装 hooks request ;
 // 参数详见：https://github.com/umijs/umi-request/blob/master/README_zh-CN.md
 import request from 'umi-request';
 import getApiUrl, { getApiEnv, getMainPort } from "./getApiUrl";
 import goAuth from "./goAuth";
 import Tool from "./Tool";
-var requestApi = function requestApi() {
-  var _window$getBridge, _window, _window$getBridge$cal, _window$getBridge$cal2;
-  var api = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  // 要请求的 url
-  var url = getApiUrl(api, options === null || options === void 0 ? void 0 : options.env);
-  console.log('makeAjax int 20 111 url:', url, options);
+var requestApi = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _window$getClientIden, _window;
+    var api,
+      options,
+      url,
+      userInfo,
+      token,
+      postUrl,
+      clientIdentity,
+      env,
+      pageUrl,
+      _args = arguments;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          api = _args.length > 0 && _args[0] !== undefined ? _args[0] : '';
+          options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+          // 要请求的 url
+          url = getApiUrl(api, options === null || options === void 0 ? void 0 : options.env);
+          console.log('makeAjax int 20 111 url:', url, options);
 
-  // const params = options.method === 'GET' ? options.data : {};
+          // const params = options.method === 'GET' ? options.data : {};
+          userInfo = Tool.getLocalUserInfo();
+          token = userInfo.sid;
+          postUrl = url + (url.indexOf('?') === -1 ? '?' : '&') + '_token_=' + token; // clientId
+          _context.next = 9;
+          return (_window$getClientIden = (_window = window).getClientIdentity) === null || _window$getClientIden === void 0 ? void 0 : _window$getClientIden.call(_window).catch(function (err) {
+            return '';
+          });
+        case 9:
+          clientIdentity = _context.sent;
+          postUrl += "&clientIdentity=".concat(clientIdentity);
 
-  var userInfo = Tool.getLocalUserInfo();
-  var token = userInfo.sid;
-  var postUrl = url + (url.indexOf('?') === -1 ? '?' : '&') + '_token_=' + token;
-
-  // clientId
-  postUrl += "&clientUniqueKey=".concat(((_window$getBridge = (_window = window).getBridge) === null || _window$getBridge === void 0 || (_window$getBridge$cal = (_window$getBridge$cal2 = _window$getBridge.call(_window)).getClientUniqueKey) === null || _window$getBridge$cal === void 0 ? void 0 : _window$getBridge$cal.call(_window$getBridge$cal2)) || '');
-
-  // 追加环境参数
-  var env = getApiEnv(options === null || options === void 0 ? void 0 : options.env);
-  if (env !== 'prod') {
-    postUrl += "&_env=".concat(env);
-  }
-  var pageUrl = document.location.href;
-  return new Promise(function (resolve, reject) {
-    var requestData = request(postUrl, _objectSpread(_objectSpread({}, options), {}, {
-      timeout: options.timeout || 15e3
-      // requestType: options.payload === false ? 'form' : 'json',
-      // onSuccess( data: ApiResult ){
-      //   console.log('ajax 1:', data );
-      //   if( ! data?.success ){
-      //     const error = new Error( data.message || '发生了一些问题' );
-      //     error.name = 'api-not-success';
-      //     throw error;
-      //   }
-      //   options.onSuccess( data );
-      // },
-    }));
-
-    requestData.then(function () {
-      var result = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      console.log('ajax requestData then:', result);
-      if (result.success) {
-        resolve(result.data || true);
-      } else {
-        var error = new Error((result === null || result === void 0 ? void 0 : result.message) || '发生了一些问题，请稍后重试');
-        error.name = result.code;
-        error.stack = result.data;
-        if (['staff-not-login', 'not-login'].includes((result === null || result === void 0 ? void 0 : result.code) || '')) {
-          // 未登录，跳走；
-          goAuth(result.authType);
-          reject(error);
-        } else {
-          onError(pageUrl, url, error.message, JSON.stringify(error), options === null || options === void 0 ? void 0 : options.silent);
-          reject(error);
-          if (!(options !== null && options !== void 0 && options.silent)) {
-            Tool.toastError(result.message);
+          // 追加环境参数
+          env = getApiEnv(options === null || options === void 0 ? void 0 : options.env);
+          if (env !== 'prod') {
+            postUrl += "&_env=".concat(env);
           }
-        }
-      }
-    }).catch(function (err) {
-      var _err, _err2;
-      console.log('ajax error:', err.name, err.message, err);
-      if (!err) {
-        err = new Error();
-      }
-      console.log('request component shipinlv:', JSON.stringify(err), url);
-      if (!((_err = err) !== null && _err !== void 0 && _err.response) && url.indexOf("http://127.0.0.1:".concat(getMainPort())) === 0) {
-        err.name = "shipinlv-client-not-run";
-        err.message = "\u8FDE\u63A5\u672C\u5730\u670D\u52A1\u5931\u8D25\uFF0C\u8BF7\u5C1D\u8BD5\u91CD\u542F\u8F6F\u4EF6";
-        reject(err);
-        return;
-      }
-      if (['Failed to fetch', 'http error'].includes((_err2 = err) === null || _err2 === void 0 ? void 0 : _err2.message)) {
-        err.message = '发生了一些问题，请稍后重试';
+          pageUrl = document.location.href;
+          return _context.abrupt("return", new Promise(function (resolve, reject) {
+            var requestData = request(postUrl, _objectSpread(_objectSpread({}, options), {}, {
+              timeout: options.timeout || 15e3
+              // requestType: options.payload === false ? 'form' : 'json',
+              // onSuccess( data: ApiResult ){
+              //   console.log('ajax 1:', data );
+              //   if( ! data?.success ){
+              //     const error = new Error( data.message || '发生了一些问题' );
+              //     error.name = 'api-not-success';
+              //     throw error;
+              //   }
+              //   options.onSuccess( data );
+              // },
+            }));
+
+            requestData.then(function () {
+              var result = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+              console.log('ajax requestData then:', result);
+              if (result.success) {
+                resolve(result.data || true);
+              } else {
+                var error = new Error((result === null || result === void 0 ? void 0 : result.message) || '发生了一些问题，请稍后重试');
+                error.name = result.code;
+                error.stack = result.data;
+                if (['staff-not-login', 'not-login'].includes((result === null || result === void 0 ? void 0 : result.code) || '')) {
+                  // 未登录，跳走；
+                  goAuth(result.authType);
+                  reject(error);
+                } else {
+                  onError(pageUrl, url, error.message, JSON.stringify(error), options === null || options === void 0 ? void 0 : options.silent);
+                  reject(error);
+                  if (!(options !== null && options !== void 0 && options.silent)) {
+                    Tool.toastError(result.message);
+                  }
+                }
+              }
+            }).catch(function (err) {
+              var _err, _err2;
+              console.log('ajax error:', err.name, err.message, err);
+              if (!err) {
+                err = new Error();
+              }
+              console.log('request component shipinlv:', JSON.stringify(err), url);
+              if (!((_err = err) !== null && _err !== void 0 && _err.response) && url.indexOf("http://127.0.0.1:".concat(getMainPort())) === 0) {
+                err.name = "shipinlv-client-not-run";
+                err.message = "\u8FDE\u63A5\u672C\u5730\u670D\u52A1\u5931\u8D25\uFF0C\u8BF7\u5C1D\u8BD5\u91CD\u542F\u8F6F\u4EF6";
+                reject(err);
+                return;
+              }
+              if (['Failed to fetch', 'http error'].includes((_err2 = err) === null || _err2 === void 0 ? void 0 : _err2.message)) {
+                err.message = '发生了一些问题，请稍后重试';
+              }
+              Tool.toastError(err.message);
+              onError(pageUrl, url, err.message, JSON.stringify(err), options === null || options === void 0 ? void 0 : options.silent);
+              reject(err);
+            });
+          }));
+        case 15:
+        case "end":
+          return _context.stop();
       }
-      Tool.toastError(err.message);
-      onError(pageUrl, url, err.message, JSON.stringify(err), options === null || options === void 0 ? void 0 : options.silent);
-      reject(err);
-    });
-  });
-};
+    }, _callee);
+  }));
+  return function requestApi() {
+    return _ref.apply(this, arguments);
+  };
+}();
 var onError = function onError(pageUrl) {
   var _window2;
   var apiUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';

package/dist/typings/VideoPublishVideoAccount.d.ts

@@ -17,7 +17,7 @@ declare namespace VideoPublishVideoAccount {
         totalVideoCount: number;
     }
     interface SaveLoginStatus {
-        clientUniqueKey: string;
+        clientIdentity: string;
         platformVideoAccountId: string;
         platform: string;
         isLogin: boolean;

package/dist/window.d.ts

@@ -19,5 +19,7 @@ declare interface Window{
     getChromiumPath: () => string;
     getClientUniqueKey: () => string;
   };
+
+  getClientIdentity: () => Promise<string>;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-shipinlv",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",