component-shipinlv 1.1.26 → 1.3.0

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

@@ -7,6 +7,8 @@ import HomePageAccountList from "./list";
 import Time from "../../UI/Time";
 import { IeOutlined } from "@ant-design/icons";
 import Tool from "../../lib/Tool";
+import openChrome from "../../lib/openChrome";
+import AccountManageSettingConfig from "../../lib/accountManageSettingConfig";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -35,6 +37,7 @@ var VideoPublishAccountManageHomePage = function VideoPublishAccountManageHomePa
       videoCount: 0,
       created: 0,
       updated: 0,
+      chromeProfileName: '',
       proxyInfo: {}
     }),
     _useState2 = _slicedToArray(_useState, 2),
@@ -89,16 +92,32 @@ var VideoPublishAccountManageHomePage = function VideoPublishAccountManageHomePa
     openMenuItems = _useState4[0],
     setOpenMenuItems = _useState4[1];
   var onOpen = function onOpen(url) {
-    var _window$getBridge;
-    (_window$getBridge = window.getBridge()) === null || _window$getBridge === void 0 || _window$getBridge.openVideoAccountBrowser(accountDetail.platform, '', accountDetail.accountId, url, accountDetail.proxyInfo);
-    Tool.toast('正在打开浏览器， 请稍等...', 8);
+    // window.getBridge()?.openVideoAccountBrowser(
+    //   accountDetail.platform,
+    //   '',
+    //   accountDetail.accountId,
+    //   url,
+    //   accountDetail.proxyInfo,
+    // );
+    var settingConfig = AccountManageSettingConfig();
+    openChrome({
+      action: 'view',
+      platform: accountDetail.platform,
+      platformAccountId: accountDetail.accountId,
+      nickname: accountDetail.nickname,
+      chromeProfileName: accountDetail.chromeProfileName,
+      url: url,
+      proxyInfo: accountDetail.proxyInfo,
+      isOpen: true
+    }, false);
+    Tool.toast('正在打开浏览器， 请稍等...', 12);
   };
   var onOpenMenuItems = function onOpenMenuItems(platform) {
     switch (platform) {
       case 'douyin':
         setOpenMenuItems([{
           label: '创作者中心(发视频)',
-          key: 'https://creator.douyin.com/creator-micro/home'
+          key: 'https://creator.douyin.com/'
         }]);
         break;
       case 'tiktok':
@@ -114,6 +133,7 @@ var VideoPublishAccountManageHomePage = function VideoPublishAccountManageHomePa
     children: [/*#__PURE__*/_jsx(HomePageAccountList, {
       apiUrl: apiUrl,
       env: env,
+      currentAccountDetail: accountDetail,
       onListData: function onListData(list) {
         // accountListDataRef.current = list;
         // setAccountListData( list )

package/dist/VideoPublish/account-manage/list.d.ts

@@ -3,6 +3,7 @@ import './list.less';
 interface Props {
     apiUrl: string;
     env?: Global.Env;
+    currentAccountDetail: VideoPublishVideoAccount.List;
     onMenu: (key: string) => void;
     onListData: (list: VideoPublishVideoAccount.List[]) => void;
     onCurrent: (detail: VideoPublishVideoAccount.List) => void;

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

@@ -15,7 +15,6 @@ import getLocalUserInfo from "../../lib/getLocalUserInfo";
 import event from "../../lib/event";
 import { VideoPlatformList } from "../../component/video-platform/logo";
 import toast from "../../lib/toast";
-import Notification from "../../lib/notification";
 import Money from "../../UI/Money";
 import AccountManageSettingConfig from "../../lib/accountManageSettingConfig";
 import VideoPlatform from "../../component/video-platform/logo";
@@ -23,6 +22,8 @@ import isInstalledChrome from "../../component/is-installed-chrome";
 import Tool from "../../lib/Tool";
 import VideoPublishVideoAccountBaseInfo from "../video-account/base-info";
 import VideoPublishVideoAccountProxySelect from "../proxy/select";
+import notification from "../../lib/notification";
+import openChrome from "../../lib/openChrome";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -33,6 +34,7 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
     onMenu = _ref$onMenu === void 0 ? function () {} : _ref$onMenu,
     _ref$onListData = _ref.onListData,
     onListData = _ref$onListData === void 0 ? function () {} : _ref$onListData,
+    currentAccountDetail = _ref.currentAccountDetail,
     _ref$onCurrent = _ref.onCurrent,
     onCurrent = _ref$onCurrent === void 0 ? function () {} : _ref$onCurrent;
   var _useState = useState(getLocalUserInfo()),
@@ -136,6 +138,7 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
         videoCount: 0,
         created: 0,
         updated: 0,
+        chromeProfileName: '',
         proxyInfo: {}
       });
       return;
@@ -167,8 +170,7 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
   };
   var onAdd = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(platform) {
-      var _window$getBridge, _window;
-      var settingConfig, addAccountResult, postData;
+      var settingConfig, chromeProfileName;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -181,32 +183,74 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
             return _context.abrupt("return");
           case 4:
             console.log('onAdd:', platform);
+            settingConfig = AccountManageSettingConfig();
+            if (settingConfig.chromeUserDataDir) {
+              _context.next = 10;
+              break;
+            }
+            notification.notificationError('请先设置：“谷歌浏览器 - 多开位置”', '选个稍微大点的盘存储，每个用户会有几百M的数据');
+            onMenu('setting');
+            return _context.abrupt("return");
+          case 10:
             toast('正在启动浏览器，请扫码登录', 12);
 
             // const platformName = platform ; // == 'kuaishou' ? 'kwai' : '';
             // const eventName = `amz-${ platform }-publish--add-account`;
             // console.log('eventName:', eventName );
             // window.bridge.ipcRenderer.sendMessage( eventName ); // 添加抖音账号
-            settingConfig = AccountManageSettingConfig();
-            _context.next = 9;
-            return (_window$getBridge = (_window = window).getBridge) === null || _window$getBridge === void 0 || (_window$getBridge = _window$getBridge.call(_window)) === null || _window$getBridge === void 0 ? void 0 : _window$getBridge.ipcRenderer.invoke('shipinlv-video-account-add', platform, proxyInfo, settingConfig.isChromeOpen).catch(function (err) {
-              Notification.notificationError('获取账号信息错误' + ((err === null || err === void 0 ? void 0 : err.message) || JSON.stringify(err)));
-            });
-          case 9:
-            addAccountResult = _context.sent;
-            if (addAccountResult) {
-              _context.next = 12;
-              break;
-            }
-            return _context.abrupt("return");
-          case 12:
-            console.log('addAccountResult：', addAccountResult, env);
-            postData = {
-              detail: addAccountResult,
-              proxyId: proxyInfo.id || 0
-            };
-            runCreate(postData);
-          case 15:
+
+            // 固定长度，必须 16位数
+            chromeProfileName = Date.now() + '-' + Tool.math.randWord(16);
+            openChrome({
+              action: 'add-account',
+              platform: platform,
+              platformAccountId: '',
+              nickname: '',
+              chromePath: settingConfig.chromePath,
+              chromeProfileName: chromeProfileName,
+              url: 'https://creator.douyin.com/',
+              proxyInfo: proxyInfo,
+              isOpen: true // settingConfig.isChromeOpen,
+            }, true);
+
+            // event.run('publish-video-account-add', {
+            //   ...openChromeQuery,
+            //   // onFinish( inChromeProfileName: string, accountDetail: PublishNpm.AccountResult ){
+            //   //   if( inChromeProfileName != chromeProfileName ){
+            //   //     return;
+            //   //   }
+            //   //   const postData: VideoPublishVideoAccount.CreateQuery = {
+            //   //     detail: accountDetail, // addAccountResult as PublishNpm.AccountResult,
+            //   //     proxyId: proxyInfo.id || 0,
+            //   //   };
+            //   //   runCreate(postData);
+            //   // },
+            //   // onFail( inChromeProfileName: string,  err: Error ){
+            //   //   if( inChromeProfileName != chromeProfileName ){
+            //   //     return;
+            //   //   }
+            //   //   Notification.notificationError( '获取账号信息错误'+ ( err?.message || JSON.stringify( err ) ) );
+            //   // }
+            // });
+
+            // const addAccountResult = await window.getBridge?.()?.ipcRenderer
+            //   .invoke('shipinlv-video-account-add', platform, proxyInfo, settingConfig.isChromeOpen )
+            //   .catch( ( err: Error ) => {
+            //     Notification.notificationError( '获取账号信息错误'+ ( err?.message || JSON.stringify( err ) ) )
+            //   });
+
+            // if( ! addAccountResult ){
+            //   return;
+            // }
+
+            // console.log('addAccountResult：', addAccountResult, env );
+            //
+            // const postData: VideoPublishVideoAccount.CreateQuery = {
+            //   detail: addAccountResult as PublishNpm.AccountResult,
+            //   proxyId: proxyInfo.id || 0,
+            // };
+            // runCreate(postData);
+          case 13:
           case "end":
             return _context.stop();
         }
@@ -402,7 +446,7 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
               onClick: function onClick() {
                 return onCurrentId(item.id);
               }
-            });
+            }, item.id);
           })
         }), listData.length == 0 && /*#__PURE__*/_jsxs("div", {
           className: "empty",

package/dist/VideoPublish/account-manage/setting/index.js

@@ -4,12 +4,13 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectDestructuringEmpty from "@babel/runtime/helpers/esm/objectDestructuringEmpty";
 import React, { useEffect, useState } from 'react';
-import { ConfigProvider, Form, Switch } from 'antd';
+import { ConfigProvider, Form, Modal, Switch, Tooltip } from 'antd';
 import "./index.less";
 import LayoutContent from "../../../UI/LayoutContent";
 import AccountManageSettingConfig from "../../../lib/accountManageSettingConfig";
 import FileSelect from "../../../component/file-select";
 import Tool from "../../../lib/Tool";
+import FolderSelect from "../../../component/folder-select";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var AccountManageSettingPage = function AccountManageSettingPage(_ref) {
@@ -27,6 +28,7 @@ var AccountManageSettingPage = function AccountManageSettingPage(_ref) {
   var _onFinish = function onFinish(data) {
     AccountManageSettingConfig(data);
   };
+  var x = function x() {};
   var onInit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -98,9 +100,12 @@ var AccountManageSettingPage = function AccountManageSettingPage(_ref) {
         // name="disabledApplyTask"
         ,
         extra: /*#__PURE__*/_jsxs("div", {
-          children: ["Chrome \u7248\u672C\u63A8\u8350 110 \u4EE5\u4E0A\uFF08\u6253\u5F00 \u8C37\u6B4C\u6D4F\u89C8\u5668\uFF0C\u8F93\u5165 ", /*#__PURE__*/_jsx("a", {
-            children: "chrome://settings/help"
-          }), " \u53EF\u67E5\u8BE2\u7248\u672C\uFF09"]
+          children: ["\u4E0B\u8F7D\u5730\u5740", /*#__PURE__*/_jsx(Tooltip, {
+            title: "https://google.cn/chrome/",
+            children: /*#__PURE__*/_jsx("a", {
+              children: " https://google.cn/chrome/"
+            })
+          })]
         }),
         children: /*#__PURE__*/_jsx(FileSelect, {
           path: formData.chromePath,
@@ -114,6 +119,40 @@ var AccountManageSettingPage = function AccountManageSettingPage(_ref) {
             _onFinish(formData);
           }
         })
+      }), /*#__PURE__*/_jsx(Form.Item, {
+        label: "\u8C37\u6B4C\u6D4F\u89C8\u5668 - \u591A\u5F00\u4F4D\u7F6E",
+        extra: /*#__PURE__*/_jsx("div", {}),
+        children: /*#__PURE__*/_jsx(FolderSelect, {
+          path: formData.chromeUserDataDir,
+          disabled: false,
+          placeholder: "\u8BF7\u9009\u62E9 Chrome \u6D4F\u89C8\u5668\u591A\u5F00\u7528\u6237\u6570\u636E\u7684\u4FDD\u5B58\u8DEF\u5F84\uFF0C\u6700\u597D\u653E\u5927\u4E00\u70B9\u7684\u76D8\uFF08\u9009\u597D\u540E\u4E0D\u8981\u4FEE\u6539\uFF09",
+          allowClear: false,
+          autoCreateDirName: "chrome-user-data",
+          onBeforeSelect: function onBeforeSelect() {
+            return new Promise(function (resolve, reject) {
+              if (!formData.chromeUserDataDir) {
+                return resolve(true);
+              }
+              Modal.confirm({
+                title: '郑重提醒',
+                content: '如果换文件夹，可能以前登录的账号全不会失效，需要全部重新登录',
+                okText: '我已清楚风险',
+                cancelText: '取消',
+                onCancel: function onCancel() {
+                  resolve(false);
+                },
+                onOk: function onOk() {
+                  resolve(true);
+                }
+              });
+            });
+          },
+          onFinish: function onFinish(chromeUserDataDir) {
+            formData.chromeUserDataDir = chromeUserDataDir;
+            setFormData(_objectSpread({}, formData));
+            _onFinish(formData);
+          }
+        })
       })]
     })
   });

package/dist/VideoPublish/log/index.js

@@ -1,20 +1,25 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState, useEffect, useRef } from "react";
 import "./index.less";
 import LayoutContent from "../../UI/LayoutContent";
 import dayjs from "dayjs";
 import Markdown from "../../component/markdown";
-import { Divider, Empty, Tooltip } from "antd";
+import { Divider, Empty, Tag, Tooltip } from "antd";
 import event from "../../lib/event";
 import math from "../../lib/math";
 import Time from "../../UI/Time";
 import * as VideoPublishVideoAccountController from "../../service/api/VideoPublishVideoAccountController";
+import notification from "../../lib/notification";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var MaxLine = 10000;
 var VideoPublishLog = function VideoPublishLog(_ref) {
-  var clientIdentity = _ref.clientIdentity,
+  var _ref$clientIdentity = _ref.clientIdentity,
+    clientIdentity = _ref$clientIdentity === void 0 ? '' : _ref$clientIdentity,
     env = _ref.env;
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
@@ -39,6 +44,73 @@ var VideoPublishLog = function VideoPublishLog(_ref) {
     fail: '<CloseSquareFilled class="icon icon-fail" />',
     success: '<CheckCircleFilled class="icon icon-success" />'
   };
+  var onLogDo = function onLogDo(data) {
+    console.log('log data:', data);
+    (function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(code) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.t0 = code;
+              _context.next = _context.t0 === 'not-login' ? 3 : 8;
+              break;
+            case 3:
+              _context.next = 5;
+              return VideoPublishVideoAccountController.saveLoginStatus({
+                clientIdentity: clientIdentity,
+                taskId: data.taskId,
+                platformVideoAccountId: data.platformAccountId,
+                platform: data.platform,
+                isLogin: false,
+                loginValidMessage: data.message
+              }, {
+                env: env
+              }).catch(function (err) {
+                console.log("上报登录失败", err === null || err === void 0 ? void 0 : err.message);
+              });
+            case 5:
+              event.run('video-publish-auth-change');
+              notification.notificationError('有账户未登录', /*#__PURE__*/_jsxs(_Fragment, {
+                children: ["\u8BF7\u68C0\u67E5 ", /*#__PURE__*/_jsx(Tag, {
+                  children: data.nickname || ''
+                })]
+              }));
+              return _context.abrupt("break", 8);
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    })()(data === null || data === void 0 ? void 0 : data.code);
+    var logKey = data.logKey ? data.logKey : math.randWord(10);
+    var messageData = {
+      platform: data.platform,
+      platformAccountId: data.platformAccountId,
+      taskId: data.taskId,
+      id: logKey,
+      logStatus: data.status,
+      nickname: data.nickname,
+      content: data.message || '',
+      created: Date.now()
+    };
+    var index = findIndex(logKey);
+    if (index < 0) {
+      textRef.current.unshift(messageData);
+    } else {
+      // 不更新时间
+      textRef.current[index].content = messageData.content;
+      textRef.current[index].logStatus = messageData.logStatus;
+    }
+    if (textRef.current.length > MaxLine) {
+      // textRef.current = textRef.current.slice( textRef.current.length - MaxLine );
+      textRef.current = textRef.current.slice(0, MaxLine);
+    }
+    setTextList(_toConsumableArray(textRef.current));
+  };
   var onLog = function onLog() {
     event.on('task-apply', function () {
       setLogAmount(function (n) {
@@ -46,48 +118,18 @@ var VideoPublishLog = function VideoPublishLog(_ref) {
       });
       setLastTaskApplyTime(Math.floor(Date.now() * 0.001));
     });
-    event.on('shipinlv-video-publish-log', function (data) {
-      console.log('log data:', data);
-      switch (data === null || data === void 0 ? void 0 : data.code) {
-        case 'not-login':
-          // 上报
-          VideoPublishVideoAccountController.saveLoginStatus({
-            clientIdentity: clientIdentity,
-            platformVideoAccountId: data.platformAccountId,
-            platform: data.platform,
-            isLogin: false,
-            loginValidMessage: data.message
-          }, {
-            env: env
-          }).catch(function (err) {
-            console.log("上报登录失败", err === null || err === void 0 ? void 0 : err.message);
-          });
-          event.run('video-publish-auth-change');
-          break;
+    event.on('ws-message.publish-video-log-publish-video', function (query) {
+      console.log('ws-message publish-video -log-publish-video:', query);
+      if (query.dataType !== 'publish-video-log-publish-video') {
+        return;
       }
-      var logKey = data.logKey ? data.logKey : math.randWord(10);
-      var messageData = {
-        platform: data.platform,
-        platformAccountId: data.platformAccountId,
-        taskId: data.taskId,
-        id: logKey,
-        logStatus: data.status,
-        content: data.message || '',
-        created: Date.now()
-      };
-      var index = findIndex(logKey);
-      if (index < 0) {
-        textRef.current.unshift(messageData);
-      } else {
-        // 不更新时间
-        textRef.current[index].content = messageData.content;
-        textRef.current[index].logStatus = messageData.logStatus;
-      }
-      if (textRef.current.length > MaxLine) {
-        // textRef.current = textRef.current.slice( textRef.current.length - MaxLine );
-        textRef.current = textRef.current.slice(0, MaxLine);
-      }
-      setTextList(_toConsumableArray(textRef.current));
+      onLogDo(query.data);
+    });
+    event.on('publish-video-log-publish-video', function (query) {
+      onLogDo(query);
+    });
+    event.on('shipinlv-video-publish-log', function (data) {
+      onLogDo(data);
     });
   };
   var findIndex = function findIndex(id) {
@@ -123,10 +165,14 @@ var VideoPublishLog = function VideoPublishLog(_ref) {
       children: [textList.map(function (items, i) {
         var logStatus = LogStatusDict[items.logStatus] || '';
         var time = dayjs(items.created).format('MM-DD HH:mm:ss');
+        var contentText = "<span class=\"created\">".concat(time, "</span> <VideoPlatform platform=\"").concat(items.platform, "\" /> <span>").concat(items.nickname, " </span> <Tooltip title='\u4EFB\u52A1\u7F16\u53F7'><Tag color='blue'> ").concat(items.taskId, "</Tag></Tooltip> ").concat(logStatus, " <span class=\"content\">").concat(items.content, "</span>");
+        if (items.content === '-----') {
+          contentText = '<Divider />';
+        }
         return /*#__PURE__*/_jsx("div", {
           className: "line ".concat('line-' + items.logStatus),
           children: /*#__PURE__*/_jsx(Markdown, {
-            content: "<span class=\"created\">".concat(time, "</span> <VideoPlatform platform=\"").concat(items.platform, "\" /> <Tooltip title='\u4EFB\u52A1\u7F16\u53F7'><Tag color='blue'>").concat(items.taskId, "</Tag></Tooltip> <Tag>").concat(items.platformAccountId || '', "</Tag> ").concat(logStatus, " <span class=\"content\">").concat(items.content, "</span>")
+            content: contentText
           })
         }, "".concat(items.id, "-").concat(i));
       }), textList.length === 0 && /*#__PURE__*/_jsx(Empty, {

package/dist/VideoPublish/log/index.less

@@ -7,7 +7,7 @@
     font-weight: 300;
     //opacity: 0.7;
     font-size: 13px;
-    min-width: 62px;
+    min-width: 95px;
     text-align: center;
     display: inline-block;
     line-height: 1em;

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

@@ -1,16 +1,28 @@
 import React, { useEffect } from 'react';
 import "./index.less";
 import PublishTaskPlanClass from "./tool";
+import event from "../../lib/event";
 import { jsx as _jsx } from "react/jsx-runtime";
 var VideoPublishPublishVideoPlan = function VideoPublishPublishVideoPlan(_ref) {
   var disabled = _ref.disabled,
     env = _ref.env,
-    clientIdentity = _ref.clientIdentity;
+    _ref$clientIdentity = _ref.clientIdentity,
+    clientIdentity = _ref$clientIdentity === void 0 ? '' : _ref$clientIdentity;
   useEffect(function () {
     if (disabled) {
       return;
     }
-    var publishTaskPlan = new PublishTaskPlanClass(env, clientIdentity);
+    var publishTaskPlan = new PublishTaskPlanClass(env || '', clientIdentity, {
+      // onVideoPublish: ( proxyInfo, query ) => {
+      //   console.log('on log:', proxyInfo, query );
+      //   // 发送给 本地服务器 SSE
+      //   return Promise.resolve( true );
+      // },
+      onLog: function onLog(query) {
+        console.log('on log:', query);
+        event.run('publish-video', query);
+      }
+    });
     publishTaskPlan.onInit();
   }, []);
   return /*#__PURE__*/_jsx("div", {