@social-mail/social-mail-web-server 1.7.577 → 1.7.579

package/package.json

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

package/src/server/smtp/services/EngagementService.ts

@@ -1,12 +1,9 @@
-import Inject, { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import { Base36 } from "../../../common/Base36.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { Email } from "../../model/entities/Email.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import sleep from "../../../common/sleep.js";
-import SubscriberActivity from "../../model/entities/SubscriberActivity.js";
-import CachedEmailService from "./CachedEmailService.js";
 import { ReactionExtractor } from "../../../protocols/core/ReactionExtractor.js";
 
 const extractEngagement = (txt: string) => {

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

@@ -33,12 +33,13 @@ export default class DeleteFileWorkflow extends Workflow<{ fileID }> {
     async deleteFolders(
         @Inject db?: SocialMailContext
     ) {
-        const { root } = this;
+        const { root, input: { fileID } } = this;
         for(;;) {
             const n = await db.appFiles
                 .asQuery()
-                .delete({ root }, (p) => (x) =>
+                .delete({ root, fileID }, (p) => (x) =>
                     Sql.text.like(x.path, p.root)
+                    && x.appFileID !== p.fileID
                     && !x.children.some((c) => c.appFileID > 0)
                 );
             if (!n) {

package/src/server/workflows/pending/PendingPostReceiveWorkflow.ts

@@ -2,7 +2,6 @@
 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 EmailReferenceService from "../../smtp/services/EmailReferenceService.js";
 import EmailPostReceiveService from "../../smtp/services/EmailPostReceiveService.js";
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
 

package/src/server/workflows/pending/PendingReferencesWorkflow.ts

@@ -18,9 +18,12 @@ export default class PendingReferencesWorkflow extends Workflow {
 
     async run() {
         let start = 0;
-        do {
+        for(;;) {
             start = await this.processPendingReferences(start);
-        } while(BigInt(start));
+            if(!BigInt(start)) {
+                break;
+            }
+        }
 
         await this.context.queue(PendingPostReceiveWorkflow, "run", { id: `post-receive-${randomUUID()}`, throttle: { group: "post-receive", maxPerSecond: 1 } } );
     }
@@ -45,10 +48,13 @@ export default class PendingReferencesWorkflow extends Workflow {
             .toArray();
 
         if (!items.length) {
+            console.log(`No pending emails to process`);
             return 0;
         }
 
         for (const { emailID, received } of items) {
+            start = emailID;
+            console.log(`Processing ${emailID}`);
             try {
                 await ers.updateReferences({
                     emailID,
@@ -61,7 +67,6 @@ export default class PendingReferencesWorkflow extends Workflow {
                 // we will ignore and continue?
             }
             db.changeSet.clear();
-            start = emailID;
         }
 
         return start;