npm - @paroicms/server - Versions diffs - 1.87.3 → 1.88.1 - Mend

@paroicms/server 1.87.3 → 1.88.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (173) hide show

package/dist/common/medias/media-lib.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"media-lib.js","sourceRoot":"","sources":["../../../src/common/medias/media-lib.ts"],"names":[],"mappings":"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"}

package/dist/common/medias/to-media-values.d.ts ADDED Viewed

@@ -0,0 +1,40 @@
+import type { MFile, MImageVariant, MSourceImage, MSourceMedia, ResizeRule } from "@paroicms/public-anywhere-lib";
+import type { FileMd, ImageMd, MediaMd } from "@paroicms/server-database-media-storage";
+import type { ImageVariant } from "@paroicms/server-image-cache-engine";
+import type { RenderingContext } from "../../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+import type { TpFile, TpImageVariant, TpSourceImage, TpSourceMedia } from "../../rendering-payload/rendering-payload.types.js";
+import type { SiteContext } from "../../site-context/site-context.types.js";
+export declare function toTpSourceMedia(renderingContext: RenderingContext, media: ImageMd, options?: {
+    galleryHandle?: string;
+}): TpSourceImage;
+export declare function toTpSourceMedia(renderingContext: RenderingContext, media: FileMd, options?: {
+    galleryHandle?: string;
+}): TpFile;
+export declare function toTpSourceMedia(renderingContext: RenderingContext, media: MediaMd, options?: {
+    galleryHandle?: string;
+}): TpSourceMedia;
+export declare function isTpSourceMedia(media: unknown): media is TpSourceMedia;
+export declare function galleryHandleOf(media: TpSourceMedia): string | undefined;
+export declare function toMImageVariant(siteContext: Pick<SiteContext, "siteUrl">, variant: ImageVariant, options: {
+    pixelRatio: number;
+    absoluteUrl: boolean;
+    unversionedUrl?: {
+        resizeRule: ResizeRule;
+    } | undefined;
+}): MImageVariant;
+export declare function toMSourceMedia(siteContext: SiteContext, media: ImageMd, options?: {
+    absoluteUrl?: boolean;
+}): MSourceImage;
+export declare function toMSourceMedia(siteContext: SiteContext, media: FileMd, options?: {
+    absoluteUrl?: boolean;
+}): MFile;
+export declare function toMSourceMedia(siteContext: SiteContext, media: MediaMd, options?: {
+    absoluteUrl?: boolean;
+}): MSourceMedia;
+export declare function toTpImageVariant(siteContext: Pick<SiteContext, "siteUrl">, variant: ImageVariant, options: {
+    pixelRatio: number;
+    absoluteUrl: boolean;
+    unversionedUrl?: {
+        resizeRule: ResizeRule;
+    } | undefined;
+}): TpImageVariant;

package/dist/common/medias/to-media-values.js ADDED Viewed

@@ -0,0 +1,109 @@
+import { rawToRenderedSize } from "@paroicms/public-server-lib";
+import { makeUrlOfImageVariant, makeUrlOfMediaFile, makeUrlOfUnversionedImageVariant, } from "../../helpers/url-helpers.js";
+const galleryHandleSymbol = Symbol("galleryHandle");
+export function toTpSourceMedia(renderingContext, media, options) {
+    const { siteContext, language } = renderingContext;
+    const base = {
+        isSource: true,
+        mediaId: media.id,
+        mediaType: media.mediaType,
+        originalName: media.originalName,
+        url: makeUrlOfMediaFile(siteContext, {
+            mediaType: media.mediaType,
+            mediaId: media.id,
+            originalName: media.originalName,
+        }),
+        weightB: media.weightB,
+        attachedData: media.attachedData?.[language],
+        [galleryHandleSymbol]: options?.galleryHandle,
+    };
+    if (media.kind === "file") {
+        return {
+            kind: "file",
+            ...base,
+        };
+    }
+    const { rawWidth, rawHeight } = media;
+    const pixelRatio = media.pixelRatio ?? siteContext.themeConf.pixelRatio;
+    return {
+        kind: "image",
+        ...base,
+        rawWidth,
+        rawHeight,
+        pixelRatio,
+        ...rawToRenderedSize({ rawWidth, rawHeight }, pixelRatio),
+    };
+}
+export function isTpSourceMedia(media) {
+    return !!media && typeof media === "object" && galleryHandleSymbol in media;
+}
+export function galleryHandleOf(media) {
+    return media[galleryHandleSymbol];
+}
+export function toMImageVariant(siteContext, variant, options) {
+    const { mediaId, rawWidth, rawHeight, rawSizeName, mediaType, resourceVersion } = variant;
+    const { pixelRatio, absoluteUrl, unversionedUrl } = options;
+    const { width, height } = rawToRenderedSize({ rawWidth, rawHeight }, pixelRatio);
+    return {
+        kind: "image",
+        isSource: false,
+        mediaId,
+        url: unversionedUrl
+            ? makeUrlOfUnversionedImageVariant(siteContext, {
+                mediaId,
+                mediaType,
+                resizeRule: unversionedUrl.resizeRule,
+                slug: variant.slug,
+                absoluteUrl,
+            })
+            : makeUrlOfImageVariant(siteContext, {
+                mediaId,
+                mediaType,
+                rawSizeName,
+                resourceVersion,
+                slug: variant.slug,
+                absoluteUrl,
+            }),
+        mediaType,
+        rawWidth,
+        rawHeight,
+        pixelRatio,
+        width,
+        height,
+    };
+}
+export function toMSourceMedia(siteContext, media, { absoluteUrl = false } = {}) {
+    const base = {
+        isSource: true,
+        mediaId: media.id,
+        mediaType: media.mediaType,
+        weightB: media.weightB,
+        url: makeUrlOfMediaFile(siteContext, {
+            mediaType: media.mediaType,
+            mediaId: media.id,
+            originalName: media.originalName,
+            absoluteUrl,
+        }),
+        originalName: media.originalName,
+        attachedData: media.attachedData,
+    };
+    if (media.kind === "file") {
+        return {
+            kind: "file",
+            ...base,
+        };
+    }
+    const { rawWidth, rawHeight } = media;
+    return {
+        kind: "image",
+        ...base,
+        rawWidth,
+        rawHeight,
+        pixelRatio: media.pixelRatio,
+        ...rawToRenderedSize({ rawWidth, rawHeight }, media.pixelRatio ?? siteContext.themeConf.pixelRatio),
+    };
+}
+export function toTpImageVariant(siteContext, variant, options) {
+    return toMImageVariant(siteContext, variant, options);
+}
+//# sourceMappingURL=to-media-values.js.map

package/dist/common/medias/to-media-values.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"to-media-values.js","sourceRoot":"","sources":["../../../src/common/medias/to-media-values.ts"],"names":[],"mappings":"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"}

package/dist/common/serve-text-or.js CHANGED Viewed

@@ -45,10 +45,14 @@ export async function render404Html(siteContext, httpContext, options) {
     const cacheKey = makeCacheKey(siteContext.logger, { kind: "html", url: "404" });
     let cacheVal = await siteContext.textCache.getCacheValue(cacheKey, tracker);
     if (!cacheVal) {
-        const renderingContext = await createRenderingContext(siteContext, { cacheKey, tracker });
-        const html = await renderLiquidTemplate(siteContext, renderingContext, {
+        const renderingContext = await createRenderingContext(siteContext, {
+            cacheKey,
+            language: options?.language,
+            tracker,
+        });
+        const html = await renderLiquidTemplate(renderingContext, {
             templateNames: ["404"],
-            payload: makeDetachedPublicPayload(siteContext, renderingContext, {
+            payload: makeDetachedPublicPayload(renderingContext, {
                 language: options?.language,
                 urlQuery: httpContext.req.query,
             }),
@@ -58,6 +62,7 @@ export async function render404Html(siteContext, httpContext, options) {
             dependencyKeys: renderingContext.getDependencyKeys(),
             value: html,
         }, tracker);
+        await renderingContext.close();
     }
     serveTextContent(httpContext, {
         status: 404,

package/dist/common/serve-text-or.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yDAAyD,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AACnG,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAExF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAoC7D,MAAM,UAAU,oBAAoB,CAClC,WAAwB,EACxB,WAA0B,EAC1B,OAAgB,EAChB,OAMC;IAED,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC1C,OAAO;QACL,KAAK,CAAC,cAAc;YAClB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC9E,IAAI,CAAC,QAAQ;gBAAE,OAAO,KAAK,CAAC;YAE5B,gBAAgB,CAAC,WAAW,EAAE;gBAC5B,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe;oBAC7B,CAAC,CAAC;wBACE,IAAI,EAAE,QAAQ,CAAC,eAAe;qBAC/B;oBACH,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,CAAC,kBAAkB,CAAC,IAAI,EAAE,cAAc,EAAE,CAAqB;YAClE,MAAM,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC;YAC7B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAE3E,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CACxD;gBACE,QAAQ,EAAE,MAAM;gBAChB,cAAc;gBACd,KAAK,EAAE,IAAI;aACZ,EACD,OAAO,CACR,CAAC;YAEF,gBAAgB,CAAC,WAAW,EAAE;gBAC5B,WAAW;gBACX,IAAI,EAAE,QAAQ,CAAC,KAAK;gBACpB,KAAK,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,SAAS;aACjF,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,WAAwB,EACxB,WAA0B,EAC1B,OAA+B;IAE/B,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;IAChF,IAAI,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CAAC,WAAW,EAAE,~~EAAE~~,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;~~QAE1F~~,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,~~WAAW,EAAE,~~gBAAgB,EAAE;~~YACrE~~,aAAa,EAAE,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,yBAAyB,CAAC,~~WAAW,EAAE,~~gBAAgB,EAAE;~~gBAChE~~,QAAQ,EAAE,OAAO,EAAE,QAAQ;gBAC3B,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,KAAK;aAChC,CAAC;SACH,CAAC,CAAC;QAEH,QAAQ,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAClD;YACE,QAAQ;YACR,cAAc,EAAE,gBAAgB,CAAC,iBAAiB,EAAE;YACpD,KAAK,EAAE,IAAI;SACZ,EACD,OAAO,CACR,CAAC;~~IACJ~~,CAAC;IAED,gBAAgB,CAAC,WAAW,EAAE;QAC5B,MAAM,EAAE,GAAG;QACX,IAAI,EAAE,QAAQ,CAAC,KAAK;KACrB,CAAC,CAAC;IACH,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC;AACvF,CAAC"}
1	+ {"version":3,"file":"serve-text-or.js","sourceRoot":"","sources":["../../src/common/serve-text-or.ts"],"names":[],"mappings":"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"}

package/dist/common/text-cache.d.ts CHANGED Viewed

@@ -19,6 +19,7 @@ export declare function makeCacheDependencyKey(options: {
 } | {
     global: "all";
 }): string;
+export declare function dependencyKeyOfMedia(mediaId: string): string;
 export declare function makeCacheKey(logger: AppLogger, options: {
     kind: "redirect";
     urlKey: string;
@@ -39,6 +40,10 @@ export declare function makeCacheKey(logger: AppLogger, options: {
     kind: "api";
     url: string;
 }): string;
+export declare function makePluginCacheKey(logger: AppLogger, options: {
+    pluginSlug: string;
+    urlLike: string;
+}): string;
 export declare function invalidateDocumentInCache(siteContext: Pick<SiteContext, "cn" | "textCache" | "siteSchema">, options: {
     parentOf: ParsedNodelId;
 } | {

package/dist/common/text-cache.js CHANGED Viewed

@@ -25,6 +25,9 @@ export function makeCacheDependencyKey(options) {
         return `${encodedId}:${options.perimeter}`;
     return encodedId;
 }
+export function dependencyKeyOfMedia(mediaId) {
+    return `media:${mediaId}`;
+}
 export function makeCacheKey(logger, options) {
     const { kind, url, urlKey, documentId } = options;
     if (kind === "html")
@@ -39,6 +42,9 @@ export function makeCacheKey(logger, options) {
         return `${kind}:${encodeNodelId(documentId)}`;
     throw new Error("invalid parameter");
 }
+export function makePluginCacheKey(logger, options) {
+    return `plugin:${options.pluginSlug}:${normalizeUrlForCache(logger, options.urlLike)}`;
+}
 export async function invalidateDocumentInCache(siteContext, options) {
     const documentId = "documentId" in options
         ? options.documentId

package/dist/common/text-cache.js.map CHANGED Viewed

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

package/dist/context.d.ts CHANGED Viewed

@@ -1,14 +1,13 @@
 import { type CommonSchemaLibrary } from "@paroicms/connector";
-import type { ImageSize } from "@paroicms/public-anywhere-lib";
 import { type RegisteredSite, type SimpleTranslator } from "@paroicms/public-server-lib";
 export declare const dbAnyLanguage = ".";
+export declare const backOfficeOwnerHandle = "backOffice";
 export declare const packageDir: string;
 export declare const cmsVersion: any, appName: any;
 export declare let appVersion: string | undefined;
 export declare function setAppVersion(version: string): void;
 export declare const appConf: import("@paroicms/connector").AppConf;
 export declare const platformLogger: import("@paroicms/internal-server-lib").PlatformLog;
-export declare const thumbRealSize: ImageSize;
 export declare let registeredSites: Map<string, RegisteredSite>;
 export declare const httpRedirections: Map<string, import("@paroicms/connector").JtHttpRedirection>;
 export declare function initCommonSchemaLib(val: CommonSchemaLibrary): void;

package/dist/context.js CHANGED Viewed

@@ -1,9 +1,10 @@
 import { readAppConfSync, supportedLanguages } from "@paroicms/connector";
-import { createPlatformLog, readOrCreateJwtSecretSync } from "@paroicms/internal-server-lib";
-import { loadSimpleTranslatorFromDirectory, makeUrl, resolveModuleDirectory, } from "@paroicms/public-server-lib";
+import { createPlatformLog, makeUrl, readOrCreateJwtSecretSync, } from "@paroicms/internal-server-lib";
+import { loadSimpleTranslatorFromDirectory, resolveModuleDirectory, } from "@paroicms/public-server-lib";
 import { existsSync, readFileSync, renameSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
 export const dbAnyLanguage = ".";
+export const backOfficeOwnerHandle = "backOffice";
 export const packageDir = resolveModuleDirectory(import.meta.url, { parent: true });
 export const { version: cmsVersion, name: appName } = JSON.parse(readFileSync(join(packageDir, "package.json"), "utf-8"));
 export let appVersion;
@@ -16,7 +17,6 @@ export const platformLogger = createPlatformLog({
     file: appConf.logFile,
     reportMessage: true,
 });
-export const thumbRealSize = "x200x";
 export let registeredSites;
 export const httpRedirections = new Map((appConf.httpRedirections ?? []).map((item) => [item.fromFqdn, item]));
 let commonSchemaLib;

package/dist/context.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,eAAe,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACpG,OAAO,~~EAAE~~,iBAAiB,~~EAAE~~,yBAAyB,~~EAAE~~,MAAM,+BAA+B,CAAC;~~AAE7F~~,OAAO,EAGL,iCAAiC,EACjC,~~OAAO,EACP,~~sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,CAAC;~~AAEjC~~,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;AACpF,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAC9D,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CACxD,CAAC;AAEF,MAAM,CAAC,IAAI,UAA8B,CAAC;AAC1C,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,UAAU,GAAG,OAAO,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,iBAAiB,CAAC;IAC9C,KAAK,EAAE,OAAO,CAAC,QAAQ;IACvB,IAAI,EAAE,OAAO,CAAC,OAAO;IACrB,aAAa,EAAE,IAAI;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,~~MAAM,aAAa,GAAc,OAAO,CAAC;AAEhD,MAAM,CAAC,~~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"}
1	+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}

package/dist/express/http-helpers.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import type { PaHttpContext } from "@paroicms/public-server-lib";
 import type { Request } from "express";
 import type { SiteContext } from "../site-context/site-context.types.js";
-declare module "express-serve-static-core" {
+declare module "express" {
     interface Request {
         paSiteContext?: SiteContext;
     }

package/dist/express/public-api.req-handler.js CHANGED Viewed

@@ -1,5 +1,4 @@
-import { makeBackendPluginRenderService } from "../helpers/make-backend-plugin-service.js";
-import { createNoRenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+import { createBackendPluginService } from "../helpers/make-backend-plugin-service.js";
 import { serve404SimpleHtml } from "./http-helpers.js";
 export async function pluginPublicApiReqHandler(siteContext, httpContext) {
     const { req } = httpContext;
@@ -15,7 +14,8 @@ export async function pluginPublicApiReqHandler(siteContext, httpContext) {
         serve404SimpleHtml(httpContext);
         return true;
     }
-    await plugin.publicApiHandler(makeBackendPluginRenderService(siteContext, createNoRenderingContext(), plugin), httpContext, relativePath);
+    const service = createBackendPluginService(siteContext, plugin);
+    await plugin.publicApiHandler(service, httpContext, relativePath);
     return true;
 }
 //# sourceMappingURL=public-api.req-handler.js.map

package/dist/express/public-api.req-handler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"public-api.req-handler.js","sourceRoot":"","sources":["../../src/express/public-api.req-handler.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,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAClE,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"}
1	+ {"version":3,"file":"public-api.req-handler.js","sourceRoot":"","sources":["../../src/express/public-api.req-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAEvF,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,aAAa,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAClE,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;QACxC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,0BAA0B,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;IAClE,OAAO,IAAI,CAAC;AACd,CAAC"}

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

@@ -1,11 +1,10 @@
 import type { PaHttpContext } from "@paroicms/public-server-lib";
 import type { NextFunction, Request, Response } from "express";
-import { Stream } from "node:stream";
 import type { SiteContext } from "../site-context/site-context.types.js";
 export declare function loadPaSiteContextMiddleware(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 declare function wrapRouteController(handler: PaRouteController): (req: Request, res: Response, next: NextFunction) => 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>;
+export declare function wrapExpressRoute(handler: (req: Request, res: Response) => Promise<unknown>): (req: Request, res: Response, next: NextFunction) => Promise<void>;

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

@@ -26,6 +26,10 @@ export function wrapRouteController(handler) {
         try {
             let result = await handler(siteContext, httpContext, req.params);
             if (result instanceof Stream) {
+                res.setHeader("Content-Type", "application/octet-stream");
+                result.on("error", (error) => {
+                    handleErrorSafely(req, res, error, undefined);
+                });
                 result.pipe(res);
                 return;
             }
@@ -74,20 +78,26 @@ export function mergeReqHandlers(handlers) {
 export function wrapExpressRoute(handler) {
     return async (req, res) => {
         try {
-            let response = await handler(req, res);
-            if (response instanceof Stream)
-                return response;
+            let result = await handler(req, res);
+            if (result instanceof Stream) {
+                res.setHeader("Content-Type", "application/octet-stream");
+                result.on("error", (error) => {
+                    handleErrorSafely(req, res, error, undefined);
+                });
+                result.pipe(res);
+                return;
+            }
             if (!res.headersSent) {
-                response ??= "";
-                if (typeof response === "object" || Array.isArray(response)) {
-                    res.status(200).json(response);
+                result ??= "";
+                if (typeof result === "object" || Array.isArray(result)) {
+                    res.status(200).json(result);
                 }
                 else {
-                    res.status(200).send(String(response));
+                    res.status(200).send(String(result));
                 }
             }
-            else if (response) {
-                (req.paSiteContext?.logger ?? platformLogger).error(`[${req.url}]`, "Cannot send a http response:", response);
+            else if (result) {
+                (req.paSiteContext?.logger ?? platformLogger).error(`[${req.url}]`, "Cannot send a http response:", result);
             }
         }
         catch (error) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"route-handler-wrapper.js","sourceRoot":"","sources":["../../src/express/route-handler-wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IAC/F,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/E,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,cAAc,CAAC,KAAK,CAClB,yBAAyB,GAAG,CAAC,QAAQ,MAAM,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAC5E,CAAC;YACF,kBAAkB,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YAC9C,OAAO;QACT,CAAC;QACD,GAAG,CAAC,aAAa,GAAG,WAAW,CAAC;QAChC,IAAI,EAAE,CAAC;IACT,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAYD,MAAM,UAAU,mBAAmB,~~CAAC~~,OAA0B;~~IAC5D~~,OAAO,KAAK,EAAE,~~GAAY~~,EAAE,~~GAAa~~,EAAE,EAAE;~~QAC3C~~,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAE1C,IAAI,CAAC;YACH,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAEjE,IAAI,MAAM,YAAY,MAAM,EAAE,CAAC;gBAC7B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACjB,OAAO;YACT,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,KAAK,EAAE,CAAC;gBACd,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;oBACxD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC/B,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;gBACvC,CAAC;YACH,CAAC;iBAAM,IAAI,MAAM,EAAE,CAAC;gBAClB,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,IAAI,cAAc,CAAC,CAAC,KAAK,CACjD,IAAI,GAAG,CAAC,GAAG,GAAG,EACd,8BAA8B,EAC9B,MAAM,CACP,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QAClD,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAWD,MAAM,UAAU,6BAA6B,CAAC,OAAqB;IACjE,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAC/D,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YACrD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,EAAE,CAAC;YACT,CAAC;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QAClD,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,QAAwB;IACvD,OAAO,KAAK,EAAE,WAAwB,EAAE,WAA0B,EAAE,EAAE;QACpE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,MAAM,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC;gBAAE,OAAO,IAAI,CAAC;QAC3D,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,~~CAAC~~,OAA0D;~~IACzF~~,OAAO,KAAK,EAAE,~~GAAY~~,EAAE,~~GAAa~~,EAAE,EAAE;~~QAC3C~~,IAAI,CAAC;YACH,IAAI,~~QAAQ~~,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;~~YAEvC~~,IAAI,~~QAAQ~~,YAAY,MAAM;~~gBAAE~~,OAAO,~~QAAQ~~,CAAC;~~YAEhD~~,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrB,~~QAAQ~~,KAAK,EAAE,CAAC;~~gBAChB~~,IAAI,OAAO,~~QAAQ~~,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,~~QAAQ~~,CAAC,EAAE,CAAC;~~oBAC5D~~,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,~~QAAQ~~,CAAC,CAAC;~~gBACjC~~,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,~~QAAQ~~,CAAC,CAAC,CAAC;~~gBACzC~~,CAAC;YACH,CAAC;iBAAM,IAAI,~~QAAQ~~,EAAE,CAAC;~~gBACpB~~,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,IAAI,cAAc,CAAC,CAAC,KAAK,CACjD,IAAI,GAAG,CAAC,GAAG,GAAG,EACd,8BAA8B,EAC9B,~~QAAQ~~,~~CACT~~,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAChD,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,GAAY,EACZ,GAAa,EACb,KAAc,EACd,WAAsC;IAEtC,CAAC,GAAG,CAAC,aAAa,EAAE,MAAM,IAAI,cAAc,CAAC,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC;IAC3E,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACrB,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;YAC/E,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,WAAW,IAAI,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;AACH,CAAC"}
1	+ {"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.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { lookup } from "mime-types";
+import mime from "mime";
 import { readFile, stat } from "node:fs/promises";
 import { join } from "node:path";
 export async function serveFile({ req, res }, path, options = {}) {
@@ -26,7 +26,7 @@ export async function serveFile({ req, res }, path, options = {}) {
         if (maxAge !== undefined) {
             res.append("Cache-Control", immutable ? `max-age=${maxAge}, immutable` : `max-age=${maxAge}`);
         }
-        const mimeType = lookup(fullPath) || "application/octet-stream";
+        const mimeType = mime.getType(fullPath) ?? "application/octet-stream";
         const charset = /^text\/|^application\/(javascript|json)/.test(mimeType)
             ? "; charset=utf-8"
             : "";

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

	@@ -1 +1 @@
1	- {"version":3,"file":"serve-file.js","sourceRoot":"","sources":["../../src/express/serve-file.ts"],"names":[],"mappings":"AACA,OAAO,~~EAAE~~,MAAM,~~EAAE,~~MAAM,~~YAAY,~~CAAC;~~AAEpC~~,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AASjC,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,EAAE,GAAG,EAAE,GAAG,EAAiB,EAC3B,IAAY,EACZ,UAA2B,EAAE;IAE7B,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEhD,IAAI,CAAC;QAEH,IAAI,QAAe,CAAC;QACpB,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;gBAAE,MAAM,GAAG,CAAC;YACrC,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,KAAK,EAAE,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChB,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAC;YACxC,CAAC;YACD,OAAO;QACT,CAAC;QAGD,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5D,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAG1C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC,WAAW,MAAM,aAAa,CAAC,CAAC,CAAC,WAAW,MAAM,EAAE,CAAC,CAAC;QAChG,CAAC;QAGD,MAAM,QAAQ,GAAG,~~MAAM~~,CAAC,QAAQ,CAAC,IAAI,0BAA0B,CAAC;~~QAChE~~,MAAM,OAAO,GAAG,yCAAyC,CAAC,IAAI,CAAC,QAAQ,CAAC;YACtE,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,QAAQ,GAAG,OAAO,EAAE,CAAC,CAAC;QAGpD,MAAM,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QACzD,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,mBAAmB,GAAG,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC;YAEtD,MAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAClD,gBAAgB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YAEpC,IAAI,mBAAmB,IAAI,gBAAgB,EAAE,CAAC;gBAE5C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;gBACvB,OAAO;YACT,CAAC;QACH,CAAC;QAGD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAGrC,GAAG,CAAC,MAAM,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;QAChD,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc;gBAAE,OAAO;QAC5C,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
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 CHANGED Viewed

@@ -1,4 +1,4 @@
-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>>>;
+import { type NextFunction, type Request, type RequestHandler, type Response } from "express";
+export declare function createBoGraphqlMiddleware(): Promise<RequestHandler>;
 export declare function createMinimalSiteMiddleware(): (req: Request, res: Response, next: NextFunction) => void;
 export declare function createRenderedSiteMiddleware(): (req: Request, res: Response, next: NextFunction) => void;

package/dist/express/site-middleware.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { ApolloServer } from "@apollo/server";
-import { expressMiddleware as graphqlMiddleware } from "@apollo/server/express4";
+import { expressMiddleware } from "@as-integrations/express5";
 import { ApiError } from "@paroicms/public-server-lib";
 import express from "express";
 import { GraphQLError } from "graphql";
@@ -18,16 +18,16 @@ import { protectedAccessController } from "../protected-site/protected-access.co
 import { protectedSiteReqHandler } from "../protected-site/protected-site.req-handler.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 "../rendered-site/common-routes.controller.js";
+import { favicon16x16Controller, robotsTxtController, } from "../rendered-site/common-routes.controller.js";
 import { feedReqHandler } from "../rendered-site/feed/feed.req-handler.js";
-import { serveFilecontroller, serveUnversionedImageController, serveVersionedImageController, } from "../rendered-site/media-serve/media-serve.controller.js";
+import { serveCacheImageController, serveFilecontroller, } from "../rendered-site/media-serve/media-serve.controller.js";
 import { renderedSiteReqHandler } from "../rendered-site/rendered-site.req-handler.js";
 import { toPaHttpContext } from "./pa-http-context.js";
 import { pluginPublicApiReqHandler } from "./public-api.req-handler.js";
 import { boFilesReqHandler, boPluginsReqHandler, renderedPageAssetsReqHandler, } from "./static-files.req-handler.js";
 export async function createBoGraphqlMiddleware() {
     const developmentMode = process.env.NODE_ENV === "development";
-    const graphqlServer = new ApolloServer({
+    const apolloServer = new ApolloServer({
         typeDefs,
         resolvers: federateResolvers(),
         plugins: [
@@ -47,8 +47,8 @@ export async function createBoGraphqlMiddleware() {
             };
         },
     });
-    await graphqlServer.start();
-    return graphqlMiddleware(graphqlServer, {
+    await apolloServer.start();
+    return expressMiddleware(apolloServer, {
         context: async ({ req, res }) => ({
             siteContext: getPaSiteContext(req),
             httpContext: toPaHttpContext(req, res),
@@ -66,7 +66,7 @@ export function createMinimalSiteMiddleware() {
     router.post("/api/v1/check-password-reset", wrapRouteController(checkPasswordResetController));
     router.post("/api/v1/protected-access", wrapRouteController(protectedAccessController));
     router.get("/robots.txt", wrapRouteController(robotsTxtController));
-    router.get("/favicon.ico", wrapRouteController(faviconController));
+    router.get("/favicon.ico", wrapRouteController(favicon16x16Controller));
     const siteReqMiddleware = reqHandlerToExpressMiddleware(mergeReqHandlers([boPluginsReqHandler, boFilesReqHandler]));
     return (req, res, next) => {
         router(req, res, () => siteReqMiddleware(req, res, next));
@@ -74,9 +74,8 @@ export function createMinimalSiteMiddleware() {
 }
 export function createRenderedSiteMiddleware() {
     const router = express.Router();
-    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));
+    router.get("/medias/:mediaId/file/:nameAndExt", wrapRouteController(serveFilecontroller));
+    router.get("/medias/:mediaId/cache/:resourceVersion/:nameAndExt", wrapRouteController(serveCacheImageController));
     const siteReqMiddleware = reqHandlerToExpressMiddleware(mergeReqHandlers([
         protectedSiteReqHandler,
         pluginPublicApiReqHandler,

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

	@@ -1 +1 @@
1	- {"version":3,"file":"site-middleware.js","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,~~IAAI,iBAAiB,~~EAAE,MAAM,~~yBAAyB~~,CAAC;~~AACjF~~,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,~~OAA2D~~,MAAM,SAAS,CAAC;~~AAClF~~,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EACL,gBAAgB,EAChB,6BAA6B,EAC7B,mBAAmB,GACpB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAElF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAC7F,OAAO,EAAE,uBAAuB,EAAE,MAAM,iDAAiD,CAAC;AAC1F,OAAO,EACL,4BAA4B,EAC5B,4BAA4B,GAC7B,MAAM,2DAA2D,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EACL,~~iBAAiB~~,~~EACjB~~,mBAAmB,GACpB,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EACL,~~mBAAmB~~,~~EACnB,+BAA+B~~,~~EAC/B~~,~~6BAA6B~~,~~GAC9B,~~MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,4BAA4B,GAC7B,MAAM,+BAA+B,CAAC;AAEvC,MAAM,CAAC,KAAK,UAAU,yBAAyB;IAC7C,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC;IAE/D,MAAM,~~aAAa~~,GAAG,IAAI,YAAY,~~CAAC~~;~~QACrC~~,QAAQ;QACR,SAAS,EAAE,iBAAiB,EAAE;QAC9B,OAAO,EAAE;YACP,sBAAsB,EAAE;YACxB,0BAA0B,EAAE;YAC5B,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,yBAAyB,EAAE,CAAC,CAAC;SAC1D;QACD,aAAa,EAAE,eAAe;QAC9B,WAAW,CAAC,cAAc,EAAE,KAAK;YAC/B,IAAI,KAAK,YAAY,YAAY,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,YAAY,QAAQ,CAAC,EAAE,CAAC;gBACvF,OAAO,cAAc,CAAC;YACxB,CAAC;YAED,cAAc,CAAC,KAAK,CAAC,0BAA0B,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;YACxE,OAAO;gBACL,OAAO,EAAE,uBAAuB;gBAChC,IAAI,EAAE,uBAAuB;aAC9B,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IACH,MAAM,~~aAAa~~,CAAC,KAAK,EAAE,CAAC;~~IAG5B~~,OAAO,iBAAiB,CAAC,~~aAAa~~,EAAE;~~QACtC~~,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAA2B,EAAE,CAAC,CAAC;YACzD,WAAW,EAAE,gBAAgB,CAAC,GAAG,CAAC;YAClC,WAAW,EAAE,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC;SACvC,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,2BAA2B;IACzC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,MAAM,CAAC,IAAI,CACT,qBAAqB,EACrB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EACrB,mBAAmB,CAAC,qBAAqB,CAAC,CAC3C,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,iCAAiC,EAAE,mBAAmB,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC7F,MAAM,CAAC,GAAG,CAAC,qBAAqB,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC9E,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC;IACnE,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,mBAAmB,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAC/F,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,mBAAmB,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAC/F,MAAM,CAAC,IAAI,CAAC,0BAA0B,EAAE,mBAAmB,CAAC,yBAAyB,CAAC,CAAC,CAAC;IACxF,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACpE,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,mBAAmB,CAAC,~~iBAAiB~~,CAAC,CAAC,CAAC;~~IAEnE~~,MAAM,iBAAiB,GAAG,6BAA6B,CACrD,gBAAgB,CAAC,CAAC,mBAAmB,EAAE,iBAAiB,CAAC,CAAC,CAC3D,CAAC;IAEF,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACzD,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B;IAC1C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAEhC,MAAM,CAAC,GAAG,CAAC,~~oCAAoC~~,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC,CAAC;~~IAC3F~~,MAAM,CAAC,GAAG,CACR,~~sDAAsD~~,~~EACtD~~,mBAAmB,CAAC,~~6BAA6B~~,CAAC,~~CACnD~~,CAAC;~~IACF,MAAM,CAAC,GAAG,CACR,qCAAqC,EACrC,mBAAmB,CAAC,+BAA+B,CAAC,CACrD,CAAC;~~IAEF,MAAM,iBAAiB,GAAG,6BAA6B,CACrD,gBAAgB,CAAC;QACf,uBAAuB;QACvB,yBAAyB;QACzB,4BAA4B;QAC5B,cAAc;QACd,sBAAsB;KACvB,CAAC,CACH,CAAC;IAEF,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACzD,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"site-middleware.js","sourceRoot":"","sources":["../../src/express/site-middleware.ts"],"names":[],"mappings":"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"}

package/dist/helpers/make-backend-plugin-service.d.ts CHANGED Viewed

@@ -1,6 +1,9 @@
 import { type SitePlugin } from "@paroicms/connector";
-import { type BackendPluginRenderService } from "@paroicms/public-server-lib";
-import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
+import { type BackendPluginService, type PluginRenderingService } from "@paroicms/public-server-lib";
+import { type RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context.js";
 import type { SiteContext } from "../site-context/site-context.types.js";
-export declare function executeHook(siteContext: SiteContext, hookName: string, params?: any): any[];
-export declare function makeBackendPluginRenderService(siteContext: SiteContext, renderingContext: RenderingContext, plugin: SitePlugin): BackendPluginRenderService;
+export declare function executeHook(siteContext: SiteContext, hookName: string, params?: any): Promise<unknown[]>;
+export declare function createBackendPluginService(siteContext: SiteContext, plugin: SitePlugin): BackendPluginService;
+export declare function createPluginRenderingService(renderingContext: RenderingContext, pluginService: BackendPluginService, options?: {
+    closeService?: () => Promise<void>;
+}): PluginRenderingService;