@telorun/http-server 0.1.5 → 0.1.7

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @telorun/http-server
 
+## 0.1.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @telorun/sdk@0.2.7
+
 ## 0.1.5
 
 ### Patch Changes

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

@@ -13,6 +13,7 @@ declare const HttpApiRouteManifest: import("@sinclair/typebox").TObject<{
         }>>;
     }>;
     handler: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnsafe<KindRef<Invocable<Record<string, any>, any>>>>;
+    inputs: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TAny>>;
     response: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
         status: import("@sinclair/typebox").TInteger;
         when: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
@@ -40,6 +41,7 @@ declare const HttpApiManifest: import("@sinclair/typebox").TObject<{
             }>>;
         }>;
         handler: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnsafe<KindRef<Invocable<Record<string, any>, any>>>>;
+        inputs: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TAny>>;
         response: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
             status: import("@sinclair/typebox").TInteger;
             when: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;

package/dist/http-api-controller.js

@@ -1,5 +1,5 @@
 import { Type } from "@sinclair/typebox";
-import { Ref } from "@telorun/sdk";
+import { Ref, } from "@telorun/sdk";
 import { pipeline } from "stream/promises";
 const HttpApiRouteManifest = Type.Object({
     request: Type.Object({
@@ -13,6 +13,7 @@ const HttpApiRouteManifest = Type.Object({
         })),
     }),
     handler: Type.Optional(Type.Unsafe(Ref("kernel#Invocable"))),
+    inputs: Type.Optional(Type.Record(Type.String(), Type.Any())),
     response: Type.Array(Type.Object({
         status: Type.Integer({ minimum: 100, maximum: 599 }),
         when: Type.Optional(Type.String()),
@@ -146,7 +147,14 @@ export class HttpServerApi {
                             body: request.body,
                         },
                     };
-                    const result = handler ? await handler.invoke(requestContext) : undefined;
+                    const resolvedInputs = route.inputs
+                        ? (this.ctx.moduleContext.expandWith(route.inputs, requestContext) ?? {})
+                        : requestContext;
+                    const invokeInput = {
+                        ...resolvedInputs,
+                        inputs: resolvedInputs,
+                    };
+                    const result = handler ? await handler.invoke(invokeInput) : undefined;
                     return dispatchResponse(route.response, result, requestContext, this.ctx.moduleContext, this.ctx.validateSchema.bind(this.ctx), reply);
                 }
                 catch (error) {

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

@@ -1,10 +1,25 @@
 import type { Invocable, KindRef, ResourceContext, ResourceInstance, RuntimeResource } from "@telorun/sdk";
 import { ResponseEntry } from "./http-api-controller.js";
+type CorsOptions = {
+    origin?: string | boolean | string[];
+    methods?: string | string[];
+    allowedHeaders?: string | string[];
+    exposedHeaders?: string | string[];
+    credentials?: boolean;
+    maxAge?: number;
+    cacheControl?: number | string;
+    preflightContinue?: boolean;
+    optionsSuccessStatus?: number;
+    preflight?: boolean;
+    strictPreflight?: boolean;
+    hideOptionsRoute?: boolean;
+};
 type HttpServerResource = RuntimeResource & {
     host?: string;
     port?: number;
     baseUrl?: string;
     logger?: boolean;
+    cors?: CorsOptions;
     contentTypeParsers?: Array<{
         contentType: string;
         parser?: Invocable;

package/dist/http-server-controller.js

@@ -1,3 +1,4 @@
+import cors from "@fastify/cors";
 import swagger from "@fastify/swagger";
 import apiReference from "@scalar/fastify-api-reference";
 import addFormats from "ajv-formats";
@@ -23,7 +24,10 @@ class HttpServer {
         if (!this.port) {
             throw new Error("Http.Server port is required");
         }
-        this.app = Fastify({ logger: resource.logger, ajv: { plugins: [addFormats.default] } });
+        this.app = Fastify({
+            logger: resource.logger,
+            ajv: { customOptions: { useDefaults: true }, plugins: [addFormats.default] },
+        });
     }
     async init() {
         if (!this.pluginsInitialized) {
@@ -50,6 +54,22 @@ class HttpServer {
                 });
             }
         }
+        if (this.resource.cors) {
+            await this.app.register(cors, {
+                origin: this.resource.cors.origin,
+                methods: this.resource.cors.methods,
+                allowedHeaders: this.resource.cors.allowedHeaders,
+                exposedHeaders: this.resource.cors.exposedHeaders,
+                credentials: this.resource.cors.credentials,
+                maxAge: this.resource.cors.maxAge,
+                cacheControl: this.resource.cors.cacheControl,
+                preflightContinue: this.resource.cors.preflightContinue,
+                optionsSuccessStatus: this.resource.cors.optionsSuccessStatus,
+                preflight: this.resource.cors.preflight,
+                strictPreflight: this.resource.cors.strictPreflight,
+                hideOptionsRoute: this.resource.cors.hideOptionsRoute,
+            });
+        }
         // Register custom error handler for validation errors
         this.app.setErrorHandler((error, request, reply) => {
             const mappedError = convertFastifyValidationError(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/http-server",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -17,13 +17,14 @@
     }
   },
   "dependencies": {
+    "@fastify/cors": "^11.2.0",
     "@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",
-    "@telorun/sdk": "0.2.6"
+    "@telorun/sdk": "0.2.7"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

package/src/http-api-controller.ts

@@ -1,5 +1,12 @@
 import { Static, Type } from "@sinclair/typebox";
-import { ControllerContext, Invocable, KindRef, Ref, ResourceContext, ResourceInstance } from "@telorun/sdk";
+import {
+  ControllerContext,
+  Invocable,
+  KindRef,
+  Ref,
+  ResourceContext,
+  ResourceInstance,
+} from "@telorun/sdk";
 import { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 import { type Readable } from "stream";
 import { pipeline } from "stream/promises";
@@ -18,6 +25,7 @@ const HttpApiRouteManifest = Type.Object({
     ),
   }),
   handler: Type.Optional(Type.Unsafe<KindRef<Invocable>>(Ref("kernel#Invocable"))),
+  inputs: Type.Optional(Type.Record(Type.String(), Type.Any())),
   response: Type.Array(
     Type.Object({
       status: Type.Integer({ minimum: 100, maximum: 599 }),
@@ -189,7 +197,14 @@ export class HttpServerApi implements ResourceInstance {
               body: request.body,
             },
           };
-          const result = handler ? await handler.invoke(requestContext) : undefined;
+          const resolvedInputs: Record<string, any> = route.inputs
+            ? ((this.ctx.moduleContext.expandWith(route.inputs, requestContext) as any) ?? {})
+            : requestContext;
+          const invokeInput: Record<string, any> = {
+            ...resolvedInputs,
+            inputs: resolvedInputs,
+          };
+          const result = handler ? await handler.invoke(invokeInput) : undefined;
 
           return dispatchResponse(
             route.response,

package/src/http-server-controller.ts

@@ -1,3 +1,4 @@
+import cors from "@fastify/cors";
 import swagger from "@fastify/swagger";
 import apiReference from "@scalar/fastify-api-reference";
 import type {
@@ -11,11 +12,27 @@ import addFormats from "ajv-formats";
 import Fastify, { FastifyInstance } from "fastify";
 import { dispatchResponse, HttpServerApi, ResponseEntry } from "./http-api-controller.js";
 
+type CorsOptions = {
+  origin?: string | boolean | string[];
+  methods?: string | string[];
+  allowedHeaders?: string | string[];
+  exposedHeaders?: string | string[];
+  credentials?: boolean;
+  maxAge?: number;
+  cacheControl?: number | string;
+  preflightContinue?: boolean;
+  optionsSuccessStatus?: number;
+  preflight?: boolean;
+  strictPreflight?: boolean;
+  hideOptionsRoute?: boolean;
+};
+
 type HttpServerResource = RuntimeResource & {
   host?: string;
   port?: number;
   baseUrl?: string;
   logger?: boolean;
+  cors?: CorsOptions;
   contentTypeParsers?: Array<{ contentType: string; parser?: Invocable }>;
   openapi?: {
     info: {
@@ -66,7 +83,10 @@ class HttpServer implements ResourceInstance {
     if (!this.port) {
       throw new Error("Http.Server port is required");
     }
-    this.app = Fastify({ logger: resource.logger, ajv: { plugins: [addFormats.default as any] } });
+    this.app = Fastify({
+      logger: resource.logger,
+      ajv: { customOptions: { useDefaults: true }, plugins: [addFormats.default as any] },
+    });
   }
 
   async init() {
@@ -80,13 +100,17 @@ class HttpServer implements ResourceInstance {
   private async setupPlugins() {
     for (const { contentType, parser } of this.resource.contentTypeParsers ?? []) {
       if (parser) {
-        this.app.addContentTypeParser(contentType, { parseAs: "string" }, async (_req, body, done) => {
-          try {
-            done(null, await parser.invoke({ body }));
-          } catch (err) {
-            done(err as Error, undefined);
-          }
-        });
+        this.app.addContentTypeParser(
+          contentType,
+          { parseAs: "string" },
+          async (_req, body, done) => {
+            try {
+              done(null, await parser.invoke({ body }));
+            } catch (err) {
+              done(err as Error, undefined);
+            }
+          },
+        );
       } else {
         this.app.addContentTypeParser(contentType, { parseAs: "string" }, (_req, body, done) => {
           done(null, body);
@@ -94,6 +118,23 @@ class HttpServer implements ResourceInstance {
       }
     }
 
+    if (this.resource.cors) {
+      await this.app.register(cors, {
+        origin: this.resource.cors.origin,
+        methods: this.resource.cors.methods,
+        allowedHeaders: this.resource.cors.allowedHeaders,
+        exposedHeaders: this.resource.cors.exposedHeaders,
+        credentials: this.resource.cors.credentials,
+        maxAge: this.resource.cors.maxAge,
+        cacheControl: this.resource.cors.cacheControl,
+        preflightContinue: this.resource.cors.preflightContinue,
+        optionsSuccessStatus: this.resource.cors.optionsSuccessStatus,
+        preflight: this.resource.cors.preflight,
+        strictPreflight: this.resource.cors.strictPreflight,
+        hideOptionsRoute: this.resource.cors.hideOptionsRoute,
+      });
+    }
+
     // Register custom error handler for validation errors
     this.app.setErrorHandler((error, request, reply) => {
       const mappedError = convertFastifyValidationError(error);