@social-mail/social-mail-web-server 1.8.402 → 1.8.404
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/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 +5 -5
- package/src/server/services/geo-ip/GeoIPService.ts +3 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@social-mail/social-mail-web-server",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.404",
|
|
4
4
|
"description": "## Phase 1",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@aws-sdk/client-s3": "^3.913.0",
|
|
24
24
|
"@azure/storage-blob": "^12.29.1",
|
|
25
|
-
"@entity-access/entity-access": "^1.0.
|
|
26
|
-
"@entity-access/server-pages": "^1.1.
|
|
25
|
+
"@entity-access/entity-access": "^1.0.512",
|
|
26
|
+
"@entity-access/server-pages": "^1.1.548",
|
|
27
27
|
"@parse/node-apn": "^6.5.0",
|
|
28
28
|
"@paypal/paypal-server-sdk": "^1.0.0",
|
|
29
29
|
"@peculiar/asn1-schema": "^2.3.15",
|
|
@@ -50,8 +50,8 @@
|
|
|
50
50
|
"my-ua-parser": "^2.0.4",
|
|
51
51
|
"node-forge": "^1.3.1",
|
|
52
52
|
"nodemailer": "^6.10.0",
|
|
53
|
-
"pg": "^8.
|
|
54
|
-
"pg-cursor": "^2.
|
|
53
|
+
"pg": "^8.16.3",
|
|
54
|
+
"pg-cursor": "^2.15.3",
|
|
55
55
|
"qrcode": "^1.5.3",
|
|
56
56
|
"semver": "^7.6.2",
|
|
57
57
|
"sharp": "^0.33.5",
|
|
@@ -7,6 +7,7 @@ import GeoIPBlock from "../../model/entities/GeoIPBlock.js";
|
|
|
7
7
|
import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
|
|
8
8
|
import SecureFetchBuilder from "../../../common/fetch/SecureFetchBuilder.js";
|
|
9
9
|
import FetchBuilder from "@web-atoms/fetch-builder";
|
|
10
|
+
import ReadOnlySocialMailContext from "../../model/ReadOnlySocialMailContext.js";
|
|
10
11
|
|
|
11
12
|
let builder: FetchBuilder;
|
|
12
13
|
|
|
@@ -28,10 +29,11 @@ export default class GeoIPService implements ICacheContainer<GeoIPService> {
|
|
|
28
29
|
using scope = ServiceProvider.createScope(this);
|
|
29
30
|
|
|
30
31
|
const db = scope.resolve(SocialMailContext);
|
|
32
|
+
const replica = scope.resolve(ReadOnlySocialMailContext);
|
|
31
33
|
|
|
32
34
|
const ipNumber = this.ipToNumber(ip);
|
|
33
35
|
|
|
34
|
-
let block = await
|
|
36
|
+
let block = await replica.geoIPBlocks
|
|
35
37
|
.where({ ipNumber }, (p) => (x) => x.blockStart <= p.ipNumber && x.blockEnd >= p.ipNumber)
|
|
36
38
|
.first();
|
|
37
39
|
|