@fluojs/platform-fastify 1.0.0-beta.6 → 1.0.0-beta.8

package/dist/adapter.d.ts

@@ -88,6 +88,7 @@ export declare class FastifyHttpApplicationAdapter implements HttpApplicationAda
     private registerWildcardFallbackRoute;
     private listenWithRetry;
     private handleRequest;
+    private handleNativeRouteRequest;
 }
 /**
  * Create the recommended Fastify adapter for `FluoFactory.create(...)`.

package/dist/adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}

package/dist/adapter.js

@@ -4,6 +4,7 @@ import fastify from 'fastify';
 import { createServerBackedHttpAdapterRealtimeCapability, createErrorResponse, HttpException, InternalServerErrorException, PayloadTooLargeException } from '@fluojs/http';
 import { attachFrameworkRequestNativeRouteHandoff, bindRawRequestNativeRouteHandoff, consumeRawRequestNativeRouteHandoff, isRoutePathNormalizationSensitive } from '@fluojs/http/internal';
 import { createNodeShutdownSignalRegistration, defaultNodeShutdownSignals } from '@fluojs/runtime/node';
+import { cloneHeaderValue, createDeferredFrameworkRequestShell, createMemoizedAsyncValue, createMemoizedValue, parseQueryParamsFromSearch, snapshotSimpleQueryRecord, splitRawRequestUrl } from '@fluojs/runtime/internal-node';
 import { bootstrapHttpAdapterApplication, runHttpAdapterApplication } from '@fluojs/runtime/internal/http-adapter';
 import { dispatchWithRequestResponseFactory } from '@fluojs/runtime/internal/request-response-factory';
 
@@ -18,6 +19,7 @@ import { dispatchWithRequestResponseFactory } from '@fluojs/runtime/internal/req
 const DEFAULT_MAX_BODY_SIZE = 1 * 1024 * 1024;
 const DEFAULT_SHUTDOWN_TIMEOUT_MS = 10_000;
 const FASTIFY_NATIVE_ROUTE_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD'];
+const EMPTY_NATIVE_ROUTE_PARAMS = Object.freeze({});
 
 /**
  * Bootstrap options for creating a Fastify-backed application without
@@ -103,13 +105,11 @@ export class FastifyHttpApplicationAdapter {
     for (const route of createFastifyNativeRoutes(descriptors)) {
       this.app.route({
         handler: async (request, reply) => {
-          const requestPath = readRequestPathFromRawUrl(request.raw.url);
+          const urlParts = splitRawRequestUrl(request.raw.url ?? '/');
           const params = normalizeNativeRouteParams(request.params);
-          if (!isRoutePathNormalizationSensitive(requestPath) && !hasNativeRouteParamSeparators(params)) {
-            bindRawRequestNativeRouteHandoff(request.raw, {
-              descriptor: route.descriptor,
-              params
-            });
+          if (!isRoutePathNormalizationSensitive(urlParts.path) && !hasNativeRouteParamSeparators(params)) {
+            await this.handleNativeRouteRequest(route.descriptor, params, urlParts, request, reply);
+            return;
           }
           await this.handleRequest(request, reply);
         },
@@ -148,6 +148,128 @@ export class FastifyHttpApplicationAdapter {
       rawResponse: reply
     });
   }
+  async handleNativeRouteRequest(descriptor, params, urlParts, request, reply) {
+    if (isMultipartRequestContentType(request.raw.headers['content-type'])) {
+      bindRawRequestNativeRouteHandoff(request.raw, {
+        descriptor,
+        params
+      });
+      await this.handleRequest(request, reply);
+      return;
+    }
+    const dispatcher = this.dispatcher;
+    if (!dispatcher?.dispatchNativeRoute) {
+      bindRawRequestNativeRouteHandoff(request.raw, {
+        descriptor,
+        params
+      });
+      await this.handleRequest(request, reply);
+      return;
+    }
+    const factory = this.requestResponseFactory;
+    const frameworkResponse = factory.createResponse(reply, request);
+    const lazySignal = createLazyFastifyRequestSignal(reply, factory.createRequestSignal);
+    try {
+      const frameworkRequest = createNativeFastFrameworkRequest(request, lazySignal, urlParts, this.maxBodySize, this.preserveRawBody) ?? (await factory.createRequest(request, lazySignal.signal()));
+      if (!isNativeFastFrameworkRequest(frameworkRequest)) {
+        await factory.materializeRequest?.(frameworkRequest);
+      }
+      const handled = await dispatcher.dispatchNativeRoute({
+        descriptor,
+        params
+      }, frameworkRequest, frameworkResponse);
+      if (!handled) {
+        bindRawRequestNativeRouteHandoff(request.raw, {
+          descriptor,
+          params
+        });
+        await this.handleRequest(request, reply);
+        return;
+      }
+      if (!frameworkResponse.committed) {
+        await frameworkResponse.send(undefined);
+      }
+    } catch (error) {
+      if (lazySignal.isAborted() || frameworkResponse.committed) {
+        return;
+      }
+      await factory.writeErrorResponse(error, frameworkResponse, factory.resolveRequestId(request));
+    }
+  }
+}
+function createNativeFastFrameworkRequest(request, lazySignal, urlParts, maxBodySize, preserveRawBody) {
+  const contentType = request.headers['content-type'];
+  if (preserveRawBody || isFastifyMultipartRequest(request) || isMultipartRequestContentType(contentType)) {
+    return undefined;
+  }
+  const contentLength = Number(request.headers['content-length']);
+  if (Number.isFinite(contentLength) && contentLength > maxBodySize) {
+    throw new PayloadTooLargeException('Request body exceeds the size limit.');
+  }
+  const frameworkRequest = createDeferredFrameworkRequestShell({
+    cookieHeader: cloneHeaderValue(request.headers.cookie),
+    headersFactory: () => normalizeHeaders(cloneRequestHeaders(request.headers)),
+    method: request.method,
+    path: urlParts.path,
+    query: readSimpleQueryRecord(request.query),
+    queryFactory: () => parseQueryParamsFromSearch(urlParts.search),
+    raw: request.raw,
+    requestId: resolvePrimaryRequestIdFromHeaders(request.raw.headers),
+    signal: lazySignal.signal,
+    url: urlParts.path + urlParts.search
+  });
+  frameworkRequest.body = request.body;
+  frameworkRequest.isAborted = lazySignal.isAborted;
+  markNativeFastFrameworkRequest(frameworkRequest);
+  return frameworkRequest;
+}
+function createLazyFastifyRequestSignal(reply, signalFactory) {
+  let signal;
+  return {
+    isAborted() {
+      return signal?.aborted ?? isFastifyReplyAborted(reply);
+    },
+    signal() {
+      if (!signal) {
+        signal = isFastifyReplyAborted(reply) ? AbortSignal.abort(new Error('Response closed before response commit.')) : signalFactory(reply);
+      }
+      return signal;
+    }
+  };
+}
+function isFastifyReplyAborted(reply) {
+  return reply.raw.destroyed && !reply.raw.writableEnded;
+}
+const NATIVE_FAST_FRAMEWORK_REQUEST = Symbol('fluo.fastify.nativeFastFrameworkRequest');
+function markNativeFastFrameworkRequest(request) {
+  request[NATIVE_FAST_FRAMEWORK_REQUEST] = true;
+}
+function isNativeFastFrameworkRequest(request) {
+  return request[NATIVE_FAST_FRAMEWORK_REQUEST] === true;
+}
+function isFastifyMultipartRequest(request) {
+  const probe = request.isMultipart;
+  return typeof probe === 'function' && probe.call(request) === true;
+}
+function readSimpleQueryRecord(query) {
+  if (typeof query !== 'object' || query === null) {
+    return undefined;
+  }
+  const record = query;
+  for (const key in record) {
+    if (!Object.prototype.hasOwnProperty.call(record, key)) {
+      continue;
+    }
+    const value = record[key];
+    if (typeof value === 'string') {
+      continue;
+    }
+    if (Array.isArray(value) && value.every(item => typeof item === 'string')) {
+      continue;
+    }
+    return undefined;
+  }
+  return record;
 }
 function createFastifyRequestResponseFactory(multipartOptions, maxBodySize = DEFAULT_MAX_BODY_SIZE, preserveRawBody = false) {
   return {
@@ -270,65 +392,71 @@ export async function runFastifyApplication(rootModule, options) {
     shutdownRegistration: createNodeShutdownSignalRegistration(options.shutdownSignals ?? defaultNodeShutdownSignals())
   }, adapter);
 }
-function createFrameworkResponse(reply) {
-  let activeStream;
-  return {
-    committed: reply.sent,
-    headers: {},
-    raw: reply,
-    get stream() {
-      activeStream ??= createFrameworkResponseStream(reply);
-      return activeStream;
-    },
-    redirect(status, location) {
-      this.setStatus(status);
-      this.setHeader('Location', location);
-      this.committed = true;
-      reply.redirect(location, status);
-    },
-    async send(body) {
-      if (reply.sent) {
-        this.committed = true;
-        return;
-      }
-      const existingContentType = reply.getHeader('content-type');
-      const serialized = serializeResponseBody(body, typeof existingContentType === 'string' ? existingContentType : undefined);
-      if (!reply.hasHeader('content-type') && serialized.defaultContentType) {
-        reply.header('content-type', serialized.defaultContentType);
-      }
+class MutableFastifyFrameworkResponse {
+  committed;
+  headers = {};
+  raw;
+  statusCode;
+  statusSet = false;
+  activeStream;
+  constructor(reply) {
+    this.reply = reply;
+    this.committed = reply.sent;
+    this.raw = reply;
+  }
+  get stream() {
+    this.activeStream ??= createFrameworkResponseStream(this.reply);
+    return this.activeStream;
+  }
+  redirect(status, location) {
+    this.setStatus(status);
+    this.setHeader('Location', location);
+    this.committed = true;
+    this.reply.redirect(location, status);
+  }
+  send(body) {
+    if (this.reply.sent) {
       this.committed = true;
-      await reply.send(serialized.payload);
-    },
-    async sendSimpleJson(body) {
-      if (reply.sent) {
-        this.committed = true;
-        return;
-      }
-      if (!reply.hasHeader('content-type')) {
-        reply.header('content-type', 'application/json; charset=utf-8');
-      }
+      return;
+    }
+    const existingContentType = this.reply.getHeader('content-type');
+    const serialized = serializeResponseBody(body, typeof existingContentType === 'string' ? existingContentType : undefined);
+    if (!this.reply.hasHeader('content-type') && serialized.defaultContentType) {
+      this.reply.header('content-type', serialized.defaultContentType);
+    }
+    this.committed = true;
+    void this.reply.send(serialized.payload);
+  }
+  sendSimpleJson(body) {
+    if (this.reply.sent) {
       this.committed = true;
-      await reply.send(JSON.stringify(body));
-    },
-    setHeader(name, value) {
-      const lowerName = name.toLowerCase();
-      if (lowerName === 'set-cookie') {
-        const merged = mergeSetCookieHeader(reply.getHeader(name), value);
-        reply.header(name, merged);
-        this.headers[name] = merged;
-        return;
-      }
-      reply.header(name, value);
-      this.headers[name] = value;
-    },
-    setStatus(code) {
-      reply.status(code);
-      this.statusCode = code;
-      this.statusSet = true;
-    },
-    statusCode: undefined,
-    statusSet: false
-  };
+      return;
+    }
+    if (!this.reply.hasHeader('content-type')) {
+      this.reply.header('content-type', 'application/json; charset=utf-8');
+    }
+    this.committed = true;
+    void this.reply.send(JSON.stringify(body));
+  }
+  setHeader(name, value) {
+    const lowerName = name.toLowerCase();
+    if (lowerName === 'set-cookie') {
+      const merged = mergeSetCookieHeader(this.reply.getHeader(name), value);
+      this.reply.header(name, merged);
+      this.headers[name] = merged;
+      return;
+    }
+    this.reply.header(name, value);
+    this.headers[name] = value;
+  }
+  setStatus(code) {
+    this.reply.status(code);
+    this.statusCode = code;
+    this.statusSet = true;
+  }
+}
+function createFrameworkResponse(reply) {
+  return new MutableFastifyFrameworkResponse(reply);
 }
 function createFrameworkResponseStream(reply) {
   let hijacked = false;
@@ -395,11 +523,11 @@ function createDeferredFrameworkRequest(request, signal, multipartOptions, maxBo
   const urlParts = splitRawRequestUrl(rawUrl);
   const headerSnapshot = cloneRequestHeaders(request.headers);
   const headers = createMemoizedValue(() => normalizeHeaders(headerSnapshot));
-  const cookieHeader = cloneHeaderValue(headerSnapshot.cookie);
-  const cookies = createMemoizedValue(() => parseCookieHeader(cookieHeader));
-  const query = createMemoizedValue(() => parseQueryParamsFromSearch(urlParts.search));
+  const querySnapshot = snapshotSimpleQueryRecord(request.query);
   const isMultipart = isMultipartRequestContentType(headerSnapshot['content-type']);
-  const materializeBody = createMemoizedAsyncValue(async () => {
+  let frameworkRequest;
+  const needsDeferredBodyMaterialization = isMultipart || preserveRawBody;
+  const materializeBody = needsDeferredBodyMaterialization ? createMemoizedAsyncValue(async () => {
     let body = request.body;
     let files;
     if (isMultipart) {
@@ -420,25 +548,23 @@ function createDeferredFrameworkRequest(request, signal, multipartOptions, maxBo
         frameworkRequest.rawBody = rawBodyValue;
       }
     }
-  });
-  const frameworkRequest = {
-    get cookies() {
-      return cookies();
-    },
-    get headers() {
-      return headers();
-    },
+  }) : undefined;
+  frameworkRequest = createDeferredFrameworkRequestShell({
+    cookieHeader: cloneHeaderValue(headerSnapshot.cookie),
+    headersFactory: headers,
+    materializeBody,
     method: request.method,
-    params: {},
     path: urlParts.path,
-    get query() {
-      return query();
-    },
+    query: querySnapshot,
+    queryFactory: () => parseQueryParamsFromSearch(urlParts.search),
     raw: request.raw,
+    requestId: resolvePrimaryRequestIdFromHeaders(headerSnapshot),
     signal,
-    url: urlParts.path + urlParts.search,
-    materializeBody
-  };
+    url: urlParts.path + urlParts.search
+  });
+  if (!needsDeferredBodyMaterialization) {
+    frameworkRequest.body = request.body;
+  }
   const nativeRouteHandoff = consumeRawRequestNativeRouteHandoff(request.raw);
   return nativeRouteHandoff ? attachFrameworkRequestNativeRouteHandoff(frameworkRequest, nativeRouteHandoff) : frameworkRequest;
 }
@@ -448,12 +574,29 @@ async function materializeFrameworkRequestBody(request) {
 }
 function normalizeNativeRouteParams(params) {
   if (typeof params !== 'object' || params === null) {
-    return {};
+    return EMPTY_NATIVE_ROUTE_PARAMS;
   }
-  return Object.fromEntries(Object.entries(params).flatMap(([key, value]) => typeof value === 'string' ? [[key, value]] : value === undefined ? [] : [[key, String(value)]]));
+  let normalized;
+  for (const key in params) {
+    if (!Object.prototype.hasOwnProperty.call(params, key)) {
+      continue;
+    }
+    const value = params[key];
+    if (value === undefined) {
+      continue;
+    }
+    normalized ??= {};
+    normalized[key] = typeof value === 'string' ? value : String(value);
+  }
+  return normalized ?? EMPTY_NATIVE_ROUTE_PARAMS;
 }
 function hasNativeRouteParamSeparators(params) {
-  return Object.values(params).some(value => value.includes('/'));
+  for (const key in params) {
+    if (Object.prototype.hasOwnProperty.call(params, key) && params[key]?.includes('/')) {
+      return true;
+    }
+  }
+  return false;
 }
 function collectVersionSensitiveRouteKeys(descriptors) {
   const grouped = new Map();
@@ -472,9 +615,6 @@ function collectVersionSensitiveRouteKeys(descriptors) {
   }
   return new Set([...grouped.entries()].filter(([, current]) => current.count > 1 || current.hasVersioned).map(([routeKey]) => routeKey));
 }
-function readRequestPathFromRawUrl(rawUrl) {
-  return splitRawRequestUrl(rawUrl ?? '/').path;
-}
 async function parseMultipartRequest(request, options = {}) {
   const fields = {};
   const files = [];
@@ -568,92 +708,9 @@ function normalizeHeaders(headers) {
   }
   return normalized;
 }
-function parseQueryParamsFromSearch(search) {
-  return parseQueryParams(new URLSearchParams(search));
-}
-function parseQueryParams(searchParams) {
-  const query = {};
-  for (const [key, value] of searchParams.entries()) {
-    const current = query[key];
-    if (current === undefined) {
-      query[key] = value;
-      continue;
-    }
-    if (Array.isArray(current)) {
-      current.push(value);
-      continue;
-    }
-    query[key] = [current, value];
-  }
-  return query;
-}
-function parseCookieHeader(cookieHeader) {
-  const normalizedCookieHeader = Array.isArray(cookieHeader) ? cookieHeader.join('; ') : cookieHeader;
-  if (!normalizedCookieHeader) {
-    return {};
-  }
-  return Object.fromEntries(normalizedCookieHeader.split(';').map(pair => pair.trim()).filter(Boolean).map(pair => {
-    const index = pair.indexOf('=');
-    if (index === -1) {
-      return [pair.trim(), ''];
-    }
-    const rawValue = pair.slice(index + 1).trim();
-    try {
-      return [pair.slice(0, index).trim(), decodeURIComponent(rawValue)];
-    } catch {
-      return [pair.slice(0, index).trim(), rawValue];
-    }
-  }));
-}
-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 cloneHeaderValue(value) {
-  return Array.isArray(value) ? [...value] : value;
-}
 function cloneRequestHeaders(headers) {
   return Object.fromEntries(Object.entries(headers).map(([name, value]) => [name, cloneHeaderValue(value)]));
 }
-function splitRawRequestUrl(rawUrl) {
-  if (rawUrl.startsWith('http://') || rawUrl.startsWith('https://')) {
-    const url = new URL(rawUrl);
-    return {
-      path: url.pathname,
-      search: url.search
-    };
-  }
-  const queryStart = rawUrl.indexOf('?');
-  const hashStart = rawUrl.indexOf('#');
-  const pathEndCandidates = [queryStart, hashStart].filter(index => index >= 0);
-  const pathEnd = pathEndCandidates.length > 0 ? Math.min(...pathEndCandidates) : rawUrl.length;
-  const path = rawUrl.slice(0, pathEnd) || '/';
-  if (queryStart === -1) {
-    return {
-      path,
-      search: ''
-    };
-  }
-  const searchEnd = hashStart >= 0 && hashStart > queryStart ? hashStart : rawUrl.length;
-  return {
-    path,
-    search: rawUrl.slice(queryStart, searchEnd)
-  };
-}
 function setMultiValue(target, key, value) {
   const existing = target[key];
   if (existing === undefined) {
@@ -684,6 +741,10 @@ function resolveRequestIdFromHeaders(headers) {
   const requestId = headers['x-request-id'] ?? headers['x-correlation-id'];
   return Array.isArray(requestId) ? requestId[0] : requestId;
 }
+function resolvePrimaryRequestIdFromHeaders(headers) {
+  const requestId = headers['x-request-id'];
+  return Array.isArray(requestId) ? requestId[0] : requestId;
+}
 function createFastifyApp(httpsOptions, maxBodySize) {
   if (httpsOptions) {
     return fastify({

package/package.json

@@ -8,7 +8,7 @@
     "platform",
     "server"
   ],
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.8",
   "private": false,
   "license": "MIT",
   "repository": {
@@ -38,8 +38,8 @@
     "@fastify/multipart": "^9.2.1",
     "fastify": "^5.8.5",
     "fastify-raw-body": "^5.0.0",
-    "@fluojs/http": "^1.0.0-beta.4",
-    "@fluojs/runtime": "^1.0.0-beta.6"
+    "@fluojs/http": "^1.0.0-beta.6",
+    "@fluojs/runtime": "^1.0.0-beta.8"
   },
   "devDependencies": {
     "vitest": "^3.2.4",