@motiadev/core 0.1.0-beta.5 → 0.1.0-beta.7

package/dist/src/middleware-composer.d.ts

@@ -0,0 +1,3 @@
+import { ApiMiddleware, ApiRequest, ApiResponse, FlowContext } from './types';
+declare const _default: (...middlewares: ApiMiddleware[]) => (req: ApiRequest, ctx: FlowContext, handler: () => Promise<ApiResponse>) => Promise<ApiResponse>;
+export default _default;

package/dist/src/middleware-composer.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = (...middlewares) => {
+    return async (req, ctx, handler) => {
+        const composedHandler = middlewares.reduceRight((nextHandler, middleware) => () => middleware(req, ctx, nextHandler), handler);
+        return composedHandler();
+    };
+};

package/dist/src/server.js

@@ -17,6 +17,7 @@ const call_step_file_1 = require("./call-step-file");
 const LoggerFactory_1 = require("./LoggerFactory");
 const generate_trace_id_1 = require("./generate-trace-id");
 const flows_config_endpoint_1 = require("./flows-config-endpoint");
+const middleware_composer_1 = __importDefault(require("./middleware-composer"));
 const createServer = async (lockedData, eventManager, state, config) => {
     const printer = lockedData.printer;
     const app = (0, express_1.default)();
@@ -37,22 +38,45 @@ const createServer = async (lockedData, eventManager, state, config) => {
                 pathParams: req.params,
                 queryParams: req.query,
             };
-            try {
-                const data = request;
-                const result = await (0, call_step_file_1.callStepFile)({
-                    contextInFirstArg: false,
-                    data,
-                    step,
-                    printer,
-                    logger,
-                    eventManager,
-                    state,
-                    traceId,
-                });
-                if (!result) {
-                    res.status(500).json({ error: 'Internal server error' });
-                    return;
+            const ctx = {
+                emit: async (event) => {
+                    await eventManager.emit({
+                        topic: event.topic,
+                        data: event.data,
+                        traceId,
+                        logger,
+                    });
+                },
+                traceId,
+                state,
+                logger,
+            };
+            const finalHandler = async () => {
+                try {
+                    const result = await (0, call_step_file_1.callStepFile)({
+                        contextInFirstArg: false,
+                        data: request,
+                        step,
+                        printer,
+                        logger,
+                        eventManager,
+                        state,
+                        traceId,
+                    });
+                    if (!result) {
+                        return { status: 500, body: { error: 'Internal server error' } };
+                    }
+                    return result;
+                }
+                catch (error) {
+                    logger.error('[API] Internal server error', { error });
+                    console.log(error);
+                    return { status: 500, body: { error: 'Internal server error' } };
                 }
+            };
+            try {
+                const middleware = step.config.middleware || [];
+                const result = await (0, middleware_composer_1.default)(...middleware)(request, ctx, finalHandler);
                 if (result.headers) {
                     Object.entries(result.headers).forEach(([key, value]) => res.setHeader(key, value));
                 }
@@ -60,8 +84,7 @@ const createServer = async (lockedData, eventManager, state, config) => {
                 res.json(result.body);
             }
             catch (error) {
-                logger.error('[API] Internal server error', { error });
-                console.log(error);
+                logger.error('[API] Error in middleware chain', { error });
                 res.status(500).json({ error: 'Internal server error' });
             }
         };
@@ -72,15 +95,15 @@ const createServer = async (lockedData, eventManager, state, config) => {
     const addRoute = (step) => {
         const { method, path } = step.config;
         logger_1.globalLogger.debug('[API] Registering route', step.config);
-        const handler = asyncHandler(step);
+        const expressHandler = asyncHandler(step);
         const methods = {
-            GET: () => router.get(path, handler),
-            POST: () => router.post(path, handler),
-            PUT: () => router.put(path, handler),
-            DELETE: () => router.delete(path, handler),
-            PATCH: () => router.patch(path, handler),
-            OPTIONS: () => router.options(path, handler),
-            HEAD: () => router.head(path, handler),
+            GET: () => router.get(path, expressHandler),
+            POST: () => router.post(path, expressHandler),
+            PUT: () => router.put(path, expressHandler),
+            DELETE: () => router.delete(path, expressHandler),
+            PATCH: () => router.patch(path, expressHandler),
+            OPTIONS: () => router.options(path, expressHandler),
+            HEAD: () => router.head(path, expressHandler),
         };
         const methodHandler = methods[method];
         if (!methodHandler) {

package/dist/src/step-validator.js

@@ -81,6 +81,7 @@ const apiSchema = zod_1.z
     flows: zod_1.z.array(zod_1.z.string()).optional(),
     bodySchema: zod_1.z.union([jsonSchema, zod_1.z.null()]).optional(),
     includeFiles: zod_1.z.array(zod_1.z.string()).optional(),
+    middleware: zod_1.z.array(zod_1.z.function()).optional(),
 })
     .strict();
 const cronSchema = zod_1.z

package/dist/src/types.d.ts

@@ -47,6 +47,7 @@ export type NoopConfig = {
     flows?: string[];
 };
 export type ApiRouteMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS' | 'HEAD';
+export type ApiMiddleware = (req: ApiRequest, ctx: FlowContext, next: () => Promise<ApiResponse>) => Promise<ApiResponse>;
 export type ApiRouteConfig = {
     type: 'api';
     name: string;
@@ -57,6 +58,7 @@ export type ApiRouteConfig = {
     virtualEmits?: Emit[];
     virtualSubscribes?: string[];
     flows?: string[];
+    middleware?: ApiMiddleware[];
     bodySchema?: ZodObject<any>;
     /**
      * Files to include in the step bundle.

package/package.json

@@ -2,7 +2,7 @@
   "name": "@motiadev/core",
   "description": "Core functionality for the Motia framework, providing the foundation for building event-driven workflows.",
   "main": "dist/index.js",
-  "version": "0.1.0-beta.5",
+  "version": "0.1.0-beta.7",
   "dependencies": {
     "body-parser": "^1.20.3",
     "colors": "^1.4.0",