@rip-lang/server 0.8.1 → 0.8.3

package/README.md

@@ -424,9 +424,9 @@ Most settings are configured via CLI flags, but environment variables provide an
 | `RIP_MAX_REQUESTS` | `r:N,...` | `10000` | Max requests before worker recycle |
 | `RIP_MAX_SECONDS` | `r:...,Ns` | `3600` | Max seconds before worker recycle |
 | `RIP_MAX_QUEUE` | `--max-queue=` | `512` | Request queue limit |
-| `RIP_QUEUE_TIMEOUT_MS` | `--queue-timeout-ms=` | `2000` | Queue wait timeout (ms) |
-| `RIP_CONNECT_TIMEOUT_MS` | `--connect-timeout-ms=` | `20000` | Worker request timeout (ms) |
-| `RIP_READ_TIMEOUT_MS` | `--read-timeout-ms=` | `5000` | Worker read timeout (ms) |
+| `RIP_QUEUE_TIMEOUT_MS` | `--queue-timeout-ms=` | `30000` | Queue wait timeout (ms) |
+| `RIP_CONNECT_TIMEOUT_MS` | `--connect-timeout-ms=` | `2000` | Reserved for future use |
+| `RIP_READ_TIMEOUT_MS` | `--read-timeout-ms=` | `30000` | Worker read timeout (ms) |
 
 ## Dashboard
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rip-lang/server",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "Pure Rip application server — multi-worker, hot reload, HTTPS, mDNS",
   "type": "module",
   "main": "server.rip",

package/server.rip

@@ -340,9 +340,9 @@ parseFlags = (argv) ->
     reload
     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, 2000))
-    connectTimeoutMs: coerceInt(getKV('--connect-timeout-ms='), coerceInt(process.env.RIP_CONNECT_TIMEOUT_MS, 20000))
-    readTimeoutMs: coerceInt(getKV('--read-timeout-ms='), coerceInt(process.env.RIP_READ_TIMEOUT_MS, 5000))
+    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')
     watchGlob: watchGlob
@@ -876,20 +876,15 @@ class Server
   forwardOnce: (req, socketPath) ->
     inUrl = new URL(req.url)
     forwardUrl = "http://localhost#{inUrl.pathname}#{inUrl.search}"
-    controller = new AbortController()
-    connectTimer = setTimeout (-> controller.abort()), @flags.connectTimeoutMs
     readTimeoutMs = @flags.readTimeoutMs
 
     try
-      # Don't await fetch - we need to race the promise against timeout
-      fetchPromise = fetch(forwardUrl, { method: req.method, headers: req.headers, body: req.body, unix: socketPath, signal: controller.signal })
+      fetchPromise = fetch(forwardUrl, { method: req.method, headers: req.headers, body: req.body, unix: socketPath })
       readGuard = new Promise (_, rej) ->
         setTimeout (-> rej(new Error('Upstream timeout'))), readTimeoutMs
       res = Promise.race!([fetchPromise, readGuard])
-      clearTimeout(connectTimer)
       res
     catch err
-      clearTimeout(connectTimer)
       if err.message is 'Upstream timeout'
         return new Response('Gateway timeout', { status: 504 })
       throw err