@social-mail/social-mail-web-server 1.8.421 → 1.8.423

package/src/wwwroot/routes/api/files/get.ts

@@ -1,9 +1,10 @@
 import Inject from "@entity-access/entity-access/dist/di/di.js";
-import SocialMailContext from "../../../../server/model/SocialMailContext.js";
 import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
 import FileConversionService from "../../../../server/services/convert/FileConversionService.js";
+import ReplicaReader from "../../../../server/services/replica/ReplicaReader.js";
+import SocialMailContext from "../../../../server/model/SocialMailContext.js";
 
 @Prepare.authorize
 export default class extends Page {
@@ -11,6 +12,9 @@ export default class extends Page {
     @Inject
     private fcs: FileConversionService;
 
+    @Inject
+    private replica: ReplicaReader;
+
     @Inject
     private db: SocialMailContext;
 
@@ -20,25 +24,35 @@ export default class extends Page {
         // we will not convert as BigInt might have loss of data
         const fileID = this.childPath[1] as unknown as number;
         let fileContentID = this.childPath[2] as unknown as number;
-
         const fileName = this.childPath[this.childPath.length-1];
 
-        if (!fileContentID) {
-            // redirect...
-            const fc1 = await this.db.appFiles.where({ fileID }, (p) => (x) => x.appFileID === p.fileID)
-                .select(void 0, (p) => (x) => ({fileContentID:  x.fileContentID}))
+        const appFile = await this.replica.query(async (db) => {
+
+            if (!fileContentID) {
+                // redirect...
+                const fc1 = await db.appFiles.where({ fileID }, (p) => (x) => x.appFileID === p.fileID)
+                    .select(void 0, (p) => (x) => ({fileContentID:  x.fileContentID}))
+                    .first();
+                if (!fc1) {
+                    return null;
+                }
+                fileContentID = fc1.fileContentID;
+            }
+
+            db.verifyFilters = true;
+            return await db.appFiles
+                .filtered("read")
+                .where({ fileID, fileContentID },
+                    (p) => (x) => x.fileContentID === p.fileContentID
+                        && x.appFileID === p.fileID)
+                .include((x) => x.fileContent)
                 .first();
-            fileContentID = fc1.fileContentID;
+        });
+
+        if (!appFile) {
+            return this.notFound();
         }
 
-        this.db.verifyFilters = true;
-        const appFile = await this.db.appFiles
-            .filtered("read")
-            .where({ fileID, fileContentID },
-                (p) => (x) => x.fileContentID === p.fileContentID
-                    && x.appFileID === p.fileID)
-            .include((x) => x.fileContent)
-            .firstOrFail();
         this.db.verifyFilters = false;
         this.db.raiseEvents = false;
         this.cacheControl = "public, max-age=2592000, immutable";

package/src/wwwroot/routes/social-mail/c/d/[domain]/[type]/[postID]/[fileID]/index.ts

@@ -3,9 +3,9 @@ import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import { Route } from "@entity-access/server-pages/dist/core/Route.js";
 import { CORS } from "../../../../../../../../../common/CORS.js";
-import SocialMailContext from "../../../../../../../../../server/model/SocialMailContext.js";
 import FileConversionService from "../../../../../../../../../server/services/convert/FileConversionService.js";
 import EncryptionService from "../../../../../../../../../server/services/encryption/EncryptionService.js";
+import ReplicaReader from "../../../../../../../../../server/services/replica/ReplicaReader.js";
 
 export default class extends Page {
 
@@ -13,7 +13,7 @@ export default class extends Page {
     private fcs: FileConversionService;
 
     @Inject
-    private db: SocialMailContext;
+    private replica: ReplicaReader;
 
     @Inject
     private ecs: EncryptionService;
@@ -39,13 +39,18 @@ export default class extends Page {
         const fileName = this.domain + "." + this.childPath[this.childPath.length-1];
 
         // verify host ...
-        const appFile = await this.db.appFiles
+        const appFile = await this.replica.query((db) => db.appFiles
             .where({ fileID, emailID }, (p) => (x) =>
                         x.appFileID === p.fileID
                         && x.emailID === p.emailID
             )
             .include((x) => x.fileContent)
-            .first();
+            .first());
+
+        if (!appFile) {
+            this.cacheControl = "public, max-age=600";
+            return this.notFound();
+        }
 
         this.cacheControl = "public, max-age=2592000, immutable";
 

package/src/wwwroot/routes/social-mail/c/e/[eDomain]/[type]/[eFileContentID]/index.ts

@@ -3,9 +3,9 @@ import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import { Route } from "@entity-access/server-pages/dist/core/Route.js";
 import { CORS } from "../../../../../../../../common/CORS.js";
-import SocialMailContext from "../../../../../../../../server/model/SocialMailContext.js";
 import FileConversionService from "../../../../../../../../server/services/convert/FileConversionService.js";
 import EncryptionService from "../../../../../../../../server/services/encryption/EncryptionService.js";
+import ReplicaReader from "../../../../../../../../server/services/replica/ReplicaReader.js";
 
 export default class extends Page {
 
@@ -13,7 +13,7 @@ export default class extends Page {
     private fcs: FileConversionService;
 
     @Inject
-    private db: SocialMailContext;
+    private replica: ReplicaReader;
 
     @Inject
     private ecs: EncryptionService;
@@ -38,12 +38,17 @@ export default class extends Page {
         const fileName = senderDomain + "." + this.childPath[this.childPath.length-1];
 
         // verify host ...
-        const appFile = await this.db.appFiles
+        const appFile = await this.replica.query((db) => db.appFiles
             .where({ eFileContentID }, (p) => (x) =>
                     x.fileContentID === p.eFileContentID
             )
             .include((x) => x.fileContent)
-            .first();
+            .first());
+
+        if (!appFile) {
+            this.cacheControl = "public, max-age=600";
+            return this.notFound();
+        }
 
         this.cacheControl = "public, max-age=2592000, immutable";
 

package/src/wwwroot/routes/social-mail/c/u/[activityID]/[accessCode]/index.tsx

@@ -6,6 +6,7 @@ import XNode from "@entity-access/server-pages/dist/html/XNode.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
 import SocialMailContext from "../../../../../../../server/model/SocialMailContext.js";
 import { Base36 } from "../../../../../../../common/Base36.js";
+import ReplicaReader from "../../../../../../../server/services/replica/ReplicaReader.js";
 
 export default class UnsubscribePage extends Page {
 
@@ -18,16 +19,19 @@ export default class UnsubscribePage extends Page {
     @Inject
     db: SocialMailContext;
 
+    @Inject
+    replica: ReplicaReader;
+
     async run() {
 
         const { accessCode, activityID } = this;
 
         const uid = Base36.decode(activityID) as any;
 
-        const sentActivity = await this.db.subscriberActivities.where({ uid, accessCode }, (p) => (x) =>
+        const sentActivity = await this.replica.query((db) => db.subscriberActivities.where({ uid, accessCode }, (p) => (x) =>
             x.accessCode === p.accessCode
             && x.activityID === p.uid
-        ).first();
+        ).first());
 
         if (!sentActivity) {
             return Content.html(<HtmlDocument>

package/src/wwwroot/routes/social-mail/cd/[domain]/[type]/[postID]/[fileID]/index.ts

@@ -4,9 +4,9 @@ import Page from "@entity-access/server-pages/dist/Page.js";
 import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
 import { Route } from "@entity-access/server-pages/dist/core/Route.js";
 import { CORS } from "../../../../../../../../common/CORS.js";
-import SocialMailContext from "../../../../../../../../server/model/SocialMailContext.js";
 import FileConversionService from "../../../../../../../../server/services/convert/FileConversionService.js";
 import EncryptionService from "../../../../../../../../server/services/encryption/EncryptionService.js";
+import ReplicaReader from "../../../../../../../../server/services/replica/ReplicaReader.js";
 
 @Prepare.authorize
 export default class extends Page {
@@ -15,7 +15,7 @@ export default class extends Page {
     private fcs: FileConversionService;
 
     @Inject
-    private db: SocialMailContext;
+    private replica: ReplicaReader;
 
     @Inject
     private ecs: EncryptionService;
@@ -41,13 +41,13 @@ export default class extends Page {
         const fileName = this.domain + "." + this.childPath[this.childPath.length-1];
 
         // verify host ...
-        const appFile = await this.db.appFiles
+        const appFile = await this.replica.query((db) => db.appFiles
             .where({ fileID, emailID }, (p) => (x) =>
                         x.appFileID === p.fileID
                         && x.emailID === p.emailID
             )
             .include((x) => x.fileContent)
-            .first();
+            .first());
 
         this.cacheControl = "public, max-age=2592000, immutable";
 

package/src/wwwroot/routes/social-mail/fd/[type]/[eFileID]/[eFileContentID]/[name]/index.ts

@@ -4,10 +4,10 @@ import Page from "@entity-access/server-pages/dist/Page.js";
 import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
 import { Route } from "@entity-access/server-pages/dist/core/Route.js";
 import { CORS } from "../../../../../../../../common/CORS.js";
-import SocialMailContext from "../../../../../../../../server/model/SocialMailContext.js";
 import FileConversionService from "../../../../../../../../server/services/convert/FileConversionService.js";
 import EncryptionService from "../../../../../../../../server/services/encryption/EncryptionService.js";
 import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
+import ReplicaReader from "../../../../../../../../server/services/replica/ReplicaReader.js";
 
 @Prepare.authorize
 export default class extends Page {
@@ -16,7 +16,7 @@ export default class extends Page {
     private fcs: FileConversionService;
 
     @Inject
-    private db: SocialMailContext;
+    private replica: ReplicaReader;
 
     @Inject
     private sessionSecurity: SessionSecurity;
@@ -44,8 +44,12 @@ export default class extends Page {
 
         const { type } = this;
 
-        const appFile = await this.db.appFiles.loadByKeys(keys);
+        const appFile = await this.replica.query((db) => db.appFiles.loadByKeys(keys));
 
+        if (!appFile) {
+            this.cacheControl = "public, max-age=300";
+            return this.notFound();
+        }
 
         this.cacheControl = "public, max-age=2592000, immutable";
 

package/src/wwwroot/routes/social-mail/social/t/index.tsx

@@ -3,6 +3,7 @@ import { Base36 } from "../../../../../common/Base36.js";
 import Inject from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
 import UnreadCountService from "../../../../../server/services/emails/UnreadCountService.js";
+import ReplicaReader from "../../../../../server/services/replica/ReplicaReader.js";
 
 const body = Buffer.from("R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==", "base64");
 
@@ -27,6 +28,9 @@ export default class extends Page {
         return true;
     }
 
+    @Inject
+    replica: ReplicaReader;
+
     @Inject
     db: SocialMailContext;
 
@@ -36,17 +40,19 @@ export default class extends Page {
     // send 1x1 gif
     async run() {
 
-        const { db } = this;
 
         const [ _p0, p1 ] = this.childPath;
 
-        db.verifyFilters = false;
         const activityID = Base36.decode(p1) as any;
 
         if (activityID) {
-            const activity = await db.subscriberActivities
+            const activity = await this.replica.query((db) => {
+                db.verifyFilters = false;
+
+                return db.subscriberActivities
                 .where({ activityID}, (p) => (x) => x.activityID === p.activityID)
                 .first();
+            });
             if (!activity) {
                 return;
             }

package/dist/wwwroot/routes/api/emails/content/attachment/index.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=index.d.ts.map

package/dist/wwwroot/routes/api/emails/content/attachment/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/api/emails/content/attachment/index.ts"],"names":[],"mappings":""}

package/dist/wwwroot/routes/api/emails/content/attachment/index.js

@@ -1,41 +0,0 @@
-// import Inject from "@entity-access/entity-access/dist/di/di.js";
-// import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
-// import CacheService from "../../../../../../server/services/cache/CacheService.js";
-// import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
-// import EmailAttachmentStorage from "../../../../../../server/storage/EmailAttachmentStorage.js";
-// import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
-// import Page from "@entity-access/server-pages/dist/Page.js";
-// import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
-export {};
-// @Prepare.authorize
-// export default class extends Page {
-//     @Inject
-//     private db: SocialMailContext;
-//     @Inject
-//     private cacheService: CacheService;
-//     @Inject
-//     private emailAttachmentStorage: EmailAttachmentStorage;
-//     async run() {
-//         const emailID = this.childPath[0] as any;
-//         const attachmentNumber = this.childPath[1] as any;
-//         // verify security...
-//         await this.db.emails.filtered("read").where({ emailID }, (p) => (x) => x.emailID === p.emailID)
-//             .some();
-//         const factory = () => {
-//             this.db.verifyFilters = false;
-//             return this.emailAttachmentStorage.downloadAttachmentFile(emailID, attachmentNumber);
-//         };
-//         const tf = await this.cacheService.get({
-//             key: `cached-email-attachment-${emailID}-${attachmentNumber}`,
-//             factory,
-//             ttl: TimeSpan.fromDays(30)
-//         });
-//         this.cacheControl = "public, max-age=2592000, immutable";
-//         return new TempFileResult(tf, {
-//             contentDisposition: "attachment",
-//             immutable: true,
-//             etag: false
-//         });
-//     }
-// }
-//# sourceMappingURL=index.js.map

package/dist/wwwroot/routes/api/emails/content/attachment/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/api/emails/content/attachment/index.ts"],"names":[],"mappings":"AAAA,mEAAmE;AACnE,uFAAuF;AACvF,sFAAsF;AACtF,8EAA8E;AAC9E,mGAAmG;AACnG,gFAAgF;AAChF,+DAA+D;AAC/D,oFAAoF;;AAGpF,qBAAqB;AACrB,sCAAsC;AAEtC,cAAc;AACd,qCAAqC;AAErC,cAAc;AACd,0CAA0C;AAE1C,cAAc;AACd,8DAA8D;AAE9D,oBAAoB;AAEpB,oDAAoD;AAEpD,6DAA6D;AAE7D,gCAAgC;AAChC,0GAA0G;AAC1G,uBAAuB;AAEvB,kCAAkC;AAClC,6CAA6C;AAC7C,oGAAoG;AACpG,aAAa;AAEb,mDAAmD;AACnD,6EAA6E;AAC7E,uBAAuB;AACvB,yCAAyC;AACzC,cAAc;AAEd,oEAAoE;AAEpE,0CAA0C;AAC1C,gDAAgD;AAChD,+BAA+B;AAC/B,0BAA0B;AAC1B,cAAc;AACd,QAAQ;AAER,IAAI"}

package/dist/wwwroot/routes/api/emails/content/html/index.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=index.d.ts.map

package/dist/wwwroot/routes/api/emails/content/html/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/api/emails/content/html/index.ts"],"names":[],"mappings":""}

package/dist/wwwroot/routes/api/emails/content/html/index.js

@@ -1,41 +0,0 @@
-// import Inject from "@entity-access/entity-access/dist/di/di.js";
-// import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
-// import Page from "@entity-access/server-pages/dist/Page.js";
-// import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
-// import CachedEmailService from "../../../../../../server/smtp/services/CachedEmailService.js";
-// import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-export {};
-// @Prepare.authorize
-// export default class extends Page {
-//     @Inject
-//     private db: SocialMailContext;
-//     @Inject
-//     private cacheEmailService: CachedEmailService;
-//     async run() {
-//         const [emailID, p2] = this.childPath as any[];
-//         const signedFileLogID = BigInt(p2 || "0") as any as number;
-//         // verify security...
-//         const email = await this.db.emails.filtered("read").where({ emailID }, (p) => (x) => x.emailID === p.emailID)
-//             .first();
-//         if (!email) {
-//             throw new EntityAccessError(`User: ${this.sessionUser.userID} doesn't have access to ${emailID}`);
-//         }
-//         this.cacheControl = "public, max-age=2592000, immutable";
-//         // if (!signedFileLogID) {
-//         //     if (!email.mimeFileID && !email.htmlBodyID) {
-//         //         return this.content({
-//         //             body: email.htmlBody,
-//         //             contentType: "text/plain",
-//         //             compress: true
-//         //         });
-//         //     }
-//         // }
-//         const body = await this.cacheEmailService.getHtmlForRecipient({ emailID, signedFileLogID });
-//         return this.content({
-//             body,
-//             contentType: "text/plain",
-//             compress: true
-//         });
-//     }
-// }
-//# sourceMappingURL=index.js.map

package/dist/wwwroot/routes/api/emails/content/html/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/api/emails/content/html/index.ts"],"names":[],"mappings":"AAAA,mEAAmE;AACnE,uFAAuF;AACvF,+DAA+D;AAC/D,oFAAoF;AACpF,iGAAiG;AACjG,iGAAiG;;AAGjG,qBAAqB;AACrB,sCAAsC;AAEtC,cAAc;AACd,qCAAqC;AAErC,cAAc;AACd,qDAAqD;AAErD,oBAAoB;AAEpB,yDAAyD;AAEzD,sEAAsE;AAEtE,gCAAgC;AAChC,wHAAwH;AACxH,wBAAwB;AAExB,wBAAwB;AACxB,iHAAiH;AACjH,YAAY;AAEZ,oEAAoE;AACpE,qCAAqC;AACrC,+DAA+D;AAC/D,2CAA2C;AAC3C,+CAA+C;AAC/C,oDAAoD;AACpD,wCAAwC;AACxC,yBAAyB;AACzB,mBAAmB;AACnB,eAAe;AAEf,uGAAuG;AAEvG,gCAAgC;AAChC,oBAAoB;AACpB,yCAAyC;AACzC,6BAA6B;AAC7B,cAAc;AACd,QAAQ;AAER,IAAI"}

package/src/wwwroot/routes/api/emails/content/attachment/index.ts

@@ -1,53 +0,0 @@
-// import Inject from "@entity-access/entity-access/dist/di/di.js";
-// import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
-// import CacheService from "../../../../../../server/services/cache/CacheService.js";
-// import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
-// import EmailAttachmentStorage from "../../../../../../server/storage/EmailAttachmentStorage.js";
-// import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
-// import Page from "@entity-access/server-pages/dist/Page.js";
-// import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
-
-
-// @Prepare.authorize
-// export default class extends Page {
-
-//     @Inject
-//     private db: SocialMailContext;
-
-//     @Inject
-//     private cacheService: CacheService;
-
-//     @Inject
-//     private emailAttachmentStorage: EmailAttachmentStorage;
-
-//     async run() {
-
-//         const emailID = this.childPath[0] as any;
-
-//         const attachmentNumber = this.childPath[1] as any;
-
-//         // verify security...
-//         await this.db.emails.filtered("read").where({ emailID }, (p) => (x) => x.emailID === p.emailID)
-//             .some();
-
-//         const factory = () => {
-//             this.db.verifyFilters = false;
-//             return this.emailAttachmentStorage.downloadAttachmentFile(emailID, attachmentNumber);
-//         };
-
-//         const tf = await this.cacheService.get({
-//             key: `cached-email-attachment-${emailID}-${attachmentNumber}`,
-//             factory,
-//             ttl: TimeSpan.fromDays(30)
-//         });
-
-//         this.cacheControl = "public, max-age=2592000, immutable";
-
-//         return new TempFileResult(tf, {
-//             contentDisposition: "attachment",
-//             immutable: true,
-//             etag: false
-//         });
-//     }
-
-// }

package/src/wwwroot/routes/api/emails/content/html/index.ts

@@ -1,52 +0,0 @@
-// import Inject from "@entity-access/entity-access/dist/di/di.js";
-// import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
-// import Page from "@entity-access/server-pages/dist/Page.js";
-// import { Prepare } from "@entity-access/server-pages/dist/decorators/Prepare.js";
-// import CachedEmailService from "../../../../../../server/smtp/services/CachedEmailService.js";
-// import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-
-
-// @Prepare.authorize
-// export default class extends Page {
-
-//     @Inject
-//     private db: SocialMailContext;
-
-//     @Inject
-//     private cacheEmailService: CachedEmailService;
-
-//     async run() {
-
-//         const [emailID, p2] = this.childPath as any[];
-
-//         const signedFileLogID = BigInt(p2 || "0") as any as number;
-
-//         // verify security...
-//         const email = await this.db.emails.filtered("read").where({ emailID }, (p) => (x) => x.emailID === p.emailID)
-//             .first();
-
-//         if (!email) {
-//             throw new EntityAccessError(`User: ${this.sessionUser.userID} doesn't have access to ${emailID}`);
-//         }
-
-//         this.cacheControl = "public, max-age=2592000, immutable";
-//         // if (!signedFileLogID) {
-//         //     if (!email.mimeFileID && !email.htmlBodyID) {
-//         //         return this.content({
-//         //             body: email.htmlBody,
-//         //             contentType: "text/plain",
-//         //             compress: true
-//         //         });
-//         //     }
-//         // }
-
-//         const body = await this.cacheEmailService.getHtmlForRecipient({ emailID, signedFileLogID });
-
-//         return this.content({
-//             body,
-//             contentType: "text/plain",
-//             compress: true
-//         });
-//     }
-
-// }