@social-mail/social-mail-web-server 1.4.705 → 1.4.706

package/package.json

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

package/src/server/model/entities/Email.ts

@@ -34,6 +34,12 @@ export type emailStatusType = typeof emailStatuses[number];
     columns: [ { name: (x) => x.externalEmailID, descending: false }],
     filter: (x) => x.externalEmailID !== null
 })
+@Index({
+    name: "IX_Emails_SentMessageID",
+    columns: [ { name: (x) => x.sentMessageID, descending: false }],
+    filter: (x) => x.sentMessageID !== null,
+    unique: true
+})
 @Index({
     name: "IX_Emails_HasHtmlBody",
     columns: [ { name: (x) => x.emailID, descending: true }],
@@ -124,6 +130,9 @@ export class Email {
     })
     public mimeFileID: number;
 
+    @Column({ dataType: "Char", length: 200, nullable: true})
+    public sentMessageID: string;
+
     @Column({ dataType: "BigInt", nullable: true })
     @RelateTo({
         type: () => EmailLog,

package/src/server/model/events/EmailEvents.ts

@@ -223,18 +223,16 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
 
     private async updateScheduleAndReferences(entity: Email) {
 
-        let saveChangesCalled = false;
-
         const { emailID, silent, dateReceived, htmlBody, tempID } = entity;
 
-        if (tempID) {
-            const html = htmlBody.replaceAll(tempID, Base36.encode(emailID));
+        let updateEmail = false;
 
-            if (html !== htmlBody) {
-                entity.htmlBody = html;
-                this.db.queuePostSaveTask(() => this.db.saveChangesWithoutEvents());
-                saveChangesCalled = true;
-            }
+        let html = htmlBody;
+
+        if (tempID) {
+            html = htmlBody.replaceAll(tempID, Base36.encode(emailID));
+            updateEmail ||= html !== htmlBody;
+            entity.htmlBody = html;
         }
 
 
@@ -253,19 +251,29 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
                 });
         }
 
+        let sentMessageID = entity.sentMessageID ?? null;
+
         if (entity.status === "scheduled") {
             entity.userID = this.sessionUser?.userID ?? void 0;
             const dateSent = DateTime.from(entity.dateSent);
             // insert a job in queue...
             const id = `send-email-${emailID}-${dateSent.msSinceEpoch.toString(36)}`;
             entity.workflowID = id;
+            sentMessageID = entity.headerMessageID;
+            updateEmail = true;
             await this.workflowContext.queue(PrepareEmailToSend, emailID, {
                 eta: dateSent,
                 id
             });
-            if (!saveChangesCalled) {
-                this.db.queuePostSaveTask(() => this.db.saveChangesWithoutEvents());
-            }
+        }
+
+        if (updateEmail) {
+            await this.db.emails.where(entity, (p) => (x) => x.emailID === p.emailID)
+                .update(entity, (p) => (x) => ({
+                    htmlBody: p.htmlBody,
+                    workflowID: p.workflowID,
+                    sentMessageID: p.sentMessageID
+                }));
         }
     }
 

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

@@ -104,6 +104,10 @@ const stripDuplicates = (addresses: IEmailRecipientInfo[]) => {
     return r;
 };
 
+export interface IEmailInfo {
+    externalEmailID: string, labels: string[], mailbox: Mailbox, silent?: boolean,
+    messageId: string
+};
 
 @RegisterScoped
 export default class EmailSerializerService {
@@ -135,20 +139,23 @@ export default class EmailSerializerService {
     @Inject
     private workflowContext: WorkflowContext;
 
-    async saveRFC822(text: string, externalEmailID: string, labels: string[], mailbox: Mailbox, silent?: boolean) {
+    async saveRFC822(text: string, emailInfo: IEmailInfo) {
         const { tempFileService } = this;
         const file = await tempFileService.createTempFile(".eml", void 0, "message/rfc822");
         await writeFile(file.path, text, "utf8");
-        await this.saveRFC822File(file, externalEmailID, labels, mailbox, silent);
+        await this.saveRFC822File(file, emailInfo);
     }
 
-    async saveRFC822File(file: LocalFile, externalEmailID: string, labels: string[], mailbox: Mailbox, silent?: boolean) {
+    async saveRFC822File(file: LocalFile, emailInfo: IEmailInfo) {
+        const { externalEmailID, labels, mailbox, silent, messageId} = emailInfo;
         const { tempFileService, db } = this;
         // check if email already saved in same mailbox...
         const { mailboxID } = mailbox;
         if (externalEmailID) {
-            const existing = await db.mailboxEmails.where({ mailboxID, externalEmailID}, (p) => (x) => x.mailboxID === p.mailboxID
+            const existing = await db.mailboxEmails.where({ mailboxID, externalEmailID, messageId }, (p) => (x) =>
+                (x.mailboxID === p.mailboxID
                 && x.email.externalEmailID === p.externalEmailID)
+            || x.email.sentMessageID === p.messageId)
                 .some();
 
             if (existing) {
@@ -197,7 +204,7 @@ export default class EmailSerializerService {
                 const mime = mail.compile();
 
                 const emailFile = await tempFileService.createFrom("harmful-email.zip", mime.createReadStream(), "message/rfc822");
-                await this.saveRFC822File(emailFile, externalEmailID, labels, mailbox, silent);
+                await this.saveRFC822File(emailFile, emailInfo);
                 return;
             }
             throw error;

package/src/server/workflows/sync/SyncMailboxWorkflow.ts

@@ -219,7 +219,7 @@ export default class SyncMailboxWorkflow extends Workflow<any, any> {
 
                 i++;
 
-                const { emailID, uid, labels } = iterator;
+                const { emailID, uid, labels, messageId } = iterator;
                 const cUID = BigInt(uid);
                 if (cUID > currentLastUID && cUID < end) {
                     currentLastUID = cUID;
@@ -255,7 +255,13 @@ export default class SyncMailboxWorkflow extends Workflow<any, any> {
                 const result = await client.uidFetchRFC822(uid);
                 syncState.progress = (BigInt(syncState.progress) + 1n).toString();
                 // console.log(`Saving ${uid}`);
-                await serializer.saveRFC822(result.rfc822, emailID, labels, target.mailbox, true);
+                await serializer.saveRFC822(result.rfc822, {
+                    externalEmailID:  emailID,
+                    messageId,
+                    labels,
+                    mailbox: target.mailbox,
+                    silent: true
+                });
                 // console.log(`Saved ${uid}`);
             }