@motiadev/core 0.1.0-beta.11 → 0.1.0-beta.13

package/dist/src/get-step-config.js

@@ -38,7 +38,7 @@ const getStepConfig = (file) => {
         });
         child.on('message', (message) => {
             logger_1.globalLogger.debug('[Config] Read config', { config: message });
-            config = command === 'node' ? eval('(' + message + ')') : message;
+            config = message;
             resolve(config);
             child.kill(); // we can kill the child process since we already received the message
         });

package/dist/src/node/get-config.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const zod_1 = require("zod");
 const zod_to_json_schema_1 = __importDefault(require("zod-to-json-schema"));
-const serialize_javascript_1 = __importDefault(require("serialize-javascript"));
 // Add ts-node registration before dynamic imports
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 require('ts-node').register({
@@ -27,7 +26,7 @@ async function getConfig(filePath) {
         else if (module.config.bodySchema instanceof zod_1.ZodObject) {
             module.config.bodySchema = (0, zod_to_json_schema_1.default)(module.config.bodySchema);
         }
-        process.send?.((0, serialize_javascript_1.default)(module.config));
+        process.send?.(module.config);
         process.exit(0);
     }
     catch (error) {

package/dist/src/node/middleware-compose.d.ts

@@ -0,0 +1 @@
+export declare const composeMiddleware: (...middlewares: any[]) => (req: any, ctx: any, handler: () => Promise<any>) => Promise<any>;

package/dist/src/{middleware-composer.js → node/middleware-compose.js}

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (...middlewares) => {
+exports.composeMiddleware = void 0;
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const composeMiddleware = (...middlewares) => {
     return async (req, ctx, handler) => {
         const composedHandler = middlewares.reduceRight((nextHandler, middleware) => () => middleware(req, ctx, nextHandler), handler);
         return composedHandler();
     };
 };
+exports.composeMiddleware = composeMiddleware;
+/* eslint-enable @typescript-eslint/no-explicit-any */

package/dist/src/node/node-runner.js

@@ -7,6 +7,7 @@ const path_1 = __importDefault(require("path"));
 const logger_1 = require("./logger");
 const rpc_state_manager_1 = require("./rpc-state-manager");
 const rpc_1 = require("./rpc");
+const middleware_compose_1 = require("./middleware-compose");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 require('dotenv').config();
 // Add ts-node registration before dynamic imports
@@ -38,8 +39,12 @@ async function runTypescriptModule(filePath, event) {
         const emit = async (data) => sender.send('emit', data);
         const context = { traceId, flows, logger, state, emit };
         sender.init();
-        // Call the function with provided arguments
-        const result = contextInFirstArg ? await module.handler(context) : await module.handler(event.data, context);
+        const middlewares = Array.isArray(module.config.middleware) ? module.config.middleware : [];
+        const composedMiddleware = (0, middleware_compose_1.composeMiddleware)(...middlewares);
+        const handlerFn = () => {
+            return contextInFirstArg ? module.handler(context) : module.handler(event.data, context);
+        };
+        const result = await composedMiddleware(event.data, context, handlerFn);
         await sender.send('result', result);
         await sender.close();
         process.exit(0);

package/dist/src/server.js

@@ -8,6 +8,7 @@ const cron_handler_1 = require("./cron-handler");
 const body_parser_1 = __importDefault(require("body-parser"));
 const express_1 = __importDefault(require("express"));
 const http_1 = __importDefault(require("http"));
+const multer_1 = __importDefault(require("multer"));
 const socket_io_1 = require("socket.io");
 const flows_endpoint_1 = require("./flows-endpoint");
 const guards_1 = require("./guards");
@@ -17,13 +18,13 @@ 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)();
     const server = http_1.default.createServer(app);
     const io = new socket_io_1.Server(server);
     const loggerFactory = new LoggerFactory_1.LoggerFactory(config.isVerbose, io);
+    const upload = (0, multer_1.default)();
     const allSteps = [...steps_1.systemSteps, ...lockedData.activeSteps];
     const cronManager = (0, cron_handler_1.setupCronHandlers)(lockedData, eventManager, state, loggerFactory);
     const asyncHandler = (step) => {
@@ -37,46 +38,24 @@ const createServer = async (lockedData, eventManager, state, config) => {
                 headers: req.headers,
                 pathParams: req.params,
                 queryParams: req.query,
-            };
-            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' } };
-                }
+                files: req.files,
             };
             try {
-                const middleware = step.config.middleware || [];
-                const result = await (0, middleware_composer_1.default)(...middleware)(request, ctx, finalHandler);
+                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;
+                }
                 if (result.headers) {
                     Object.entries(result.headers).forEach(([key, value]) => res.setHeader(key, value));
                 }
@@ -84,7 +63,8 @@ const createServer = async (lockedData, eventManager, state, config) => {
                 res.json(result.body);
             }
             catch (error) {
-                logger.error('[API] Error in middleware chain', { error });
+                logger.error('[API] Internal server error', { error });
+                console.log(error);
                 res.status(500).json({ error: 'Internal server error' });
             }
         };
@@ -95,15 +75,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 expressHandler = asyncHandler(step);
+        const handler = asyncHandler(step);
         const methods = {
-            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),
+            GET: () => router.get(path, handler),
+            POST: () => router.post(path, upload.any(), handler),
+            PUT: () => router.put(path, upload.any(), handler),
+            DELETE: () => router.delete(path, handler),
+            PATCH: () => router.patch(path, upload.any(), handler),
+            OPTIONS: () => router.options(path, handler),
+            HEAD: () => router.head(path, handler),
         };
         const methodHandler = methods[method];
         if (!methodHandler) {

package/dist/src/types.d.ts

@@ -71,6 +71,9 @@ export type ApiRequest = {
     queryParams: Record<string, string | string[]>;
     body: Record<string, any>;
     headers: Record<string, string | string[]>;
+    files?: Express.Multer.File[] | {
+        [fieldname: string]: Express.Multer.File[];
+    };
 };
 export type ApiResponse = {
     status: number;

package/package.json

@@ -2,14 +2,15 @@
   "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.11",
+  "version": "0.1.0-beta.13",
   "dependencies": {
     "body-parser": "^1.20.3",
     "colors": "^1.4.0",
+    "dotenv": "^16.4.7",
     "express": "^4.21.2",
     "ioredis": "^5.4.2",
+    "multer": "1.4.5-lts.1",
     "node-cron": "^3.0.3",
-    "serialize-javascript": "^6.0.2",
     "socket.io": "^4.8.1",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
@@ -20,8 +21,8 @@
     "@types/body-parser": "^1.19.5",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.14",
+    "@types/multer": "^1.4.12",
     "@types/node-cron": "^3.0.11",
-    "@types/serialize-javascript": "^5.0.4",
     "@types/supertest": "^6.0.2",
     "jest": "^29.7.0",
     "supertest": "^7.0.0",

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

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