@streamr/geoip-location 103.1.2-rc.0 → 103.2.0-experiment.0

package/dist/exports.cjs

@@ -0,0 +1,287 @@
+'use strict';
+
+var utils = require('@streamr/utils');
+var LongTimeout = require('long-timeout');
+var crypto = require('crypto');
+var fs = require('fs');
+var mmdbLib = require('mmdb-lib');
+var stream = require('stream');
+var tar = require('tar');
+var NodePath = require('path');
+var uuid = require('uuid');
+
+const doExtractFileFromTarStream = (fileName, stream$1, downloadFolder) => {
+    return new Promise((resolve, reject) => {
+        try {
+            const nodeStream = stream.Readable.fromWeb(stream$1);
+            stream.pipeline(nodeStream, tar.extract({
+                cwd: downloadFolder,
+                filter: (entryPath) => NodePath.basename(entryPath) === fileName,
+                strip: 1
+            }), (err) => {
+                if (err) {
+                    reject(new Error('Error extracting tarball to ' + downloadFolder + ', error: ' + err));
+                }
+                else {
+                    resolve();
+                }
+            });
+        }
+        catch (e) {
+            reject(new Error('Failed to create nodejs Readable from web stream: ' + e));
+        }
+    });
+};
+const extractFileFromTarStream = async (fileName, stream, downloadFolder) => {
+    await doExtractFileFromTarStream(fileName, stream, downloadFolder);
+    if (!fs.existsSync(NodePath.join(downloadFolder, fileName))) {
+        throw new Error('File not found in tarball: ' + fileName);
+    }
+};
+
+const GEOIP_MIRROR_URL = 'https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/master/redist/';
+const DB_NAME = 'GeoLite2-City';
+const TAR_SUFFFIX = '.tar.gz';
+const DB_SUFFIX = '.mmdb';
+const HASH_SUFFIX = '.mmdb.sha384';
+const logger$1 = new utils.Logger('downloadGeoIpDatabase');
+const downloadNewDb = async (url, dbFolder, remoteHash, abortSignal) => {
+    // make a unique name for the temporary download folder
+    // in case there are multiple downloads happening at the same time
+    const uniqueName = uuid.v4();
+    const downloadFolder = dbFolder + '.download' + uniqueName;
+    const dbFileName = DB_NAME + DB_SUFFIX;
+    const dbFileInDownloadFolder = downloadFolder + '/' + dbFileName;
+    const dbFileInDbFolder = dbFolder + dbFileName;
+    let response;
+    try {
+        logger$1.debug('Downloading GeoIP database from: ' + url);
+        response = await fetch(url, { keepalive: false, signal: abortSignal });
+    }
+    catch (e) {
+        // Catching and re-throwing as async exception 
+        // here is necessary, synch exceptions cannot be caught by the caller
+        throw new Error('Fetch error when downloading ' + url + ', error: ' + e);
+    }
+    if (!response.ok) {
+        throw new Error('HTTP error when downloading ' + url + ', status: ' + response.status);
+    }
+    // extract the tarball to a temporary folder
+    try {
+        fs.mkdirSync(downloadFolder, { recursive: true });
+    }
+    catch (e) {
+        throw new Error('Error creating temporary folder ' + downloadFolder + ', error: ' + e);
+    }
+    try {
+        await extractFileFromTarStream(dbFileName, response.body, downloadFolder);
+    }
+    catch (e) {
+        try {
+            fs.rmSync(downloadFolder, { recursive: true });
+        }
+        catch {
+            // ignore error when removing the temporary folder
+        }
+        throw e;
+    }
+    // check the hash of the extracted file
+    if (!isDbFileValid(dbFileInDownloadFolder, remoteHash)) {
+        try {
+            fs.rmSync(downloadFolder, { recursive: true });
+        }
+        catch {
+            // ignore error when removing the temporary folder
+        }
+        throw new Error('Downloaded database hash does not match the expected hash');
+    }
+    try {
+        // move the extracted file to the correct location
+        fs.renameSync(dbFileInDownloadFolder, dbFileInDbFolder);
+    }
+    catch (e) {
+        throw new Error('Error moving ' + dbFileInDownloadFolder + ' to ' + dbFileInDbFolder + ', error: ' + e);
+    }
+    finally {
+        try {
+            fs.rmSync(downloadFolder, { recursive: true });
+        }
+        catch {
+            // ignore error when removing the temporary folder
+        }
+    }
+    // set the db file permissions to rw only for the owner
+    try {
+        fs.chmodSync(dbFileInDbFolder, 0o600);
+    }
+    catch (err) {
+        throw new Error('Error setting permissions on ' + dbFileInDbFolder + ', error: ' + err);
+    }
+    logger$1.debug('Downloaded GeoIP database to: ' + dbFileInDbFolder);
+};
+const downloadRemoteHash = async (remoteHashUrl, abortSignal) => {
+    // download the hash of the latest GeoIP database using fetch as text and trim it
+    let response;
+    try {
+        logger$1.debug('Downloading GeoIP database hash from: ' + remoteHashUrl);
+        response = await fetch(remoteHashUrl, { signal: abortSignal });
+    }
+    catch (e) {
+        // Catching and re-throwing as async exception 
+        // here is necessary, synch exceptions cannot be caught by the caller
+        throw new Error('Fetch error when downloading ' + remoteHashUrl + ', error: ' + e);
+    }
+    if (!response.ok) {
+        throw new Error('HTTP error when downloading ' + remoteHashUrl + ', status: ' + response.status);
+    }
+    return (await response.text()).trim();
+};
+const isDbFileValid = (dbFile, remoteHash) => {
+    // check if the local db exists and calculate its hash
+    try {
+        const db = fs.readFileSync(dbFile);
+        const localHash = crypto.createHash('sha384').update(db).digest('hex');
+        // if the hashes are different, download the latest database
+        if (localHash !== remoteHash) {
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
+    catch {
+        // if the local db does not exist, or some other exception occurres db is not considered valid
+        return false;
+    }
+};
+// returns a Reader if a new db was downloaded, or if the caller wants to force return a reader
+// also if there was no need to download a new db
+const downloadGeoIpDatabase = async (dbFolder, forceReturnReader, abortSignal, mirrorUrl) => {
+    // This will throw if the download folder is not readable
+    if (!fs.existsSync(dbFolder)) {
+        // This will throw if the download folder is not writable
+        fs.mkdirSync(dbFolder, { recursive: true });
+    }
+    if (!dbFolder.endsWith('/')) {
+        dbFolder += '/';
+    }
+    let geoIpMirrorUrl = GEOIP_MIRROR_URL;
+    if (mirrorUrl !== undefined) {
+        if (!mirrorUrl.endsWith('/')) {
+            mirrorUrl += '/';
+        }
+        geoIpMirrorUrl = mirrorUrl;
+    }
+    const remoteHashUrl = geoIpMirrorUrl + DB_NAME + HASH_SUFFIX;
+    const dbDownloadUrl = geoIpMirrorUrl + DB_NAME + TAR_SUFFFIX;
+    const dbFileInDbFolder = dbFolder + DB_NAME + DB_SUFFIX;
+    const remoteHash = await downloadRemoteHash(remoteHashUrl, abortSignal);
+    const dbValid = isDbFileValid(dbFileInDbFolder, remoteHash);
+    if (dbValid === false) {
+        await downloadNewDb(dbDownloadUrl, dbFolder, remoteHash, abortSignal);
+        // return new reader if db was downloaded
+        return new mmdbLib.Reader(fs.readFileSync(dbFileInDbFolder));
+    }
+    else {
+        logger$1.debug('The hash of the local GeoIP database matches the remote hash, no need to download a new database');
+    }
+    if (forceReturnReader) {
+        // return reader also for old db the caller wants it
+        return new mmdbLib.Reader(fs.readFileSync(dbFileInDbFolder));
+    }
+    else {
+        // return undefined if the db is already up to date
+        return undefined;
+    }
+};
+
+const logger = new utils.Logger('GeoIpLocator');
+// 30 days in milliseconds
+const DEFAULT_DB_CHECK_INTERVAL = 30 * 24 * 60 * 60 * 1000;
+// 24 hours in milliseconds
+const DEFAULT_DB_CHECK_ERROR_INTERVAL = 24 * 60 * 60 * 1000;
+class GeoIpLocator {
+    abortController;
+    geoIpDatabaseFolder;
+    dbCheckInterval;
+    dbCheckErrorInterval;
+    mirrorUrl;
+    reader;
+    dbCheckTimeout;
+    constructor(geoIpDatabaseFolder, dbCheckInterval = DEFAULT_DB_CHECK_INTERVAL, dbCheckErrorInterval = DEFAULT_DB_CHECK_ERROR_INTERVAL, mirrorUrl) {
+        this.abortController = new AbortController();
+        this.dbCheckInterval = dbCheckInterval;
+        this.dbCheckErrorInterval = dbCheckErrorInterval;
+        if (!geoIpDatabaseFolder.endsWith('/')) {
+            geoIpDatabaseFolder += '/';
+        }
+        this.geoIpDatabaseFolder = utils.filePathToNodeFormat(geoIpDatabaseFolder);
+        this.mirrorUrl = mirrorUrl;
+    }
+    checkDatabase = async () => {
+        if (this.reader === undefined) {
+            // if we do not have a reader, create a new one in any case
+            this.reader = await downloadGeoIpDatabase(this.geoIpDatabaseFolder, true, this.abortController.signal, this.mirrorUrl);
+        }
+        else {
+            // if we already have a reader, create a new one only if db has changed
+            const newReader = await downloadGeoIpDatabase(this.geoIpDatabaseFolder, false, this.abortController.signal, this.mirrorUrl);
+            if (newReader !== undefined) {
+                this.reader = newReader;
+            }
+        }
+    };
+    scheduleCheck = async (timeout) => {
+        if (this.abortController.signal.aborted) {
+            return;
+        }
+        this.dbCheckTimeout = LongTimeout.setTimeout(async () => {
+            try {
+                await this.checkDatabase();
+                this.scheduleCheck(this.dbCheckInterval);
+            }
+            catch (err) {
+                logger.warn('GeoIpLocator: GeoIP database check failed', { err });
+                this.scheduleCheck(this.dbCheckErrorInterval);
+            }
+        }, timeout);
+    };
+    async start() {
+        if (this.dbCheckTimeout !== undefined) {
+            return;
+        }
+        await this.checkDatabase();
+        this.scheduleCheck(this.dbCheckInterval);
+    }
+    stop() {
+        if (this.dbCheckTimeout !== undefined) {
+            LongTimeout.clearTimeout(this.dbCheckTimeout);
+        }
+        this.abortController.abort();
+    }
+    lookup(ip) {
+        if (this.reader === undefined) {
+            logger.warn('GeoIpLocator: lookup called before database is ready (maybe start() was not called?');
+            return undefined;
+        }
+        // If ip is falsy, the library will crash
+        // this might happen despite the ts typings because the ip address 
+        // comes from the ws server socket and is not under our control
+        if (!ip) {
+            return undefined;
+        }
+        const result = this.reader.get(ip);
+        if (!result?.location?.latitude || !result.location.longitude) {
+            return undefined;
+        }
+        else {
+            return {
+                latitude: result.location.latitude,
+                longitude: result.location.longitude
+            };
+        }
+    }
+}
+
+exports.GeoIpLocator = GeoIpLocator;
+//# sourceMappingURL=exports.cjs.map

package/dist/exports.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"exports.cjs","sources":["src/tarHelper.js","src/downloadGeoIpDatabase.js","src/GeoIpLocator.js"],"sourcesContent":["import { Readable, pipeline } from 'stream';\nimport { extract } from 'tar';\nimport NodePath from 'path'; // use NodePath to avoid conflict with other 'path' symbols\nimport fs from 'fs';\nconst doExtractFileFromTarStream = (fileName, stream, downloadFolder) => {\n    return new Promise((resolve, reject) => {\n        try {\n            const nodeStream = Readable.fromWeb(stream);\n            pipeline(nodeStream, extract({\n                cwd: downloadFolder,\n                filter: (entryPath) => NodePath.basename(entryPath) === fileName,\n                strip: 1\n            }), (err) => {\n                if (err) {\n                    reject(new Error('Error extracting tarball to ' + downloadFolder + ', error: ' + err));\n                }\n                else {\n                    resolve();\n                }\n            });\n        }\n        catch (e) {\n            reject(new Error('Failed to create nodejs Readable from web stream: ' + e));\n        }\n    });\n};\nexport const extractFileFromTarStream = async (fileName, stream, downloadFolder) => {\n    await doExtractFileFromTarStream(fileName, stream, downloadFolder);\n    if (!fs.existsSync(NodePath.join(downloadFolder, fileName))) {\n        throw new Error('File not found in tarball: ' + fileName);\n    }\n};\n//# sourceMappingURL=tarHelper.js.map","import crypto from 'crypto';\nimport fs from 'fs';\nimport { Reader } from 'mmdb-lib';\nimport { extractFileFromTarStream } from './tarHelper';\nimport { v4 } from 'uuid';\nimport { Logger } from '@streamr/utils';\nconst GEOIP_MIRROR_URL = 'https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/master/redist/';\nconst DB_NAME = 'GeoLite2-City';\nconst TAR_SUFFFIX = '.tar.gz';\nconst DB_SUFFIX = '.mmdb';\nconst HASH_SUFFIX = '.mmdb.sha384';\nconst logger = new Logger('downloadGeoIpDatabase');\nconst downloadNewDb = async (url, dbFolder, remoteHash, abortSignal) => {\n    // make a unique name for the temporary download folder\n    // in case there are multiple downloads happening at the same time\n    const uniqueName = v4();\n    const downloadFolder = dbFolder + '.download' + uniqueName;\n    const dbFileName = DB_NAME + DB_SUFFIX;\n    const dbFileInDownloadFolder = downloadFolder + '/' + dbFileName;\n    const dbFileInDbFolder = dbFolder + dbFileName;\n    let response;\n    try {\n        logger.debug('Downloading GeoIP database from: ' + url);\n        response = await fetch(url, { keepalive: false, signal: abortSignal });\n    }\n    catch (e) {\n        // Catching and re-throwing as async exception \n        // here is necessary, synch exceptions cannot be caught by the caller\n        throw new Error('Fetch error when downloading ' + url + ', error: ' + e);\n    }\n    if (!response.ok) {\n        throw new Error('HTTP error when downloading ' + url + ', status: ' + response.status);\n    }\n    // extract the tarball to a temporary folder\n    try {\n        fs.mkdirSync(downloadFolder, { recursive: true });\n    }\n    catch (e) {\n        throw new Error('Error creating temporary folder ' + downloadFolder + ', error: ' + e);\n    }\n    try {\n        await extractFileFromTarStream(dbFileName, response.body, downloadFolder);\n    }\n    catch (e) {\n        try {\n            fs.rmSync(downloadFolder, { recursive: true });\n        }\n        catch {\n            // ignore error when removing the temporary folder\n        }\n        throw e;\n    }\n    // check the hash of the extracted file\n    if (!isDbFileValid(dbFileInDownloadFolder, remoteHash)) {\n        try {\n            fs.rmSync(downloadFolder, { recursive: true });\n        }\n        catch {\n            // ignore error when removing the temporary folder\n        }\n        throw new Error('Downloaded database hash does not match the expected hash');\n    }\n    try {\n        // move the extracted file to the correct location\n        fs.renameSync(dbFileInDownloadFolder, dbFileInDbFolder);\n    }\n    catch (e) {\n        throw new Error('Error moving ' + dbFileInDownloadFolder + ' to ' + dbFileInDbFolder + ', error: ' + e);\n    }\n    finally {\n        try {\n            fs.rmSync(downloadFolder, { recursive: true });\n        }\n        catch {\n            // ignore error when removing the temporary folder\n        }\n    }\n    // set the db file permissions to rw only for the owner\n    try {\n        fs.chmodSync(dbFileInDbFolder, 0o600);\n    }\n    catch (err) {\n        throw new Error('Error setting permissions on ' + dbFileInDbFolder + ', error: ' + err);\n    }\n    logger.debug('Downloaded GeoIP database to: ' + dbFileInDbFolder);\n};\nconst downloadRemoteHash = async (remoteHashUrl, abortSignal) => {\n    // download the hash of the latest GeoIP database using fetch as text and trim it\n    let response;\n    try {\n        logger.debug('Downloading GeoIP database hash from: ' + remoteHashUrl);\n        response = await fetch(remoteHashUrl, { signal: abortSignal });\n    }\n    catch (e) {\n        // Catching and re-throwing as async exception \n        // here is necessary, synch exceptions cannot be caught by the caller\n        throw new Error('Fetch error when downloading ' + remoteHashUrl + ', error: ' + e);\n    }\n    if (!response.ok) {\n        throw new Error('HTTP error when downloading ' + remoteHashUrl + ', status: ' + response.status);\n    }\n    return (await response.text()).trim();\n};\nconst isDbFileValid = (dbFile, remoteHash) => {\n    // check if the local db exists and calculate its hash\n    try {\n        const db = fs.readFileSync(dbFile);\n        const localHash = crypto.createHash('sha384').update(db).digest('hex');\n        // if the hashes are different, download the latest database\n        if (localHash !== remoteHash) {\n            return false;\n        }\n        else {\n            return true;\n        }\n    }\n    catch {\n        // if the local db does not exist, or some other exception occurres db is not considered valid\n        return false;\n    }\n};\n// returns a Reader if a new db was downloaded, or if the caller wants to force return a reader\n// also if there was no need to download a new db\nexport const downloadGeoIpDatabase = async (dbFolder, forceReturnReader, abortSignal, mirrorUrl) => {\n    // This will throw if the download folder is not readable\n    if (!fs.existsSync(dbFolder)) {\n        // This will throw if the download folder is not writable\n        fs.mkdirSync(dbFolder, { recursive: true });\n    }\n    if (!dbFolder.endsWith('/')) {\n        dbFolder += '/';\n    }\n    let geoIpMirrorUrl = GEOIP_MIRROR_URL;\n    if (mirrorUrl !== undefined) {\n        if (!mirrorUrl.endsWith('/')) {\n            mirrorUrl += '/';\n        }\n        geoIpMirrorUrl = mirrorUrl;\n    }\n    const remoteHashUrl = geoIpMirrorUrl + DB_NAME + HASH_SUFFIX;\n    const dbDownloadUrl = geoIpMirrorUrl + DB_NAME + TAR_SUFFFIX;\n    const dbFileInDbFolder = dbFolder + DB_NAME + DB_SUFFIX;\n    const remoteHash = await downloadRemoteHash(remoteHashUrl, abortSignal);\n    const dbValid = isDbFileValid(dbFileInDbFolder, remoteHash);\n    if (dbValid === false) {\n        await downloadNewDb(dbDownloadUrl, dbFolder, remoteHash, abortSignal);\n        // return new reader if db was downloaded\n        return new Reader(fs.readFileSync(dbFileInDbFolder));\n    }\n    else {\n        logger.debug('The hash of the local GeoIP database matches the remote hash, no need to download a new database');\n    }\n    if (forceReturnReader) {\n        // return reader also for old db the caller wants it\n        return new Reader(fs.readFileSync(dbFileInDbFolder));\n    }\n    else {\n        // return undefined if the db is already up to date\n        return undefined;\n    }\n};\n//# sourceMappingURL=downloadGeoIpDatabase.js.map","import { Logger, filePathToNodeFormat } from '@streamr/utils';\nimport LongTimeout from 'long-timeout';\nimport { downloadGeoIpDatabase } from './downloadGeoIpDatabase';\nconst logger = new Logger('GeoIpLocator');\n// 30 days in milliseconds\nconst DEFAULT_DB_CHECK_INTERVAL = 30 * 24 * 60 * 60 * 1000;\n// 24 hours in milliseconds\nconst DEFAULT_DB_CHECK_ERROR_INTERVAL = 24 * 60 * 60 * 1000;\nexport class GeoIpLocator {\n    abortController;\n    geoIpDatabaseFolder;\n    dbCheckInterval;\n    dbCheckErrorInterval;\n    mirrorUrl;\n    reader;\n    dbCheckTimeout;\n    constructor(geoIpDatabaseFolder, dbCheckInterval = DEFAULT_DB_CHECK_INTERVAL, dbCheckErrorInterval = DEFAULT_DB_CHECK_ERROR_INTERVAL, mirrorUrl) {\n        this.abortController = new AbortController();\n        this.dbCheckInterval = dbCheckInterval;\n        this.dbCheckErrorInterval = dbCheckErrorInterval;\n        if (!geoIpDatabaseFolder.endsWith('/')) {\n            geoIpDatabaseFolder += '/';\n        }\n        this.geoIpDatabaseFolder = filePathToNodeFormat(geoIpDatabaseFolder);\n        this.mirrorUrl = mirrorUrl;\n    }\n    checkDatabase = async () => {\n        if (this.reader === undefined) {\n            // if we do not have a reader, create a new one in any case\n            this.reader = await downloadGeoIpDatabase(this.geoIpDatabaseFolder, true, this.abortController.signal, this.mirrorUrl);\n        }\n        else {\n            // if we already have a reader, create a new one only if db has changed\n            const newReader = await downloadGeoIpDatabase(this.geoIpDatabaseFolder, false, this.abortController.signal, this.mirrorUrl);\n            if (newReader !== undefined) {\n                this.reader = newReader;\n            }\n        }\n    };\n    scheduleCheck = async (timeout) => {\n        if (this.abortController.signal.aborted) {\n            return;\n        }\n        this.dbCheckTimeout = LongTimeout.setTimeout(async () => {\n            try {\n                await this.checkDatabase();\n                this.scheduleCheck(this.dbCheckInterval);\n            }\n            catch (err) {\n                logger.warn('GeoIpLocator: GeoIP database check failed', { err });\n                this.scheduleCheck(this.dbCheckErrorInterval);\n            }\n        }, timeout);\n    };\n    async start() {\n        if (this.dbCheckTimeout !== undefined) {\n            return;\n        }\n        await this.checkDatabase();\n        this.scheduleCheck(this.dbCheckInterval);\n    }\n    stop() {\n        if (this.dbCheckTimeout !== undefined) {\n            LongTimeout.clearTimeout(this.dbCheckTimeout);\n        }\n        this.abortController.abort();\n    }\n    lookup(ip) {\n        if (this.reader === undefined) {\n            logger.warn('GeoIpLocator: lookup called before database is ready (maybe start() was not called?');\n            return undefined;\n        }\n        // If ip is falsy, the library will crash\n        // this might happen despite the ts typings because the ip address \n        // comes from the ws server socket and is not under our control\n        if (!ip) {\n            return undefined;\n        }\n        const result = this.reader.get(ip);\n        if (!result?.location?.latitude || !result.location.longitude) {\n            return undefined;\n        }\n        else {\n            return {\n                latitude: result.location.latitude,\n                longitude: result.location.longitude\n            };\n        }\n    }\n}\n//# sourceMappingURL=GeoIpLocator.js.map"],"names":["stream","Readable","pipeline","extract","logger","Logger","v4","Reader","filePathToNodeFormat"],"mappings":"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"}

package/dist/{src/GeoIpLocator.d.ts → exports.d.ts}

@@ -2,7 +2,7 @@ interface GeoIpLookupResult {
     latitude: number;
     longitude: number;
 }
-export declare class GeoIpLocator {
+declare class GeoIpLocator {
     private abortController;
     private readonly geoIpDatabaseFolder;
     private readonly dbCheckInterval;
@@ -17,4 +17,5 @@ export declare class GeoIpLocator {
     stop(): void;
     lookup(ip: string): GeoIpLookupResult | undefined;
 }
-export {};
+
+export { GeoIpLocator };

package/dist/exports.js

@@ -0,0 +1,285 @@
+import { Logger, filePathToNodeFormat } from '@streamr/utils';
+import LongTimeout from 'long-timeout';
+import crypto from 'crypto';
+import fs from 'fs';
+import { Reader } from 'mmdb-lib';
+import { Readable, pipeline } from 'stream';
+import { extract } from 'tar';
+import NodePath from 'path';
+import { v4 } from 'uuid';
+
+const doExtractFileFromTarStream = (fileName, stream, downloadFolder) => {
+    return new Promise((resolve, reject) => {
+        try {
+            const nodeStream = Readable.fromWeb(stream);
+            pipeline(nodeStream, extract({
+                cwd: downloadFolder,
+                filter: (entryPath) => NodePath.basename(entryPath) === fileName,
+                strip: 1
+            }), (err) => {
+                if (err) {
+                    reject(new Error('Error extracting tarball to ' + downloadFolder + ', error: ' + err));
+                }
+                else {
+                    resolve();
+                }
+            });
+        }
+        catch (e) {
+            reject(new Error('Failed to create nodejs Readable from web stream: ' + e));
+        }
+    });
+};
+const extractFileFromTarStream = async (fileName, stream, downloadFolder) => {
+    await doExtractFileFromTarStream(fileName, stream, downloadFolder);
+    if (!fs.existsSync(NodePath.join(downloadFolder, fileName))) {
+        throw new Error('File not found in tarball: ' + fileName);
+    }
+};
+
+const GEOIP_MIRROR_URL = 'https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/master/redist/';
+const DB_NAME = 'GeoLite2-City';
+const TAR_SUFFFIX = '.tar.gz';
+const DB_SUFFIX = '.mmdb';
+const HASH_SUFFIX = '.mmdb.sha384';
+const logger$1 = new Logger('downloadGeoIpDatabase');
+const downloadNewDb = async (url, dbFolder, remoteHash, abortSignal) => {
+    // make a unique name for the temporary download folder
+    // in case there are multiple downloads happening at the same time
+    const uniqueName = v4();
+    const downloadFolder = dbFolder + '.download' + uniqueName;
+    const dbFileName = DB_NAME + DB_SUFFIX;
+    const dbFileInDownloadFolder = downloadFolder + '/' + dbFileName;
+    const dbFileInDbFolder = dbFolder + dbFileName;
+    let response;
+    try {
+        logger$1.debug('Downloading GeoIP database from: ' + url);
+        response = await fetch(url, { keepalive: false, signal: abortSignal });
+    }
+    catch (e) {
+        // Catching and re-throwing as async exception 
+        // here is necessary, synch exceptions cannot be caught by the caller
+        throw new Error('Fetch error when downloading ' + url + ', error: ' + e);
+    }
+    if (!response.ok) {
+        throw new Error('HTTP error when downloading ' + url + ', status: ' + response.status);
+    }
+    // extract the tarball to a temporary folder
+    try {
+        fs.mkdirSync(downloadFolder, { recursive: true });
+    }
+    catch (e) {
+        throw new Error('Error creating temporary folder ' + downloadFolder + ', error: ' + e);
+    }
+    try {
+        await extractFileFromTarStream(dbFileName, response.body, downloadFolder);
+    }
+    catch (e) {
+        try {
+            fs.rmSync(downloadFolder, { recursive: true });
+        }
+        catch {
+            // ignore error when removing the temporary folder
+        }
+        throw e;
+    }
+    // check the hash of the extracted file
+    if (!isDbFileValid(dbFileInDownloadFolder, remoteHash)) {
+        try {
+            fs.rmSync(downloadFolder, { recursive: true });
+        }
+        catch {
+            // ignore error when removing the temporary folder
+        }
+        throw new Error('Downloaded database hash does not match the expected hash');
+    }
+    try {
+        // move the extracted file to the correct location
+        fs.renameSync(dbFileInDownloadFolder, dbFileInDbFolder);
+    }
+    catch (e) {
+        throw new Error('Error moving ' + dbFileInDownloadFolder + ' to ' + dbFileInDbFolder + ', error: ' + e);
+    }
+    finally {
+        try {
+            fs.rmSync(downloadFolder, { recursive: true });
+        }
+        catch {
+            // ignore error when removing the temporary folder
+        }
+    }
+    // set the db file permissions to rw only for the owner
+    try {
+        fs.chmodSync(dbFileInDbFolder, 0o600);
+    }
+    catch (err) {
+        throw new Error('Error setting permissions on ' + dbFileInDbFolder + ', error: ' + err);
+    }
+    logger$1.debug('Downloaded GeoIP database to: ' + dbFileInDbFolder);
+};
+const downloadRemoteHash = async (remoteHashUrl, abortSignal) => {
+    // download the hash of the latest GeoIP database using fetch as text and trim it
+    let response;
+    try {
+        logger$1.debug('Downloading GeoIP database hash from: ' + remoteHashUrl);
+        response = await fetch(remoteHashUrl, { signal: abortSignal });
+    }
+    catch (e) {
+        // Catching and re-throwing as async exception 
+        // here is necessary, synch exceptions cannot be caught by the caller
+        throw new Error('Fetch error when downloading ' + remoteHashUrl + ', error: ' + e);
+    }
+    if (!response.ok) {
+        throw new Error('HTTP error when downloading ' + remoteHashUrl + ', status: ' + response.status);
+    }
+    return (await response.text()).trim();
+};
+const isDbFileValid = (dbFile, remoteHash) => {
+    // check if the local db exists and calculate its hash
+    try {
+        const db = fs.readFileSync(dbFile);
+        const localHash = crypto.createHash('sha384').update(db).digest('hex');
+        // if the hashes are different, download the latest database
+        if (localHash !== remoteHash) {
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
+    catch {
+        // if the local db does not exist, or some other exception occurres db is not considered valid
+        return false;
+    }
+};
+// returns a Reader if a new db was downloaded, or if the caller wants to force return a reader
+// also if there was no need to download a new db
+const downloadGeoIpDatabase = async (dbFolder, forceReturnReader, abortSignal, mirrorUrl) => {
+    // This will throw if the download folder is not readable
+    if (!fs.existsSync(dbFolder)) {
+        // This will throw if the download folder is not writable
+        fs.mkdirSync(dbFolder, { recursive: true });
+    }
+    if (!dbFolder.endsWith('/')) {
+        dbFolder += '/';
+    }
+    let geoIpMirrorUrl = GEOIP_MIRROR_URL;
+    if (mirrorUrl !== undefined) {
+        if (!mirrorUrl.endsWith('/')) {
+            mirrorUrl += '/';
+        }
+        geoIpMirrorUrl = mirrorUrl;
+    }
+    const remoteHashUrl = geoIpMirrorUrl + DB_NAME + HASH_SUFFIX;
+    const dbDownloadUrl = geoIpMirrorUrl + DB_NAME + TAR_SUFFFIX;
+    const dbFileInDbFolder = dbFolder + DB_NAME + DB_SUFFIX;
+    const remoteHash = await downloadRemoteHash(remoteHashUrl, abortSignal);
+    const dbValid = isDbFileValid(dbFileInDbFolder, remoteHash);
+    if (dbValid === false) {
+        await downloadNewDb(dbDownloadUrl, dbFolder, remoteHash, abortSignal);
+        // return new reader if db was downloaded
+        return new Reader(fs.readFileSync(dbFileInDbFolder));
+    }
+    else {
+        logger$1.debug('The hash of the local GeoIP database matches the remote hash, no need to download a new database');
+    }
+    if (forceReturnReader) {
+        // return reader also for old db the caller wants it
+        return new Reader(fs.readFileSync(dbFileInDbFolder));
+    }
+    else {
+        // return undefined if the db is already up to date
+        return undefined;
+    }
+};
+
+const logger = new Logger('GeoIpLocator');
+// 30 days in milliseconds
+const DEFAULT_DB_CHECK_INTERVAL = 30 * 24 * 60 * 60 * 1000;
+// 24 hours in milliseconds
+const DEFAULT_DB_CHECK_ERROR_INTERVAL = 24 * 60 * 60 * 1000;
+class GeoIpLocator {
+    abortController;
+    geoIpDatabaseFolder;
+    dbCheckInterval;
+    dbCheckErrorInterval;
+    mirrorUrl;
+    reader;
+    dbCheckTimeout;
+    constructor(geoIpDatabaseFolder, dbCheckInterval = DEFAULT_DB_CHECK_INTERVAL, dbCheckErrorInterval = DEFAULT_DB_CHECK_ERROR_INTERVAL, mirrorUrl) {
+        this.abortController = new AbortController();
+        this.dbCheckInterval = dbCheckInterval;
+        this.dbCheckErrorInterval = dbCheckErrorInterval;
+        if (!geoIpDatabaseFolder.endsWith('/')) {
+            geoIpDatabaseFolder += '/';
+        }
+        this.geoIpDatabaseFolder = filePathToNodeFormat(geoIpDatabaseFolder);
+        this.mirrorUrl = mirrorUrl;
+    }
+    checkDatabase = async () => {
+        if (this.reader === undefined) {
+            // if we do not have a reader, create a new one in any case
+            this.reader = await downloadGeoIpDatabase(this.geoIpDatabaseFolder, true, this.abortController.signal, this.mirrorUrl);
+        }
+        else {
+            // if we already have a reader, create a new one only if db has changed
+            const newReader = await downloadGeoIpDatabase(this.geoIpDatabaseFolder, false, this.abortController.signal, this.mirrorUrl);
+            if (newReader !== undefined) {
+                this.reader = newReader;
+            }
+        }
+    };
+    scheduleCheck = async (timeout) => {
+        if (this.abortController.signal.aborted) {
+            return;
+        }
+        this.dbCheckTimeout = LongTimeout.setTimeout(async () => {
+            try {
+                await this.checkDatabase();
+                this.scheduleCheck(this.dbCheckInterval);
+            }
+            catch (err) {
+                logger.warn('GeoIpLocator: GeoIP database check failed', { err });
+                this.scheduleCheck(this.dbCheckErrorInterval);
+            }
+        }, timeout);
+    };
+    async start() {
+        if (this.dbCheckTimeout !== undefined) {
+            return;
+        }
+        await this.checkDatabase();
+        this.scheduleCheck(this.dbCheckInterval);
+    }
+    stop() {
+        if (this.dbCheckTimeout !== undefined) {
+            LongTimeout.clearTimeout(this.dbCheckTimeout);
+        }
+        this.abortController.abort();
+    }
+    lookup(ip) {
+        if (this.reader === undefined) {
+            logger.warn('GeoIpLocator: lookup called before database is ready (maybe start() was not called?');
+            return undefined;
+        }
+        // If ip is falsy, the library will crash
+        // this might happen despite the ts typings because the ip address 
+        // comes from the ws server socket and is not under our control
+        if (!ip) {
+            return undefined;
+        }
+        const result = this.reader.get(ip);
+        if (!result?.location?.latitude || !result.location.longitude) {
+            return undefined;
+        }
+        else {
+            return {
+                latitude: result.location.latitude,
+                longitude: result.location.longitude
+            };
+        }
+    }
+}
+
+export { GeoIpLocator };
+//# sourceMappingURL=exports.js.map

package/dist/exports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exports.js","sources":["src/tarHelper.js","src/downloadGeoIpDatabase.js","src/GeoIpLocator.js"],"sourcesContent":["import { Readable, pipeline } from 'stream';\nimport { extract } from 'tar';\nimport NodePath from 'path'; // use NodePath to avoid conflict with other 'path' symbols\nimport fs from 'fs';\nconst doExtractFileFromTarStream = (fileName, stream, downloadFolder) => {\n    return new Promise((resolve, reject) => {\n        try {\n            const nodeStream = Readable.fromWeb(stream);\n            pipeline(nodeStream, extract({\n                cwd: downloadFolder,\n                filter: (entryPath) => NodePath.basename(entryPath) === fileName,\n                strip: 1\n            }), (err) => {\n                if (err) {\n                    reject(new Error('Error extracting tarball to ' + downloadFolder + ', error: ' + err));\n                }\n                else {\n                    resolve();\n                }\n            });\n        }\n        catch (e) {\n            reject(new Error('Failed to create nodejs Readable from web stream: ' + e));\n        }\n    });\n};\nexport const extractFileFromTarStream = async (fileName, stream, downloadFolder) => {\n    await doExtractFileFromTarStream(fileName, stream, downloadFolder);\n    if (!fs.existsSync(NodePath.join(downloadFolder, fileName))) {\n        throw new Error('File not found in tarball: ' + fileName);\n    }\n};\n//# sourceMappingURL=tarHelper.js.map","import crypto from 'crypto';\nimport fs from 'fs';\nimport { Reader } from 'mmdb-lib';\nimport { extractFileFromTarStream } from './tarHelper';\nimport { v4 } from 'uuid';\nimport { Logger } from '@streamr/utils';\nconst GEOIP_MIRROR_URL = 'https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/master/redist/';\nconst DB_NAME = 'GeoLite2-City';\nconst TAR_SUFFFIX = '.tar.gz';\nconst DB_SUFFIX = '.mmdb';\nconst HASH_SUFFIX = '.mmdb.sha384';\nconst logger = new Logger('downloadGeoIpDatabase');\nconst downloadNewDb = async (url, dbFolder, remoteHash, abortSignal) => {\n    // make a unique name for the temporary download folder\n    // in case there are multiple downloads happening at the same time\n    const uniqueName = v4();\n    const downloadFolder = dbFolder + '.download' + uniqueName;\n    const dbFileName = DB_NAME + DB_SUFFIX;\n    const dbFileInDownloadFolder = downloadFolder + '/' + dbFileName;\n    const dbFileInDbFolder = dbFolder + dbFileName;\n    let response;\n    try {\n        logger.debug('Downloading GeoIP database from: ' + url);\n        response = await fetch(url, { keepalive: false, signal: abortSignal });\n    }\n    catch (e) {\n        // Catching and re-throwing as async exception \n        // here is necessary, synch exceptions cannot be caught by the caller\n        throw new Error('Fetch error when downloading ' + url + ', error: ' + e);\n    }\n    if (!response.ok) {\n        throw new Error('HTTP error when downloading ' + url + ', status: ' + response.status);\n    }\n    // extract the tarball to a temporary folder\n    try {\n        fs.mkdirSync(downloadFolder, { recursive: true });\n    }\n    catch (e) {\n        throw new Error('Error creating temporary folder ' + downloadFolder + ', error: ' + e);\n    }\n    try {\n        await extractFileFromTarStream(dbFileName, response.body, downloadFolder);\n    }\n    catch (e) {\n        try {\n            fs.rmSync(downloadFolder, { recursive: true });\n        }\n        catch {\n            // ignore error when removing the temporary folder\n        }\n        throw e;\n    }\n    // check the hash of the extracted file\n    if (!isDbFileValid(dbFileInDownloadFolder, remoteHash)) {\n        try {\n            fs.rmSync(downloadFolder, { recursive: true });\n        }\n        catch {\n            // ignore error when removing the temporary folder\n        }\n        throw new Error('Downloaded database hash does not match the expected hash');\n    }\n    try {\n        // move the extracted file to the correct location\n        fs.renameSync(dbFileInDownloadFolder, dbFileInDbFolder);\n    }\n    catch (e) {\n        throw new Error('Error moving ' + dbFileInDownloadFolder + ' to ' + dbFileInDbFolder + ', error: ' + e);\n    }\n    finally {\n        try {\n            fs.rmSync(downloadFolder, { recursive: true });\n        }\n        catch {\n            // ignore error when removing the temporary folder\n        }\n    }\n    // set the db file permissions to rw only for the owner\n    try {\n        fs.chmodSync(dbFileInDbFolder, 0o600);\n    }\n    catch (err) {\n        throw new Error('Error setting permissions on ' + dbFileInDbFolder + ', error: ' + err);\n    }\n    logger.debug('Downloaded GeoIP database to: ' + dbFileInDbFolder);\n};\nconst downloadRemoteHash = async (remoteHashUrl, abortSignal) => {\n    // download the hash of the latest GeoIP database using fetch as text and trim it\n    let response;\n    try {\n        logger.debug('Downloading GeoIP database hash from: ' + remoteHashUrl);\n        response = await fetch(remoteHashUrl, { signal: abortSignal });\n    }\n    catch (e) {\n        // Catching and re-throwing as async exception \n        // here is necessary, synch exceptions cannot be caught by the caller\n        throw new Error('Fetch error when downloading ' + remoteHashUrl + ', error: ' + e);\n    }\n    if (!response.ok) {\n        throw new Error('HTTP error when downloading ' + remoteHashUrl + ', status: ' + response.status);\n    }\n    return (await response.text()).trim();\n};\nconst isDbFileValid = (dbFile, remoteHash) => {\n    // check if the local db exists and calculate its hash\n    try {\n        const db = fs.readFileSync(dbFile);\n        const localHash = crypto.createHash('sha384').update(db).digest('hex');\n        // if the hashes are different, download the latest database\n        if (localHash !== remoteHash) {\n            return false;\n        }\n        else {\n            return true;\n        }\n    }\n    catch {\n        // if the local db does not exist, or some other exception occurres db is not considered valid\n        return false;\n    }\n};\n// returns a Reader if a new db was downloaded, or if the caller wants to force return a reader\n// also if there was no need to download a new db\nexport const downloadGeoIpDatabase = async (dbFolder, forceReturnReader, abortSignal, mirrorUrl) => {\n    // This will throw if the download folder is not readable\n    if (!fs.existsSync(dbFolder)) {\n        // This will throw if the download folder is not writable\n        fs.mkdirSync(dbFolder, { recursive: true });\n    }\n    if (!dbFolder.endsWith('/')) {\n        dbFolder += '/';\n    }\n    let geoIpMirrorUrl = GEOIP_MIRROR_URL;\n    if (mirrorUrl !== undefined) {\n        if (!mirrorUrl.endsWith('/')) {\n            mirrorUrl += '/';\n        }\n        geoIpMirrorUrl = mirrorUrl;\n    }\n    const remoteHashUrl = geoIpMirrorUrl + DB_NAME + HASH_SUFFIX;\n    const dbDownloadUrl = geoIpMirrorUrl + DB_NAME + TAR_SUFFFIX;\n    const dbFileInDbFolder = dbFolder + DB_NAME + DB_SUFFIX;\n    const remoteHash = await downloadRemoteHash(remoteHashUrl, abortSignal);\n    const dbValid = isDbFileValid(dbFileInDbFolder, remoteHash);\n    if (dbValid === false) {\n        await downloadNewDb(dbDownloadUrl, dbFolder, remoteHash, abortSignal);\n        // return new reader if db was downloaded\n        return new Reader(fs.readFileSync(dbFileInDbFolder));\n    }\n    else {\n        logger.debug('The hash of the local GeoIP database matches the remote hash, no need to download a new database');\n    }\n    if (forceReturnReader) {\n        // return reader also for old db the caller wants it\n        return new Reader(fs.readFileSync(dbFileInDbFolder));\n    }\n    else {\n        // return undefined if the db is already up to date\n        return undefined;\n    }\n};\n//# sourceMappingURL=downloadGeoIpDatabase.js.map","import { Logger, filePathToNodeFormat } from '@streamr/utils';\nimport LongTimeout from 'long-timeout';\nimport { downloadGeoIpDatabase } from './downloadGeoIpDatabase';\nconst logger = new Logger('GeoIpLocator');\n// 30 days in milliseconds\nconst DEFAULT_DB_CHECK_INTERVAL = 30 * 24 * 60 * 60 * 1000;\n// 24 hours in milliseconds\nconst DEFAULT_DB_CHECK_ERROR_INTERVAL = 24 * 60 * 60 * 1000;\nexport class GeoIpLocator {\n    abortController;\n    geoIpDatabaseFolder;\n    dbCheckInterval;\n    dbCheckErrorInterval;\n    mirrorUrl;\n    reader;\n    dbCheckTimeout;\n    constructor(geoIpDatabaseFolder, dbCheckInterval = DEFAULT_DB_CHECK_INTERVAL, dbCheckErrorInterval = DEFAULT_DB_CHECK_ERROR_INTERVAL, mirrorUrl) {\n        this.abortController = new AbortController();\n        this.dbCheckInterval = dbCheckInterval;\n        this.dbCheckErrorInterval = dbCheckErrorInterval;\n        if (!geoIpDatabaseFolder.endsWith('/')) {\n            geoIpDatabaseFolder += '/';\n        }\n        this.geoIpDatabaseFolder = filePathToNodeFormat(geoIpDatabaseFolder);\n        this.mirrorUrl = mirrorUrl;\n    }\n    checkDatabase = async () => {\n        if (this.reader === undefined) {\n            // if we do not have a reader, create a new one in any case\n            this.reader = await downloadGeoIpDatabase(this.geoIpDatabaseFolder, true, this.abortController.signal, this.mirrorUrl);\n        }\n        else {\n            // if we already have a reader, create a new one only if db has changed\n            const newReader = await downloadGeoIpDatabase(this.geoIpDatabaseFolder, false, this.abortController.signal, this.mirrorUrl);\n            if (newReader !== undefined) {\n                this.reader = newReader;\n            }\n        }\n    };\n    scheduleCheck = async (timeout) => {\n        if (this.abortController.signal.aborted) {\n            return;\n        }\n        this.dbCheckTimeout = LongTimeout.setTimeout(async () => {\n            try {\n                await this.checkDatabase();\n                this.scheduleCheck(this.dbCheckInterval);\n            }\n            catch (err) {\n                logger.warn('GeoIpLocator: GeoIP database check failed', { err });\n                this.scheduleCheck(this.dbCheckErrorInterval);\n            }\n        }, timeout);\n    };\n    async start() {\n        if (this.dbCheckTimeout !== undefined) {\n            return;\n        }\n        await this.checkDatabase();\n        this.scheduleCheck(this.dbCheckInterval);\n    }\n    stop() {\n        if (this.dbCheckTimeout !== undefined) {\n            LongTimeout.clearTimeout(this.dbCheckTimeout);\n        }\n        this.abortController.abort();\n    }\n    lookup(ip) {\n        if (this.reader === undefined) {\n            logger.warn('GeoIpLocator: lookup called before database is ready (maybe start() was not called?');\n            return undefined;\n        }\n        // If ip is falsy, the library will crash\n        // this might happen despite the ts typings because the ip address \n        // comes from the ws server socket and is not under our control\n        if (!ip) {\n            return undefined;\n        }\n        const result = this.reader.get(ip);\n        if (!result?.location?.latitude || !result.location.longitude) {\n            return undefined;\n        }\n        else {\n            return {\n                latitude: result.location.latitude,\n                longitude: result.location.longitude\n            };\n        }\n    }\n}\n//# sourceMappingURL=GeoIpLocator.js.map"],"names":["logger"],"mappings":"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"}

package/package.json

@@ -1,21 +1,20 @@
 {
   "name": "@streamr/geoip-location",
-  "version": "103.1.2-rc.0",
+  "version": "103.2.0-experiment.0",
   "description": "Library for getting location information from IP addresses based on MaxMind GeoLite2 databases",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/streamr-dev/network.git",
     "directory": "packages/geoip-location"
   },
-  "main": "dist/src/exports.js",
+  "main": "./dist/exports.cjs",
+  "module": "./dist/exports.js",
+  "types": "./dist/exports.d.ts",
   "browser": {
-    "dist/src/exports.js": false,
-    "dist/src/GeoIpLocator.js": false,
-    "dist/src/downloadGeoIpDatabase.js": false
+    "./dist/exports.js": false
   },
-  "types": "dist/src/exports.d.ts",
   "files": [
-    "dist",
+    "dist/exports.*",
     "!*.tsbuildinfo",
     "README.md",
     "LICENSE"
@@ -23,15 +22,18 @@
   "license": "Apache-2.0",
   "author": "Streamr Network AG <contact@streamr.network>",
   "scripts": {
-    "build": "tsc -b tsconfig.node.json",
-    "check": "tsc -p ./tsconfig.jest.json",
-    "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
+    "prebuild": "npm run reset-self",
+    "build": "tsc -b",
+    "postbuild": "NODE_OPTIONS='--import tsx' rollup -c rollup.config.mts",
+    "check": "tsc -p tsconfig.jest.json",
+    "reset-self": "rimraf --glob 'dist/**/*.tsbuildinfo'",
+    "clean": "jest --clearCache --config '{}' || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
     "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
     "test": "jest test/unit",
     "test-unit": "jest test/unit"
   },
   "dependencies": {
-    "@streamr/utils": "103.1.2-rc.0",
+    "@streamr/utils": "103.2.0-experiment.0",
     "eventemitter3": "^5.0.0",
     "long-timeout": "^0.1.1",
     "mmdb-lib": "^3.0.1",
@@ -39,8 +41,13 @@
     "uuid": "^11.1.0"
   },
   "devDependencies": {
+    "@rollup/plugin-node-resolve": "^16.0.3",
     "@types/long-timeout": "^0.1.2",
     "@types/tar": "^6.1.11",
-    "express": "^5.1.0"
+    "express": "^5.2.0",
+    "rimraf": "^6.1.2",
+    "rollup": "^4.55.1",
+    "rollup-plugin-dts": "^6.3.0",
+    "tsx": "^4.21.0"
   }
 }

package/dist/src/GeoIpLocator.js

@@ -1,98 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeoIpLocator = void 0;
-const utils_1 = require("@streamr/utils");
-const long_timeout_1 = __importDefault(require("long-timeout"));
-const downloadGeoIpDatabase_1 = require("./downloadGeoIpDatabase");
-const logger = new utils_1.Logger(module);
-// 30 days in milliseconds
-const DEFAULT_DB_CHECK_INTERVAL = 30 * 24 * 60 * 60 * 1000;
-// 24 hours in milliseconds
-const DEFAULT_DB_CHECK_ERROR_INTERVAL = 24 * 60 * 60 * 1000;
-class GeoIpLocator {
-    abortController;
-    geoIpDatabaseFolder;
-    dbCheckInterval;
-    dbCheckErrorInterval;
-    mirrorUrl;
-    reader;
-    dbCheckTimeout;
-    constructor(geoIpDatabaseFolder, dbCheckInterval = DEFAULT_DB_CHECK_INTERVAL, dbCheckErrorInterval = DEFAULT_DB_CHECK_ERROR_INTERVAL, mirrorUrl) {
-        this.abortController = new AbortController();
-        this.dbCheckInterval = dbCheckInterval;
-        this.dbCheckErrorInterval = dbCheckErrorInterval;
-        if (!geoIpDatabaseFolder.endsWith('/')) {
-            geoIpDatabaseFolder += '/';
-        }
-        this.geoIpDatabaseFolder = (0, utils_1.filePathToNodeFormat)(geoIpDatabaseFolder);
-        this.mirrorUrl = mirrorUrl;
-    }
-    checkDatabase = async () => {
-        if (this.reader === undefined) {
-            // if we do not have a reader, create a new one in any case
-            this.reader = await (0, downloadGeoIpDatabase_1.downloadGeoIpDatabase)(this.geoIpDatabaseFolder, true, this.abortController.signal, this.mirrorUrl);
-        }
-        else {
-            // if we already have a reader, create a new one only if db has changed
-            const newReader = await (0, downloadGeoIpDatabase_1.downloadGeoIpDatabase)(this.geoIpDatabaseFolder, false, this.abortController.signal, this.mirrorUrl);
-            if (newReader !== undefined) {
-                this.reader = newReader;
-            }
-        }
-    };
-    scheduleCheck = async (timeout) => {
-        if (this.abortController.signal.aborted) {
-            return;
-        }
-        this.dbCheckTimeout = long_timeout_1.default.setTimeout(async () => {
-            try {
-                await this.checkDatabase();
-                this.scheduleCheck(this.dbCheckInterval);
-            }
-            catch (err) {
-                logger.warn('GeoIpLocator: GeoIP database check failed', { err });
-                this.scheduleCheck(this.dbCheckErrorInterval);
-            }
-        }, timeout);
-    };
-    async start() {
-        if (this.dbCheckTimeout !== undefined) {
-            return;
-        }
-        await this.checkDatabase();
-        this.scheduleCheck(this.dbCheckInterval);
-    }
-    stop() {
-        if (this.dbCheckTimeout !== undefined) {
-            long_timeout_1.default.clearTimeout(this.dbCheckTimeout);
-        }
-        this.abortController.abort();
-    }
-    lookup(ip) {
-        if (this.reader === undefined) {
-            logger.warn('GeoIpLocator: lookup called before database is ready (maybe start() was not called?');
-            return undefined;
-        }
-        // If ip is falsy, the library will crash
-        // this might happen despite the ts typings because the ip address 
-        // comes from the ws server socket and is not under our control
-        if (!ip) {
-            return undefined;
-        }
-        const result = this.reader.get(ip);
-        if (!result?.location?.latitude || !result.location.longitude) {
-            return undefined;
-        }
-        else {
-            return {
-                latitude: result.location.latitude,
-                longitude: result.location.longitude
-            };
-        }
-    }
-}
-exports.GeoIpLocator = GeoIpLocator;
-//# sourceMappingURL=GeoIpLocator.js.map

package/dist/src/GeoIpLocator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"GeoIpLocator.js","sourceRoot":"","sources":["../../src/GeoIpLocator.ts"],"names":[],"mappings":"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"}

package/dist/src/downloadGeoIpDatabase.d.ts

@@ -1,2 +0,0 @@
-import { CityResponse, Reader } from 'mmdb-lib';
-export declare const downloadGeoIpDatabase: (dbFolder: string, forceReturnReader: boolean, abortSignal: AbortSignal, mirrorUrl?: string) => Promise<Reader<CityResponse> | undefined>;

package/dist/src/downloadGeoIpDatabase.js

@@ -1,169 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadGeoIpDatabase = void 0;
-const crypto_1 = __importDefault(require("crypto"));
-const fs_1 = __importDefault(require("fs"));
-const mmdb_lib_1 = require("mmdb-lib");
-const tarHelper_1 = require("./tarHelper");
-const uuid_1 = require("uuid");
-const utils_1 = require("@streamr/utils");
-const GEOIP_MIRROR_URL = 'https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/master/redist/';
-const DB_NAME = 'GeoLite2-City';
-const TAR_SUFFFIX = '.tar.gz';
-const DB_SUFFIX = '.mmdb';
-const HASH_SUFFIX = '.mmdb.sha384';
-const logger = new utils_1.Logger(module);
-const downloadNewDb = async (url, dbFolder, remoteHash, abortSignal) => {
-    // make a unique name for the temporary download folder
-    // in case there are multiple downloads happening at the same time
-    const uniqueName = (0, uuid_1.v4)();
-    const downloadFolder = dbFolder + '.download' + uniqueName;
-    const dbFileName = DB_NAME + DB_SUFFIX;
-    const dbFileInDownloadFolder = downloadFolder + '/' + dbFileName;
-    const dbFileInDbFolder = dbFolder + dbFileName;
-    let response;
-    try {
-        logger.debug('Downloading GeoIP database from: ' + url);
-        response = await fetch(url, { keepalive: false, signal: abortSignal });
-    }
-    catch (e) {
-        // Catching and re-throwing as async exception 
-        // here is necessary, synch exceptions cannot be caught by the caller
-        throw new Error('Fetch error when downloading ' + url + ', error: ' + e);
-    }
-    if (!response.ok) {
-        throw new Error('HTTP error when downloading ' + url + ', status: ' + response.status);
-    }
-    // extract the tarball to a temporary folder
-    try {
-        fs_1.default.mkdirSync(downloadFolder, { recursive: true });
-    }
-    catch (e) {
-        throw new Error('Error creating temporary folder ' + downloadFolder + ', error: ' + e);
-    }
-    try {
-        await (0, tarHelper_1.extractFileFromTarStream)(dbFileName, response.body, downloadFolder);
-    }
-    catch (e) {
-        try {
-            fs_1.default.rmSync(downloadFolder, { recursive: true });
-        }
-        catch {
-            // ignore error when removing the temporary folder
-        }
-        throw e;
-    }
-    // check the hash of the extracted file
-    if (!isDbFileValid(dbFileInDownloadFolder, remoteHash)) {
-        try {
-            fs_1.default.rmSync(downloadFolder, { recursive: true });
-        }
-        catch {
-            // ignore error when removing the temporary folder
-        }
-        throw new Error('Downloaded database hash does not match the expected hash');
-    }
-    try {
-        // move the extracted file to the correct location
-        fs_1.default.renameSync(dbFileInDownloadFolder, dbFileInDbFolder);
-    }
-    catch (e) {
-        throw new Error('Error moving ' + dbFileInDownloadFolder + ' to ' + dbFileInDbFolder + ', error: ' + e);
-    }
-    finally {
-        try {
-            fs_1.default.rmSync(downloadFolder, { recursive: true });
-        }
-        catch {
-            // ignore error when removing the temporary folder
-        }
-    }
-    // set the db file permissions to rw only for the owner
-    try {
-        fs_1.default.chmodSync(dbFileInDbFolder, 0o600);
-    }
-    catch (err) {
-        throw new Error('Error setting permissions on ' + dbFileInDbFolder + ', error: ' + err);
-    }
-    logger.debug('Downloaded GeoIP database to: ' + dbFileInDbFolder);
-};
-const downloadRemoteHash = async (remoteHashUrl, abortSignal) => {
-    // download the hash of the latest GeoIP database using fetch as text and trim it
-    let response;
-    try {
-        logger.debug('Downloading GeoIP database hash from: ' + remoteHashUrl);
-        response = await fetch(remoteHashUrl, { signal: abortSignal });
-    }
-    catch (e) {
-        // Catching and re-throwing as async exception 
-        // here is necessary, synch exceptions cannot be caught by the caller
-        throw new Error('Fetch error when downloading ' + remoteHashUrl + ', error: ' + e);
-    }
-    if (!response.ok) {
-        throw new Error('HTTP error when downloading ' + remoteHashUrl + ', status: ' + response.status);
-    }
-    return (await response.text()).trim();
-};
-const isDbFileValid = (dbFile, remoteHash) => {
-    // check if the local db exists and calculate its hash
-    try {
-        const db = fs_1.default.readFileSync(dbFile);
-        const localHash = crypto_1.default.createHash('sha384').update(db).digest('hex');
-        // if the hashes are different, download the latest database
-        if (localHash !== remoteHash) {
-            return false;
-        }
-        else {
-            return true;
-        }
-    }
-    catch {
-        // if the local db does not exist, or some other exception occurres db is not considered valid
-        return false;
-    }
-};
-// returns a Reader if a new db was downloaded, or if the caller wants to force return a reader
-// also if there was no need to download a new db
-const downloadGeoIpDatabase = async (dbFolder, forceReturnReader, abortSignal, mirrorUrl) => {
-    // This will throw if the download folder is not readable
-    if (!fs_1.default.existsSync(dbFolder)) {
-        // This will throw if the download folder is not writable
-        fs_1.default.mkdirSync(dbFolder, { recursive: true });
-    }
-    if (!dbFolder.endsWith('/')) {
-        dbFolder += '/';
-    }
-    let geoIpMirrorUrl = GEOIP_MIRROR_URL;
-    if (mirrorUrl !== undefined) {
-        if (!mirrorUrl.endsWith('/')) {
-            mirrorUrl += '/';
-        }
-        geoIpMirrorUrl = mirrorUrl;
-    }
-    const remoteHashUrl = geoIpMirrorUrl + DB_NAME + HASH_SUFFIX;
-    const dbDownloadUrl = geoIpMirrorUrl + DB_NAME + TAR_SUFFFIX;
-    const dbFileInDbFolder = dbFolder + DB_NAME + DB_SUFFIX;
-    const remoteHash = await downloadRemoteHash(remoteHashUrl, abortSignal);
-    const dbValid = isDbFileValid(dbFileInDbFolder, remoteHash);
-    if (dbValid === false) {
-        await downloadNewDb(dbDownloadUrl, dbFolder, remoteHash, abortSignal);
-        // return new reader if db was downloaded
-        return new mmdb_lib_1.Reader(fs_1.default.readFileSync(dbFileInDbFolder));
-    }
-    else {
-        logger.debug('The hash of the local GeoIP database matches the remote hash, no need to download a new database');
-    }
-    if (forceReturnReader) {
-        // return reader also for old db the caller wants it
-        return new mmdb_lib_1.Reader(fs_1.default.readFileSync(dbFileInDbFolder));
-    }
-    else {
-        // return undefined if the db is already up to date
-        return undefined;
-    }
-};
-exports.downloadGeoIpDatabase = downloadGeoIpDatabase;
-//# sourceMappingURL=downloadGeoIpDatabase.js.map

package/dist/src/downloadGeoIpDatabase.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"downloadGeoIpDatabase.js","sourceRoot":"","sources":["../../src/downloadGeoIpDatabase.ts"],"names":[],"mappings":"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"}

package/dist/src/exports.d.ts

@@ -1 +0,0 @@
-export { GeoIpLocator } from './GeoIpLocator';

package/dist/src/exports.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeoIpLocator = void 0;
-var GeoIpLocator_1 = require("./GeoIpLocator");
-Object.defineProperty(exports, "GeoIpLocator", { enumerable: true, get: function () { return GeoIpLocator_1.GeoIpLocator; } });
-//# sourceMappingURL=exports.js.map

package/dist/src/exports.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../src/exports.ts"],"names":[],"mappings":";;;AAAA,+CAA6C;AAApC,4GAAA,YAAY,OAAA"}

package/dist/src/tarHelper.d.ts

@@ -1,2 +0,0 @@
-import { ReadableStream } from 'stream/web';
-export declare const extractFileFromTarStream: (fileName: string, stream: ReadableStream<any>, downloadFolder: string) => Promise<void>;

package/dist/src/tarHelper.js

@@ -1,40 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractFileFromTarStream = void 0;
-const stream_1 = require("stream");
-const tar_1 = require("tar");
-const path_1 = __importDefault(require("path")); // use NodePath to avoid conflict with other 'path' symbols
-const fs_1 = __importDefault(require("fs"));
-const doExtractFileFromTarStream = (fileName, stream, downloadFolder) => {
-    return new Promise((resolve, reject) => {
-        try {
-            const nodeStream = stream_1.Readable.fromWeb(stream);
-            (0, stream_1.pipeline)(nodeStream, (0, tar_1.extract)({
-                cwd: downloadFolder,
-                filter: (entryPath) => path_1.default.basename(entryPath) === fileName,
-                strip: 1
-            }), (err) => {
-                if (err) {
-                    reject(new Error('Error extracting tarball to ' + downloadFolder + ', error: ' + err));
-                }
-                else {
-                    resolve();
-                }
-            });
-        }
-        catch (e) {
-            reject(new Error('Failed to create nodejs Readable from web stream: ' + e));
-        }
-    });
-};
-const extractFileFromTarStream = async (fileName, stream, downloadFolder) => {
-    await doExtractFileFromTarStream(fileName, stream, downloadFolder);
-    if (!fs_1.default.existsSync(path_1.default.join(downloadFolder, fileName))) {
-        throw new Error('File not found in tarball: ' + fileName);
-    }
-};
-exports.extractFileFromTarStream = extractFileFromTarStream;
-//# sourceMappingURL=tarHelper.js.map

package/dist/src/tarHelper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tarHelper.js","sourceRoot":"","sources":["../../src/tarHelper.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA2C;AAC3C,6BAA6B;AAE7B,gDAA2B,CAAK,2DAA2D;AAC3F,4CAAmB;AAEnB,MAAM,0BAA0B,GAAG,CAAC,QAAgB,EAAE,MAA2B,EAAE,cAAsB,EAAiB,EAAE;IACxH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,CAAC;YACD,MAAM,UAAU,GAAG,iBAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YAC3C,IAAA,iBAAQ,EAAC,UAAU,EACf,IAAA,aAAO,EAAC;gBACJ,GAAG,EAAE,cAAc;gBACnB,MAAM,EAAE,CAAC,SAAiB,EAAW,EAAE,CAAC,cAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,QAAQ;gBACjF,KAAK,EAAE,CAAC;aACX,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;gBACR,IAAI,GAAG,EAAE,CAAC;oBACN,MAAM,CAAC,IAAI,KAAK,CAAC,8BAA8B,GAAG,cAAc,GAAG,WAAW,GAAG,GAAG,CAAC,CAAC,CAAA;gBAC1F,CAAC;qBAAM,CAAC;oBACJ,OAAO,EAAE,CAAA;gBACb,CAAC;YACL,CAAC,CAAC,CAAA;QACV,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,CAAC,IAAI,KAAK,CAAC,oDAAoD,GAAG,CAAC,CAAC,CAAC,CAAA;QAC/E,CAAC;IACL,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAEM,MAAM,wBAAwB,GAAG,KAAK,EAAE,QAAgB,EAAE,MAA2B,EAAE,cAAsB,EAAiB,EAAE;IACnI,MAAM,0BAA0B,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,CAAA;IAClE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,cAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,6BAA6B,GAAG,QAAQ,CAAC,CAAA;IAC7D,CAAC;AACL,CAAC,CAAA;AALY,QAAA,wBAAwB,4BAKpC"}