@social-mail/social-mail-web-server 1.8.354 → 1.8.356

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.8.354",
+  "version": "1.8.356",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -21,8 +21,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.717.0",
     "@azure/storage-blob": "^12.25.0",
-    "@entity-access/entity-access": "^1.0.504",
-    "@entity-access/server-pages": "^1.1.536",
+    "@entity-access/entity-access": "^1.0.508",
+    "@entity-access/server-pages": "^1.1.539",
     "@parse/node-apn": "^6.5.0",
     "@paypal/paypal-server-sdk": "^1.0.0",
     "@peculiar/asn1-schema": "^2.3.15",

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.55"
+        version: "1.9.56"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {

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

@@ -1,13 +1,16 @@
-import { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import AppFile from "../../model/entities/AppFile.js";
-import { globalServices } from "../../../globalServices.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
+import DeleteFileHistoryWorkflow from "../../workflows/files/DeleteFileHistoryWorkflow.js";
+import { AppWorkflowContext } from "../../workflows/AppWorkflowContext.js";
 
 @RegisterScoped
 export default class FileVersionService {
 
+    @Inject workflowContext: AppWorkflowContext;
+
     public async saveVersion(user: SessionUser, file: AppFile) {
         const { userID, sessionID } = user ?? {};
         const db = ServiceProvider.resolve(this, SocialMailContext);
@@ -40,6 +43,9 @@ export default class FileVersionService {
             await db.websiteFolders.where({ rootFolder }, (p) => (x) => x.folderID === p.rootFolder)
                 .update(void 0, (p) => (x) => ({ isModified: true }));
         }
+
+        // clean older versions...
+        await DeleteFileHistoryWorkflow.queue(this.workflowContext, file.appFileID);
     }
 
 }

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

@@ -115,20 +115,6 @@ export default class SnapshotService
 
         await tx.commit();
 
-        // delete all file versions....
-        // as snapshot version will be kept alive...
-
-        await db.fileContents
-            .where({ sourcePath }, (p) => (x) => x.versions.some((v) => Sql.text.like(v.file.path, p.sourcePath) ))
-            .update(void 0, (p) => (x) => ({ deleted: true }));
-
-        // Keep current version
-        // Only delete the history
-        await db.fileVersions
-            .asQuery()
-            .delete({ sourcePath }, (p) => (x) => x.fileContentID !== x.file.fileContentID
-                && Sql.text.like(x.file.path, p.sourcePath));
-
         this.ms.snapshotRefresh.notify({ folderID });
 
         return snapshotRoot;

package/src/server/workflows/SocialWorkflowContext.ts

@@ -54,6 +54,7 @@ import DeleteWebSiteVersionWorkflow from "./web-site/DeleteWebSiteVersionWorkflo
 import SendLibraryContentWorkflow from "./channel/library/SendLibraryContentWorkflow.js";
 import CreateChannelWorkflow from "./channel/creation/CreateChannelWorkflow.js";
 import { AppWorkflowContext } from "./AppWorkflowContext.js";
+import DeleteFileHistoryWorkflow from "./files/DeleteFileHistoryWorkflow.js";
 
 @RegisterSingleton
 export default class SocialWorkflowContext extends AppWorkflowContext {
@@ -108,6 +109,7 @@ export default class SocialWorkflowContext extends AppWorkflowContext {
         this.register(DeleteWebsiteWorkflow);
         this.register(DeleteWebSiteVersionWorkflow);
         this.register(DeleteFileWorkflow);
+        this.register(DeleteFileHistoryWorkflow);
 
         this.register(DeleteMailboxWorkflow);
         this.register(DeleteHostedDomainWorkflow);

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

@@ -0,0 +1,64 @@
+import Inject from "@entity-access/entity-access/dist/di/di.js";
+import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
+import SocialMailContext from "../../model/SocialMailContext.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+import { AppWorkflowContext } from "../AppWorkflowContext.js";
+import { randomBytes, randomUUID } from "node:crypto";
+
+export default class DeleteFileHistoryWorkflow extends Workflow<{ appFileID }> {
+
+    static taskGroup = "background";
+
+    static queue(context: AppWorkflowContext, appFileID) {
+        const group = `delete-file-history-v1-${appFileID}`;
+        const id = `${group}-${randomBytes(8).readBigUInt64BE().toString(36)}`;
+        return context.queue(DeleteFileHistoryWorkflow, { appFileID }, {
+            id ,
+            throttle: {
+                group,
+                deferSeconds: 60
+            }
+        });
+    }
+
+    async run() {
+
+        await this.deleteVersions();
+
+    }
+
+    @UniqueActivity
+    async deleteVersions(
+        @Inject db?: SocialMailContext
+    ) {
+        const { appFileID } = this.input;
+
+        const recentVersions = await db.fileVersions.where(this.input, (p) => (x) => x.fileID === p.appFileID)
+            .orderByDescending(void 0, (p) => (x) => x.versionID)
+            .limit(30)
+            .toArray();
+
+        const date = DateTime.now.addDays(-30);
+
+        const oldest = await db.fileVersions.where({ appFileID, date }, (p) => (x) => x.fileID === p.appFileID
+                && x.dateCreated < Sql.cast.asDateTime(p.date)
+            )
+            .orderByDescending(void 0, (p) => (x) => x.versionID)
+            .first();
+
+        const ids = recentVersions.map((x) => x.versionID);
+        let oldestId = oldest?.versionID ?? "0" as any;
+
+        if (ids.includes(oldestId)) {
+            oldestId = ids.pop();
+        }
+
+        await db.fileContents.where({ appFileID, oldestId },(p) => (x) => x.versions.some((v) => v.fileID === p.appFileID && v.versionID < p.oldestId))
+            .update(void 0, (p) => (x) => ({ deleted: true }));
+
+        await db.fileVersions.asQuery()
+            .delete({ appFileID, oldestId },(p) => (v) => v.fileID === p.appFileID && v.versionID < p.oldestId);
+    }
+
+}