src/project.ts

@@ -5,7 +5,7 @@ import { join } from "path"
 import { readdirSync, type Dirent } from "fs"
 import { sessionGet } from "./session"
 import { DEFAULT_PROJECT, NOSE_DIR } from "./config"
-import { isDir, isFile } from "./utils"
+import { isDir } from "./utils"
 
 export function projectName(): string {
   const state = sessionGet()
@@ -16,7 +16,7 @@ export function projectName(): string {
 
 export function projects(): string[] {
   return readdirSync(NOSE_DIR, { withFileTypes: true })
-    .filter(dir => dir.isDirectory() && isProject(join(NOSE_DIR, dir.name)))
+    .filter(file => file.isDirectory())
     .map(dir => dir.name)
     .sort()
 }
@@ -35,7 +35,3 @@ export function projectBin(name = projectName()): string {
 export function projectFiles(name = projectName()): Dirent[] {
   return readdirSync(projectDir(name), { recursive: true, withFileTypes: true })
 }
-
-function isProject(path: string): boolean {
-  return join(NOSE_DIR, "root") === path || isFile(join(path, "index.ts")) || isFile(join(path, "index.tsx")) || isDir(join(path, "pub"))
-}

src/webapp/server.ts

@@ -14,13 +14,7 @@ import { apps, isApp, appDir, isStaticApp, webappLog } from "./utils"
 export type Handler = (r: Context) => string | Child | Response | Promise<Response>
 export type App = Hono | Handler
 
-type ProcInfo = {
+const processes = new Map<string, { port: string, proc: ReturnType<typeof Bun.spawn> }>()
-    port: string,
-    proc: ReturnType<typeof Bun.spawn>,
-    killed?: boolean
-}
-
-const processes = new Map<string, ProcInfo>()
 const restarting = new Set<string>()
 const STARTING_PORT = 10000
 let nextPort = STARTING_PORT
@@ -73,9 +67,8 @@ async function startApp(name: string): Promise<string | undefined> {
         stderr: "inherit",
     })
 
-    const info: ProcInfo = { port, proc }
+    processes.set(name, { port, proc })
-    processes.set(name, info)
+    proc.exited.then(() => restartApp(name))
-    proc.exited.then(code => !info.killed && code !== 0 ? restartApp(name) : {})
 
     await Bun.sleep(100) // give it time before first request
 
@@ -96,15 +89,13 @@ export async function shutdownWebapps() {
     wwwWatcher?.close()
     nextPort = STARTING_PORT
 
-    for (const [name, proc] of processes) {
+    for (const [name, { port, proc }] of processes) {
         webappLog(name, "Shutting down")
-        try {
+        try { proc.kill() } catch { }
-            proc.killed = true
-            proc.proc.kill()
-        } catch { }
     }
 
     processes.clear()
+    process.exit(0)
 }
 
 async function restartApp(name: string) {
@@ -116,10 +107,7 @@ async function restartApp(name: string) {
     webappLog(name, "restarting")
     const existing = processes.get(name)
     if (existing) {
-        try {
+        try { existing.proc.kill() } catch { }
-            existing.killed = true
-            existing.proc.kill()
-        } catch { }
         processes.delete(name)
     }
 
@@ -133,6 +121,7 @@ async function startSubprocs() {
     await Promise.all(list.map(app => startApp(app)))
 }
 
+
 let wwwWatcher: any
 function startWatcher() {
     if (!expectDir(NOSE_DIR)) return