wechat-mp-controller 0.2.1 → 0.3.0

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>;
@@ -36,11 +36,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

@@ -116,7 +116,8 @@ export class Controller {
     }
     const {
       formData,
-      uploader
+      uploader,
+      onUpload
     } = options;
     const searchParams = new URLSearchParams({
       action: 'get_class',
@@ -132,11 +133,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechat-mp-controller",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "",
   "type": "module",
   "license": "MIT",