@mp-assistant/core - npm Package Compare versions

Comparing version 0.1.10 to 0.1.11

dist/worker/BaseTask.d.ts

@@ -21,5 +21,6 @@ import { BrowserContext } from "playwright";
     protected _setStatus(status: TaskStatus): void;
+    protected _complete(status: TaskStatus.COMPLETED | TaskStatus.FAILED, result: TaskExecResult): void;
     protected _addRunningReport(report: TaskRunningReport): void;
     info(): BaseTaskInfo;
-    run(browserContent: BrowserContext): Promise<TaskExecResult>;
+    start(browserContent: BrowserContext): Promise<void>;
     destroy(): Promise<void>;
@@ -32,4 +33,4 @@ private __emitDetailChangeEventTimer;
     emitDetailChangeEvent(): void;
-    protected abstract _executor(browserContent: BrowserContext): Promise<TaskExecResult>;
+    protected abstract _start(browserContent: BrowserContext): Promise<void> | void;
 }
 //# sourceMappingURL=BaseTask.d.ts.map

dist/worker/BaseTask.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"BaseTask.d.ts","sourceRoot":"","sources":["../../src/worker/BaseTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,8CAA8C,CAAC;AACrI,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGlD,8BAAsB,QAAQ;IAC1B,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;IAEzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB,OAAO,CAAC,QAAQ,CAAsC;IAEtD,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC;IAEtB,OAAO,CAAC,mBAAmB,CAA2B;IAEtD,MAAM,CAAC,EAAE,cAAc,CAAC;IAExB,SAAS,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;IAE/B,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,SAAS,CAAa;IAE9B,IAAI,MAAM,IAAI,UAAU,GAAG,IAAI,CAE9B;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,UAAU,EAE5B;IAED,IAAI,MAAM,eAET;IAED,IAAI,iBAAiB,wBAEpB;gBAEW,OAAO,EAAE,GAAG;IAOxB,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU;IASvC,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,iBAAiB;IAMrD,IAAI,IAAI,YAAY;IAed,GAAG,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;IA4B5D,OAAO;IAKb,OAAO,CAAC,4BAA4B,CAA8C;IAClF;;;OAGG;IACH,qBAAqB;IAOrB,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;CACxF"}
+{"version":3,"file":"BaseTask.d.ts","sourceRoot":"","sources":["../../src/worker/BaseTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,8CAA8C,CAAC;AACrI,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,8BAAsB,QAAQ;IAC1B,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;IAEzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAErB,OAAO,CAAC,QAAQ,CAAsC;IAEtD,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC;IAEtB,OAAO,CAAC,mBAAmB,CAA2B;IAEtD,MAAM,CAAC,EAAE,cAAc,CAAC;IAExB,SAAS,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;IAE/B,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,SAAS,CAAa;IAE9B,IAAI,MAAM,IAAI,UAAU,GAAG,IAAI,CAE9B;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,UAAU,EAE5B;IAED,IAAI,MAAM,eAET;IAED,IAAI,iBAAiB,wBAEpB;gBAEW,OAAO,EAAE,GAAG;IAOxB,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU;IASvC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc;IAO5F,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,iBAAiB;IAMrD,IAAI,IAAI,YAAY;IAed,KAAK,CAAC,cAAc,EAAE,cAAc;IAoBpC,OAAO;IAKb,OAAO,CAAC,4BAA4B,CAA8C;IAClF;;;OAGG;IACH,qBAAqB;IAOrB,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;CAClF"}

dist/worker/BaseTask.js

@@ -38,2 +38,8 @@ import { getUUID } from "@mp-assistant/common/dist/utils/index.js";
     }
+    _complete(status, result) {
+        this.__endTime = Date.now();
+        this.result = result;
+        this._setStatus(status);
+        this.emitDetailChangeEvent();
+    }
     _addRunningReport(report) {
@@ -57,5 +63,5 @@ this.__runningReportList.push(report);
     }
-    async run(browserContent) {
+    async start(browserContent) {
         if (this.status !== TaskStatus.NOT_STARTED) {
-            throw new Error('Task already started');
+            return;
         }
@@ -67,21 +73,10 @@ this.__startTime = Date.now();
             this.__runningReportList = [];
-            // 执行任务
-            const result = await this._executor(browserContent);
-            this._setStatus(result.status);
-            this.result = result;
+            await this._start(browserContent);
         }
         catch (error) {
-            this._setStatus(TaskStatus.FAILED);
-            this.result = {
-                status: TaskStatus.FAILED,
-                endTimestamp: Date.now(),
+            console.error('任务执行失败', error);
+            this._complete(TaskStatus.FAILED, {
                 msg: error instanceof Error ? error.message : '未知错误',
-            };
-            console.error('任务执行失败', error);
+            });
         }
-        finally {
-            this.__endTime = Date.now();
-            this.emitDetailChangeEvent();
-        }
-        return this.result;
     }
@@ -88,0 +83,0 @@ async destroy() {

dist/worker/wx/task/AuditTask.d.ts

 import { BrowserContext, Locator, Page } from "playwright";
 import { BaseWXTask } from "./BaseWXTask.js";
-import { TaskExecResult, TaskType, WXTaskN } from "@mp-assistant/common/dist/work/task/index.js";
+import { TaskType, WXTaskN } from "@mp-assistant/common/dist/work/task/index.js";
 import { VersionListItem } from "@mp-assistant/common/dist/types/wx.js";
@@ -14,10 +14,8 @@ /**
     private _errorToMessage;
-    private _buildFailedResult;
-    private _buildCompletedResult;
     protected _waitForImgUpload(ct: Locator, num: number, timeout?: number): Promise<void>;
     protected _uploadImageFile(ct: Locator, imagePreview: string): Promise<void>;
     protected _uploadVideoFile(ct: Locator, videoPreview: string): Promise<void>;
-    protected _getAuditPage(page: Page, targetVersion: VersionListItem): Promise<TaskExecResult>;
-    protected _executor(browserContent: BrowserContext): Promise<TaskExecResult>;
+    protected _getAuditPage(page: Page, targetVersion: VersionListItem): Promise<void>;
+    protected _start(browserContent: BrowserContext): Promise<void>;
 }
 //# sourceMappingURL=AuditTask.d.ts.map

dist/worker/wx/task/AuditTask.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"AuditTask.d.ts","sourceRoot":"","sources":["../../../../src/worker/wx/task/AuditTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAc,QAAQ,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AAC7G,OAAO,EAAE,eAAe,EAAkB,MAAM,uCAAuC,CAAC;AAOxF;;;GAGG;AACH,qBAAa,SAAU,SAAQ,UAAU;IACrC,QAAQ,CAAC,IAAI,qBAAqB;IAClC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC;gBAE/B,OAAO,EAAE,OAAO,CAAC,gBAAgB;IAK7C,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,qBAAqB;cAYb,iBAAiB,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,MAAc,GAAG,OAAO,CAAC,IAAI,CAAC;cAcnF,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAqBlE,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAmBlE,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;cA0DlF,SAAS,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;CAyGrF"}
+{"version":3,"file":"AuditTask.d.ts","sourceRoot":"","sources":["../../../../src/worker/wx/task/AuditTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAA8B,QAAQ,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AAC7G,OAAO,EAAE,eAAe,EAAkB,MAAM,uCAAuC,CAAC;AAOxF;;;GAGG;AACH,qBAAa,SAAU,SAAQ,UAAU;IACrC,QAAQ,CAAC,IAAI,qBAAqB;IAElC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC;gBAE/B,OAAO,EAAE,OAAO,CAAC,gBAAgB;IAK7C,OAAO,CAAC,eAAe;cAaP,iBAAiB,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,MAAc,GAAG,OAAO,CAAC,IAAI,CAAC;cAcnF,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAqBlE,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAmBlE,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,eAAe;cA6DxD,MAAM,CAAC,cAAc,EAAE,cAAc;CAyHxD"}

dist/worker/wx/task/AuditTask.js

@@ -31,22 +31,2 @@ import { BaseWXTask } from "./BaseWXTask.js";
     }
-    _buildFailedResult(msg, code = WXReviewStatus.FAIL) {
-        return {
-            status: TaskStatus.FAILED,
-            data: {
-                code
-            },
-            msg,
-            endTimestamp: Date.now(),
-        };
-    }
-    _buildCompletedResult(msg, code = WXReviewStatus.SUCCESS) {
-        return {
-            status: TaskStatus.COMPLETED,
-            data: {
-                code
-            },
-            msg,
-            endTimestamp: Date.now(),
-        };
-    }
     // 等待图片上传完成
@@ -142,7 +122,10 @@ async _waitForImgUpload(ct, num, timeout = 10000) {
             });
-            return this._buildCompletedResult(successLocator ? '提审成功' : '提审失败', successLocator ? WXReviewStatus.SUCCESS : WXReviewStatus.FAIL);
+            return this._complete(TaskStatus.COMPLETED, {
+                msg: successLocator ? '提审成功' : '提审失败'
+            });
         }
         catch (error) {
-            console.log('提审失败', error);
-            return this._buildFailedResult(this._errorToMessage(error));
+            return this._complete(TaskStatus.FAILED, {
+                msg: this._errorToMessage(error)
+            });
         }
@@ -153,3 +136,3 @@ finally {
     }
-    async _executor(browserContent) {
+    async _start(browserContent) {
         const page = await this._switchMP(browserContent);
@@ -169,3 +152,6 @@ let shouldClosePage = true;
             if (!positioner?.length || !populateData || !Object.keys(populateData).length) {
-                return this._buildFailedResult('缺少相关参数');
+                this._complete(TaskStatus.FAILED, {
+                    msg: '缺少相关参数'
+                });
+                return;
             }
@@ -179,7 +165,13 @@ this._addRunningReport({
             if (onlineVersion && versionSatisfy(onlineVersion, positioner)) {
-                return this._buildFailedResult('当前预提审版本和线上版本一致，无需提审');
+                this._complete(TaskStatus.FAILED, {
+                    msg: '当前预提审版本和线上版本一致，无需提审'
+                });
+                return;
             }
             const targetVersion = developVersionList?.find(version => versionSatisfy(version, positioner));
             if (!targetVersion) {
-                return this._buildFailedResult('没有找到要提审的版本');
+                this._complete(TaskStatus.FAILED, {
+                    msg: '没有找到要提审的版本'
+                });
+                return;
             }
@@ -208,3 +200,6 @@ // 当前没有审核中的版本，直接打开提审页
                         });
-                        return this._buildCompletedResult('当前版本已通过审核，请发布');
+                        this._complete(TaskStatus.COMPLETED, {
+                            msg: '当前版本已通过审核，请发布'
+                        });
+                        return;
                     }
@@ -217,3 +212,6 @@ // 重新提审
                     if (isCurrentAuditTarget) {
-                        return this._buildFailedResult('当前版本正在审核中，请耐心等待', WXReviewStatus.REVIEWING);
+                        this._complete(TaskStatus.FAILED, {
+                            msg: '当前版本正在审核中，请耐心等待'
+                        });
+                        return;
                     }
@@ -233,9 +231,10 @@ // 当前审核版本不是目标版本，先取消审核
             }
-            return {
-                status: TaskStatus.FAILED,
-                endTimestamp: Date.now(),
-            };
+            return this._complete(TaskStatus.FAILED, {
+                msg: '没有找到要提审的版本'
+            });
         }
         catch (error) {
-            return this._buildFailedResult(this._errorToMessage(error));
+            return this._complete(TaskStatus.FAILED, {
+                msg: this._errorToMessage(error)
+            });
         }
@@ -242,0 +241,0 @@ finally {

dist/worker/wx/task/BaseWXTask.d.ts

 import { BrowserContext, Locator, Page } from "playwright";
 import { BaseTask } from "../../BaseTask.js";
-import { TaskExecResult, WXTaskN } from "@mp-assistant/common/dist/work/task/index.js";
+import { WXTaskN } from "@mp-assistant/common/dist/work/task/index.js";
 export declare class BaseWXTask extends BaseTask {
@@ -8,3 +8,3 @@ readonly options: WXTaskN.TaskOptions;
     info(): WXTaskN.TaskInfo;
-    protected _executor(browserContent: BrowserContext): Promise<TaskExecResult>;
+    protected _start(browserContent: BrowserContext): void;
     protected _switchMP(browserContent: BrowserContext): Promise<Page>;
@@ -11,0 +11,0 @@ protected _getVersionList(page: Page): Promise<WXTaskN.VersionListData>;

dist/worker/wx/task/BaseWXTask.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"BaseWXTask.d.ts","sourceRoot":"","sources":["../../../../src/worker/wx/task/BaseWXTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AAKvF,qBAAa,UAAW,SAAQ,QAAQ;IACpC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC;gBAE1B,OAAO,EAAE,OAAO,CAAC,WAAW;IAMxC,IAAI,IAAI,OAAO,CAAC,QAAQ;IAOxB,SAAS,CAAC,SAAS,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;cAI5D,SAAS,CAAC,cAAc,EAAE,cAAc;cAsFxC,eAAe,CAAC,IAAI,EAAE,IAAI;IAkB1C,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,GAAG,OAAO;CAUxF"}
+{"version":3,"file":"BaseWXTask.d.ts","sourceRoot":"","sources":["../../../../src/worker/wx/task/BaseWXTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,OAAO,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AAKvE,qBAAa,UAAW,SAAQ,QAAQ;IACpC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC;gBAE1B,OAAO,EAAE,OAAO,CAAC,WAAW;IAMxC,IAAI,IAAI,OAAO,CAAC,QAAQ;IAOxB,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,cAAc;cAI/B,SAAS,CAAC,cAAc,EAAE,cAAc;cAsFxC,eAAe,CAAC,IAAI,EAAE,IAAI;IAkB1C,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,GAAG,OAAO;CAUxF"}

dist/worker/wx/task/BaseWXTask.js

@@ -19,3 +19,3 @@ import { BaseTask } from "../../BaseTask.js";
     }
-    _executor(browserContent) {
+    _start(browserContent) {
         throw new Error("Method not implemented.");
@@ -22,0 +22,0 @@ }

dist/worker/wx/task/InspectVersionTask.d.ts

 import { BrowserContext } from "playwright";
 import { BaseWXTask } from "./BaseWXTask.js";
-import { TaskExecResult, TaskType, WXTaskN } from "@mp-assistant/common/dist/work/task/index.js";
+import { TaskExecResult, TaskStatus, TaskType, WXTaskN } from "@mp-assistant/common/dist/work/task/index.js";
 /**
@@ -10,4 +10,5 @@ * 检查小程序版本任务
     readonly type = TaskType.WX_INSPECT_VERSION;
-    protected _executor(browserContent: BrowserContext): Promise<TaskExecResult<WXTaskN.GetVersionListResult>>;
+    protected _complete(status: TaskStatus.COMPLETED | TaskStatus.FAILED, result: TaskExecResult<WXTaskN.GetVersionListResult>): void;
+    protected _start(browserContent: BrowserContext): Promise<void>;
 }
 //# sourceMappingURL=InspectVersionTask.d.ts.map

dist/worker/wx/task/InspectVersionTask.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"InspectVersionTask.d.ts","sourceRoot":"","sources":["../../../../src/worker/wx/task/InspectVersionTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAc,QAAQ,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AAG7G;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,UAAU;IAC9C,QAAQ,CAAC,IAAI,+BAA+B;cAE5B,SAAS,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAkBnH"}
+{"version":3,"file":"InspectVersionTask.d.ts","sourceRoot":"","sources":["../../../../src/worker/wx/task/InspectVersionTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AAG7G;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,UAAU;IAC9C,QAAQ,CAAC,IAAI,+BAA+B;IAE5C,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,oBAAoB,CAAC;cAI1G,MAAM,CAAC,cAAc,EAAE,cAAc;CAgBxD"}

dist/worker/wx/task/InspectVersionTask.js

@@ -10,3 +10,6 @@ import { BaseWXTask } from "./BaseWXTask.js";
     type = TaskType.WX_INSPECT_VERSION;
-    async _executor(browserContent) {
+    _complete(status, result) {
+        super._complete(status, result);
+    }
+    async _start(browserContent) {
         const page = await this._switchMP(browserContent);
@@ -16,7 +19,5 @@ try {
             const currentVersionData = await this._getVersionList(page);
-            return {
-                status: TaskStatus.COMPLETED,
+            this._complete(TaskStatus.COMPLETED, {
                 data: currentVersionData,
-                endTimestamp: Date.now(),
-            };
+            });
         }
@@ -23,0 +24,0 @@ catch (error) {

dist/worker/wx/task/ReleaseTask.d.ts

 import { BrowserContext, Page } from "playwright";
 import { BaseWXTask } from "./BaseWXTask.js";
-import { TaskExecResult, TaskType, WXTaskN } from "@mp-assistant/common/dist/work/task/index.js";
+import { TaskType, WXTaskN } from "@mp-assistant/common/dist/work/task/index.js";
 /**
@@ -24,4 +24,4 @@ * 发布小程序任务
     getQrcodePath(): Promise<boolean>;
-    protected _executor(browserContent: BrowserContext): Promise<TaskExecResult>;
+    protected _start(browserContent: BrowserContext): Promise<void>;
 }
 //# sourceMappingURL=ReleaseTask.d.ts.map

dist/worker/wx/task/ReleaseTask.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"ReleaseTask.d.ts","sourceRoot":"","sources":["../../../../src/worker/wx/task/ReleaseTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAW,IAAI,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAc,QAAQ,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AAM7G;;;GAGG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACvC,QAAQ,CAAC,IAAI,uBAAuB;IAEpC,OAAO,CAAC,uBAAuB,CAAc;IAC7C,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,gBAAgB,CAAkB;IAE1C,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC;gBAGjC,OAAO,EAAE,OAAO,CAAC,kBAAkB;IAK/C,IAAI,IAAI,OAAO,CAAC,WAAW;cASX,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,GAAE,MAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCvF;;;;OAIG;IACG,aAAa;cAuCH,SAAS,CAAC,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;CAyIrF"}
+{"version":3,"file":"ReleaseTask.d.ts","sourceRoot":"","sources":["../../../../src/worker/wx/task/ReleaseTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAc,QAAQ,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AAM7F;;;GAGG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACvC,QAAQ,CAAC,IAAI,uBAAuB;IAEpC,OAAO,CAAC,uBAAuB,CAAc;IAC7C,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,gBAAgB,CAAkB;IAE1C,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC;gBAEjC,OAAO,EAAE,OAAO,CAAC,kBAAkB;IAK/C,IAAI,IAAI,OAAO,CAAC,WAAW;cASX,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,GAAE,MAAe;IAuCvE;;;;OAIG;IACG,aAAa;cAuCH,MAAM,CAAC,cAAc,EAAE,cAAc;CAsHxD"}

dist/worker/wx/task/ReleaseTask.js

@@ -101,3 +101,3 @@ import { BaseWXTask } from "./BaseWXTask.js";
     }
-    async _executor(browserContent) {
+    async _start(browserContent) {
         const page = await this._switchMP(browserContent);
@@ -117,17 +117,11 @@ await page.goto(`${WXMP_VERSION_MANAGEMENT_URL}${new URL(page.url()).search}`);
             if (!positioner || !positioner?.length) {
-                return {
-                    status: TaskStatus.FAILED,
-                    data: null,
+                return this._complete(TaskStatus.FAILED, {
                     msg: "缺少相关参数",
-                    endTimestamp: Date.now(),
-                };
+                });
             }
             // 判断线上版本是否与即将发布的版本一致
             if (onlineVersion && versionSatisfy(onlineVersion, positioner)) {
-                return {
-                    status: TaskStatus.FAILED,
-                    data: null,
+                return this._complete(TaskStatus.FAILED, {
                     msg: "当前预发布版本和线上版本一致，无需发布",
-                    endTimestamp: Date.now(),
-                };
+                });
             }
@@ -150,8 +144,5 @@ // 判断是否有可发布的版本
                 });
-                return {
-                    status: TaskStatus.FAILED,
-                    data: null,
+                return this._complete(TaskStatus.FAILED, {
                     msg: "暂无可发布的版本",
-                    endTimestamp: Date.now(),
-                };
+                });
             }
@@ -161,8 +152,5 @@ // 判断可发布的版本是否为目标版本
             if (!isCurrentAuditTarget) {
-                return {
-                    status: TaskStatus.FAILED,
-                    data: null,
+                return this._complete(TaskStatus.FAILED, {
                     msg: "未找到可发布版本",
-                    endTimestamp: Date.now(),
-                };
+                });
             }
@@ -185,8 +173,5 @@ this._addRunningReport({
             if (!qrCodeLoadingStatus) {
-                return {
-                    status: TaskStatus.FAILED,
-                    data: null,
+                return this._complete(TaskStatus.FAILED, {
                     msg: "二维码加载失败",
-                    endTimestamp: Date.now(),
-                };
+                });
             }
@@ -204,14 +189,10 @@ this._addRunningReport({
             });
-            return {
-                status: TaskStatus.COMPLETED,
-                endTimestamp: Date.now(),
-            };
+            return this._complete(TaskStatus.COMPLETED, {
+                msg: "发布成功",
+            });
         }
         catch (error) {
-            return {
-                status: TaskStatus.FAILED,
-                data: null,
+            return this._complete(TaskStatus.FAILED, {
                 msg: JSON.stringify(error),
-                endTimestamp: Date.now(),
-            };
+            });
         }
@@ -218,0 +199,0 @@ finally {

dist/worker/wx/WXWorker.js

@@ -55,3 +55,3 @@ import { BaseWorker } from "../BaseWorker.js";
         if (currentRunningTask.status === TaskStatus.NOT_STARTED) {
-            currentRunningTask.run(this.browserContent);
+            currentRunningTask.start(this.browserContent);
         }
@@ -58,0 +58,0 @@ /**

package.json

 {
   "name": "@mp-assistant/core",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "",
@@ -11,4 +11,4 @@ "main": "index.js",
   "devDependencies": {
-    "@mp-assistant/configuration": "0.1.10",
-    "@mp-assistant/scripts": "0.1.10"
+    "@mp-assistant/configuration": "0.1.11",
+    "@mp-assistant/scripts": "0.1.11"
   },
@@ -23,3 +23,3 @@ "repository": {
     "playwright": "^1.58.2",
-    "@mp-assistant/common": "0.1.10"
+    "@mp-assistant/common": "0.1.11"
   },
@@ -26,0 +26,0 @@ "scripts": {

No alert changes

Worsened metrics

Total package byte prevSize

68796

-1.24%

Lines of code

1499

-1.58%

Dependency changes

• + Added

  @mp-assistant/common@0.1.11
  (transitive)

• - Removed

  @mp-assistant/common@0.1.10
  (transitive)

• Updated

  @mp-assistant/common@0.1.11