@mp-assistant/cli 0.1.3 → 0.1.4

package/dist/server/api/modules/worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../../src/server/api/modules/worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAY1C,eAAO,MAAM,iBAAiB,GAAI,SAAS,eAAe,SAqKzD,CAAA"}
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../../src/server/api/modules/worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAc1C,eAAO,MAAM,iBAAiB,GAAI,SAAS,eAAe,SAsNzD,CAAA"}

package/dist/server/api/modules/worker.js

@@ -2,12 +2,14 @@ import { WorkerStore } from "../../../store/WorkerStore.js";
 import { Api } from "@mp-assistant/common/dist/api/index.js";
 import { createWorker, isWXWorker } from "@mp-assistant/core/dist/worker/index.js";
 import { ConfigStore } from "../../../store/ConfigStore.js";
-import { createTask } from "@mp-assistant/core/dist/worker/wx/task/index.js";
+import { createTask, isReleaseTask } from "@mp-assistant/core/dist/worker/wx/task/index.js";
 import { getSuccessApiResponse, getErrorApiResponse } from "@mp-assistant/common/dist/api/utils.js";
 import { WSStore } from "../../../store/WSStore.js";
 import { WSMessage } from "@mp-assistant/common/dist/ws/message.js";
 import { WSMessageEvent } from "../../../event/WSMessageEvent.js";
 import fs from 'fs';
+import { WorkerStatus } from "@mp-assistant/common/dist/work/index.js";
+import { TaskStatus } from "@mp-assistant/common/dist/work/task/const.js";
 export const registerWorkerApi = (fastify) => {
     fastify.get(Api.Worker.GetWorkerList.url, async (request, reply) => {
         const workerInfos = WorkerStore.instance.workerList.map(item => {
@@ -40,17 +42,35 @@ export const registerWorkerApi = (fastify) => {
             executablePath: ConfigStore.instance.config.executablePath,
             headless: ConfigStore.instance.config.headless,
         });
+        // 如果是微信worker则自动触发登录
+        if (isWXWorker(worker)) {
+            worker.login();
+        }
         WorkerStore.instance.addWorker(worker);
         WSStore.instance.broadcast(WSMessage.Worker.ListChange.createMessage());
         return getSuccessApiResponse(worker.info());
     });
+    fastify.post(Api.Worker.PauseAndRecoverWorker.url, async (request, reply) => {
+        const { key } = request.query;
+        const worker = WorkerStore.instance.workerList.find(item => item.key === key);
+        if (!worker) {
+            return getErrorApiResponse('Worker not found', 404);
+        }
+        worker.pauseAndRecover();
+        WSStore.instance.broadcast(WSMessage.Worker.ListChange.createMessage());
+        return getSuccessApiResponse(undefined, worker.status === WorkerStatus.PAUSED ? '暂停Worker成功' : '恢复Worker成功');
+    });
     fastify.delete(Api.Worker.RemoveWorker.url, async (request, reply) => {
         const { key } = request.query;
         const worker = WorkerStore.instance.workerList.find(item => item.key === key);
         if (!worker) {
             return getErrorApiResponse('Worker not found', 404);
         }
-        await worker.destroy();
+        // 如果任务正在运行则不能删除
+        if (worker.taskList.some(item => item.status === TaskStatus.RUNNING)) {
+            return getErrorApiResponse('Worker正在运行中，请先暂停，或者等任务执行完成后再删除', 400);
+        }
+        worker.destroy();
         WorkerStore.instance.removeWorker(worker);
         WSStore.instance.broadcast(WSMessage.Worker.ListChange.createMessage());
         return getSuccessApiResponse(undefined);
@@ -143,4 +163,23 @@ export const registerWorkerApi = (fastify) => {
         }
         return getSuccessApiResponse(task.info());
     });
+    fastify.post(Api.Worker.GetPublishQRCode.url, async (request, reply) => {
+        const { key, taskKey } = request.query;
+        const worker = WorkerStore.instance.workerList.find(item => item.key === key);
+        if (!worker) {
+            return getErrorApiResponse('Worker not found', 404);
+        }
+        const task = worker.taskList.find(item => item.key === taskKey);
+        if (!task) {
+            return getErrorApiResponse('Task not found', 404);
+        }
+        if (!isReleaseTask(task)) {
+            return getErrorApiResponse('Task type not supported', 400);
+        }
+        const qrCodeLoadingStatus = await task.getQrcodePath();
+        if (!qrCodeLoadingStatus) {
+            return getErrorApiResponse('Publish QR code path not found', 404);
+        }
+        return getSuccessApiResponse(undefined);
+    });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mp-assistant/cli",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "",
   "type": "module",
   "main": "index.js",
@@ -19,14 +19,14 @@
     "dayjs": "^1.11.13",
     "fastify": "^5.7.4",
     "ws": "^8.19.0",
-    "@mp-assistant/common": "0.1.3",
-    "@mp-assistant/dashboard": "0.1.3",
-    "@mp-assistant/core": "0.1.3"
+    "@mp-assistant/common": "0.1.4",
+    "@mp-assistant/core": "0.1.4",
+    "@mp-assistant/dashboard": "0.1.4"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",
-    "@mp-assistant/configuration": "0.1.3",
-    "@mp-assistant/scripts": "0.1.3"
+    "@mp-assistant/configuration": "0.1.4",
+    "@mp-assistant/scripts": "0.1.4"
   },
   "repository": {
     "type": "git",