@paroicms/server 1.11.0 → 1.12.0

package/dist/modules/public-site/media-serve/media-serve.controller.js

@@ -13,110 +13,191 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MediaServeController = void 0;
-const node_stream_1 = require("node:stream");
 const common_1 = require("@nestjs/common");
+const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
 const http_helpers_1 = require("../../../express/http-helpers");
-const utils_helper_1 = require("../../../helpers/utils-helper");
+const url_helpers_1 = require("../../../helpers/url.helpers");
 const site_context_1 = require("../../../site-context/site-context");
 const _media_serve_helpers_1 = require("./_media-serve-helpers");
 let MediaServeController = class MediaServeController {
-    async serveMedia(param, res, req) {
+    async serveFile(mediaUid, nameAndExt, res, req) {
         const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
-        const parsedName = (0, _media_serve_helpers_1.parseMediaName)(param);
-        if (!parsedName) {
-            throw new common_1.NotFoundException("media not found");
-        }
-        const fts = parsedName.variantName
-            ? await getImageToServe(siteContext, {
-                mediaUid: parsedName.mediaUid,
-                variantName: parsedName.variantName,
-                ifModifiedSince: req.headers["if-modified-since"],
-            })
-            : await getFileToServe(siteContext, {
-                mediaUid: parsedName.mediaUid,
-                ifModifiedSince: req.headers["if-modified-since"],
+        const cacheControl = "no-cache";
+        const fts = await getFileToServe(siteContext, {
+            mediaUid,
+            ifNoneMatch: req.headers["if-none-match"],
+        });
+        if (fts.status === 304) {
+            return (0, http_helpers_1.serve304NotModified)(res, {
+                cacheControl,
+                etag: fts.resourceVersion,
             });
+        }
+        const { file } = fts;
+        const { url, fileName } = (0, url_helpers_1.makeUrlOfMediaFile)(siteContext, { mediaUid, mediaType: file.mediaType, originalName: file.originalName }, { returnObj: true });
+        if (fileName !== nameAndExt)
+            return (0, http_helpers_1.serve301Redirect)(res, url);
+        res.append("Cache-Control", cacheControl);
+        res.append("Etag", file.resourceVersion);
+        res.append("Content-Type", file.mediaType);
+        res.append("Content-Length", file.binaryFile.byteLength.toString());
+        res.send(file.binaryFile);
+        res.end();
+    }
+    async serveVersionedImage(mediaUid, resourceVersion, nameAndExt, res, req) {
+        const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
+        const cacheControl = "public, max-age=604800, immutable";
+        const parsed = (0, _media_serve_helpers_1.parseNameAndExt)(nameAndExt);
+        if (!parsed)
+            throw new common_1.NotFoundException();
+        const { slug, variantName } = parsed;
+        const fts = await getVariantImageToServe(siteContext, {
+            mediaUid,
+            variantName,
+            canCreateVariant: false,
+            ifNoneMatch: req.headers["if-none-match"],
+        });
         if (fts.status === 304) {
-            res.setHeader("content-type", fts.mediaType);
-            res.append("Last-Modified", fts.lastModified);
-            return (0, http_helpers_1.serve304NotModified)(res);
+            return (0, http_helpers_1.serve304NotModified)(res, {
+                cacheControl,
+                etag: fts.resourceVersion,
+            });
         }
-        const { file, lastModified } = fts;
-        const mediaName = (0, _media_serve_helpers_1.makeMediaName)({
+        const { file } = fts;
+        const newUrl = (0, url_helpers_1.makeUrlOfImageVariant)(siteContext, {
+            mediaUid,
             mediaType: file.mediaType,
-            mediaUid: parsedName.mediaUid,
-            variantSize: parsedName.variantName,
-        });
-        if (mediaName !== param) {
-            (0, http_helpers_1.serve301Redirect)(res, `/medias/${mediaName}`);
-            return;
+            completeVariantName: variantName,
+            resourceVersion: file.resourceVersion,
+            slug: file.slug,
+        }, { returnObj: true });
+        if (file.resourceVersion !== resourceVersion ||
+            file.slug !== slug ||
+            newUrl.fileName !== nameAndExt) {
+            return (0, http_helpers_1.serve301Redirect)(res, newUrl.url);
         }
-        res.setHeader("content-type", file.mediaType);
-        res.append("Last-Modified", lastModified);
-        node_stream_1.Readable.from(file.binaryFile)
-            .on("data", (chunk) => {
-            res.write(chunk);
-        })
-            .on("error", (error) => {
-            res.end(error);
-        })
-            .on("end", () => {
-            res.end();
+        res.append("Cache-Control", cacheControl);
+        res.append("Etag", file.resourceVersion);
+        res.append("Content-Type", file.mediaType);
+        res.append("Content-Length", file.binaryFile.byteLength.toString());
+        res.send(file.binaryFile);
+        res.end();
+    }
+    async serveUnversionedImage(mediaUid, nameAndExt, res, req) {
+        const siteContext = await (0, site_context_1.getSiteContext)(req.hostname);
+        const cacheControl = "no-cache";
+        const parsed = (0, _media_serve_helpers_1.parseNameAndExt)(nameAndExt);
+        if (!parsed)
+            throw new common_1.NotFoundException();
+        const { variantName, slug } = parsed;
+        if (!(0, server_image_cache_engine_1.isCompleteVariantName)(variantName))
+            throw new common_1.NotFoundException("invalid variant name");
+        const fts = await getVariantImageToServe(siteContext, {
+            mediaUid,
+            variantName,
+            canCreateVariant: true,
+            ifNoneMatch: req.headers["if-none-match"],
         });
+        if (fts.status === 304) {
+            return (0, http_helpers_1.serve304NotModified)(res, {
+                cacheControl,
+                etag: fts.resourceVersion,
+            });
+        }
+        const { file } = fts;
+        const newUrl = (0, url_helpers_1.makeUrlOfImageVariant)(siteContext, {
+            mediaUid,
+            mediaType: file.mediaType,
+            completeVariantName: variantName,
+            resourceVersion: undefined,
+            slug: file.slug,
+        }, { returnObj: true });
+        if (file.slug !== slug || newUrl.fileName !== nameAndExt) {
+            return (0, http_helpers_1.serve301Redirect)(res, newUrl.url);
+        }
+        res.append("Cache-Control", cacheControl);
+        res.append("Etag", file.resourceVersion);
+        res.append("Content-Type", file.mediaType);
+        res.append("Content-Length", file.binaryFile.byteLength.toString());
+        res.send(file.binaryFile);
+        res.end();
     }
 };
 exports.MediaServeController = MediaServeController;
 __decorate([
-    (0, common_1.Get)(":param"),
-    __param(0, (0, common_1.Param)("param")),
-    __param(1, (0, common_1.Res)()),
-    __param(2, (0, common_1.Req)()),
+    (0, common_1.Get)(":mediaUid/file/:nameAndExt"),
+    __param(0, (0, common_1.Param)("mediaUid")),
+    __param(1, (0, common_1.Param)("nameAndExt")),
+    __param(2, (0, common_1.Res)()),
+    __param(3, (0, common_1.Req)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object, Object]),
+    __metadata("design:paramtypes", [String, String, Object, Object]),
     __metadata("design:returntype", Promise)
-], MediaServeController.prototype, "serveMedia", null);
+], MediaServeController.prototype, "serveFile", null);
+__decorate([
+    (0, common_1.Get)(":mediaUid/image/:resourceVersion/:nameAndExt"),
+    __param(0, (0, common_1.Param)("mediaUid")),
+    __param(1, (0, common_1.Param)("resourceVersion")),
+    __param(2, (0, common_1.Param)("nameAndExt")),
+    __param(3, (0, common_1.Res)()),
+    __param(4, (0, common_1.Req)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String, String, Object, Object]),
+    __metadata("design:returntype", Promise)
+], MediaServeController.prototype, "serveVersionedImage", null);
+__decorate([
+    (0, common_1.Get)(":mediaUid/image/:nameAndExt"),
+    __param(0, (0, common_1.Param)("mediaUid")),
+    __param(1, (0, common_1.Param)("nameAndExt")),
+    __param(2, (0, common_1.Res)()),
+    __param(3, (0, common_1.Req)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String, Object, Object]),
+    __metadata("design:returntype", Promise)
+], MediaServeController.prototype, "serveUnversionedImage", null);
 exports.MediaServeController = MediaServeController = __decorate([
     (0, common_1.Controller)("medias"),
     (0, common_1.UseInterceptors)(common_1.ClassSerializerInterceptor)
 ], MediaServeController);
-async function getImageToServe(siteContext, options) {
-    const { mediaUid, variantName, ifModifiedSince } = options;
+async function getVariantImageToServe(siteContext, options) {
+    const { mediaUid, variantName, canCreateVariant, ifNoneMatch } = options;
     let file = await siteContext.imageCache.getImageVariantWithBinary({
         imageUid: mediaUid,
         variantName,
     });
     if (file) {
-        if (ifModifiedSince === file.lastModified) {
+        if (ifNoneMatch === file.resourceVersion) {
             return {
                 status: 304,
-                lastModified: file.lastModified,
-                mediaType: file.mediaType,
+                resourceVersion: file.resourceVersion,
             };
         }
     }
     else {
-        file = await tryToCreateImageVariant(siteContext, { mediaUid, variantName });
+        if (canCreateVariant) {
+            file = await tryToCreateImageVariant(siteContext, { mediaUid, variantName });
+        }
         if (!file)
             throw new common_1.NotFoundException("image not found");
     }
     return {
         status: 200,
-        lastModified: file.lastModified,
         file,
     };
 }
 async function getFileToServe(siteContext, options) {
-    const { mediaUid, ifModifiedSince } = options;
+    const { mediaUid, ifNoneMatch } = options;
     const media = await siteContext.mediaStorage.getMediaWithBinary(mediaUid);
     if (!media)
         throw new common_1.NotFoundException(`media '${mediaUid}' not found`);
-    const lastModified = (0, utils_helper_1.toHttpHeaderIfModifiedSince)(media.modifiedTs);
-    if (lastModified === ifModifiedSince) {
-        return { status: 304, lastModified, mediaType: media.mediaType };
+    if (media.resourceVersion === ifNoneMatch) {
+        return {
+            status: 304,
+            resourceVersion: media.resourceVersion,
+        };
     }
     return {
         status: 200,
-        lastModified,
         file: media,
     };
 }
@@ -134,7 +215,8 @@ async function tryToCreateImageVariant(siteContext, options) {
     }, {
         authorisedVariantNames: siteContext.themeConf.fTextImages,
         variantName,
-        dependsOnCacheKey: "themeConf.fTextImages",
+        slug: (0, server_image_cache_engine_1.generateImageSlug)(media.originalName),
+        dependsOnUsedKey: "themeConf.fTextImages",
     });
 }
 //# sourceMappingURL=media-serve.controller.js.map

package/dist/modules/public-site/media-serve/media-serve.controller.js.map

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

package/dist/modules/public-site/public-site.controller.js

@@ -44,7 +44,7 @@ exports.PublicSiteController = PublicSiteController = __decorate([
 ], PublicSiteController);
 async function serveHomePage(siteContext, req, res, tracker) {
     const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "html", url: req.url });
-    const serveOr = (0, serve_html_or_1.serveHtmlFromCacheOr)(siteContext, tracker, { cacheKey, req, res });
+    const serveOr = (0, serve_html_or_1.serveTextFromCacheOr)(siteContext, tracker, { cacheKey, req, res });
     if (await serveOr.serveFromCache())
         return;
     const renderingContext = await (0, rendering_context_1.createRenderingContext)(siteContext, { cacheKey, tracker });

package/dist/modules/public-site/public-site.middleware.js

@@ -39,14 +39,13 @@ exports.PublicSiteMiddleware = PublicSiteMiddleware = __decorate([
 ], PublicSiteMiddleware);
 async function serveDocument(siteContext, req, res, parsedRoute, tracker) {
     const cacheKey = (0, text_cache_1.makeCacheKey)({ kind: "html", url: req.url });
-    const serveOr = (0, serve_html_or_1.serveHtmlFromCacheOr)(siteContext, tracker, { cacheKey, req, res });
+    const serveOr = (0, serve_html_or_1.serveTextFromCacheOr)(siteContext, tracker, { cacheKey, req, res });
     if (await serveOr.serveFromCache())
         return;
     const redirectCacheKey = (0, text_cache_1.makeCacheKey)({ kind: "redirect", urlKey: parsedRoute.urlCacheKey });
     const cacheRedirect = await siteContext.textCache.getCacheValue(redirectCacheKey, tracker);
     if (cacheRedirect && cacheRedirect.value !== req.url) {
-        (0, http_helpers_1.serve301Redirect)(res, cacheRedirect.value);
-        return;
+        return (0, http_helpers_1.serve301Redirect)(res, cacheRedirect.value);
     }
     const generated = await (0, serve_document_1.generateDocumentHtml)(siteContext, { req, parsedRoute, cacheKey }, tracker);
     if (generated.status === 301) {
@@ -55,8 +54,7 @@ async function serveDocument(siteContext, req, res, parsedRoute, tracker) {
             dependencyKeys: generated.dependencyKeys,
             value: generated.url,
         }, tracker);
-        (0, http_helpers_1.serve301Redirect)(res, generated.url);
-        return;
+        return (0, http_helpers_1.serve301Redirect)(res, generated.url);
     }
     if (generated.status === 404) {
         await (0, serve_html_or_1.render404Html)(siteContext, res, { lang: parsedRoute.lang });

package/dist/modules/public-site/public-site.middleware.js.map

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

package/dist/modules/security/complexity-plugin.d.ts

@@ -1,5 +1,5 @@
-import type { ApolloServerPlugin, GraphQLRequestListener } from "@apollo/server";
 import { GraphQLSchemaHost } from "@nestjs/graphql";
+import type { ApolloServerPlugin, GraphQLRequestListener } from "@apollo/server";
 import type { GraphqlContext } from "../graphql.types";
 export declare class ComplexityPlugin implements ApolloServerPlugin {
     private gqlSchemaHost;

package/dist/modules/security/complexity-plugin.js

@@ -10,8 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComplexityPlugin = void 0;
-const apollo_1 = require("@nestjs/apollo");
 const graphql_1 = require("@nestjs/graphql");
+const apollo_1 = require("@nestjs/apollo");
 const graphql_2 = require("graphql");
 const graphql_query_complexity_1 = require("graphql-query-complexity");
 let ComplexityPlugin = class ComplexityPlugin {

package/dist/modules/security/complexity-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"complexity-plugin.js","sourceRoot":"","sources":["../../../src/modules/security/complexity-plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAwC;AAExC,6CAAoD;AACpD,qCAAuC;AACvC,uEAAoG;AAI7F,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IACP;IAApB,YAAoB,aAAgC;QAAhC,kBAAa,GAAb,aAAa,CAAmB;IAAG,CAAC;IAExD,KAAK,CAAC,eAAe;QACnB,MAAM,aAAa,GAAG,GAAG,CAAC;QAC1B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAEtC,OAAO;YACL,KAAK,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE;gBAC7C,MAAM,UAAU,GAAG,IAAA,wCAAa,EAAC;oBAC/B,MAAM;oBACN,aAAa,EAAE,OAAO,CAAC,aAAa;oBACpC,KAAK,EAAE,QAAQ;oBACf,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,UAAU,EAAE,CAAC,IAAA,mDAAwB,GAAE,EAAE,IAAA,0CAAe,EAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC;iBACpF,CAAC,CAAC;gBAEH,IAAI,UAAU,GAAG,aAAa,EAAE,CAAC;oBAC/B,MAAM,IAAI,sBAAY,CACpB,yBAAyB,UAAU,iCAAiC,aAAa,EAAE,CACpF,CAAC;gBACJ,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAzBY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,eAAM,GAAE;qCAE4B,2BAAiB;GADzC,gBAAgB,CAyB5B"}
+{"version":3,"file":"complexity-plugin.js","sourceRoot":"","sources":["../../../src/modules/security/complexity-plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAAoD;AAGpD,2CAAwC;AACxC,qCAAuC;AACvC,uEAAoG;AAI7F,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IACP;IAApB,YAAoB,aAAgC;QAAhC,kBAAa,GAAb,aAAa,CAAmB;IAAG,CAAC;IAExD,KAAK,CAAC,eAAe;QACnB,MAAM,aAAa,GAAG,GAAG,CAAC;QAC1B,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QAEtC,OAAO;YACL,KAAK,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE;gBAC7C,MAAM,UAAU,GAAG,IAAA,wCAAa,EAAC;oBAC/B,MAAM;oBACN,aAAa,EAAE,OAAO,CAAC,aAAa;oBACpC,KAAK,EAAE,QAAQ;oBACf,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,UAAU,EAAE,CAAC,IAAA,mDAAwB,GAAE,EAAE,IAAA,0CAAe,EAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC,CAAC;iBACpF,CAAC,CAAC;gBAEH,IAAI,UAAU,GAAG,aAAa,EAAE,CAAC;oBAC/B,MAAM,IAAI,sBAAY,CACpB,yBAAyB,UAAU,iCAAiC,aAAa,EAAE,CACpF,CAAC;gBACJ,CAAC;YACH,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAzBY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,eAAM,GAAE;qCAE4B,2BAAiB;GADzC,gBAAgB,CAyB5B"}

package/dist/public-payload/make-image-available.d.ts

@@ -1,4 +1,4 @@
-import type { VariantName } from "@paroicms/server-image-cache-engine";
+import { type VariantName } from "@paroicms/server-image-cache-engine";
 import type { RenderingContext } from "../liquidjs-tools/liquidjs-rendering/rendering-context";
 import type { SiteContext } from "../site-context/site-context.types";
 export interface PublicImage {

package/dist/public-payload/make-image-available.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeImageAvailable = void 0;
-const utils_helper_1 = require("../helpers/utils-helper");
+const server_image_cache_engine_1 = require("@paroicms/server-image-cache-engine");
+const url_helpers_1 = require("../helpers/url.helpers");
 async function makeImageAvailable(siteContext, renderingContext, { imageSel, size, autoCrop = false, }) {
-    const media = "uid" in imageSel
-        ? await siteContext.mediaStorage.getMedia(imageSel)
-        : await siteContext.mediaStorage.getMedia(imageSel);
+    const media = await siteContext.mediaStorage.getMedia(imageSel);
     if (!media) {
         if ("handle" in imageSel)
             return;
@@ -13,7 +12,7 @@ async function makeImageAvailable(siteContext, renderingContext, { imageSel, siz
     }
     if (media.kind !== "image")
         throw new Error(`media '${media.uid}' should be an image`);
-    const { width, height, completeVariantName } = siteContext.imageCache.makeImageAvailable({
+    const { width, height, completeVariantName, resourceVersion, mediaType, slug } = siteContext.imageCache.makeImageAvailable({
         imageRef: {
             imageUid: media.uid,
             width: media.width,
@@ -22,13 +21,20 @@ async function makeImageAvailable(siteContext, renderingContext, { imageSel, siz
         },
         variantName: size,
         autoCrop,
-        dependsOnCacheKey: renderingContext.cacheKey,
+        dependsOnUsedKey: renderingContext.cacheKey,
+        slug: (0, server_image_cache_engine_1.generateImageSlug)(media.originalName),
     });
     return {
-        url: `/medias/${media.uid}-${completeVariantName}.${(0, utils_helper_1.mediaTypeToFileExtension)(media.mediaType)}`,
+        url: (0, url_helpers_1.makeUrlOfImageVariant)(siteContext, {
+            mediaUid: media.uid,
+            mediaType,
+            completeVariantName: completeVariantName,
+            resourceVersion,
+            slug,
+        }),
         width,
         height,
-        mediaType: media.mediaType,
+        mediaType,
     };
 }
 exports.makeImageAvailable = makeImageAvailable;

package/dist/public-payload/make-image-available.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-image-available.js","sourceRoot":"","sources":["../../src/public-payload/make-image-available.ts"],"names":[],"mappings":";;;AACA,0DAAmE;AAsC5D,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,EACE,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,GACmD;IAErE,MAAM,KAAK,GACT,KAAK,IAAI,QAAQ;QACf,CAAC,CAAC,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACnD,CAAC,CAAC,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAExD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,QAAQ,IAAI,QAAQ;YAAE,OAAO;QACjC,MAAM,IAAI,KAAK,CAAC,kBAAkB,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEvF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,GAAG,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QACvF,QAAQ,EAAE;YACR,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,WAAW,EAAE,IAAI;QACjB,QAAQ;QACR,iBAAiB,EAAE,gBAAgB,CAAC,QAAQ;KAC7C,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,EAAE,WAAW,KAAK,CAAC,GAAG,IAAI,mBAAmB,IAAI,IAAA,uCAAwB,EAAC,KAAK,CAAC,SAAS,CAAC,EAAE;QAC/F,KAAK;QACL,MAAM;QACN,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC;AACJ,CAAC;AAtCD,gDAsCC;AAED,SAAS,gBAAgB,CAAC,QAA8C;IACtE,OAAO,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;AAC5D,CAAC"}
+{"version":3,"file":"make-image-available.js","sourceRoot":"","sources":["../../src/public-payload/make-image-available.ts"],"names":[],"mappings":";;;AAAA,mFAA0F;AAC1F,wDAA+D;AAsCxD,KAAK,UAAU,kBAAkB,CACtC,WAAwB,EACxB,gBAAkC,EAClC,EACE,QAAQ,EACR,IAAI,EACJ,QAAQ,GAAG,KAAK,GACmD;IAErE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAEhE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,QAAQ,IAAI,QAAQ;YAAE,OAAO;QACjC,MAAM,IAAI,KAAK,CAAC,kBAAkB,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,GAAG,sBAAsB,CAAC,CAAC;IAEvF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,GAC5E,WAAW,CAAC,UAAU,CAAC,kBAAkB,CAAC;QACxC,QAAQ,EAAE;YACR,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS;SAC3B;QACD,WAAW,EAAE,IAAI;QACjB,QAAQ;QACR,gBAAgB,EAAE,gBAAgB,CAAC,QAAQ;QAC3C,IAAI,EAAE,IAAA,6CAAiB,EAAC,KAAK,CAAC,YAAY,CAAC;KAC5C,CAAC,CAAC;IAEL,OAAO;QACL,GAAG,EAAE,IAAA,mCAAqB,EAAC,WAAW,EAAE;YACtC,QAAQ,EAAE,KAAK,CAAC,GAAG;YACnB,SAAS;YACT,mBAAmB,EAAE,mBAAmB;YACxC,eAAe;YACf,IAAI;SACL,CAAC;QACF,KAAK;QACL,MAAM;QACN,SAAS;KACV,CAAC;AACJ,CAAC;AA3CD,gDA2CC;AAED,SAAS,gBAAgB,CAAC,QAA8C;IACtE,OAAO,KAAK,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;AAC5D,CAAC"}

package/dist/site-context/create-site-context.js

@@ -41,12 +41,6 @@ async function createSiteContext(siteConf) {
     await (0, server_lib_1.ensureDirectory)(cacheDir);
     await (0, server_lib_1.ensureDirectory)(backupDir);
     const { siteSchema, plugins } = await (0, site_schema_factory_1.loadSiteSchema)(siteConf);
-    const { mainCn, logNextQuery } = await (0, db_init_1.createOrOpenMainCn)(siteSchema, dataDir, {
-        siteName,
-        canCreate: !!context_1.appConf.generateMissingDatabases,
-        siteLog,
-    });
-    const siteIds = await (0, init_routing_points_1.loadOrInsertSiteIds)(mainCn, siteSchema, siteLog);
     const mediaStorage = new server_database_media_storage_1.MediaStorage({
         siteName,
         canCreate: !!context_1.appConf.generateMissingDatabases,
@@ -56,7 +50,13 @@ async function createSiteContext(siteConf) {
             file: (0, node_path_1.join)(dataDir, "medias.sqlite"),
         },
     });
-    await mediaStorage.initialise(siteIds.siteLeafId);
+    await mediaStorage.initialise();
+    const { mainCn, logNextQuery } = await (0, db_init_1.createOrOpenMainCn)(siteSchema, dataDir, {
+        siteName,
+        canCreate: !!context_1.appConf.generateMissingDatabases,
+        siteLog,
+    }, mediaStorage);
+    const siteIds = await (0, init_routing_points_1.loadOrInsertSiteIds)(mainCn, siteSchema, siteLog);
     const imageCache = await (0, server_image_cache_engine_1.createImageCacheEngine)({
         siteName,
         storage: {

package/dist/site-context/create-site-context.js.map

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

package/dist/site-context/db-init/db-init.d.ts

@@ -1,11 +1,12 @@
 import type { SiteSchema } from "@paroicms/anywhere-lib";
+import type { MediaStorage } from "@paroicms/server-database-media-storage";
 import { type AppLog } from "@paroicms/server-lib";
 import type { DataSource } from "typeorm";
 export declare function createOrOpenMainCn(siteSchema: SiteSchema, dataDir: string, { siteLog, siteName, canCreate }: {
     siteName: string;
     canCreate: boolean;
     siteLog: AppLog;
-}): Promise<{
+}, mediaStorage: MediaStorage): Promise<{
     mainCn: DataSource;
     logNextQuery: (count?: number | undefined) => void;
 }>;

package/dist/site-context/db-init/db-init.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOrOpenMainCn = void 0;
-const node_path_1 = require("node:path");
 const server_lib_1 = require("@paroicms/server-lib");
+const node_path_1 = require("node:path");
 const context_1 = require("../../context");
 const ddl_migration_1 = require("./ddl-migration");
-async function createOrOpenMainCn(siteSchema, dataDir, { siteLog, siteName, canCreate }) {
+async function createOrOpenMainCn(siteSchema, dataDir, { siteLog, siteName, canCreate }, mediaStorage) {
     const { logNextQuery, typeOrmLogger } = (0, server_lib_1.createSqlLogger)({
         appLog: siteLog,
         siteName,
@@ -29,7 +29,7 @@ async function createOrOpenMainCn(siteSchema, dataDir, { siteLog, siteName, canC
                 fromVersion: dbVersion,
                 siteName,
                 siteLog,
-            });
+            }, mediaStorage);
         }
     }
     return { mainCn, logNextQuery };

package/dist/site-context/db-init/db-init.js.map

@@ -1 +1 @@
-{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../../src/site-context/db-init/db-init.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AAEjC,qDAAkG;AAElG,2CAA2C;AAC3C,mDAKyB;AAElB,KAAK,UAAU,kBAAkB,CACtC,UAAsB,EACtB,OAAe,EACf,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAA6D;IAE3F,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAA,4BAAe,EAAC;QACtD,MAAM,EAAE,OAAO;QACf,QAAQ;QACR,YAAY,EAAZ,4BAAY;KACb,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,yCAA4B,EAAC;QACpD,QAAQ;QACR,SAAS;QACT,YAAY,EAAZ,4BAAY;QACZ,UAAU,EAAE,IAAA,gBAAI,EAAC,OAAO,EAAE,aAAa,CAAC;QACxC,OAAO,EAAE,IAAA,gBAAI,EAAC,oBAAU,EAAE,KAAK,EAAE,cAAc,CAAC;QAChD,SAAS;QACT,QAAQ,EAAE,CAAC,GAAG,oBAAU,qBAAqB,CAAC;QAC9C,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,OAAO;KAChB,CAAC,CAAC;IAEH,KAAK,UAAU,SAAS,CAAC,EAAc;QACrC,MAAM,SAAS,GAAG,MAAM,IAAA,4BAAY,EAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvD,IAAI,SAAS,KAAK,0CAA0B,EAAE,CAAC;YAC7C,MAAM,IAAA,6BAAa,EAAC,UAAU,EAAE,EAAE,EAAE;gBAClC,WAAW,EAAE,SAAS;gBACtB,QAAQ;gBACR,OAAO;aACR,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;AAClC,CAAC;AAnCD,gDAmCC"}
+{"version":3,"file":"db-init.js","sourceRoot":"","sources":["../../../src/site-context/db-init/db-init.ts"],"names":[],"mappings":";;;AAEA,qDAAkG;AAClG,yCAAiC;AAEjC,2CAA2C;AAC3C,mDAKyB;AAElB,KAAK,UAAU,kBAAkB,CACtC,UAAsB,EACtB,OAAe,EACf,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAA6D,EAC3F,YAA0B;IAE1B,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,IAAA,4BAAe,EAAC;QACtD,MAAM,EAAE,OAAO;QACf,QAAQ;QACR,YAAY,EAAZ,4BAAY;KACb,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,yCAA4B,EAAC;QACpD,QAAQ;QACR,SAAS;QACT,YAAY,EAAZ,4BAAY;QACZ,UAAU,EAAE,IAAA,gBAAI,EAAC,OAAO,EAAE,aAAa,CAAC;QACxC,OAAO,EAAE,IAAA,gBAAI,EAAC,oBAAU,EAAE,KAAK,EAAE,cAAc,CAAC;QAChD,SAAS;QACT,QAAQ,EAAE,CAAC,GAAG,oBAAU,qBAAqB,CAAC;QAC9C,MAAM,EAAE,aAAa;QACrB,MAAM,EAAE,OAAO;KAChB,CAAC,CAAC;IAEH,KAAK,UAAU,SAAS,CAAC,EAAc;QACrC,MAAM,SAAS,GAAG,MAAM,IAAA,4BAAY,EAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvD,IAAI,SAAS,KAAK,0CAA0B,EAAE,CAAC;YAC7C,MAAM,IAAA,6BAAa,EACjB,UAAU,EACV,EAAE,EACF;gBACE,WAAW,EAAE,SAAS;gBACtB,QAAQ;gBACR,OAAO;aACR,EACD,YAAY,CACb,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;AAClC,CAAC;AAzCD,gDAyCC"}

package/dist/site-context/db-init/ddl-migration.d.ts

@@ -1,8 +1,9 @@
 import type { SiteSchema } from "@paroicms/anywhere-lib";
+import type { MediaStorage } from "@paroicms/server-database-media-storage";
 import type { AppLog } from "@paroicms/server-lib";
 import type { DataSource } from "typeorm";
 export declare const dbSchemaName = "main";
-export declare const currentMainDbSchemaVersion = 5;
+export declare const currentMainDbSchemaVersion = 6;
 export declare function getDbVersion(cn: DataSource, { siteName }: {
     siteName: string;
 }): Promise<number>;
@@ -10,4 +11,5 @@ export declare function migrateMainDb(siteSchema: SiteSchema, cn: DataSource, {
     fromVersion: number;
     siteName: string;
     siteLog: AppLog;
-}): Promise<void>;
+}, mediaStorage: MediaStorage): Promise<void>;
+export declare function replaceMediaUrls(val: string, mediaStorage: MediaStorage, siteLog: AppLog): Promise<string>;