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

package/package.json

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

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

@@ -21,6 +21,7 @@ import CacheService from "../../services/cache/CacheService.js";
 import EmailLogService from "../../services/email-logs/EmailLogService.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import StoreConfigService from "../../services/store/StoreConfigService.js";
+import WebSiteChannelService from "../../smtp/services/WebSiteChannelService.js";
 
 export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
 
@@ -60,6 +61,19 @@ export default class AppFileEvents extends AuthenticatedEvents<AppFile> {
         return db.appFiles.where({ path }, (p) => (x) => Sql.text.like(x.path, p.path));
     }
 
+    @ExternalQuery
+    async channelEmailFiles(emailID) {
+        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);
+
+        return this.db.appFiles.where({ emailID, host, mailboxes }, (p) => (x) => x.emailID === p.emailID
+            && x.email.status === "published"
+            && x.email.mailboxes.some((mc)=> Sql.in(mc.mailboxID, p.mailboxes )));
+    }
+
     @ExternalQuery
     async children(folderID, path: string, sha256: string) {
 

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

@@ -20,6 +20,7 @@ import ExternalQuery from "@entity-access/server-pages/dist/decorators/ExternalQ
 import ScopeVars from "../../../common/ScopeVars.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import { globalEnv } from "../../../common/globalEnv.js";
+import WebSiteChannelService from "../../smtp/services/WebSiteChannelService.js";
 
 export default class EmailEvents extends AuthenticatedEvents<Email> {
 
@@ -52,17 +53,17 @@ export default class EmailEvents extends AuthenticatedEvents<Email> {
     }
 
     @ExternalQuery
-    channelEmails(channelID) {
+    async channelEmails(channelID) {
         // get current host
         const page = ServiceProvider.resolve(this, Page as any) as Page;
         const host = page.request.host;
 
-        const q = this.db.emails.where({ channelID, host}, (p) => (x) =>
+        const wcs = ServiceProvider.resolve(this, WebSiteChannelService);
+        const mailboxes = await wcs.getMailboxes(host);
+
+        const q = this.db.emails.where({ channelID, host, mailboxes}, (p) => (x) =>
             x.status === "published"
-            && x.mailboxes.some((m) => m.mailboxID === p.channelID
-            && m.mailbox.isChannel === true
-            && m.mailbox.websiteChannels.some((c) => c.website.hosts.some((h) => h.host === p.host)
-        )));
+            && x.mailboxes.some((m) => Sql.in(m.mailboxID, p.mailboxes)));
         return q.limit(25);
     }
 

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

@@ -14,6 +14,7 @@ import SyncDnsZoneRecordsWorkflow from "../../workflows/dns/SyncDnsZoneRecordsWo
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
 import ApexDomain from "../../../common/ApexDomain.js";
 import EmailAddressService from "../../services/EmailAddressService.js";
+import WebSiteChannelService from "../../smtp/services/WebSiteChannelService.js";
 
 export default class WebSiteFolderEvents extends AuthenticatedEvents<WebSiteFolder> {
 
@@ -117,6 +118,13 @@ export class WebSiteChannelEvents extends AuthenticatedEvents<WebSiteChannel> {
         return query.where({ writeFileAccess }, (p) => (x) => Sql.text.likeAny(x.website.folder.path, p.writeFileAccess ));
     }
 
+    afterInsert(entity: WebSiteChannel, entry: ChangeEntry<WebSiteChannel>) {
+        ServiceProvider.resolve(this, WebSiteChannelService).clear();
+    }
+
+    afterDelete(entity: WebSiteChannel, entry: ChangeEntry<WebSiteChannel>) {
+        ServiceProvider.resolve(this, WebSiteChannelService).clear();
+    }
 }
 
 

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.533";
+    const version = "1.2.534";
 
     const existing = await config.getValue(UIPackageConfig, false);
     if (existing) {

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

@@ -0,0 +1,44 @@
+import TimedCache from "@entity-access/entity-access/dist/common/cache/TimedCache.js";
+import Inject, { RegisterScoped, RegisterSingleton, RegisterTransient, ServiceCollection, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
+import SocialMailContext from "../../model/SocialMailContext.js";
+import GlobalEvents from "../../../common/GlobalEvents.js";
+
+export default class WebSiteChannelService {
+
+    @Inject
+    globalEvents: GlobalEvents;
+
+    cache = new TimedCache<string, number[]>();
+
+    getMailboxes(host: string) {
+        return this.cache.getOrCreateAsync(host, async (host) => {
+            using scope = ServiceProvider.createScope(this);
+            const db = scope.resolve(SocialMailContext);
+
+            host = host?.toLocaleLowerCase() ?? "localhost";
+
+            const mailboxes = await db.mailboxes.where({ host}, (p) => (x) =>
+                    x.websiteChannels
+                        .some((w) => w.website.hosts
+                            .some((h)=> h.host === p.host)))
+                .toArray();
+
+            return mailboxes.map((x) => x.mailboxID);
+        });
+    }
+
+    clear() {
+        this.globalEvents.notify("web-site-channel-host-clear" as any, {} as any);
+    }
+
+    protected postInit() {
+        this.globalEvents.on("web-site-channel-host-clear" as any, () => this.cache.clear() );
+    }
+
+}
+
+ServiceCollection.register("Singleton", WebSiteChannelService, (sp) => {
+    const instance = sp.create(WebSiteChannelService);
+    (instance as any).postInit();
+    return instance;
+});