@social-mail/social-mail-web-server 1.4.779 → 1.4.781

package/package.json

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

package/src/WebServer.ts

@@ -182,7 +182,7 @@ export default class WebServer {
 
     async seed() {
         await seed();
-        await globalServices.resolve(WorkflowContext).storage.seed();
+        await globalServices.resolve(WorkflowContext).storage.seed(globalEnv.version);
     }
 
     registerRoutes(server: ServerPages) {

package/src/common/globalEnv.ts

@@ -1,5 +1,13 @@
+import { readFileSync } from "node:fs";
 import { availableParallelism } from "node:os";
+import { join } from "node:path";
+import { fileURLToPath } from "node:url";
 
+const packageJsonPath = join(fileURLToPath(import.meta.url), "../../../package.json");
+
+const packageJson = JSON.parse(readFileSync(packageJsonPath , "utf8"));
+
+const { version } = packageJson;
 
 const isTestMode = (process.env.LOGGER_SERVER_TEST_MODE ?? "false") === "true";
 
@@ -10,6 +18,7 @@ if (Number.isNaN(port)) {
 
 export const globalEnv = {
     protocol: void 0,
+    version,
     host: process.env.SOCIAL_MAIL_HOST,
     cdn: process.env.SOCIAL_MAIL_CDN,
     path: process.env.SOCIAL_MAIL_PATH || "/",

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

@@ -19,7 +19,7 @@ import type EmailEngagement from "./EmailEngagement.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import { apiPath } from "../../../common/globalEnv.js";
 
-const emailStatuses = [ "queued", "received", "draft", "published", "pending-approval", "scheduled", "sent", "sent-failed", "deleted"] as const;
+const emailStatuses = [ "queued", "received", "draft", "published", "pending-approval", "scheduled", "sent", "sent-failed", "deleted", "closed"] as const;
 export type emailStatusType = typeof emailStatuses[number];
 
 
@@ -200,8 +200,8 @@ export class Email {
     })
     public forwardedID: number;
 
-    @Column({ dataType: "DateTime", nullable: true })
-    public closed: DateTime;
+    // @Column({ dataType: "DateTime", nullable: true })
+    // public closed: DateTime;
 
     @Column({ dataType: "BigInt" , nullable: true })
     @RelateTo(Email, {

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

@@ -118,6 +118,9 @@ export default class MailboxContact {
     @Column({ dataType: "Boolean", default: () => false})
     public mute: boolean;
 
+    @JsonProperty({})
+    public closeAllConversations: boolean;
+
     /**
      * Used at client end ...
      */

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

@@ -126,6 +126,7 @@ export class User {
 
     // storeOrders: StoreBill[];
     stores: StoreUser[];
+    closedEmails: Email[];
 
     // [GraphService.toGraph]() {
     //     return {

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

@@ -7,6 +7,7 @@ import EmailAddressService from "../../services/EmailAddressService.js";
 import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 import SocialMailContext from "../SocialMailContext.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 
 export default class MailboxContactEvents extends AuthenticatedEvents<MailboxContact> {
 
@@ -26,10 +27,6 @@ export default class MailboxContactEvents extends AuthenticatedEvents<MailboxCon
             || x.mailbox.domain.domainUsers.some((u) => u.userID === p.userID || u.isAdmin === true));
     }
 
-    beforeUpdate(entity: MailboxContact, entry: ChangeEntry<MailboxContact>) {
-        // do nothing...
-    }
-
     async beforeInsert(entity: MailboxContact, entry: ChangeEntry<MailboxContact>) {
         if (this.verify) {
             this.sessionUser.ensureLoggedIn();
@@ -45,12 +42,68 @@ export default class MailboxContactEvents extends AuthenticatedEvents<MailboxCon
         }
     }
 
-    async afterUpdate(entity: MailboxContact, entry: ChangeEntry<MailboxContact>) {
+    async beforeUpdate(entity: MailboxContact, entry: ChangeEntry<MailboxContact>) {
         // if blocked was changed
         const { mailboxID, blocked, autoClose, emailAddressID, openThreads } = entity;
 
         const db = ServiceProvider.resolve(this, SocialMailContext);
-        if (entry.isUpdated("autoClose") || entry.isUpdated("blocked")) {
+        if (entity.closeAllConversations) {
+
+            // we will simply put a dummy email
+            // with userID set to current userid
+            // and set it as lastReplyID
+
+            // check if there are any open threads..
+            if (entity.openThreads) {
+
+                const dateCreated = DateTime.now;
+                const dateSent = dateCreated;
+                const dateUpdated = dateCreated;
+
+                const email = await db.emails.statements.insert({
+                    subject: "Thread Closed",
+                    textBody: "",
+                    htmlBody: "",
+                    senderID: mailboxID,
+                    userID: this.sessionUser.userID,
+                    dateCreated,
+                    dateSent,
+                    dateUpdated,
+                    status: "closed"
+                });
+
+                const { emailID } = email;
+                await db.mailboxContactEmails.statements.insert({
+                    emailID,
+                    emailAddressID,
+                    mailboxID,
+                    dateReceived: dateSent,
+                    timeRead: dateSent
+                });
+
+                await db.mailboxEmails.statements.insert({
+                    emailID,
+                    mailboxID
+                });
+
+                await db.emails
+                    .where(entity , (p) => (x) => x.threadContacts.some((t) => t.mailboxID === p.mailboxID
+                        && t.emailAddressID === p.emailAddressID)
+                        && x.threadID === null
+                        && x.lastReplyID === null
+                    )
+                    .update(email, (p) => (x) => ({
+                        lastReplyID: p.emailID
+                    }));
+
+                entity.openThreads = 0;
+
+            }
+
+        }
+
+
+        if (entry.isModified("autoClose") || entry.isModified("blocked")) {
             if (autoClose || blocked) {
 
                 await db.mailboxes.where({ mailboxID }, (p) => (x) => x.mailboxID === p.mailboxID)
@@ -58,11 +111,7 @@ export default class MailboxContactEvents extends AuthenticatedEvents<MailboxCon
                         openThreads: Sql.math.max(0, x.openThreads - Sql.cast.asInteger(p.openThreads)),
                     }));
 
-                await db.mailboxContacts.where(entity, (p) => (x) => x.mailboxID === p.mailboxID
-                    && x.emailAddressID === p.emailAddressID)
-                    .update(void 0, (p) => (x) => ({
-                        openThreads: 0
-                    }));
+                entity.openThreads = 0;
 
             } else {
                 // we need to recalculate
@@ -76,7 +125,8 @@ export default class MailboxContactEvents extends AuthenticatedEvents<MailboxCon
                         totalThreads: 1,
                         openThreads: x.lastReplyID === null ? 1 : 0
                     }));
-                await db.mailboxContacts.statements.update(all, { mailboxID, emailAddressID});
+                entity.openThreads = all.openThreads;
+                entity.totalThreads = all.totalThreads;
             }
         }
 

package/src/server/seed/seed.ts

@@ -17,13 +17,15 @@ export default async function seed() {
         // making sure multiple workers don't interfere
         using fl = await LockFile.lock(`seed-lock-${globalEnv.serverID}.lock`);
 
+        const migrationConfig = { version: globalEnv.version };
+
         const lc = scope.resolve(DbLockContext);
         await lc.connection.ensureDatabase();
-        await lc.connection.automaticMigrations().migrate(lc);
+        await lc.connection.automaticMigrations().migrate(lc, migrationConfig);
 
         const context = scope.resolve(SocialMailContext);
         await context.connection.ensureDatabase();
-        await context.connection.automaticMigrations().migrate(context);
+        await context.connection.automaticMigrations().migrate(context, migrationConfig);
 
 
         context.verifyFilters = false;

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

@@ -121,7 +121,7 @@ export default class EmailReferenceService {
         let newThread = 0;
         let newOpenThread = 0;
 
-        if (thread) {
+        if (thread && !email.hasUnsubscribe) {
             // yes thread exists...
             // and was already open