@fluojs/runtime 1.0.0-beta.1 → 1.0.0-beta.11

package/dist/web.js

@@ -1,4 +1,5 @@
 import { BadRequestException, createErrorResponse, HttpException, InternalServerErrorException, PayloadTooLargeException } from '@fluojs/http';
+import { attachFrameworkRequestNativeRouteHandoff, consumeRawRequestNativeRouteHandoff } from '@fluojs/http/internal';
 import { parseMultipart } from './multipart.js';
 import { dispatchWithRequestResponseFactory } from './adapters/request-response-factory.js';
 const DEFAULT_MAX_BODY_SIZE = 1 * 1024 * 1024;
@@ -93,12 +94,12 @@ class MutableWebFrameworkResponse {
   statusCode;
   statusSet;
   finalizedResponse;
-  responseStream = new WebResponseStream(() => {
-    this.streamActive = true;
-  });
+  responseStream;
   responseBody;
   streamActive = false;
-  stream = this.responseStream;
+  get stream() {
+    return this.getOrCreateResponseStream();
+  }
   redirect(status, location) {
     this.setStatus(status);
     this.setHeader('Location', location);
@@ -116,6 +117,17 @@ class MutableWebFrameworkResponse {
     this.responseBody = serialized.payload;
     this.committed = true;
   }
+  async sendSimpleJson(body) {
+    if (this.finalizedResponse) {
+      this.committed = true;
+      return;
+    }
+    if (!hasHeader(this.headers, 'content-type')) {
+      this.setHeader('Content-Type', 'application/json; charset=utf-8');
+    }
+    this.responseBody = JSON.stringify(body);
+    this.committed = true;
+  }
   setHeader(name, value) {
     const existingHeaderName = findHeaderName(this.headers, name) ?? name;
     if (name.toLowerCase() === 'set-cookie') {
@@ -134,13 +146,19 @@ class MutableWebFrameworkResponse {
         headers: toResponseHeaders(this.headers),
         status: this.statusCode ?? 200
       };
-      const responseBody = this.responseBody instanceof Uint8Array ? this.responseBody.slice().buffer : this.responseBody;
-      this.finalizedResponse = this.streamActive ? new Response(this.responseStream.readable, init) : new Response(responseBody ?? '', init);
+      const nativeResponseBody = isResponseBodyForbidden(init.status) ? undefined : this.responseBody === undefined ? '' : this.responseBody;
+      this.finalizedResponse = this.streamActive ? new Response(this.getOrCreateResponseStream().readable, init) : new Response(nativeResponseBody, init);
       this.raw = this.finalizedResponse;
       this.committed = true;
     }
     return this.finalizedResponse;
   }
+  getOrCreateResponseStream() {
+    this.responseStream ??= new WebResponseStream(() => {
+      this.streamActive = true;
+    });
+    return this.responseStream;
+  }
 }
 
 /**
@@ -152,7 +170,10 @@ class MutableWebFrameworkResponse {
 export function createWebRequestResponseFactory(options = {}) {
   return {
     async createRequest(request, signal) {
-      return await createWebFrameworkRequest(request, signal, options.multipart, options.maxBodySize ?? DEFAULT_MAX_BODY_SIZE, options.rawBody ?? false);
+      return createDeferredWebFrameworkRequest(request, signal, options.multipart, options.maxBodySize ?? DEFAULT_MAX_BODY_SIZE, options.rawBody ?? false, options.preferNativeJsonBodyReader ?? false, options.consumeOriginalBody ?? false);
+    },
+    materializeRequest(request) {
+      return materializeWebFrameworkRequestBody(request);
     },
     createRequestSignal(signal) {
       return signal ?? new AbortController().signal;
@@ -180,13 +201,14 @@ export function createWebRequestResponseFactory(options = {}) {
 export async function dispatchWebRequest({
   dispatcher,
   dispatcherNotReadyMessage = 'Web adapter received a request before dispatcher binding completed.',
+  factory,
   request,
   ...options
 }) {
   const frameworkResponse = await dispatchWithRequestResponseFactory({
     dispatcher,
     dispatcherNotReadyMessage,
-    factory: createWebRequestResponseFactory(options),
+    factory: factory ?? createWebRequestResponseFactory(options),
     rawRequest: request,
     rawResponse: request.signal
   });
@@ -204,61 +226,176 @@ export async function dispatchWebRequest({
  * @returns The normalized framework request used by the dispatcher.
  */
 export async function createWebFrameworkRequest(request, signal, multipartOptions, maxBodySize = DEFAULT_MAX_BODY_SIZE, preserveRawBody = false) {
+  const frameworkRequest = createDeferredWebFrameworkRequest(request, signal, multipartOptions, maxBodySize, preserveRawBody);
+  await materializeWebFrameworkRequestBody(frameworkRequest);
+  return frameworkRequest;
+}
+
+/**
+ * Creates the cheap Web framework request shell before consuming the body stream.
+ *
+ * @param request - Native Web request to normalize.
+ * @param signal - Abort signal propagated to the framework request.
+ * @param multipartOptions - Multipart parser options applied when materializing multipart requests.
+ * @param maxBodySize - Maximum allowed non-multipart body size in bytes.
+ * @param preserveRawBody - Whether materialization should retain raw request body bytes.
+ * @returns The framework request shell with metadata snapshotted and body materialization deferred.
+ */
+function createDeferredWebFrameworkRequest(request, signal, multipartOptions, maxBodySize = DEFAULT_MAX_BODY_SIZE, preserveRawBody = false, preferNativeJsonBodyReader = false, consumeOriginalBody = false) {
   const url = new URL(request.url);
-  const headers = cloneWebHeaders(request.headers);
-  const contentType = request.headers.get('content-type') ?? undefined;
+  const requestHeaders = new Headers(request.headers);
+  const method = request.method;
+  const headers = createMemoizedValue(() => cloneWebHeaders(requestHeaders));
+  const cookies = createMemoizedValue(() => parseCookieHeader(requestHeaders.get('cookie') ?? undefined));
+  const query = createMemoizedValue(() => parseQueryString(url.search));
+  const contentType = requestHeaders.get('content-type') ?? undefined;
   const isMultipart = typeof contentType === 'string' && contentType.includes('multipart/form-data');
-  let body;
-  let files;
-  let rawBody;
-  if (isMultipart) {
-    const result = await parseMultipart(request.clone(), {
-      ...multipartOptions,
-      maxTotalSize: multipartOptions?.maxTotalSize ?? maxBodySize
-    });
-    body = result.fields;
-    files = result.files;
-  } else {
-    const bodyResult = await readWebRequestBody(request.clone(), contentType, maxBodySize, preserveRawBody);
-    body = bodyResult.body;
-    rawBody = bodyResult.rawBody;
-  }
+  const hasRequestBody = request.body !== null;
+  const materializeBody = hasRequestBody ? createMemoizedAsyncValue(async () => {
+    if (isMultipart) {
+      const materializedRequest = request.clone();
+      const result = await parseMultipart(createRequestWithSnapshotMetadata(materializedRequest, request.url, method, requestHeaders), {
+        ...multipartOptions,
+        maxTotalSize: multipartOptions?.maxTotalSize ?? maxBodySize
+      });
+      frameworkRequest.body = result.fields;
+      frameworkRequest.files = result.files;
+      return;
+    }
+    validateWebRequestContentLength(request, maxBodySize);
+    if (!request.body) {
+      frameworkRequest.body = undefined;
+      return;
+    }
+    const requestToRead = consumeOriginalBody ? request : request.clone();
+    const bodyResult = await readWebRequestBody(requestToRead, contentType, maxBodySize, preserveRawBody, preferNativeJsonBodyReader);
+    frameworkRequest.body = bodyResult.body;
+    if (bodyResult.rawBody) {
+      frameworkRequest.rawBody = bodyResult.rawBody;
+    }
+  }) : undefined;
   const frameworkRequest = {
-    body,
-    cookies: parseCookieHeader(request.headers.get('cookie') ?? undefined),
-    headers,
-    method: request.method,
+    get cookies() {
+      return cookies();
+    },
+    get headers() {
+      return headers();
+    },
+    method,
     params: {},
     path: url.pathname,
-    query: parseQueryParams(url.searchParams),
+    get query() {
+      return query();
+    },
     raw: request,
+    requestId: requestHeaders.get('x-request-id') ?? undefined,
     signal,
-    url: url.pathname + url.search
+    url: url.pathname + url.search,
+    materializeBody
   };
-  if (files) {
-    frameworkRequest.files = files;
+  if (!hasRequestBody) {
+    frameworkRequest.body = undefined;
   }
-  if (rawBody) {
-    frameworkRequest.rawBody = rawBody;
+  const nativeRouteHandoff = consumeRawRequestNativeRouteHandoff(request);
+  return nativeRouteHandoff ? attachFrameworkRequestNativeRouteHandoff(frameworkRequest, nativeRouteHandoff) : frameworkRequest;
+}
+function createRequestWithSnapshotMetadata(request, url, method, headers) {
+  const init = {
+    headers: new Headers(headers),
+    method
+  };
+  if (request.body) {
+    init.body = request.body;
+    init.duplex = 'half';
   }
-  return frameworkRequest;
+  return new Request(url, init);
 }
-function parseQueryParams(searchParams) {
+function validateWebRequestContentLength(request, maxBodySize) {
+  const contentLength = request.headers.get('content-length');
+  if (contentLength === null) {
+    return;
+  }
+  const parsedContentLength = Number(contentLength);
+  if (Number.isFinite(parsedContentLength) && parsedContentLength > maxBodySize) {
+    throw new PayloadTooLargeException(REQUEST_BODY_LIMIT_MESSAGE);
+  }
+}
+
+/**
+ * Materializes a deferred Web framework request body exactly once.
+ *
+ * @param request - Framework request returned by {@link createDeferredWebFrameworkRequest}.
+ * @returns A promise that settles after body, rawBody, and files fields are populated when applicable.
+ */
+async function materializeWebFrameworkRequestBody(request) {
+  await request.materializeBody?.();
+  delete request.materializeBody;
+}
+function createMemoizedValue(factory) {
+  let initialized = false;
+  let value;
+  return () => {
+    if (!initialized) {
+      value = factory();
+      initialized = true;
+    }
+    return value;
+  };
+}
+function createMemoizedAsyncValue(factory) {
+  let promise;
+  return () => {
+    promise ??= factory();
+    return promise;
+  };
+}
+function parseQueryString(search) {
   const query = {};
-  for (const [key, value] of searchParams.entries()) {
-    const current = query[key];
-    if (current === undefined) {
-      query[key] = value;
-      continue;
+  if (search.length <= 1) {
+    return query;
+  }
+  let index = search.charCodeAt(0) === 63 ? 1 : 0;
+  while (index <= search.length) {
+    let nextDelimiter = search.indexOf('&', index);
+    if (nextDelimiter === -1) {
+      nextDelimiter = search.length;
     }
-    if (Array.isArray(current)) {
-      current.push(value);
-      continue;
+    const entry = search.slice(index, nextDelimiter);
+    if (entry.length > 0) {
+      const separatorIndex = entry.indexOf('=');
+      const rawKey = separatorIndex === -1 ? entry : entry.slice(0, separatorIndex);
+      const rawValue = separatorIndex === -1 ? '' : entry.slice(separatorIndex + 1);
+      const key = decodeQueryComponent(rawKey, 'key');
+      const value = decodeQueryComponent(rawValue, 'value');
+      const current = query[key];
+      if (current === undefined) {
+        query[key] = value;
+      } else if (Array.isArray(current)) {
+        current.push(value);
+      } else {
+        query[key] = [current, value];
+      }
     }
-    query[key] = [current, value];
+    index = nextDelimiter + 1;
   }
   return query;
 }
+function decodeQueryComponent(value, kind) {
+  const normalizedValue = value.includes('+') ? value.replaceAll('+', ' ') : value;
+  try {
+    return decodeURIComponent(normalizedValue);
+  } catch {
+    return decodeQueryComponentLikeUrlSearchParams(value, kind);
+  }
+}
+function decodeQueryComponentLikeUrlSearchParams(value, kind) {
+  if (kind === 'key') {
+    const params = new URLSearchParams(`${value}=`);
+    return params.keys().next().value ?? '';
+  }
+  const params = new URLSearchParams(`x=${value}`);
+  return params.get('x') ?? '';
+}
 function cloneWebHeaders(headers) {
   const clonedHeaders = {};
   for (const [name, value] of headers.entries()) {
@@ -285,20 +422,23 @@ function parseCookieHeader(cookieHeader) {
     return [pair.slice(0, index).trim(), decodeCookieValue(pair.slice(index + 1).trim())];
   }));
 }
-async function readWebRequestBody(request, contentType, maxBodySize = DEFAULT_MAX_BODY_SIZE, preserveRawBody = false) {
-  const contentLength = request.headers.get('content-length');
-  if (contentLength !== null) {
-    const parsedContentLength = Number(contentLength);
-    if (Number.isFinite(parsedContentLength) && parsedContentLength > maxBodySize) {
-      throw new PayloadTooLargeException(REQUEST_BODY_LIMIT_MESSAGE);
-    }
-  }
+async function readWebRequestBody(request, contentType, maxBodySize = DEFAULT_MAX_BODY_SIZE, preserveRawBody = false, preferNativeJsonBodyReader = false) {
+  validateWebRequestContentLength(request, maxBodySize);
   if (!request.body) {
     return {
       body: undefined
     };
   }
-  const rawBody = await readByteLimitedStream(request.body, maxBodySize);
+  if (!preserveRawBody && isJsonContentType(contentType) && (preferNativeJsonBodyReader || isContentLengthWithinLimit(request, maxBodySize))) {
+    const rawBody = new Uint8Array(await request.arrayBuffer());
+    if (rawBody.byteLength > maxBodySize) {
+      throw new PayloadTooLargeException(REQUEST_BODY_LIMIT_MESSAGE);
+    }
+    return parseWebRequestRawBody(rawBody, contentType, preserveRawBody);
+  }
+  return parseWebRequestRawBody(await readByteLimitedStream(request.body, maxBodySize), contentType, preserveRawBody);
+}
+function parseWebRequestRawBody(rawBody, contentType, preserveRawBody) {
   if (rawBody.byteLength === 0) {
     return {
       body: undefined
@@ -311,7 +451,7 @@ async function readWebRequestBody(request, contentType, maxBodySize = DEFAULT_MA
       rawBody: preserveRawBody ? rawBody : undefined
     };
   }
-  if (typeof contentType === 'string' && contentType.includes('application/json')) {
+  if (isJsonContentType(contentType)) {
     try {
       return {
         body: JSON.parse(bodyText),
@@ -326,6 +466,14 @@ async function readWebRequestBody(request, contentType, maxBodySize = DEFAULT_MA
     rawBody: preserveRawBody ? rawBody : undefined
   };
 }
+function isContentLengthWithinLimit(request, maxBodySize) {
+  const contentLength = request.headers.get('content-length');
+  if (contentLength === null) {
+    return false;
+  }
+  const parsedContentLength = Number(contentLength);
+  return Number.isFinite(parsedContentLength) && parsedContentLength > 0 && parsedContentLength <= maxBodySize;
+}
 async function readByteLimitedStream(stream, maxBodySize) {
   const reader = stream.getReader();
   const chunks = [];
@@ -376,6 +524,9 @@ function findHeaderName(headers, name) {
 function hasHeader(headers, name) {
   return findHeaderName(headers, name) !== undefined;
 }
+function isResponseBodyForbidden(status) {
+  return status === 204 || status === 205 || status === 304;
+}
 function toResponseHeaders(headers) {
   const responseHeaders = new Headers();
   for (const [name, value] of Object.entries(headers)) {

package/package.json

@@ -9,7 +9,7 @@
     "module-graph",
     "orchestration"
   ],
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.11",
   "private": false,
   "license": "MIT",
   "repository": {
@@ -67,14 +67,14 @@
     "dist"
   ],
   "dependencies": {
-    "@fluojs/core": "^1.0.0-beta.1",
-    "@fluojs/config": "^1.0.0-beta.1",
-    "@fluojs/di": "^1.0.0-beta.1",
-    "@fluojs/http": "^1.0.0-beta.1"
+    "@fluojs/config": "^1.0.0-beta.6",
+    "@fluojs/core": "^1.0.0-beta.4",
+    "@fluojs/di": "^1.0.0-beta.6",
+    "@fluojs/http": "^1.0.0-beta.10"
   },
   "devDependencies": {
     "vitest": "^3.2.4",
-    "@fluojs/serialization": "^1.0.0-beta.1"
+    "@fluojs/serialization": "^1.0.0-beta.5"
   },
   "scripts": {
     "prebuild": "node ../../tooling/scripts/clean-dist.mjs",