Skip to content

Commit

Permalink
fix: reduce middleware to ssr, add urlParser to add expected url obje…
Browse files Browse the repository at this point in the history
…ct on ctx object
  • Loading branch information
aheissenberger committed Sep 25, 2024
1 parent b2cf313 commit 4280adc
Showing 1 changed file with 22 additions and 10 deletions.
32 changes: 22 additions & 10 deletions packages/react-server-adapter-aws/libs/create-middleware.mjs
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
import { join, resolve } from "node:path";
import { /*join,*/ resolve } from "node:path";
import { Worker } from "node:worker_threads";

import { compose } from "@hattip/compose";
import { cookie } from "@hattip/cookie";
import { cors } from "@hattip/cors";
//import { cookie } from "@hattip/cookie";
//import { cors } from "@hattip/cors";
import { parseMultipartFormData } from "@hattip/multipart";
import notFoundHandler from "@lazarv/react-server/lib/handlers/not-found.mjs";
import staticHandler from "@lazarv/react-server/lib/handlers/static.mjs";
//import notFoundHandler from "@lazarv/react-server/lib/handlers/not-found.mjs";
//import staticHandler from "@lazarv/react-server/lib/handlers/static.mjs";
import trailingSlashHandler from "@lazarv/react-server/lib/handlers/trailing-slash.mjs";
import ssrHandler from "@lazarv/react-server/lib/start/ssr-handler.mjs";
import * as sys from "@lazarv/react-server/lib/sys.mjs";
//import * as sys from "@lazarv/react-server/lib/sys.mjs";
import { MemoryCache } from "@lazarv/react-server/memory-cache/index.mjs";
import { PrerenderStorage } from "@lazarv/react-server/server/prerender-storage.mjs";
//import { PrerenderStorage } from "@lazarv/react-server/server/prerender-storage.mjs";
import { getRuntime, runtime$ } from "@lazarv/react-server/server/runtime.mjs";
import {
CONFIG_CONTEXT,
CONFIG_ROOT,
FORM_DATA_PARSER,
LOGGER_CONTEXT,
//LOGGER_CONTEXT,
MEMORY_CACHE_CONTEXT,
WORKER_THREAD,
} from "@lazarv/react-server/server/symbols.mjs";

const cwd = sys.cwd();
//const cwd = sys.cwd();

const urlParser = (ctx) => {
ctx.url = new URL(ctx.request.url);
};

export async function createMiddleware(root, options) {
if (!options.outDir) {
Expand All @@ -39,7 +43,7 @@ export async function createMiddleware(root, options) {
runtime$(WORKER_THREAD, worker);

const config = getRuntime(CONFIG_CONTEXT)?.[CONFIG_ROOT] ?? {};
const logger = getRuntime(LOGGER_CONTEXT);
//const logger = getRuntime(LOGGER_CONTEXT);

const initialRuntime = {
[MEMORY_CACHE_CONTEXT]: new MemoryCache(),
Expand All @@ -53,7 +57,14 @@ export async function createMiddleware(root, options) {
...config.runtime,
}
);
const initialHandlers = [
urlParser,
await trailingSlashHandler(),
await ssrHandler(root, options),
];
return compose(initialHandlers);

/*
const publicDir =
typeof config.public === "string" ? config.public : "public";
const initialHandlers = [
Expand Down Expand Up @@ -91,4 +102,5 @@ export async function createMiddleware(root, options) {
);
return middleware;
*/
}

0 comments on commit 4280adc

Please sign in to comment.