sillyspec 3.7.9 → 3.7.11

package/packages/dashboard/server/index.js

@@ -1,11 +1,12 @@
 import { createServer } from 'http'
 import { WebSocketServer } from 'ws'
-import { existsSync, readFileSync } from 'fs'
-import { join, dirname } from 'path'
+import { existsSync, readFileSync, readdirSync, realpathSync } from 'fs'
+import { join, dirname, basename, sep } from 'path'
 import { fileURLToPath } from 'url'
+import { homedir } from 'os'
 import open from 'open'
 import { parseProjectState } from './parser.js'
-import { startWatcher, stopWatcher } from './watcher.js'
+import { startWatcher, stopWatcher, addCustomScanPath, removeCustomScanPath, getCustomScanPaths, customScanPaths } from './watcher.js'
 import { executeCommand } from './executor.js'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
@@ -28,83 +29,96 @@ function broadcast(data) {
   })
 }
 
+// --- Shared scan logic (aligned with watcher.js) ---
+
+const excludeDirs = new Set([
+  '.Trash', '.cache', '.npm', '.local', '.vscode', 'Library',
+  '.git', 'node_modules', '.Trash-*', '.DS_Store', '.config',
+  '.cocoapods', '.gem', '.rvm', '.nvm', '.asdf', '.brew',
+  'AppData', 'Application Data', '.cargo', '.rustup',
+  '.nuget', '.android', '.gradle', '.m2', '.vscode-server'
+])
+
+function shouldExclude(name, cwd) {
+  if (excludeDirs.has(name)) return true
+  for (const pattern of excludeDirs) {
+    if (pattern.includes('*')) {
+      const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$')
+      if (regex.test(name)) return true
+    }
+  }
+  const cwdName = cwd.split(sep).pop() || cwd.split('/').pop() || ''
+  if (name.startsWith('.') && name !== cwdName) return true
+  return false
+}
+
+function scanDirectory(baseDir, seen, maxDepth = 2, currentDepth = 0) {
+  const cwd = process.cwd()
+  const projects = []
+  try {
+    const entries = readdirSync(baseDir, { withFileTypes: true })
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue
+      if (shouldExclude(entry.name, cwd)) continue
+      const dirPath = join(baseDir, entry.name)
+      let realPath
+      try { realPath = realpathSync(dirPath) } catch { realPath = dirPath }
+      const normalizedPath = realPath.toLowerCase()
+      if (seen.has(normalizedPath)) continue
+      seen.add(normalizedPath)
+      if (existsSync(join(dirPath, '.sillyspec'))) {
+        projects.push({ name: entry.name, path: dirPath })
+      }
+      if (currentDepth < maxDepth) {
+        projects.push(...scanDirectory(dirPath, seen, maxDepth, currentDepth + 1))
+      }
+    }
+  } catch (err) {}
+  return projects
+}
+
 /**
  * Discover all SillySpec projects
  * @returns {Promise<Array>} Array of project objects
  */
 async function discoverProjects() {
-  const { homedir } = await import('os')
   const home = homedir()
   const cwd = process.cwd()
 
-  // Directories to exclude (system junk, cache, etc.)
-  const excludeDirs = new Set([
-    '.Trash', '.cache', '.npm', '.local', '.vscode', 'Library',
-    '.git', 'node_modules', '.Trash-*', '.DS_Store', '.config',
-    '.cocoapods', '.gem', '.rvm', '.nvm', '.asdf', '.brew'
-  ])
-
-  // Helper to check if directory should be excluded
-  const shouldExclude = (name) => {
-    // Check exact matches
-    if (excludeDirs.has(name)) return true
-    // Check wildcard patterns (like .Trash-*)
-    for (const pattern of excludeDirs) {
-      if (pattern.includes('*')) {
-        const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$')
-        if (regex.test(name)) return true
-      }
-    }
-    // Exclude hidden directories (starting with .) unless it's the cwd basename
-    if (name.startsWith('.') && name !== cwd.split('/').pop()) {
-      return true
-    }
-    return false
-  }
+  const scanDirs = new Set()
+  scanDirs.add(cwd)
+  scanDirs.add(dirname(cwd))
+  scanDirs.add(dirname(dirname(cwd)))
+  scanDirs.add(home)
 
-  // Build scan directories: cwd + home subdirs + common project locations
-  const scanDirs = [cwd, home]
-  const extraDirs = ['Desktop', 'Documents', 'Projects', 'Work', 'Repos', 'Code', 'src', 'dev']
+  const extraDirs = [
+    'Desktop', '桌面', 'Documents', '文档', 'Downloads', '下载',
+    'Projects', '项目', 'Work', '工作', 'Repos', 'Code', 'src', 'dev',
+    'workspace', '工作区'
+  ]
 
   for (const extra of extraDirs) {
     const extraPath = join(home, extra)
-    if (existsSync(extraPath)) {
-      scanDirs.push(extraPath)
-    }
+    if (existsSync(extraPath)) scanDirs.add(extraPath)
   }
 
-  const projects = []
-  const seen = new Set() // Dedupe by path
-
-  for (const baseDir of scanDirs) {
-    try {
-      const { readdirSync } = await import('fs')
-      const entries = readdirSync(baseDir, { withFileTypes: true })
-
-      for (const entry of entries) {
-        if (!entry.isDirectory()) continue
-        if (shouldExclude(entry.name)) continue
-
-        const dirPath = join(baseDir, entry.name)
+  for (const customPath of customScanPaths) {
+    if (existsSync(customPath)) scanDirs.add(customPath)
+  }
 
-        // Skip if we've already seen this path (handles symlinks, dupes)
-        const realPath = dirPath // Could add realpath for true deduping
-        if (seen.has(realPath)) continue
-        seen.add(realPath)
+  const seen = new Set()
+  const projects = []
 
-        const sillyspecPath = join(dirPath, '.sillyspec')
+  // Normalize cwd for dedup
+  let cwdReal
+  try { cwdReal = realpathSync(cwd) } catch { cwdReal = cwd }
+  seen.add(cwdReal.toLowerCase())
+  if (existsSync(join(cwd, '.sillyspec'))) {
+    projects.push({ name: basename(cwd), path: cwd })
+  }
 
-        if (existsSync(sillyspecPath)) {
-          projects.push({
-            name: entry.name,
-            path: dirPath
-          })
-        }
-      }
-    } catch (err) {
-      // Skip directories we can't read
-      continue
-    }
+  for (const baseDir of scanDirs) {
+    projects.push(...scanDirectory(baseDir, seen, 2, 0))
   }
 
   return projects
@@ -126,7 +140,6 @@ function handleCliExecute(ws, data) {
     return
   }
 
-  // Find project
   discoverProjects().then(projects => {
     const project = projects.find(p => p.name === projectName)
     if (!project) {
@@ -137,45 +150,29 @@ function handleCliExecute(ws, data) {
       return
     }
 
-    // Kill existing process for this project if any
     const existingKill = activeProcesses.get(projectName)
-    if (existingKill) {
-      existingKill()
-    }
+    if (existingKill) existingKill()
 
-    // Execute command
     const kill = executeCommand(
       project.path,
       command,
       (output) => {
         broadcast({
           type: 'cli:output',
-          data: {
-            projectName,
-            output: output.data,
-            outputType: output.type
-          }
+          data: { projectName, output: output.data, outputType: output.type }
         })
       },
       (result) => {
         activeProcesses.delete(projectName)
         broadcast({
           type: 'cli:complete',
-          data: {
-            projectName,
-            exitCode: result.code,
-            signal: result.signal
-          }
+          data: { projectName, exitCode: result.code, signal: result.signal }
         })
       }
     )
 
     activeProcesses.set(projectName, kill)
-
-    broadcast({
-      type: 'cli:started',
-      data: { projectName, command }
-    })
+    broadcast({ type: 'cli:started', data: { projectName, command } })
   })
 }
 
@@ -186,7 +183,6 @@ function handleCliExecute(ws, data) {
  */
 function startServer({ port = 3456, open: openBrowser = true } = {}) {
   const server = createServer((req, res) => {
-    // CORS headers
     res.setHeader('Access-Control-Allow-Origin', '*')
     res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS')
     res.setHeader('Access-Control-Allow-Headers', 'Content-Type')
@@ -197,7 +193,6 @@ function startServer({ port = 3456, open: openBrowser = true } = {}) {
       return
     }
 
-    // API: List all projects
     if (req.url === '/api/projects') {
       discoverProjects().then(projects => {
         res.setHeader('Content-Type', 'application/json')
@@ -210,7 +205,6 @@ function startServer({ port = 3456, open: openBrowser = true } = {}) {
       return
     }
 
-    // API: Get project details with state
     if (req.url?.startsWith('/api/project/')) {
       const projectName = decodeURIComponent(req.url.split('/').pop())
       discoverProjects().then(projects => {
@@ -219,10 +213,7 @@ function startServer({ port = 3456, open: openBrowser = true } = {}) {
           const state = parseProjectState(project.path)
           res.setHeader('Content-Type', 'application/json')
           res.writeHead(200)
-          res.end(JSON.stringify({
-            ...project,
-            state
-          }))
+          res.end(JSON.stringify({ ...project, state }))
         } else {
           res.writeHead(404)
           res.end(JSON.stringify({ error: 'Project not found' }))
@@ -247,7 +238,6 @@ function startServer({ port = 3456, open: openBrowser = true } = {}) {
         res.end(readFileSync(filePath))
         return
       }
-      // SPA fallback: serve index.html for unknown routes
       if (existsSync(indexPath)) {
         res.setHeader('Content-Type', 'text/html')
         res.writeHead(200)
@@ -256,12 +246,10 @@ function startServer({ port = 3456, open: openBrowser = true } = {}) {
       }
     }
 
-    // 404
     res.writeHead(404)
     res.end('Not found')
   })
 
-  // WebSocket Server
   wss = new WebSocketServer({ server })
 
   wss.on('error', (err) => {
@@ -282,6 +270,12 @@ function startServer({ port = 3456, open: openBrowser = true } = {}) {
         type: 'projects:init',
         data: projectsWithState
       }))
+
+      // Send current scan paths
+      ws.send(JSON.stringify({
+        type: 'scan:paths',
+        data: getCustomScanPaths()
+      }))
     }).catch(err => {
       console.error('Error sending initial projects:', err)
     })
@@ -299,12 +293,31 @@ function startServer({ port = 3456, open: openBrowser = true } = {}) {
             if (kill) {
               kill()
               activeProcesses.delete(data.data.projectName)
-              broadcast({
-                type: 'cli:killed',
-                data: { projectName: data.data.projectName }
+              broadcast({ type: 'cli:killed', data: { projectName: data.data.projectName } })
+            }
+            break
+          case 'scan:add-path':
+            if (data.data?.path) {
+              addCustomScanPath(data.data.path)
+              broadcast({ type: 'scan:paths', data: getCustomScanPaths() })
+              // Resend projects after scan
+              discoverProjects().then(projects => {
+                broadcast({
+                  type: 'projects:updated',
+                  data: projects.map(p => ({ ...p, state: parseProjectState(p.path) }))
+                })
               })
             }
             break
+          case 'scan:remove-path':
+            if (data.data?.path) {
+              removeCustomScanPath(data.data.path)
+              ws.send(JSON.stringify({ type: 'scan:paths', data: getCustomScanPaths() }))
+            }
+            break
+          case 'scan:get-paths':
+            ws.send(JSON.stringify({ type: 'scan:paths', data: getCustomScanPaths() }))
+            break
           default:
             console.log('Unknown message type:', data.type)
         }
@@ -322,13 +335,9 @@ function startServer({ port = 3456, open: openBrowser = true } = {}) {
     })
   })
 
-  // Start file watcher (wrapped to avoid crashing server)
   try {
     startWatcher((projects) => {
-      broadcast({
-        type: 'projects:updated',
-        data: projects
-      })
+      broadcast({ type: 'projects:updated', data: projects })
     })
   } catch (err) {
     console.error('Failed to start file watcher:', err)
@@ -336,13 +345,11 @@ function startServer({ port = 3456, open: openBrowser = true } = {}) {
 
   server.listen(port, () => {
     console.log(`Dashboard server running on http://localhost:${port}`)
-
     if (openBrowser) {
       open(`http://localhost:${port}`)
     }
   })
 
-  // Handle shutdown
   const shutdown = () => {
     stopWatcher()
     activeProcesses.forEach(kill => kill())