@telorun/http-server 0.1.3 → 0.1.4

package/CHANGELOG.md

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

package/dist/http-api-controller.js

@@ -37,16 +37,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);
@@ -83,15 +73,11 @@ export class HttpServerApi {
         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;
+                    acc[status] = statusConfig.schema.body;
                 }
-                if (statusConfig.schema.headers) {
-                    acc[status].headers = statusConfig.schema.headers;
+                else {
+                    acc[status] = {};
                 }
             }
             return acc;
@@ -269,68 +255,6 @@ 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

package/dist/http-server-controller.js

@@ -1,5 +1,6 @@
 import swagger from "@fastify/swagger";
 import apiReference from "@scalar/fastify-api-reference";
+import addFormats from "ajv-formats";
 import Fastify from "fastify";
 class HttpServer {
     releaseHold = null;
@@ -18,13 +19,23 @@ class HttpServer {
         if (!this.port) {
             throw new Error("Http.Server port is required");
         }
-        this.app = Fastify({ logger: true });
+        this.app = Fastify({ logger: true, ajv: { plugins: [addFormats.default] } });
     }
     async init() {
-        this.setupPlugins();
+        await this.setupPlugins();
         this.setupRoutes();
     }
     async setupPlugins() {
+        // Register custom error handler for validation errors
+        this.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 (this.resource.openapi) {
             const servers = [];
             // const routesByName = new Map<string, HttpRouteResource>();
@@ -56,7 +67,7 @@ class HttpServer {
             const type = mount.type || "";
             const { kind, name } = parseType(type);
             const prefix = mount.path || "";
-            const api = this.ctx.getResourcesByName(kind, name);
+            const api = this.ctx.moduleContext.getInvokable(name);
             if (!api) {
                 throw new Error(`Failed to mount Http.Api at "${prefix}": ${type} not found`);
             }
@@ -102,3 +113,65 @@ function parseType(type) {
     }
     return { kind: type.slice(0, separator), name: type.slice(separator + 1) };
 }
+/**
+ * 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,
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/http-server",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,12 +17,13 @@
     }
   },
   "dependencies": {
+    "@fastify/swagger": "^9.6.1",
+    "@scalar/fastify-api-reference": "^1.44.6",
     "@sinclair/typebox": "^0.34.48",
     "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1",
     "fastify": "^5.7.2",
-    "@fastify/swagger": "^9.6.1",
-    "@scalar/fastify-api-reference": "^1.44.6",
-    "@telorun/sdk": "0.2.4"
+    "@telorun/sdk": "0.2.5"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

package/src/http-api-controller.ts

@@ -52,17 +52,6 @@ export class HttpServerApi implements ResourceInstance {
   async init() {}
 
   register(app: FastifyInstance, 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) => {
@@ -107,15 +96,10 @@ export class HttpServerApi implements ResourceInstance {
       (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;
+            acc[status] = statusConfig.schema.body;
+          } else {
+            acc[status] = {};
           }
         }
         return acc;
@@ -325,72 +309,6 @@ function normalizeHeaders(headers: Record<string, any>): Record<string, any> {
   return normalized;
 }
 
-/**
- * Converts Fastify validation errors to standardized Telo format
- * Returns null if the error is not a validation error
- */
-function convertFastifyValidationError(error: any): Record<string, any> | null {
-  // 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

package/src/http-server-controller.ts

@@ -1,6 +1,7 @@
 import swagger from "@fastify/swagger";
 import apiReference from "@scalar/fastify-api-reference";
 import type { ResourceContext, ResourceInstance, RuntimeResource } from "@telorun/sdk";
+import addFormats from "ajv-formats";
 import Fastify, { FastifyInstance } from "fastify";
 import { HttpServerApi } from "./http-api-controller.js";
 
@@ -86,15 +87,25 @@ class HttpServer implements ResourceInstance {
     if (!this.port) {
       throw new Error("Http.Server port is required");
     }
-    this.app = Fastify({ logger: true });
+    this.app = Fastify({ logger: true, ajv: { plugins: [addFormats.default as any] } });
   }
 
   async init() {
-    this.setupPlugins();
+    await this.setupPlugins();
     this.setupRoutes();
   }
 
   private async setupPlugins() {
+    // Register custom error handler for validation errors
+    this.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 (this.resource.openapi) {
       const servers = [];
       // const routesByName = new Map<string, HttpRouteResource>();
@@ -128,7 +139,7 @@ class HttpServer implements ResourceInstance {
       const { kind, name } = parseType(type);
       const prefix = mount.path || "";
 
-      const api: HttpServerApi = this.ctx.getResourcesByName(kind, name) as any;
+      const api = this.ctx.moduleContext.getInvokable(name) as unknown as HttpServerApi;
 
       if (!api) {
         throw new Error(`Failed to mount Http.Api at "${prefix}": ${type} not found`);
@@ -181,3 +192,69 @@ function parseType(type: string): { kind: string; name: string } {
   }
   return { kind: type.slice(0, separator), name: type.slice(separator + 1) };
 }
+
+/**
+ * Converts Fastify validation errors to standardized Telo format
+ * Returns null if the error is not a validation error
+ */
+function convertFastifyValidationError(error: any): Record<string, any> | null {
+  // 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,
+  };
+}

package/dist/openapi.js

@@ -1,152 +0,0 @@
-import swagger from '@fastify/swagger';
-import apiReference from '@scalar/fastify-api-reference';
-function getResourceConfig(resource) {
-    return resource;
-}
-export function register(ctx) { }
-export function create(resource, ctx) {
-    const openApiResource = resource;
-    const config = getResourceConfig(openApiResource);
-    const apiRefs = config.apis || [];
-    if (apiRefs.length === 0) {
-        throw new Error(`OpenApi.Spec "${resource.metadata.name}" is missing apis`);
-    }
-    const handler = (payload) => {
-        const serverResource = payload?.resource;
-        const app = payload?.app;
-        if (!serverResource || !app) {
-            throw new Error(`OpenApi.Spec handler missing Http.Server resource or Fastify app`);
-        }
-        const matchedApis = resolveApis(apiRefs, ctx);
-        const mounts = getResourceConfig(serverResource).mounts || [];
-        const servers = buildServers(serverResource, mounts, matchedApis);
-        if (servers.length === 0) {
-            return;
-        }
-        const paths = buildPaths(matchedApis, mounts);
-        const info = config.info && typeof config.info === 'object'
-            ? config.info
-            : {
-                title: resource.metadata.name,
-                version: resource.version || '1.0.0',
-            };
-        const routePrefix = config.path || `/openapi/${resource.metadata.name}`;
-        app.register(swagger, {
-            openapi: {
-                openapi: '3.0.0',
-                info,
-                servers,
-                paths,
-            },
-            routePrefix,
-        });
-        app.register(apiReference, {
-            routePrefix,
-        });
-    };
-    const httpServers = ctx.getResources('Http.Server');
-    return {
-        init: async () => {
-            // Register listeners after all resources are initialized
-            for (const server of httpServers) {
-                ctx.on('Http.Server.Ready', server.metadata.name, handler);
-            }
-        },
-        teardown: () => {
-            for (const server of httpServers) {
-                ctx.offResourceEvent('Http.Server', server.metadata.name, 'Ready', handler);
-            }
-        },
-    };
-}
-function resolveApis(apiRefs, ctx) {
-    const apis = [];
-    for (const ref of apiRefs) {
-        const { kind, name } = parseRef(ref);
-        if (!kind || !name) {
-            throw new Error(`Reference not found: ${ref}`);
-        }
-        if (kind !== 'Http.Api' && kind !== 'Http.Route') {
-            throw new Error(`Reference not supported: ${ref}`);
-        }
-        const resource = ctx.kernel.registry.get(kind)?.get(name);
-        if (!resource) {
-            throw new Error(`Reference not found: ${ref}`);
-        }
-        apis.push(resource);
-    }
-    return apis;
-}
-function buildServers(server, mounts, apis) {
-    const config = getResourceConfig(server);
-    const host = config.host || '0.0.0.0';
-    const port = Number(config.port || 0);
-    if (!port) {
-        return [];
-    }
-    // Server URL should be the base URL without mount paths
-    // Paths will include the mount prefix
-    return [{ url: `http://${host}:${port}` }];
-}
-function buildPaths(apis, mounts) {
-    const paths = {};
-    const mountPrefixByType = new Map();
-    for (const mount of mounts) {
-        if (mount.type) {
-            mountPrefixByType.set(mount.type, mount.path || '');
-        }
-    }
-    for (const api of apis) {
-        const prefix = mountPrefixByType.get(`${api.kind}.${api.metadata.name}`) || '';
-        if (api.kind === 'Http.Route') {
-            const config = getResourceConfig(api);
-            const path = joinPath(prefix, api.metadata?.path || config.path || '');
-            const method = (api.metadata?.method ||
-                config.method ||
-                'GET').toLowerCase();
-            if (!path) {
-                continue;
-            }
-            if (!paths[path]) {
-                paths[path] = {};
-            }
-            paths[path][method] = { responses: { '200': { description: 'OK' } } };
-            continue;
-        }
-        const routes = getResourceConfig(api).routes || [];
-        for (const route of routes) {
-            if (typeof route === 'string') {
-                continue;
-            }
-            const request = route.request || {};
-            const path = joinPath(prefix, request.path || '');
-            const method = (request.method || 'GET').toLowerCase();
-            if (!path) {
-                continue;
-            }
-            if (!paths[path]) {
-                paths[path] = {};
-            }
-            paths[path][method] = { responses: { '200': { description: 'OK' } } };
-        }
-    }
-    return paths;
-}
-function parseRef(ref) {
-    const separator = ref.lastIndexOf('.');
-    if (separator <= 0 || separator === ref.length - 1) {
-        return { kind: '', name: '' };
-    }
-    return { kind: ref.slice(0, separator), name: ref.slice(separator + 1) };
-}
-function joinPath(prefix, path) {
-    if (!prefix) {
-        return path;
-    }
-    if (!path) {
-        return prefix;
-    }
-    const trimmedPrefix = prefix.endsWith('/') ? prefix.slice(0, -1) : prefix;
-    const trimmedPath = path.startsWith('/') ? path : `/${path}`;
-    return `${trimmedPrefix}${trimmedPath}`;
-}

package/dist/test-validation.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/test-validation.js

@@ -1,36 +0,0 @@
-// Test file to validate error conversion logic
-import { convertFastifyValidationError } from "./http-api-controller.js";
-function testValidationError() {
-    // Test case 1: Querystring validation error
-    const error1 = {
-        code: "FST_ERR_VALIDATION",
-        message: "querystring must have required property 'name'",
-        statusCode: 400,
-        error: "Bad Request",
-    };
-    const result1 = convertFastifyValidationError(error1);
-    console.log("Test 1 - Querystring required field:", JSON.stringify(result1, null, 2));
-    console.log("✓ Location:", result1?.details[0].location === "query" ? "PASS" : "FAIL");
-    console.log("✓ Path:", result1?.details[0].path === "name" ? "PASS" : "FAIL");
-    console.log("✓ Message:", result1?.details[0].message.includes("required") ? "PASS" : "FAIL");
-    // Test case 2: Body validation error
-    const error2 = {
-        code: "FST_ERR_VALIDATION",
-        message: "body must be object",
-        statusCode: 400,
-    };
-    const result2 = convertFastifyValidationError(error2);
-    console.log("\nTest 2 - Body type error:", JSON.stringify(result2, null, 2));
-    console.log("✓ Location:", result2?.details[0].location === "body" ? "PASS" : "FAIL");
-    // Test case 3: Non-validation error (should return null)
-    const error3 = {
-        code: "ERR_OTHER",
-        message: "Some other error",
-    };
-    const result3 = convertFastifyValidationError(error3);
-    console.log("\nTest 3 - Non-validation error:", result3 === null ? "PASS (null)" : "FAIL (not null)");
-}
-// Only run if this file is executed directly
-if (import.meta.url === `file://${process.argv[1]}`) {
-    testValidationError();
-}