component-shipinlv 1.1.27 → 1.3.1

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

@@ -5,38 +5,81 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import * as VideoPublishCrawlerTaskController from "../../service/api/VideoPublishCrawlerTaskController";
+import * as VideoPublishVideoAccountController from "../../service/api/VideoPublishVideoAccountController";
 import sleep from "../../lib/sleep";
 import event from "../../lib/event";
 import AccountManageSettingConfig from "../../lib/accountManageSettingConfig";
+import SSE from "../../component/sse";
+import param from "../../component/param";
+import { notification } from "antd";
+import openChrome from "../../lib/openChrome";
 var PublishTaskPlanClass = /*#__PURE__*/function () {
   function PublishTaskPlanClass(env) {
     var clientIdentity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    var options = arguments.length > 2 ? arguments[2] : undefined;
     _classCallCheck(this, PublishTaskPlanClass);
     _defineProperty(this, "timeLoopMillisecond", 15 * 1e3);
     _defineProperty(this, "isPublishing", false);
     _defineProperty(this, "env", '');
     _defineProperty(this, "clientIdentity", '');
+    _defineProperty(this, "options", {
+      // onVideoPublish: ( proxyInfo, query ) => {
+      //   return Promise.resolve( true );
+      // },
+      onLog: function onLog() {}
+    });
     this.env = env;
     this.clientIdentity = clientIdentity;
+    this.options = options;
   }
   _createClass(PublishTaskPlanClass, [{
     key: "onInit",
     value: function onInit() {
-      var _this = this,
-        _window$getBridge,
-        _window,
-        _window$getBridge$onL;
+      var _this2 = this;
       setInterval(function () {
-        if (_this.isPublishing) {
+        if (_this2.isPublishing) {
           return;
         }
-        _this.getWork();
+        _this2.getWork();
       }, 2e3);
 
-      // 桥
-      (_window$getBridge = (_window = window).getBridge) === null || _window$getBridge === void 0 || (_window$getBridge = _window$getBridge.call(_window)) === null || _window$getBridge === void 0 || (_window$getBridge$onL = _window$getBridge.onLog) === null || _window$getBridge$onL === void 0 || _window$getBridge$onL.call(_window$getBridge, function (query) {
-        event.run('shipinlv-video-publish-log', query);
+      // chrome 提交的 用户信息；
+      event.on('ws-message.chrome-publish-video-account-info', function (result) {
+        if (result.dataType !== 'chrome-publish-video-account-info') {
+          return;
+        }
+        console.log('ws-message chrome account:', result);
+        var data = result.data;
+        VideoPublishVideoAccountController.create(data, {
+          env: _this2.env
+        });
       });
+
+      // event.on('ws-message.publish-video-log-publish-video', async ( query: ApiLocal.DataFlowResult<PublishVideo.PublishVideoLog> ) => {
+      //   if( query.dataType !== 'publish-video-log-publish-video' ){
+      //     return;
+      //   }
+      //   const data: PublishVideo.PublishVideoLog = query.data;
+      //   if( ! ['fail', 'success'].includes( data.status ) ){
+      //     return;
+      //   }
+      //
+      //   await this.on Report( data.status === 'success', data.message, {
+      //     taskType: data.taskType,
+      //     taskId: data.taskId,
+      //     platform: data.platform,
+      //     platformAccountId: '',
+      //   }).catch( err => {
+      //
+      //   });
+      //
+      //   await this.doWorkWait();
+      // });
+
+      // 桥
+      // this.options.onLog?.( ( query: any ) => {
+      //   event.run('shipinlv-video-publish-log', query )
+      // });
     }
   }, {
     key: "getWork",
@@ -84,8 +127,7 @@ var PublishTaskPlanClass = /*#__PURE__*/function () {
     key: "doWork",
     value: function () {
       var _doWork = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(taskDetail) {
-        var _this2 = this;
-        var item, saveBaseData, result, errMessage, errLog;
+        var item, saveBaseData, result, errMessage, code, errLog;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -111,42 +153,41 @@ var PublishTaskPlanClass = /*#__PURE__*/function () {
                 platformAccountId: taskDetail.platformVideoAccountId
               };
               _context2.t0 = item.taskType;
-              _context2.next = _context2.t0 === "publish-video" ? 12 : 21;
+              _context2.next = _context2.t0 === "publish-video" ? 12 : 20;
               break;
             case 12:
               if (item.publishVideo) {
                 _context2.next = 16;
                 break;
               }
-              console.warn("item.publishVideo is empty!");
-              this.onReport(false, "publishVideo 不存在", saveBaseData);
+              console.warn("item publishVideo is empty!");
+              this.onReport(false, '', "publishVideo 不存在", saveBaseData);
               return _context2.abrupt("break", 26);
             case 16:
               _context2.next = 18;
-              return this.onPublishVideo(taskDetail.platform, taskDetail.platformVideoAccountId, taskDetail.taskInfo, taskDetail.proxyInfo).catch(function (err) {
+              return this.onPublishVideo(taskDetail.platform, taskDetail.platformVideoAccountId, taskDetail.nickname, taskDetail.chromeProfileName, taskDetail.taskInfo, taskDetail.proxyInfo).catch(function (err) {
                 console.warn("onPublishVideo err:", err);
-                _this2.onReport(false, err === null || err === void 0 ? void 0 : err.message, saveBaseData);
+                // this.on Report(false, err?.message, saveBaseData );
               });
             case 18:
               result = _context2.sent;
-              if (result) {
-                this.onReport(result.success, result.message, saveBaseData);
-              }
               return _context2.abrupt("break", 26);
-            case 21:
+            case 20:
               errMessage = '暂不支持 类型：' + item.taskType;
               console.log(errMessage);
+              code = 'not-support-task-type';
               errLog = {
                 platform: taskDetail.platform,
                 platformAccountId: taskDetail.platformVideoAccountId,
-                code: 'not-support-task-type',
+                code: code,
+                nickname: taskDetail.nickname,
                 message: errMessage,
                 status: 'fail',
                 taskId: item.taskId,
                 eventType: 'task-kind'
               };
               this.onLog(errLog);
-              this.onReport(false, errMessage, saveBaseData);
+              this.onReport(false, code, errMessage, saveBaseData);
             case 26:
               _context2.next = 28;
               return this.doWorkWait();
@@ -168,12 +209,13 @@ var PublishTaskPlanClass = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              event.run('shipinlv-video-publish-log', query);
-            case 1:
+              event.run('publish-video-log-publish-video', query);
+              this.options.onLog(query);
+            case 2:
             case "end":
               return _context3.stop();
           }
-        }, _callee3);
+        }, _callee3, this);
       }));
       function onLog(_x2) {
         return _onLog.apply(this, arguments);
@@ -204,9 +246,12 @@ var PublishTaskPlanClass = /*#__PURE__*/function () {
     }()
   }, {
     key: "onReport",
-    value: function onReport(success, message, saveBaseData) {
-      VideoPublishCrawlerTaskController.report(_objectSpread({
+    value: function onReport(success, code,
+    // not-login
+    message, saveBaseData) {
+      return VideoPublishCrawlerTaskController.report(_objectSpread({
         success: success,
+        code: code,
         message: message
       }, saveBaseData), {
         env: this.env
@@ -242,27 +287,30 @@ var PublishTaskPlanClass = /*#__PURE__*/function () {
   }, {
     key: "onPublishVideo",
     value: function () {
-      var _onPublishVideo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(platform, platformVideoAccountId, taskInfo, proxyInfo) {
+      var _onPublishVideo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(platform, platformVideoAccountId, nickname, chromeProfileName, taskInfo, proxyInfo) {
         var _this3 = this;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+        var _this;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _context7.next = 2;
+              _this = this; // 发布抖音视频
+              _context8.next = 3;
               return sleep(1);
-            case 2:
-              return _context7.abrupt("return", new Promise( /*#__PURE__*/function () {
-                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(resolve, reject) {
-                  var _window$getBridge2, _window2;
-                  var settingConfig, publishResult, errLog, err;
-                  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-                    while (1) switch (_context6.prev = _context6.next) {
+            case 3:
+              return _context8.abrupt("return", new Promise( /*#__PURE__*/function () {
+                var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(resolve, reject) {
+                  var settingConfig, publishResult, finishLog;
+                  return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+                    while (1) switch (_context7.prev = _context7.next) {
                       case 0:
                         settingConfig = AccountManageSettingConfig();
                         console.log('settingConfig 1:', settingConfig);
-                        _context6.next = 4;
-                        return (_window$getBridge2 = (_window2 = window).getBridge) === null || _window$getBridge2 === void 0 ? void 0 : _window$getBridge2.call(_window2).videoPublish(proxyInfo, {
+                        _context7.next = 4;
+                        return _this.onPublishVideoDo(proxyInfo, {
                           platformVideoAccountId: platformVideoAccountId,
                           platform: platform,
+                          chromeProfileName: chromeProfileName,
+                          nickname: nickname,
                           open: settingConfig.isChromeOpen,
                           // 发布视频的时候是否打开图形界面
                           taskInfo: taskInfo
@@ -279,71 +327,242 @@ var PublishTaskPlanClass = /*#__PURE__*/function () {
                           //     kindTagValue: detail.kindTagValue, // "" // 抖音是商品链接 快手是商品relItemId
                           //   }
                           // },
-                        }).catch(function (err) {
-                          // 基本不会到这里
-                          console.warn('bridge. video Publish err:', err.code, err);
-                          resolve(err);
-                        });
+                        }, settingConfig).catch( /*#__PURE__*/function () {
+                          var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(err) {
+                            var _err$message;
+                            var msgInfo, code, message, errLog, errNew;
+                            return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                              while (1) switch (_context6.prev = _context6.next) {
+                                case 0:
+                                  // 基本不会到这里
+                                  console.warn('bridge. video Publish err:', err.code, err);
+                                  msgInfo = (err === null || err === void 0 || (_err$message = err.message) === null || _err$message === void 0 ? void 0 : _err$message.split('■')) || [];
+                                  code = '';
+                                  message = '';
+                                  if (msgInfo.length >= 2) {
+                                    code = msgInfo[0];
+                                    message = msgInfo.slice(1).join(' ');
+                                  } else {
+                                    message = (err === null || err === void 0 ? void 0 : err.message) || '';
+                                  }
+                                  errLog = {
+                                    platform: platform,
+                                    platformAccountId: platformVideoAccountId,
+                                    code: code,
+                                    message: message,
+                                    nickname: nickname,
+                                    status: 'fail',
+                                    taskId: taskInfo.taskId,
+                                    eventType: 'publish-video'
+                                  }; // event.run('lo g', errLog);
+                                  _this3.onLog(errLog);
+                                  _this3.onReport(false, code, err === null || err === void 0 ? void 0 : err.message, {
+                                    taskType: taskInfo.taskType,
+                                    taskId: taskInfo.taskId,
+                                    platform: platform,
+                                    platformAccountId: platformVideoAccountId
+                                  });
+
+                                  // 等一会，清理现场，关闭 chrome
+                                  _context6.next = 10;
+                                  return sleep(10e3);
+                                case 10:
+                                  errNew = new Error(err === null || err === void 0 ? void 0 : err.message);
+                                  errNew.name = err.code;
+                                  reject(errNew);
+
+                                  // resolve( err );
+                                case 13:
+                                case "end":
+                                  return _context6.stop();
+                              }
+                            }, _callee6);
+                          }));
+                          return function (_x11) {
+                            return _ref2.apply(this, arguments);
+                          };
+                        }());
                       case 4:
-                        publishResult = _context6.sent;
+                        publishResult = _context7.sent;
                         if (publishResult) {
-                          _context6.next = 7;
+                          _context7.next = 8;
                           break;
                         }
-                        return _context6.abrupt("return", publishResult);
-                      case 7:
+                        console.log('publishResult empty');
+                        return _context7.abrupt("return", publishResult);
+                      case 8:
                         console.log("publishResult:", publishResult);
-                        if (publishResult.success) {
-                          _context6.next = 14;
-                          break;
-                        }
-                        errLog = {
-                          platform: publishResult.data.platform,
-                          platformAccountId: publishResult.data.platformVideoAccountId,
-                          code: publishResult.code,
-                          message: publishResult.message,
-                          status: 'fail',
+                        finishLog = {
+                          platform: platform,
+                          platformAccountId: platformVideoAccountId,
+                          code: '',
+                          message: '恭喜你，视频发布成功',
+                          nickname: nickname,
+                          status: 'success',
                           taskId: taskInfo.taskId,
                           eventType: 'publish-video'
                         }; // event.run('lo g', errLog);
-                        _this3.onLog(errLog);
-                        err = new Error(publishResult.message);
-                        err.name = publishResult.code;
-                        return _context6.abrupt("return", reject(err));
-                      case 14:
-                        resolve(publishResult);
+                        _this3.onLog(finishLog);
+                        _context7.next = 13;
+                        return sleep(1);
+                      case 13:
+                        _this3.onReport(true, '', '', {
+                          taskType: taskInfo.taskType,
+                          taskId: taskInfo.taskId,
+                          platform: platform,
+                          platformAccountId: platformVideoAccountId
+                        });
 
-                        // const logReceive: Log.Receive = {
-                        //   platform: publishResult.data.platform,
-                        //   platformAccountId: publishResult.data.platformVideoAccountId,
-                        //   code: 'publish-video-finish',
-                        //   message: '',
-                        //   status: 'success',
-                        //   taskId: 0,
-                        //   eventType: 'task-kind'
-                        // }
-                        // event.run('lo g', logReceive);
-                      case 15:
+                        // 等一会，清理现场，关闭 chrome
+                        _context7.next = 16;
+                        return sleep(10e3);
+                      case 16:
+                        resolve(true);
+                      case 17:
                       case "end":
-                        return _context6.stop();
+                        return _context7.stop();
                     }
-                  }, _callee6);
+                  }, _callee7);
                 }));
-                return function (_x7, _x8) {
+                return function (_x9, _x10) {
                   return _ref.apply(this, arguments);
                 };
               }()));
-            case 3:
+            case 4:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
-        }, _callee7);
+        }, _callee8, this);
       }));
-      function onPublishVideo(_x3, _x4, _x5, _x6) {
+      function onPublishVideo(_x3, _x4, _x5, _x6, _x7, _x8) {
         return _onPublishVideo.apply(this, arguments);
       }
       return onPublishVideo;
     }()
+  }, {
+    key: "onPublishVideoDo",
+    value: function () {
+      var _onPublishVideoDo = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(proxyInfo, query, settingConfig) {
+        var _this;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
+            case 0:
+              _this = this;
+              return _context9.abrupt("return", new Promise(function (resolve, reject) {
+                var isOpened = false;
+                var sse = new SSE("http://localhost:".concat(window.__ShipinlvLocalServerPort || 61806, "/").concat("chrome/applyForPublishTaskSse".toLocaleLowerCase(), "?") + param({
+                  data: JSON.stringify(_objectSpread(_objectSpread({}, query), {}, {
+                    proxyInfo: proxyInfo
+                  }))
+                }), function (lastEventId, data) {
+                  if (lastEventId === 'start-do-task') {
+                    //唤起 浏览器；
+                    // event.run('publish-video-open-chrome', {
+                    //   platform: query.platform || 'douyin',
+                    //   platformAccountId: query.platformVideoAccountId,
+                    //   chromePath: settingConfig.chromePath,
+                    //   isOpen: query.open,
+                    // });
+                    _this.onLog({
+                      platform: query.platform || 'douyin',
+                      platformAccountId: query.platformVideoAccountId,
+                      code: '',
+                      nickname: query.nickname,
+                      message: "<Divider orientation=\"left\">\u89C6\u9891\u8D26\u53F7\uFF1A".concat(query.nickname, "</Divider>"),
+                      status: '',
+                      taskId: query.taskInfo.taskId,
+                      eventType: 'publish-video'
+                    });
+                    _this.onLog({
+                      platform: query.platform || 'douyin',
+                      platformAccountId: query.platformVideoAccountId,
+                      code: '',
+                      nickname: query.nickname,
+                      message: '接到任务，准备启动 谷歌浏览器',
+                      status: '',
+                      taskId: query.taskInfo.taskId,
+                      eventType: 'publish-video'
+                    });
+                    openChrome({
+                      action: 'publish',
+                      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,
+                      isOpen: query.open
+                    }, false);
+                  } else if (lastEventId === 'fail') {
+                    // query.onDownFail( data );
+                    // this.on Report( false, data, {
+                    //   taskType: query.taskInfo.taskType,
+                    //   taskId: query.taskInfo.taskId,
+                    //   platform: query.platform || 'douyin',
+                    //   platformAccountId: query.platformVideoAccountId,
+                    // });
+                    var failErr = new Error(data);
+                    reject(failErr);
+                  } else if (lastEventId === 'finish') {
+                    // _this.onLog( {
+                    //   platform: query.platform || 'douyin',
+                    //   platformAccountId: query.platformVideoAccountId,
+                    //   code: '',
+                    //   message: data,
+                    //   status: 'success',
+                    //   taskId: query.taskInfo.taskId,
+                    //   eventType: 'publish-video',
+                    // });
+
+                    resolve(true);
+                  } else {
+                    // @ts-ignore
+                    var status = "".concat(lastEventId);
+                    _this.onLog({
+                      platform: query.platform || 'douyin',
+                      platformAccountId: query.platformVideoAccountId,
+                      code: '',
+                      nickname: query.nickname,
+                      message: data,
+                      status: status,
+                      taskId: query.taskInfo.taskId,
+                      eventType: 'publish-video'
+                    });
+                  }
+                }, function () {
+                  isOpened = true;
+                }, function () {}, function (err) {
+                  console.log('down file err:', err);
+                  var description = '发布客户端似乎不正常，请检查:' + (err === null || err === void 0 ? void 0 : err.message);
+                  if (!isOpened) {
+                    notification.error({
+                      duration: 30 * 60,
+                      message: "发布失败",
+                      description: description
+                    });
+                  }
+                  // _this?.on Report( false, description, {
+                  //   taskType: query.taskInfo.taskType,
+                  //   taskId: query.taskInfo.taskId,
+                  //   platform: query.platform || 'douyin',
+                  //   platformAccountId: query.platformVideoAccountId,
+                  // });
+                });
+
+                sse.onInit();
+              }));
+            case 2:
+            case "end":
+              return _context9.stop();
+          }
+        }, _callee9, this);
+      }));
+      function onPublishVideoDo(_x12, _x13, _x14) {
+        return _onPublishVideoDo.apply(this, arguments);
+      }
+      return onPublishVideoDo;
+    }()
   }]);
   return PublishTaskPlanClass;
 }();

package/dist/VideoPublish/video-account/index.js

@@ -191,7 +191,7 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
       var current = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : pagination.current;
       return VideoPublishController.videoAccountList(_objectSpread(_objectSpread({}, postQuery), {}, {
         current: current,
-        pageSize: 20
+        pageSize: pagination.pageSize
       }), {
         env: env
       });
@@ -302,7 +302,10 @@ var VideoPublishVideoAccount = function VideoPublishVideoAccount(_ref) {
       loading: false,
       columns: columns,
       dataSource: listData,
-      pagination: pagination
+      pagination: pagination,
+      onChange: function onChange(page, filters, sorter, extra) {
+        runVideoAccount(query, page.current || 1);
+      }
     })
   });
 };

package/dist/base/folderCreate.d.ts

@@ -0,0 +1,2 @@
+declare const folderCreate: (folderPath: string) => Promise<LocalFile.FileCreate>;
+export default folderCreate;

package/dist/base/folderCreate.js

@@ -0,0 +1,56 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import * as LocalFileController from "../service/local/FileController";
+var folderCreate = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(folderPath) {
+    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 LocalFileController.folderCreate({
+                      folderPath: folderPath
+                    }, {
+                      silent: true
+                    }).catch(function (err) {
+                      if ((err === null || err === void 0 ? void 0 : err.name) === "shipinlv-client-not-run") {
+                        return reject(err);
+                      }
+                      console.log('create In Folder err:', err);
+                      console.log('create In Folder err 2:', JSON.stringify(err));
+                      err.message = "\u521B\u5EFA\u6587\u4EF6\u5939\u5931\u8D25\uFF1A".concat(err === null || err === void 0 ? void 0 : err.message);
+                      reject(err);
+                    });
+                  case 2:
+                    openResult = _context.sent;
+                    if (openResult) {
+                      resolve({
+                        folderPath: folderPath
+                      });
+                    }
+                  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 folderCreate(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export default folderCreate;

package/dist/component/folder-select.d.ts

@@ -9,6 +9,7 @@ interface Props {
     label?: React.ReactNode;
     placeholder?: string;
     disabled?: boolean;
+    autoCreateDirName?: string;
     onBeforeSelect?: () => Promise<boolean>;
     hiddenOpenDir?: boolean;
     disabledChangeDir?: boolean;