@social-mail/social-mail-web-server 1.7.366 → 1.7.368

package/src/server/workflows/files/DeleteFileWorkflow.ts

@@ -31,6 +31,7 @@ export default class DeleteFileWorkflow extends Workflow<{ fileID }> {
 
     @UniqueActivity
     async deleteFile(@Inject db?: SocialMailContext) {
+        await db.websiteVersions.asQuery().delete(this.input, (p) => (x) => x.snapshotFolderID === p.fileID);
         await db.websiteFolders.asQuery().delete(this.input, (p) => (x) => x.folderID === p.fileID);
         await db.appFiles.statements.delete({ appFileID: this.input.fileID});
     }

package/src/server/workflows/web-site/DeleteWebSiteVersionWorkflow.ts

@@ -0,0 +1,54 @@
+import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
+import { WebSiteVersion } from "../../model/entities/WebSiteVersion.js";
+import Inject from "@entity-access/entity-access/dist/di/di.js";
+import SocialMailContext from "../../model/SocialMailContext.js";
+import DeleteFileWorkflow from "../files/DeleteFileWorkflow.js";
+
+export default class DeleteWebSiteVersionWorkflow extends Workflow<Partial<WebSiteVersion>> {
+
+    async run() {
+        let start = 0;
+        do {
+            const { start: startNext, children }  = await this.deleteChildren(start);
+
+            if (!startNext) {
+                break;
+            }
+
+            start = startNext;
+            const all = children.map((fileID) => this.runChild(DeleteFileWorkflow, { fileID }));
+            await this.all(all);
+
+        } while(BigInt(start) > 0);
+    }
+
+    @UniqueActivity
+    async deleteChildren(
+        start: number,
+        @Inject db?: SocialMailContext
+    ) {
+
+        const { folderID, snapshotFolderID } = this.input;
+        const files = await db.websiteVersions.where({ folderID, snapshotFolderID , start }, (p) => (x) =>
+                x.folderID === p.folderID
+                && x.snapshotFolderID !== p.snapshotFolderID
+                && x.snapshotFolderID > p.start
+            )
+            .limit(10)
+            .toArray();
+
+            const children = [];
+
+        if (files.length === 0) {
+            return { start: 0, children };
+        }
+
+        for (const version of files) {
+            start = version.snapshotFolderID;
+            children.push(version.snapshotFolderID);
+        }
+
+        return { start, children };
+
+    }
+}

package/src/wwwroot/routes/social-mail/site/download/files/get.tsx

@@ -26,31 +26,6 @@ export default class extends Page {
             return this.notFound();
         }
 
-        // this will be handled by the site route
-        // if (snapshot.remoteUrl) {
-        //     // proxy remote url
-        //     const url = snapshot.remoteUrl + this.request.URL.pathname + this.request.URL.search;
-        //     const r = await fetch(url);
-        //     if (r.status >= 400) {
-        //         return this.content({
-        //             body: await r.text(),
-        //             contentType: "text/plain"
-        //         });
-        //     }
-        //     const buffer = await r.arrayBuffer();
-        //     const contentType = r.headers.get("content-type") || "text/plain";
-        //     let compress = false;
-        //     if (/text|json/i.test(contentType)) {
-        //         compress = true;
-        //     }
-        //     return this.content({
-        //         status: r.status,
-        //         body: Buffer.from(buffer),
-        //         compress,
-        //         contentType
-        //     });
-        // }
-
         const path = this.childPath as string[] ?? [];
 
         const file = path?.length
@@ -84,9 +59,10 @@ export default class extends Page {
             });
         }
 
-        const appFile = await this.wcs.getSnapshotFile(snapshot, path);
+        const appFile = await this.wcs.getFileFromInfo(file);
         return new TempFileResult(appFile, {
             contentDisposition: "inline",
+            contentType: file.contentType
         });
     }
 }