lvyjs 0.3.0-alpha.0 → 0.3.0-alpha.1

package/bin/index.js

@@ -3,6 +3,7 @@
 import { fork } from 'child_process'
 import { join, dirname, relative } from 'path'
 import { fileURLToPath } from 'node:url'
+import chokidar from 'chokidar'
 const args = [...process.argv.slice(2)]
 const currentFilePath = fileURLToPath(import.meta.url)
 const currentDirPath = dirname(currentFilePath)
@@ -23,6 +24,58 @@ const dev = () => {
 
   let devProcess = null
   let pendingRestart = false // 标记是否有重启 pending
+  let killTimeout = null // SIGKILL 超时定时器
+  let restartDebounceTimer = null // 重启防抖定时器
+  let latestConfig = null // 最新待应用的配置
+  let fileWatcher = null // chokidar watcher 实例
+  let watchDebounce = null // watch 防抖定时器
+
+  // 解析 watch 配置
+  const parseWatchConfig = data => {
+    const w = data?.watch
+    if (!w) return { paths: [], delay: 500 }
+    if (Array.isArray(w)) return { paths: w, delay: 500 }
+    if (typeof w === 'object' && w.paths) {
+      return { paths: w.paths, delay: w.delay || 500 }
+    }
+    return { paths: [], delay: 500 }
+  }
+
+  // 关闭 watcher
+  const closeFileWatcher = async () => {
+    if (watchDebounce) {
+      clearTimeout(watchDebounce)
+      watchDebounce = null
+    }
+    if (fileWatcher) {
+      await fileWatcher.close()
+      fileWatcher = null
+    }
+  }
+
+  // 启动 watch 监听（支持 glob 模式，如 'src/**/*.{ts,tsx}'）
+  const startFileWatcher = data => {
+    closeFileWatcher()
+    const { paths, delay } = parseWatchConfig(data)
+    if (paths.length === 0) return
+
+    fileWatcher = chokidar.watch(paths, {
+      cwd: process.cwd(),
+      ignoreInitial: true,
+      ignored: /(^|[\/\\])\../ // 忽略点文件
+    })
+
+    fileWatcher.on('all', (_event, filePath) => {
+      if (watchDebounce) clearTimeout(watchDebounce)
+      watchDebounce = setTimeout(() => {
+        watchDebounce = null
+        console.info(`[lvyjs] 监听到文件变化: ${filePath}，正在重启...`)
+        doRestart(latestConfig || data)
+      }, delay)
+    })
+
+    fileWatcher.on('ready', () => {})
+  }
 
   // 启动开发进程
   const startDevProcess = data => {
@@ -31,6 +84,12 @@ const dev = () => {
     const envConfig = data?.env || {}
     // 前面1个被占用，剩余参数
     const restArgs = args.slice(1)
+
+    // 如果支持，得到 watch 配置，启动watch。
+    // 当watch的配置发生变化时，重启开发进程
+    // 复用当前的重启逻辑。
+    startFileWatcher(data)
+
     devProcess = fork(indexFileDir, restArgs, {
       stdio: 'inherit',
       execArgv: [
@@ -67,11 +126,31 @@ const dev = () => {
     })
   }
 
-  // 优雅重启开发进程
+  // 优雅重启开发进程（带防抖，避免密集重启）
   const restartDevProcess = newConfig => {
+    // 保存最新配置，防抖后使用
+    latestConfig = newConfig
+
+    if (restartDebounceTimer) clearTimeout(restartDebounceTimer)
+    restartDebounceTimer = setTimeout(() => {
+      restartDebounceTimer = null
+      doRestart(latestConfig)
+    }, 500)
+  }
+
+  const doRestart = config => {
+    // 关闭旧的文件监听
+    closeFileWatcher()
+
     if (!devProcess) {
       // 没有运行中的进程，直接启动
-      startDevProcess(newConfig)
+      startDevProcess(config)
+      return
+    }
+
+    // 如果已经在等待重启，只更新配置，不重复 kill
+    if (pendingRestart) {
+      latestConfig = config
       return
     }
 
@@ -80,15 +159,22 @@ const dev = () => {
 
     // 监听退出事件，确保旧进程完全结束后再启动新进程
     devProcess.once('exit', () => {
+      // 清除 SIGKILL 超时定时器
+      if (killTimeout) {
+        clearTimeout(killTimeout)
+        killTimeout = null
+      }
       pendingRestart = false
-      startDevProcess(newConfig)
+      // 使用最新的配置启动
+      startDevProcess(latestConfig || config)
     })
 
     // 发送终止信号
     devProcess.kill('SIGTERM')
 
     // 超时保护：如果 5 秒后还没退出，强制杀掉
-    setTimeout(() => {
+    killTimeout = setTimeout(() => {
+      killTimeout = null
       if (devProcess && !devProcess.killed) {
         console.info('[lvyjs] 开发进程无响应，强制终止')
         devProcess.kill('SIGKILL')
@@ -131,6 +217,7 @@ const dev = () => {
   // 处理主进程退出
   process.on('SIGINT', () => {
     console.log('\n[lvyjs] 正在退出...')
+    closeFileWatcher()
     if (devProcess) devProcess.kill()
     if (readConfigFork) readConfigFork.kill()
     process.exit(0)

package/lib/assets/236e80b2c76c39f6fcf00d05ec8357c2.css

@@ -1,4 +1,7 @@
-.warning, .error, .success, .message {
+.warning,
+.error,
+.success,
+.message {
   border: 1px solid #ccc;
   padding: 10px;
   color: #333;
@@ -17,13 +20,13 @@
 }
 
 .info {
-  background: #A9A9A9;
+  background: #a9a9a9;
   box-shadow: 0 0 1px rgba(169, 169, 169, 0.25);
   color: #fff;
 }
 
 .alert {
-  background: #8B0000;
+  background: #8b0000;
   box-shadow: 0 0 1px rgba(139, 0, 0, 0.25);
   color: #fff;
 }
@@ -32,4 +35,4 @@
   background: #006400;
   box-shadow: 0 0 1px rgba(0, 100, 0, 0.25);
   color: #fff;
-}
+}

package/lib/assets/ff44ec490241107927aa7b6853fdb1fb.css

@@ -24,7 +24,10 @@ body {
   border-color: yellow;
 }
 
-.warning, .error, .success, .message {
+.warning,
+.error,
+.success,
+.message {
   border: 1px solid #ccc;
   padding: 10px;
   color: #333;
@@ -52,4 +55,4 @@ body {
   background: #8b0000;
   box-shadow: 0 0 1px rgba(139, 0, 0, 0.25);
   color: #fff;
-}
+}

package/lib/readConfig.js

@@ -56,11 +56,17 @@ const main = async () => {
     };
     // 首次发送
     await sendConfig();
-    // 监听文件变化
+    // 监听文件变化（带防抖，避免多次触发）
+    let debounceTimer = null;
     watch(process.cwd(), (_event, filename) => {
         if (files.includes(filename)) {
-            console.info(`[lvyjs] 配置文件 ${filename} 已变化，重新加载...`);
-            sendConfig();
+            if (debounceTimer)
+                clearTimeout(debounceTimer);
+            debounceTimer = setTimeout(() => {
+                debounceTimer = null;
+                console.info(`[lvyjs] 配置文件 ${filename} 已变化，重新加载...`);
+                sendConfig();
+            }, 300);
         }
     });
     // 保持进程运行

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lvyjs",
-  "version": "0.3.0-alpha.0",
+  "version": "0.3.0-alpha.1",
   "description": "tsx compile script",
   "author": "lemonade",
   "license": "MIT",