@telorun/http-server 0.1.3 → 0.1.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @telorun/http-server
 
+## 0.1.5
+
+### Patch Changes
+
+- Automated release.
+- Updated dependencies
+  - @telorun/sdk@0.2.6
+
+## 0.1.4
+
+### Patch Changes
+
+- Automated release.
+- Updated dependencies
+  - @telorun/sdk@0.2.5
+
 ## 0.1.3
 
 ### Patch Changes

package/dist/http-api-controller.d.ts

@@ -1,6 +1,32 @@
 import { Static } from "@sinclair/typebox";
-import { ControllerContext, ResourceContext, ResourceInstance } from "@telorun/sdk";
-import { FastifyInstance } from "fastify";
+import { ControllerContext, Invocable, KindRef, ResourceContext, ResourceInstance } from "@telorun/sdk";
+import { FastifyInstance, FastifyReply } from "fastify";
+declare const HttpApiRouteManifest: import("@sinclair/typebox").TObject<{
+    request: import("@sinclair/typebox").TObject<{
+        path: import("@sinclair/typebox").TString;
+        method: import("@sinclair/typebox").TString;
+        schema: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            params: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
+            query: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
+            body: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
+            headers: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
+        }>>;
+    }>;
+    handler: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnsafe<KindRef<Invocable<Record<string, any>, any>>>>;
+    response: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
+        status: import("@sinclair/typebox").TInteger;
+        when: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        mode: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"buffer">, import("@sinclair/typebox").TLiteral<"stream">]>>;
+        schema: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            query: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
+            body: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
+            headers: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
+        }>>;
+        headers: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TString>>;
+        body: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
+    }>>;
+}>;
+type HttpApiRouteManifest = Static<typeof HttpApiRouteManifest>;
 declare const HttpApiManifest: import("@sinclair/typebox").TObject<{
     routes: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
         request: import("@sinclair/typebox").TObject<{
@@ -13,23 +39,27 @@ declare const HttpApiManifest: import("@sinclair/typebox").TObject<{
                 headers: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
             }>>;
         }>;
-        handler: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
-        response: import("@sinclair/typebox").TObject<{
-            status: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TNumber, import("@sinclair/typebox").TString]>;
-            statuses: import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
-                schema: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
-                    query: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
-                    body: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
-                    headers: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
-                }>>;
-                headers: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TString>>;
+        handler: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnsafe<KindRef<Invocable<Record<string, any>, any>>>>;
+        response: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
+            status: import("@sinclair/typebox").TInteger;
+            when: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            mode: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"buffer">, import("@sinclair/typebox").TLiteral<"stream">]>>;
+            schema: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+                query: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
                 body: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
+                headers: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
             }>>;
-        }>;
+            headers: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TString>>;
+            body: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
+        }>>;
     }>>;
 }>;
 type HttpApiManifest = Static<typeof HttpApiManifest>;
-export declare function register(ctx: ControllerContext): Promise<void>;
+export declare function register(_ctx: ControllerContext): Promise<void>;
+export type ResponseEntry = Static<(typeof HttpApiRouteManifest)["properties"]["response"]["items"]>;
+export declare function dispatchResponse(response: ResponseEntry[], result: unknown, requestContext: Record<string, unknown>, moduleContext: {
+    expandWith: (v: unknown, ctx: Record<string, unknown>) => unknown;
+}, validateSchema: (value: unknown, schema: unknown) => void, reply: FastifyReply): Promise<void>;
 export declare class HttpServerApi implements ResourceInstance {
     private readonly ctx;
     readonly manifest: HttpApiManifest;

package/dist/http-api-controller.js

@@ -1,4 +1,6 @@
 import { Type } from "@sinclair/typebox";
+import { Ref } from "@telorun/sdk";
+import { pipeline } from "stream/promises";
 const HttpApiRouteManifest = Type.Object({
     request: Type.Object({
         path: Type.String(),
@@ -10,24 +12,72 @@ const HttpApiRouteManifest = Type.Object({
             headers: Type.Optional(Type.Any()),
         })),
     }),
-    handler: Type.Optional(Type.Any()), // Any handler shape is allowed - will be processed in create()
-    response: Type.Object({
-        status: Type.Union([Type.Number({ minimum: 100, maximum: 599 }), Type.String()]),
-        statuses: Type.Record(Type.String(), Type.Object({
-            schema: Type.Optional(Type.Object({
-                query: Type.Optional(Type.Any()),
-                body: Type.Optional(Type.Any()),
-                headers: Type.Optional(Type.Any()),
-            })),
-            headers: Type.Optional(Type.Record(Type.String(), Type.String())),
+    handler: Type.Optional(Type.Unsafe(Ref("kernel#Invocable"))),
+    response: Type.Array(Type.Object({
+        status: Type.Integer({ minimum: 100, maximum: 599 }),
+        when: Type.Optional(Type.String()),
+        mode: Type.Optional(Type.Union([Type.Literal("buffer"), Type.Literal("stream")])),
+        schema: Type.Optional(Type.Object({
+            query: Type.Optional(Type.Any()),
             body: Type.Optional(Type.Any()),
+            headers: Type.Optional(Type.Any()),
         })),
-    }),
+        headers: Type.Optional(Type.Record(Type.String(), Type.String())),
+        body: Type.Optional(Type.Any()),
+    })),
 });
 const HttpApiManifest = Type.Object({
     routes: Type.Array(HttpApiRouteManifest),
 });
-export async function register(ctx) { }
+export async function register(_ctx) { }
+export async function dispatchResponse(response, result, requestContext, moduleContext, validateSchema, reply) {
+    let matched;
+    let fallback;
+    for (const entry of response) {
+        if (!entry.when) {
+            fallback ??= entry;
+            continue;
+        }
+        const condition = moduleContext.expandWith(entry.when, { result, ...requestContext });
+        if (condition === true) {
+            matched = entry;
+            break;
+        }
+    }
+    const statusEntry = matched ?? fallback;
+    if (!statusEntry) {
+        reply.code(500);
+        reply.send({
+            error: "InternalServerError",
+            message: "No matching response status entry",
+            status: 500,
+        });
+        return;
+    }
+    reply.code(statusEntry.status);
+    if (statusEntry.headers) {
+        const mappedHeaders = moduleContext.expandWith(statusEntry.headers, {
+            result,
+            ...requestContext,
+        });
+        Object.entries(mappedHeaders).forEach(([key, value]) => reply.header(key, value));
+    }
+    if (statusEntry.mode === "stream") {
+        reply.hijack();
+        reply.raw.writeHead(statusEntry.status, reply.getHeaders());
+        await pipeline(result, reply.raw);
+        return;
+    }
+    if (statusEntry.body !== undefined) {
+        const mappedBody = moduleContext.expandWith(statusEntry.body, { result, ...requestContext });
+        if (statusEntry.schema?.body) {
+            validateSchema(mappedBody, statusEntry.schema.body);
+        }
+        reply.send(mappedBody);
+        return;
+    }
+    reply.send(result);
+}
 export class HttpServerApi {
     ctx;
     manifest;
@@ -37,16 +87,6 @@ export class HttpServerApi {
     }
     async init() { }
     register(app, prefix = "") {
-        // Register custom error handler for validation errors
-        app.setErrorHandler((error, request, reply) => {
-            const mappedError = convertFastifyValidationError(error);
-            if (mappedError) {
-                reply.code(400);
-                return reply.send(mappedError);
-            }
-            // Let Fastify handle other errors normally
-            throw error;
-        });
         if (prefix) {
             app.register(async (scoped) => {
                 this.registerRoutes(scoped);
@@ -63,7 +103,8 @@ export class HttpServerApi {
         }
     }
     registerRoute(app, route) {
-        const handler = route.handler ? resolveHandlerName(route.handler) : null;
+        // After Phase 5 injection, KindRef<Invocable> is replaced with the live Invocable instance.
+        const handler = route.handler;
         const translatedPath = translateOpenApiPath(route.request.path);
         const schema = {
             response: {},
@@ -80,19 +121,12 @@ export class HttpServerApi {
         if (route.request.schema?.headers) {
             schema.headers = route.request.schema?.headers;
         }
-        schema.response = Object.keys(route.response.statuses).reduce((acc, status) => {
-            const statusConfig = route.response.statuses[status];
-            if (statusConfig.schema) {
-                acc[status] = {};
-                if (statusConfig.schema.query) {
-                    acc[status].querystring = statusConfig.schema.query;
-                }
-                if (statusConfig.schema.body) {
-                    acc[status].body = statusConfig.schema.body;
-                }
-                if (statusConfig.schema.headers) {
-                    acc[status].headers = statusConfig.schema.headers;
-                }
+        schema.response = route.response.reduce((acc, entry) => {
+            if (entry.schema?.body) {
+                acc[entry.status] = entry.schema.body;
+            }
+            else if (entry.schema) {
+                acc[entry.status] = {};
             }
             return acc;
         }, {});
@@ -102,59 +136,18 @@ export class HttpServerApi {
             schema,
             handler: async (request, reply) => {
                 try {
-                    // Normalize headers to lowercase
-                    const normalizedHeaders = normalizeHeaders(request.headers);
-                    // Construct standardized Telo request object
-                    const requestPayload = {
-                        method: request.method,
-                        path: request.url,
-                        params: request.params || {},
-                        query: request.query || {},
-                        headers: normalizedHeaders,
-                        body: request.body,
+                    const requestContext = {
+                        request: {
+                            method: request.method,
+                            path: request.url,
+                            params: request.params || {},
+                            query: request.query || {},
+                            headers: normalizeHeaders(request.headers),
+                            body: request.body,
+                        },
                     };
-                    // Wrap in "request" object as per spec
-                    const teloRequestContext = { request: requestPayload };
-                    const result = handler
-                        ? await this.ctx.invoke(handler.kind, handler.name, resolveHandlerInputs(route.handler, teloRequestContext))
-                        : undefined;
-                    const response = route.response;
-                    // Determine final status code
-                    let statusCode = response.status;
-                    if (typeof statusCode === "string") {
-                        statusCode = this.ctx.expandValue(statusCode, { result });
-                    }
-                    // Convert status to string for lookup
-                    const statusKey = String(statusCode);
-                    const statusConfig = response.statuses[statusKey];
-                    if (!statusConfig) {
-                        reply.code(500);
-                        return reply.send({
-                            error: "InternalServerError",
-                            message: "Response status configuration not found",
-                            status: 500,
-                        });
-                    }
-                    // Set HTTP status code
-                    reply.code(statusCode);
-                    // Map and set response headers if specified
-                    if (statusConfig.headers) {
-                        const mappedHeaders = this.ctx.expandValue(statusConfig.headers, { result });
-                        Object.entries(mappedHeaders).forEach(([key, value]) => {
-                            reply.header(key, value);
-                        });
-                    }
-                    // Map and send response body if specified
-                    if (statusConfig.body !== undefined) {
-                        const mappedBody = this.ctx.expandValue(statusConfig.body, { result });
-                        // Validate response body if schema is specified
-                        if (statusConfig.schema && statusConfig.schema.body) {
-                            this.ctx.validateSchema(mappedBody, statusConfig.schema.body);
-                        }
-                        return reply.send(mappedBody);
-                    }
-                    // No body mapping, send result as-is
-                    return reply.send(result);
+                    const result = handler ? await handler.invoke(requestContext) : undefined;
+                    return dispatchResponse(route.response, result, requestContext, this.ctx.moduleContext, this.ctx.validateSchema.bind(this.ctx), reply);
                 }
                 catch (error) {
                     // Let the error handler deal with all errors
@@ -165,92 +158,8 @@ export class HttpServerApi {
     }
 }
 export async function create(resource, ctx) {
-    // First validate with a permissive schema (handler can be any shape)
     ctx.validateSchema(resource, HttpApiManifest);
-    // Process routes and register unnamed handlers as child resources
-    let handlerCounter = 0;
-    const processedRoutes = (resource.routes || []).map((route) => {
-        if (!route.handler) {
-            return route;
-        }
-        // Check if handler is unnamed (inline handler)
-        if (typeof route.handler === "object" && !route.handler.name) {
-            // Use resolveChildren to register the unnamed handler and get its normalized reference
-            const resolvedHandler = ctx.resolveChildren(route.handler, `__handler_${handlerCounter++}`);
-            // Return route with the resolved handler reference
-            return {
-                ...route,
-                handler: {
-                    kind: resolvedHandler.kind,
-                    name: resolvedHandler.name,
-                    inputs: route.handler.inputs,
-                },
-            };
-        }
-        return route;
-    });
-    // Create the API instance with processed routes
-    const processedResource = {
-        ...resource,
-        routes: processedRoutes,
-    };
-    return new HttpServerApi(ctx, processedResource);
-}
-function resolveHandlerName(handler) {
-    if (typeof handler === "string") {
-        const [kind, name] = handler.split("/");
-        return { kind, name };
-    }
-    if (handler && typeof handler === "object" && typeof handler.kind === "string") {
-        // name should always be present after create() processes the routes
-        // but fallback gracefully if it's not
-        const name = handler.name || `__unnamed_${Math.random().toString(36).slice(2, 9)}`;
-        return { name, kind: handler.kind };
-    }
-    throw new Error("Unable to resolve handler - handler must have a 'kind' property");
-}
-function resolveHandlerInputs(handler, requestContext) {
-    if (typeof handler === "string") {
-        return requestContext;
-    }
-    if (!handler || typeof handler !== "object") {
-        return requestContext;
-    }
-    if (!handler.inputs) {
-        return requestContext;
-    }
-    return resolveTemplateInputs(handler.inputs, requestContext);
-}
-function resolveTemplateInputs(value, context) {
-    if (typeof value === "string") {
-        const match = value.match(/^\s*\$\{\{\s*([^}]+)\s*\}\}\s*$/);
-        if (match) {
-            return resolveTemplatePath(match[1], context);
-        }
-        return value;
-    }
-    if (Array.isArray(value)) {
-        return value.map((item) => resolveTemplateInputs(item, context));
-    }
-    if (value && typeof value === "object") {
-        const resolved = {};
-        for (const [key, entry] of Object.entries(value)) {
-            resolved[key] = resolveTemplateInputs(entry, context);
-        }
-        return resolved;
-    }
-    return value;
-}
-function resolveTemplatePath(pathExpression, context) {
-    const parts = pathExpression.trim().split(".").filter(Boolean);
-    let current = context;
-    for (const part of parts) {
-        if (!current || (typeof current !== "object" && typeof current !== "function")) {
-            return undefined;
-        }
-        current = current[part];
-    }
-    return current;
+    return new HttpServerApi(ctx, resource);
 }
 /**
  * Translates OpenAPI path format {paramName} to Fastify format :paramName
@@ -269,115 +178,3 @@ function normalizeHeaders(headers) {
     }
     return normalized;
 }
-/**
- * Converts Fastify validation errors to standardized Telo format
- * Returns null if the error is not a validation error
- */
-function convertFastifyValidationError(error) {
-    // Check if this is a Fastify validation error
-    if (!error || typeof error !== "object" || error.code !== "FST_ERR_VALIDATION") {
-        return null;
-    }
-    const message = error.message || "";
-    const details = [];
-    // Parse Fastify validation error message to extract location and field
-    // Format examples:
-    // "querystring must have required property 'name'"
-    // "body must be object"
-    // "params.userId must be string"
-    let location = "body"; // default
-    let fieldPath = "";
-    let validationMessage = "Validation failed";
-    // Try to extract location from message
-    if (message.includes("querystring")) {
-        location = "query";
-    }
-    else if (message.includes("params")) {
-        location = "params";
-    }
-    else if (message.includes("headers")) {
-        location = "headers";
-    }
-    else if (message.includes("body")) {
-        location = "body";
-    }
-    // Extract field name from "must have required property 'fieldName'" pattern
-    const requiredMatch = message.match(/must have required property '([^']+)'/);
-    if (requiredMatch) {
-        fieldPath = requiredMatch[1];
-        validationMessage = `is a required property`;
-    }
-    else {
-        // Extract field from "fieldName must be" pattern
-        const fieldMatch = message.match(/^(?:querystring|body|params|headers)\.?(\w+)\s/);
-        if (fieldMatch) {
-            fieldPath = fieldMatch[1];
-        }
-        validationMessage = message
-            .replace(/^(?:querystring|body|params|headers)\.?\w*\s/, "")
-            .replace(" must ", " ");
-    }
-    if (fieldPath || message) {
-        details.push({
-            location,
-            path: fieldPath,
-            message: validationMessage,
-        });
-    }
-    return {
-        error: "ValidationError",
-        message: "Request validation failed",
-        status: 400,
-        details,
-    };
-}
-/**
- * Legacy function - kept for compatibility but not used
- * Converts framework-specific validation errors to standardized Telo format
- * Returns null if the error is not a validation error
- */
-function convertValidationError(error) {
-    // Check if this is a Fastify/AJV validation error
-    if (!error || typeof error !== "object") {
-        return null;
-    }
-    // Fastify validation errors have a statusCode of 400 and validation array
-    if (error.statusCode === 400 && Array.isArray(error.validation)) {
-        const details = error.validation.map((err) => {
-            const path = err.instancePath ? err.instancePath.replace(/^\//, "").replace(/\//g, ".") : "";
-            // Determine location from keyword/message context
-            let location = "body"; // default
-            if (err.keyword === "required" && err.params?.missingProperty) {
-                location = determinLocationFromContext(err);
-            }
-            else {
-                location = determinLocationFromContext(err);
-            }
-            return {
-                location,
-                path: path || err.params?.missingProperty || "",
-                message: err.message || "Validation failed",
-            };
-        });
-        return {
-            error: "ValidationError",
-            message: "Request validation failed",
-            status: 400,
-            details,
-        };
-    }
-    return null;
-}
-/**
- * Helper to determine the location (body, query, params, headers) from validation error context
- */
-function determinLocationFromContext(err) {
-    // AJV validation errors in Fastify include parent keyword context
-    if (err.parentSchema && err.instancePath) {
-        const path = err.instancePath;
-        // This is a simplified check; in practice, Fastify provides better context
-        // For now, default to "body" for general validation errors
-        return "body";
-    }
-    return "body";
-}

package/dist/http-server-controller.d.ts

@@ -1,8 +1,14 @@
-import type { ResourceContext, ResourceInstance, RuntimeResource } from "@telorun/sdk";
+import type { Invocable, KindRef, ResourceContext, ResourceInstance, RuntimeResource } from "@telorun/sdk";
+import { ResponseEntry } from "./http-api-controller.js";
 type HttpServerResource = RuntimeResource & {
     host?: string;
     port?: number;
     baseUrl?: string;
+    logger?: boolean;
+    contentTypeParsers?: Array<{
+        contentType: string;
+        parser?: Invocable;
+    }>;
     openapi?: {
         info: {
             title: string;
@@ -13,6 +19,10 @@ type HttpServerResource = RuntimeResource & {
         path?: string;
         type?: string;
     }>;
+    notFoundHandler?: {
+        invoke: KindRef<Invocable>;
+        response?: ResponseEntry[];
+    };
 };
-export declare function create(resource: HttpServerResource, ctx: ResourceContext): ResourceInstance | null;
+export declare function create(resource: HttpServerResource, ctx: ResourceContext): Promise<ResourceInstance | null>;
 export {};