@social-mail/social-mail-web-server 1.7.474 → 1.7.475

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.474",
+  "version": "1.7.475",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/seed/ui/seed-ui.ts

@@ -5,13 +5,13 @@ export default async function seedUI(config: DBConfig) {
     await config.saveVersion(UIPackageConfig, {
         package: "@social-mail/social-mail-client",
         view: "dist/web/AppIndex",
-        version: "1.8.38"
+        version: "1.8.39"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {
         package: "@social-mail/web-components",
         view: "dist/index.js",
-        version: "1.0.240"
+        version: "1.0.242"
     });
 
     await config.saveVersion(FAFreePackageConfig, {

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

@@ -1,4 +1,4 @@
-import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped, ServiceObject } 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";
@@ -6,9 +6,17 @@ import TempFileService from "../../storage/TempFileService.js";
 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";
 
 @RegisterScoped
-export default class PreviewDraftService {
+export default class PreviewDraftService extends ServiceObject implements ICacheContainer<PreviewDraftService> {
+
+    cache: ObjectCache<PreviewDraftService>;
+
+    @Inject
+    dbConfig: DBConfig;
 
     @Inject
     private websiteService: WebSiteContentService;
@@ -16,6 +24,29 @@ export default class PreviewDraftService {
     @Inject
     private tfs: TempFileService;
 
+    @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) {
 
 
@@ -44,6 +75,7 @@ export default class PreviewDraftService {
             const b = document.createElement("base");
             b.href = `/social-mail/site/draft/${siteID}/`;
             document.head.insertAdjacentElement("afterbegin", b);
+            // we need to process injects first
             for(const e of Array.from(document.body.querySelectorAll("inject"))) {
                 let src = e.getAttribute("src");
                 if (src.startsWith("/")) {
@@ -60,6 +92,18 @@ export default class PreviewDraftService {
                 }
                 e.remove();
             }
+
+            for(const node of descendentElementIterator(document.documentElement)) {
+                switch(node.tagName) {
+                    case "SCRIPT":
+                        await this.rewriteLink(node, "src");
+                        continue;
+                    case "LINK":
+                        await this.rewriteLink(node, "href");
+                        continue;
+                }
+            }
+
             body = `<!DOCTYPE HTML>${document.documentElement.outerHTML}`;
         } else {
             body = body.split(/\<\/head\>/i).join(`<base href="/api/site/draft/${siteID}/"/></head>`);
@@ -68,57 +112,69 @@ export default class PreviewDraftService {
         return body;
     }
 
-
-    async prepareHtml(site: WebSite, localFile: LocalFile) {
-
-
-        const updateAttribute = (root: string, name: string, element: Element) => {
-            const value = element.getAttribute(name);
+        async rewriteLink(node: Element, attributeName: string) {
+            let value = node.getAttribute(attributeName);
             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();
+            const packageReplacements = await this.getPackages();
+            for (const { latest, version } of packageReplacements) {
+                value = value.replace(latest, version);
             }
-            body = `<!DOCTYPE HTML>${document.documentElement.outerHTML}`;
-        } else {
-            body = body.split(/\<\/head\>/i).join(`<base href="/api/site/draft/${siteID}/"/></head>`);
+            node.setAttribute(attributeName, value);
         }
 
-        return body;
-    }
+
+    // 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;
+    // }
 
 }