@social-mail/social-mail-web-server 1.8.400 → 1.8.401

package/dist/wwwroot/routes/social-mail/site/snapshot/[type]/[eSiteID]/[eFileContentID]/[name]/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/wwwroot/routes/social-mail/site/snapshot/[type]/[eSiteID]/[eFileContentID]/[name]/index.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAQ5D;;;;GAIG;AACH,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,GAAG,CAAwB;IAGnC,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,GAAG,CAAoB;IAG/B,OAAO,CAAC,IAAI,CAAS;IAGrB,OAAO,CAAC,OAAO,CAAM;IAGrB,OAAO,CAAC,cAAc,CAAM;IAG5B,OAAO,CAAC,IAAI,CAAM;IAEZ,GAAG;IAwCH,YAAY,CAAC,MAAM,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,SAAI;CA0B1D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/wwwroot/routes/social-mail/site/snapshot/[type]/[eSiteID]/[eFileContentID]/[name]/index.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAQ5D;;;;GAIG;AACH,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,GAAG,CAAwB;IAGnC,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,GAAG,CAAoB;IAG/B,OAAO,CAAC,IAAI,CAAS;IAGrB,OAAO,CAAC,OAAO,CAAM;IAGrB,OAAO,CAAC,cAAc,CAAM;IAG5B,OAAO,CAAC,IAAI,CAAM;IAEZ,GAAG;IAyCH,YAAY,CAAC,MAAM,KAAA,EAAE,aAAa,KAAA,EAAE,SAAS,SAAI;CA0B1D"}

package/dist/wwwroot/routes/social-mail/site/snapshot/[type]/[eSiteID]/[eFileContentID]/[name]/index.js

@@ -28,6 +28,7 @@ export default class default_1 extends Page {
         const { type } = this;
         const appFile = await this.getAppFileID(siteID, fileContentID);
         if (!appFile) {
+            this.cacheControl = "no-cache, max-age=0";
             return this.notFound();
         }
         this.cacheControl = "public, max-age=2592000, immutable";

package/dist/wwwroot/routes/social-mail/site/snapshot/[type]/[eSiteID]/[eFileContentID]/[name]/index.js.map

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

package/package.json

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

package/src/WebServer.ts

@@ -57,6 +57,7 @@ import ReportDbContext from "./reports/model/ReportDbContext.js";
 import ReportDbContextEvents from "./reports/model/ReportDbContextEvents.js";
 import ContextEvents from "@entity-access/entity-access/dist/model/events/ContextEvents.js";
 import ReportWorkflowContext from "./reports/workflows/ReportWorkflowContext.js";
+import ReadOnlySocialMailContext from "./server/model/ReadOnlySocialMailContext.js";
 
 ServiceCollection.registerMultiple("Singleton", [SecureContextService, SocialSecureContextService], SocialSecureContextService);
 
@@ -251,6 +252,8 @@ export default class WebServer {
         ServiceCollection.register("Scoped", ReportDbContext);
         ServiceCollection.register("Singleton", ReportWorkflowContext);
 
+        ServiceCollection.register("Scoped", ReadOnlySocialMailContext);
+
         ServiceCollection.registerMultiple("Scoped", [ AppDbContext, SocialMailContext], SocialMailContext);
         ServiceCollection.register("Scoped", UserInfoProvider);
         ServiceCollection.registerMultiple("Singleton", [AppSocketService, SocketService], AppSocketService);

package/src/common/globalEnv.ts

@@ -26,6 +26,7 @@ const db = {
     ssl: JSON.parse(process.env.SOCIAL_MAIL_DB_SSL ?? "true"),
     user: process.env.SOCIAL_MAIL_DB_USER ?? "postgres",
     password: process.env.SOCIAL_MAIL_DB_PASSWORD ?? "abcd123",
+    readOnlyReplica: process.env.SOCIAL_MAIL_DB_READ_ONLY_REPLICA ?? process.env.SOCIAL_MAIL_DB_SERVER ?? "postgres",
 };
 
 const host = process.env.SOCIAL_MAIL_HOST;

package/src/server/model/ReadOnlySocialMailContext.ts

@@ -0,0 +1,22 @@
+import PostgreSqlDriver from "@entity-access/entity-access/dist/drivers/postgres/PostgreSqlDriver.js";
+import SocialMailContext from "./SocialMailContext.js";
+import { globalEnv } from "../../common/globalEnv.js";
+
+const driver = new PostgreSqlDriver({
+    host: globalEnv.db.readOnlyReplica,
+    port: globalEnv.db.port,
+    ssl: globalEnv.db.ssl,
+    database: globalEnv.db.database,
+    user: globalEnv.db.user,
+    password: globalEnv.db.password,
+    /** Since we are going to use cluster, a single worker should not hold more than 10 connections */
+    poolSize: 10
+});
+
+export default class ReadOnlySocialMailContext extends SocialMailContext {
+
+    constructor(_, events, logger) {
+        super(driver, events, logger);
+    }
+
+}

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

@@ -14,6 +14,7 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
 import { appendFile } from "fs/promises";
 import DbLockService from "../db-lock/DbLockService.js";
 import RateLimiterService from "../rate-limiter/RateLimiterService.js";
+import ReadOnlySocialMailContext from "../../model/ReadOnlySocialMailContext.js";
 
 export class CachedFile implements Disposable {
 
@@ -38,6 +39,9 @@ export default class CacheService {
     @Inject
     private db: SocialMailContext;
 
+    @Inject
+    private replica: ReadOnlySocialMailContext;
+
     @Inject
     private storage: BaseStorage;
 
@@ -146,7 +150,7 @@ export default class CacheService {
 
         const expiry = now.add(ttl);
 
-        let cachedItem = await this.db.cachedItems.statements.select({}, keys);
+        let cachedItem = await this.replica.cachedItems.statements.select({}, keys);
         if (cachedItem?.ready) {
             if(DateTime.from(cachedItem.expiry).msSinceEpoch > Date.now()) {
                 if (cachedItem.slide) {

package/src/wwwroot/routes/social-mail/site/snapshot/[type]/[eSiteID]/[eFileContentID]/[name]/index.ts

@@ -47,6 +47,7 @@ export default class extends Page {
         const appFile = await this.getAppFileID(siteID, fileContentID);
 
         if (!appFile) {
+            this.cacheControl = "no-cache, max-age=0";
             return this.notFound();
         }