wechat-mp-controller 0.2.1 → 0.3.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { LaunchOptions } from 'puppeteer-core';
-import { SubmitAuditFormType } from './type';
+import { SubmitAuditOptions } from './type';
 export type WeChatMpControllerOptions = Pick<LaunchOptions, 'headless' | 'userDataDir'>;
 export declare class WeChatMpController {
     static create(options?: WeChatMpControllerOptions): Promise<Controller>;
@@ -8,6 +8,7 @@ export declare class Controller {
     private browser;
     private page;
     private _isLogin;
+    private getLoginQrCodeTask;
     init(options?: WeChatMpControllerOptions): Promise<void>;
     isLogin(): boolean;
     close(): Promise<void>;
@@ -36,11 +37,5 @@ export declare class Controller {
             isExperience: boolean;
         }[];
     }>;
-    submitAudit(options: {
-        formData: SubmitAuditFormType;
-        uploader: {
-            name: string;
-            openId: string;
-        };
-    }): Promise<void>;
+    submitAudit(options: SubmitAuditOptions): Promise<void>;
 }

package/dist/index.js

@@ -8,6 +8,7 @@ export class WeChatMpController {
     return controller;
   }
 }
+const WAIT_TIMEOUT = 30 * 1000;
 export class Controller {
   _isLogin = false;
   async init(options) {
@@ -18,6 +19,18 @@ export class Controller {
       ...options
     });
     this.page = await this.browser.newPage();
+    this.getLoginQrCodeTask = new Promise(resolve => {
+      const listener = res => {
+        if (res.url().includes('/scanloginqrcode?action=getqrcode')) {
+          resolve(res);
+          this.page?.off('response', listener);
+        }
+      };
+      this.page?.on('response', listener);
+      setTimeout(() => {
+        this.page?.off('response', listener);
+      }, WAIT_TIMEOUT);
+    });
     await this.page.goto(`https://mp.weixin.qq.com/`);
     this._isLogin = await Promise.race([this.page.waitForSelector(`.login__type__container__scan__qrcode`).then(() => false), this.page.waitForSelector('#menuBar .menu').then(() => true)]);
     return;
@@ -43,8 +56,8 @@ export class Controller {
         break;
       }
     }
-    const imgResponse = await this.page.waitForResponse(src);
-    const buffer = await imgResponse.buffer();
+    const loginQrCodeRes = await this.getLoginQrCodeTask;
+    const buffer = await loginQrCodeRes.buffer();
     const loginLink = await analyzeQrCodeImgBuffer(buffer);
     let _qrcode = '';
     await new Promise(resolve => {
@@ -116,7 +129,8 @@ export class Controller {
     }
     const {
       formData,
-      uploader
+      uploader,
+      onUpload
     } = options;
     const searchParams = new URLSearchParams({
       action: 'get_class',
@@ -132,11 +146,33 @@ export class Controller {
     }
     if (formData.imageUrls?.length || formData.videoUrl) {
       const [imageUploader, videoUploader] = await this.page.$$('.webuploader-container input');
+      const uploadResponseHandles = [];
       if (formData.imageUrls?.length) {
-        await imageUploader.uploadFile(...formData.imageUrls);
+        for (let A = 0; A < formData.imageUrls.length; ++A) {
+          await imageUploader.uploadFile(formData.imageUrls[A]);
+          uploadResponseHandles.push(this.page.waitForResponse(res => {
+            return res.url().includes('https://mp.weixin.qq.com/cgi-bin/filetransfer');
+          }).then(response => {
+            return onUpload?.({
+              filePath: formData.imageUrls[A],
+              response
+            });
+          }));
+        }
       }
       if (formData.videoUrl) {
         await videoUploader.uploadFile(formData.videoUrl);
+        uploadResponseHandles.push(this.page.waitForResponse(res => {
+          return res.url().includes('https://mp.weixin.qq.com/cgi-bin/filetransfer');
+        }).then(response => {
+          return onUpload?.({
+            filePath: formData.videoUrl,
+            response
+          });
+        }));
+      }
+      if (uploadResponseHandles.length) {
+        await Promise.all(uploadResponseHandles);
       }
     }
     await this.page.locator('.btn.btn_primary[data-msgid="提交审核"]').click();

package/dist/type.d.ts

@@ -1,3 +1,4 @@
+import { HTTPResponse } from 'puppeteer-core';
 export type VersionInfo = {
     uploader: {
         name: string;
@@ -64,3 +65,14 @@ export type SubmitAuditFormType = {
     imageUrls?: string[];
     videoUrl?: string;
 };
+export type SubmitAuditOptions = {
+    formData: SubmitAuditFormType;
+    uploader: {
+        name: string;
+        openId: string;
+    };
+    onUpload?: (data: {
+        filePath: string;
+        response: HTTPResponse;
+    }) => Promise<void>;
+};

package/dist/utils.d.ts

@@ -1,2 +1,3 @@
-export declare const analyzeQrCodeImgBuffer: (buffer: Buffer) => Promise<string>;
+import { Jimp } from 'jimp';
+export declare const analyzeQrCodeImgBuffer: (buffer: Parameters<typeof Jimp.read>[0]) => Promise<string>;
 export declare const wait: (duration: number) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechat-mp-controller",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "",
   "type": "module",
   "license": "MIT",
@@ -30,6 +30,7 @@
   "author": "ArcherCube",
   "dependencies": {
     "jimp": "^1.6.0",
+    "node-fetch": "^3.3.2",
     "puppeteer-core": "^24.22.0",
     "qrcode-reader": "^1.0.4",
     "qrcode-terminal": "^0.12.0"