@rip-lang/server 1.3.114 → 1.3.116

package/api.rip

@@ -562,12 +562,12 @@ export validators =
   cents_even: (v) -> v[/^([-+]? ?\$? ?(?:[\d,]+(?:\.\d*)?|\.\d+))$/] and toMoney(_[1], true,  true)
 
   # Strings & formatting
-  string:    (v) -> v.replace(/(?:\t+|\s{2,})/g, ' ')
-  text:      (v) -> v.replace(/  +/g  , ' ')
+  string:     (v) -> v.replace(/(?:\t+|\s{2,})/g, ' ')
+  text:       (v) -> v.replace(/  +/g, ' ')
 
   # Name/address
-  name:      (v) -> v = v.replace(/\s+/g, ' ') and toName v, 'name'
-  address:   (v) -> v = v.replace(/\s+/g, ' ') and toName v, 'address'
+  name:       (v) -> v = v.replace(/\s+/g, ' ') and toName v, 'name'
+  address:    (v) -> v = v.replace(/\s+/g, ' ') and toName v, 'address'
 
   # Date & time
   date:      (v) -> v[/^\d{4}(-?)\d{2}\1\d{2}$/]                                and _[0]

package/control/cli.rip

@@ -1,7 +1,222 @@
 # ==============================================================================
-# control/cli.rip — CLI parsing, subcommands, and output
+# control/cli.rip — CLI parsing, flag parsing, subcommands, and output
 # ==============================================================================
 
+import { existsSync, statSync } from 'node:fs'
+import { basename, dirname, isAbsolute, join, resolve } from 'node:path'
+import { cpus } from 'node:os'
+
+# --- Shared helpers ---
+
+export coerceInt = (value, fallback) ->
+  return fallback unless value? and value isnt ''
+  n = parseInt(String(value))
+  if Number.isFinite(n) then n else fallback
+
+parseWorkersToken = (token, fallback) ->
+  return fallback unless token
+  cores = cpus().length
+  return Math.max(1, cores) if token is 'auto'
+  return Math.max(1, Math.floor(cores / 2)) if token is 'half'
+  return Math.max(1, cores * 2) if token is '2x'
+  return Math.max(1, cores * 3) if token is '3x'
+  n = parseInt(token)
+  if Number.isFinite(n) and n > 0 then n else fallback
+
+parseRestartPolicy = (token, defReqs, defSecs) ->
+  return { maxRequests: defReqs, maxSeconds: defSecs } unless token
+  maxRequests = defReqs
+  maxSeconds = defSecs
+  for part in token.split(',').map((s) -> s.trim()).filter(Boolean)
+    if part.endsWith('s')
+      secs = parseInt(part.slice(0, -1))
+      maxSeconds = secs if Number.isFinite(secs) and secs >= 0
+    else
+      n = parseInt(part)
+      maxRequests = n if Number.isFinite(n) and n > 0
+  { maxRequests, maxSeconds }
+
+export resolveAppEntry = (appPathInput, defaultEntryPath = null) ->
+  abs = if isAbsolute(appPathInput) then appPathInput else resolve(process.cwd(), appPathInput)
+
+  if existsSync(abs) and statSync(abs).isDirectory()
+    baseDir = abs
+    one = join(abs, 'index.rip')
+    two = join(abs, 'index.ts')
+    if existsSync(one)
+      entryPath = one
+    else if existsSync(two)
+      entryPath = two
+    else
+      p "rip-server: no index.rip found, serving static files from #{abs}\n             Create an index.rip to customize, or run 'rip server --help' for options."
+      entryPath = defaultEntryPath or abs
+  else
+    unless existsSync(abs)
+      console.error "App path not found: #{abs}"
+      exit 2
+    baseDir = dirname(abs)
+    entryPath = abs
+
+  appName = basename(baseDir)
+  { baseDir, entryPath, appName }
+
+export parseFlags = (argv, defaultEntryPath = null) ->
+  rawFlags = new Set()
+  appPathInput = null
+  appAliases = []
+
+  isFlag = (tok) ->
+    tok.startsWith('-') or tok.startsWith('--') or /^\d+$/.test(tok) or tok in ['http', 'https']
+
+  tryResolveApp = (tok) ->
+    looksLikePath = tok.includes('/') or tok.startsWith('.') or isAbsolute(tok) or tok.endsWith('.rip') or tok.endsWith('.ts')
+    return undefined unless looksLikePath
+    try
+      abs = if isAbsolute(tok) then tok else resolve(process.cwd(), tok)
+      if existsSync(abs) then tok else undefined
+    catch
+      undefined
+
+  for i in [2...argv.length]
+    tok = argv[i]
+    unless appPathInput
+      if tok.includes('@') and not tok.startsWith('-')
+        [pathPart, aliasesPart] = tok.split('@')
+        maybe = tryResolveApp(pathPart)
+        if maybe
+          appPathInput = maybe
+          appAliases = aliasesPart.split(',').map((a) -> a.trim()).filter((a) -> a)
+          continue
+        else if not pathPart.includes('/') and not pathPart.startsWith('.')
+          appAliases = [pathPart].concat(aliasesPart.split(',').map((a) -> a.trim()).filter((a) -> a))
+          continue
+
+      maybe = tryResolveApp(tok)
+      if maybe
+        appPathInput = maybe
+        continue
+
+      unless isFlag(tok)
+        appAliases.push(tok)
+        continue
+
+    rawFlags.add(tok)
+
+  unless appPathInput
+    cwd = process.cwd()
+    indexRip = join(cwd, 'index.rip')
+    indexTs = join(cwd, 'index.ts')
+    if existsSync(indexRip)
+      appPathInput = indexRip
+    else if existsSync(indexTs)
+      appPathInput = indexTs
+    else
+      appPathInput = cwd
+
+  getKV = (prefix) ->
+    for f as rawFlags
+      return f.slice(prefix.length) if f.startsWith(prefix)
+    undefined
+
+  has = (name) -> rawFlags.has(name)
+
+  { baseDir, entryPath, appName } = resolveAppEntry(appPathInput, defaultEntryPath)
+  appAliases = [appName] if appAliases.length is 0
+
+  tokens = Array.from(rawFlags)
+  bareIntPort = null
+  hasHttpsKeyword = false
+  httpsPortToken = null
+  hasHttpKeyword = false
+  httpPortToken = null
+
+  for t in tokens
+    if /^\d+$/.test(t)
+      bareIntPort = parseInt(t)
+    else if t is 'https'
+      hasHttpsKeyword = true
+    else if t.startsWith('https:')
+      httpsPortToken = coerceInt(t.slice(6), 0)
+    else if t is 'http'
+      hasHttpKeyword = true
+    else if t.startsWith('http:')
+      httpPortToken = coerceInt(t.slice(5), 0)
+
+  httpsIntent = bareIntPort? or hasHttpsKeyword or httpsPortToken?
+  httpIntent = hasHttpKeyword or httpPortToken?
+  httpsIntent = true unless httpsIntent or httpIntent
+
+  httpPort = if httpIntent then (httpPortToken ?? bareIntPort ?? 0) else 0
+  httpsPortDerived = if not httpIntent then (bareIntPort or httpsPortToken or 0) else null
+
+  socketPrefixOverride = getKV('--socket-prefix=')
+  socketPrefix = socketPrefixOverride or "rip_#{appName}"
+
+  cores = cpus().length
+  workers = parseWorkersToken(getKV('w:'), Math.max(1, Math.floor(cores / 2)))
+
+  policy = parseRestartPolicy(
+    getKV('r:'),
+    coerceInt(process.env.RIP_MAX_REQUESTS, 10000),
+    coerceInt(process.env.RIP_MAX_SECONDS, 3600)
+  )
+
+  reload = not (has('--static') or process.env.RIP_STATIC is '1')
+
+  envValue = getKV('--env=')
+  envOverride = null
+  if envValue
+    normalized = envValue.toLowerCase()
+    envOverride = switch normalized
+      when 'prod', 'production' then 'production'
+      when 'dev', 'development' then 'development'
+      else normalized
+
+  watch = getKV('--watch=') or '*.rip'
+
+  httpsPort = do ->
+    kv = getKV('--https-port=')
+    return coerceInt(kv, 443) if kv?
+    httpsPortDerived
+
+  {
+    appPath: resolve(appPathInput)
+    appBaseDir: baseDir
+    appEntry: entryPath
+    appName
+    appAliases
+    workers
+    maxRequestsPerWorker: policy.maxRequests
+    maxSecondsPerWorker: policy.maxSeconds
+    httpPort
+    httpsPort
+    certPath: getKV('--cert=')
+    keyPath: getKV('--key=')
+    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))
+    connectTimeoutMs: coerceInt(getKV('--connect-timeout-ms='), coerceInt(process.env.RIP_CONNECT_TIMEOUT_MS, 2000))
+    readTimeoutMs: coerceInt(getKV('--read-timeout-ms='), coerceInt(process.env.RIP_READ_TIMEOUT_MS, 30000))
+    jsonLogging: has('--json-logging')
+    accessLog: not has('--no-access-log')
+    acme: has('--acme')
+    acmeStaging: has('--acme-staging')
+    acmeDomain: getKV('--acme-domain=')
+    realtimePath: getKV('--realtime-path=') or '/realtime'
+    publishSecret: getKV('--publish-secret=') or process.env.RIP_PUBLISH_SECRET or null
+    rateLimit: coerceInt(getKV('--rate-limit='), 0)
+    rateLimitWindow: coerceInt(getKV('--rate-limit-window='), 60000)
+    watch: watch
+    edgefilePath: getKV('--edgefile=')
+    checkConfig: has('--check-config')
+    envOverride: envOverride
+    debug: has('--debug')
+  }
+
 # --- Argv helpers ---
 
 export getKV = (argv, prefix) ->
@@ -51,6 +266,8 @@ export runHelpOutput = (argv) ->
     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
       --watch=<glob>          Watch glob pattern (default: *.rip)
       --static                Disable hot reload and file watching
       --env=<mode>            Set environment (dev, production)
@@ -84,6 +301,9 @@ export runHelpOutput = (argv) ->
       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
 
     If no index.rip or index.ts is found, a built-in static file server
     activates with directory indexes, auto-detected MIME types, and

package/control/control.rip

@@ -66,6 +66,15 @@ export handleWatchControl = (req, registerWatch, watchDirs) ->
       return { handled: true, response: jsonOk() }
   { handled: true, response: jsonBad() }
 
+export handleReloadControl = (req, result) ->
+  return { handled: false } unless req.method is 'POST'
+  body = JSON.stringify(result or { ok: false, result: 'rejected', reason: 'unknown' })
+  status = if result?.ok then 200 else 409
+  return {
+    handled: true
+    response: new Response(body, { status, headers: { 'content-type': 'application/json' } })
+  }
+
 export handleRegistryControl = (req, hostIndex) ->
   return { handled: false } unless req.method is 'GET'
   hostMap = {}

package/control/lifecycle.rip

@@ -60,9 +60,14 @@ export createCleanup = (pidFile, server, manager, unlinkSyncFn, fetchFn, process
     try unlinkSyncFn(pidFile)
     processObj.exit(0)
 
-export installShutdownHandlers = (cleanup, processObj) ->
+export installShutdownHandlers = (cleanup, processObj, onReload = null) ->
   processObj.on 'SIGTERM', cleanup
   processObj.on 'SIGINT', cleanup
+  if onReload
+    processObj.on 'SIGHUP', ->
+      try onReload!()
+      catch err
+        console.error 'rip-server: config reload failed:', err?.message or err
   processObj.on 'uncaughtException', (err) ->
     console.error 'rip-server: uncaught exception:', err
     cleanup()

package/control/watchers.rip

@@ -39,6 +39,16 @@ export broadcastWatchChange = (watchGroups, prefix, type = 'page') ->
     catch then dead.push(client)
   group.sseClients.delete(c) for c in dead
 
+# --- Code reload matching ---
+
+export shouldTriggerCodeReload = (filename, watchSpec, entryBase = null) ->
+  return false unless filename
+  return false if entryBase and filename is entryBase
+  if watchSpec?.startsWith('*.')
+    filename.endsWith(watchSpec.slice(1))
+  else
+    filename is watchSpec or filename.endsWith("/#{watchSpec}")
+
 # --- App directory watchers ---
 
 export registerAppWatchDirs = (appWatchers, prefix, dirs, server, cwdFn) ->

package/control/workers.rip

@@ -7,18 +7,22 @@ import { getWorkerSocketPath, getControlSocketPath } from './control.rip'
 
 # --- Spawn ---
 
-export spawnTrackedWorker = (flags, workerId, version, nowMsFn, importMetaPath, appId) ->
+export spawnTrackedWorker = (flags, workerId, version, nowMsFn, importMetaPath, appId, appConfig = {}) ->
   socketPath = getWorkerSocketPath(flags.socketPrefix, workerId)
   try unlinkSync(socketPath)
 
-  workerEnv = Object.assign {}, process.env,
+  appEntry = appConfig.entry or flags.appEntry
+  appBaseDir = appConfig.appBaseDir or flags.appBaseDir
+  workerEnvExtra = appConfig.env or {}
+
+  workerEnv = Object.assign {}, process.env, workerEnvExtra,
     RIP_WORKER_MODE: '1'
     WORKER_ID: String(workerId)
     SOCKET_PATH: socketPath
     SOCKET_PREFIX: flags.socketPrefix
     APP_ID: String(appId or flags.appName or 'default')
-    APP_ENTRY: flags.appEntry
-    APP_BASE_DIR: flags.appBaseDir
+    APP_ENTRY: appEntry
+    APP_BASE_DIR: workerEnvExtra.APP_BASE_DIR or appBaseDir
     MAX_REQUESTS: String(flags.maxRequestsPerWorker)
     MAX_SECONDS: String(flags.maxSecondsPerWorker)
     RIP_LOG_JSON: if flags.jsonLogging then '1' else '0'
@@ -31,7 +35,7 @@ export spawnTrackedWorker = (flags, workerId, version, nowMsFn, importMetaPath,
     cwd: process.cwd()
     env: workerEnv
 
-  { id: workerId, process: proc, socketPath, restartCount: 0, backoffMs: 1000, startedAt: nowMsFn() }
+  { id: workerId, process: proc, socketPath, restartCount: 0, backoffMs: 1000, startedAt: nowMsFn(), appId }
 
 # --- Health and control notifications ---
 

package/default.rip

@@ -425,7 +425,9 @@ notFound ->
 
   if stat.isDirectory()
     return new Response(null, { status: 301, headers: { Location: "#{reqPath}/" } }) unless reqPath.endsWith('/')
-    try return @send join(path, 'index.html'), 'text/html; charset=UTF-8' if statSync(join(path, 'index.html')).isFile()
+    indexPath = join(path, 'index.html')
+    if (try statSync(indexPath).isFile())
+      return @send indexPath, 'text/html; charset=UTF-8'
     return new Response renderIndex(reqPath, path), { headers: { 'Content-Type': 'text/html; charset=UTF-8' } }
 
   new Response 'Not Found', { status: 404 }