@social-mail/social-mail-web-server 1.7.412 → 1.7.415

package/package.json

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

package/src/server/seed/ui/seed-ui.ts

@@ -5,13 +5,13 @@ export default async function seedUI(config: DBConfig) {
     await config.saveVersion(UIPackageConfig, {
         package: "@social-mail/social-mail-client",
         view: "dist/web/AppIndex",
-        version: "1.5.32"
+        version: "1.5.33"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {
         package: "@social-mail/web-components",
         view: "dist/index.js",
-        version: "1.0.200"
+        version: "1.0.201"
     });
 
     await config.saveVersion(FAFreePackageConfig, {

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

@@ -17,6 +17,7 @@ import EmailThreadService from "../../services/threads/EmailThreadService.js";
 import ChannelModerationService from "../../services/channels/ChannelModerationService.js";
 import Mailbox from "../../model/entities/Mailbox.js";
 import UpdatePendingModerationCountWorkflow from "../../workflows/channel/moderation/UpdatePendingModerationCountWorkflow.js";
+import SendLibraryContentWorkflow from "../../workflows/channel/library/SendLibraryContentWorkflow.js";
 
 @RegisterScoped
 export default class EmailPostReceiveService {
@@ -146,6 +147,16 @@ export default class EmailPostReceiveService {
                     await this.ets.unsubscribe(senderID, emailID);
                     return;
                 case "➕":
+
+                    if(channel.isLibrary) {
+                        // send all...
+                        await SendLibraryContentWorkflow.broadcast(this.context, {
+                            channelID: channel.mailboxID,
+                            from: channel.emailAddress.emailAddress,
+                            recipientID: senderID
+                        });
+                    }
+
                     await BroadcastEmail.broadcast(this.context, {
                         mailboxID: recipientID,
                         emailID,

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

@@ -426,6 +426,12 @@ export default class EmailSerializerService {
 
                 if (mailbox.isChannel) {
 
+                    if (!engagement) {
+                        if(subject.startsWith("subscribe")) {
+                            engagement = "➕";
+                        }
+                    }
+
                     // if it is engagement...
                     if (!/^(➕-)?subscribe/ui.test(subject)) {
 

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

@@ -10,7 +10,6 @@ import TempFileService from "../../storage/TempFileService.js";
 import { AddressObject, ParsedMail, simpleParser } from "mailparser";
 import { authenticate } from "mailauth";
 import EmailAddressService from "../../services/EmailAddressService.js";
-import WorkflowContext from "../../workflows/SocialWorkflowContext.js";
 import { SmtpStatusCodes } from "../client/SmtpStatusCodes.js";
 import { isTestMode } from "../../../globalServices.js";
 import EmailSerializerService from "./EmailSerializerService.js";
@@ -18,11 +17,8 @@ import ChannelService from "./ChannelService.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import sleep from "../../../common/sleep.js";
-import EmailAddress from "../../model/entities/EmailAddress.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { serverActivities } from "../../model/entities/ServerActivity.js";
-import AccessTokenService from "./AccessTokenService.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import TagService from "../../services/tags/TagService.js";
 import DomainReputationService from "./DomainReputationService.js";
@@ -84,9 +80,6 @@ export default class MailReceiverService {
     @Inject
     private db: SocialMailContext;
 
-    @Inject
-    private storage: BaseStorage;
-
     @Inject
     private tempFileService: TempFileService;
 

package/src/server/workflows/SocialWorkflowContext.ts

@@ -51,6 +51,7 @@ import DeleteMailboxContactWorkflow from "./mailbox/DeleteMailboxContactWorkflow
 import DownloadExternalAttachmentWorkflow from "./external-body/DownloadExternalAttachmentWorkflow.js";
 import FetchCheckoutResultWorkflow from "./store/FetchCheckoutResultWorkflow.js";
 import DeleteWebSiteVersionWorkflow from "./web-site/DeleteWebSiteVersionWorkflow.js";
+import SendLibraryContentWorkflow from "./channel/library/SendLibraryContentWorkflow.js";
 
 @RegisterSingleton
 export default class SocialWorkflowContext extends WorkflowContext {
@@ -113,6 +114,7 @@ export default class SocialWorkflowContext extends WorkflowContext {
         this.register(DownloadExternalAttachmentWorkflow);
 
         this.register(FetchCheckoutResultWorkflow);
+        this.register(SendLibraryContentWorkflow);
 
         // start processing...
         // this.start().catch((error) => console.error(error));

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

@@ -211,6 +211,7 @@ export default class BroadcastEmail extends Workflow<IBroadcastEmail> {
 
         return db.mailboxContacts.where(input, (p) => (x) => x.mailboxID === p.mailboxID
             && x.emailAddressID !== p.mailboxID
+            && x.emailAddressID !== p.senderID
             && !x.emailAddress.subscriberActivities.some((sa) => sa.emailID === p.emailID)
             && x.status === "active"
             && (x.subscriptionType === null

package/src/server/workflows/channel/library/SendLibraryContentWorkflow.ts

@@ -0,0 +1,105 @@
+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 { randomUUID } from "node:crypto";
+import DispatchEmailToMX from "../../smtp/DispatchEmailToMX.js";
+import BroadcastEmail from "../BroadcastEmail.js";
+import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
+
+export interface ISendLibraryContentWorkflowParams {
+    channelID, recipientID, from: string;
+}
+
+export default class SendLibraryContentWorkflow extends Workflow<ISendLibraryContentWorkflowParams> {
+
+    static taskGroup = "batch";
+
+    static broadcast(context: WorkflowContext, input: ISendLibraryContentWorkflowParams ) {
+        return context.queue(SendLibraryContentWorkflow, input, {
+            id: `library-broadcast-${input.channelID}-${input.recipientID}`,
+        });
+    }
+
+    async run() {
+        let start = BigInt(0);
+        for(;;) {
+            start = await this.send(start);
+            if (!BigInt(start)) {
+                break;
+            }
+        }
+    }
+
+    @UniqueActivity
+    async send(
+        start,
+        db?: SocialMailContext
+    ) {
+
+        const { channelID, recipientID } = this.input;
+
+        const list = await db.channelEmails.where({ channelID, start, recipientID }, (p) => (x) => x.mailboxID === p.channelID
+            && x.emailID > p.start
+            && x.datePublished !== null
+            && x.email.status === "published"
+            && !x.email.subscriberActivities.some((e) => e.emailAddressID === p.recipientID)
+            )
+            .orderBy(void 0, (p) => (x) => x.emailID)
+            .limit(100)
+            .include((x) => x.email.senderEmail)
+            .toArray();
+
+        if(!list.length) {
+            return 0;
+        }
+
+        let eta = this.currentTime;
+
+        const emailAddressID = recipientID;
+        const { from } = this.input;
+
+        for (const { email: { emailID, dateCreated, senderID, senderEmail: { emailAddress: to } } } of list) {
+            const accessCode = randomUUID().replaceAll("-", "");
+
+            await using tx = await db.connection.createTransaction();
+            const activity = await db.subscriberActivities.statements.insert({
+                activity: "scheduled",
+                emailID,
+                emailAddressID,
+                mailboxID: channelID,
+                accessCode,
+                dateCreated
+            });
+            const host = to.split("@").pop();
+
+            const { activityID } = activity;
+
+            await this.context.queue(DispatchEmailToMX, {
+                recipientAddressID: emailAddressID,
+                emailID,
+                senderID,
+                external: false,
+                doNotSendDR: true,
+                saveHeadersOnly: true,
+                activityID,
+                accessCode,
+                from,
+                to: [to],
+                modifyTo: true,
+                listID: senderID,
+                host,
+            }, {
+                id: `bulk-dispatch-to-mx-${activityID}`,
+                eta,
+                taskGroup: BroadcastEmail.taskGroup
+            });
+            await tx.commit();
+            eta = eta.addSeconds(15);
+
+            db.changeSet.clear();
+        }
+
+        return start;
+    }
+
+}