@social-mail/social-mail-web-server 1.8.402 → 1.8.403

package/package.json

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

package/src/server/model/ReadOnlySocialMailContext.ts

@@ -1,22 +1,22 @@
-import PostgreSqlDriver from "@entity-access/entity-access/dist/drivers/postgres/PostgreSqlDriver.js";
+// import PostgreSqlDriver from "@entity-access/entity-access/dist/drivers/postgres/PostgreSqlDriver.js";
 import SocialMailContext from "./SocialMailContext.js";
-import { globalEnv } from "../../common/globalEnv.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
-});
+// 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);
-    }
+    // constructor(_, events, logger) {
+    //     super(driver, events, logger);
+    // }
 
 }

package/src/server/services/geo-ip/GeoIPService.ts

@@ -7,6 +7,7 @@ import GeoIPBlock from "../../model/entities/GeoIPBlock.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import SecureFetchBuilder from "../../../common/fetch/SecureFetchBuilder.js";
 import FetchBuilder from "@web-atoms/fetch-builder";
+import ReadOnlySocialMailContext from "../../model/ReadOnlySocialMailContext.js";
 
 let builder: FetchBuilder;
 
@@ -28,10 +29,11 @@ export default class GeoIPService implements ICacheContainer<GeoIPService> {
             using scope = ServiceProvider.createScope(this);
 
             const db = scope.resolve(SocialMailContext);
+            const replica = scope.resolve(ReadOnlySocialMailContext);
 
             const ipNumber = this.ipToNumber(ip);
 
-            let block = await db.geoIPBlocks
+            let block = await replica.geoIPBlocks
                 .where({ ipNumber }, (p) => (x) => x.blockStart <= p.ipNumber && x.blockEnd >= p.ipNumber)
                 .first();