geoip-lite2 2.2.8-beta.3 → 2.2.8-beta.6

package/data/city.checksum

@@ -1 +1 @@
-f4a4c624512ef085feded9b74f5a797c1fedfae6c9a31d1a2c65462e23338d24  GeoLite2-City-CSV_20251107.zip
+e6e3de413a870dd57e1801fbf3f3123c0798aee81c6c01dad9da53fcb023bc00  GeoLite2-City-CSV_20251121.zip

package/data/country.checksum

@@ -1 +1 @@
-f6acd69d1aae734a4ccf1130d6133c99042c716ff814a4cc045b2109406c543b  GeoLite2-Country-CSV_20251107.zip
+098468175e0cecd62499b0430c8876e412471df27c32f8c7a2618b8e90025708  GeoLite2-Country-CSV_20251121.zip

package/dist/main.js

@@ -1 +1 @@
-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:'',city:'',ll:[0,0],metro:null,area:null,eu:'',timezone:''};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();
+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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geoip-lite2",
-  "version": "2.2.8-beta.3",
+  "version": "2.2.8-beta.6",
   "description": "A light weight native JavaScript implementation of GeoIP API from MaxMind. Improved and faster version by Sefinek.",
   "keywords": [
     "city",
@@ -68,6 +68,8 @@
     "README.md"
   ],
   "scripts": {
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "minify": "node minify.js",
     "test": "jest test",
     "up": "ncu -u && npm install && npm update && npm audit fix",
@@ -80,7 +82,7 @@
     "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",
@@ -89,6 +91,6 @@
     "terser": "^5.44.1"
   },
   "engines": {
-    "node": ">=10.3.0"
+    "node": ">=20.0.0"
   }
 }

package/tools/updatedb.js

@@ -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);
 		}