@social-mail/social-mail-web-server 1.8.392 → 1.8.394

package/package.json

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

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

@@ -17,7 +17,7 @@ export default async function seedUI(config: DBConfig) {
     await config.saveVersion(UIPackageConfig, {
         package: "@social-mail/social-mail-client",
         view: "dist/web/AppIndex",
-        version: "1.9.85"
+        version: "1.9.86"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {

package/src/server/services/files/WebSiteContentService.ts

@@ -10,6 +10,7 @@ import WebContentTranspileService from "./web-content/WebContentTranspileService
 import { ISiteFolder } from "./ISiteFolder.js";
 import EncryptionService from "../encryption/EncryptionService.js";
 import { hash } from "crypto";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 
 @RegisterScoped
 export default class WebSiteContentService
@@ -93,8 +94,9 @@ export default class WebSiteContentService
     async getFileInfo(folderID, ... segments: string[]): Promise<IFileInfo> {
         const [top, ... paths] = segments;
         const child = await this.db.appFiles
-            .where({ folderID, top },(p) => (x) => x.parentID === p.folderID && x.name === p.top)
+            .where({ folderID, top },(p) => (x) => x.parentID === p.folderID && Sql.text.iLike(x.name, p.top))
             .orderBy(void 0, (p) => (x) => x.isDeleted)
+            .thenByDescending({ top }, (p) => (x) => x.name === p.top)
             .first();
         if (!child) {
             return null;

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

@@ -21,10 +21,14 @@ const updateAttribute = (root: string, name: string, element: Element) => {
     if (!value) {
         return;
     }
-    if (value.startsWith(".")) {
-        const v = join(root, value);
-        element.setAttribute(name, v.toString());
+    if(/^https?\:\/\//i.test(value)) {
+        return;
+    }
+    if (value.startsWith("/")) {
+        return;
     }
+    const v = join(root, value);
+    element.setAttribute(name, v.toString());
 };
 
 @RegisterScoped
@@ -272,14 +276,17 @@ export default class WebContentTranspileService
 
     async injectFragment(siteFolder: ISiteFolder, node: HTMLElement, doc: Document, currentPath: string) {
         let src = node.getAttribute("src");
+        let isAbsolute = null as string;
         if (src.startsWith("/")) {
             src = src.substring(1);
+            isAbsolute = src;
         }
 
-        const dir = src.split("/").slice(0, -1).join("/");
+        const dir = isAbsolute ? ("/" + src.split("/").slice(0, -1).join("/")) : (src.split("/").slice(0, -1).join("/"));
+        const filePath = isAbsolute ? isAbsolute.split("/") : join(currentPath, src).split("/");
 
         const contentService = ServiceProvider.resolve(this, WebSiteContentService);
-        const file = await contentService.getFile(siteFolder.snapshotFolderID, ... join(currentPath, src).split("/"));
+        const file = await contentService.getFile(siteFolder.snapshotFolderID, ... filePath);
         const html = await file.readAsText();
         const parser = new doc.defaultView.DOMParser();
         const parsed = parser.parseFromString(html, "text/html");
@@ -337,7 +344,7 @@ export default class WebContentTranspileService
         if (!/^((\/\/)|https?\:\/\/|data\:)/i.test(value)) {
             // need to set path to CDN url
             const cdn = globalEnv.cdn ? `https://${globalEnv.cdn}` : "";
-            const rewritePath = value.startsWith("/") ? value : join(currentPath, value);
+            const rewritePath = value.startsWith("/") ? value.substring(1) : join(currentPath, value);
             const contentService = ServiceProvider.resolve(this, WebSiteContentService);
             const fileInfo = await contentService.getFileInfo(siteFolder.snapshotFolderID, ... rewritePath.split("/"));
             if (!fileInfo) {