geoip-lite2 2.2.8-beta.4 → 2.2.8-beta.7

package/data/city.checksum

@@ -1 +1 @@
-f4a4c624512ef085feded9b74f5a797c1fedfae6c9a31d1a2c65462e23338d24  GeoLite2-City-CSV_20251107.zip
+1e2d74273ff207a2a7d129a195b300dbc45b22a4358cd3e45de17ae47ccab4f8  GeoLite2-City-CSV_20251128.zip

package/data/country.checksum

@@ -1 +1 @@
-f6acd69d1aae734a4ccf1130d6133c99042c716ff814a4cc045b2109406c543b  GeoLite2-Country-CSV_20251107.zip
+67ac2aeddc82fc748089eaf5b01edf2ce0895c0c383a4a3f6812270a93bb3333  GeoLite2-Country-CSV_20251128.zip

package/fsWatcher.js

@@ -0,0 +1,85 @@
+// ============================================================================
+// File System Watcher for Auto-Reloading GeoIP Data
+// ============================================================================
+
+const { access, constants, watch } = require('node:fs');
+const { join } = require('node:path');
+const FSWatcher = {};
+
+// ============================================================================
+// Watcher Management
+// ============================================================================
+
+/**
+ * Takes an FSWatcher object and closes it.
+ * @param {string} name - The name of the watcher to close.
+ */
+const stopWatching = name => FSWatcher[name].close();
+
+// ============================================================================
+// File System Watch with Debounce
+// ============================================================================
+
+/**
+ * Takes a directory/file and watch for change. Upon change, call the callback.
+ *
+ * @param {String} name - name of this watcher
+ * @param {String} directory - path to the directory to watch
+ * @param {String} [filename] - (optional) specific filename to watch for, watches for all files in the directory if unspecified
+ * @param {Number} cdDelay - delay to wait before triggering the callback
+ * @param {Function} callback - function() - called when changes are detected
+ */
+const makeFsWatchFilter = (name, directory, filename, cdDelay, callback) => {
+	let cdId = null;
+
+	// Delete the cdId and callback the outer function
+	function timeoutCallback() {
+		cdId = null;
+		callback();
+	}
+
+	// This function is called when there is a change in the data directory
+	// It sets a timer to wait for the change to be completed
+	function onWatchEvent(event, changedFile) {
+		// Check to make sure changedFile is not null
+		if (!changedFile) return;
+
+		const filePath = join(directory, changedFile);
+		if (!filename || filename === changedFile) {
+			access(filePath, constants.F_OK, err => {
+				if (err) return console.error(err);
+
+				// At this point, a new file system activity has been detected,
+				// We have to wait for file transfer to be finished before moving on.
+
+				// If a cdId already exists, we delete it
+				if (cdId !== null) {
+					clearTimeout(cdId);
+					cdId = null;
+				}
+
+				// Once the cdDelay has passed, the timeoutCallback function will be called
+				cdId = setTimeout(timeoutCallback, cdDelay);
+			});
+		}
+	}
+
+	// Manage the case where filename is missing (because it's optional)
+	if (typeof cdDelay === 'function') {
+		callback = cdDelay;
+		cdDelay = filename;
+		filename = null;
+	}
+
+	if (FSWatcher[name]) {
+		stopWatching(name);
+	}
+
+	FSWatcher[name] = watch(directory, onWatchEvent);
+};
+
+// ============================================================================
+// Exports
+// ============================================================================
+
+module.exports = { makeFsWatchFilter, stopWatching };

package/index.js

@@ -0,0 +1,571 @@
+// ============================================================================
+// Dependencies
+// ============================================================================
+
+const { open, fstat, read, close, openSync, fstatSync, readSync, closeSync } = require('node:fs');
+const { join, resolve } = require('node:path');
+const { isIP } = require('node:net');
+const async = require('async');
+const { aton4, aton6, cmp6, ntoa4, ntoa6, cmp } = require('./utils.js');
+const fsWatcher = require('./fsWatcher.js');
+const { version } = require('./package.json');
+
+// ============================================================================
+// Configuration
+// ============================================================================
+
+const watcherName = 'dataWatcher';
+
+const geoDataDir = resolve(
+	__dirname,
+	global.geoDataDir || process.env.GEODATADIR || './data/'
+);
+
+const dataFiles = {
+	city: join(geoDataDir, 'geoip-city.dat'),
+	city6: join(geoDataDir, 'geoip-city6.dat'),
+	cityNames: join(geoDataDir, 'geoip-city-names.dat'),
+	country: join(geoDataDir, 'geoip-country.dat'),
+	country6: join(geoDataDir, 'geoip-country6.dat'),
+};
+
+const privateRange4 = [
+	[aton4('10.0.0.0'), aton4('10.255.255.255')],
+	[aton4('172.16.0.0'), aton4('172.31.255.255')],
+	[aton4('192.168.0.0'), aton4('192.168.255.255')],
+];
+
+// ============================================================================
+// Cache Configuration
+// ============================================================================
+
+const conf4 = {
+	firstIP: null,
+	lastIP: null,
+	lastLine: 0,
+	locationBuffer: null,
+	locationRecordSize: 88,
+	mainBuffer: null,
+	recordSize: 24,
+};
+
+const conf6 = {
+	firstIP: null,
+	lastIP: null,
+	lastLine: 0,
+	mainBuffer: null,
+	recordSize: 48,
+};
+
+let cache4 = { ...conf4 };
+let cache6 = { ...conf6 };
+
+const RECORD_SIZE = 10;
+const RECORD_SIZE6 = 34;
+
+// ============================================================================
+// Helper Functions
+// ============================================================================
+
+const removeNullTerminator = str => {
+	const nullIndex = str.indexOf('\0');
+	return nullIndex === -1 ? str : str.substring(0, nullIndex);
+};
+
+const readIp6 = (buffer, line, recordSize, offset) => {
+	const ipArray = [];
+	for (let i = 0; i < 2; i++) {
+		ipArray.push(buffer.readUInt32BE((line * recordSize) + (offset * 16) + (i * 4)));
+	}
+	return ipArray;
+};
+
+// ============================================================================
+// IPv4 Lookup Function
+// ============================================================================
+
+const lookup4 = ip => {
+	let fline = 0;
+	let cline = cache4.lastLine;
+	let floor = cache4.lastIP;
+	let ceil = cache4.firstIP;
+	let line, locId;
+
+	const buffer = cache4.mainBuffer;
+	const locBuffer = cache4.locationBuffer;
+	const privateRange = privateRange4;
+	const recordSize = cache4.recordSize;
+	const locRecordSize = cache4.locationRecordSize;
+
+	const geoData = {
+		range: [null, null],
+		country: '',
+		region: '',
+		eu: '',
+		timezone: '',
+		city: '',
+		ll: [null, null],
+		metro: null,
+		area: null,
+	};
+
+	// Outside IPv4 range
+	if (ip > cache4.lastIP || ip < cache4.firstIP) return null;
+
+	// Private IP
+	for (let i = 0; i < privateRange.length; i++) {
+		if (ip >= privateRange[i][0] && ip <= privateRange[i][1]) return null;
+	}
+
+	while (true) {
+		line = Math.round((cline - fline) / 2) + fline;
+		const offset = line * recordSize;
+		floor = buffer.readUInt32BE(offset);
+		ceil = buffer.readUInt32BE(offset + 4);
+
+		if (floor <= ip && ceil >= ip) {
+			geoData.range = [floor, ceil];
+
+			if (recordSize === RECORD_SIZE) {
+				geoData.country = buffer.toString('utf8', offset + 8, offset + 10);
+			} else {
+				locId = buffer.readUInt32BE(offset + 8);
+
+				// -1>>>0 is a marker for "No Location Info"
+				if (-1 >>> 0 > locId) {
+					const locOffset = locId * locRecordSize;
+					geoData.country = removeNullTerminator(locBuffer.toString('utf8', locOffset, locOffset + 2));
+					geoData.region = removeNullTerminator(locBuffer.toString('utf8', locOffset + 2, locOffset + 5));
+					geoData.metro = locBuffer.readInt32BE(locOffset + 5);
+					geoData.ll[0] = buffer.readInt32BE(offset + 12) / 10000; // latitude
+					geoData.ll[1] = buffer.readInt32BE(offset + 16) / 10000; // longitude
+					geoData.area = buffer.readUInt32BE(offset + 20);
+					geoData.eu = removeNullTerminator(locBuffer.toString('utf8', locOffset + 9, locOffset + 10));
+					geoData.timezone = removeNullTerminator(locBuffer.toString('utf8', locOffset + 10, locOffset + 42));
+					geoData.city = removeNullTerminator(locBuffer.toString('utf8', locOffset + 42, locOffset + locRecordSize));
+				}
+			}
+
+			return geoData;
+		} else if (fline === cline) {
+			return null;
+		} else if (fline === (cline - 1)) {
+			if (line === fline) {
+				fline = cline;
+			} else {
+				cline = fline;
+			}
+		} else if (floor > ip) {
+			cline = line;
+		} else if (ceil < ip) {
+			fline = line;
+		}
+	}
+};
+
+// ============================================================================
+// IPv6 Lookup Function
+// ============================================================================
+
+const lookup6 = ip => {
+	const buffer = cache6.mainBuffer;
+	const recordSize = cache6.recordSize;
+	const locBuffer = cache4.locationBuffer;
+	const locRecordSize = cache4.locationRecordSize;
+
+	const geoData = {
+		range: [null, null],
+		country: '',
+		region: '',
+		eu: '',
+		timezone: '',
+		city: '',
+		ll: [null, null],
+		metro: null,
+		area: null,
+	};
+
+	let fline = 0;
+	let cline = cache6.lastLine;
+	let floor = cache6.lastIP;
+	let ceil = cache6.firstIP;
+	let line, locId;
+
+	if (cmp6(ip, cache6.lastIP) > 0 || cmp6(ip, cache6.firstIP) < 0) return null;
+
+	while (true) {
+		line = Math.round((cline - fline) / 2) + fline;
+		floor = readIp6(buffer, line, recordSize, 0);
+		ceil = readIp6(buffer, line, recordSize, 1);
+
+		if (cmp6(floor, ip) <= 0 && cmp6(ceil, ip) >= 0) {
+			const offset = line * recordSize;
+			if (recordSize === RECORD_SIZE6) {
+				geoData.country = removeNullTerminator(buffer.toString('utf8', offset + 32, offset + 34));
+			} else {
+				locId = buffer.readUInt32BE(offset + 32);
+
+				// -1>>>0 is a marker for "No Location Info"
+				if (-1 >>> 0 > locId) {
+					const locOffset = locId * locRecordSize;
+					geoData.country = removeNullTerminator(locBuffer.toString('utf8', locOffset, locOffset + 2));
+					geoData.region = removeNullTerminator(locBuffer.toString('utf8', locOffset + 2, locOffset + 5));
+					geoData.metro = locBuffer.readInt32BE(locOffset + 5);
+					geoData.ll[0] = buffer.readInt32BE(offset + 36) / 10000; // latitude
+					geoData.ll[1] = buffer.readInt32BE(offset + 40) / 10000; // longitude
+					geoData.area = buffer.readUInt32BE(offset + 44); // area
+					geoData.eu = removeNullTerminator(locBuffer.toString('utf8', locOffset + 9, locOffset + 10));
+					geoData.timezone = removeNullTerminator(locBuffer.toString('utf8', locOffset + 10, locOffset + 42));
+					geoData.city = removeNullTerminator(locBuffer.toString('utf8', locOffset + 42, locOffset + locRecordSize));
+				}
+			}
+			// We do not currently have detailed region/city info for IPv6, but finally have coords
+			return geoData;
+		} else if (fline === cline) {
+			return null;
+		} else if (fline === (cline - 1)) {
+			if (line === fline) {
+				fline = cline;
+			} else {
+				cline = fline;
+			}
+		} else if (cmp6(floor, ip) > 0) {
+			cline = line;
+		} else if (cmp6(ceil, ip) < 0) {
+			fline = line;
+		}
+	}
+};
+
+// ============================================================================
+// IPv4-Mapped IPv6 Handler
+// ============================================================================
+
+const V6_PREFIX_1 = '0:0:0:0:0:FFFF:';
+const V6_PREFIX_2 = '::FFFF:';
+const get4mapped = ip => {
+	const ipv6 = ip.toUpperCase();
+	if (ipv6.startsWith(V6_PREFIX_1)) return ipv6.substring(V6_PREFIX_1.length);
+	if (ipv6.startsWith(V6_PREFIX_2)) return ipv6.substring(V6_PREFIX_2.length);
+	return null;
+};
+
+// ============================================================================
+// Data Loading Functions - IPv4
+// ============================================================================
+
+function preload(callback) {
+	let datFile;
+	let datSize;
+	const asyncCache = { ...conf4 };
+
+	// When the preload function receives a callback, do the task asynchronously
+	if (typeof arguments[0] === 'function') {
+		async.series([
+			cb => {
+				async.series([
+					cb2 => {
+						open(dataFiles.cityNames, 'r', (err, file) => {
+							datFile = file;
+							cb2(err);
+						});
+					},
+					cb2 => {
+						fstat(datFile, (err, stats) => {
+							datSize = stats.size;
+							asyncCache.locationBuffer = Buffer.alloc(datSize);
+							cb2(err);
+						});
+					},
+					cb2 => {
+						read(datFile, asyncCache.locationBuffer, 0, datSize, 0, cb2);
+					},
+					cb2 => {
+						close(datFile, cb2);
+					},
+					cb2 => {
+						open(dataFiles.city, 'r', (err, file) => {
+							datFile = file;
+							cb2(err);
+						});
+					},
+					cb2 => {
+						fstat(datFile, (err, stats) => {
+							datSize = stats.size;
+							cb2(err);
+						});
+					},
+				], err => {
+					if (err) {
+						if (err.code !== 'ENOENT' && err.code !== 'EBADF') {
+							throw err;
+						}
+
+						open(dataFiles.country, 'r', (err, file) => {
+							if (err) {
+								cb(err);
+							} else {
+								datFile = file;
+								fstat(datFile, (err, stats) => {
+									datSize = stats.size;
+									asyncCache.recordSize = RECORD_SIZE;
+
+									cb();
+								});
+							}
+						});
+
+					} else {
+						cb();
+					}
+				});
+			}, () => {
+				asyncCache.mainBuffer = Buffer.alloc(datSize);
+
+				async.series([
+					cb2 => {
+						read(datFile, asyncCache.mainBuffer, 0, datSize, 0, cb2);
+					},
+					cb2 => {
+						close(datFile, cb2);
+					},
+				], err => {
+					if (!err) {
+						asyncCache.lastLine = (datSize / asyncCache.recordSize) - 1;
+						asyncCache.lastIP = asyncCache.mainBuffer.readUInt32BE((asyncCache.lastLine * asyncCache.recordSize) + 4);
+						asyncCache.firstIP = asyncCache.mainBuffer.readUInt32BE(0);
+						cache4 = asyncCache;
+					}
+					callback(err);
+				});
+			},
+		]);
+	} else {
+		try {
+			datFile = openSync(dataFiles.cityNames, 'r');
+			datSize = fstatSync(datFile).size;
+			if (datSize === 0) {
+				const err = new Error('Empty file');
+				err.code = 'EMPTY_FILE';
+				throw err;
+			}
+
+			cache4.locationBuffer = Buffer.alloc(datSize);
+			readSync(datFile, cache4.locationBuffer, 0, datSize, 0);
+			closeSync(datFile);
+
+			datFile = openSync(dataFiles.city, 'r');
+			datSize = fstatSync(datFile).size;
+		} catch (err) {
+			if (err.code !== 'ENOENT' && err.code !== 'EBADF' && err.code !== 'EMPTY_FILE') {
+				throw err;
+			}
+
+			datFile = openSync(dataFiles.country, 'r');
+			datSize = fstatSync(datFile).size;
+			cache4.recordSize = RECORD_SIZE;
+		}
+
+		cache4.mainBuffer = Buffer.alloc(datSize);
+		readSync(datFile, cache4.mainBuffer, 0, datSize, 0);
+		closeSync(datFile);
+
+		cache4.lastLine = (datSize / cache4.recordSize) - 1;
+		cache4.lastIP = cache4.mainBuffer.readUInt32BE((cache4.lastLine * cache4.recordSize) + 4);
+		cache4.firstIP = cache4.mainBuffer.readUInt32BE(0);
+	}
+}
+
+// ============================================================================
+// Data Loading Functions - IPv6
+// ============================================================================
+
+function preload6(callback) {
+	let datFile;
+	let datSize;
+	const asyncCache6 = { ...conf6 };
+
+	// When the preload function receives a callback, do the task asynchronously
+	if (typeof arguments[0] === 'function') {
+		async.series([
+			cb => {
+				async.series([
+					cb2 => {
+						open(dataFiles.city6, 'r', (err, file) => {
+							datFile = file;
+							cb2(err);
+						});
+					},
+					cb2 => {
+						fstat(datFile, (err, stats) => {
+							datSize = stats.size;
+							cb2(err);
+						});
+					},
+				], err => {
+					if (err) {
+						if (err.code !== 'ENOENT' && err.code !== 'EBADF') {
+							throw err;
+						}
+
+						open(dataFiles.country6, 'r', (err, file) => {
+							if (err) {
+								cb(err);
+							} else {
+								datFile = file;
+								fstat(datFile, (err, stats) => {
+									datSize = stats.size;
+									asyncCache6.recordSize = RECORD_SIZE6;
+
+									cb();
+								});
+							}
+						});
+					} else {
+						cb();
+					}
+				});
+			}, () => {
+				asyncCache6.mainBuffer = Buffer.alloc(datSize);
+
+				async.series([
+					cb2 => {
+						read(datFile, asyncCache6.mainBuffer, 0, datSize, 0, cb2);
+					},
+					cb2 => {
+						close(datFile, cb2);
+					},
+				], err => {
+					if (!err) {
+						asyncCache6.lastLine = (datSize / asyncCache6.recordSize) - 1;
+						asyncCache6.lastIP = readIp6(asyncCache6.mainBuffer, asyncCache6.lastLine, asyncCache6.recordSize, 1);
+						asyncCache6.firstIP = readIp6(asyncCache6.mainBuffer, 0, asyncCache6.recordSize, 0);
+						cache6 = asyncCache6;
+					}
+					callback(err);
+				});
+			},
+		]);
+	} else {
+		try {
+			datFile = openSync(dataFiles.city6, 'r');
+			datSize = fstatSync(datFile).size;
+
+			if (datSize === 0) {
+				const err = new Error('Empty file');
+				err.code = 'EMPTY_FILE';
+				throw err;
+			}
+		} catch (err) {
+			if (err.code !== 'ENOENT' && err.code !== 'EBADF' && err.code !== 'EMPTY_FILE') {
+				throw err;
+			}
+
+			datFile = openSync(dataFiles.country6, 'r');
+			datSize = fstatSync(datFile).size;
+			cache6.recordSize = RECORD_SIZE6;
+		}
+
+		cache6.mainBuffer = Buffer.alloc(datSize);
+		readSync(datFile, cache6.mainBuffer, 0, datSize, 0);
+		closeSync(datFile);
+
+		cache6.lastLine = (datSize / cache6.recordSize) - 1;
+		cache6.lastIP = readIp6(cache6.mainBuffer, cache6.lastLine, cache6.recordSize, 1);
+		cache6.firstIP = readIp6(cache6.mainBuffer, 0, cache6.recordSize, 0);
+	}
+}
+
+// ============================================================================
+// Public API
+// ============================================================================
+
+module.exports = {
+	cmp,
+
+	lookup: ip => {
+		if (!ip) {
+			return null;
+		} else if (typeof ip === 'number') {
+			return lookup4(ip);
+		} else if (isIP(ip) === 4) {
+			return lookup4(aton4(ip));
+		} else if (isIP(ip) === 6) {
+			const ipv4 = get4mapped(ip);
+			if (ipv4) {
+				return lookup4(aton4(ipv4));
+			} else {
+				return lookup6(aton6(ip));
+			}
+		}
+
+		return null;
+	},
+
+	pretty: n => {
+		if (typeof n === 'string') {
+			return n;
+		} else if (typeof n === 'number') {
+			return ntoa4(n);
+		} else if (Array.isArray(n)) {
+			return ntoa6(n);
+		}
+
+		return n;
+	},
+
+	// Start watching for data updates. The watcher waits one minute for file transfer to
+	// complete before triggering the callback.
+	startWatchingDataUpdate: callback => {
+		fsWatcher.makeFsWatchFilter(watcherName, geoDataDir, 60 * 1000, () => {
+			// Reload data
+			async.series([
+				cb => {
+					preload(cb);
+				}, cb => {
+					preload6(cb);
+				},
+			], callback);
+		});
+	},
+
+	// Stop watching for data updates.
+	stopWatchingDataUpdate: () => fsWatcher.stopWatching(watcherName),
+
+	// Clear data
+	clear: () => {
+		cache4 = { ...conf4 };
+		cache6 = { ...conf6 };
+	},
+
+	// Reload data synchronously
+	reloadDataSync: () => {
+		preload();
+		preload6();
+	},
+
+	// Reload data asynchronously
+	reloadData: callback => {
+		// Reload data
+		async.series([
+			cb => {
+				preload(cb);
+			},
+			cb => {
+				preload6(cb);
+			},
+		], callback);
+	},
+
+	version,
+};
+
+// ============================================================================
+// Initialize - Load data on module startup
+// ============================================================================
+
+preload();
+preload6();
+
+// lookup4 = gen_lookup('geoip-country.dat', 4);
+// lookup6 = gen_lookup('geoip-country6.dat', 16);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geoip-lite2",
-  "version": "2.2.8-beta.4",
+  "version": "2.2.8-beta.7",
   "description": "A light weight native JavaScript implementation of GeoIP API from MaxMind. Improved and faster version by Sefinek.",
   "keywords": [
     "city",
@@ -52,7 +52,7 @@
   "license": "Apache-2.0",
   "author": "Philip Tellis <philip@bluesmoon.info> (https://bluesmoon.info)",
   "type": "commonjs",
-  "main": "dist/main.js",
+  "main": "index.js",
   "types": "index.d.ts",
   "directories": {
     "lib": "lib",
@@ -60,15 +60,18 @@
   },
   "files": [
     "data",
-    "dist",
     "tools",
     "AUTHORS",
+    "fsWatcher.js",
     "index.d.ts",
+    "index.js",
     "LICENSE",
-    "README.md"
+    "README.md",
+    "utils.js"
   ],
   "scripts": {
-    "minify": "node minify.js",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "test": "jest test",
     "up": "ncu -u && npm install && npm update && npm audit fix",
     "updatedb": "node tools/updatedb.js",
@@ -80,15 +83,14 @@
     "async": "^3.2.6",
     "iconv-lite": "0.7.0",
     "ip-address": "^10.1.0",
-    "rimraf": "^6.1.0"
+    "rimraf": "^6.1.2"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.1",
     "globals": "^16.5.0",
-    "jest": "^30.2.0",
-    "terser": "^5.44.1"
+    "jest": "^30.2.0"
   },
   "engines": {
-    "node": ">=10.3.0"
+    "node": ">=20.0.0"
   }
 }

package/tools/updatedb.js

@@ -23,7 +23,7 @@ const async = require('async');
 const { decodeStream } = require('iconv-lite');
 const rimraf = require('rimraf').sync;
 const AdmZip = require('adm-zip');
-const utils = require('../lib/utils.js');
+const utils = require('../utils.js');
 const { Address6, Address4 } = require('ip-address');
 
 // ============================================================================
@@ -32,12 +32,10 @@ const { Address6, Address4 } = require('ip-address');
 
 // Logging utility for consistent and readable output
 const log = {
-	info: (msg, ...logArgs) => console.log('[INFO]', msg, ...logArgs),
-	success: (msg, ...logArgs) => console.log('[SUCCESS]', msg, ...logArgs),
-	warn: (msg, ...logArgs) => console.warn('[WARN]', msg, ...logArgs),
-	error: (msg, ...logArgs) => console.error('[ERROR]', msg, ...logArgs),
-	progress: (msg) => process.stdout.write(`[INFO] ${msg}... `),
-	done: () => console.log('Done'),
+	info: (msg, ...logArgs) => console.log(`[INFO] ${msg}`, ...logArgs),
+	success: (msg, ...logArgs) => console.log(`[SUCCESS] ${msg}`, ...logArgs),
+	warn: (msg, ...logArgs) => console.warn(`[WARN] ${msg}`, ...logArgs),
+	error: (msg, ...logArgs) => console.error(`[ERROR] ${msg}`, ...logArgs),
 };
 
 // ============================================================================
@@ -114,8 +112,8 @@ function tryFixingLine(line) {
 		pos1 = pos2;
 		pos2 = line.indexOf(',', pos1 + 1);
 		if (pos2 < 0) pos2 = line.length;
-		if (line.indexOf('\'', (pos1 || 0)) > -1 && line.indexOf('\'', pos1) < pos2 && line[pos1 + 1] != '"' && line[pos2 - 1] != '"') {
-			line = line.substr(0, pos1 + 1) + '"' + line.substr(pos1 + 1, pos2 - pos1 - 1) + '"' + line.substr(pos2, line.length - pos2);
+		if (line.indexOf('\'', (pos1 || 0)) > -1 && line.indexOf('\'', pos1) < pos2 && line[pos1 + 1] !== '"' && line[pos2 - 1] !== '"') {
+			line = line.substring(0, pos1 + 1) + '"' + line.substring(pos1 + 1, pos2) + '"' + line.substring(pos2);
 			pos2 = line.indexOf(',', pos2 + 1);
 			if (pos2 < 0) pos2 = line.length;
 		}
@@ -267,14 +265,12 @@ function fetch(database, cb) {
 		}
 
 		tmpFilePipe.on('close', () => {
-			log.done();
+			log.info(`Retrieved ${fileName}`);
 			cb(null, tmpFile, fileName, database);
 		});
 	}
 
 	mkdir(tmpFile);
-
-	log.progress(`Retrieving ${fileName}`);
 }
 
 function extract(tmpFile, tmpFileName, database, cb) {
@@ -283,7 +279,7 @@ function extract(tmpFile, tmpFileName, database, cb) {
 	if (path.extname(tmpFileName) !== '.zip') {
 		cb(null, database);
 	} else {
-		log.progress('Extracting ' + tmpFileName);
+		log.info('Extracting ' + tmpFileName);
 		const zip = new AdmZip(tmpFile);
 		const zipEntries = zip.getEntries();
 
@@ -297,7 +293,7 @@ function extract(tmpFile, tmpFileName, database, cb) {
 			fs.writeFileSync(destinationPath, entry.getData());
 		});
 
-		log.done();
+		log.info('Extracted ' + tmpFileName);
 		cb(null, database);
 	}
 }
@@ -313,7 +309,7 @@ function processLookupCountry(src, cb) {
 	}
 	const tmpDataFile = path.join(tmpPath, src);
 
-	log.progress('Processing lookup data (this may take a moment)');
+	log.info('Processing lookup data');
 
 	const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile).pipe(decodeStream('latin1')), output: process.stdout, terminal: false });
 
@@ -324,7 +320,7 @@ function processLookupCountry(src, cb) {
 	});
 
 	rl.on('close', () => {
-		log.done();
+		log.info('Processed lookup data');
 		cb();
 	});
 }
@@ -341,8 +337,7 @@ async function processCountryData(src, dest) {
 	rimraf(dataFile);
 	mkdir(dataFile);
 
-	process.stdout.write('\n');
-	log.progress('Processing country data (this may take a moment)');
+	log.info('Processing country data');
 	let tstart = Date.now();
 	const datFile = fs.createWriteStream(dataFile);
 
@@ -380,8 +375,8 @@ async function processCountryData(src, dest) {
 				bsz = 10;
 
 				rngip = new Address4(fields[0]);
-				sip = parseInt(rngip.startAddress().bigInt(), 10);
-				eip = parseInt(rngip.endAddress().bigInt(), 10);
+				sip = parseInt(rngip.startAddress().bigInt().toString(), 10);
+				eip = parseInt(rngip.endAddress().bigInt().toString(), 10);
 
 				b = Buffer.alloc(bsz);
 				b.fill(0);
@@ -392,7 +387,7 @@ async function processCountryData(src, dest) {
 			b.write(cc, bsz - 2);
 			if (Date.now() - tstart > 5000) {
 				tstart = Date.now();
-				process.stdout.write(`\nStill working (${lines})...`);
+				log.info(`Processing country data (${lines} entries)`);
 			}
 
 			if (datFile._writableState.needDrain) {
@@ -405,15 +400,53 @@ async function processCountryData(src, dest) {
 		}
 	}
 
-	const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile), crlfDelay: Infinity });
-	let i = 0;
-	for await (const line of rl) {
-		i++;
-		if (i === 1) continue;
-		await processLine(line);
-	}
+	await new Promise((resolve, reject) => {
+		const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile), crlfDelay: Infinity });
+		let settled = false;
+		let i = 0;
+
+		function finish(err) {
+			if (settled) return;
+			settled = true;
+			if (!rl.closed) rl.close();
+			if (err) reject(err);
+			else resolve();
+		}
+
+		function resume() {
+			if (!settled && !rl.closed) rl.resume();
+		}
+
+		rl.on('line', line => {
+			rl.pause();
+			i++;
+			if (i === 1) {
+				resume();
+				return;
+			}
+
+			let result;
+			try {
+				result = processLine(line);
+			} catch (err) {
+				finish(err);
+				return;
+			}
+
+			if (result && typeof result.then === 'function') {
+				result.then(() => {
+					resume();
+				}).catch(finish);
+			} else {
+				resume();
+			}
+		});
+
+		rl.on('close', () => finish());
+		rl.on('error', finish);
+	});
 	datFile.close();
-	log.done();
+	log.info('Processed country data');
 }
 
 async function processCityData(src, dest) {
@@ -423,8 +456,7 @@ async function processCityData(src, dest) {
 
 	rimraf(dataFile);
 
-	process.stdout.write('\n');
-	log.progress('Processing city data (this may take a moment)');
+	log.info('Processing city data');
 	let tstart = Date.now();
 	const datFile = fs.createWriteStream(dataFile);
 
@@ -482,8 +514,8 @@ async function processCityData(src, dest) {
 			bsz = 24;
 
 			rngip = new Address4(fields[0]);
-			sip = parseInt(rngip.startAddress().bigInt(), 10);
-			eip = parseInt(rngip.endAddress().bigInt(), 10);
+			sip = parseInt(rngip.startAddress().bigInt().toString(), 10);
+			eip = parseInt(rngip.endAddress().bigInt().toString(), 10);
 			locId = parseInt(fields[1], 10);
 			locId = cityLookup[locId];
 			b = Buffer.alloc(bsz);
@@ -502,7 +534,7 @@ async function processCityData(src, dest) {
 
 		if (Date.now() - tstart > 5000) {
 			tstart = Date.now();
-			process.stdout.write('\n[INFO] Processing... (' + lines + ' entries) ');
+			log.info(`Processing city data (${lines} entries)`);
 		}
 
 		if (datFile._writableState.needDrain) {
@@ -514,13 +546,51 @@ async function processCityData(src, dest) {
 		}
 	}
 
-	const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile), crlfDelay: Infinity });
-	let i = 0;
-	for await (const line of rl) {
-		i++;
-		if (i === 1) continue;
-		await processLine(line);
-	}
+	await new Promise((resolve, reject) => {
+		const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile), crlfDelay: Infinity });
+		let settled = false;
+		let i = 0;
+
+		function finish(err) {
+			if (settled) return;
+			settled = true;
+			if (!rl.closed) rl.close();
+			if (err) reject(err);
+			else resolve();
+		}
+
+		function resume() {
+			if (!settled && !rl.closed) rl.resume();
+		}
+
+		rl.on('line', line => {
+			rl.pause();
+			i++;
+			if (i === 1) {
+				resume();
+				return;
+			}
+
+			let result;
+			try {
+				result = processLine(line);
+			} catch (err) {
+				finish(err);
+				return;
+			}
+
+			if (result && typeof result.then === 'function') {
+				result.then(() => {
+					resume();
+				}).catch(finish);
+			} else {
+				resume();
+			}
+		});
+
+		rl.on('close', () => finish());
+		rl.on('error', finish);
+	});
 	datFile.close();
 }
 
@@ -610,11 +680,10 @@ function processData(database, cb) {
 	} else if (type === 'city') {
 		processCityDataNames(src[0], dest[0], () => {
 			processCityData(src[1], dest[1]).then(() => {
-				process.stdout.write('\n');
-				log.info('City IPv4 data processed');
+				log.info('Processed city IPv4 data');
 				return processCityData(src[2], dest[2]);
 			}).then(() => {
-				log.info('City IPv6 data processed');
+				log.info('Processed city IPv6 data');
 				cb(null, database);
 			});
 		});
@@ -653,10 +722,9 @@ async.eachSeries(databases, (database, nextDatabase) => {
 		log.error('Failed to update databases from MaxMind!', err);
 		process.exit(1);
 	} else {
-		process.stdout.write('\n');
 		log.success('All databases have been successfully updated from MaxMind');
 		if (args.indexOf('debug') !== -1) {
-			console.debug('Notice: temporary files are not deleted for debug purposes');
+			log.info('Debug mode: temporary files preserved at ' + tmpPath);
 		} else {
 			rimraf(tmpPath);
 		}

package/utils.js

@@ -0,0 +1,103 @@
+// ============================================================================
+// Utility Functions for IP Address Conversion and Comparison
+// ============================================================================
+
+const utils = module.exports = {};
+
+// ============================================================================
+// IPv4 Conversion Functions
+// ============================================================================
+
+utils.aton4 = a => {
+	const parts = a.split('.');
+	return ((parseInt(parts[0], 10) << 24) >>> 0) + ((parseInt(parts[1], 10) << 16) >>> 0) + ((parseInt(parts[2], 10) << 8) >>> 0) + (parseInt(parts[3], 10) >>> 0);
+};
+
+utils.ntoa4 = n => {
+	return ((n >>> 24) & 0xff) + '.' + ((n >>> 16) & 0xff) + '.' + ((n >>> 8) & 0xff) + '.' + (n & 0xff);
+};
+
+// ============================================================================
+// IPv6 Conversion Functions
+// ============================================================================
+
+utils.aton6 = a => {
+	a = a.replace(/"/g, '').split(':');
+
+	const l = a.length - 1;
+	let i;
+
+	if (a[l] === '') {
+		a[l] = 0;
+	}
+
+	if (l < 7) {
+		a.length = 8;
+
+		for (i = l; i >= 0 && a[i] !== ''; i--) {
+			a[7 - l + i] = a[i];
+		}
+	}
+
+	for (i = 0; i < 8; i++) {
+		if (!a[i]) {
+			a[i] = 0;
+		} else {
+			a[i] = parseInt(a[i], 16);
+		}
+	}
+
+	const r = [];
+	for (i = 0; i < 4; i++) {
+		r.push(((a[2 * i] << 16) + a[2 * i + 1]) >>> 0);
+	}
+
+	return r;
+};
+
+utils.ntoa6 = n => {
+	let a = '[';
+
+	for (let i = 0; i < n.length; i++) {
+		a += (n[i] >>> 16).toString(16) + ':';
+		a += (n[i] & 0xffff).toString(16) + ':';
+	}
+
+	a = a.replace(/:$/, ']').replace(/:0+/g, ':').replace(/::+/, '::');
+	return a;
+};
+
+// ============================================================================
+// Comparison Functions
+// ============================================================================
+
+utils.cmp = (a, b) => {
+	if (typeof a === 'number' && typeof b === 'number') return (a < b ? -1 : (a > b ? 1 : 0));
+	if (a instanceof Array && b instanceof Array) return utils.cmp6(a, b);
+
+	return null;
+};
+
+utils.cmp6 = (a, b) => {
+	for (let ii = 0; ii < 2; ii++) {
+		if (a[ii] < b[ii]) return -1;
+		if (a[ii] > b[ii]) return 1;
+	}
+
+	return 0;
+};
+
+// ============================================================================
+// IP Address Validation
+// ============================================================================
+
+utils.isPrivateIP = addr => {
+	const str = addr.toString();
+	return str.startsWith('10.') ||
+		str.startsWith('192.168.') ||
+		str.startsWith('172.16.') ||
+		str.startsWith('127.') ||
+		str.startsWith('169.254.') ||
+		str.startsWith('fc00:') ||
+		str.startsWith('fe80:');
+};

package/dist/fsWatcher.js

@@ -1 +0,0 @@
-const{access:e,constants:n,watch:t}=require('node:fs'),{join:o}=require('node:path'),l={},u=e=>l[e].close();module.exports={makeFsWatchFilter:(c,r,s,i,a)=>{let f=null;function h(){f=null,a()}'function'==typeof i&&(a=i,i=s,s=null),l[c]&&u(c),l[c]=t(r,function(t,l){if(!l)return;const u=o(r,l);s&&s!==l||e(u,n.F_OK,e=>{if(e)return console.error(e);null!==f&&(clearTimeout(f),f=null),f=setTimeout(h,i)})})},stopWatching:u};

package/dist/main.js

@@ -1 +0,0 @@
-const{open:e,fstat:r,read:t,close:n,openSync:i,fstatSync:o,readSync:a,closeSync:l}=require('node:fs'),{join:f,resolve:u}=require('node:path'),{isIP:c}=require('node:net'),s=require('async'),{aton4:d,aton6:B,cmp6:y,ntoa4:I,ntoa6:m,cmp:E}=require('./utils.js'),S=require('./fsWatcher.js'),{version:g}=require('../package.json'),z='dataWatcher',p=u(__dirname,global.geoDataDir||process.env.GEODATADIR||'../data/'),P={city:f(p,'geoip-city.dat'),city6:f(p,'geoip-city6.dat'),cityNames:f(p,'geoip-city-names.dat'),country:f(p,'geoip-country.dat'),country6:f(p,'geoip-country6.dat')},h=[[d('10.0.0.0'),d('10.255.255.255')],[d('172.16.0.0'),d('172.31.255.255')],[d('192.168.0.0'),d('192.168.255.255')]],F={firstIP:null,lastIP:null,lastLine:0,locationBuffer:null,locationRecordSize:88,mainBuffer:null,recordSize:24},L={firstIP:null,lastIP:null,lastLine:0,mainBuffer:null,recordSize:48};let U={...F},D={...L};const N=e=>{const r=e.indexOf('\0');return-1===r?e:e.substring(0,r)},T=(e,r,t,n)=>{const i=[];for(let o=0;o<2;o++)i.push(e.readUInt32BE(r*t+16*n+4*o));return i},w=e=>{let r,t,n=0,i=U.lastLine,o=U.lastIP,a=U.firstIP;const l=U.mainBuffer,f=U.locationBuffer,u=h,c=U.recordSize,s=U.locationRecordSize,d={range:[null,null],country:'',region:'',eu:'',timezone:'',city:'',ll:[null,null],metro:null,area:null};if(e>U.lastIP||e<U.firstIP)return null;for(let r=0;r<u.length;r++)if(e>=u[r][0]&&e<=u[r][1])return null;for(;;){r=Math.round((i-n)/2)+n;const u=r*c;if(o=l.readUInt32BE(u),a=l.readUInt32BE(u+4),o<=e&&a>=e){if(d.range=[o,a],10===c)d.country=l.toString('utf8',u+8,u+10);else if(t=l.readUInt32BE(u+8),-1>>>0>t){const e=t*s;d.country=N(f.toString('utf8',e,e+2)),d.region=N(f.toString('utf8',e+2,e+5)),d.metro=f.readInt32BE(e+5),d.ll[0]=l.readInt32BE(u+12)/1e4,d.ll[1]=l.readInt32BE(u+16)/1e4,d.area=l.readUInt32BE(u+20),d.eu=N(f.toString('utf8',e+9,e+10)),d.timezone=N(f.toString('utf8',e+10,e+42)),d.city=N(f.toString('utf8',e+42,e+s))}return d}if(n===i)return null;n===i-1?r===n?n=i:i=n:o>e?i=r:a<e&&(n=r)}};function A(f){let u,c;const d={...F};if('function'==typeof arguments[0])s.series([i=>{s.series([r=>{e(P.cityNames,'r',(e,t)=>{u=t,r(e)})},e=>{r(u,(r,t)=>{c=t.size,d.locationBuffer=Buffer.alloc(c),e(r)})},e=>{t(u,d.locationBuffer,0,c,0,e)},e=>{n(u,e)},r=>{e(P.city,'r',(e,t)=>{u=t,r(e)})},e=>{r(u,(r,t)=>{c=t.size,e(r)})}],t=>{if(t){if('ENOENT'!==t.code&&'EBADF'!==t.code)throw t;e(P.country,'r',(e,t)=>{e?i(e):(u=t,r(u,(e,r)=>{c=r.size,d.recordSize=10,i()}))})}else i()})},()=>{d.mainBuffer=Buffer.alloc(c),s.series([e=>{t(u,d.mainBuffer,0,c,0,e)},e=>{n(u,e)}],e=>{e||(d.lastLine=c/d.recordSize-1,d.lastIP=d.mainBuffer.readUInt32BE(d.lastLine*d.recordSize+4),d.firstIP=d.mainBuffer.readUInt32BE(0),U=d),f(e)})}]);else{try{if(u=i(P.cityNames,'r'),c=o(u).size,0===c){const e=new Error('Empty file');throw e.code='EMPTY_FILE',e}U.locationBuffer=Buffer.alloc(c),a(u,U.locationBuffer,0,c,0),l(u),u=i(P.city,'r'),c=o(u).size}catch(e){if('ENOENT'!==e.code&&'EBADF'!==e.code&&'EMPTY_FILE'!==e.code)throw e;u=i(P.country,'r'),c=o(u).size,U.recordSize=10}U.mainBuffer=Buffer.alloc(c),a(u,U.mainBuffer,0,c,0),l(u),U.lastLine=c/U.recordSize-1,U.lastIP=U.mainBuffer.readUInt32BE(U.lastLine*U.recordSize+4),U.firstIP=U.mainBuffer.readUInt32BE(0)}}function W(f){let u,c;const d={...L};if('function'==typeof arguments[0])s.series([t=>{s.series([r=>{e(P.city6,'r',(e,t)=>{u=t,r(e)})},e=>{r(u,(r,t)=>{c=t.size,e(r)})}],n=>{if(n){if('ENOENT'!==n.code&&'EBADF'!==n.code)throw n;e(P.country6,'r',(e,n)=>{e?t(e):(u=n,r(u,(e,r)=>{c=r.size,d.recordSize=34,t()}))})}else t()})},()=>{d.mainBuffer=Buffer.alloc(c),s.series([e=>{t(u,d.mainBuffer,0,c,0,e)},e=>{n(u,e)}],e=>{e||(d.lastLine=c/d.recordSize-1,d.lastIP=T(d.mainBuffer,d.lastLine,d.recordSize,1),d.firstIP=T(d.mainBuffer,0,d.recordSize,0),D=d),f(e)})}]);else{try{if(u=i(P.city6,'r'),c=o(u).size,0===c){const e=new Error('Empty file');throw e.code='EMPTY_FILE',e}}catch(e){if('ENOENT'!==e.code&&'EBADF'!==e.code&&'EMPTY_FILE'!==e.code)throw e;u=i(P.country6,'r'),c=o(u).size,D.recordSize=34}D.mainBuffer=Buffer.alloc(c),a(u,D.mainBuffer,0,c,0),l(u),D.lastLine=c/D.recordSize-1,D.lastIP=T(D.mainBuffer,D.lastLine,D.recordSize,1),D.firstIP=T(D.mainBuffer,0,D.recordSize,0)}}module.exports={cmp:E,lookup:e=>{if(!e)return null;if('number'==typeof e)return w(e);if(4===c(e))return w(d(e));if(6===c(e)){const r=(e=>{const r=e.toUpperCase();return r.startsWith("0:0:0:0:0:FFFF:")?r.substring(15):r.startsWith("::FFFF:")?r.substring(7):null})(e);return r?w(d(r)):(e=>{const r=D.mainBuffer,t=D.recordSize,n=U.locationBuffer,i=U.locationRecordSize,o={range:[null,null],country:'',region:'',eu:'',timezone:'',city:'',ll:[null,null],metro:null,area:null};let a,l,f=0,u=D.lastLine,c=D.lastIP,s=D.firstIP;if(y(e,D.lastIP)>0||y(e,D.firstIP)<0)return null;for(;;){if(a=Math.round((u-f)/2)+f,c=T(r,a,t,0),s=T(r,a,t,1),y(c,e)<=0&&y(s,e)>=0){const e=a*t;if(34===t)o.country=N(r.toString('utf8',e+32,e+34));else if(l=r.readUInt32BE(e+32),-1>>>0>l){const t=l*i;o.country=N(n.toString('utf8',t,t+2)),o.region=N(n.toString('utf8',t+2,t+5)),o.metro=n.readInt32BE(t+5),o.ll[0]=r.readInt32BE(e+36)/1e4,o.ll[1]=r.readInt32BE(e+40)/1e4,o.area=r.readUInt32BE(e+44),o.eu=N(n.toString('utf8',t+9,t+10)),o.timezone=N(n.toString('utf8',t+10,t+42)),o.city=N(n.toString('utf8',t+42,t+i))}return o}if(f===u)return null;f===u-1?a===f?f=u:u=f:y(c,e)>0?u=a:y(s,e)<0&&(f=a)}})(B(e))}return null},pretty:e=>'string'==typeof e?e:'number'==typeof e?I(e):Array.isArray(e)?m(e):e,startWatchingDataUpdate:e=>{S.makeFsWatchFilter(z,p,6e4,()=>{s.series([e=>{A(e)},e=>{W(e)}],e)})},stopWatchingDataUpdate:()=>S.stopWatching(z),clear:()=>{U={...F},D={...L}},reloadDataSync:()=>{A(),W()},reloadData:e=>{s.series([e=>{A(e)},e=>{W(e)}],e)},version:g},A(),W();

package/dist/utils.js

@@ -1 +0,0 @@
-const t=module.exports={};t.aton4=t=>{const r=t.split('.');return(parseInt(r[0],10)<<24>>>0)+(parseInt(r[1],10)<<16>>>0)+(parseInt(r[2],10)<<8>>>0)+(parseInt(r[3],10)>>>0)},t.ntoa4=t=>(t>>>24&255)+'.'+(t>>>16&255)+'.'+(t>>>8&255)+'.'+(255&t),t.aton6=t=>{const r=(t=t.replace(/"/g,'').split(':')).length-1;let e;if(''===t[r]&&(t[r]=0),r<7)for(t.length=8,e=r;e>=0&&''!==t[e];e--)t[7-r+e]=t[e];for(e=0;e<8;e++)t[e]?t[e]=parseInt(t[e],16):t[e]=0;const n=[];for(e=0;e<4;e++)n.push((t[2*e]<<16)+t[2*e+1]>>>0);return n},t.ntoa6=t=>{let r='[';for(let e=0;e<t.length;e++)r+=(t[e]>>>16).toString(16)+':',r+=(65535&t[e]).toString(16)+':';return r=r.replace(/:$/,']').replace(/:0+/g,':').replace(/::+/,'::'),r},t.cmp=(r,e)=>'number'==typeof r&&'number'==typeof e?r<e?-1:r>e?1:0:r instanceof Array&&e instanceof Array?t.cmp6(r,e):null,t.cmp6=(t,r)=>{for(let e=0;e<2;e++){if(t[e]<r[e])return-1;if(t[e]>r[e])return 1}return 0},t.isPrivateIP=t=>{const r=t.toString();return r.startsWith('10.')||r.startsWith('192.168.')||r.startsWith('172.16.')||r.startsWith('127.')||r.startsWith('169.254.')||r.startsWith('fc00:')||r.startsWith('fe80:')};