scene-capability-engine 3.6.38 → 3.6.44

package/lib/watch/action-executor.js

@@ -4,6 +4,15 @@ const { promisify } = require('util');
 
 const execAsync = promisify(exec);
 
+function sleep(ms) {
+  return new Promise(resolve => {
+    const timer = setTimeout(resolve, ms);
+    if (typeof timer.unref === 'function') {
+      timer.unref();
+    }
+  });
+}
+
 /**
  * ActionExecutor - 动作执行器
  * 
@@ -203,7 +212,7 @@ class ActionExecutor extends EventEmitter {
       });
 
       // 等待
-      await new Promise(resolve => setTimeout(resolve, delay));
+      await sleep(delay);
 
       try {
         // 重新执行

package/lib/watch/event-debouncer.js

@@ -71,6 +71,9 @@ class EventDebouncer extends EventEmitter {
         this.emit('error', { error, key, type: 'debounce' });
       }
     }, actualDelay);
+    if (typeof timer.unref === 'function') {
+      timer.unref();
+    }
 
     this.debounceTimers.set(key, timer);
   }

package/lib/watch/file-watcher.js

@@ -41,6 +41,9 @@ class FileWatcher extends EventEmitter {
     };
     this.retryCount = 0;
     this.lastError = null;
+    this.basePath = process.cwd();
+    this.initializationTimer = null;
+    this.recoveryTimer = null;
   }
 
   /**
@@ -93,6 +96,8 @@ class FileWatcher extends EventEmitter {
     }
 
     try {
+      this.basePath = basePath;
+
       // 将相对路径转换为绝对路径
       const absolutePatterns = this.config.patterns.map(pattern => {
         if (path.isAbsolute(pattern)) {
@@ -120,19 +125,22 @@ class FileWatcher extends EventEmitter {
 
       // 等待 watcher 准备就绪
       await new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => {
+        this._clearInitializationTimer();
+        this.initializationTimer = setTimeout(() => {
+          this.initializationTimer = null;
           reject(new Error('FileWatcher initialization timeout'));
         }, 10000);
+        this._unrefTimer(this.initializationTimer);
 
         this.watcher.once('ready', () => {
-          clearTimeout(timeout);
+          this._clearInitializationTimer();
           this.isWatching = true;
           this.stats.startedAt = new Date();
           resolve();
         });
 
         this.watcher.once('error', (error) => {
-          clearTimeout(timeout);
+          this._clearInitializationTimer();
           reject(error);
         });
       });
@@ -140,6 +148,7 @@ class FileWatcher extends EventEmitter {
       this.emit('started', { patterns: this.config.patterns });
     } catch (error) {
       this.isWatching = false;
+      await this._disposeWatcher();
       throw error;
     }
   }
@@ -150,15 +159,14 @@ class FileWatcher extends EventEmitter {
    * @returns {Promise<void>}
    */
   async stop() {
-    if (!this.isWatching) {
+    if (!this.isWatching && !this.watcher && !this.initializationTimer && !this.recoveryTimer) {
       return;
     }
 
     try {
-      if (this.watcher) {
-        await this.watcher.close();
-        this.watcher = null;
-      }
+      this._clearInitializationTimer();
+      this._clearRecoveryTimer();
+      await this._disposeWatcher();
 
       this.isWatching = false;
       this.watchedFiles.clear();
@@ -300,10 +308,12 @@ class FileWatcher extends EventEmitter {
     });
 
     // 延迟后重试
-    setTimeout(async () => {
+    this._clearRecoveryTimer();
+    this.recoveryTimer = setTimeout(async () => {
+      this.recoveryTimer = null;
       try {
         // 重启 watcher
-        const basePath = this.watcher ? this.watcher.options.cwd : process.cwd();
+        const basePath = this.basePath || process.cwd();
         
         await this.stop();
         await this.start(basePath);
@@ -326,6 +336,7 @@ class FileWatcher extends EventEmitter {
         await this._attemptRecovery(recoveryError);
       }
     }, this.config.retryDelay);
+    this._unrefTimer(this.recoveryTimer);
   }
 
   /**
@@ -494,6 +505,36 @@ class FileWatcher extends EventEmitter {
       lastError: this.lastError ? this.lastError.message : null
     };
   }
+
+  _unrefTimer(timer) {
+    if (timer && typeof timer.unref === 'function') {
+      timer.unref();
+    }
+  }
+
+  _clearInitializationTimer() {
+    if (this.initializationTimer) {
+      clearTimeout(this.initializationTimer);
+      this.initializationTimer = null;
+    }
+  }
+
+  _clearRecoveryTimer() {
+    if (this.recoveryTimer) {
+      clearTimeout(this.recoveryTimer);
+      this.recoveryTimer = null;
+    }
+  }
+
+  async _disposeWatcher() {
+    if (!this.watcher) {
+      return;
+    }
+
+    const watcher = this.watcher;
+    this.watcher = null;
+    await watcher.close();
+  }
 }
 
 module.exports = FileWatcher;

package/lib/watch/watch-manager.js

@@ -6,6 +6,15 @@ const EventDebouncer = require('./event-debouncer');
 const ActionExecutor = require('./action-executor');
 const ExecutionLogger = require('./execution-logger');
 
+function sleep(ms) {
+  return new Promise(resolve => {
+    const timer = setTimeout(resolve, ms);
+    if (typeof timer.unref === 'function') {
+      timer.unref();
+    }
+  });
+}
+
 /**
  * WatchManager - Watch 模式管理器
  * 
@@ -137,7 +146,7 @@ class WatchManager extends EventEmitter {
    */
   async restart() {
     await this.stop();
-    await new Promise(resolve => setTimeout(resolve, 1000));
+    await sleep(1000);
     await this.start();
   }
 

package/lib/workspace/multi/workspace-context-resolver.js

@@ -94,14 +94,14 @@ class WorkspaceContextResolver {
    */
   async isValidSceDirectory(dirPath) {
     try {
-      const kiroPath = path.join(dirPath, '.sce');
-      const exists = await fs.pathExists(kiroPath);
+      const scePath = path.join(dirPath, '.sce');
+      const exists = await fs.pathExists(scePath);
       
       if (!exists) {
         return false;
       }
 
-      const stats = await fs.stat(kiroPath);
+      const stats = await fs.stat(scePath);
       return stats.isDirectory();
     } catch (error) {
       return false;

package/lib/workspace/multi/workspace-registry.js

@@ -84,10 +84,10 @@ class WorkspaceRegistry {
       }
 
       // Check if .sce directory exists
-      const kiroPath = path.join(workspacePath, '.sce');
-      const kiroExists = await fs.pathExists(kiroPath);
+      const scePath = path.join(workspacePath, '.sce');
+      const sceExists = await fs.pathExists(scePath);
       
-      return kiroExists;
+      return sceExists;
     } catch (error) {
       return false;
     }

package/lib/workspace/multi/workspace-state-manager.js

@@ -192,9 +192,9 @@ class WorkspaceStateManager {
     }
 
     // Validate path (check for .sce directory)
-    const kiroPath = path.join(workspacePath, '.sce');
-    const kiroExists = await fs.pathExists(kiroPath);
-    if (!kiroExists) {
+    const scePath = path.join(workspacePath, '.sce');
+    const sceExists = await fs.pathExists(scePath);
+    if (!sceExists) {
       throw new Error(`Path "${workspacePath}" is not a valid sce project directory. ` +
                      `Ensure it exists and contains a .sce/ directory.`);
     }