@social-mail/social-mail-web-server 1.7.78 → 1.7.80

package/package.json

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

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

@@ -291,10 +291,13 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
     }
 
     preJson(entity: Email): Email {
-        if (entity.status === "published") {
-            this.sessionSecurity.injectPublicKey(entity);
-        } else {
-            this.sessionSecurity.injectKey(entity);
+        switch(entity.status) {
+            case "published":
+                this.sessionSecurity.injectPublicKey(entity);
+                break;
+            default:
+                this.sessionSecurity.injectKey(entity);
+                break;
         }
         entity.statePostReceiveInvoked = void 0;
         entity.stateReferencesUpdated = void 0;

package/src/server/services/email-logs/EmailLogService.ts

@@ -36,6 +36,14 @@ export default class EmailLogService {
         }
     }
 
+    async delete(logID: number) {
+        await using tx = await this.db.connection.createTransaction();
+        const log = await this.db.emailLogs.statements.select({}, { logID});
+        await this.storage.deleteFile(log.cloudPath);
+        await this.db.emailLogs.statements.delete({ logID });
+        await tx.commit();
+    }
+
     async save(emailID: number, file: LocalFile, compression: string = "gz") {
         const { db, tfs } = this;
 

package/src/server/workflows/channel/BroadcastEmail.ts

@@ -171,6 +171,7 @@ export default class BroadcastEmail extends Workflow<IBroadcastEmail> {
                     senderID,
                     external: false,
                     doNotSendDR: true,
+                    saveHeadersOnly: true,
                     activityID,
                     accessCode,
                     from,

package/src/server/workflows/smtp/DispatchEmailToMX.ts

@@ -8,18 +8,16 @@ import Tracer from "../../../Tracer.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import SMTPClient, { ISmtpResponse } from "../../smtp/client/SMTPClient.js";
 import { SmtpStatusCodes } from "../../smtp/client/SmtpStatusCodes.js";
-import TempFileService from "../../storage/TempFileService.js";
 import MailDispatcherService from "./MailDispatcherService.js";
 import EmailLogService from "../../services/email-logs/EmailLogService.js";
 import EmailAddressService from "../../services/EmailAddressService.js";
 // import PostReceiveWorkflow from "../post-receive/PostReceiveWorkflow.js";
 import ESmtpClient from "../../../protocols/smtp/ESmtpClient.js";
-import DnsService from "../../smtp/dns/DnsService.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
 import EmailReferenceService from "../../smtp/services/EmailReferenceService.js";
 import EmailPostReceiveService from "../../smtp/services/EmailPostReceiveService.js";
-import EngagementService from "../../smtp/services/EngagementService.js";
 import TagService from "../../services/tags/TagService.js";
+import { IMessageEnvelope } from "./IMessageEnvelope.js";
 
 export const smtpPool = new NamedObjectPool<SMTPClient>((host) => ({
     asyncFactory: () => new SMTPClient({ host }).connect(),
@@ -32,21 +30,6 @@ export const smtpPool = new NamedObjectPool<SMTPClient>((host) => ({
     },
 }));
 
-interface IMessageEnvelope {
-    emailID: number;
-    recipientAddressID: number;
-    host: string;
-    from: string;
-    to: string[];
-    modifyTo?: boolean;
-    external: boolean;
-    senderID?: number;
-    activityID?: number;
-    accessCode?: string;
-    doNotSendDR?: boolean;
-    listID?: number;
-}
-
 export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
 
     private response: ISmtpResponse;
@@ -92,8 +75,7 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
     async signEmail(
         @Inject mds?: MailDispatcherService
     ) {
-        const { emailID, senderID, activityID, recipientAddressID, accessCode, external, to, listID, from } = this.input;
-        return await mds.encodeForBulk({ emailID, senderID, activityID, recipientAddressID , accessCode, external, to, listID, from });
+        return await mds.encodeForBulk(this.input);
     }
 
     @UniqueActivity
@@ -310,6 +292,12 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
     ) {
         const { emailID, recipientAddressID: emailAddressID, activityID } = this.input;
         db.verifyFilters = false;
+
+        if (this.signedFileLogID && this.input.saveHeadersOnly) {
+            // delete the log file...
+            await els.delete(this.signedFileLogID);
+        }
+
         if (this.response?.statusCode === SmtpStatusCodes.Ok) {
 
             await db.emailRecipients.statements.update({
@@ -320,9 +308,16 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
             });
             await els.saveText(emailID,this.input.to.join(","), this.response.logs);
 
+            if (activityID) {
+                await db.subscriberActivities.statements.update({ activity: "sent" }, { activityID});
+            }
             return;
         }
 
+        if (activityID) {
+            await db.subscriberActivities.statements.update({ activity: "sent-failed" }, { activityID});
+        }
+
         db.raiseEvents = true;
 
         const now = DateTime.now;

package/src/server/workflows/smtp/IMessageEnvelope.ts

@@ -0,0 +1,15 @@
+export interface IMessageEnvelope {
+    emailID: number;
+    recipientAddressID: number;
+    host: string;
+    from: string;
+    to: string[];
+    modifyTo?: boolean;
+    external: boolean;
+    senderID?: number;
+    activityID?: number;
+    accessCode?: string;
+    doNotSendDR?: boolean;
+    saveHeadersOnly?: boolean;
+    listID?: number;
+}

package/src/server/workflows/smtp/MailDispatcherService.ts

@@ -16,6 +16,7 @@ import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { randomUUID } from "node:crypto";
 import DomainKeyService from "../../services/domain-keys/DomainKeyService.js";
 import EncryptionService from "../../services/encryption/EncryptionService.js";
+import { IMessageEnvelope } from "./IMessageEnvelope.js";
 
 @RegisterScoped
 export default class MailDispatcherService {
@@ -41,8 +42,8 @@ export default class MailDispatcherService {
     @Inject
     encryptionService: EncryptionService;
 
-    async encodeForBulk({ senderID, emailID, recipientAddressID, activityID, accessCode, external, to, listID, from }:
-        { senderID: number, emailID: number, recipientAddressID: number, activityID: number, accessCode: string, external?: boolean, listID?: any, from: string, to: string[] }) {
+    async encodeForBulk({ senderID, emailID, recipientAddressID, activityID, accessCode, external, to, listID, from, saveHeadersOnly }:
+        IMessageEnvelope) {
         const { db, tfs, storage, htmlSanitizer } = this;
         db.verifyFilters = false;
         db.raiseEvents = false;
@@ -169,15 +170,17 @@ export default class MailDispatcherService {
             const log = await this.emailLogService.save(emailID, mailFile);
             return log.logID;
         }
-        const signed = await this.signFile({ emailID, senderID, file: mailFile});
+        const signed = await this.signFile({ emailID, senderID, file: mailFile, saveHeadersOnly, recipientID: to[0]});
         return signed;
     }
 
     async signFile({
         emailID,
         senderID,
-        file
-    }: { emailID: number, senderID, file: LocalFile } ) {
+        file,
+        recipientID,
+        saveHeadersOnly
+    }: { emailID: number, recipientID, senderID, file: LocalFile, saveHeadersOnly?: boolean } ) {
         const { tfs } = this;
 
         const dks = ServiceProvider.resolve(this, DomainKeyService);
@@ -189,9 +192,22 @@ export default class MailDispatcherService {
             privateKey: dk.privateKey
         });
 
-        const mailFile = await tfs.createFrom(`${emailID}.eml`, signer.sign( file.openReadStream()), "message/rfc822");
+        const mailFile = await tfs.createFrom(`${emailID}-${recipientID}.eml`, signer.sign( file.openReadStream()), "message/rfc822");
 
         const log = await this.emailLogService.save(emailID, mailFile);
+
+        if (saveHeadersOnly) {
+            // save a copy...
+            const headers = await tfs.createTempFile(".log", `${emailID}-${recipientID}.headers.log`, "message/rfc822");
+            for await(const line of mailFile.lines()) {
+                if (!line) {
+                    break;
+                }
+                await headers.appendLine(line);
+                await this.emailLogService.save(emailID, headers);
+            }
+        }
+
         return log.logID;
     }
 

package/dist/server/workflows/channel/BroadcastEmailToMX.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=BroadcastEmailToMX.d.ts.map

package/dist/server/workflows/channel/BroadcastEmailToMX.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BroadcastEmailToMX.d.ts","sourceRoot":"","sources":["../../../../src/server/workflows/channel/BroadcastEmailToMX.ts"],"names":[],"mappings":""}

package/dist/server/workflows/channel/BroadcastEmailToMX.js

@@ -1,219 +0,0 @@
-// import Inject from "@entity-access/entity-access/dist/di/di.js";
-// import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
-// import TempFileService from "../../storage/TempFileService.js";
-// import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
-// import { SmtpStatusCodes } from "../../smtp/client/SmtpStatusCodes.js";
-// import { ISmtpResponse } from "../../smtp/client/SMTPClient.js";
-// import SocialMailContext from "../../model/SocialMailContext.js";
-// import SubscriberActivity from "../../model/entities/SubscriberActivity.js";
-// import AppFile from "../../model/entities/AppFile.js";
-// import { Attachment } from "nodemailer/lib/mailer/index.js";
-// import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-// import DKIM from "nodemailer/lib/dkim/index.js";
-// import MailComposer from "nodemailer/lib/mail-composer/index.js";
-// import { expandPlaceholders } from "../../services/TemplateExpander.js";
-// import HtmlSanitizer from "../../services/dom/HtmlSanitizer.js";
-// import sleep from "../../../common/sleep.js";
-// import { Base36 } from "../../../common/Base36.js";
-// import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
-// import Tracer from "../../../Tracer.js";
-// import EngagementService from "../../smtp/services/EngagementService.js";
-// import { smtpPool } from "../smtp/DispatchEmailToMX.js";
-// import EmailLogService from "../../services/email-logs/EmailLogService.js";
-export {};
-// export default class BroadcastEmailToMX extends Workflow<SubscriberActivity> {
-//     private response: ISmtpResponse;
-//     async run() {
-//         let ts = TimeSpan.fromSeconds(60);
-//         for (let index = 0; index < 5; index++) {
-//             const status = this.response = await this.sendMail(index);
-//             switch(status.statusCode) {
-//                 case SmtpStatusCodes.Ok:
-//                     await this.saveStatus();
-//                     return null;
-//                 case SmtpStatusCodes.ExceededStorageAllocation:
-//                 case SmtpStatusCodes.MailboxBusy:
-//                 case SmtpStatusCodes.TransactionFailed:
-//                 case SmtpStatusCodes.ServiceNotAvailable:
-//                     break;
-//                 default:
-//                     await this.saveStatus();
-//                     return status.status;
-//             }
-//             await this.delay(ts);
-//             ts = ts.add(ts);
-//         }
-//         await this.saveStatus();
-//         return "Failed after multiple attempts";
-//     }
-//     @UniqueActivity
-//     async sendMail(
-//         attempt: number,
-//         @Inject db?: SocialMailContext,
-//         @Inject tfs?: TempFileService,
-//         @Inject es?: EngagementService,
-//         @Inject htmlSanitizer?: HtmlSanitizer
-//     ) {
-//         const { activityID, emailID } = this.input;
-//         db.verifyFilters = false;
-//         db.raiseEvents = false;
-//         const activity = await db.subscriberActivities
-//             .where(this.input, (p) => (x) => x.activityID === p.activityID)
-//             .include((x) => [
-//                 x.email.attachments,
-//                 x.email.senderEmail,
-//                 x.subscriber.mailbox,
-//                 x.subscriber.domain,
-//                 x.mailbox.emailAddress,
-//                 x.mailbox.domain.domainKeys
-//             ])
-//             .first();
-//         const uid = activity.activityID;
-//         const email = activity.email;
-//         const to = activity.subscriber.emailAddress;
-//         const headers = JSON.parse(email.headers ?? "{}");
-//         let { inReplyTo } = headers;
-//         if (email.parent) {
-//             inReplyTo = `<${email.parent.headerMessageID}>`;
-//         }
-//         if (inReplyTo) {
-//             if (!inReplyTo.startsWith("<")) {
-//                 inReplyTo = `<${inReplyTo}>`;
-//             }
-//         }
-//         const senderEmail = activity.mailbox.emailAddress.emailAddress;
-//         let html = email.htmlBody;
-//         const s = htmlSanitizer.sanitize(html, email.textBody, {
-//             senderEmail,
-//             uid: Base36.encode(uid),
-//             emailID: Base36.encode(emailID),
-//             messageID: email.headerMessageID,
-//             activityID: Base36.encode(activityID) as any,
-//         });
-//         html = s.html;
-//         const senderName = activity.mailbox.emailAddress.name || activity.mailbox.name;
-//         const now = DateTime.now;
-//         if (!email.senderName) {
-//             email.senderName = senderName;
-//         }
-//         const toAttachment = async (ea: AppFile): Promise<Attachment> => {
-//             const tf = await tfs.downloadAppFile(ea);
-//             return {
-//                 content: tf.openReadStream(),
-//                 filename: ea.name,
-//                 contentType: ea.contentType,
-//                 contentDisposition: ea.contentDisposition as any,
-//                 cid: ea.appFileID.toString()
-//             };
-//         };
-//         const attachments = await Promise.all((email.attachments ?? []).map(toAttachment));
-//         // prepare transport...
-//         const mail = new MailComposer({
-//             from: {
-//                 name: senderName,
-//                 address: senderEmail
-//             },
-//             to,
-//             html,
-//             text: email.textBody,
-//             subject: email.subject,
-//             messageId: email.headerMessageID,
-//             inReplyTo,
-//             attachments,
-//             date: now.asJSDate,
-//             headers: {
-//                 "Original-From": `"${senderName}" <${senderEmail}>`,
-//                 "List-Unsubscribe": `<mailto:unsubscribe-${senderEmail}>`
-//             }
-//         });
-//         const mime = mail.compile();
-//         const dk = activity.mailbox.domain.domainKeys[0];
-//         const signer = new DKIM({
-//             domainName: activity.mailbox.emailAddress.emailAddress.split("@").pop() ,
-//             keySelector: dk.name,
-//             privateKey: dk.privateKey
-//         });
-//         const mailFile = await tfs.createFrom(`${email.emailID}.eml`, signer.sign( mime.createReadStream()), "message/rfc822");
-//         if (activity.subscriber.mailbox) {
-//             const originalFile = db.appFiles.add({
-//                 name: "mail.eml",
-//                 contentType: mailFile.contentType,
-//                 file: mailFile
-//             });
-//             // we need to insert a copy into database...
-//             // with recipient
-//             db.emails.add({
-//                 originalFile,
-//                 textBody: s.text,
-//                 // htmlBody: s.html,
-//                 subject: email.subject,
-//                 senderID: activity.mailboxID,
-//                 headerMessageID: email.headerMessageID,
-//                 senderName: email.senderName || senderName,
-//                 recipients: [db.emailRecipients.add({
-//                     emailAddressID: activity.emailAddressID,
-//                     type: "to"
-//                 })],
-//                 attachments: email.attachments?.map((x) => db.appFiles.add({
-//                     ... x,
-//                     appFileID: void 0
-//                 })),
-//                 status: "received",
-//                 received: true,
-//                 dateSent: now,
-//                 dateReceived: now,
-//                 dateCreated: now,
-//                 mailboxes: [
-//                     db.mailboxEmails.add({
-//                         mailboxID: activity.emailAddressID
-//                     })
-//                 ]
-//             });
-//             db.raiseEvents = true;
-//             db.verifyFilters = false;
-//             await db.saveChanges();
-//             return  {
-//                 statusCode: SmtpStatusCodes.Ok,
-//                 logs: "Delivered"
-//             } as ISmtpResponse;
-//         }
-//         const host = activity.subscriber.domain.name;
-//         await using client = await smtpPool.acquire(host);
-//         const status = await client.send({
-//             from: senderEmail,
-//             to: [to],
-//             host
-//         }, mailFile);
-//         if (Number(status.statusCode) >= 400) {
-//             Tracer.instance.error(status.logs, {
-//                 path: to,
-//                 host
-//             });
-//         }
-//         return status;
-//     }
-//     @UniqueActivity
-//     async saveStatus(
-//         @Inject db?: SocialMailContext,
-//         @Inject els?: EmailLogService
-//     ) {
-//         const { emailID, emailAddressID: subscriberID, mailboxID } = this.input;
-//         db.verifyFilters = false;
-//         const activity = this.response?.statusCode === SmtpStatusCodes.Ok
-//             ? "sent"
-//             : "failed";
-//         await db.subscriberActivities.saveDirect({
-//             mode: "insert",
-//             changes: {
-//                 mailboxID,
-//                 emailID,
-//                 emailAddressID: subscriberID,
-//                 activity,
-//                 dateCreated: DateTime.now
-//             }
-//         });
-//         await els.saveText(this.input.emailID, this.input.activityID.toString(), this.response.logs);
-//         return;
-//     }
-// }
-//# sourceMappingURL=BroadcastEmailToMX.js.map

package/dist/server/workflows/channel/BroadcastEmailToMX.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"BroadcastEmailToMX.js","sourceRoot":"","sources":["../../../../src/server/workflows/channel/BroadcastEmailToMX.ts"],"names":[],"mappings":"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"}