@emeryld/rrroutes-server 2.4.2 → 2.4.3

package/dist/index.js

@@ -64,6 +64,20 @@ var decodeJsonLikeQueryValue = (value) => {
   return value;
 };
 var CTX_SYMBOL = /* @__PURE__ */ Symbol.for("typedLeaves.ctx");
+var REQUEST_PAYLOAD_SYMBOL = /* @__PURE__ */ Symbol.for(
+  "typedLeaves.requestPayload"
+);
+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 +95,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 = [
@@ -171,7 +205,9 @@ 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 routeSpecific = (def?.before ?? []).map(
+      (mw) => adaptRouteBeforeMw(mw)
+    );
     const derived = buildDerived(leaf);
     const ctxMw = async (req, res, next) => {
       const requestUrl = req.originalUrl ?? path;
@@ -183,8 +219,66 @@ function createRRRoute(router, config) {
         path,
         url: requestUrl
       });
+      let params;
+      let query;
+      let body;
       try {
-        const ctx = await config.buildCtx(req, res);
+        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
+        };
+        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
+      };
+      setRouteRequestPayload(res, requestPayload);
+      try {
+        const ctx = await config.buildCtx({
+          req,
+          res
+        });
         res.locals[CTX_SYMBOL] = ctx;
         emit({
           type: "buildCtx",
@@ -224,9 +318,10 @@ 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;
       let responsePayload;
       let hasResponsePayload = false;
       const downstreamNext = next;
@@ -244,26 +339,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(
           {
@@ -472,8 +547,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;