@sybz-components/portal-dev 1.0.9 → 1.0.10

package/README.md

@@ -178,4 +178,4 @@ pnpm portal:skill:install
 pnpm portal:release
 ```
 
-`portal:release` 会执行检查、升级 patch 版本、创建版本提交和 Git tag、发布 npm 包，最后将当前分支及 tags 推送到 Git 远端。执行前请确认当前分支、远端和工作区状态。
+`portal:release` 会检查工作区和 npm 登录状态、升级 patch 版本并公开发布到 npm。只有确认新版本能从 npm registry 查询到之后，才会创建版本提交和 `portal-dev-v<版本号>` Git tag，并将当前分支及 tags 推送到 Git 远端。发布失败时会恢复本地版本号，避免留下无法安装的空版本。执行前请先提交当前改动，并确认当前分支和远端正确。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sybz-components/portal-dev",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "成华和石景山门户自动登录与本地前端联调 CLI",
   "type": "module",
   "bin": {
@@ -22,7 +22,7 @@
   "scripts": {
     "skill:install": "node ./bin/portal-dev.mjs skill install",
     "check": "node --check bin/portal-dev.mjs && node --check src/config-file.mjs && node --check src/configure.mjs && node --check src/macos-chrome.mjs && node --check src/portal-dev.mjs && node --check src/recognize-captcha.mjs",
-    "release": "pnpm check && npm version patch && npm publish && git push --follow-tags"
+    "release": "node ./scripts/release.mjs"
   },
   "dependencies": {
     "@napi-rs/canvas": "^1.0.3",

package/src/macos-chrome.mjs

@@ -83,13 +83,15 @@ const fillAndSubmit = async (tab, { username, password, captchaText, custom }) =
         const visible = (element) => { const style = getComputedStyle(element); const rect = element.getBoundingClientRect(); return style.display !== 'none' && style.visibility !== 'hidden' && rect.width > 0 && rect.height > 0; };
         const inputs = Array.from(document.querySelectorAll('input')).filter(visible);
         const setValue = (element, value) => { const setter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value').set; setter.call(element, value); element.dispatchEvent(new Event('input', {bubbles:true})); element.dispatchEvent(new Event('change', {bubbles:true})); };
-        const usernameInput = inputs.find((input) => input.autocomplete === 'username' || ['username','account','login','user','email'].includes(input.name) || /用户名|账号|邮箱|手机/.test(input.placeholder));
-        const passwordInput = inputs.find((input) => input.autocomplete === 'current-password' || input.name === 'password' || input.type === 'password' || input.placeholder.includes('密码'));
-        const captchaInput = inputs.find((input) => /验证码/.test(input.placeholder) || /captcha|code/i.test(input.name));
-        if (!usernameInput || !passwordInput || (!${custom} && !captchaInput)) return JSON.stringify({submitted:false});
+        const attribute = (input, name) => input.getAttribute(name) || '';
+        const passwordInput = inputs.find((input) => attribute(input, 'autocomplete') === 'current-password' || /^password$/i.test(attribute(input, 'name')) || input.type === 'password' || /密码/.test(attribute(input, 'placeholder')));
+        const captchaInput = inputs.find((input) => /验证码/.test(attribute(input, 'placeholder')) || /captcha|code/i.test(attribute(input, 'name')));
+        const usernameInput = inputs.find((input) => attribute(input, 'autocomplete') === 'username' || /^(username|account|login|user|email|phone)$/i.test(attribute(input, 'name')) || /用户名|账号|邮箱|手机/.test(attribute(input, 'placeholder'))) || inputs.find((input) => input !== passwordInput && input !== captchaInput && /^(text|email|tel|number)$/.test(input.type));
+        const missing = [!usernameInput && '账号输入框', !passwordInput && '密码输入框', !${custom} && !captchaInput && '验证码输入框'].filter(Boolean);
+        if (missing.length) return JSON.stringify({submitted:false, reason:'未找到' + missing.join('、')});
         setValue(usernameInput, values.username); setValue(passwordInput, values.password); if (captchaInput) setValue(captchaInput, values.captchaText);
         const button = Array.from(document.querySelectorAll('button, input[type="submit"], [role="button"], .btn-box .btn')).filter(visible).find((element) => element.type === 'submit' || /登录|Login|Sign in/i.test(element.textContent || element.value || ''));
-        if (!button) return JSON.stringify({submitted:false}); button.click(); return JSON.stringify({submitted:true});
+        if (!button) return JSON.stringify({submitted:false, reason:'未找到登录按钮'}); button.click(); return JSON.stringify({submitted:true});
       })()`,
     ),
   )
@@ -107,7 +109,7 @@ const login = async (tab, config, recognizeCaptcha, custom) => {
       console.log(`已识别图形验证码（第 ${attempt}/3 次）`)
     }
     const result = await fillAndSubmit(tab, { ...config, captchaText, custom })
-    if (!result.submitted) throw new Error('登录表单字段不完整或未找到登录按钮')
+    if (!result.submitted) throw new Error(result.reason || '登录表单字段不完整或未找到登录按钮')
     await sleep(1800)
     const state = await pageState(tab)
     if (custom || !state.url.includes('/passport/login/')) return

package/src/portal-dev.mjs

@@ -209,6 +209,7 @@ const login = async () => {
         'input[name="username"]',
         'input[placeholder*="用户名"]',
         'input[placeholder*="账号"]',
+        'input[autocomplete="off"]:not([type="password"]):not([placeholder*="验证码"])',
       ])
       const passwordInput = await visibleLocator([
         'input[autocomplete="current-password"]',