@emeryld/rrroutes-server 2.4.2 → 2.4.4

package/dist/index.js

@@ -6,6 +6,7 @@ import {
   keyOf,
   lowProfileParse
 } from "@emeryld/rrroutes-contract";
+import multer from "multer";
 var serverDebugEventTypes = [
   "register",
   "request",
@@ -64,6 +65,59 @@ var decodeJsonLikeQueryValue = (value) => {
   return value;
 };
 var CTX_SYMBOL = /* @__PURE__ */ Symbol.for("typedLeaves.ctx");
+var REQUEST_PAYLOAD_SYMBOL = /* @__PURE__ */ Symbol.for(
+  "typedLeaves.requestPayload"
+);
+function isMulterFile(value) {
+  if (!isPlainObject(value)) return false;
+  const candidate = value;
+  return typeof candidate.fieldname === "string";
+}
+function collectMulterFiles(req) {
+  const files = [];
+  const pushValue = (value) => {
+    if (value === void 0 || value === null) return;
+    if (Array.isArray(value)) {
+      value.forEach(pushValue);
+      return;
+    }
+    if (isMulterFile(value)) {
+      files.push(value);
+      return;
+    }
+    if (isPlainObject(value)) {
+      Object.values(value).forEach(pushValue);
+    }
+  };
+  pushValue(req.files);
+  pushValue(req.file);
+  return files;
+}
+function resolveBodyFilesFromRequest(req, fields) {
+  if (!fields?.length) return void 0;
+  const allowedNames = new Set(fields.map((field) => field.name));
+  const collected = collectMulterFiles(req);
+  if (collected.length === 0) return void 0;
+  const result = {};
+  for (const file of collected) {
+    if (!allowedNames.has(file.fieldname)) continue;
+    const bucket = result[file.fieldname] ?? [];
+    bucket.push(file);
+    result[file.fieldname] = bucket;
+  }
+  return Object.keys(result).length ? result : void 0;
+}
+function getRouteRequestPayload(res) {
+  const payload = res.locals[REQUEST_PAYLOAD_SYMBOL];
+  if (payload) {
+    return payload;
+  }
+  throw new Error("Request payload was not initialized before middleware");
+}
+function setRouteRequestPayload(res, payload) {
+  ;
+  res.locals[REQUEST_PAYLOAD_SYMBOL] = payload;
+}
 function getCtx(res) {
   return res.locals[CTX_SYMBOL];
 }
@@ -81,6 +135,26 @@ function adaptCtxMw(mw) {
     }
   };
 }
+function adaptRouteBeforeMw(mw) {
+  return (req, res, next) => {
+    try {
+      const result = mw({
+        req,
+        res,
+        next,
+        ctx: getCtx(res),
+        ...getRouteRequestPayload(res)
+      });
+      if (result && typeof result.then === "function") {
+        return result.catch((err) => next(err));
+      }
+      return result;
+    } catch (err) {
+      next(err);
+      return void 0;
+    }
+  };
+}
 function logHandlerDebugWithRoutesLogger(logger, event) {
   if (!logger || event.type !== "handler") return;
   const payload = [
@@ -95,6 +169,9 @@ function logHandlerDebugWithRoutesLogger(logger, event) {
   ;
   (logger.debug ?? logger.verbose ?? logger.info ?? logger.log ?? logger.system)?.call(logger, ...payload);
 }
+var defaultMulterOptions = {
+  storage: multer.memoryStorage()
+};
 var defaultSend = (res, data) => {
   res.json(data);
 };
@@ -138,12 +215,22 @@ function createRRRoute(router, config) {
     (mw) => adaptCtxMw(mw)
   );
   const registered = getRegisteredRouteStore(router);
-  const buildDerived = (leaf) => {
-    const derived = [];
-    if (config.fromCfg?.upload && Array.isArray(leaf.cfg.bodyFiles) && leaf.cfg.bodyFiles.length > 0) {
-      derived.push(...config.fromCfg.upload(leaf.cfg.bodyFiles));
-    }
-    return derived;
+  const getMulterOptions = (fields) => {
+    if (!fields || fields.length === 0) return void 0;
+    const resolved = typeof config.multerOptions === "function" ? config.multerOptions(fields) : config.multerOptions;
+    if (resolved === false) return void 0;
+    return resolved ?? defaultMulterOptions;
+  };
+  const runMulterHandler = (handler, req, res) => {
+    return new Promise((resolve, reject) => {
+      handler(req, res, (err) => {
+        if (err) {
+          reject(err);
+          return;
+        }
+        resolve();
+      });
+    });
   };
   function register(leaf, def) {
     const method = leaf.method;
@@ -171,8 +258,84 @@ function createRRRoute(router, config) {
     const emit = (event) => activeEmit(event, debugName);
     const isVerboseDebug = activeDebugMode === "complete";
     emit({ type: "register", method: methodUpper, path });
-    const routeSpecific = (def?.before ?? []).map((mw) => adaptCtxMw(mw));
-    const derived = buildDerived(leaf);
+    const routeSpecific = (def?.before ?? []).map(
+      (mw) => adaptRouteBeforeMw(mw)
+    );
+    const resolvePayloadMw = async (req, res, next) => {
+      const requestUrl = req.originalUrl ?? path;
+      const startedAt = Date.now();
+      let params;
+      let query;
+      let body;
+      let bodyFiles;
+      try {
+        if (leaf.cfg.bodyFiles && leaf.cfg.bodyFiles.length > 0) {
+          const uploadOptions = getMulterOptions(leaf.cfg.bodyFiles);
+          if (uploadOptions) {
+            const fieldDefs = leaf.cfg.bodyFiles.map(({ name, maxCount }) => ({
+              name,
+              maxCount
+            }));
+            const uploader = multer(uploadOptions).fields(fieldDefs);
+            await runMulterHandler(uploader, req, res);
+          }
+        }
+        bodyFiles = resolveBodyFilesFromRequest(req, leaf.cfg.bodyFiles);
+        params = leaf.cfg.paramsSchema ? lowProfileParse(leaf.cfg.paramsSchema, req.params) : Object.keys(req.params || {}).length ? req.params : void 0;
+        const hasQueryKeys = req.query && Object.keys(req.query || {}).length > 0;
+        const parsedQueryInput = leaf.cfg.querySchema && hasQueryKeys ? decodeJsonLikeQueryValue(req.query) : req.query;
+        if (leaf.cfg.querySchema) {
+          try {
+            query = lowProfileParse(
+              leaf.cfg.querySchema,
+              parsedQueryInput
+            );
+          } catch (err) {
+            const parseError = new Error(
+              `Query parsing error: ${err.message ?? String(err)}`
+            );
+            parseError.raw = JSON.stringify(req.query);
+            parseError.cause = err;
+            throw parseError;
+          }
+        } else {
+          query = hasQueryKeys ? req.query : void 0;
+        }
+        body = leaf.cfg.bodySchema ? lowProfileParse(leaf.cfg.bodySchema, req.body) : req.body !== void 0 ? req.body : void 0;
+      } catch (err) {
+        const payloadError = {
+          params,
+          query,
+          body,
+          bodyFiles
+        };
+        emit(
+          decorateDebugEvent(
+            isVerboseDebug,
+            {
+              type: "request",
+              stage: "error",
+              method: methodUpper,
+              path,
+              url: requestUrl,
+              durationMs: Date.now() - startedAt,
+              error: err
+            },
+            isVerboseDebug ? payloadError : void 0
+          )
+        );
+        next(err);
+        return;
+      }
+      const requestPayload = {
+        params,
+        query,
+        body,
+        bodyFiles
+      };
+      setRouteRequestPayload(res, requestPayload);
+      next();
+    };
     const ctxMw = async (req, res, next) => {
       const requestUrl = req.originalUrl ?? path;
       const startedAt = Date.now();
@@ -184,7 +347,10 @@ function createRRRoute(router, config) {
         url: requestUrl
       });
       try {
-        const ctx = await config.buildCtx(req, res);
+        const ctx = await config.buildCtx({
+          req,
+          res
+        });
         res.locals[CTX_SYMBOL] = ctx;
         emit({
           type: "buildCtx",
@@ -209,9 +375,9 @@ function createRRRoute(router, config) {
       }
     };
     const before = [
+      resolvePayloadMw,
       ctxMw,
       ...globalBeforeMws,
-      ...derived,
       ...routeSpecific
     ];
     const wrapped = async (req, res, next) => {
@@ -224,9 +390,11 @@ function createRRRoute(router, config) {
         path,
         url: requestUrl
       });
-      let params;
-      let query;
-      let body;
+      const requestPayload = getRouteRequestPayload(res);
+      const params = requestPayload.params;
+      const query = requestPayload.query;
+      const body = requestPayload.body;
+      const bodyFiles = requestPayload.bodyFiles;
       let responsePayload;
       let hasResponsePayload = false;
       const downstreamNext = next;
@@ -244,26 +412,6 @@ function createRRRoute(router, config) {
         }
       };
       try {
-        params = leaf.cfg.paramsSchema ? lowProfileParse(leaf.cfg.paramsSchema, req.params) : Object.keys(req.params || {}).length ? req.params : void 0;
-        try {
-          const parsedQueryInput = leaf.cfg.querySchema && req.query ? decodeJsonLikeQueryValue(req.query) : req.query;
-          query = leaf.cfg.querySchema ? lowProfileParse(leaf.cfg.querySchema, parsedQueryInput) : Object.keys(req.query || {}).length ? req.query : void 0;
-        } catch (e) {
-          emitWithCtx({
-            type: "request",
-            stage: "error",
-            method: methodUpper,
-            path,
-            url: requestUrl,
-            error: {
-              ...e,
-              raw: JSON.stringify(req.query),
-              message: `Query parsing error: ${e.message}`
-            }
-          });
-          throw e;
-        }
-        body = leaf.cfg.bodySchema ? lowProfileParse(leaf.cfg.bodySchema, req.body) : req.body !== void 0 ? req.body : void 0;
         const handlerStartedAt = Date.now();
         emitWithCtx(
           {
@@ -272,7 +420,7 @@ function createRRRoute(router, config) {
             method: methodUpper,
             path
           },
-          isVerboseDebug ? { params, query, body } : void 0
+          isVerboseDebug ? { params, query, body, bodyFiles } : void 0
         );
         let result;
         try {
@@ -283,7 +431,8 @@ function createRRRoute(router, config) {
             ctx,
             params,
             query,
-            body
+            body,
+            bodyFiles
           });
           emitWithCtx(
             {
@@ -297,6 +446,7 @@ function createRRRoute(router, config) {
               params,
               query,
               body,
+              bodyFiles,
               ...result !== void 0 ? { output: result } : {}
             } : void 0
           );
@@ -310,7 +460,7 @@ function createRRRoute(router, config) {
               durationMs: Date.now() - handlerStartedAt,
               error: e
             },
-            isVerboseDebug ? { params, query, body } : void 0
+            isVerboseDebug ? { params, query, body, bodyFiles } : void 0
           );
           throw e;
         }
@@ -331,6 +481,7 @@ function createRRRoute(router, config) {
             params,
             query,
             body,
+            bodyFiles,
             ...hasResponsePayload ? { output: responsePayload } : {}
           } : void 0
         );
@@ -345,7 +496,7 @@ function createRRRoute(router, config) {
             durationMs: Date.now() - startedAt,
             error: err
           },
-          isVerboseDebug ? { params, query, body } : void 0
+          isVerboseDebug ? { params, query, body, bodyFiles } : void 0
         );
         next(err);
       }
@@ -472,8 +623,12 @@ function createBuiltInConnectionHandlers(opts) {
   const pingEvent = "sys:ping";
   const pongEvent = "sys:pong";
   const heartbeatEnabled = heartbeat?.enabled !== false;
-  const joinPayloadSchema = buildRoomPayloadSchema(config.joinMetaMessage);
-  const leavePayloadSchema = buildRoomPayloadSchema(config.leaveMetaMessage);
+  const joinPayloadSchema = buildRoomPayloadSchema(
+    config.joinMetaMessage
+  );
+  const leavePayloadSchema = buildRoomPayloadSchema(
+    config.leaveMetaMessage
+  );
   const pingPayloadSchema = config.pingPayload;
   const pongPayloadSchema = config.pongPayload;
   const sysEvents = sys;