@quicktvui/web-cli 1.0.0-beta.37 → 1.0.0-beta.39

package/bin/qt-web-cli.js

@@ -119,6 +119,9 @@ async function main() {
 
   // 入口候选列表
   const entryCandidates = [
+    { name: 'webMain (package.json)', path: pkg.webMain, type: 'web' },
+    { name: 'src/main-web.ts', path: './src/main-web.ts', type: 'web' },
+    { name: 'src/main-web.js', path: './src/main-web.js', type: 'web' },
     { name: 'src/main-native.ts', path: './src/main-native.ts', type: 'package' },
     { name: 'src/main-native.js', path: './src/main-native.js', type: 'package' },
     { name: 'src/main.ts', path: './src/main.ts', type: 'package' },
@@ -139,6 +142,8 @@ async function main() {
 
   if (!mainEntry) {
     signale.error('无法找到有效的入口文件，请检查以下路径:')
+    signale.error('  - package.json 中的 webMain 字段')
+    signale.error('  - src/main-web.ts 或 src/main-web.js')
     signale.error('  - src/main-native.ts 或 src/main-native.js')
     signale.error('  - src/main.ts 或 src/main.js')
     signale.error('  - package.json 中的 main 字段')
@@ -183,10 +188,9 @@ function startDevServer(configPath, port, shouldOpen) {
   const WebpackDevServer = require('webpack-dev-server')
   const config = require(configPath)
 
-  // 确保 devServer 配置正确
   config.devServer = config.devServer || {}
   config.devServer.port = port
-  config.devServer.open = false // 我们自己控制浏览器打开
+  config.devServer.open = false
 
   const compiler = webpack(config)
   const server = new WebpackDevServer(config.devServer, compiler)
@@ -198,14 +202,12 @@ function startDevServer(configPath, port, shouldOpen) {
     }
     signale.success(`开发服务器已启动: http://localhost:${port}`)
 
-    // 打开浏览器
     if (shouldOpen) {
       const url = `http://localhost:${port}`
-      openOrRefreshBrowser(url)
+      openBrowser(url)
     }
   })
 
-  // 处理退出信号
   process.on('SIGINT', () => {
     server.stopCallback(() => {
       signale.info('开发服务器已停止')
@@ -251,41 +253,79 @@ function waitForServer(url, timeout = 30000) {
 }
 
 /**
- * 打开或刷新浏览器（支持 macOS）
+ * 打开浏览器
  */
-function openOrRefreshBrowser(url) {
+function openBrowser(url) {
   const platform = process.platform
+  if (platform === 'darwin' && focusExistingBrowserPage(url)) {
+    signale.success('已切换到已打开的浏览器页面')
+    return
+  }
+  const command =
+    platform === 'darwin'
+      ? `open "${url}"`
+      : platform === 'win32'
+        ? `cmd /c start "" "${url}"`
+        : `xdg-open "${url}"`
+  const result = exec(command, { silent: true })
+
+  if (result.code === 0) {
+    signale.success('已打开浏览器')
+    return
+  }
+
+  signale.warn(`自动打开浏览器失败，请手动访问: ${url}`)
+}
 
-  if (platform === 'darwin') {
-    // macOS: 使用 AppleScript 检查并刷新已存在的标签页
-    const appleScript = `
+function focusExistingBrowserPage(url) {
+  const match = /^https?:\/\/[^/]+/.exec(url)
+  const targetPrefix = match ? match[0] : url
+  const browserApps = ['Google Chrome', 'Safari', 'Arc', 'Microsoft Edge', 'Brave Browser']
+  const script = `
+set targetPrefix to "${escapeAppleScriptString(targetPrefix)}"
+set browserApps to {${browserApps.map((app) => `"${escapeAppleScriptString(app)}"`).join(', ')}}
+repeat with appName in browserApps
+  tell application "System Events"
+    set isRunning to (name of processes) contains (appName as text)
+  end tell
+  if isRunning then
+    if (appName as text) is "Safari" then
       tell application "Safari"
-        activate
-        set found to false
         repeat with w in windows
           repeat with t in tabs of w
-            if URL of t starts with "http://localhost:" then
-              set URL of t to "${url}"
-              set found to true
-              exit repeat
+            if URL of t starts with targetPrefix then
+              set current tab of w to t
+              set index of w to 1
+              activate
+              return "FOUND"
             end if
           end repeat
-          if found then exit repeat
         end repeat
-        if not found then
-          open location "${url}"
-        end if
       end tell
-    `
+    else
+      tell application (appName as text)
+        repeat with w in windows
+          repeat with t in tabs of w
+            if URL of t starts with targetPrefix then
+              set active tab index of w to (index of t)
+              set index of w to 1
+              activate
+              return "FOUND"
+            end if
+          end repeat
+        end repeat
+      end tell
+    end if
+  end if
+end repeat
+return "NOT_FOUND"
+  `.trim()
+  const result = exec(`osascript <<'APPLESCRIPT'\n${script}\nAPPLESCRIPT`, { silent: true })
+  return result.code === 0 && String(result.stdout || '').includes('FOUND')
+}
 
-    exec(`osascript -e '${appleScript.replace(/\n/g, ' ')}'`, { silent: true })
-    signale.success('已打开/刷新浏览器')
-  } else {
-    // 其他平台：直接打开 URL
-    const openCmd = platform === 'win32' ? 'start' : 'xdg-open'
-    exec(`${openCmd} "${url}"`, { silent: true })
-    signale.success('已打开浏览器')
-  }
+function escapeAppleScriptString(value) {
+  return String(value).replace(/\\/g, '\\\\').replace(/"/g, '\\"')
 }
 
 function findProjectRoot(startDir = process.cwd()) {

package/lib/webpack.config.js

@@ -10,6 +10,7 @@ const fs = require('fs')
 const projectRoot = process.env.QUICKTVUI_PROJECT_ROOT || process.cwd()
 const mainEntry = process.env.QUICKTVUI_MAIN_ENTRY || path.resolve(projectRoot, 'src/main.ts')
 const port = parseInt(process.env.QUICKTVUI_PORT || '39001', 10)
+const watchPoll = parseInt(process.env.QUICKTVUI_WATCH_POLL || '1000', 10)
 
 // 尝试加载项目的 package.json
 let pkg = {}
@@ -114,7 +115,13 @@ module.exports = {
 
   devServer: {
     port,
-    hot: true,
+    hot: false,
+    liveReload: true,
+    headers: {
+      'Cache-Control': 'no-store, no-cache, must-revalidate, proxy-revalidate',
+      Pragma: 'no-cache',
+      Expires: '0',
+    },
     proxy: [
       {
         context: ['/proxy'],
@@ -149,7 +156,7 @@ module.exports = {
 
   watchOptions: {
     aggregateTimeout: 1500,
-    poll: 1000,
+    poll: watchPoll,
     ignored: /node_modules/,
   },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quicktvui/web-cli",
-  "version": "1.0.0-beta.37",
+  "version": "1.0.0-beta.39",
   "description": "CLI tool for QuickTVUI web development - zero configuration",
   "author": "QuickTVUI Team",
   "license": "Apache-2.0",