@paroicms/server 1.78.1 → 1.80.0

package/dist/express/pa-http-context.js

@@ -0,0 +1,39 @@
+import { Stream } from "node:stream";
+export function toPaHttpContext(expressReq, expressRes) {
+    const req = {
+        hostname: expressReq.hostname,
+        headers: expressReq.headers,
+        method: expressReq.method,
+        relativeUrl: expressReq.url,
+        path: expressReq.path,
+        query: expressReq.query,
+        body: expressReq.body,
+        file: expressReq.file,
+    };
+    let headersSent = false;
+    const res = {
+        get headersSent() {
+            return headersSent || expressRes.headersSent;
+        },
+        status(code) {
+            expressRes.status(code);
+            return res;
+        },
+        append(field, value) {
+            expressRes.append(field, value);
+            return res;
+        },
+        send(body) {
+            headersSent = true;
+            if (body instanceof Stream) {
+                body.pipe(expressRes);
+            }
+            else {
+                expressRes.send(body);
+            }
+            return res;
+        },
+    };
+    return { req, res };
+}
+//# sourceMappingURL=pa-http-context.js.map

package/dist/express/pa-http-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pa-http-context.js","sourceRoot":"","sources":["../../src/express/pa-http-context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,UAAU,eAAe,CAAC,UAAmB,EAAE,UAAoB;IACvE,MAAM,GAAG,GAAkB;QACzB,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,OAAO,EAAE,UAAU,CAAC,OAAuD;QAC3E,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,WAAW,EAAE,UAAU,CAAC,GAAG;QAC3B,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,KAAK,EAAE,UAAU,CAAC,KAAwD;QAC1E,IAAI,EAAE,UAAU,CAAC,IAA0B;QAC3C,IAAI,EAAE,UAAU,CAAC,IAAI;KACtB,CAAC;IAEF,IAAI,WAAW,GAAG,KAAK,CAAC;IAExB,MAAM,GAAG,GAAmB;QAC1B,IAAI,WAAW;YACb,OAAO,WAAW,IAAI,UAAU,CAAC,WAAW,CAAC;QAC/C,CAAC;QACD,MAAM,CAAC,IAAI;YACT,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACxB,OAAO,GAAG,CAAC;QACb,CAAC;QACD,MAAM,CAAC,KAAK,EAAE,KAAK;YACjB,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAChC,OAAO,GAAG,CAAC;QACb,CAAC;QACD,IAAI,CAAC,IAAI;YACP,WAAW,GAAG,IAAI,CAAC;YACnB,IAAI,IAAI,YAAY,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;KACF,CAAC;IAEF,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AACtB,CAAC"}

package/dist/express/public-api-middlewares.d.ts

@@ -1,2 +1,3 @@
-import type { Request, Response } from "express";
-export declare function pluginPublicApiMiddleware(req: Request, res: Response, next: () => void): Promise<void>;
+import type { PaHttpContext } from "@paroicms/public-server-lib";
+import type { SiteContext } from "../site-context/site-context.types.js";
+export declare function pluginPublicApiReqHandler(siteContext: SiteContext, httpContext: PaHttpContext): Promise<boolean>;

package/dist/express/public-api-middlewares.js

@@ -1,28 +1,21 @@
 import { makeBackendPluginRenderService } from "../helpers/make-backend-plugin-service.js";
 import { createNoRenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
-import { getReqSiteContext, serve404SimpleHtml, serve500Html } from "./http-helpers.js";
-export async function pluginPublicApiMiddleware(req, res, next) {
-    const siteContext = getReqSiteContext(req);
+import { serve404SimpleHtml } from "./http-helpers.js";
+export async function pluginPublicApiReqHandler(siteContext, httpContext) {
+    const { req } = httpContext;
     const path = req.path;
     const prefix = "/api/plugin/";
-    if (!path.startsWith(prefix)) {
-        next();
-        return;
-    }
+    if (!path.startsWith(prefix))
+        return false;
     const sepIndex = path.indexOf("/", prefix.length);
     const pluginPublicDirName = sepIndex === -1 ? path.substring(prefix.length) : path.substring(prefix.length, sepIndex);
     const relativePath = sepIndex === -1 ? "" : path.substring(sepIndex);
     const plugin = siteContext.plugins.get(pluginPublicDirName);
     if (!plugin || !plugin.publicApiHandler) {
-        serve404SimpleHtml(res);
-        return;
-    }
-    try {
-        await plugin.publicApiHandler(makeBackendPluginRenderService(siteContext, createNoRenderingContext(), plugin), req, res, relativePath);
-    }
-    catch (error) {
-        siteContext.logger.error(error);
-        serve500Html(res);
+        serve404SimpleHtml(httpContext);
+        return true;
     }
+    await plugin.publicApiHandler(makeBackendPluginRenderService(siteContext, createNoRenderingContext(), plugin), httpContext, relativePath);
+    return true;
 }
 //# sourceMappingURL=public-api-middlewares.js.map

package/dist/express/public-api-middlewares.js.map

@@ -1 +1 @@
-{"version":3,"file":"public-api-middlewares.js","sourceRoot":"","sources":["../../src/express/public-api-middlewares.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,8BAA8B,EAAE,MAAM,2CAA2C,CAAC;AAC3F,OAAO,EAAE,wBAAwB,EAAE,MAAM,2DAA2D,CAAC;AACrG,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAExF,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAgB;IAC3F,MAAM,WAAW,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,MAAM,MAAM,GAAG,cAAc,CAAC;IAC9B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,IAAI,EAAE,CAAC;QACP,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,mBAAmB,GACvB,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC5F,MAAM,YAAY,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QACxC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,gBAAgB,CAC3B,8BAA8B,CAAC,WAAW,EAAE,wBAAwB,EAAE,EAAE,MAAM,CAAC,EAC/E,GAAG,EACH,GAAG,EACH,YAAY,CACb,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAChC,YAAY,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;AACH,CAAC"}
+{"version":3,"file":"public-api-middlewares.js","sourceRoot":"","sources":["../../src/express/public-api-middlewares.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,8BAA8B,EAAE,MAAM,2CAA2C,CAAC;AAC3F,OAAO,EAAE,wBAAwB,EAAE,MAAM,2DAA2D,CAAC;AAErG,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,WAAwB,EACxB,WAA0B;IAE1B,MAAM,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;IAC5B,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,MAAM,MAAM,GAAG,cAAc,CAAC;IAC9B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAE3C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,mBAAmB,GACvB,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC5F,MAAM,YAAY,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACrE,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QACxC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,CAAC,gBAAgB,CAC3B,8BAA8B,CAAC,WAAW,EAAE,wBAAwB,EAAE,EAAE,MAAM,CAAC,EAC/E,WAAW,EACX,YAAY,CACb,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/express/route-handler-wrapper.d.ts

@@ -1,4 +1,11 @@
+import type { PaHttpContext } from "@paroicms/public-server-lib";
 import type { NextFunction, Request, Response } from "express";
 import { Stream } from "node:stream";
-export declare function wrapRouteHandler(handler: (req: Request, res: Response) => Promise<unknown>): (req: Request, res: Response) => Promise<Stream | undefined>;
-export declare function wrapMiddlewareHandler(handler: (req: Request, res: Response, next: NextFunction) => Promise<unknown>): (req: Request, res: Response, next: NextFunction) => Promise<void>;
+import type { SiteContext } from "../site-context/site-context.types.js";
+export declare function loadPaContextsMiddleware(req: Request, res: Response, next: NextFunction): Promise<void>;
+export type PaRouteController = (siteContext: SiteContext, httpContext: PaHttpContext, routeParams: Record<string, string | undefined>) => Promise<unknown>;
+export declare function wrapRouteController(handler: PaRouteController): (req: Request, res: Response) => Promise<void>;
+export type PaReqHandler = (siteContext: SiteContext, httpContext: PaHttpContext) => Promise<boolean>;
+export declare function reqHandlerToExpressMiddleware(handler: PaReqHandler): (req: Request, res: Response, next: NextFunction) => Promise<void>;
+export declare function mergeReqHandlers(handlers: PaReqHandler[]): PaReqHandler;
+export declare function wrapExpressRoute(handler: (req: Request, res: Response) => Promise<unknown>): (req: Request, res: Response) => Promise<Stream | undefined>;

package/dist/express/route-handler-wrapper.js

@@ -1,8 +1,77 @@
 import { Stream } from "node:stream";
 import { ApiError } from "../common/api-error-handler.js";
 import { platformLogger } from "../context.js";
-import { serve500Html } from "./http-helpers.js";
-export function wrapRouteHandler(handler) {
+import { getSiteContext } from "../site-context/site-context.js";
+import { getPaSiteContext, serve404SimpleHtml, serve500Html } from "./http-helpers.js";
+import { toPaHttpContext } from "./pa-http-context.js";
+export async function loadPaContextsMiddleware(req, res, next) {
+    try {
+        const siteContext = await getSiteContext(req.hostname, { returnsUndef: true });
+        if (!siteContext) {
+            platformLogger.debug(`[404] Site not found: ${req.protocol}://${req.hostname}${req.originalUrl}`);
+            serve404SimpleHtml(toPaHttpContext(req, res));
+            return;
+        }
+        req.paSiteContext = siteContext;
+        next();
+    }
+    catch (error) {
+        handleErrorSafely(req, res, error, undefined);
+    }
+}
+export function wrapRouteController(handler) {
+    return async (req, res) => {
+        const httpContext = toPaHttpContext(req, res);
+        const siteContext = getPaSiteContext(req);
+        try {
+            let result = await handler(siteContext, httpContext, req.params);
+            if (result instanceof Stream) {
+                result.pipe(res);
+                return;
+            }
+            if (!httpContext.res.headersSent) {
+                result ??= "";
+                if (typeof result === "object" || Array.isArray(result)) {
+                    res.status(200).json(result);
+                }
+                else {
+                    res.status(200).send(String(result));
+                }
+            }
+            else if (result) {
+                (req.paSiteContext?.logger ?? platformLogger).error(`[${req.url}]`, "Cannot send a http response:", result);
+            }
+        }
+        catch (error) {
+            handleErrorSafely(req, res, error, httpContext);
+        }
+    };
+}
+export function reqHandlerToExpressMiddleware(handler) {
+    return async (req, res, next) => {
+        const httpContext = toPaHttpContext(req, res);
+        const siteContext = getPaSiteContext(req);
+        try {
+            const done = await handler(siteContext, httpContext);
+            if (!done) {
+                next();
+            }
+        }
+        catch (error) {
+            handleErrorSafely(req, res, error, httpContext);
+        }
+    };
+}
+export function mergeReqHandlers(handlers) {
+    return async (siteContext, httpContext) => {
+        for (const handler of handlers) {
+            if (await handler(siteContext, httpContext))
+                return true;
+        }
+        return false;
+    };
+}
+export function wrapExpressRoute(handler) {
     return async (req, res) => {
         try {
             let response = await handler(req, res);
@@ -22,36 +91,20 @@ export function wrapRouteHandler(handler) {
             }
         }
         catch (error) {
-            (req.paSiteContext?.logger ?? platformLogger).error(`[${req.url}]`, error);
-            if (!res.headersSent) {
-                if (error instanceof ApiError) {
-                    const message = error.status === 500 ? "Internal Server Error" : error.message;
-                    res.status(error.status).json({ message });
-                }
-                else {
-                    serve500Html(res);
-                }
-            }
+            handleErrorSafely(req, res, error, undefined);
         }
     };
 }
-export function wrapMiddlewareHandler(handler) {
-    return async (req, res, next) => {
-        try {
-            await handler(req, res, next);
+function handleErrorSafely(req, res, error, httpContext) {
+    (req.paSiteContext?.logger ?? platformLogger).error(`[${req.url}]`, error);
+    if (!res.headersSent) {
+        if (error instanceof ApiError) {
+            const message = error.status === 500 ? "Internal Server Error" : error.message;
+            res.status(error.status).json({ message });
         }
-        catch (error) {
-            (req.paSiteContext?.logger ?? platformLogger).error(`[${req.url}]`, error);
-            if (!res.headersSent) {
-                if (error instanceof ApiError) {
-                    const message = error.status === 500 ? "Internal Server Error" : error.message;
-                    res.status(error.status).json({ message });
-                }
-                else {
-                    serve500Html(res);
-                }
-            }
+        else {
+            serve500Html(httpContext ?? toPaHttpContext(req, res));
         }
-    };
+    }
 }
 //# sourceMappingURL=route-handler-wrapper.js.map

package/dist/express/route-handler-wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-handler-wrapper.js","sourceRoot":"","sources":["../../src/express/route-handler-wrapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"route-handler-wrapper.js","sourceRoot":"","sources":["../../src/express/route-handler-wrapper.ts"],"names":[],"mappings":"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"}

package/dist/express/serve-file.d.ts

@@ -0,0 +1,8 @@
+import type { PaHttpContext } from "@paroicms/public-server-lib";
+export interface ServeFileOption {
+    immutable?: boolean;
+    maxAge?: number;
+    root?: string;
+    on404?: () => Promise<void> | void;
+}
+export declare function serveFile({ req, res }: PaHttpContext, path: string, options?: ServeFileOption): Promise<void>;

package/dist/express/serve-file.js

@@ -0,0 +1,58 @@
+import { lookup } from "mime-types";
+import { readFile, stat } from "node:fs/promises";
+import { join } from "node:path";
+export async function serveFile({ req, res }, path, options = {}) {
+    const { immutable, maxAge, root, on404 } = options;
+    const fullPath = root ? join(root, path) : path;
+    try {
+        let fileStat;
+        try {
+            fileStat = await stat(fullPath);
+        }
+        catch (err) {
+            if (err.code !== "ENOENT")
+                throw err;
+            if (on404) {
+                await on404();
+            }
+            else {
+                res.status(404);
+                res.send({ error: "File not found" });
+            }
+            return;
+        }
+        const lastModified = new Date(fileStat.mtime).toUTCString();
+        res.append("Last-Modified", lastModified);
+        if (maxAge !== undefined) {
+            res.append("Cache-Control", immutable ? `max-age=${maxAge}, immutable` : `max-age=${maxAge}`);
+        }
+        const mimeType = lookup(fullPath) || "application/octet-stream";
+        const charset = /^text\/|^application\/(javascript|json)/.test(mimeType)
+            ? "; charset=utf-8"
+            : "";
+        res.append("Content-Type", `${mimeType}${charset}`);
+        const ifModifiedSince = req.headers["if-modified-since"];
+        if (ifModifiedSince) {
+            const ifModifiedSinceDate = new Date(ifModifiedSince);
+            const lastModifiedDate = new Date(fileStat.mtime);
+            lastModifiedDate.setMilliseconds(0);
+            if (ifModifiedSinceDate >= lastModifiedDate) {
+                res.status(304).send();
+                return;
+            }
+        }
+        const buf = await readFile(fullPath);
+        res.append("X-Content-Type-Options", "nosniff");
+        res.append("Content-Length", buf.byteLength.toString());
+        res.status(200);
+        res.send(buf);
+    }
+    catch (error) {
+        if ("code" in error) {
+            if (error.code === "ECONNABORTED")
+                return;
+        }
+        throw error;
+    }
+}
+//# sourceMappingURL=serve-file.js.map

package/dist/express/serve-file.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serve-file.js","sourceRoot":"","sources":["../../src/express/serve-file.ts"],"names":[],"mappings":"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"}

package/dist/express/site-middleware.d.ts

@@ -0,0 +1,3 @@
+import express, { type NextFunction, type Request, type Response } from "express";
+export declare function createBoGraphqlMiddleware(): Promise<express.RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>>;
+export declare function createSiteMiddleware(): (req: Request, res: Response, next: NextFunction) => void;

package/dist/express/site-middleware.js

@@ -0,0 +1,83 @@
+import { ApolloServer } from "@apollo/server";
+import { expressMiddleware as graphqlMiddleware } from "@apollo/server/express4";
+import express from "express";
+import { GraphQLError } from "graphql";
+import multer from "multer";
+import { downloadBackupController } from "../bo-backend/backup/backup.controller.js";
+import { loginController } from "../bo-backend/login/login.controller.js";
+import { uploadMediaController } from "../bo-backend/media/media-upload.controller.js";
+import { ApiError } from "../common/api-error-handler.js";
+import { platformLogger } from "../context.js";
+import { getPaSiteContext } from "../express/http-helpers.js";
+import { pluginPublicApiReqHandler } from "../express/public-api-middlewares.js";
+import { mergeReqHandlers, reqHandlerToExpressMiddleware, wrapRouteController, } from "../express/route-handler-wrapper.js";
+import { boFilesReqHandler, boPluginsReqHandler, publicAssetsReqHandler, } from "../express/static-files-middlewares.js";
+import { federateResolvers, typeDefs } from "../graphql/apollo-server-init.js";
+import { createComplexityPlugin } from "../graphql/complexity-plugin.js";
+import { disableApolloStudioPlugin } from "../graphql/disable-apollo-studio-plugin.js";
+import { createErrorConverterPlugin } from "../graphql/error-converter-plugin.js";
+import { checkPasswordResetController, setAccountPasswordController, } from "../public-api/password-reset/password-reset.controller.js";
+import { healthCheckController } from "../public-api/public-api-controller.js";
+import { faviconController, robotsTxtController } from "../public-site/common-routes.controller.js";
+import { feedReqHandler } from "../public-site/feed/feed.middleware.js";
+import { serveFilecontroller, serveUnversionedImageController, serveVersionedImageController, } from "../public-site/media-serve/media-serve.controller.js";
+import { publicSiteReqHandler } from "../public-site/public-site.middleware.js";
+import { toPaHttpContext } from "./pa-http-context.js";
+export async function createBoGraphqlMiddleware() {
+    const developmentMode = process.env.NODE_ENV === "development";
+    const graphqlServer = new ApolloServer({
+        typeDefs,
+        resolvers: federateResolvers(),
+        plugins: [
+            createComplexityPlugin(),
+            createErrorConverterPlugin(),
+            ...(developmentMode ? [] : [disableApolloStudioPlugin()]),
+        ],
+        introspection: developmentMode,
+        formatError(formattedError, error) {
+            if (error instanceof GraphQLError && (!error.cause || error.cause instanceof ApiError)) {
+                return formattedError;
+            }
+            platformLogger.error("Unexpected graphql error", formattedError, error);
+            return {
+                message: "Internal Server Error",
+                code: "INTERNAL_SERVER_ERROR",
+            };
+        },
+    });
+    await graphqlServer.start();
+    return graphqlMiddleware(graphqlServer, {
+        context: async ({ req, res }) => ({
+            siteContext: getPaSiteContext(req),
+            httpContext: toPaHttpContext(req, res),
+        }),
+    });
+}
+export function createSiteMiddleware() {
+    const router = express.Router();
+    const upload = multer();
+    router.post("/adm/backend/upload", upload.single("file"), wrapRouteController(uploadMediaController));
+    router.get("/adm/backend/backup/:backupName", wrapRouteController(downloadBackupController));
+    router.get("/api/v1/healthcheck", wrapRouteController(healthCheckController));
+    router.post("/api/v1/login", wrapRouteController(loginController));
+    router.post("/api/v1/set-account-password", wrapRouteController(setAccountPasswordController));
+    router.post("/api/v1/check-password-reset", wrapRouteController(checkPasswordResetController));
+    router.get("/robots.txt", wrapRouteController(robotsTxtController));
+    router.get("/favicon.ico", wrapRouteController(faviconController));
+    router.get("/medias/:mediaUid/file/:nameAndExt", wrapRouteController(serveFilecontroller));
+    router.get("/medias/:mediaUid/image/:resourceVersion/:nameAndExt", wrapRouteController(serveVersionedImageController));
+    router.get("/medias/:mediaUid/image/:nameAndExt", wrapRouteController(serveUnversionedImageController));
+    const siteReqHandlers = mergeReqHandlers([
+        boPluginsReqHandler,
+        boFilesReqHandler,
+        pluginPublicApiReqHandler,
+        publicAssetsReqHandler,
+        feedReqHandler,
+        publicSiteReqHandler,
+    ]);
+    const siteReqMiddleware = reqHandlerToExpressMiddleware(siteReqHandlers);
+    return (req, res, next) => {
+        router(req, res, () => siteReqMiddleware(req, res, next));
+    };
+}
+//# sourceMappingURL=site-middleware.js.map

package/dist/express/site-middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"site-middleware.js","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"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"}

package/dist/express/static-files-middlewares.d.ts

@@ -1,4 +1,5 @@
-import type { Request, Response } from "express";
-export declare function publicAssetsMiddleware(req: Request, res: Response, next: () => void): Promise<void>;
-export declare function boMiddleware(req: Request, res: Response, next: () => void): Promise<void>;
-export declare function boPluginsMiddleware(req: Request, res: Response, next: () => void): Promise<void>;
+import type { PaHttpContext } from "@paroicms/public-server-lib";
+import type { SiteContext } from "../site-context/site-context.types.js";
+export declare function publicAssetsReqHandler(siteContext: SiteContext, httpContext: PaHttpContext): Promise<boolean>;
+export declare function boFilesReqHandler(siteContext: SiteContext, httpContext: PaHttpContext): Promise<boolean>;
+export declare function boPluginsReqHandler(siteContext: SiteContext, httpContext: PaHttpContext): Promise<boolean>;

package/dist/express/static-files-middlewares.js

@@ -6,13 +6,13 @@ import { getAssetsBaseUrl } from "../common/data-format.js";
 import { render404Html } from "../common/serve-text-or.js";
 import { appConf } from "../context.js";
 import { HTTP_MAX_AGE } from "./http-constants.js";
-import { getReqSiteContext, serve404SimpleHtml, serve500Html } from "./http-helpers.js";
-export async function publicAssetsMiddleware(req, res, next) {
-    const siteContext = getReqSiteContext(req);
+import { serve404SimpleHtml, serve500Html } from "./http-helpers.js";
+import { serveFile } from "./serve-file.js";
+export async function publicAssetsReqHandler(siteContext, httpContext) {
+    const { req } = httpContext;
     let path = req.path;
     if (!path.startsWith("/assets/") || !["GET", "HEAD"].includes(req.method)) {
-        next();
-        return;
+        return false;
     }
     let pathPrefix;
     let baseDir;
@@ -20,14 +20,14 @@ export async function publicAssetsMiddleware(req, res, next) {
     if (path.startsWith(pluginAssetsPrefix)) {
         const sepIndex = path.indexOf("/", pluginAssetsPrefix.length);
         if (sepIndex === -1) {
-            void render404Asset(siteContext, res);
-            return;
+            await render404Asset(siteContext, httpContext);
+            return true;
         }
         const pluginPublicDirName = path.substring(pluginAssetsPrefix.length, sepIndex);
         const plugin = siteContext.plugins.get(pluginPublicDirName);
         if (!plugin || !plugin.publicAssetsDir) {
-            void render404Asset(siteContext, res);
-            return;
+            await render404Asset(siteContext, httpContext);
+            return true;
         }
         baseDir = plugin.publicAssetsDir;
         pathPrefix = `${getPluginAssetsUrl(plugin)}/`;
@@ -37,107 +37,66 @@ export async function publicAssetsMiddleware(req, res, next) {
         baseDir = join(siteContext.themeDir, "assets");
     }
     if (!path.startsWith(pathPrefix)) {
-        void render404Asset(siteContext, res);
-        return;
+        await render404Asset(siteContext, httpContext);
+        return true;
     }
     path = path.substring(pathPrefix.length);
-    try {
-        res.sendFile(path, {
-            root: baseDir,
-            immutable: appConf.immutableAssets,
-            maxAge: appConf.immutableAssets ? HTTP_MAX_AGE : 0,
-        }, (error) => {
-            if (!error)
-                return;
-            sendFileErrorHandler(error, siteContext, res, path);
-        });
-    }
-    catch (error) {
-        siteContext.logger.error(error);
-        serve500Html(res);
-    }
+    await serveFile(httpContext, path, {
+        root: baseDir,
+        immutable: appConf.immutableAssets,
+        maxAge: appConf.immutableAssets ? HTTP_MAX_AGE : 0,
+    });
+    return true;
 }
-export async function boMiddleware(req, res, next) {
-    const siteContext = getReqSiteContext(req);
+export async function boFilesReqHandler(siteContext, httpContext) {
+    const { req } = httpContext;
     let path = req.path;
     if (!["GET", "HEAD"].includes(req.method) ||
         path.startsWith("/adm/api/v1") ||
         (path !== "/adm" && !path.startsWith("/adm/"))) {
-        next();
-        return;
-    }
-    try {
-        path = path.substring("/adm/".length);
-        if (path === "")
-            path = "index.html";
-        if (!(await pathExists(join(boDistDir, path)))) {
-            path = "index.html";
-        }
-        res.sendFile(path, { root: boDistDir }, (error) => {
-            if (!error)
-                return;
-            sendFileErrorHandler(error, siteContext, res, path);
-        });
-    }
-    catch (error) {
-        siteContext.logger.error(error);
-        serve500Html(res);
-    }
+        return false;
+    }
+    path = path.substring("/adm/".length);
+    if (path === "")
+        path = "index.html";
+    if (!(await pathExists(join(boDistDir, path)))) {
+        path = "index.html";
+    }
+    await serveFile(httpContext, path, {
+        root: boDistDir,
+        on404: () => render404Asset(siteContext, httpContext),
+    });
+    return true;
 }
-export async function boPluginsMiddleware(req, res, next) {
-    const siteContext = getReqSiteContext(req);
+export async function boPluginsReqHandler(siteContext, httpContext) {
+    const { req } = httpContext;
     const prefix = "/adm/plugins/";
     if (!["GET", "HEAD"].includes(req.method) || !req.path.startsWith(prefix)) {
-        next();
-        return;
+        return false;
     }
     const relPathIndex = req.path.indexOf("/", prefix.length);
     if (relPathIndex === -1) {
-        serve404SimpleHtml(res);
-        return;
+        serve404SimpleHtml(httpContext);
+        return true;
     }
     const urlPath = req.path.substring(prefix.length, relPathIndex);
     const relPath = req.path.substring(relPathIndex + 1);
-    try {
-        const plugin = siteContext.plugins.get(urlPath);
-        const boAssetsDir = plugin?.boAssetsDir;
-        if (!boAssetsDir || !(await pathExists(join(boAssetsDir, relPath)))) {
-            serve404SimpleHtml(res);
-            return;
-        }
-        res.sendFile(relPath, { root: boAssetsDir }, (error) => {
-            if (!error)
-                return;
-            sendFileErrorHandler(error, siteContext, res, join(boAssetsDir, relPath));
-        });
-    }
-    catch (error) {
-        siteContext.logger.error(error);
-        serve500Html(res);
-    }
-}
-function sendFileErrorHandler(error, siteContext, res, path) {
-    if ("statusCode" in error && error.statusCode === 404) {
-        void render404Asset(siteContext, res);
-    }
-    else {
-        if ("code" in error) {
-            if (error.code === "ECONNABORTED") {
-                res.send();
-                return;
-            }
-            siteContext.logger.error(`failed to serve file '${path}':`, error.code, error);
-        }
-        serve500Html(res);
-    }
+    const plugin = siteContext.plugins.get(urlPath);
+    const boAssetsDir = plugin?.boAssetsDir;
+    if (!boAssetsDir || !(await pathExists(join(boAssetsDir, relPath)))) {
+        serve404SimpleHtml(httpContext);
+        return true;
+    }
+    await serveFile(httpContext, relPath, { root: boAssetsDir });
+    return true;
 }
-async function render404Asset(siteContext, res) {
+async function render404Asset(siteContext, httpContext) {
     try {
-        await render404Html(siteContext, res);
+        await render404Html(siteContext, httpContext);
     }
     catch (error) {
         siteContext.logger.error("failed to render 404", error);
-        serve500Html(res);
+        serve500Html(httpContext);
     }
 }
 //# sourceMappingURL=static-files-middlewares.js.map