@social-mail/social-mail-web-server 1.8.402 → 1.8.403
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/server/model/ReadOnlySocialMailContext.d.ts +0 -1
- package/dist/server/model/ReadOnlySocialMailContext.d.ts.map +1 -1
- package/dist/server/model/ReadOnlySocialMailContext.js +12 -15
- package/dist/server/model/ReadOnlySocialMailContext.js.map +1 -1
- package/dist/server/services/geo-ip/GeoIPService.d.ts.map +1 -1
- package/dist/server/services/geo-ip/GeoIPService.js +3 -1
- package/dist/server/services/geo-ip/GeoIPService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/server/model/ReadOnlySocialMailContext.ts +15 -15
- package/src/server/services/geo-ip/GeoIPService.ts +3 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadOnlySocialMailContext.d.ts","sourceRoot":"","sources":["../../../src/server/model/ReadOnlySocialMailContext.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAcvD,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,iBAAiB;
|
|
1
|
+
{"version":3,"file":"ReadOnlySocialMailContext.d.ts","sourceRoot":"","sources":["../../../src/server/model/ReadOnlySocialMailContext.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AAcvD,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,iBAAiB;CAMvE"}
|
|
@@ -1,19 +1,16 @@
|
|
|
1
|
-
import PostgreSqlDriver from "@entity-access/entity-access/dist/drivers/postgres/PostgreSqlDriver.js";
|
|
1
|
+
// import PostgreSqlDriver from "@entity-access/entity-access/dist/drivers/postgres/PostgreSqlDriver.js";
|
|
2
2
|
import SocialMailContext from "./SocialMailContext.js";
|
|
3
|
-
import { globalEnv } from "../../common/globalEnv.js";
|
|
4
|
-
const driver = new PostgreSqlDriver({
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
});
|
|
3
|
+
// import { globalEnv } from "../../common/globalEnv.js";
|
|
4
|
+
// const driver = new PostgreSqlDriver({
|
|
5
|
+
// host: globalEnv.db.readOnlyReplica,
|
|
6
|
+
// port: globalEnv.db.port,
|
|
7
|
+
// ssl: globalEnv.db.ssl,
|
|
8
|
+
// database: globalEnv.db.database,
|
|
9
|
+
// user: globalEnv.db.user,
|
|
10
|
+
// password: globalEnv.db.password,
|
|
11
|
+
// /** Since we are going to use cluster, a single worker should not hold more than 10 connections */
|
|
12
|
+
// poolSize: 10
|
|
13
|
+
// });
|
|
14
14
|
export default class ReadOnlySocialMailContext extends SocialMailContext {
|
|
15
|
-
constructor(_, events, logger) {
|
|
16
|
-
super(driver, events, logger);
|
|
17
|
-
}
|
|
18
15
|
}
|
|
19
16
|
//# sourceMappingURL=ReadOnlySocialMailContext.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReadOnlySocialMailContext.js","sourceRoot":"","sources":["../../../src/server/model/ReadOnlySocialMailContext.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"ReadOnlySocialMailContext.js","sourceRoot":"","sources":["../../../src/server/model/ReadOnlySocialMailContext.ts"],"names":[],"mappings":"AAAA,yGAAyG;AACzG,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;AACvD,yDAAyD;AAEzD,wCAAwC;AACxC,0CAA0C;AAC1C,+BAA+B;AAC/B,6BAA6B;AAC7B,uCAAuC;AACvC,+BAA+B;AAC/B,uCAAuC;AACvC,yGAAyG;AACzG,mBAAmB;AACnB,MAAM;AAEN,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,iBAAiB;CAMvE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeoIPService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/geo-ip/GeoIPService.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,eAAe,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAGrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,UAAU,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"GeoIPService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/geo-ip/GeoIPService.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,eAAe,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAGrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,UAAU,MAAM,oCAAoC,CAAC;AAS5D,MAAM,CAAC,OAAO,OAAO,YAAa,YAAW,eAAe,CAAC,YAAY,CAAC;IAEtE,KAAK,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IAG3B,QAAQ,CAAC,EAAE,EAAE,MAAM;IA+CnB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAyC9C,UAAU,CAAC,QAAQ,EAAE,iBAAiB,EAAE,YAAY,SAAQ;IA2B5D,UAAU,CAAC,EAAE,EAAE,MAAM;IAWrB,UAAU,CAAC,EAAE,EAAE,MAAM;;;;CAyBxB"}
|
|
@@ -66,6 +66,7 @@ import SocialMailContext from "../../model/SocialMailContext.js";
|
|
|
66
66
|
import GeoIPBlock from "../../model/entities/GeoIPBlock.js";
|
|
67
67
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
68
68
|
import SecureFetchBuilder from "../../../common/fetch/SecureFetchBuilder.js";
|
|
69
|
+
import ReadOnlySocialMailContext from "../../model/ReadOnlySocialMailContext.js";
|
|
69
70
|
let builder;
|
|
70
71
|
let GeoIPService = class GeoIPService {
|
|
71
72
|
async getBlock(ip) {
|
|
@@ -78,8 +79,9 @@ let GeoIPService = class GeoIPService {
|
|
|
78
79
|
// try local db cache first...
|
|
79
80
|
const scope = __addDisposableResource(env_1, ServiceProvider.createScope(this), false);
|
|
80
81
|
const db = scope.resolve(SocialMailContext);
|
|
82
|
+
const replica = scope.resolve(ReadOnlySocialMailContext);
|
|
81
83
|
const ipNumber = this.ipToNumber(ip);
|
|
82
|
-
let block = await
|
|
84
|
+
let block = await replica.geoIPBlocks
|
|
83
85
|
.where({ ipNumber }, (p) => (x) => x.blockStart <= p.ipNumber && x.blockEnd >= p.ipNumber)
|
|
84
86
|
.first();
|
|
85
87
|
if (block) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeoIPService.js","sourceRoot":"","sources":["../../../../src/server/services/geo-ip/GeoIPService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAgC,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,UAAU,MAAM,oCAAoC,CAAC;AAC5D,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,kBAAkB,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"GeoIPService.js","sourceRoot":"","sources":["../../../../src/server/services/geo-ip/GeoIPService.ts"],"names":[],"mappings":"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"}
|