@social-mail/social-mail-web-server 1.5.455 → 1.7.2

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

@@ -34,7 +34,7 @@ export const smtpPool = new NamedObjectPool<SMTPClient>((host) => ({
 
 interface IMessageEnvelope {
     emailID: number;
-    emailAddressID: number;
+    recipientAddressID: number;
     host: string;
     from: string;
     to: string[];
@@ -92,8 +92,8 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
     async signEmail(
         @Inject mds?: MailDispatcherService
     ) {
-        const { emailID, senderID, activityID, emailAddressID, accessCode, external, to, listID } = this.input;
-        return await mds.encodeForBulk({ emailID, senderID, activityID, recipientID: emailAddressID, accessCode, external, to, listID });
+        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 });
     }
 
     @UniqueActivity
@@ -174,7 +174,7 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
 
         // if it is local...
         // save signedFileLogID to MailboxContactEmail
-        const { senderID, emailID, emailAddressID, external } = this.input;
+        const { senderID, emailID, recipientAddressID, external } = this.input;
         const { signedFileLogID } = this;
         const mailboxID = await eas.getHostedMailboxID(this.input.to[0]);
 
@@ -186,6 +186,8 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
                 // internal broad casting is not working
                 // we either need to create an email or add the recipient
 
+                const emailAddressID = senderID;
+
                 const email = await db.emails.loadByKeys({ emailID });
                 await db.changeSet.getEntry(email).loadNavigationAsync((x) => x.emailTags);
 
@@ -204,7 +206,8 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
                 await db.mailboxContacts.statements.upsert({
                     mailboxID,
                     emailAddressID,
-                    folderTagID
+                    folderTagID,
+                    newRequest: true,
                 }, (x) => {
                     addFolder = false;
                     x.unread++;
@@ -305,7 +308,7 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
         @Inject db?: SocialMailContext,
         @Inject els?: EmailLogService
     ) {
-        const { emailID, emailAddressID, activityID } = this.input;
+        const { emailID, recipientAddressID: emailAddressID, activityID } = this.input;
         db.verifyFilters = false;
         if (this.response?.statusCode === SmtpStatusCodes.Ok) {
 
@@ -327,7 +330,7 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
         if (!this.input.doNotSendDR) {
 
             const e = await db.emailRecipients
-                .where(this.input, (p) => (x) => x.emailID === p.emailID && x.emailAddressID === p.emailAddressID)
+                .where(this.input, (p) => (x) => x.emailID === p.emailID && x.emailAddressID === p.recipientAddressID)
                 .include((x) => [x.email, x.emailAddress])
                 .first();
 
@@ -337,7 +340,7 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
             // send mailer daemon...
             db.emails.add({
                 senderName: e.name ?? "Mailer Daemon",
-                senderID: this.input.emailAddressID,
+                senderID: this.input.recipientAddressID,
                 parentID: e.emailID,
                 subject: `Mailer Daemon Delivery Failed`,
                 textBody: `Mail delivery to ${e.emailAddress.emailAddress} failed with following error\r\nError Code: ${this.response.statusCode}\r\n${this.response.status}`,

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

@@ -41,8 +41,8 @@ export default class MailDispatcherService {
     @Inject
     encryptionService: EncryptionService;
 
-    async encodeForBulk({ senderID, emailID, recipientID, activityID, accessCode, external, to, listID }:
-        { senderID: number, emailID: number, recipientID: number, activityID: number, accessCode: string, external?: boolean, listID?: any, to: string[] }) {
+    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[] }) {
         const { db, tfs, storage, htmlSanitizer } = this;
         db.verifyFilters = false;
         db.raiseEvents = false;
@@ -55,7 +55,7 @@ export default class MailDispatcherService {
             const a = await db.subscriberActivities.statements.insert({
                 emailID,
                 mailboxID: senderID,
-                emailAddressID: recipientID,
+                emailAddressID: recipientAddressID,
                 dateCreated,
                 accessCode,
                 activity: "scheduled"
@@ -120,7 +120,7 @@ export default class MailDispatcherService {
             }
         }
 
-        const senderEmail = email.senderEmail.emailAddress;
+        const senderEmail = from ?? mb.emailAddress.emailAddress;
 
 
         let html = email.htmlBody ?? await this.cachedEmailService.getHtmlText(email);
@@ -141,7 +141,7 @@ export default class MailDispatcherService {
             html = s.html;
         }
 
-        const fromAddress = mb.emailAddress.emailAddress;
+        const fromAddress = from ?? mb.emailAddress.emailAddress;
 
         if (listID) {
             headers["List-ID"] = `${mb.emailAddress.name} <${fromAddress}>`;

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

@@ -94,7 +94,7 @@ export default class PrepareEmailToSend extends Workflow<number, string> {
                 from: email.senderEmail.emailAddress,
                 senderID: email.senderID,
                 emailID: x.emailID,
-                emailAddressID: x.emailAddressID,
+                recipientAddressID: x.emailAddressID,
                 external: email.senderEmail.mailbox.isExternal,
                 to: [ x.replyTo ?? x.emailAddress.emailAddress],
                 maxPerSecond,

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

@@ -296,7 +296,7 @@ export default class SyncMailboxWorkflow extends Workflow<any, any> {
 
         if (emailID) {
             const e = await this.db.emails.where({ emailID, mailboxID, messageId }, (p) => (x) =>
-                x.mailboxes.some((mb) => mb.mailboxID === p.mailboxID)
+                x.mailboxContactEvents.some((mb) => mb.mailboxID === p.mailboxID)
                 && (
                     x.externalEmailID === p.emailID
                     || (x.headerMessageID === p.messageId
@@ -313,7 +313,7 @@ export default class SyncMailboxWorkflow extends Workflow<any, any> {
         return await this.db.emails.where({ mailboxID, messageId, from }, (p) => (x) =>
             x.sentMessageID === p.messageId
             || (
-                x.mailboxes.some((mb) => mb.mailboxID === p.mailboxID)
+                x.mailboxContactEvents.some((mb) => mb.mailboxID === p.mailboxID)
                 && x.headerMessageID === p.messageId
                 && x.senderEmail.emailAddress === p.from
             )

package/src/server/workflows/web-hooks/InvokeWebHookWorkflow.ts

@@ -108,7 +108,7 @@ export default class InvokeWebHookWorkflow extends Workflow<{ webHookID: number,
                 lastEvent: "failed"
             }, { webHookID });
 
-            console.error(error);
+            console.error(response);
             return false;
         }
 

package/src/wwwroot/routes/api/emails/channel/content/attachment/index.ts

@@ -34,14 +34,14 @@ export default class extends Page {
                     x.appFileID === p.fileID
                     && x.emailID === p.emailID
                     && x.email.headerMessageID === p.messageID
-                    && x.email.mailboxes.some((c) => Sql.in(c.mailboxID, p.mailboxes))
+                    && x.email.channelEmails.some((c) => Sql.in(c.mailboxID, p.mailboxes))
                 )
             : this.db.appFiles
                 .where({ fileID, emailID, messageID, channelID, domains }, (p) => (x) =>
                     x.appFileID === p.fileID
                     && x.emailID === p.emailID
                     && x.email.headerMessageID === p.messageID
-                    && x.email.mailboxes.some((c) => Sql.in(c.mailbox.domainID, p.domains))
+                    && x.email.channelEmails.some((c) => Sql.in(c.mailbox.domainID, p.domains))
                 );
 
         // verify host ...

package/src/wwwroot/routes/api/emails/channel/content/html/index.ts

@@ -46,12 +46,12 @@ export default class extends Page {
             email = mailboxes
                 ? await q
                     .where({ mailboxes }, (p) => (x) =>
-                        x.mailboxes.some((c) => Sql.in(c.mailboxID, p.mailboxes) )
+                        x.channelEmails.some((c) => Sql.in(c.mailboxID, p.mailboxes) )
                     )
                     .first()
                 : await q
                     .where({ domains }, (p) => (x) =>
-                        x.mailboxes.some((c) => Sql.in(c.mailbox.domainID, p.domains) )
+                        x.channelEmails.some((c) => Sql.in(c.mailbox.domainID, p.domains) )
                     )
                     .first();
             if (!email) {
@@ -62,7 +62,7 @@ export default class extends Page {
                 email = mailboxes
                     ? await q
                         .where({ channelID, mailboxes, userID }, (p) => (x) =>
-                            x.mailboxes.some((c) => c.mailboxID === p.channelID
+                            x.channelEmails.some((c) => c.mailboxID === p.channelID
                                 && Sql.in(c.mailboxID, p.mailboxes)
                                 && c.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
                             )
@@ -70,7 +70,7 @@ export default class extends Page {
                         .first()
                     : await q
                         .where({ channelID, domains, userID }, (p) => (x) =>
-                            x.mailboxes.some((c) => c.mailboxID === p.channelID
+                            x.channelEmails.some((c) => c.mailboxID === p.channelID
                                 && Sql.in(c.mailbox.domainID, p.domains)
                             )
                         )
@@ -82,12 +82,12 @@ export default class extends Page {
                 email = mailboxes
                     ? await q
                         .where({ mailboxes }, (p) => (x) =>
-                            x.mailboxes.some((c) => Sql.in(c.mailboxID, p.mailboxes))
+                            x.channelEmails.some((c) => Sql.in(c.mailboxID, p.mailboxes))
                         )
                         .first()
                     :  await q
                         .where({ domains }, (p) => (x) =>
-                            x.mailboxes.some((c) => Sql.in(c.mailbox.domainID, p.domains))
+                            x.channelEmails.some((c) => Sql.in(c.mailbox.domainID, p.domains))
                         )
                         .first();
                 if (!email) {

package/src/wwwroot/routes/social-mail/public/email/attachment/index.ts

@@ -18,6 +18,8 @@ export default class extends Page {
 
     async run() {
 
+        console.warn(`Do not use this, ${this.request.url}`);
+
         let { 0:channelID, 1: emailID, 3: fileID} = this.childPath as any[];
         const {2: messageID } = this.childPath;
 
@@ -33,7 +35,7 @@ export default class extends Page {
                         x.appFileID === p.fileID
                         && x.emailID === p.emailID
                         && x.email.headerMessageID === p.messageID
-                        && x.email.mailboxes.some((c) => c.mailboxID === p.channelID
+                        && x.email.channelEmails.some((c) => c.mailboxID === p.channelID
                             && c.mailbox.websiteChannels.some((wc) =>
                                 wc.website.hosts.some((h) => h.host === p.host)))
             )

package/src/wwwroot/routes/social-mail/social/buttons/get.tsx

@@ -1,133 +1,133 @@
-import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import Content, { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
-import Page from "@entity-access/server-pages/dist/Page.js";
-import CacheService from "../../../../../server/services/cache/CacheService.js";
-import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
-import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
-import CachedEmailService from "../../../../../server/smtp/services/CachedEmailService.js";
-import { Base36 } from "../../../../../common/Base36.js";
-import { toKMBString } from "../../../../../common/NumberFormats.js";
-import { PuppeteerService } from "../../../../../server/services/puppeteer/PuppeteerService.js";
-import TempFileService from "../../../../../server/storage/TempFileService.js";
-
-/**
- * Social Buttons URL Pattern
- *
- * /social-mail/social/buttons/{method}/{selector}/{emailID}/{activityID}
- *
- * method: can be track or any unicode emoji that will be considered as an engagement.
- *
- * selector: unique selector button that will be converted to PNG
- *
- * emailID: email id of the email, Base36 encoded.
- *
- * activityID: activity id of subscription activity to track activity/engagement of specific subscriber.
- *      We are not going to use subscriberID as each activityID will be unique and it will be new for
- *      new email.
- */
-export default class SocialButtonPage extends Page {
-
-    @Inject
-    private cacheService: CacheService;
-
-    @Inject
-    private cachedEmailService: CachedEmailService;
-
-    @Inject
-    private db: SocialMailContext;
-
-    async run() {
-
-        const [method, selector, emailIDEncoded, activityID] = this.childPath;
-
-        let emailID = emailIDEncoded;
-
-        if (!/^\$/.test(emailID)) {
-            emailID = Base36.decode(emailID, false);
-        }
-
-        const key = `buttons/${method}/${emailID}`;
-
-        /**
-         * why do we need to cache this?
-         *
-         * It is to avoid putting load on puppeteer service.
-         * As rendering html to png will require significant cpu and network
-         * resources, as styles can reference any external images.
-         */
-
-        // const file = await this.cacheService.get({
-        //     key, factory: () => this.createImage(method, selector, emailID, activityID),
-        //     ttl: TimeSpan.fromSeconds(8600)
-        // });
-
-        const file = await this.createImage(method, selector, emailID, activityID);
-
-        this.cacheControl = "public, max-age=8600";
-
-        return new TempFileResult(file, {});
-    }
-
-    async createImage(method: string, selector, emailID, activityID) {
-        const db = ServiceProvider.resolve(this, SocialMailContext);
-        const puppeteerService = ServiceProvider.resolve(this, PuppeteerService);
-        const tempFileService = ServiceProvider.resolve(this, TempFileService);
-
-        let count: string;
-
-        if (method === "track") {
-            count = await this.track(emailID, activityID);
-        } else {
-            const engagement = decodeURIComponent(method);
-            // console.log(`Search for engagement ${engagement} in ${emailID}`);
-            const ec = await this.db.emailEngagements
-                .where({ emailID, engagement }, (p) => (x) => x.emailID === p.emailID && x.engagement === p.engagement)
-                .first();
-
-            if (ec?.count) {
-                count = toKMBString(ec.count);
-            }
-        }
-
-        count ??= "";
-
-        const html = await this.cachedEmailService.getHtml(emailID);
-
-        const png = await tempFileService.createTempFile(".png", "button.png", "image/png");
-        await puppeteerService.htmlToPng(await html.readAsText(), { selector, outputFile: png.path, count });
-        return png;
-    }
-
-    async track(emailID: any, activityID: any) {
-
-        const ep = { emailID };
-        const isValidActivityID = !/^\$/.test(activityID);
-        if (isValidActivityID) {
-            const activity = await this.db.subscriberActivities
-            .where({
-                activityID: Base36.decode(activityID, false) ?? 0,
-                emailID
-            }, (p) => (x) => x.activityID === p.activityID && x.emailID === p.emailID)
-            .first();
-
-            if (activity) {
-                delete activity.activityID;
-                activity.activity = "view";
-                activity.ipAddress = this.request?.remoteIPAddress;
-                await this.db.subscriberActivities.statements.insert(activity);
-
-                await this.db.emails.where(ep, (p) => (x) => x.emailID === p.emailID as any)
-                    .update(ep, (p) => (x) => ({ viewCount: x.viewCount + 1}));
-            }
-        }
+// import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+// import Content, { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
+// import Page from "@entity-access/server-pages/dist/Page.js";
+// import CacheService from "../../../../../server/services/cache/CacheService.js";
+// import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
+// import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
+// import CachedEmailService from "../../../../../server/smtp/services/CachedEmailService.js";
+// import { Base36 } from "../../../../../common/Base36.js";
+// import { toKMBString } from "../../../../../common/NumberFormats.js";
+// import { PuppeteerService } from "../../../../../server/services/puppeteer/PuppeteerService.js";
+// import TempFileService from "../../../../../server/storage/TempFileService.js";
+
+// /**
+//  * Social Buttons URL Pattern
+//  *
+//  * /social-mail/social/buttons/{method}/{selector}/{emailID}/{activityID}
+//  *
+//  * method: can be track or any unicode emoji that will be considered as an engagement.
+//  *
+//  * selector: unique selector button that will be converted to PNG
+//  *
+//  * emailID: email id of the email, Base36 encoded.
+//  *
+//  * activityID: activity id of subscription activity to track activity/engagement of specific subscriber.
+//  *      We are not going to use subscriberID as each activityID will be unique and it will be new for
+//  *      new email.
+//  */
+// export default class SocialButtonPage extends Page {
+
+//     @Inject
+//     private cacheService: CacheService;
+
+//     @Inject
+//     private cachedEmailService: CachedEmailService;
+
+//     @Inject
+//     private db: SocialMailContext;
+
+//     async run() {
+
+//         const [method, selector, emailIDEncoded, activityID] = this.childPath;
+
+//         let emailID = emailIDEncoded;
+
+//         if (!/^\$/.test(emailID)) {
+//             emailID = Base36.decode(emailID, false);
+//         }
+
+//         const key = `buttons/${method}/${emailID}`;
+
+//         /**
+//          * why do we need to cache this?
+//          *
+//          * It is to avoid putting load on puppeteer service.
+//          * As rendering html to png will require significant cpu and network
+//          * resources, as styles can reference any external images.
+//          */
+
+//         // const file = await this.cacheService.get({
+//         //     key, factory: () => this.createImage(method, selector, emailID, activityID),
+//         //     ttl: TimeSpan.fromSeconds(8600)
+//         // });
+
+//         const file = await this.createImage(method, selector, emailID, activityID);
+
+//         this.cacheControl = "public, max-age=8600";
+
+//         return new TempFileResult(file, {});
+//     }
+
+//     async createImage(method: string, selector, emailID, activityID) {
+//         const db = ServiceProvider.resolve(this, SocialMailContext);
+//         const puppeteerService = ServiceProvider.resolve(this, PuppeteerService);
+//         const tempFileService = ServiceProvider.resolve(this, TempFileService);
+
+//         let count: string;
+
+//         if (method === "track") {
+//             count = await this.track(emailID, activityID);
+//         } else {
+//             const engagement = decodeURIComponent(method);
+//             // console.log(`Search for engagement ${engagement} in ${emailID}`);
+//             const ec = await this.db.emailEngagements
+//                 .where({ emailID, engagement }, (p) => (x) => x.emailID === p.emailID && x.engagement === p.engagement)
+//                 .first();
+
+//             if (ec?.count) {
+//                 count = toKMBString(ec.count);
+//             }
+//         }
+
+//         count ??= "";
+
+//         const html = await this.cachedEmailService.getHtml(emailID);
+
+//         const png = await tempFileService.createTempFile(".png", "button.png", "image/png");
+//         await puppeteerService.htmlToPng(await html.readAsText(), { selector, outputFile: png.path, count });
+//         return png;
+//     }
+
+//     async track(emailID: any, activityID: any) {
+
+//         const ep = { emailID };
+//         const isValidActivityID = !/^\$/.test(activityID);
+//         if (isValidActivityID) {
+//             const activity = await this.db.subscriberActivities
+//             .where({
+//                 activityID: Base36.decode(activityID, false) ?? 0,
+//                 emailID
+//             }, (p) => (x) => x.activityID === p.activityID && x.emailID === p.emailID)
+//             .first();
+
+//             if (activity) {
+//                 delete activity.activityID;
+//                 activity.activity = "view";
+//                 activity.ipAddress = this.request?.remoteIPAddress;
+//                 await this.db.subscriberActivities.statements.insert(activity);
+
+//                 await this.db.emails.where(ep, (p) => (x) => x.emailID === p.emailID as any)
+//                     .update(ep, (p) => (x) => ({ viewCount: x.viewCount + 1}));
+//             }
+//         }
 
-        const ec = await this.db.emails
-            .where(ep, (p) => (x) => x.emailID === p.emailID as any)
-            .first();
+//         const ec = await this.db.emails
+//             .where(ep, (p) => (x) => x.emailID === p.emailID as any)
+//             .first();
 
-        if (ec?.viewCount) {
-            return toKMBString(ec.viewCount);
-        }
-    }
+//         if (ec?.viewCount) {
+//             return toKMBString(ec.viewCount);
+//         }
+//     }
 
-}
+// }