component-shipinlv 1.3.6 → 1.3.8

package/dist/component/isFileExist.js

@@ -0,0 +1,50 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import * as FileController from "../service/video-api/FileController";
+var isFileExist = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(filePath) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", new Promise( /*#__PURE__*/function () {
+            var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve, reject) {
+              var result;
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    _context.next = 2;
+                    return FileController.isExist({
+                      filePath: filePath
+                    }).catch(function (err) {
+                      reject(err);
+                    });
+                  case 2:
+                    result = _context.sent;
+                    if (result) {
+                      _context.next = 5;
+                      break;
+                    }
+                    return _context.abrupt("return");
+                  case 5:
+                    resolve(result);
+                  case 6:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }));
+            return function (_x2, _x3) {
+              return _ref2.apply(this, arguments);
+            };
+          }()));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function isFileExist(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export default isFileExist;

package/dist/lib/Tool.d.ts

@@ -161,7 +161,7 @@ declare const Tool: {
     OsPathSeparator(): string;
     getTitleByPath(path: string): string;
     h5Pay(query: Pay.H5PayQuery): void;
-    notification(type: "error" | "success" | "info" | "warning", message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
+    notification(type: "success" | "info" | "warning" | "error", message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationSuccess(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationError(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationWarning(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;

package/dist/lib/getPublishExtensionDir.d.ts

@@ -0,0 +1,2 @@
+declare const getPublishExtensionDir: (env: Global.Env | '' | undefined) => Promise<string>;
+export default getPublishExtensionDir;

package/dist/lib/getPublishExtensionDir.js

@@ -0,0 +1,55 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import { getLocalVideoServerDir } from "../service/video-api/BaseController";
+var getPublishExtensionDir = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(env) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", new Promise( /*#__PURE__*/function () {
+            var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve, reject) {
+              var result, dir;
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    _context.next = 2;
+                    return getLocalVideoServerDir().catch(function (err) {
+                      reject(err);
+                    });
+                  case 2:
+                    result = _context.sent;
+                    if (result) {
+                      _context.next = 5;
+                      break;
+                    }
+                    return _context.abrupt("return");
+                  case 5:
+                    if (!(env === 'local')) {
+                      _context.next = 7;
+                      break;
+                    }
+                    return _context.abrupt("return", resolve('/Volumes/Data/Web/shipinlv/chrome-shipinlv-video-publish/public'));
+                  case 7:
+                    dir = result.dirPath + '/../../../chrome-publish-plugin';
+                    resolve(dir);
+                  case 9:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            }));
+            return function (_x2, _x3) {
+              return _ref2.apply(this, arguments);
+            };
+          }()));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function getPublishExtensionDir(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export default getPublishExtensionDir;

package/dist/lib/openChrome.d.ts

@@ -1,2 +1,2 @@
-declare const openChrome: (query: ChromeOperate.PropsQuery, isNew: boolean) => Promise<void>;
+declare const openChrome: (query: ChromeOperate.PropsQuery, isNew: boolean, env: Global.Env | '' | undefined) => Promise<unknown>;
 export default openChrome;

package/dist/lib/openChrome.js

@@ -1,4 +1,5 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import AccountManageSettingConfig from "./accountManageSettingConfig";
 import param from "../component/param";
@@ -8,139 +9,235 @@ import userAgent from "./user-agent";
 import VideoApiOpenChrome from "./video-api/open-chrome";
 import sleep from "./sleep";
 import VideoApiQuitChrome from "./video-api/quit-chrome";
+import event from "./event";
+import * as VideoPublishCrawlerTaskController from "../service/api/VideoPublishCrawlerTaskController";
+import * as LocalVideoPublishTaskController from "../service/local/VideoPublishTaskController";
+import getPublishExtensionDir from "./getPublishExtensionDir";
+
 // @isNew: 只有 新建账户，才要 isNew
 var openChrome = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(query, isNew) {
-    var settingConfig, data, cmdResult;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(query, isNew, env) {
+    var settingConfig;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           settingConfig = AccountManageSettingConfig();
           if (!query.chromePath) {
             query.chromePath = settingConfig.chromePath;
           }
           if (query.chromePath) {
-            _context.next = 5;
+            _context3.next = 5;
             break;
           }
           notification.notificationError('没找到 Google 浏览器', '请设置 谷歌浏览器地址，或者重新安装 https://google.cn/chrome/');
-          return _context.abrupt("return");
+          return _context3.abrupt("return");
         case 5:
-          data = getOpenQuery(query, isNew, settingConfig);
-          if (!query.chromeProfileName) {
-            _context.next = 11;
-            break;
-          }
-          _context.next = 9;
-          return VideoApiQuitChrome({
-            platform: query.platform,
-            platformVideoAccountId: query.platformAccountId,
-            chromeProfileName: query.chromeProfileName
-          }).catch(function (err) {
-            console.warn('关闭 chrome 失败', query);
-          });
-        case 9:
-          _context.next = 11;
-          return sleep(2e3);
-        case 11:
-          _context.next = 13;
-          return VideoApiOpenChrome({
-            commandList: data.commandList
-          }).catch(function (err) {
-            // todo 上报
-            console.log('open chrome err:', err);
-            // VideoPublishCrawlerTaskController.report({
-            //   success: false,
-            //   code: 'open-chrome-fail',
-            //   message: err?.message,
-            //
-            //   taskType: '',
-            //   taskId: query.taskId,
-            //   platform: query.platform,
-            //   platformAccountId: query.platformAccountId,
-            // },{
-            //   // env,
-            // });
-          });
-        case 13:
-          cmdResult = _context.sent;
-          console.log("cmd:", query);
-          if (!cmdResult) {
-            // await sleep( 6e3 );
-            // VideoApiQuitChrome({
-            //   platform: query.platform,
-            //   platformVideoAccountId: query.platformAccountId,
-            //   chromeProfileName: query.chromeProfileName,
-            // });
-          }
-        case 16:
+          return _context3.abrupt("return", new Promise( /*#__PURE__*/function () {
+            var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve, reject) {
+              var data, cmdResult;
+              return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                while (1) switch (_context2.prev = _context2.next) {
+                  case 0:
+                    _context2.next = 2;
+                    return getOpenQuery(query, isNew, settingConfig, env).catch(function (err) {
+                      reject(err);
+                    });
+                  case 2:
+                    data = _context2.sent;
+                    if (data) {
+                      _context2.next = 5;
+                      break;
+                    }
+                    return _context2.abrupt("return");
+                  case 5:
+                    if (!query.chromeProfileName) {
+                      _context2.next = 10;
+                      break;
+                    }
+                    _context2.next = 8;
+                    return VideoApiQuitChrome({
+                      platform: query.platform,
+                      platformVideoAccountId: query.platformAccountId,
+                      chromeProfileName: query.chromeProfileName
+                    }).catch(function (err) {
+                      console.warn('关闭 chrome 失败', query);
+                    });
+                  case 8:
+                    _context2.next = 10;
+                    return sleep(2e3);
+                  case 10:
+                    _context2.next = 12;
+                    return VideoApiOpenChrome({
+                      commandList: data.commandList
+                    }).catch( /*#__PURE__*/function () {
+                      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(err) {
+                        var sendData;
+                        return _regeneratorRuntime().wrap(function _callee$(_context) {
+                          while (1) switch (_context.prev = _context.next) {
+                            case 0:
+                              console.log('open chrome err:', err);
+                              notification.notificationError('打开 Google 浏览器 失败', err === null || err === void 0 ? void 0 : err.message);
+                              sendData = {
+                                success: false,
+                                platform: query.platform,
+                                platformAccountId: query.platformAccountId,
+                                code: 'open-chrome-fail',
+                                message: (err === null || err === void 0 ? void 0 : err.message) || JSON.stringify(err),
+                                taskId: query.taskId,
+                                taskType: 'publish-video'
+                              };
+                              event.run('publish-video-log-publish-video', sendData);
+
+                              // 发消息 , 不管结果，无论失败
+                              LocalVideoPublishTaskController.sendMessageToPort(_objectSpread({}, sendData));
+                              VideoPublishCrawlerTaskController.report(_objectSpread({}, sendData), {
+                                // env: this.env,
+                              });
+                              _context.next = 8;
+                              return sleep(2e3);
+                            case 8:
+                              reject(err);
+
+                              // VideoPublishCrawlerTaskController.report({
+                              //   success: false,
+                              //   code: 'open-chrome-fail',
+                              //   message: err?.message,
+                              //
+                              //   taskType: '',
+                              //   taskId: query.taskId,
+                              //   platform: query.platform,
+                              //   platformAccountId: query.platformAccountId,
+                              // },{
+                              //   // env,
+                              // });
+                            case 9:
+                            case "end":
+                              return _context.stop();
+                          }
+                        }, _callee);
+                      }));
+                      return function (_x6) {
+                        return _ref3.apply(this, arguments);
+                      };
+                    }());
+                  case 12:
+                    cmdResult = _context2.sent;
+                    console.log("cmd:", query);
+                    if (cmdResult) {
+                      _context2.next = 16;
+                      break;
+                    }
+                    return _context2.abrupt("return");
+                  case 16:
+                    resolve(true);
+                  case 17:
+                  case "end":
+                    return _context2.stop();
+                }
+              }, _callee2);
+            }));
+            return function (_x4, _x5) {
+              return _ref2.apply(this, arguments);
+            };
+          }()));
+        case 6:
         case "end":
-          return _context.stop();
+          return _context3.stop();
       }
-    }, _callee);
+    }, _callee3);
   }));
-  return function openChrome(_x, _x2) {
+  return function openChrome(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();
-var getOpenQuery = function getOpenQuery(query, isNew, settingConfig) {
-  var cmdList = [];
-  var url = query.url;
-  var openUrl = url + ((url === null || url === void 0 ? void 0 : url.indexOf('?')) === -1 ? '?' : '&') + param({
-    _shipinlvFrom: 'auto',
-    _action: query.action || '',
-    _platformAccountId: query.platformAccountId,
-    _nickname: query.nickname || '',
-    _chromeProfileName: query.chromeProfileName || ''
-  });
-  var chromeProfileDir = settingConfig.chromeUserDataDir + '/' + query.chromeProfileName;
-  switch (Tool.getOsName()) {
-    case "windows":
-      // 艹，屎一样的 windows cmd
-      // powershell -NoProfile -Command "Start-Process -FilePath 'C:\Program Files\Google\Chrome\Application\chrome.exe'"
-      // cmdList.push( "cmd", "/c", "start" );
-      // cmdList.push( "powershell", "-NoProfile", "-Command", "\"Start-Process", "-FilePath" );
-      if (query.chromePath) {
-        cmdList.push("".concat(query.chromePath));
-      } else {
-        cmdList.push("chrome");
-      }
-      if (!query.isOpen) {
-        cmdList.push("--headless=old");
-
-        // --disable-gpu是为了解决一些在无头模式下可能出现的GPU相关的问题
-        cmdList.push("--disable-gpu");
-      }
-      break;
-    case "darwin":
-      cmdList = ["open"];
-      if (isNew) {
-        cmdList.push("-n");
-      }
-      cmdList.push("-a", "".concat(query.chromePath || 'Google Chrome'), "--args");
-      if (!query.isOpen) {
-        cmdList.push("--headless");
+var getOpenQuery = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(query, isNew, settingConfig, env) {
+    var cmdList, url, openUrl, chromeProfileDir, publishExtensionDir;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          cmdList = [];
+          url = query.url; // todo
+          query.isOpen = true;
+          openUrl = url + ((url === null || url === void 0 ? void 0 : url.indexOf('?')) === -1 ? '?' : '&') + param({
+            _shipinlvFrom: 'auto',
+            _action: query.action || '',
+            _platformAccountId: query.platformAccountId,
+            _nickname: query.nickname || '',
+            _chromeProfileName: query.chromeProfileName || ''
+          });
+          chromeProfileDir = settingConfig.chromeUserDataDir + '/' + query.chromeProfileName;
+          _context4.t0 = Tool.getOsName();
+          _context4.next = _context4.t0 === "windows" ? 8 : _context4.t0 === "darwin" ? 11 : 16;
+          break;
+        case 8:
+          // 艹，屎一样的 windows cmd
+          // powershell -NoProfile -Command "Start-Process -FilePath 'C:\Program Files\Google\Chrome\Application\chrome.exe'"
+          // cmdList.push( "cmd", "/c", "start" );
+          // cmdList.push( "powershell", "-NoProfile", "-Command", "\"Start-Process", "-FilePath" );
+          if (query.chromePath) {
+            cmdList.push("".concat(query.chromePath));
+          } else {
+            cmdList.push("chrome");
+          }
+          if (!query.isOpen) {
+            cmdList.push("--headless=old");
 
-        // --disable-gpu是为了解决一些在无头模式下可能出现的GPU相关的问题
-        cmdList.push("--disable-gpu");
-      }
-      break;
-    default:
-      notification.notificationError('不支持的系统', '发布不支持此系统');
-  }
+            // --disable-gpu是为了解决一些在无头模式下可能出现的GPU相关的问题
+            cmdList.push("--disable-gpu");
+          }
+          return _context4.abrupt("break", 17);
+        case 11:
+          cmdList = ["open"];
+          if (isNew) {
+            cmdList.push("-n");
+          }
+          cmdList.push("-a", "".concat(query.chromePath || 'Google Chrome'), "--args");
+          if (!query.isOpen) {
+            cmdList.push("--headless");
 
-  // 尺寸
-  cmdList.push("--window-size=".concat(window.screen.width, ",").concat(window.screen.height));
-  cmdList.push("--user-data-dir=".concat(chromeProfileDir));
-  cmdList.push("--user-agent=".concat(userAgent()));
+            // --disable-gpu是为了解决一些在无头模式下可能出现的GPU相关的问题
+            cmdList.push("--disable-gpu");
+          }
+          return _context4.abrupt("break", 17);
+        case 16:
+          notification.notificationError('不支持的系统', '发布不支持此系统');
+        case 17:
+          // 尺寸
+          cmdList.push("--window-position=".concat(-window.screen.width + 20, ",10"));
+          cmdList.push("--window-size=".concat(window.screen.width, ",").concat(window.screen.height - 100));
+          cmdList.push("--user-data-dir=".concat(chromeProfileDir));
+          cmdList.push("--user-agent=".concat(userAgent()));
 
-  // 不要检查
-  cmdList.push('--no-first-run', '--no-default-browser-check', '--disable-default-apps');
-  cmdList.push("".concat(openUrl));
-  console.log('profileName:', cmdList, chromeProfileDir);
-  return {
-    commandList: cmdList,
-    chromeProfileDir: chromeProfileDir
+          // 不要检查
+          cmdList.push('--no-first-run', '--no-default-browser-check', '--disable-default-apps');
+          _context4.next = 24;
+          return getPublishExtensionDir(env).catch(function (err) {
+            notification.notificationError('获取插件地址失败', err.message);
+          });
+        case 24:
+          publishExtensionDir = _context4.sent;
+          if (publishExtensionDir) {
+            _context4.next = 27;
+            break;
+          }
+          return _context4.abrupt("return", Promise.reject(new Error('获取插件地址失败')));
+        case 27:
+          cmdList.push("--load-extension=".concat(publishExtensionDir));
+          cmdList.push("".concat(openUrl));
+          console.log('profileName:', cmdList, chromeProfileDir);
+          return _context4.abrupt("return", {
+            commandList: cmdList,
+            chromeProfileDir: chromeProfileDir
+          });
+        case 31:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return function getOpenQuery(_x7, _x8, _x9, _x10) {
+    return _ref4.apply(this, arguments);
   };
-};
+}();
 export default openChrome;

package/dist/lib/video-api/open-chrome.js

@@ -13,7 +13,9 @@ var VideoApiOpenChrome = /*#__PURE__*/function () {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
                     _context.next = 2;
-                    return VideoApiOpenChromeController.openChrome(query).catch(function (err) {
+                    return VideoApiOpenChromeController.openChrome(query, {
+                      timeout: 60e3
+                    }).catch(function (err) {
                       // if( err?.name === "shipinlv-client-not-run" ){
                       //   return reject( err );
                       // }

package/dist/service/local/VideoPublishTaskController.js

@@ -19,7 +19,7 @@ function _sendMessageToPort() {
               'Content-Type': 'application/json'
             },
             data: _objectSpread({}, body),
-            timeout: 6e3,
+            timeout: 10e3,
             silent: true
           }, options || {})));
         case 2:

package/dist/service/video-api/BaseController.d.ts

@@ -0,0 +1 @@
+export declare function getLocalVideoServerDir(body?: {}, options?: ServicesApi.RequestOptions): Promise<VideoApiBase.LocalVideoServerDir>;

package/dist/service/video-api/BaseController.js

@@ -0,0 +1,27 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import request from "../../lib/request";
+export function getLocalVideoServerDir(_x, _x2) {
+  return _getLocalVideoServerDir.apply(this, arguments);
+}
+function _getLocalVideoServerDir() {
+  _getLocalVideoServerDir = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(body, options) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", request("_video-api/base/getLocalVideoServerDir", _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: body
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _getLocalVideoServerDir.apply(this, arguments);
+}

package/dist/service/video-api/FileController.d.ts

@@ -0,0 +1 @@
+export declare function isExist(body: File.IsExistQuery, options?: ServicesApi.RequestOptions): Promise<File.IsExistResult>;

package/dist/service/video-api/FileController.js

@@ -0,0 +1,27 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import request from "../../lib/request";
+export function isExist(_x, _x2) {
+  return _isExist.apply(this, arguments);
+}
+function _isExist() {
+  _isExist = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(body, options) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", request("_video-api/file/isExist", _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: body
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _isExist.apply(this, arguments);
+}

package/dist/types/File.d.ts

@@ -0,0 +1,8 @@
+declare namespace File {
+    interface IsExistQuery {
+        filePath: string;
+    }
+    interface IsExistResult {
+        isExist: boolean;
+    }
+}

package/dist/types/VideoPublishLog.d.ts

@@ -1,5 +1,5 @@
 declare namespace VideoPublishLog {
-    type Status = 'wait' | 'warn' | 'fail' | 'success';
+    type Status = 'wait' | 'warn' | 'fail' | 'success' | 'finish';
     interface Receive {
         platform: Global.VideoPlatformKind;
         platformAccountId: string;

package/dist/types/VideoPublishVideoAccount.d.ts

@@ -17,6 +17,7 @@ declare namespace VideoPublishVideoAccount {
         isLoginValid: boolean;
         "groupId": number;
         "groupName": string;
+        followerCount: number;
         "uniqueId": string;
         "accountId": string;
         "avatar": string;

package/dist/types/VidepApiBase.d.ts

@@ -0,0 +1,5 @@
+declare namespace VideoApiBase {
+    interface LocalVideoServerDir {
+        dirPath: string;
+    }
+}

package/package.json

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