@social-mail/social-mail-web-server 1.16.519 → 1.16.521

package/src/server/services/files/web-content/WebContentTranspileService.ts

@@ -1,12 +1,11 @@
-import Inject, { RegisterScoped, ServiceObject, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import SiteDiskContentCache from "../SiteDiskContentCache.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import WebSiteContentService from "../WebSiteContentService.js";
 import { JSDOM } from 'jsdom';
 import { join, parse } from "path";
-import DBConfig, { FAFreePackageConfig, UIPackageConfig, WebComponentsPackageConfig } from "../../DBConfig.js";
+import DBConfig, { WebComponentsPackageConfig } from "../../DBConfig.js";
 import { descendentElementIterator } from "../../../../common/html/Html.js";
-import { ICacheContainer, ObjectCache } from "../../../../common/cacheFor.js";
 import { tokenizeRegex } from "../../../../protocols/core/tokenizer.js";
 import { globalEnv } from "../../../../common/globalEnv.js";
 import EncryptionService from "../../encryption/EncryptionService.js";
@@ -31,9 +30,7 @@ const updateAttribute = (root: string, name: string, element: Element) => {
 };
 
 @RegisterScoped
-export default class WebContentTranspileService
-    extends ServiceObject
-    implements ICacheContainer<WebContentTranspileService> {
+export default class WebContentTranspileService {
 
     @Inject
     siteCache: SiteDiskContentCache;
@@ -47,13 +44,8 @@ export default class WebContentTranspileService
     @Inject
     ss: SessionSecurity;
 
-    cache: ObjectCache<any>;
-
     packages: { latest: string, version: string }[];
 
-    postInit() {
-        this.cache = this.siteCache.cache;
-    }
 
     async transformCss(siteFolder: ISiteFolder, srcFile: LocalFile, currentPath: string): Promise<string> {
         const css = await srcFile.readAsText();
@@ -62,7 +54,7 @@ export default class WebContentTranspileService
 
     async transformHtml(siteFolder: ISiteFolder, srcFile: LocalFile, currentPath: string, addPreview?: boolean): Promise<string> {
 
-        await this.loadPackages();
+        this.packages = await this.dbConfig.getPackages();
 
         const html = await srcFile.readAsText();
         const browser = new JSDOM(html);
@@ -442,21 +434,6 @@ export default class WebContentTranspileService
         node.remove();
     }
 
-    async loadPackages() {
-        const config = this.dbConfig;
-
-        const packages = [
-            await config.get(UIPackageConfig),
-            await config.get(WebComponentsPackageConfig),
-            await config.get(FAFreePackageConfig)
-        ];
-
-        this.packages = packages.map((x) => ({
-            latest: x.value.package + "@latest",
-            version: x.value.package + "@" + x.value.version
-        }));
-    }
-
     private async rewriteCss(css: string, siteFolder: ISiteFolder, currentPath: string) {
         for (const [_match, group] of tokenizeRegex(css, /url\(((\"[^\"]+\")|([^\)]+))\)/gmi)) {
             if (group) {

package/src/server/services/html/PreviewDraftService.ts

@@ -1,19 +1,15 @@
-import Inject, { RegisterScoped, ServiceObject } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import { JSDOM } from 'jsdom';
 import { join } from "path";
 import WebSite from "../../model/entities/WebSite.js";
 import { descendentElementIterator } from "../../../common/html/Html.js";
 import WebSiteContentService from "../files/WebSiteContentService.js";
-import { cacheFor, ICacheContainer, ObjectCache } from "../../../common/cacheFor.js";
-import SiteDiskContentCache from "../files/SiteDiskContentCache.js";
-import DBConfig, { UIPackageConfig, WebComponentsPackageConfig, FAFreePackageConfig } from "../DBConfig.js";
+import DBConfig from "../DBConfig.js";
 import DynamicStyles from "../files/web-content/DynamicStyles.js";
 
 @RegisterScoped
-export default class PreviewDraftService extends ServiceObject implements ICacheContainer<PreviewDraftService> {
-
-    cache: ObjectCache<PreviewDraftService>;
+export default class PreviewDraftService {
 
     @Inject
     dbConfig: DBConfig;
@@ -21,29 +17,6 @@ export default class PreviewDraftService extends ServiceObject implements ICache
     @Inject
     private websiteService: WebSiteContentService;
 
-    @Inject
-    private siteCache: SiteDiskContentCache;
-
-    postInit() {
-        this.cache = this.siteCache.cache;
-    }
-
-    @cacheFor()
-    async getPackages() {
-        const config = this.dbConfig;
-
-        const packages = [
-            await config.get(UIPackageConfig),
-            await config.get(WebComponentsPackageConfig),
-            await config.get(FAFreePackageConfig)
-        ];
-
-        return packages.map((x) => ({
-            latest: x.value.package + "@latest",
-            version: x.value.package + "@" + x.value.version
-        }));
-    }
-
     async prepareSecureHtml(siteID, site: WebSite, localFile: LocalFile) {
 
         const updateAttribute = (root: string, name: string, element: Element) => {
@@ -117,69 +90,17 @@ export default class PreviewDraftService extends ServiceObject implements ICache
         return body;
     }
 
-        async rewriteLink(node: Element, attributeName: string) {
-            let value = node.getAttribute(attributeName);
-            if (!value) {
-                return;
-            }
-            const packageReplacements = await this.getPackages();
-            for (const { latest, version } of packageReplacements) {
-                value = value.replace(latest, version);
-            }
-            node.setAttribute(attributeName, value);
+    async rewriteLink(node: Element, attributeName: string) {
+        let value = node.getAttribute(attributeName);
+        if (!value) {
+            return;
         }
+        const packageReplacements = await this.dbConfig.getPackages();
+        for (const { latest, version } of packageReplacements) {
+            value = value.replace(latest, version);
+        }
+        node.setAttribute(attributeName, value);
+    }
 
 
-    // async prepareHtml(site: WebSite, localFile: LocalFile) {
-
-
-    //     const updateAttribute = (root: string, name: string, element: Element) => {
-    //         const value = element.getAttribute(name);
-    //         if (!value) {
-    //             return;
-    //         }
-    //         if (value.startsWith(".")) {
-    //             const v = join(root, value);
-    //             element.setAttribute(name, v.toString());
-    //         }
-    //     };
-
-    //     const updateAddress = (root: string, element: Element) => {
-    //         for(const e of descendentElementIterator(element)) {
-    //             updateAttribute(root, "src", e);
-    //         }
-    //     };
-
-    //     let body = await localFile.readAsText();
-    //     const siteID = site.folderID;
-    //     if(/\<inject\s/i.test(body)) {
-    //         // perform inject...
-    //         const { window: { document } } = new JSDOM(body);
-    //         const parser = new document.defaultView.DOMParser();
-    //         const b = document.createElement("base");
-    //         b.href = `/api/site/draft/${siteID}/`;
-    //         document.head.insertAdjacentElement("afterbegin", b);
-    //         for(const e of Array.from(document.body.querySelectorAll("inject"))) {
-    //             let src = e.getAttribute("src");
-    //             if (src.startsWith("/")) {
-    //                 src = src.substring(1);
-    //             }
-    //             const includeFile = await this.websiteService.getFile(site.folderID, ... src.split("/"));
-    //             // const includeFile = await this.tfs.downloadAppFile(include);
-    //             const parsed = parser.parseFromString(await includeFile.readAsText(), "text/html");
-    //             for(const pe of Array.from(parsed.body.children)) {
-    //                 pe.remove();
-    //                 updateAddress(b.href + src, pe);
-    //                 e.parentElement.insertBefore(pe, e);
-    //             }
-    //             e.remove();
-    //         }
-    //         body = `<!DOCTYPE HTML>${document.documentElement.outerHTML}`;
-    //     } else {
-    //         body = body.split(/\<\/head\>/i).join(`<base href="/api/site/draft/${siteID}/"/></head>`);
-    //     }
-
-    //     return body;
-    // }
-
 }

package/src/server/services/site/SitePreviewGenerator.ts

@@ -1,20 +1,20 @@
 import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
-import WebSiteContentService from "../files/WebSiteContentService.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 import WebSite from "../../model/entities/WebSite.js";
+import DBConfig from "../DBConfig.js";
 
 @RegisterScoped
 export default class SitePreviewGenerator {
     
     @Inject
-    wcs: WebSiteContentService;
+    dbConfig: DBConfig;
 
     async getPreviewUrls(site:WebSite, hostName?) {
 
         const cdn = hostName || globalEnv.cdn;
         const { host } = site.hosts[0];
         const { currentVersionID } = site;
-        const v = await this.wcs.getPackagesHash();
+        const v = await this.dbConfig.getPackagesHash();
         const gv = (40).toString(36);
         const cv = `c${gv}-${v}-${currentVersionID.toString(36)}`;
         return {

package/src/server/workflows/site/generate-previews/GenerateTemplatePreviewWorkflow.ts

@@ -9,6 +9,7 @@ import SitePreviewGenerator from "../../../services/site/SitePreviewGenerator.js
 import WebSiteContentService from "../../../services/files/WebSiteContentService.js";
 import MessagingService from "../../../services/message-events/MessagingService.js";
 import WebSite from "../../../model/entities/WebSite.js";
+import DBConfig from "../../../services/DBConfig.js";
 
 export default class GenerateTemplatePreviewWorkflow extends Workflow<string> {
 
@@ -19,6 +20,8 @@ export default class GenerateTemplatePreviewWorkflow extends Workflow<string> {
             return;
         }
 
+        await this.invalidate();
+
         let start = "0";
         for(;;) {
             start = await this.generate(start);
@@ -28,6 +31,21 @@ export default class GenerateTemplatePreviewWorkflow extends Workflow<string> {
         }
     }
 
+    @UniqueActivity
+    async invalidate(
+        @Inject db?: SocialMailContext,
+        @Inject dbConfig?: DBConfig
+    ) {
+
+        if(!(await dbConfig.packagesChanged())) {
+            return;
+        }
+
+        await db.websiteFolders.asQuery()
+            .update(() => (({ previewGenerated: false})));
+        
+    }
+
     @UniqueActivity
     async generateFor(
         @Inject db?: SocialMailContext,

package/src/wwwroot/routes/social-mail/config/ui-packages/get.tsx

@@ -1,15 +1,14 @@
 import Inject from "@entity-access/entity-access/dist/di/di.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
-import WebContentTranspileService from "../../../../../server/services/files/web-content/WebContentTranspileService.js";
+import DBConfig from "../../../../../server/services/DBConfig.js";
 
 export default class extends Page {
 
     @Inject
-    ws: WebContentTranspileService;
+    dbConfig: DBConfig;
 
     async run() {
-        await this.ws.loadPackages();
-        const packages = this.ws.packages;
+        const packages = await this.dbConfig.getPackages();
         return this.json(packages);
     }