@morojs/moro 1.8.12 → 1.8.14

package/dist/core/http/http-server.js

@@ -1,3 +1,4 @@
+import { bodyIsText } from './utils/body-type.js';
 import { createRequire } from 'module';
 import { promisify } from 'util';
 import { randomUUID } from 'crypto';
@@ -24,15 +25,21 @@ const http = requireBuiltin('http');
 const createServer = http.createServer;
 let gzipFn;
 let deflateFn;
+let gzipSyncFn;
+let deflateSyncFn;
 function compressors() {
     if (!gzipFn) {
         const zlib = requireBuiltin('zlib');
         gzipFn = promisify(zlib.gzip);
         deflateFn = promisify(zlib.deflate);
+        gzipSyncFn = (buf) => zlib.gzipSync(buf);
+        deflateSyncFn = (buf) => zlib.deflateSync(buf);
     }
     return {
         gzip: gzipFn,
         deflate: deflateFn,
+        gzipSync: gzipSyncFn,
+        deflateSync: deflateSyncFn,
     };
 }
 const JSON_CONTENT_TYPE = 'application/json; charset=utf-8';
@@ -115,6 +122,10 @@ export class MoroIncomingMessage extends http.IncomingMessage {
     body = null;
     path = '';
     _queryString = null;
+    /** The request body exactly as received, before any parsing; null when empty. */
+    get rawBody() {
+        return this._rawBody ?? null;
+    }
     // Single slot for every lazily-computed/assigned helper value (query,
     // cookies, requestId, hostname, ...). Allocated on first access - a plain
     // JSON GET that never touches the helpers never allocates it, and the
@@ -378,6 +389,28 @@ export class MoroServerResponse extends http.ServerResponse {
             const acceptEncoding = this.req?.headers['accept-encoding'];
             if (acceptEncoding && acceptEncoding.includes('gzip')) {
                 const buffer = Buffer.from(jsonString, 'utf8');
+                // A small body is compressed here and now rather than on the threadpool
+                // (see compressionMaxInlineBytes); a failure takes the async path below.
+                if (server.compressionMaxInlineBytes > 0 &&
+                    buffer.length <= server.compressionMaxInlineBytes) {
+                    let compressed;
+                    try {
+                        compressed = compressors().gzipSync(buffer);
+                    }
+                    catch {
+                        compressed = undefined;
+                    }
+                    if (compressed !== undefined) {
+                        this.writeHead(this.statusCode || 200, {
+                            'Content-Type': JSON_CONTENT_TYPE,
+                            'Content-Encoding': 'gzip',
+                            Vary: 'Accept-Encoding',
+                            'Content-Length': compressed.length,
+                        });
+                        this.end(compressed);
+                        return;
+                    }
+                }
                 compressors()
                     .gzip(buffer)
                     .then(compressed => {
@@ -410,6 +443,26 @@ export class MoroServerResponse extends http.ServerResponse {
             }
             else if (acceptEncoding && acceptEncoding.includes('deflate')) {
                 const buffer = Buffer.from(jsonString, 'utf8');
+                if (server.compressionMaxInlineBytes > 0 &&
+                    buffer.length <= server.compressionMaxInlineBytes) {
+                    let compressed;
+                    try {
+                        compressed = compressors().deflateSync(buffer);
+                    }
+                    catch {
+                        compressed = undefined;
+                    }
+                    if (compressed !== undefined) {
+                        this.writeHead(this.statusCode || 200, {
+                            'Content-Type': JSON_CONTENT_TYPE,
+                            'Content-Encoding': 'deflate',
+                            Vary: 'Accept-Encoding',
+                            'Content-Length': compressed.length,
+                        });
+                        this.end(compressed);
+                        return;
+                    }
+                }
                 compressors()
                     .deflate(buffer)
                     .then(compressed => {
@@ -899,6 +952,9 @@ export class MoroHttpServer {
     compressionEnabled = true;
     /** @internal read by MoroServerResponse prototype methods */
     compressionThreshold = 1024;
+    // Bodies at or below this size compress on the calling thread (Content-Length
+    // response); larger ones on the threadpool. 0 sends everything to the pool.
+    compressionMaxInlineBytes = 16384;
     /** @internal read by MoroIncomingMessage prototype methods */
     requestTrackingEnabled = true; // Generate request IDs
     /** @internal read by MoroServerResponse prototype methods */
@@ -1007,6 +1063,9 @@ export class MoroHttpServer {
             if (config.compression.threshold !== undefined) {
                 this.compressionThreshold = config.compression.threshold;
             }
+            if (config.compression.maxInlineBytes !== undefined) {
+                this.compressionMaxInlineBytes = config.compression.maxInlineBytes;
+            }
         }
         // Minimal mode - disable ALL overhead for pure speed
         if (config.minimal) {
@@ -1562,6 +1621,8 @@ export class MoroHttpServer {
                     const body = chunks.length === 1 && firstChunk !== undefined
                         ? firstChunk
                         : Buffer.concat(chunks, totalLength);
+                    if (totalLength > 0)
+                        req._rawBody = body;
                     if (contentType.includes('application/json')) {
                         // Empty JSON body -> null (parity with the engine/uWS servers, and
                         // avoids JSON.parse('') throwing and 500ing an empty POST).
@@ -1574,7 +1635,9 @@ export class MoroHttpServer {
                         resolve(this.parseMultipart(body, contentType));
                     }
                     else {
-                        resolve(body.toString());
+                        // Text decodes to a string; binary (octet-stream, images, protobuf,
+                        // ...) stays a Buffer - decoding it would corrupt it irreversibly.
+                        resolve(bodyIsText(contentType) ? body.toString() : body);
                     }
                 }
                 catch (error) {
@@ -1788,6 +1851,17 @@ export class MoroHttpServer {
     forceCleanup() {
         this.forceCleanupPools();
     }
+    /**
+     * Replace the TLS certificate/key for new handshakes (node's
+     * tls.Server#setSecureContext). Throws when the server is plain HTTP.
+     */
+    updateSsl(ssl) {
+        const server = this.server;
+        if (typeof server.setSecureContext !== 'function') {
+            throw new Error('updateSsl: this server was not started with TLS (server.ssl)');
+        }
+        server.setSecureContext(ssl);
+    }
     getServer() {
         return this.server;
     }