@social-mail/social-mail-web-server 1.5.97 → 1.5.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.5.97",
+  "version": "1.5.99",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.609.0",
     "@azure/storage-blob": "^12.25.0",
-    "@entity-access/entity-access": "^1.0.360",
+    "@entity-access/entity-access": "^1.0.364",
     "@entity-access/server-pages": "^1.1.292",
     "@otplib/preset-v11": "^12.0.1",
     "@social-mail/noto-emoji-svg": "^2.0.42",

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

@@ -133,6 +133,9 @@ export class Email {
     @Column({ dataType: "Int", default: () => 0})
     public viewCount: number;
 
+    @Column({ dataType: "Int", default: () => 0})
+    public engagementCount: number;
+
     @Column({ dataType: "BigInt", nullable: true })
     @RelateTo({
         type: () => EmailLog,

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

@@ -12,7 +12,11 @@ export default class EmailEngagement {
     @Column({ dataType: "BigInt", key: true, order: 1})
     @RelateTo(Email, {
         property: (x) => x.email,
-        inverseProperty: (x) => x.engagements
+        inverseProperty: (x) => x.engagements,
+        foreignKeyConstraint: {
+            name: "FC_Email_Engagements",
+            cascade: "delete"
+        }
     })
     public emailID: number;
 

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

@@ -10,7 +10,11 @@ export default class EmailTag {
     @Column({key: true,  dataType: "BigInt", order : 1})
     @RelateTo(Email, {
         property: (et) => et.email,
-        inverseProperty: (e) => e.emailTags
+        inverseProperty: (e) => e.emailTags,
+        foreignKeyConstraint: {
+            name: "FC_Email_Tags",
+            cascade: "delete"
+        }
     })
     public emailID: number;
 

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

@@ -35,11 +35,11 @@ export default class LoginSession {
 
     @Column({})
     @IgnoreJsonProperty
-    public start: Date;
+    public start: DateTime;
 
     @Column({})
     @IgnoreJsonProperty
-    public expiry: Date;
+    public expiry: DateTime;
 
     @Column({})
     public invalid: boolean;

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

@@ -3,8 +3,25 @@ import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js
 import Table from "@entity-access/entity-access/dist/decorators/Table.js";
 import { Email } from "./Email.js";
 import Mailbox from "./Mailbox.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import Index from "@entity-access/entity-access/dist/decorators/Index.js";
 
 @Table("MailboxEmails")
+@Index({
+    name: "IX_Mailbox_Email_Engagement_Count",
+    columns: [
+        { name: (x) => x.dateUpdated, descending: true },
+        { name: (x) => x.engagementCount, descending: true  },
+    ],
+    filter: (x) => x.dateUpdated !== null
+})
+@Index({
+    name: "IX_Mailbox_Email_Published",
+    columns: [
+        { name: (x) => x.datePublished, descending: true  },
+    ],
+    filter: (x) => x.datePublished !== null
+})
 export default class MailboxEmail {
 
     @Column({ dataType: "BigInt", key: true, order: 1 })
@@ -29,6 +46,24 @@ export default class MailboxEmail {
 
     email: Email;
 
+    /**
+     * Forwarded from email for caching, only for channels
+     */
+    @Column({ dataType: "Int", default: () => 0})
+    engagementCount: number;
+
+    /**
+     * Forwarded from email for caching, only for channels
+     */
+    @Column({ dataType: "DateTime", nullable: true})
+    dateUpdated: DateTime;
+
+    /**
+     * Forwarded from email for caching, only for channels
+     */
+    @Column({ dataType: "DateTime", nullable: true})
+    datePublished: DateTime;
+
     mailbox: Mailbox;
 
 }

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

@@ -180,6 +180,9 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
         await this.db.appFiles.asQuery()
             .delete(entity, (p) => (x) => x.emailID === p.emailID && x.parentID === null);
 
+        await this.db.emailEngagements.asQuery()
+            .delete(entity, (p) => (x) => x.emailID === p.emailID);
+
         await this.db.mailboxEmails
             .asQuery()
             .delete(entity, (p) => (x) => x.emailID === p.emailID);
@@ -205,8 +208,19 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
         return this.updateScheduleAndReferences(entity);
     }
 
-    afterUpdate(entity: Email, entry: ChangeEntry<Email>) {
-        return this.updateScheduleAndReferences(entity);
+    async afterUpdate(entity: Email, entry: ChangeEntry<Email>) {
+        if (entry.isUpdated("status")) {
+            switch(entity.status) {
+                case "published":
+                    await this.db.mailboxEmails.where(entity, (p) => (x) => x.emailID === p.emailID)
+                        .update(entity, (p) => (x) => ({ datePublished: Sql.cast.asDateTime(p.dateSent) as any }));
+                    break;
+                default:
+                    await this.db.mailboxEmails.where(entity, (p) => (x) => x.emailID === p.emailID)
+                        .update(void 0, (p) => (x) => ({ datePublished: Sql.cast.asDateTime(null) as any }));
+            }
+        }
+        await this.updateScheduleAndReferences(entity);
     }
 
     includeFilter(query: IEntityQuery<Email>, type?: any, key?: string): IEntityQuery<Email> {

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

@@ -95,8 +95,8 @@ export default class LoginSessionEvents extends EntityEvents<LoginSession> {
                     && x.expires >= p.now)
                 .firstOrFail();
             entity.userID = user.userID;
-            entity.start = now.asJSDate;
-            entity.expiry = now.addDays(30).asJSDate;
+            entity.start = now;
+            entity.expiry = now.addDays(30);
             entity.dateUpdated = now;
             entity.invalid = false;
             entity.status = "created";
@@ -120,8 +120,8 @@ export default class LoginSessionEvents extends EntityEvents<LoginSession> {
             }
         }
         entity.userID = user.userID;
-        entity.start = now.asJSDate;
-        entity.expiry = now.addDays(30).asJSDate;
+        entity.start = now;
+        entity.expiry = now.addDays(30);
         entity.dateUpdated = now;
         entity.invalid = false;
         entity.status = "created";
@@ -165,7 +165,7 @@ export default class LoginSessionEvents extends EntityEvents<LoginSession> {
             await this.sessionUser.setAuthCookie({
                 userID: entity.userID,
                 id: entity.sessionID,
-                expiry: entity.expiry,
+                expiry: entity.expiry.asJSDate,
                 version: "1.1",
                 active: false
             });
@@ -176,7 +176,7 @@ export default class LoginSessionEvents extends EntityEvents<LoginSession> {
         await this.sessionUser.setAuthCookie({
             userID: entity.userID,
             id: entity.sessionID,
-            expiry: entity.expiry,
+            expiry: entity.expiry.asJSDate,
             version: "1.1",
             active: true
         });
@@ -304,7 +304,7 @@ export default class LoginSessionEvents extends EntityEvents<LoginSession> {
             await this.sessionUser.setAuthCookie({
                 userID: entity.userID,
                 id: entity.sessionID,
-                expiry: entity.expiry,
+                expiry: entity.expiry.asJSDate,
                 version: "1.1",
                 active: true
             });

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

@@ -2,6 +2,12 @@ import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeE
 import MailboxEmail from "../entities/MailboxEmail.js";
 import AuthenticatedEvents from "./AuthenticatedEvents.js";
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
+import { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
+import WebSiteChannelService from "../../smtp/services/WebSiteChannelService.js";
+import Page from "@entity-access/server-pages/dist/Page.js";
+import SocialMailContext from "../SocialMailContext.js";
 
 export default class MailboxEmailEvents extends AuthenticatedEvents<MailboxEmail> {
 
@@ -19,6 +25,23 @@ export default class MailboxEmailEvents extends AuthenticatedEvents<MailboxEmail
             || x.mailbox.domain.hostedDomain.domainUsers.some((d) => d.userID === p.userID));
     }
 
+    @ExternalQuery
+    async channelEmails(channelID) {
+        // get current host
+        const page = ServiceProvider.resolve(this, Page as any) as Page;
+        const host = page.request.host;
+
+        const wcs = ServiceProvider.resolve(this, WebSiteChannelService);
+        const mailboxes = await wcs.getMailboxes(host);
+
+        const db = ServiceProvider.resolve(this, SocialMailContext);
+
+        const q = db.mailboxEmails.where({ channelID, host, mailboxes}, (p) => (x) =>
+            x.datePublished !== null
+            && Sql.in(x.mailboxID, p.mailboxes));
+        return q.limit(25);
+    }
+
     beforeInsert(entity: MailboxEmail, entry: ChangeEntry<MailboxEmail>) {
         if (this.verify) {
             this.sessionUser.ensureLoggedIn();

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

@@ -17,6 +17,7 @@ import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js"
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import SyncMailboxWorkflow from "../../workflows/sync/SyncMailboxWorkflow.js";
 import TagService from "../../services/tags/TagService.js";
+import WebSiteChannelService from "../../smtp/services/WebSiteChannelService.js";
 
 export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
 
@@ -45,8 +46,12 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
         const page = ServiceProvider.resolve(this, Page as any) as Page;
         const host = page.request.host;
 
-        let q = this.db.mailboxes.where(void 0, (p) => (x) => x.isChannel === true && x.isPrivateChannel === false);
-        q = q.where({ host }, (p) => (x) => x.websiteChannels.some((c) => c.website.hosts.some((h) => h.host === p.host)));
+        const wcs = ServiceProvider.resolve(this, WebSiteChannelService);
+
+        const mailboxes = await wcs.getMailboxes(host);
+
+        let q = this.db.mailboxes.where({ mailboxes }, (p) => (x) => Sql.in(x.mailboxID, p.mailboxes) );
+
         if (text) {
             text = text.toLocaleLowerCase();
             if (text.startsWith("@")) {

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

@@ -218,7 +218,7 @@ export default class UserEvents extends AuthenticatedEvents<User> {
     async afterUpdate(entity: User, entry: ChangeEntry<User>) {
         if (entry.isUpdated("status")) {
             if (entity.status === "blocked") {
-                const now = new Date();
+                const now = DateTime.now;
                 const { userID } = entity;
 
                 await this.db.loginSessions.where({ userID, now}, (p) => (x) => x.userID === p.userID

package/src/server/services/UserInfoProvider.ts

@@ -30,7 +30,7 @@ export default class UserSessionProvider extends USP {
             userID,
             sessionID,
             userName: session.user.userName,
-            expiry: session.expiry,
+            expiry: session.expiry.asJSDate,
             roles: session.user.roles?.map((x) => x.roleName) ?? [],
             fileAccessList: session.user.fileAccessList?.map(({ type, file: { path }}) => ({ type, path })),
             invalid: false

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

@@ -187,8 +187,19 @@ export default class EngagementService {
 
         const ea = { emailID, engagement };
 
+        if (email.status === "published") {
+            await this.db.mailboxEmails.where(ea, (p) => (x) => x.emailID === p.emailID)
+            .update(void 0, (p) => (x) => ({
+                engagementCount: x.engagementCount + 1,
+                dateUpdated: Sql.date.now()
+            }));
+        }
+
         await this.db.emails.where(ea, (p) => (x) => x.emailID === p.emailID)
-            .update(void 0, (p) => (x) => ({ dateUpdated: Sql.date.now()}));
+            .update(void 0, (p) => (x) => ({
+                engagementCount: x.engagementCount + 1,
+                dateUpdated: Sql.date.now()
+            }));
 
         const r = await this.db.emailEngagements.where(ea, (p) => (x) => x.emailID === p.emailID && x.engagement === p.engagement)
             .update(void 0, (p) => (x) => ({ count: x.count + 1}));

package/src/server/workflows/SocialWorkflowContext.ts

@@ -33,6 +33,7 @@ import RepairMailboxFoldersWorkflow from "./repair/mailbox-folders/RepairMailbox
 import DispatchNotificationToMX from "./smtp/DispatchNotificationToMX.js";
 import RepairCacheClearWorkflow from "./repair/cache/RepairCacheClearWorkflow.js";
 import RepairEmailNameTagsWorkflow from "./repair/tags/RepairEmailNameTagsWorkflow.js";
+import RepairChannelEmailCountsWorkflow from "./repair/channel/RepairChannelEmailCountsWorkflow.js";
 
 @RegisterSingleton
 export default class SocialWorkflowContext extends WorkflowContext {
@@ -66,6 +67,7 @@ export default class SocialWorkflowContext extends WorkflowContext {
         this.register(RepairStoreTagsWorkflow);
         this.register(RepairCacheClearWorkflow);
         this.register(RepairEmailNameTagsWorkflow);
+        this.register(RepairChannelEmailCountsWorkflow);
         // this.register(MigrateEmailFilesWorkflow);
         this.register(CleanupDeletedFilesWorkflow);
 

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

@@ -85,7 +85,13 @@ export default class BroadcastEmail extends Workflow<IBroadcastEmail> {
             .update(void 0, (p) => (x) => ({ status: "published"}));
 
         await db.mailboxes.where(this.input, (p) => (x) => x.mailboxID === p.mailboxID)
-            .update(void 0, (p) => (x) => ({ datePublished: Sql.date.now()}));
+            .update(void 0, (p) => (x) => ({ datePublished: Sql.cast.asDateTime(Sql.date.now()) }));
+
+        await db.mailboxEmails.where(this.input, (p) => (x) => x.emailID === p.emailID && x.mailboxID === p.mailboxID)
+            .update(void 0, (p) => (x) => ({
+                dateUpdated: Sql.cast.asDateTime(Sql.date.now()),
+                datePublished: Sql.cast.asDateTime(Sql.date.now())
+            }));
 
         // load email..
         const from = (await eas.getEmailAddress(this.input.mailboxID)).emailAddress;

package/src/server/workflows/daily/DailyWorkflow.ts

@@ -72,7 +72,7 @@ export default class DailyWorkflow extends Workflow<any,any> {
 
         // deactivate all expired sessions...
         await db.loginSessions
-            .where(void 0, (p) => (x) => x.expiry <= (Sql.date.now() as any as Date))
+            .where(void 0, (p) => (x) => x.expiry <= (Sql.date.now()))
             .limit(1000)
             .update(void 0, (p) => (x) => ({ invalid: true }));
 

package/src/server/workflows/repair/channel/RepairChannelEmailCountsWorkflow.ts

@@ -0,0 +1,49 @@
+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 Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+
+export default class RepairChannelEmailCountsWorkflow extends Workflow {
+
+    static taskGroup = "batch";
+
+    async run() {
+        let start = 0;
+        do{
+            start = await this.fixEmailTags(start);
+        } while(BigInt(start));
+    }
+
+    @UniqueActivity
+    async fixEmailTags(
+        start: number,
+        @Inject db?: SocialMailContext
+    ) {
+
+        for(let i = 0;i< 100;i++) {
+            const mailboxes = await db.mailboxes.where({ start }, (p) => (x) => x.mailboxID > p.start && x.isChannel === true)
+                .orderBy(void 0, (p) => (x) => x.mailboxID)
+                .limit(10)
+                .include((x) => [x.folders])
+                .toArray();
+
+            if (!mailboxes.length) {
+                return 0;
+            }
+
+            for (const iterator of mailboxes) {
+                start = iterator.mailboxID;
+
+                await db.mailboxEmails.where(iterator, (p) => (x) => x.mailboxID === p.mailboxID)
+                    .update(void 0, (p) => (x) => ({
+                        datePublished: Sql.cast.asDateTime( x.email.status === "published" ? x.email.dateSent : null ) as any,
+                        dateUpdated: Sql.cast.asDateTime( x.email.status === "published" ? x.email.dateUpdated : null ) as any,
+                        engagementCount: Sql.cast.asInteger( x.email.status === "published" ? x.email.engagementCount : 0 ) as any
+                    }));
+
+            }
+            db.changeSet.clear();
+        }
+        return start;
+    }
+}