@quicktvui/web-cli 1.0.0-beta.14 → 1.0.0-beta.16

package/bin/qt-web-cli.js

@@ -23,7 +23,7 @@ const args = minimist(process.argv.slice(2), {
   },
   default: {
     port: 39001,
-    open: false,
+    open: true,
   },
 })
 
@@ -122,13 +122,22 @@ async function main() {
 
   // 构建 webpack 命令
   const webpackArgs = ['serve', `--config "${webpackConfigPath}"`, `--port ${args.port}`, '--color']
-  if (args.open) webpackArgs.push('--open')
 
   const envPrefix = nodeOptions ? `NODE_OPTIONS="${nodeOptions}" ` : ''
   const webpackCmd = `${envPrefix}npx webpack ${webpackArgs.join(' ')}`
 
   signale.pending(`执行: ${webpackCmd}`)
 
+  // 如果需要打开浏览器，等待服务器就绪后打开
+  if (args.open) {
+    const url = `http://localhost:${args.port}`
+    waitForServer(url, 30000).then(() => {
+      openOrRefreshBrowser(url)
+    }).catch((err) => {
+      signale.warn(`自动打开浏览器失败: ${err.message}`)
+    })
+  }
+
   const result = exec(webpackCmd, { stdio: 'inherit' })
   if (result.code !== 0) {
     signale.error('启动开发服务器失败')
@@ -136,6 +145,80 @@ async function main() {
   }
 }
 
+/**
+ * 等待服务器就绪
+ */
+function waitForServer(url, timeout = 30000) {
+  const http = require('http')
+  const startTime = Date.now()
+
+  return new Promise((resolve, reject) => {
+    function check() {
+      if (Date.now() - startTime > timeout) {
+        reject(new Error('等待服务器超时'))
+        return
+      }
+
+      const req = http.get(url, (res) => {
+        if (res.statusCode === 200 || res.statusCode === 304) {
+          resolve()
+        } else {
+          setTimeout(check, 500)
+        }
+      })
+
+      req.on('error', () => {
+        setTimeout(check, 500)
+      })
+
+      req.setTimeout(1000, () => {
+        req.destroy()
+        setTimeout(check, 500)
+      })
+    }
+
+    check()
+  })
+}
+
+/**
+ * 打开或刷新浏览器（支持 macOS）
+ */
+function openOrRefreshBrowser(url) {
+  const platform = process.platform
+
+  if (platform === 'darwin') {
+    // macOS: 使用 AppleScript 检查并刷新已存在的标签页
+    const appleScript = `
+      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
+            end if
+          end repeat
+          if found then exit repeat
+        end repeat
+        if not found then
+          open location "${url}"
+        end if
+      end tell
+    `
+
+    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 findProjectRoot(startDir = process.cwd()) {
   let currentDir = startDir
   while (currentDir !== path.dirname(currentDir)) {

package/lib/webpack.config.js

@@ -66,6 +66,20 @@ function detectModules() {
   if (fs.existsSync(cwdNodeModules) && !modules.includes(cwdNodeModules)) {
     modules.push(cwdNodeModules)
   }
+  // 添加 web-cli 自身的 node_modules 路径（支持全局安装）
+  const cliNodeModules = path.resolve(__dirname, '../node_modules')
+  if (fs.existsSync(cliNodeModules) && !modules.includes(cliNodeModules)) {
+    modules.push(cliNodeModules)
+  }
+  // 添加全局 node_modules 路径
+  try {
+    const globalNodeModules = require('child_process')
+      .execSync('npm root -g', { encoding: 'utf-8' })
+      .trim()
+    if (fs.existsSync(globalNodeModules) && !modules.includes(globalNodeModules)) {
+      modules.push(globalNodeModules)
+    }
+  } catch (e) {}
   return modules
 }
 

package/package.json

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