@social-mail/social-mail-web-server 1.7.199 → 1.7.201

package/package.json

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

package/src/common/BaseDiskCache.ts

@@ -18,23 +18,27 @@ export default class BaseDiskCache {
     protected readonly keepTTLSeconds: number;
     protected readonly minSize: number;
     protected readonly updateAccessTime: boolean;
+    protected readonly maxAge: number;
     constructor(
         {
             root,
             keepTTLSeconds = 3600,
             minSize = Number.MAX_SAFE_INTEGER,
-            updateAccessTime = true
+            updateAccessTime = true,
+            maxAge = 1
         }: {
             root: string;
             keepTTLSeconds?: number;
             minSize?: number;
             updateAccessTime?: boolean;
+            maxAge?: number;
         }
     ) {
         this.root = root;
         this.keepTTLSeconds = keepTTLSeconds;
         this.minSize = minSize;
         this.updateAccessTime = updateAccessTime;
+        this.maxAge = maxAge;
         ensureDir(root);
         // eslint-disable-next-line no-console
         setTimeout(() => this.clean().catch(console.error), 1000);
@@ -130,13 +134,13 @@ export default class BaseDiskCache {
 
         let total = 0;
 
-        for(let i=7;i>0;i--) {
+        for(let i=this.maxAge;i>0;i--) {
             const s = await fsp.statfs(this.root);
             const freeSize = s.bavail * s.bsize;
 
             if (freeSize < this.minSize) {
                 try {
-                    const keep = Date.now() - this.keepTTLSeconds * i;
+                    const keep = Date.now() - this.keepTTLSeconds * 1000 * i;
                     const files = await this.getFilesToDelete(keep);
 
                     for (const file of files) {

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

@@ -7,23 +7,20 @@ import SocialMailContext from "../SocialMailContext.js";
 import EmailAddressService from "../../services/EmailAddressService.js";
 import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events/EntityEvents.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
-import { ignoreFK } from "./UserMailboxEvents.js";
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
 import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQuery.js";
 import ExternalInvoke from "@entity-access/server-pages/dist/decorators/ExternalInvoke.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
-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";
 import ChannelEmail from "../entities/ChannelEmail.js";
 import MailboxTag from "../entities/MailboxTag.js";
 import MailboxContactEvent from "../entities/MailboxContactEvent.js";
 import ScopeVars from "../../../common/ScopeVars.js";
-import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
 import MailboxFolderService from "../../services/mailboxes/MailboxFolderService.js";
+import MailService from "../../services/emails/MailService.js";
 
 export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
 
@@ -218,6 +215,9 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
     }
 
     async afterInsert(entity: Mailbox) {
+
+        const ea = await this.emailAddressService.getEmailAddress(entity.mailboxID);
+
         this.emailAddressService.cache?.clear("getHostedMailbox");
         this.emailAddressService.cache?.clear("getHostedMailboxID");
 
@@ -235,6 +235,15 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
         }
 
         await this.updateFolders(entity);
+        // const ms = ServiceProvider.resolve(this, MailService);
+        // await ms.sendNotificationEmail(`welcome-${entity.mailboxID}`, {
+        //     from: "social@esocialmail.com",
+        //     fromName: "Social Mail",
+        //     subject: "Welcome to Social Mail",
+        //     textBody: "",
+        //     to: ea.emailAddress,
+        //     htmlBody: ""
+        // });
         return this.updateIndex(entity);
     }
 

package/src/server/services/cache/DiskCacheService.ts

@@ -6,7 +6,6 @@ import { link } from "node:fs/promises";
 import FileSize from "../../../common/FileSize.js";
 import ensureDir from "../../../common/FileApi.js";
 import { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
-import { unlinkSync } from "fs";
 import { randomUUID } from "crypto";
 import BaseDiskCache from "../../../common/BaseDiskCache.js";
 
@@ -18,9 +17,6 @@ ensureDir(serverCache);
 const tempSize = FileSize.parse(globalEnv.tmpSize);
 const minSize = tempSize / 2;
 
-const doNothing = () => void 0;
-
-
 @RegisterSingleton
 export default class DiskCacheService extends BaseDiskCache {
 
@@ -28,14 +24,16 @@ export default class DiskCacheService extends BaseDiskCache {
 
     constructor() {
         super({
-            root: join(cacheRoot),
+            root: join(cacheRoot, "fc"),
             keepTTLSeconds: 86400,
-            minSize
+            minSize,
+            maxAge:7
         });
 
         this.tmp = new BaseDiskCache({
             root: join(cacheRoot, "tmp"),
-            keepTTLSeconds: 60*60
+            keepTTLSeconds: 60*60,
+            maxAge: 7
         });
     }
 

package/src/server/services/captcha/CaptchaService.ts

@@ -4,16 +4,20 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
 import ensureDir from "../../../common/FileApi.js";
 import { spawnPromise } from "../../../common/spawnPromise.js";
 import TempFileService from "../../storage/TempFileService.js";
-import DiskCacheService from "../cache/DiskCacheService.js";
-import EncryptionService from "../encryption/EncryptionService.js";
 import { IVerification } from "./IVerification.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import { randomUUID } from "crypto";
+import BaseDiskCache from "../../../common/BaseDiskCache.js";
+import { globalEnv } from "../../../common/globalEnv.js";
+import FileSize from "../../../common/FileSize.js";
 
 const captchaCache = "/cache/captcha";
-
 ensureDir(captchaCache);
 
+const tempSize = FileSize.parse(globalEnv.tmpSize);
+const minSize = tempSize / 2;
+
+
 const zero = '0'.charCodeAt(0);
 
 const filter = "[0]pad=width=750:height=200:x=0:y=0:color=white[v0];"
@@ -30,11 +34,12 @@ const filter = "[0]pad=width=750:height=200:x=0:y=0:color=white[v0];"
 @RegisterScoped
 export default class CaptchaService {
 
-    @Inject
-    private diskCache: DiskCacheService;
-
-    @Inject
-    private encryption: EncryptionService;
+    private diskCache: BaseDiskCache = new BaseDiskCache({
+        root: captchaCache,
+        keepTTLSeconds: 86400,
+        minSize,
+        maxAge: 7
+    }) ;
 
     @Inject
     private db: SocialMailContext;
@@ -76,7 +81,7 @@ export default class CaptchaService {
     }
 
     async getVideo(code: string) {
-        return this.diskCache.getOrCreateAsync("captcha/" + code + ".gif", (cf) => this.prepareVideo(code, cf.path));
+        return this.diskCache.getOrCreateAsync(code + ".gif", (cf) => this.prepareVideo(code, cf.path));
     }
 
     async prepareVideo(code: string, saveAs: string) {

package/src/server/storage/BaseStorage.ts

@@ -106,7 +106,7 @@ export default abstract class BaseStorage {
 
     async downloadFile({ cloudPath, contentHash, compression}: FileContent) {
 
-        return this.diskCache.getOrCreateAsync(path.join("fc", cloudPath), async (cf) => {
+        return this.diskCache.getOrCreateAsync(cloudPath, async (cf) => {
             let { stream } = await this.streamFile(cloudPath);
             if(compression) {
                 switch(compression) {

package/src/server/storage/TempFileService.ts

@@ -86,7 +86,7 @@ export default class TempFileService {
     async downloadCloudFile(cloudPath: string, fileName: string, contentType?: string) {
         try {
 
-            const localFile = await this.diskCache.getOrCreateAsync(path.join("fc", cloudPath), async (cf) => {
+            const localFile = await this.diskCache.getOrCreateAsync(cloudPath, async (cf) => {
                 const { stream } = await this.storage.streamFile(cloudPath);
                 await cf.writeAll(stream);
             } );