@mp-assistant/core - npm Package Compare versions

Comparing version 0.1.15 to 0.1.16

dist/worker/BaseWorker.d.ts

@@ -9,2 +9,3 @@ import { BrowserContext, LaunchOptions } from "playwright";
     private __name;
+    private __weight;
     private __browserContent;
@@ -20,2 +21,4 @@ private __taskList;
     set name(name: string);
+    get weight(): number;
+    set weight(weight: number);
     get browserContent(): BrowserContext | null;
@@ -22,0 +25,0 @@ set status(status: WorkerStatus);

dist/worker/BaseWorker.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"BaseWorker.d.ts","sourceRoot":"","sources":["../../src/worker/BaseWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAY,aAAa,EAAE,MAAM,YAAY,CAAC;AAIrE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAa,MAAM,yCAAyC,CAAC;AAC/H,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAInE,8BAAsB,UAAU;IAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC;IAE3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAE/B,OAAO,CAAC,MAAM,CAAc;IAE5B,OAAO,CAAC,gBAAgB,CAA+B;IAEvD,OAAO,CAAC,UAAU,CAAkB;IAEpC,OAAO,CAAC,QAAQ,CAAsC;IAEtD,OAAO,CAAC,uBAAuB,CAAM;IAErC,OAAO,CAAC,uBAAuB,CAAkB;IAEjD,WAAW;IACX,OAAO,CAAC,UAAU,CAAgB;IAElC,IAAI,GAAG,WAEN;IAED,IAAI,IAAI,IAIO,MAAM,CAFpB;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAEpB;IAED,IAAI,cAAc,0BAEjB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,YAAY,EAM9B;IAED,IAAI,MAAM,IARS,YAAY,CAU9B;IAED,IAAI,QAAQ,eAEX;IAED,IAAI,kBAAkB,yBAErB;IACD,IAAI,qBAAqB,IAGM,MAAM,CADpC;IACD,IAAI,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAEpC;gBAEW,OAAO,EAAE,iBAAiB;IAQtC,IAAI,IAAI,YAAY;IAWd,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC;IAWnD;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,QAAQ;IAOtB;;;OAGG;IACG,UAAU,CAAC,OAAO,EAAE,MAAM;IAehC,eAAe;IAQT,OAAO;YAyBC,WAAW;cAcT,UAAU;IAyB1B,UAAU,CAAC,IAAI,EAAE,MAAM;IAQvB,UAAU,CAAC,IAAI,EAAE,MAAM;IAMvB,SAAS,CAAC,IAAI,EAAE,MAAM;IAItB,WAAW,CAAC,CAAC,SAAS,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IAIpF,OAAO,CAAC,4BAA4B,CAA8C;IAClF;;;OAGG;IACH,qBAAqB;IASrB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;CACvD"}
+{"version":3,"file":"BaseWorker.d.ts","sourceRoot":"","sources":["../../src/worker/BaseWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAY,aAAa,EAAE,MAAM,YAAY,CAAC;AAIrE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAa,MAAM,yCAAyC,CAAC;AAC/H,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAInE,8BAAsB,UAAU;IAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC;IAE3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAE/B,OAAO,CAAC,MAAM,CAAc;IAE5B,OAAO,CAAC,QAAQ,CAAa;IAE7B,OAAO,CAAC,gBAAgB,CAA+B;IAEvD,OAAO,CAAC,UAAU,CAAkB;IAEpC,OAAO,CAAC,QAAQ,CAAsC;IAEtD,OAAO,CAAC,uBAAuB,CAAM;IAErC,OAAO,CAAC,uBAAuB,CAAkB;IAEjD,WAAW;IACX,OAAO,CAAC,UAAU,CAAgB;IAElC,IAAI,GAAG,WAEN;IAED,IAAI,IAAI,IAIO,MAAM,CAFpB;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAEpB;IAED,IAAI,MAAM,IAIS,MAAM,CAFxB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAExB;IAED,IAAI,cAAc,0BAEjB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,YAAY,EAM9B;IAED,IAAI,MAAM,IARS,YAAY,CAU9B;IAED,IAAI,QAAQ,eAEX;IAED,IAAI,kBAAkB,yBAErB;IACD,IAAI,qBAAqB,IAGM,MAAM,CADpC;IACD,IAAI,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAEpC;gBAEW,OAAO,EAAE,iBAAiB;IAStC,IAAI,IAAI,YAAY;IAYd,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC;IAWnD;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,QAAQ;IAOtB;;;OAGG;IACG,UAAU,CAAC,OAAO,EAAE,MAAM;IAehC,eAAe;IAQT,OAAO;YAyBC,WAAW;cAcT,UAAU;IAyB1B,UAAU,CAAC,IAAI,EAAE,MAAM;IAQvB,UAAU,CAAC,IAAI,EAAE,MAAM;IAMvB,SAAS,CAAC,IAAI,EAAE,MAAM;IAItB,WAAW,CAAC,CAAC,SAAS,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IAIpF,OAAO,CAAC,4BAA4B,CAA8C;IAClF;;;OAGG;IACH,qBAAqB;IASrB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;CACvD"}

dist/worker/BaseWorker.js

@@ -14,2 +14,3 @@ import { chromium } from "playwright";
     __name = '';
+    __weight = 0;
     __browserContent = null;
@@ -31,2 +32,8 @@ __taskList = [];
     }
+    get weight() {
+        return this.__weight;
+    }
+    set weight(weight) {
+        this.__weight = Number.isFinite(weight) ? weight : 0;
+    }
     get browserContent() {
@@ -58,5 +65,6 @@ return this.__browserContent;
     constructor(options) {
-        const { key, name, wsMessageEventHandler } = options;
+        const { key, name, weight, wsMessageEventHandler } = options;
         this.__key = key ?? getUUID();
         this.__name = name ?? '';
+        this.__weight = Number.isFinite(weight) ? weight : 0;
         this.__wsMessageEventHandler = wsMessageEventHandler;
@@ -68,2 +76,3 @@ }
             name: this.name,
+            weight: this.weight,
             type: this.type,
@@ -70,0 +79,0 @@ taskList: this.taskList.map(task => task.info()),

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

 import { BrowserContext, Locator, Page } from "playwright";
 import { BaseTask } from "../../BaseTask.js";
 import { WXTaskN } from "@mp-assistant/common/dist/work/task/index.js";
+import { WXMPItem } from "@mp-assistant/common/dist/types/wx.js";
 export declare class BaseWXTask extends BaseTask {
@@ -9,2 +10,6 @@ readonly options: WXTaskN.TaskOptions;
     protected _start(browserContent: BrowserContext): void;
+    /**
+     * 根据 options.appid 从所属 worker 的小程序列表中获取完整信息
+     */
+    protected _getWXMPItem(): WXMPItem;
     protected _switchMP(browserContent: BrowserContext): Promise<Page>;
@@ -11,0 +16,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,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"}
+{"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;AAEvE,OAAO,EAAmB,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AAIlF,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;IAI/C;;OAEG;IACH,SAAS,CAAC,YAAY,IAAI,QAAQ;cASlB,SAAS,CAAC,cAAc,EAAE,cAAc;cAwFxC,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

@@ -22,3 +22,15 @@ import { BaseTask } from "../../BaseTask.js";
     }
+    /**
+     * 根据 options.appid 从所属 worker 的小程序列表中获取完整信息
+     */
+    _getWXMPItem() {
+        const worker = this._worker;
+        const wxaItem = worker?.wxaList?.find(item => item.appid === this.options.appid);
+        if (!wxaItem) {
+            throw new Error(`未找到 appid 为 ${this.options.appid} 的小程序信息`);
+        }
+        return wxaItem;
+    }
     async _switchMP(browserContent) {
+        const wxaItem = this._getWXMPItem();
         return await (new Promise(async (resolve, reject) => {
@@ -69,5 +81,5 @@ let page = null;
                 const mpItemLocator = switchAccountPanelLocator.locator(page.locator('.account_item.account_item_gap', {
-                    has: page.getByText(this.options.app_name)
+                    has: page.getByText(wxaItem.app_name)
                 }).and(page.locator('.account_item.account_item_gap', {
-                    has: page.getByText(this.options.username)
+                    has: page.getByText(wxaItem.username)
                 })));
@@ -81,3 +93,3 @@ if (!await expect(mpItemLocator).toBeVisible({ timeout: 1000 }).then(() => true, () => false)) {
                     title: '切换小程序成功',
-                    description: `切换小程序: ${this.options.app_name} - ${this.options.username}`,
+                    description: `切换小程序: ${wxaItem.app_name} - ${wxaItem.username}`,
                     timestamp: Date.now(),
@@ -84,0 +96,0 @@ images: [imageUrl],

package.json

 {
   "name": "@mp-assistant/core",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "",
@@ -11,4 +11,4 @@ "main": "index.js",
   "devDependencies": {
-    "@mp-assistant/configuration": "0.1.15",
-    "@mp-assistant/scripts": "0.1.15"
+    "@mp-assistant/scripts": "0.1.16",
+    "@mp-assistant/configuration": "0.1.16"
   },
@@ -24,3 +24,3 @@ "repository": {
     "playwright": "^1.58.2",
-    "@mp-assistant/common": "0.1.15"
+    "@mp-assistant/common": "0.1.16"
   },
@@ -27,0 +27,0 @@ "scripts": {

No alert changes

Improved metrics

Total package byte prevSize

72503

1.64%

Lines of code

1588

1.86%

Dependency changes

• + Added

  @mp-assistant/common@0.1.16
  (transitive)

• - Removed

  @mp-assistant/common@0.1.15
  (transitive)

• Updated

  @mp-assistant/common@0.1.16