@rip-lang/server 1.3.18 → 1.3.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rip-lang/server",
-  "version": "1.3.18",
+  "version": "1.3.20",
   "description": "Pure Rip web framework and application server",
   "type": "module",
   "main": "api.rip",
@@ -45,7 +45,7 @@
   "author": "Steve Shreeve <steve.shreeve@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "rip-lang": ">=3.13.34"
+    "rip-lang": ">=3.13.36"
   },
   "files": [
     "api.rip",

package/server.rip

@@ -339,6 +339,7 @@ parseFlags = (argv) ->
     hsts: has('--hsts')
     redirectHttp: not has('--no-redirect-http')
     reload
+    quiet: has('--quiet')
     socketPrefix
     maxQueue: coerceInt(getKV('--max-queue='), coerceInt(process.env.RIP_MAX_QUEUE, 512))
     queueTimeoutMs: coerceInt(getKV('--queue-timeout-ms='), coerceInt(process.env.RIP_QUEUE_TIMEOUT_MS, 30000))
@@ -361,6 +362,13 @@ runSetup = ->
     fn = mod?.setup or mod?.default
     if typeof fn is 'function'
       await fn()
+    # Signal the Manager that setup is complete
+    process.stdout.write '__setup_done__\n'
+    # If teardown exported, stay alive until Manager sends SIGTERM
+    if typeof mod?.teardown is 'function'
+      await new Promise (resolve) ->
+        process.once 'SIGTERM', ->
+          Promise.resolve(mod.teardown()).finally(resolve)
   catch e
     console.error "rip-server: setup failed:", e
     process.exit(1)
@@ -499,6 +507,7 @@ class Manager
     @retiringIds = new Set()
     @currentVersion = 1
     @server = null
+    @setupProc = null
     @appWatchers = new Map()
 
     process.on 'SIGTERM', => @shutdown!
@@ -514,15 +523,32 @@ class Manager
         RIP_SETUP_MODE: '1'
         RIP_SETUP_FILE: setupFile
       proc = Bun.spawn ['rip', import.meta.path],
-        stdout: 'inherit'
+        stdout: 'pipe'
         stderr: 'inherit'
         stdin: 'ignore'
         cwd: process.cwd()
         env: setupEnv
-      code = await proc.exited
-      if code isnt 0
-        console.error "rip-server: setup exited with code #{code}"
-        process.exit(1)
+
+      # Stream stdout to our stdout, watching for the __setup_done__ signal
+      setupDone = new Promise (resolve, reject) ->
+        buf = ''
+        reader = proc.stdout.getReader()
+        dec = new TextDecoder()
+        readLoop = ->
+          { done, value } = await reader.read()
+          if done
+            code = await proc.exited
+            if code isnt 0 then reject new Error "setup exited #{code}" else resolve()
+            return
+          buf += dec.decode(value)
+          lines = buf.split('\n')
+          buf = lines.pop()
+          for line in lines
+            if line is '__setup_done__' then resolve() else process.stdout.write line + '\n'
+          readLoop()
+        readLoop()
+      await setupDone
+      @setupProc = proc
 
     @workers = []
     for i in [0...@flags.workers]
@@ -710,6 +736,8 @@ class Manager
     return if @shuttingDown
     @shuttingDown = true
     @stop!
+    # Signal the setup process to run teardown (kills rip-db if we launched it)
+    @setupProc?.kill('SIGTERM')
     process.exit(0)
 
   getEntryMtime: ->
@@ -1017,7 +1045,7 @@ class Server
 
     port = @flags.httpsPort or @flags.httpPort or 80
     protocol = if @flags.httpsPort then 'https' else 'http'
-    console.log "rip-server: #{protocol}://#{@flags.appName}.ripdev.io#{formatPort(protocol, port)}"
+    console.log "rip-server: #{protocol}://#{@flags.appName}.ripdev.io#{formatPort(protocol, port)}" unless @flags.quiet
 
   controlFetch: (req) ->
     url = new URL(req.url)
@@ -1139,7 +1167,7 @@ class Server
         stderr: 'ignore'
 
       @mdnsProcesses.set(host, proc)
-      console.log "rip-server: #{protocol}://#{host}#{formatPort(protocol, port)}"
+      console.log "rip-server: #{protocol}://#{host}#{formatPort(protocol, port)}" unless @flags.quiet
     catch e
       console.error "rip-server: failed to advertise #{host} via mDNS:", e.message
 
@@ -1174,6 +1202,7 @@ main = ->
         --static                Disable hot reload and file watching
         --env=<mode>            Set environment (dev, production)
         --debug                 Enable debug logging
+        --quiet                 Suppress URL lines (app prints its own)
 
       Network:
         http                    HTTP only (no TLS)
@@ -1287,6 +1316,7 @@ main = ->
 
   httpOnly = flags.httpsPort is null
   protocol = if httpOnly then 'http' else 'https'
+  process.env.RIP_HTTP_ONLY = '1' if httpOnly
   port = flags.httpsPort or flags.httpPort or 80
   console.log "rip-server: app=#{flags.appName} workers=#{flags.workers} url=#{protocol}://#{flags.appName}.ripdev.io#{formatPort(protocol, port)}/server"