feat: 新增force-submit选项

Author: phk422

README.md

@@ -34,6 +34,7 @@ Options:
   -V, --version               output the version number
   -p, --platform <platform>   操作的平台 (choices: "weixin", "alipay")
   -a, --action <action>       提审或者发布 (choices: "review", "release")
+  -f, --force-submit          如果存在【审核中】或【审核通过】的版本，这将强制提交新的审核版本 (choices: "true", "false")
   -hl, --headless [headless]  浏览器无头模式 (choices: "false", "new", default: "new")
   -h, --help                  display help for command
 ```

src/constants/index.ts

@@ -15,6 +15,11 @@ export enum ACTION {
   RELEASE = 'release',
 }
 
+export enum BOOL {
+  TRUE = 'true',
+  FALSE = 'false',
+}
+
 export const VIEWPORT: Viewport = { width: 1920, height: 1080, deviceScaleFactor: 1.5 }
 
 export const __DEV__ = process.env.NODE_ENV === 'development'

src/core/index.ts

@@ -2,7 +2,7 @@ import { bgGreen, blue, green, red, reset } from 'kolorist'
 import prompts from 'prompts'
 import { ACTION, PLATFORM } from '../constants'
 import weixinRobot from '../weixin'
-import { isEmpty } from '../utils'
+import { isEmpty, onCancel } from '../utils'
 
 export default async function main(options: InputOptions) {
   const result: prompts.Answers<
@@ -31,9 +31,7 @@ export default async function main(options: InputOptions) {
     },
   ],
   {
-    onCancel: () => {
-      throw new Error(`${red('✖')} Operation cancelled`)
-    },
+    onCancel,
   },
 )
   const opts = {

src/index.ts

@@ -1,11 +1,12 @@
 import { Option, program } from 'commander'
-import { ACTION, PLATFORM, description, name, version } from './constants'
+import { ACTION, BOOL, PLATFORM, description, name, version } from './constants'
 import main from './core'
 import { handleOptions } from './utils'
 
 program.name(name).version(version).description(description)
   .addOption(new Option('-p, --platform <platform>', '操作的平台').choices(Object.values(PLATFORM)))
   .addOption(new Option('-a, --action <action>', '提审或者发布').choices(Object.values(ACTION)))
+  .addOption(new Option('-f, --force-submit', '如果存在【审核中】或【审核通过】的版本，这将强制提交新的审核版本').default(BOOL.FALSE).choices(Object.values(BOOL)))
   .addOption(new Option('-hl, --headless [headless]', '浏览器无头模式').default('new').choices(['false', 'new']))
 
 program.parse()

src/types/index.d.ts

@@ -1,10 +1,11 @@
 import type { PuppeteerLaunchOptions } from 'puppeteer'
-import type { ACTION, PLATFORM } from '../constants'
+import type { ACTION, BOOL, PLATFORM } from '../constants'
 
 declare global {
   interface InputOptions {
     platform: PLATFORM
     action: ACTION
     headless: PuppeteerLaunchOptions['headless']
+    forceSubmit: BOOL
   }
 }

src/utils/index.ts

@@ -4,6 +4,7 @@ import { fileURLToPath } from 'node:url'
 import qrcodeTerminal from 'qrcode-terminal'
 import jsqr from 'jsqr'
 import UPNG from 'upng-js'
+import { red } from 'kolorist'
 
 export const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
@@ -75,5 +76,10 @@ export function transBooleanStrToBool(value: string) {
 
 export function handleOptions(opts: InputOptions) {
   opts.headless = transBooleanStrToBool(opts.headless as string) as never
+  opts.forceSubmit = transBooleanStrToBool(opts.forceSubmit as string) as never
   return opts
 }
+
+export function onCancel() {
+  throw new Error(`${red('✖')} Operation cancelled`)
+}

src/weixin/index.ts

@@ -4,8 +4,9 @@ import type { Browser, Page } from 'puppeteer'
 import puppeteer from 'puppeteer'
 import type { Ora } from 'ora'
 import ora from 'ora'
+import prompts from 'prompts'
 import { ACTION, VIEWPORT, WEIXIN_URL, __DEV__ } from '../constants'
-import { pathResolve, showQrCodeToTerminal, sleep } from '../utils'
+import { onCancel, pathResolve, showQrCodeToTerminal, sleep } from '../utils'
 
 let browser: Browser
 let page: Page
@@ -73,18 +74,47 @@ export async function jumpToVersions() {
  * 跳转确认提交审核界面
  */
 export async function jumpToConfirmPage() {
-  const submitReviewBtn = await page.waitForSelector('.mod_default_box.code_version_dev .weui-desktop-btn.weui-desktop-btn_primary')
+  const submitReviewBtnSelector = '.mod_default_box.code_version_dev .weui-desktop-btn.weui-desktop-btn_primary'
+  let submitReviewBtn = await page.waitForSelector(submitReviewBtnSelector)
   if (!submitReviewBtn) {
     spinner.fail('未找到提交审核按钮')
     throw new Error('未找到提交审核按钮')
   }
+  const isSubmitReviewBtnDisabled = await submitReviewBtn.evaluate(btn => btn.classList.contains('weui-desktop-btn_disabled'))
   // 判断是否有提交审核中的版本
   const testVersion = await page.$('.mod_default_bd.default_box.test_version')
   if (testVersion && !await testVersion.evaluate(el => el.textContent?.includes('你暂无提交审核的版本或者版本已发布上线'))) {
-    spinner.warn('存在提交审核中的版本')
-    throw new Error('存在提交审核中的版本')
+    if (!options.forceSubmit) {
+      spinner.stop()
+      const result: prompts.Answers<'forceSubmit'> = await prompts([
+        {
+          type: 'confirm',
+          name: 'forceSubmit',
+          message: '当前已存在版本，是否继续强制提交审核？',
+          initial: false,
+        },
+      ], {
+        onCancel,
+      })
+      if (!result.forceSubmit)
+        throw new Error('退出提审')
+      else
+        spinner.start()
+    }
+  }
+  if (isSubmitReviewBtnDisabled) {
+    // 撤回
+    await page.evaluate(() => {
+      const el: HTMLButtonElement | null = document.querySelector('.mod_default_bd.default_box.test_version .weui-desktop-dropdown__list-ele__text')
+      el!.click()
+    })
+    await sleep()
+    const confirm = await page.$('body > div:nth-child(9) > div.weui-desktop-dialog__wrp.self-weui-modal > div > div.weui-desktop-dialog__ft > div > div:nth-child(2) > button')
+    await confirm?.click()
+    await sleep(2000)
+    submitReviewBtn = await page.waitForSelector(submitReviewBtnSelector)
   }
-  await submitReviewBtn.click()
+  await submitReviewBtn!.click()
   await sleep(1200) // 可能会报错
   spinner.start('正在提交审核中...')
   const agreeCheckbox = await page.waitForSelector('.weui-desktop-icon-checkbox')