@sybz-components/portal-dev 1.0.6 → 1.0.10

package/README.md

@@ -7,6 +7,8 @@
 - Node.js 18+
 - Google Chrome 或 Microsoft Edge
 
+macOS 会直接复用当前打开的 Google Chrome，在现有窗口中新建标签页完成登录和本地联调，不会启动独立的 Chrome 实例。Windows / Linux 使用独立浏览器实例作为兼容方案。
+
 ## 安装
 
 全局安装：
@@ -176,4 +178,4 @@ pnpm portal:skill:install
 pnpm portal:release
 ```
 
-`portal:release` 会执行检查、升级 patch 版本并发布 npm 包，执行前请确认当前分支和版本状态。
+`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.6",
+  "version": "1.0.10",
   "description": "成华和石景山门户自动登录与本地前端联调 CLI",
   "type": "module",
   "bin": {
@@ -21,8 +21,8 @@
   },
   "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/portal-dev.mjs && node --check src/recognize-captcha.mjs",
-    "release": "pnpm check && npm version patch && npm publish"
+    "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": "node ./scripts/release.mjs"
   },
   "dependencies": {
     "@napi-rs/canvas": "^1.0.3",

package/skills/portal-dev/SKILL.md

@@ -7,6 +7,8 @@ description: 启动前端项目的石景山门户本地联调，自动登录成
 
 调用已安装的 `portal-dev` CLI，不要复制或改写登录自动化逻辑。
 
+macOS 会复用用户当前打开的 Google Chrome，并在现有窗口的标签页中完成登录；不要另外启动 Chrome。Windows / Linux 使用 CLI 内置的浏览器兼容方案。
+
 ## 执行
 
 缺少账号配置时先执行：

package/src/macos-chrome.mjs

@@ -0,0 +1,171 @@
+import { execFile } from 'node:child_process'
+import { promisify } from 'node:util'
+
+const execFileAsync = promisify(execFile)
+const sleep = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds))
+const escapeAppleScript = (value) => value.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\r?\n/g, ' ')
+
+const runAppleScript = async (script) => {
+  const { stdout } = await execFileAsync('/usr/bin/osascript', ['-e', script])
+  return stdout.trim()
+}
+
+const openTab = async (url) => {
+  const result = await runAppleScript(`
+    tell application "Google Chrome"
+      activate
+      if (count windows) = 0 then make new window
+      set currentWindow to front window
+      tell currentWindow
+        set newTab to make new tab with properties {URL:"${escapeAppleScript(url)}"}
+        set active tab index to (count tabs)
+      end tell
+      return "tab id " & (id of newTab) & " of window id " & (id of currentWindow)
+    end tell
+  `)
+  const match = result.match(/tab id (\d+) of window id (\d+)/)
+  if (!match) throw new Error(`无法识别 Chrome 新标签页：${result}`)
+  return { tabId: Number(match[1]), windowId: Number(match[2]) }
+}
+
+const execute = (tab, javascript) =>
+  runAppleScript(
+    `tell application "Google Chrome" to return (execute tab id ${tab.tabId} of window id ${tab.windowId} javascript "${escapeAppleScript(javascript)}") as text`,
+  )
+
+const pageState = async (tab) =>
+  JSON.parse(
+    await execute(
+      tab,
+      `(() => JSON.stringify({url: location.href, frameUrls: Array.from(document.querySelectorAll('iframe')).map((frame) => frame.src).filter(Boolean)}))()`,
+    ),
+  )
+
+const findTargetUrl = (state, iframeHost, iframePath) =>
+  state.frameUrls
+    .map((value) => {
+      try {
+        return new URL(value, state.url)
+      } catch {
+        return undefined
+      }
+    })
+    .find((url) => url?.host === iframeHost && url.pathname.startsWith(iframePath) && url.searchParams.has('token'))
+
+const clickText = async (tab, text) =>
+  (await execute(
+    tab,
+    `(() => {
+      const label = ${JSON.stringify(text)};
+      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 candidates = Array.from(document.querySelectorAll('button, a, [role="button"], div, span')).filter((element) => visible(element) && (element.textContent || '').includes(label)).sort((a, b) => (a.textContent || '').length - (b.textContent || '').length);
+      if (!candidates[0]) return 'false'; candidates[0].click(); return 'true';
+    })()`,
+  )) === 'true'
+
+const fillSearch = async (tab, roomName) =>
+  (await execute(
+    tab,
+    `(() => {
+      const input = document.querySelector('input[placeholder*="搜索"], input[placeholder*="查找"], input[type="search"]');
+      if (!input) return 'false';
+      const setter = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value').set;
+      setter.call(input, ${JSON.stringify(roomName)}); input.dispatchEvent(new Event('input', {bubbles:true})); input.dispatchEvent(new Event('change', {bubbles:true})); return 'true';
+    })()`,
+  )) === 'true'
+
+const fillAndSubmit = async (tab, { username, password, captchaText, custom }) =>
+  JSON.parse(
+    await execute(
+      tab,
+      `(() => {
+        const values = ${JSON.stringify({ username, password, captchaText })};
+        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 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, reason:'未找到登录按钮'}); button.click(); return JSON.stringify({submitted:true});
+      })()`,
+    ),
+  )
+
+const login = async (tab, config, recognizeCaptcha, custom) => {
+  for (let attempt = 1; attempt <= (custom ? 1 : 3); attempt += 1) {
+    let captchaText = ''
+    if (!custom) {
+      const captchaUrl = await execute(
+        tab,
+        `(() => { const image = document.querySelector('img.code-img, img[class*="captcha" i], img[alt*="验证码"], img[title*="验证码"]'); return image ? (image.currentSrc || image.src || '') : ''; })()`,
+      )
+      if (!captchaUrl) throw new Error('未找到图形验证码')
+      captchaText = await recognizeCaptcha(captchaUrl)
+      console.log(`已识别图形验证码（第 ${attempt}/3 次）`)
+    }
+    const result = await fillAndSubmit(tab, { ...config, captchaText, custom })
+    if (!result.submitted) throw new Error(result.reason || '登录表单字段不完整或未找到登录按钮')
+    await sleep(1800)
+    const state = await pageState(tab)
+    if (custom || !state.url.includes('/passport/login/')) return
+    if (attempt < 3)
+      await execute(
+        tab,
+        `(() => { const image = document.querySelector('img.code-img, img[class*="captcha" i]'); if (image) image.click(); return ''; })()`,
+      )
+  }
+  throw new Error('自动登录失败，已达到最多重试次数')
+}
+
+export const runInExistingChrome = async ({
+  config,
+  devMode,
+  localOrigin,
+  localPath,
+  iframeHost,
+  iframePath,
+  roomName,
+  portal,
+  portalName,
+  recognizeCaptcha,
+}) => {
+  console.log('正在使用当前打开的 Google Chrome 登录门户。')
+  const tab = await openTab(config.loginUrl)
+  await sleep(800)
+  const state = await pageState(tab)
+  if (portal === 'custom') await login(tab, config, recognizeCaptcha, true)
+  else if (state.url.includes('/passport/login/') || portal === 'chenghua')
+    await login(tab, config, recognizeCaptcha, false)
+
+  if (!devMode) {
+    if (portal === 'chenghua') {
+      await execute(tab, `location.href = 'https://www.chenghua-ai.com/chat/pages/application'; ''`)
+    }
+    console.log(`${portalName}登录流程已完成，按 Ctrl+C 结束。`)
+    await new Promise(() => undefined)
+  }
+
+  let sampleRoomClicked = false
+  let searched = false
+  for (let index = 0; index < 180; index += 1) {
+    const currentState = await pageState(tab)
+    const targetUrl = findTargetUrl(currentState, iframeHost, iframePath)
+    if (targetUrl) {
+      const destination = new URL(`${localPath || targetUrl.pathname}${targetUrl.search}${targetUrl.hash}`, localOrigin)
+      await openTab(destination.href)
+      console.log(`门户本地调试已就绪：${localOrigin}${targetUrl.pathname}`)
+      console.log('Token 未打印、未写入文件。按 Ctrl+C 结束。')
+      return new Promise(() => undefined)
+    }
+    if (!sampleRoomClicked) sampleRoomClicked = await clickText(tab, '智能体样板间')
+    else if (!searched) searched = await fillSearch(tab, roomName)
+    else (await clickText(tab, roomName)) || (await clickText(tab, '3D智能展厅'))
+    await sleep(1000)
+  }
+  throw new Error(`未找到目标智能体入口：${roomName}`)
+}

package/src/portal-dev.mjs

@@ -4,6 +4,7 @@ import { dirname, resolve } from 'node:path'
 import { chromium } from 'playwright-core'
 import { readPortalConfig } from './config-file.mjs'
 import { recognizeCaptcha } from './recognize-captcha.mjs'
+import { runInExistingChrome } from './macos-chrome.mjs'
 
 const sleep = (milliseconds) => new Promise((resolvePromise) => setTimeout(resolvePromise, milliseconds))
 const args = process.argv.slice(2)
@@ -145,6 +146,22 @@ if (devMode && !(await isReady())) {
   if (!(await isReady())) throw new Error(`本地开发服务启动超时：${localOrigin}`)
 }
 
+if (process.platform === 'darwin') {
+  await runInExistingChrome({
+    config,
+    devMode,
+    localOrigin,
+    localPath,
+    iframeHost,
+    iframePath,
+    roomName,
+    portal,
+    portalName:
+      portal === 'custom' ? `自定义网站“${portalAccount.name}”` : `${portal === 'chenghua' ? '成华' : '石景山'}门户`,
+    recognizeCaptcha,
+  })
+}
+
 const browser = await chromium.launch({ headless: false, executablePath })
 const context = await browser.newContext()
 const page = await context.newPage()
@@ -192,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"]',