@rip-lang/server 1.3.124 → 1.3.126

package/control/cli.rip

@@ -63,6 +63,7 @@ export resolveAppEntry = (appPathInput, defaultEntryPath = null) ->
 export parseFlags = (argv, defaultEntryPath = null) ->
   rawFlags = new Set()
   appPathInput = null
+  appNameOverride = null
   appAliases = []
 
   isFlag = (tok) ->
@@ -82,13 +83,17 @@ export parseFlags = (argv, defaultEntryPath = null) ->
     unless appPathInput
       if tok.includes('@') and not tok.startsWith('-')
         [pathPart, aliasesPart] = tok.split('@')
+        aliases = aliasesPart.split(',').map((a) -> a.trim()).filter((a) -> a)
         maybe = tryResolveApp(pathPart)
         if maybe
           appPathInput = maybe
-          appAliases = aliasesPart.split(',').map((a) -> a.trim()).filter((a) -> a)
+          if aliases.length > 0
+            appNameOverride = aliases[0]
+            appAliases = aliases
           continue
         else if not pathPart.includes('/') and not pathPart.startsWith('.')
-          appAliases = [pathPart].concat(aliasesPart.split(',').map((a) -> a.trim()).filter((a) -> a))
+          appNameOverride = pathPart
+          appAliases = [pathPart].concat(aliases)
           continue
 
       maybe = tryResolveApp(tok)
@@ -97,7 +102,11 @@ export parseFlags = (argv, defaultEntryPath = null) ->
         continue
 
       unless isFlag(tok)
-        appAliases.push(tok)
+        if appNameOverride
+          appAliases.push(tok)
+        else
+          appNameOverride = tok
+          appAliases = [tok]
         continue
 
     rawFlags.add(tok)
@@ -114,13 +123,18 @@ export parseFlags = (argv, defaultEntryPath = null) ->
       appPathInput = cwd
 
   getKV = (prefix) ->
-    for f as rawFlags
-      return f.slice(prefix.length) if f.startsWith(prefix)
+    tokens = Array.from(rawFlags)
+    bare = prefix.slice(0, -1)
+    for i in [0...tokens.length]
+      return tokens[i].slice(prefix.length) if tokens[i].startsWith(prefix)
+      if tokens[i] is bare and tokens[i + 1] and not tokens[i + 1].startsWith('-')
+        return tokens[i + 1]
     undefined
 
   has = (name) -> rawFlags.has(name)
 
   { baseDir, entryPath, appName } = resolveAppEntry(appPathInput, defaultEntryPath)
+  appName = appNameOverride if appNameOverride
   appAliases = [appName] if appAliases.length is 0
 
   tokens = Array.from(rawFlags)
@@ -211,8 +225,10 @@ export parseFlags = (argv, defaultEntryPath = null) ->
     rateLimit: coerceInt(getKV('--rate-limit='), 0)
     rateLimitWindow: coerceInt(getKV('--rate-limit-window='), 60000)
     watch: watch
-    edgefilePath: getKV('--edgefile=')
-    checkConfig: has('--check-config')
+    edgefilePath: getKV('--edgefile=') or getKV('--file=') or getKV('-f=')
+    checkConfig: has('--check-config') or has('--check') or has('-c')
+    reloadConfig: has('--reload') or has('-r')
+    stopServer: has('--stop') or has('-s')
     envOverride: envOverride
     debug: has('--debug')
   }
@@ -236,6 +252,16 @@ export findAppPathToken = (argv, existsSyncFn, isAbsoluteFn, resolveFn, cwdFn) -
 export computeSocketPrefix = (argv, resolveAppEntryFn, existsSyncFn, isAbsoluteFn, resolveFn, cwdFn) ->
   override = getKV(argv, '--socket-prefix=')
   return override if override
+  for i in [2...argv.length]
+    tok = argv[i]
+    continue if tok.startsWith('-') or /^\d+$/.test(tok) or tok in ['http', 'https']
+    [pathPart, aliasesPart] = if tok.includes('@') then tok.split('@') else [tok, null]
+    aliases = aliasesPart?.split(',').map((a) -> a.trim()).filter((a) -> a) or []
+    looksLikePath = pathPart.includes('/') or pathPart.startsWith('.') or pathPart.endsWith('.rip') or pathPart.endsWith('.ts')
+    unless looksLikePath
+      return "rip_#{pathPart}"
+    return "rip_#{aliases[0]}" if aliases.length > 0
+    break
   appTok = findAppPathToken(argv, existsSyncFn, isAbsoluteFn, resolveFn, cwdFn)
   if appTok
     try
@@ -260,14 +286,16 @@ export runHelpOutput = (argv) ->
     rip-server - Pure Rip application server
 
     Usage:
-      rip serve [options] [app-path] [app-name]
-      rip serve [options] [app-path]@<alias1>,<alias2>,...
+      rip server [options] [app-path] [app-name]
+      rip server [options] [app-path]@<alias1>,<alias2>,...
 
     Options:
       -h, --help              Show this help
       -v, --version           Show version
-      --edgefile=<path>       Load Edgefile.rip from an explicit path
-      --check-config          Validate Edgefile.rip or config.rip and exit
+      -c, --check             Validate Edgefile.rip or config.rip and exit
+      -r, --reload            Reload config on a running server
+      -s, --stop              Stop a running server
+      -f, --file=<path>       Load Edgefile.rip from an explicit path
       --watch=<glob>          Watch glob pattern (default: *.rip)
       --static                Disable hot reload and file watching
       --env=<mode>            Set environment (dev, production)
@@ -297,13 +325,15 @@ export runHelpOutput = (argv) ->
       r:<n>,<s>s              Restart policy: max requests, max seconds
 
     Examples:
-      rip serve               Start with ./index.rip (watches *.rip)
-      rip serve myapp         Start with app name "myapp"
-      rip serve http          HTTP only (no TLS)
-      rip serve --static w:8  Production: no reload, 8 workers
-      rip serve --check-config
-      rip serve --check-config --edgefile=./Edgefile.rip
-      rip serve --edgefile=./Edgefile.rip
+      rip server               Start with ./index.rip (watches *.rip)
+      rip server myapp         Start with app name "myapp"
+      rip server http          HTTP only (no TLS)
+      rip server --static w:8  Production: no reload, 8 workers
+      rip server -c            Validate config and exit
+      rip server -c -f=./Edgefile.rip
+      rip server -r            Reload running server config
+      rip server -s            Stop running server
+      rip server -f=./Edgefile.rip
 
     If no index.rip or index.ts is found, a built-in static file server
     activates with directory indexes, auto-detected MIME types, and
@@ -313,8 +343,7 @@ export runHelpOutput = (argv) ->
 
 # --- Subcommands ---
 
-export runStopSubcommand = (argv, prefix, getPidFilePathFn, existsSyncFn, readFileSyncFn, killFn, spawnSyncFn, importMetaPath) ->
-  return false unless 'stop' in argv
+export stopServer = (prefix, getPidFilePathFn, existsSyncFn, readFileSyncFn, killFn, spawnSyncFn, importMetaPath) ->
   pidFile = getPidFilePathFn(prefix)
   try
     if existsSyncFn(pidFile)
@@ -326,7 +355,6 @@ export runStopSubcommand = (argv, prefix, getPidFilePathFn, existsSyncFn, readFi
       spawnSyncFn(['pkill', '-f', importMetaPath])
   catch e
     console.error "rip-server: stop failed: #{e.message}"
-  true
 
 export runListSubcommand = (argv, prefix, getControlSocketPathFn, fetchFn, exitFn) ->
   return false unless 'list' in argv
@@ -341,3 +369,18 @@ export runListSubcommand = (argv, prefix, getControlSocketPathFn, fetchFn, exitF
     console.error "list command failed: #{e?.message or e}"
     exitFn(1)
   true
+
+export runReloadSubcommand = (prefix, getControlSocketPathFn, fetchFn, exitFn) ->
+  controlUnix = getControlSocketPathFn(prefix)
+  try
+    res = fetchFn!('http://localhost/reload', { unix: controlUnix, method: 'POST' })
+    j = res.json!
+    if j?.ok
+      p "rip-server: config reload applied"
+    else
+      reason = j?.reason or 'unknown'
+      console.error "rip-server: config reload rejected: #{reason}"
+      exitFn(1)
+  catch e
+    console.error "rip-server: reload failed: #{e?.message or e}"
+    exitFn(1)

package/control/workers.rip

@@ -3,6 +3,7 @@
 # ==============================================================================
 
 import { unlinkSync } from 'node:fs'
+import { dirname, join } from 'node:path'
 import { getWorkerSocketPath, getControlSocketPath } from './control.rip'
 
 # --- Spawn ---
@@ -28,7 +29,8 @@ export spawnTrackedWorker = (flags, workerId, version, nowMsFn, importMetaPath,
     RIP_LOG_JSON: if flags.jsonLogging then '1' else '0'
     RIP_VERSION: String(version)
 
-  proc = Bun.spawn ['rip', importMetaPath],
+  loaderPath = join(dirname(importMetaPath), '..', '..', 'rip-loader.js')
+  proc = Bun.spawn ['bun', '--preload', loaderPath, importMetaPath],
     stdout: 'inherit'
     stderr: 'inherit'
     stdin: 'ignore'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rip-lang/server",
-  "version": "1.3.124",
+  "version": "1.3.126",
   "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.129"
+    "rip-lang": ">=3.13.131"
   },
   "files": [
     "api.rip",

package/server.rip

@@ -26,7 +26,7 @@ import { handleWorkerControl, handleWatchControl, handleRegistryControl, handleR
 import { getLanIP as controlGetLanIP, startMdnsAdvertisement as controlStartMdnsAdvertisement, stopMdnsAdvertisements as controlStopMdnsAdvertisements } from './control/mdns.rip'
 import { registerWatchGroup, handleWatchGroup, broadcastWatchChange, registerAppWatchDirs, shouldTriggerCodeReload } from './control/watchers.rip'
 import { computeHideUrls, logStartupSummary, createCleanup, installShutdownHandlers } from './control/lifecycle.rip'
-import { computeSocketPrefix as cliComputeSocketPrefix, runVersionOutput, runHelpOutput, runStopSubcommand, runListSubcommand, resolveAppEntry, parseFlags, coerceInt } from './control/cli.rip'
+import { runVersionOutput, runHelpOutput, stopServer, runReloadSubcommand, resolveAppEntry, parseFlags, coerceInt } from './control/cli.rip'
 import { runSetupMode, runWorkerMode } from './control/worker.rip'
 import { spawnTrackedWorker, postWorkerQuit, waitForWorkerReady } from './control/workers.rip'
 import { createChallengeStore, handleChallengeRequest } from './acme/store.rip'
@@ -1476,21 +1476,17 @@ main = ->
   if runHelpOutput(process.argv)
     return
 
-  # Subcommands: stop/list
-  if 'stop' in process.argv or 'list' in process.argv
-    prefix = cliComputeSocketPrefix(process.argv, resolveAppEntry, existsSync, isAbsolute, resolve, (-> process.cwd()))
-    if runStopSubcommand(process.argv, prefix, getPidFilePath, existsSync, readFileSync, process.kill.bind(process), Bun.spawnSync, import.meta.path)
-      return
-
-    if runListSubcommand(process.argv, prefix, getControlSocketPath, fetch, exit)
-      return
-
-  # Normal startup
   flags = parseFlags(process.argv, defaultEntry)
   applyFlagSideEffects(flags)
   if flags.checkConfig
     runCheckConfig!(flags)
     return
+  if flags.reloadConfig
+    runReloadSubcommand!(flags.socketPrefix, getControlSocketPath, fetch, exit)
+    return
+  if flags.stopServer
+    stopServer(flags.socketPrefix, getPidFilePath, existsSync, readFileSync, process.kill.bind(process), Bun.spawnSync, import.meta.path)
+    return
   setEventJsonMode(flags.jsonLogging)
   pidFile = getPidFilePath(flags.socketPrefix)
   writeFileSync(pidFile, String(process.pid))
@@ -1504,13 +1500,7 @@ main = ->
   exit 1 unless startupReload.ok
 
   cleanup = createCleanup(pidFile, svr, mgr, unlinkSync, fetch, process)
-  installShutdownHandlers(cleanup, process, ->
-    p 'rip-server: received SIGHUP, reloading config...'
-    if svr.reloadRuntimeConfig!(flags, 'sighup', true).ok
-      p 'rip-server: config reload applied'
-    else
-      p 'rip-server: config reload rejected, keeping previous config'
-  )
+  installShutdownHandlers(cleanup, process)
 
   # Suppress top URL lines if setup.rip will print them at the bottom
   flags.hideUrls = computeHideUrls(flags.appEntry, join, dirname, existsSync)

package/tests/runtime_entrypoints.rip

@@ -1,5 +1,5 @@
 import { test, eq, ok } from '../test.rip'
-import { coerceInt, parseFlags } from '../control/cli.rip'
+import { coerceInt, computeSocketPrefix, parseFlags } from '../control/cli.rip'
 import { createEdgeRuntime, createReloadHistoryEntry } from '../edge/runtime.rip'
 
 test "control cli helpers load and parse basic flags", ->
@@ -8,6 +8,28 @@ test "control cli helpers load and parse basic flags", ->
   eq flags.httpsPort, 9445
   ok flags.edgefilePath.endsWith('Edgefile.rip')
 
+test "control cli uses bare app token as true app name override", ->
+  flags = parseFlags(['bun', 'server', 'ola'])
+  eq flags.appName, 'ola'
+  eq flags.appAliases[0], 'ola'
+  eq flags.socketPrefix, 'rip_ola'
+
+  socketPrefix = computeSocketPrefix(
+    ['bun', 'server', 'ola'],
+    (appTok) -> { appName: appTok }
+    -> false
+    -> false
+    (_, tok) -> tok
+    -> '/tmp'
+  )
+  eq socketPrefix, 'rip_ola'
+
+test "control cli supports explicit path with custom app name", ->
+  flags = parseFlags(['bun', 'server', 'packages/server/default.rip@ola'])
+  eq flags.appName, 'ola'
+  eq flags.appAliases[0], 'ola'
+  eq flags.socketPrefix, 'rip_ola'
+
 test "edge runtime helpers load and create summary entries", ->
   runtime = createEdgeRuntime()
   entry = createReloadHistoryEntry('reload-1', 'test', null, 1, 'applied')