component-shipinlv 1.3.0 → 1.3.1

package/dist/VideoPublish/account-manage/home.js

@@ -106,6 +106,7 @@ var VideoPublishAccountManageHomePage = function VideoPublishAccountManageHomePa
       platformAccountId: accountDetail.accountId,
       nickname: accountDetail.nickname,
       chromeProfileName: accountDetail.chromeProfileName,
+      taskId: 0,
       url: url,
       proxyInfo: accountDetail.proxyInfo,
       isOpen: true

package/dist/VideoPublish/account-manage/list.js

@@ -206,6 +206,7 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
               platform: platform,
               platformAccountId: '',
               nickname: '',
+              taskId: 0,
               chromePath: settingConfig.chromePath,
               chromeProfileName: chromeProfileName,
               url: 'https://creator.douyin.com/',

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

@@ -488,6 +488,7 @@ var PublishTaskPlanClass = /*#__PURE__*/function () {
                       platform: query.platform || 'douyin',
                       platformAccountId: query.platformVideoAccountId,
                       nickname: query.nickname,
+                      taskId: query.taskInfo.taskId,
                       url: 'https://creator.douyin.com/creator-micro/home',
                       chromePath: settingConfig.chromePath,
                       chromeProfileName: query.chromeProfileName,

package/dist/component/video-platform/logo.js

@@ -15,7 +15,8 @@ export var VideoPlatformList = [{
   name: 'Tiktok',
   videoWebSiteUrl: 'https://www.tiktok.com/',
   // auth login
-  allowMainDomainList: ['tiktok.com']
+  allowMainDomainList: ['tiktok.com'],
+  disabled: true
 },
 // {
 //   platform: 'buyin',
@@ -29,7 +30,8 @@ export var VideoPlatformList = [{
   platform: 'kuaishou',
   name: '快手',
   videoWebSiteUrl: 'https://www.kuaishou.com/',
-  allowMainDomainList: ['kuaishou.com']
+  allowMainDomainList: ['kuaishou.com'],
+  disabled: true
 }
 // {
 //   platform: 'bilibili',

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export { default as Product } from './Product';
 export { default as JoinClient } from './join-client';
 export { default as renewalVip } from './renewal-vip';
 export { default as ClientUpdate } from './Client/ClientUpdate';
+export { default as openChrome } from './lib/openChrome';
 export { default as DealerUrlDict } from './base/DealerUrlDict';
 export { default as VideoPlatform, VideoPlatformList, VideoPlatformDict } from './component/video-platform/logo';
 export { default as VipList } from './VipList';

package/dist/index.js

@@ -10,6 +10,7 @@ export { default as Product } from "./Product";
 export { default as JoinClient } from "./join-client";
 export { default as renewalVip } from "./renewal-vip";
 export { default as ClientUpdate } from "./Client/ClientUpdate";
+export { default as openChrome } from "./lib/openChrome";
 export { default as DealerUrlDict } from "./base/DealerUrlDict";
 export { default as VideoPlatform, VideoPlatformList, VideoPlatformDict } from "./component/video-platform/logo";
 export { default as VipList } from "./VipList";

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: "success" | "info" | "error" | "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/Tool.js

@@ -1100,6 +1100,7 @@ var Tool = _objectSpread(_objectSpread({
     return Date.now() - Tool.getTimeOffset();
   },
   getOsName: function getOsName() {
+    return 'windows';
     var userAgent = navigator.userAgent || window.opera;
 
     // Windows

package/dist/lib/openChrome.d.ts

@@ -1,2 +1,2 @@
-declare const openChrome: (query: OpenChrome.PropsQuery, isNew: boolean) => void;
+declare const openChrome: (query: ChromeOperate.PropsQuery, isNew: boolean) => Promise<void>;
 export default openChrome;

package/dist/lib/openChrome.js

@@ -6,52 +6,75 @@ import Tool from "./Tool";
 import notification from "./notification";
 import userAgent from "./user-agent";
 import VideoApiOpenChrome from "./video-api/open-chrome";
+import sleep from "./sleep";
+import VideoApiQuitChrome from "./video-api/quit-chrome";
+import * as VideoPublishCrawlerTaskController from "../service/api/VideoPublishCrawlerTaskController";
 
 // @isNew: 只有 新建账户，才要 isNew
-var openChrome = function openChrome(query, isNew) {
-  var settingConfig = AccountManageSettingConfig();
-  if (!query.chromePath) {
-    query.chromePath = settingConfig.chromePath;
-  }
-  if (!query.chromePath) {
-    notification.notificationError('没找到 Google 浏览器', '请设置 谷歌浏览器地址，或者重新安装 https://google.cn/chrome/');
-    return;
-  }
-  var data = getOpenQuery(query, isNew, settingConfig);
-
-  //唤起 浏览器；
-  // onOpenChromeRun({
-  //   ...query,
-  //   ...data,
-  //   chromeUserDataDir: settingConfig.chromeUserDataDir,
-  //   chromePath,
-  // });
-  onOpenChromeRun({
-    commandList: data.commandList
-  });
-};
-var onOpenChromeRun = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(query) {
-    var cmdResult;
+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) {
         case 0:
-          _context.next = 2;
-          return VideoApiOpenChrome(query).catch(function (err) {
+          settingConfig = AccountManageSettingConfig();
+          if (!query.chromePath) {
+            query.chromePath = settingConfig.chromePath;
+          }
+          if (query.chromePath) {
+            _context.next = 5;
+            break;
+          }
+          notification.notificationError('没找到 Google 浏览器', '请设置 谷歌浏览器地址，或者重新安装 https://google.cn/chrome/');
+          return _context.abrupt("return");
+        case 5:
+          data = getOpenQuery(query, isNew, settingConfig); //唤起 浏览器；
+          // onOpenChromeRun({
+          //   ...query,
+          //   ...data,
+          //   chromeUserDataDir: settingConfig.chromeUserDataDir,
+          //   chromePath,
+          // });
+          _context.next = 8;
+          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 === null || err === void 0 ? void 0 : err.message,
+              taskType: '',
+              taskId: query.taskId,
+              platform: query.platform,
+              platformAccountId: query.platformAccountId
+            }, {
+              // env,
+            });
           });
-        case 2:
+        case 8:
           cmdResult = _context.sent;
           console.log("cmd:", query);
-          if (cmdResult) {}
-        case 5:
+          if (cmdResult) {
+            _context.next = 14;
+            break;
+          }
+          _context.next = 13;
+          return sleep(6e3);
+        case 13:
+          VideoApiQuitChrome({
+            platform: query.platform,
+            platformVideoAccountId: query.platformAccountId,
+            chromeProfileName: query.chromeProfileName
+          });
+        case 14:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function onOpenChromeRun(_x) {
+  return function openChrome(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -65,9 +88,13 @@ var getOpenQuery = function getOpenQuery(query, isNew, settingConfig) {
     _nickname: query.nickname || '',
     _chromeProfileName: query.chromeProfileName || ''
   });
+  var chromeProfileDir = settingConfig.chromeUserDataDir + '/' + query.chromeProfileName;
   switch (Tool.getOsName()) {
     case "windows":
-      cmdList.push("cmd", "/c", "start");
+      // 艹，屎一样的 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 {
@@ -99,14 +126,13 @@ var getOpenQuery = function getOpenQuery(query, isNew, settingConfig) {
 
   // 尺寸
   cmdList.push("--window-size=".concat(window.screen.width, ",").concat(window.screen.height));
-  cmdList.push("--user-agent='".concat(userAgent(), "'"));
+  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');
-  var chromeProfileDir = settingConfig.chromeUserDataDir + '/' + query.chromeProfileName;
-  cmdList.push("--user-data-dir=".concat(chromeProfileDir));
   cmdList.push("".concat(openUrl));
-  console.log('profileName:', chromeProfileDir);
+  console.log('profileName:', cmdList, chromeProfileDir);
   return {
     commandList: cmdList,
     chromeProfileDir: chromeProfileDir

package/dist/lib/video-api/open-chrome.d.ts

@@ -1,2 +1,2 @@
-declare const VideoApiOpenChrome: (query: OpenChrome.OnOpenChromeRun) => Promise<boolean>;
+declare const VideoApiOpenChrome: (query: ChromeOperate.OpenChrome) => Promise<boolean>;
 export default VideoApiOpenChrome;

package/dist/lib/video-api/quit-chrome.d.ts

@@ -0,0 +1,2 @@
+declare const VideoApiQuitChrome: (query: ChromeOperate.QuitChromeQuery) => Promise<boolean>;
+export default VideoApiQuitChrome;

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

@@ -0,0 +1,51 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import * as VideoApiOpenChromeController from "../../service/video-api/VideoApiOpenChromeController";
+import notification from "../notification";
+var VideoApiQuitChrome = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(query) {
+    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 openResult;
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    _context.next = 2;
+                    return VideoApiOpenChromeController.quitChrome(query).catch(function (err) {
+                      // if( err?.name === "shipinlv-client-not-run" ){
+                      //   return reject( err );
+                      // }
+                      console.log('open In Folder err:', err);
+                      err.message = "\u5173\u95ED \u8C37\u6B4C\u6D4F\u89C8\u5668\u5931\u8D25\uFF1A".concat(err === null || err === void 0 ? void 0 : err.message);
+                      notification.notificationError('关闭 谷歌浏览器 失败', '请手动关闭');
+                      reject(err);
+                    });
+                  case 2:
+                    openResult = _context.sent;
+                    if (openResult) {
+                      resolve(true);
+                    }
+                  case 4:
+                  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 VideoApiQuitChrome(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export default VideoApiQuitChrome;

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

@@ -1 +1,2 @@
-export declare function openChrome(body: OpenChrome.OnOpenChromeRun, options?: ServicesApi.RequestOptions): Promise<boolean>;
+export declare function openChrome(body: ChromeOperate.OpenChrome, options?: ServicesApi.RequestOptions): Promise<boolean>;
+export declare function quitChrome(body: ChromeOperate.QuitChromeQuery, options?: ServicesApi.RequestOptions): Promise<boolean>;

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

@@ -24,4 +24,27 @@ function _openChrome() {
     }, _callee);
   }));
   return _openChrome.apply(this, arguments);
+}
+export function quitChrome(_x3, _x4) {
+  return _quitChrome.apply(this, arguments);
+}
+function _quitChrome() {
+  _quitChrome = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(body, options) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", request("_video-api/chrome/quit", _objectSpread({
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json'
+            },
+            data: body
+          }, options || {})));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _quitChrome.apply(this, arguments);
 }

package/dist/types/{OpenChrome.d.ts → ChromeOperate.d.ts}

@@ -1,4 +1,4 @@
-declare namespace OpenChrome {
+declare namespace ChromeOperate {
     interface PropsQuery {
         action: 'view' | 'publish' | 'add-account';
         platform: Global.VideoPlatformKind;
@@ -6,11 +6,17 @@ declare namespace OpenChrome {
         nickname: string;
         chromePath?: string;
         chromeProfileName: string;
+        taskId: number;
         url?: string;
         proxyInfo?: Global.ProxyInfo;
         isOpen: boolean;
     }
-    interface OnOpenChromeRun {
+    interface OpenChrome {
         commandList: string[];
     }
+    interface QuitChromeQuery {
+        platform: Global.VideoPlatformKind;
+        platformVideoAccountId: string;
+        chromeProfileName: string;
+    }
 }

package/package.json

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