@social-mail/social-mail-web-server 1.5.415 → 1.5.416

package/dist/wwwroot/routes/@[channel]/[slug]/index.js

@@ -61,13 +61,13 @@ export default class default_1 extends Page {
                 const { meta } = await this.channelPageService.getEmailMeta(host, this.request.URL.toString(), mb.mailboxID, mb.emailID);
                 if (meta?.length) {
                     body = body.replace(/\<head[^\>]*\>/, (s, v) => {
-                        return s + meta.map((x) => x.render()).join("\r\n");
+                        return s + meta.map((x) => x.render()).join("\r\n") + "\r\n";
                     });
                 }
-                body = body.replace(/\<head[^\>]*\>/, (s, v) => {
-                    return s + `<script>var socialMail = ${socialMail};</script>`;
-                });
             }
+            body = body.replace(/\<head[^\>]*\>/, (s, v) => {
+                return s + `\r\n<script>var socialMail = ${socialMail};</script>\r\n`;
+            });
             // const body = await this.channelPageService.modifyPage({
             //     host,
             //     url: this.request.URL.toString(),

package/dist/wwwroot/routes/@[channel]/[slug]/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/wwwroot/routes/@[channel]/[slug]/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/wwwroot/routes/@[channel]/[slug]/index.tsx"],"names":[],"mappings":"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"}

package/dist/wwwroot/routes/api/site/snapshot/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/snapshot/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAU5D;;;;GAIG;AAEH,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,cAAc,CAAiB;IAGvC,OAAO,CAAC,YAAY,CAAe;IAGnC,OAAO,CAAC,WAAW,CAAqB;IAGxC,OAAO,CAAC,GAAG,CAAkB;IAEvB,GAAG;IAwDH,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG;CA+ChD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/snapshot/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAW5D;;;;GAIG;AAEH,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,cAAc,CAAiB;IAGvC,OAAO,CAAC,YAAY,CAAe;IAGnC,OAAO,CAAC,WAAW,CAAqB;IAGxC,OAAO,CAAC,GAAG,CAAkB;IAEvB,GAAG;IAwDH,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG;CA+ChD"}

package/dist/wwwroot/routes/api/site/snapshot/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/snapshot/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/snapshot/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.5.415",
+  "version": "1.5.416",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -21,8 +21,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.609.0",
     "@azure/storage-blob": "^12.25.0",
-    "@entity-access/entity-access": "^1.0.378",
-    "@entity-access/server-pages": "^1.1.332",
+    "@entity-access/entity-access": "^1.0.380",
+    "@entity-access/server-pages": "^1.1.335",
     "@ffmpeg/core-mt": "^0.12.6",
     "@ffmpeg/ffmpeg": "^0.12.10",
     "@ffmpeg/util": "^0.12.1",

package/src/common/Mailto.ts

@@ -0,0 +1,39 @@
+export const Mailto = {
+
+    templateLink({emoji}) {
+        return `mailto:[{senderEmail}]?subject=${emoji}:[{uid}]:[{accessCode}]`;
+    },
+
+    create({
+        subject = "",
+        command = void 0 as {
+            emoji: string,
+            messageID: string,
+            uid?: string,
+        },
+        to = "",
+        body = "",
+        inReplyTo = ""
+    }) {
+        const usp = new URLSearchParams();
+        if (command) {
+            const { emoji, messageID } = command;
+            let { uid =  "0" } = command;
+            if (uid) {
+                uid = uid + ":";
+            }
+            subject = `${emoji}:${uid}${messageID}:${subject}`;
+        }
+        if (subject) {
+            usp.append("subject", subject);
+        }
+        if (body) {
+            usp.append("body", body);
+        }
+        if (inReplyTo) {
+            usp.append("in-reply-to", inReplyTo);
+        }
+        return `mailto:${to}?${usp.toString()}`;
+    }
+
+};

package/src/common/cacheFor.ts

@@ -1,12 +1,34 @@
 /* eslint-disable no-console */
 import TimedCache from "@entity-access/entity-access/dist/common/cache/TimedCache.js";
 
-export function cacheFor() {
-    return function(target, key) {
-        const cacheSymbol = Symbol.for(`cache-for-${key}`);
+
+export class ObjectCache<T> {
+
+    private cache: Map<any, TimedCache> = new Map();
+
+    for(name: keyof T) {
+        let tc = this.cache.get(name);
+        if (!tc) {
+            tc = new TimedCache();
+            this.cache.set(name, tc);
+        }
+        return tc;
+    }
+
+    clear(name: keyof T) {
+        this.cache.get(name)?.clear();
+    }
+};
+
+export interface ICacheContainer<T> {
+    cache: ObjectCache<T> | undefined;
+}
+
+export function cacheFor<T>() {
+    return function(target:ICacheContainer<T>, key) {
         const oldMethod = target[key] as (... a: any[]) => any;
         function value(... a: any[]) {
-            const cache: TimedCache = this[cacheSymbol] ??= new TimedCache();
+            const cache = (this.cache ??= new ObjectCache()).get(key) as TimedCache;
             const cacheKey = a.join();
             const r = cache.getOrCreate(cacheKey, a, (k) => oldMethod.apply(this, a));
             r?.catch((error) => {

package/src/server/model/SocialMailContext.ts

@@ -71,6 +71,7 @@ import StoreCoupon from "./entities/StoreCoupon.js";
 import StoreJournalCoupon from "./entities/StoreJournalCoupon.js";
 import WebHook from "./entities/WebHook.js";
 import WebHookEvent from "./entities/WebHookEvent.js";
+import ThreadParticipant from "./entities/ThreadParticipant.js";
 
 @RegisterScoped
 export default class SocialMailContext extends EntityContext {
@@ -247,6 +248,8 @@ export default class SocialMailContext extends EntityContext {
 
     public emailAddressNames = this.model.register(EmailAddressName);
 
+    public threadParticipants = this.model.register(ThreadParticipant);
+
     public tags = this.model.register(Tag);
 
 }

package/src/server/model/SocialMailContextEvents.ts

@@ -129,6 +129,8 @@ import WebHook from "./entities/WebHook.js";
 import WebHookEvents from "./events/WebHookEvents.js";
 import WebHookEvent from "./entities/WebHookEvent.js";
 import WebHookEventEvents from "./events/WebHookEventEvents.js";
+import ThreadParticipant from "./entities/ThreadParticipant.js";
+import ThreadParticipantEvents from "./events/ThreadParticipantEvents.js";
 
 
 @RegisterSingleton
@@ -219,6 +221,8 @@ export default class SocialMailContextEvents extends ContextEvents {
         this.register(WebHook, WebHookEvents);
         this.register(WebHookEvent, WebHookEventEvents);
 
+        this.register(ThreadParticipant, ThreadParticipantEvents);
+
     }
 
 }

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

@@ -19,6 +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";
 import type MailboxContactEvent from "./MailboxContactEvent.js";
+import type ThreadParticipant from "./ThreadParticipant.js";
 
 const emailStatuses = [ "queued", "received", "draft", "published", "pending-approval", "scheduled", "sent", "sent-failed", "deleted", "closed"] as const;
 export type emailStatusType = typeof emailStatuses[number];
@@ -298,6 +299,7 @@ export class Email {
 
     public engagements: EmailEngagement[];
     mailboxContactEvents: MailboxContactEvent[];
+    threadParticipants: ThreadParticipant[];
 }
 
 @Table("EmailLogs")

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

@@ -11,6 +11,7 @@ import type { ContactEmail } from "./Contact.js";
 import type SubscriberActivity from "./SubscriberActivity.js";
 import type EmailAddressName from "./EmailAddressName.js";
 import type StoreAccountEmail from "./StoreAccountEmail.js";
+import type ThreadParticipant from "./ThreadParticipant.js";
 
 @Table("EmailAddresses")
 @Index({
@@ -54,5 +55,6 @@ export default class EmailAddress {
     public subscriberActivities: SubscriberActivity[];
     names: EmailAddressName[];
     storeAccounts: StoreAccountEmail[];
+    threadParticipants: ThreadParticipant[];
 
 }

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

@@ -6,7 +6,7 @@ import EmailAddress from "./EmailAddress.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { JsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 
-const emailRecipientTypes = [ "from", "to", "cc", "bcc", "viewer", "editor"] as const;
+const emailRecipientTypes = [ "from", "to", "cc", "bcc", "viewer", "editor", "unsubscribed"] as const;
 export type emailRecipientType = typeof emailRecipientTypes[number];
 
 @Table("EmailRecipients")
@@ -33,7 +33,7 @@ export default class EmailRecipient {
     })
     public emailAddressID: number;
 
-    @Column({ dataType: "Char", length: 10, enum: emailRecipientTypes })
+    @Column({ dataType: "Char", length: 20, enum: emailRecipientTypes })
     public type: emailRecipientType;
 
     @Column({ dataType: "Char", length: 200, nullable: true })

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

@@ -156,6 +156,9 @@ export default class Mailbox {
     @Column({ dataType: "Boolean", default: () => true })
     public requiresCommentModeration: boolean;
 
+    @Column({ dataType: "Boolean", default: () => true })
+    public requiresSignup: boolean;
+
     @Column({ dataType: "Int", default: () => 0 })
     public subscriberCount: number;
 

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

@@ -0,0 +1,45 @@
+import Column from "@entity-access/entity-access/dist/decorators/Column.js";
+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 EmailAddress from "./EmailAddress.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
+import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+
+/**
+ * This class is a separate entity instead of using EmailRecipient,
+ * the reason is, for simplicity and faster index.
+ *
+ * 1. As EmailRecipients will be serialized for every email through JSON
+ * 2. Adding filter to remove participants will be extra pressure on database
+ * 3. Thread Participant may only exist at top thread.
+ * 4. Normal email communication will not involve thread participants.
+ * 5. This can further include fields related to Projects and other
+ *    Task Management related data such as assignee etc. Which will make
+ *    EmailRecipient simpler.
+ */
+
+@Table("ThreadParticipants")
+export default class ThreadParticipant {
+
+    @Column({ dataType: "BigInt", key: true})
+    @RelateTo(Email, {
+        property: (x) => x.email,
+        inverseProperty: (x) => x.threadParticipants
+    })
+    emailID: number;
+
+    @Column({ dataType: "BigInt", key: true })
+    @RelateTo(EmailAddress, {
+        property: (x) => x.emailAddress,
+        inverseProperty: (x) => x.threadParticipants
+    })
+    emailAddressID: number;
+
+    @Column({ dataType: "Boolean", default: () => false})
+    unsubscribed: boolean;
+
+    email: Email;
+    emailAddress: EmailAddress;
+
+}

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

@@ -140,16 +140,28 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
 
         // deny changes back to draft... unless email was still in queue...
         const change = entry.getChange("status");
-        if (change?.newValue === "draft" && change.newValue !== change.oldValue) {
+        if (change) {
+
+            if (change.oldValue === "pending-approval") {
+                // check if user is approval
+                if (this.verify) {
+                    this.sessionUser.ensureIsAdmin();
+                    return;
+                }
+                throw new EntityAccessError(`Cannot change status from pending approval`);
+            }
+
+            if (change.newValue === "draft" && change.newValue !== change.oldValue) {
 
-            const dateSent = entry.getChange("dateSent");
-            const isPending = change.oldValue === "scheduled"
-                && dateSent?.oldValue && (DateTime.from(dateSent.oldValue).diff(DateTime.now).totalSeconds > 1);
+                const dateSent = entry.getChange("dateSent");
+                const isPending = change.oldValue === "scheduled"
+                    && dateSent?.oldValue && (DateTime.from(dateSent.oldValue).diff(DateTime.now).totalSeconds > 1);
 
-            if(!isPending) {
-                throw new EntityAccessError(`Status cannot be set to draft from ${change.oldValue}`);
+                if(!isPending) {
+                    throw new EntityAccessError(`Status cannot be set to draft from ${change.oldValue}`);
+                }
+                entity.workflowID = null;
             }
-            entity.workflowID = null;
         }
 
         if (entry.isModified("parentID")) {

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

@@ -199,6 +199,8 @@ export default class MailboxEvents extends AuthenticatedEvents<Mailbox> {
     }
 
     async afterInsert(entity: Mailbox) {
+        this.emailAddressService.cache?.clear("getHostedMailbox");
+        this.emailAddressService.cache?.clear("getHostedMailboxID");
         await this.updateFolders(entity);
         return this.updateIndex(entity);
     }

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

@@ -0,0 +1,27 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
+import ThreadParticipant from "../entities/ThreadParticipant.js";
+import AuthenticatedEvents from "./AuthenticatedEvents.js";
+
+export default class ThreadParticipantEvents extends AuthenticatedEvents<ThreadParticipant> {
+
+    filter(query: IEntityQuery<ThreadParticipant>) {
+        if (!this.verify) {
+            return query;
+        }
+        this.sessionUser.ensureLoggedIn();
+        if (this.sessionUser.isAdmin) {
+            return query;
+        }
+        const { userID } = this.sessionUser;
+        return query.where({ userID }, (p) => (x) =>
+            x.email.mailboxes.some((m) =>
+                m.mailbox.userMailboxes.some((mu) => mu.userID === p.userID)
+                || m.mailbox.domain.hostedDomain.domainUsers.some((du) => du.userID === p.userID && du.isAdmin === true)
+            )
+        );
+    }
+
+    includeFilter(query: IEntityQuery<ThreadParticipant>, type?: any, key?: string) {
+        return query;
+    }
+}

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

@@ -3,7 +3,7 @@ import semver from "semver";
 
 export default async function seedUI(config: DBConfig) {
 
-    const version = "1.2.764";
+    const version = "1.2.770";
 
     const existing = await config.getValue(UIPackageConfig, false);
     if (existing) {

package/src/server/services/EmailAddressService.ts

@@ -3,14 +3,17 @@ import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access
 import SocialMailContext from "../model/SocialMailContext.js";
 import { globalServices } from "../../globalServices.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-import { cacheFor } from "../../common/cacheFor.js";
+import {ICacheContainer, ObjectCache, cacheFor } from "../../common/cacheFor.js";
 import Domain from "../model/entities/Domain.js";
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
 import RepairEmailNameTagsWorkflow from "../workflows/repair/tags/RepairEmailNameTagsWorkflow.js";
 
 
+
 @RegisterSingleton
-export default class EmailAddressService {
+export default class EmailAddressService implements ICacheContainer<EmailAddressService> {
+
+    cache: ObjectCache<EmailAddressService>;
 
     @cacheFor()
     public async getOrCreateDomain(name: string) {
@@ -96,11 +99,11 @@ export default class EmailAddressService {
     }
 
     @cacheFor()
-    public async getHostedMailbox(emailAddress: string) {
-        emailAddress = emailAddress.trim().toLocaleLowerCase();
+    public async getHostedMailbox(mailboxID: number) {
         using scope = globalServices.createScope();
         const db = scope.resolve(SocialMailContext);
-        return await db.mailboxes.where({ emailAddress }, (p) => (x) => x.emailAddress.emailAddress === p.emailAddress)
+        return await db.mailboxes.where({ mailboxID }, (p) => (x) => x.mailboxID === p.mailboxID)
+            .include((x) => x.emailAddress)
             .first();
     }
 

package/src/server/services/StoreFileService.ts

@@ -5,12 +5,15 @@ import AtomicFolderService from "./files/AtomicFolderService.js";
 import { SafeFileName } from "../../common/SafeFileName.js";
 import { Base36 } from "../../common/Base36.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
-import { cacheFor } from "../../common/cacheFor.js";
+import {ICacheContainer, ObjectCache, cacheFor } from "../../common/cacheFor.js";
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
 import UpdateFolderSize from "../workflows/storage/files/UpdateFolderSize.js";
 
+
 @RegisterScoped
-export default class StoreFileService {
+export default class StoreFileService implements ICacheContainer<StoreFileService> {
+
+    cache: ObjectCache<StoreFileService>;
 
     @Inject
     db: SocialMailContext;
@@ -21,6 +24,7 @@ export default class StoreFileService {
     @Inject
     context: WorkflowContext;
 
+
     async changeFolder(item: StoreItem) {
         const folderName = SafeFileName.rename(item.name, `(${Base36.encode(item.storeItemID)})`);
         await this.db.appFiles.statements.update({

package/src/server/services/TemplateExpander.ts

@@ -1,7 +1,7 @@
 export const expandPlaceholders = (text: string, a: Record<string, any>) => {
     const keys = Object.keys(a).map((x) => ({ key: x.toLocaleLowerCase(), value: x }));
     return text.replaceAll(/(\$([^\$\s]{3,50})\$)|(\[\{([^\}\s]{3,50})\}\])/g,(original, g1, gv1, g2, gv2) => {
-        let key = gv1?.toLocaleLowerCase() ?? gv2?.toLocaleLowerCase();
+        let key = gv1?.toLowerCase() ?? gv2?.toLowerCase();
         if (!key) {
             return original;
         }

package/src/server/services/accounts/sales/SalesInvoiceService.ts

@@ -2,13 +2,16 @@ import Inject, { RegisterTransient } from "@entity-access/entity-access/dist/di/
 import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
 import ChartOfAccounts from "../chart-of-accounts/ChartOfAccounts.js";
 import SocialMailContext from "../../../model/SocialMailContext.js";
-import { cacheFor } from "../../../../common/cacheFor.js";
+import {ICacheContainer, ObjectCache, cacheFor } from "../../../../common/cacheFor.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { StoreJournal } from "../../../model/entities/StoreJournal.js";
 import CouponService from "../../coupons/CouponService.js";
 
+
 @RegisterTransient
-export default class SalesInvoiceService {
+export default class SalesInvoiceService implements ICacheContainer<SalesInvoiceService> {
+
+    cache: ObjectCache<SalesInvoiceService>;
 
     @Inject
     chartOfAccounts: ChartOfAccounts;

package/src/server/services/channels/ChannelModerationService.ts

@@ -0,0 +1,27 @@
+import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
+import SocialMailContext from "../../model/SocialMailContext.js";
+import Mailbox from "../../model/entities/Mailbox.js";
+import MailboxContact from "../../model/entities/MailboxContact.js";
+
+@RegisterScoped
+export default class ChannelModerationService {
+
+    @Inject
+    db: SocialMailContext;
+
+    async addToQueue(channel: Mailbox, emailID: any, mc: MailboxContact) {
+        if(!channel.requiresPostModeration) {
+            return false;
+        }
+        if (mc.isOwner) {
+            return false;
+        }
+        await this.db.emails.statements.update({
+            status: "pending-approval"
+        }, {
+            emailID
+        });
+        return true;
+    }
+
+}

package/src/server/services/dom/HtmlSanitizer.ts

@@ -185,10 +185,16 @@ export default class HtmlSanitizer {
 
                 // replace all attributes
                 for (const iterator of e.attributes) {
+                    if (!iterator.nodeValue) {
+                        continue;
+                    }
                     iterator.nodeValue = expandPlaceholders(iterator.nodeValue, replace);
                 }
                 if(e.childElementCount === 0) {
-                    e.textContent = expandPlaceholders(e.textContent, replace);
+                    const { textContent } = e;
+                    if (textContent) {
+                        e.textContent = expandPlaceholders(textContent, replace);
+                    }
                 }
                 this.updateCommandAttributes(e, replace);
 

package/src/server/services/domain-keys/DomainKeyService.ts

@@ -1,9 +1,11 @@
 import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
-import { cacheFor } from "../../../common/cacheFor.js";
+import {ICacheContainer, ObjectCache, cacheFor } from "../../../common/cacheFor.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 
 @RegisterSingleton
-export default class DomainKeyService {
+export default class DomainKeyService implements ICacheContainer<DomainKeyService> {
+
+    cache: ObjectCache<DomainKeyService>;
 
     @cacheFor()
     getDomainKey(mailboxID: number) {

package/src/server/services/files/FileAccessService.ts

@@ -1,19 +1,18 @@
-import TimedCache from "@entity-access/entity-access/dist/common/cache/TimedCache.js";
+
 import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
 import AppFile, { AppFileAccess, ExternalUser } from "../../model/entities/AppFile.js";
 import { globalServices } from "../../../globalServices.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
-import { cacheFor } from "../../../common/cacheFor.js";
+import {ICacheContainer, ObjectCache, cacheFor } from "../../../common/cacheFor.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import CryptoService from "../CryptoService.js";
 import { randomUUID } from "crypto";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 
-const cache = new TimedCache<number, AppFileAccess[]>();
-
 @RegisterSingleton
-export default class FileAccessService {
+export default class FileAccessService implements ICacheContainer<FileAccessService> {
 
+    cache: ObjectCache<FileAccessService>;
 
     public async getWriteList(userID: number) {
         const list = await this.getList(userID);

package/src/server/services/files/SnapshotService.ts

@@ -8,13 +8,14 @@ import AppFile from "../../model/entities/AppFile.js";
 import BaseStorage from "../../storage/BaseStorage.js";
 import TempFileService from "../../storage/TempFileService.js";
 import { join } from "path";
-import { cacheFor } from "../../../common/cacheFor.js";
+import {ICacheContainer, ObjectCache, cacheFor } from "../../../common/cacheFor.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import type { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
 import { tokenizeCssUrl } from "../../../protocols/core/tokenizer.js";
 
+
 let cdn = globalEnv.cdn || "";
 if (cdn) {
     cdn = `//${cdn}`;
@@ -40,7 +41,9 @@ const joinPath = (root: string, path: string) => {
 };
 
 @RegisterTransient
-export default class SnapshotService {
+export default class SnapshotService implements ICacheContainer<SnapshotService> {
+
+    cache: ObjectCache<SnapshotService>;
 
     @Inject
     db: SocialMailContext;

package/src/server/services/files/WebSiteService.ts

@@ -2,7 +2,7 @@ import Inject, { RegisterSingleton, ServiceProvider } from "@entity-access/entit
 import WebSiteFolder, { WebSiteFolderVersion } from "../../model/entities/WebSiteFolder.js";
 import { globalServices } from "../../../globalServices.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
-import { cacheFor } from "../../../common/cacheFor.js";
+import {ICacheContainer, ObjectCache, cacheFor } from "../../../common/cacheFor.js";
 import BaseStorage from "../../storage/BaseStorage.js";
 import AppFile from "../../model/entities/AppFile.js";
 import SnapshotService from "./SnapshotService.js";
@@ -12,10 +12,13 @@ import TempFileService from "../../storage/TempFileService.js";
 import Content from "@entity-access/server-pages/dist/Content.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 
+
 const empty = new WebSiteFolder();
 
 @RegisterSingleton
-export default class WebSiteService {
+export default class WebSiteService implements ICacheContainer<WebSiteService> {
+
+    cache: ObjectCache<WebSiteService>;
 
     @Inject
     private storage: BaseStorage;