@streamr/geoip-location 103.2.0 → 103.2.2
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/src/GeoIpLocator.js
CHANGED
|
@@ -7,7 +7,7 @@ exports.GeoIpLocator = void 0;
|
|
|
7
7
|
const utils_1 = require("@streamr/utils");
|
|
8
8
|
const long_timeout_1 = __importDefault(require("long-timeout"));
|
|
9
9
|
const downloadGeoIpDatabase_1 = require("./downloadGeoIpDatabase");
|
|
10
|
-
const logger = new utils_1.Logger(
|
|
10
|
+
const logger = new utils_1.Logger('GeoIpLocator');
|
|
11
11
|
// 30 days in milliseconds
|
|
12
12
|
const DEFAULT_DB_CHECK_INTERVAL = 30 * 24 * 60 * 60 * 1000;
|
|
13
13
|
// 24 hours in milliseconds
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeoIpLocator.js","sourceRoot":"","sources":["../../src/GeoIpLocator.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA6D;AAE7D,gEAAsC;AACtC,mEAA+D;AAE/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"GeoIpLocator.js","sourceRoot":"","sources":["../../src/GeoIpLocator.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ const DB_NAME = 'GeoLite2-City';
|
|
|
15
15
|
const TAR_SUFFFIX = '.tar.gz';
|
|
16
16
|
const DB_SUFFIX = '.mmdb';
|
|
17
17
|
const HASH_SUFFIX = '.mmdb.sha384';
|
|
18
|
-
const logger = new utils_1.Logger(
|
|
18
|
+
const logger = new utils_1.Logger('downloadGeoIpDatabase');
|
|
19
19
|
const downloadNewDb = async (url, dbFolder, remoteHash, abortSignal) => {
|
|
20
20
|
// make a unique name for the temporary download folder
|
|
21
21
|
// in case there are multiple downloads happening at the same time
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"downloadGeoIpDatabase.js","sourceRoot":"","sources":["../../src/downloadGeoIpDatabase.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA2B;AAC3B,4CAAmB;AACnB,uCAA+C;AAC/C,2CAAsD;AACtD,+BAAyB;AACzB,0CAAuC;AAEvC,MAAM,gBAAgB,GAAG,kFAAkF,CAAA;AAC3G,MAAM,OAAO,GAAG,eAAe,CAAA;AAC/B,MAAM,WAAW,GAAG,SAAS,CAAA;AAC7B,MAAM,SAAS,GAAG,OAAO,CAAA;AACzB,MAAM,WAAW,GAAG,cAAc,CAAA;AAElC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"downloadGeoIpDatabase.js","sourceRoot":"","sources":["../../src/downloadGeoIpDatabase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/geoip-location",
|
|
3
|
-
"version": "103.2.
|
|
3
|
+
"version": "103.2.2",
|
|
4
4
|
"description": "Library for getting location information from IP addresses based on MaxMind GeoLite2 databases",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -25,13 +25,13 @@
|
|
|
25
25
|
"scripts": {
|
|
26
26
|
"build": "tsc -b",
|
|
27
27
|
"check": "tsc -p tsconfig.jest.json",
|
|
28
|
-
"clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
|
|
28
|
+
"clean": "jest --clearCache --config '{}' || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
|
|
29
29
|
"eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
|
|
30
30
|
"test": "jest test/unit",
|
|
31
31
|
"test-unit": "jest test/unit"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@streamr/utils": "103.2.
|
|
34
|
+
"@streamr/utils": "103.2.2",
|
|
35
35
|
"eventemitter3": "^5.0.0",
|
|
36
36
|
"long-timeout": "^0.1.1",
|
|
37
37
|
"mmdb-lib": "^3.0.1",
|