dsh-unlag 1.9.52 → 1.9.54

package/index.js

@@ -1312,6 +1312,7 @@ function serveBundlesAtCurrentRevision(ctx) {
     const ask = async (url) => {
       let held = null
       let body
+      const parts = []
       let failed = false
       if (url !== originalUrl) {
         try {
@@ -1329,10 +1330,51 @@ function serveBundlesAtCurrentRevision(ctx) {
           return realWriteHead.call(res, status, ...rest)
         }
       }
+      /**
+       * A held 404 can still be written to in pieces. Passing those pieces through would send the
+       * implicit 200 headers Node writes on a first `write`, and the real answer could then never
+       * be sent; so the pieces are kept with the body and the socket stays untouched.
+       */
+      const realWrite = res.write
+      // A held answer still owes the caller the callbacks it passed: dropping one would leave a
+      // handler that waits for the flush awaiting forever, and the fallback answer would never
+      // run. They are answered on the next turn once the held body is collected.
+      const answerCallback = (args) => {
+        for (let at = args.length - 1; at >= 0; at -= 1) {
+          if (typeof args[at] === 'function') {
+            const done = args[at]
+            try {
+              process.nextTick(() => {
+                try {
+                  done()
+                } catch {
+                  /* the caller's own callback failed; the document still needs its script */
+                }
+              })
+            } catch {
+              /* no event loop to defer on; the answer matters more than the callback */
+            }
+            return
+          }
+        }
+      }
+      if (typeof realWrite === 'function') {
+        res.write = (chunk, ...rest) => {
+          if (held !== null) {
+            if (typeof chunk === 'string' || Buffer.isBuffer(chunk)) parts.push(Buffer.from(chunk))
+            answerCallback(rest)
+            return true
+          }
+          return realWrite.call(res, chunk, ...rest)
+        }
+      }
       if (typeof realEnd === 'function') {
         res.end = (...args) => {
           if (held !== null) {
-            body = typeof args[0] === 'string' || Buffer.isBuffer(args[0]) ? args[0] : ''
+            const last = args[0]
+            if (typeof last === 'string' || Buffer.isBuffer(last)) parts.push(Buffer.from(last))
+            body = parts.length === 0 ? '' : Buffer.concat(parts)
+            answerCallback(args)
             return res
           }
           return realEnd.apply(res, args)
@@ -1346,6 +1388,7 @@ function serveBundlesAtCurrentRevision(ctx) {
       } finally {
         try {
           res.writeHead = realWriteHead
+          if (realWrite !== undefined) res.write = realWrite
           res.end = realEnd
         } catch {
           /* the response object owns its own shape */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-unlag",
-  "version": "1.9.52",
+  "version": "1.9.54",
   "type": "module",
   "description": "A press applies plugin edits right away and brings a laggy interface back; automatic reloading stays off unless you turn it on, so the press is the only trigger, and nothing restarts.",
   "license": "MIT",