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

package/data/city.checksum

@@ -1 +1 @@
-43cd254f51bc2e181c37b82bc3e575d702fb80e47403415369588585ee012abf  GeoLite2-City-CSV_20251104.zip
+f4a4c624512ef085feded9b74f5a797c1fedfae6c9a31d1a2c65462e23338d24  GeoLite2-City-CSV_20251107.zip

package/data/country.checksum

@@ -1 +1 @@
-55f23aac3290cee0cc46ea41d02c8f063357aad8446163065ea6743517b42513  GeoLite2-Country-CSV_20251104.zip
+f6acd69d1aae734a4ccf1130d6133c99042c716ff814a4cc045b2109406c543b  GeoLite2-Country-CSV_20251107.zip

package/dist/main.js

@@ -1 +1 @@
-const{open:e,fstat:t,read:r,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:E,cmp:g}=require('./utils.js'),m=require('./fsWatcher.js'),{version:S}=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 t=e.indexOf('\0');return-1===t?e:e.substring(0,t)},T=(e,t,r,n)=>{const i=[];for(let o=0;o<2;o++)i.push(e.readUInt32BE(t*r+16*n+4*o));return i},w=e=>{let t,r,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 t=0;t<u.length;t++)if(e>=u[t][0]&&e<=u[t][1])return null;for(;;){t=Math.round((i-n)/2)+n;const u=t*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(r=l.readUInt32BE(u+8),-1>>>0>r){const e=r*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?t===n?n=i:i=n:o>e?i=t:a<e&&(n=t)}},A=['0:0:0:0:0:FFFF:','::FFFF:'];function q(f){let u,c;const d={...F};if('function'==typeof arguments[0])s.series([i=>{s.series([t=>{e(P.cityNames,'r',(e,r)=>{u=r,t(e)})},e=>{t(u,(t,r)=>{c=r.size,d.locationBuffer=Buffer.alloc(c),e(t)})},e=>{r(u,d.locationBuffer,0,c,0,e)},e=>{n(u,e)},t=>{e(P.city,'r',(e,r)=>{u=r,t(e)})},e=>{t(u,(t,r)=>{c=r.size,e(t)})}],r=>{if(r){if('ENOENT'!==r.code&&'EBADF'!==r.code)throw r;e(P.country,'r',(e,r)=>{e?i(e):(u=r,t(u,(e,t)=>{c=t.size,d.recordSize=10,i()}))})}else i()})},()=>{d.mainBuffer=Buffer.alloc(c),s.series([e=>{r(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)throw{code:'EMPTY_FILE'};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 O(f){let u,c;const d={...L};if('function'==typeof arguments[0])s.series([r=>{s.series([t=>{e(P.city6,'r',(e,r)=>{u=r,t(e)})},e=>{t(u,(t,r)=>{c=r.size,e(t)})}],n=>{if(n){if('ENOENT'!==n.code&&'EBADF'!==n.code)throw n;e(P.country6,'r',(e,n)=>{e?r(e):(u=n,t(u,(e,t)=>{c=t.size,d.recordSize=34,r()}))})}else r()})},()=>{d.mainBuffer=Buffer.alloc(c),s.series([e=>{r(u,d.mainBuffer,0,c,0,e)},e=>{n(u,e)}],e=>{e||(d.lastLine=c/d.recordSize-1,D=d),f(e)})}]);else{try{if(u=i(P.city6,'r'),c=o(u).size,0===c)throw{code:'EMPTY_FILE'}}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}}module.exports={cmp:g,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 t=(e=>{const t=e.toUpperCase();for(let e=0;e<A.length;e++){const r=A[e];if(0===t.indexOf(r))return t.substring(r.length)}return null})(e);return t?w(d(t)):(e=>{const t=D.mainBuffer,r=D.recordSize,n=U.locationBuffer,i=U.locationRecordSize,o={range:[null,null],country:'',region:'',city:'',ll:[0,0],metro:null,area:null,eu:'',timezone:''};D.lastIP=T(t,D.lastLine,r,1),D.firstIP=T(t,0,r,0);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(t,a,r,0),s=T(t,a,r,1),y(c,e)<=0&&y(s,e)>=0){const e=a*r;if(34===r)o.country=N(t.toString('utf8',e+32,e+34));else if(l=t.readUInt32BE(e+32),-1>>>0>l){const r=l*i;o.country=N(n.toString('utf8',r,r+2)),o.region=N(n.toString('utf8',r+2,r+5)),o.metro=n.readInt32BE(r+5),o.ll[0]=t.readInt32BE(e+36)/1e4,o.ll[1]=t.readInt32BE(e+40)/1e4,o.area=t.readUInt32BE(e+44),o.eu=N(n.toString('utf8',r+9,r+10)),o.timezone=N(n.toString('utf8',r+10,r+42)),o.city=N(n.toString('utf8',r+42,r+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)?E(e):e,startWatchingDataUpdate:e=>{m.makeFsWatchFilter(z,p,6e4,async()=>{await s.series([e=>{q(e)},e=>{O(e)}],e)})},stopWatchingDataUpdate:()=>m.stopWatching(z),clear:()=>{U={...F},D={...L}},reloadDataSync:()=>{q(),O()},reloadData:async e=>{await s.series([e=>{q(e)},e=>{O(e)}],e)},version:S},q(),O();
+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();

package/dist/utils.js

@@ -1 +1 @@
-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.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.cmp=(t,r)=>'number'==typeof t&&'number'==typeof r?t<r?-1:t>r?1:0:t instanceof Array&&r instanceof Array?this.cmp6(t,r):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:')},t.ntoa4=t=>((t=t.toString())>>>24&255)+'.'+(t>>>16&255)+'.'+(t>>>8&255)+'.'+(255&t),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};
+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:')};

package/index.d.ts

@@ -2,12 +2,12 @@ interface GeoIp2Location {
     range: [number | null, number | null];
     country: string;
     region: string;
-    eu: '0' | '1';
+    eu: '0' | '1' | '';
     timezone: string;
     city: string;
     ll: [number | null, number | null];
-    metro: number;
-    area: number;
+    metro: number | null;
+    area: number | null;
 }
 
 export function lookup(ip: string | number): GeoIp2Location | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geoip-lite2",
-  "version": "2.2.8-beta.1",
+  "version": "2.2.8-beta.3",
   "description": "A light weight native JavaScript implementation of GeoIP API from MaxMind. Improved and faster version by Sefinek.",
   "keywords": [
     "city",
@@ -79,14 +79,14 @@
     "adm-zip": "^0.5.16",
     "async": "^3.2.6",
     "iconv-lite": "0.7.0",
-    "ip-address": "^10.0.1",
+    "ip-address": "^10.1.0",
     "rimraf": "^6.1.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.1",
     "globals": "^16.5.0",
     "jest": "^30.2.0",
-    "terser": "^5.44.0"
+    "terser": "^5.44.1"
   },
   "engines": {
     "node": ">=10.3.0"

package/tools/updatedb.js

@@ -1,7 +1,14 @@
-// Fetches and converts MaxMind lite databases
+// ============================================================================
+// GeoIP Database Updater
+// Fetches and converts MaxMind GeoLite2 databases
+// ============================================================================
 
 'use strict';
 
+// ============================================================================
+// Dependencies
+// ============================================================================
+
 const { name, version } = require('../package.json');
 const UserAgent = `Mozilla/5.0 (compatible; ${name}/${version}; +https://github.com/sefinek/geoip-lite2)`;
 
@@ -19,6 +26,24 @@ const AdmZip = require('adm-zip');
 const utils = require('../lib/utils.js');
 const { Address6, Address4 } = require('ip-address');
 
+// ============================================================================
+// Utility Functions - Logging
+// ============================================================================
+
+// 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'),
+};
+
+// ============================================================================
+// Configuration
+// ============================================================================
+
 const args = process.argv.slice(2);
 let license_key = args.find(arg => arg.match(/^license_key=[a-zA-Z0-9]+/) !== null);
 if (typeof license_key === 'undefined' && typeof process.env.LICENSE_KEY !== 'undefined') {
@@ -34,7 +59,7 @@ let dataPath = path.resolve(__dirname, '..', 'data');
 if (typeof geoDataDir !== 'undefined') {
 	dataPath = path.resolve(process.cwd(), geoDataDir.split('=')[1]);
 	if (!fs.existsSync(dataPath)) {
-		console.log('ERROR: Directory doesn\'t exist: ' + dataPath);
+		log.error('Directory does not exist:', dataPath);
 		process.exit(1);
 	}
 }
@@ -67,6 +92,10 @@ const databases = [{
 	dest: ['geoip-city-names.dat', 'geoip-city.dat', 'geoip-city6.dat'],
 }];
 
+// ============================================================================
+// Utility Functions
+// ============================================================================
+
 function mkdir(dirName) {
 	const dir = path.dirname(dirName);
 	if (!fs.existsSync(dir)) fs.mkdirSync(dir);
@@ -118,6 +147,10 @@ function CSVtoArray(text) {
 	return a;
 }
 
+// ============================================================================
+// HTTP Configuration
+// ============================================================================
+
 function getHTTPOptions(downloadUrl) {
 	const parsedUrl = new URL(downloadUrl);
 	const options = {
@@ -132,7 +165,7 @@ function getHTTPOptions(downloadUrl) {
 			const HttpsProxyAgent = require('https-proxy-agent');
 			options.agent = new HttpsProxyAgent(process.env.http_proxy || process.env.https_proxy);
 		} catch (err) {
-			console.error(`Install https-proxy-agent to use an HTTP/HTTPS proxy. ${err.message}`);
+			log.error(`Install https-proxy-agent to use an HTTP/HTTPS proxy. ${err.message}`);
 			process.exit(-1);
 		}
 	}
@@ -140,6 +173,10 @@ function getHTTPOptions(downloadUrl) {
 	return options;
 }
 
+// ============================================================================
+// Database Download Functions
+// ============================================================================
+
 function check(database, cb) {
 	if (args.indexOf('force') !== -1) {
 		// We are forcing database upgrade,
@@ -154,14 +191,16 @@ function check(database, cb) {
 	fs.readFile(path.join(dataPath, `${database.type}.checksum`), { encoding: 'utf8' }, (err, data) => {
 		if (!err && data && data.length) database.checkValue = data;
 
-		console.log('Checking', database.fileName);
+		log.info('Checking database:', database.fileName);
+
+		const client = https.get(getHTTPOptions(checksumUrl), onResponse);
 
 		function onResponse(response) {
 			const status = response.statusCode;
 			if ([301, 302, 303, 307, 308].includes(status)) {
 				return https.get(getHTTPOptions(response.headers.location), onResponse);
 			} else if (status !== 200) {
-				console.error('ERROR: HTTP Request Failed [%d %s]', status, http.STATUS_CODES[status]);
+				log.error('HTTP Request Failed [%d %s]', status, http.STATUS_CODES[status]);
 				client.end();
 				process.exit(1);
 			}
@@ -174,24 +213,22 @@ function check(database, cb) {
 			response.on('end', () => {
 				if (str && str.length) {
 					if (str === database.checkValue) {
-						console.log(`Database "${database.type}" is up to date`);
+						log.info(`Database "${database.type}" is up to date`);
 						database.skip = true;
 					} else {
-						console.log(`Database "${database.type}" has new data`);
+						log.info(`Database "${database.type}" has new data available`);
 						database.checkValue = str;
 					}
 				}
 				else {
-					console.error(`ERROR: Could not retrieve checksum for ${database.type}. Aborting.`);
-					console.error('Run with "force" to update without checksum');
+					log.error(`Could not retrieve checksum for ${database.type}. Aborting.`);
+					log.error('Run with "force" to update without checksum');
 					client.end();
 					process.exit(1);
 				}
 				cb(null, database);
 			});
 		}
-
-		var client = https.get(getHTTPOptions(checksumUrl), onResponse);
 	});
 }
 
@@ -206,14 +243,16 @@ function fetch(database, cb) {
 	const tmpFile = path.join(tmpPath, fileName);
 	if (fs.existsSync(tmpFile)) return cb(null, tmpFile, fileName, database);
 
-	console.log('Fetching', fileName);
+	log.info('Downloading:', fileName);
+
+	const client = https.get(getHTTPOptions(downloadUrl), onResponse);
 
 	function onResponse(response) {
 		const status = response.statusCode;
 		if ([301, 302, 303, 307, 308].includes(status)) {
 			return https.get(getHTTPOptions(response.headers.location), onResponse);
 		} else if (status !== 200) {
-			console.error('ERROR: HTTP Request Failed [%d %s]', status, http.STATUS_CODES[status]);
+			log.error('HTTP Request Failed [%d %s]', status, http.STATUS_CODES[status]);
 			client.end();
 			process.exit(1);
 		}
@@ -228,16 +267,14 @@ function fetch(database, cb) {
 		}
 
 		tmpFilePipe.on('close', () => {
-			console.log(' DONE');
+			log.done();
 			cb(null, tmpFile, fileName, database);
 		});
 	}
 
 	mkdir(tmpFile);
 
-	var client = https.get(getHTTPOptions(downloadUrl), onResponse);
-
-	process.stdout.write(`Retrieving ${fileName}...`);
+	log.progress(`Retrieving ${fileName}`);
 }
 
 function extract(tmpFile, tmpFileName, database, cb) {
@@ -246,7 +283,7 @@ function extract(tmpFile, tmpFileName, database, cb) {
 	if (path.extname(tmpFileName) !== '.zip') {
 		cb(null, database);
 	} else {
-		process.stdout.write('Extracting ' + tmpFileName + '...');
+		log.progress('Extracting ' + tmpFileName);
 		const zip = new AdmZip(tmpFile);
 		const zipEntries = zip.getEntries();
 
@@ -260,7 +297,7 @@ function extract(tmpFile, tmpFileName, database, cb) {
 			fs.writeFileSync(destinationPath, entry.getData());
 		});
 
-		console.log(' DONE');
+		log.done();
 		cb(null, database);
 	}
 }
@@ -269,14 +306,14 @@ function processLookupCountry(src, cb) {
 	function processLine(line) {
 		const fields = CSVtoArray(line);
 		if (!fields || fields.length < 6) {
-			console.log('Weird line: %s::', line);
+			log.warn('Malformed line detected:', line);
 			return;
 		}
 		countryLookup[fields[0]] = fields[4];
 	}
 	const tmpDataFile = path.join(tmpPath, src);
 
-	process.stdout.write('Processing lookup data (may take a moment)...');
+	log.progress('Processing lookup data (this may take a moment)');
 
 	const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile).pipe(decodeStream('latin1')), output: process.stdout, terminal: false });
 
@@ -287,16 +324,31 @@ function processLookupCountry(src, cb) {
 	});
 
 	rl.on('close', () => {
-		console.log(' DONE');
+		log.done();
 		cb();
 	});
 }
 
+// ============================================================================
+// Data Processing Functions
+// ============================================================================
+
 async function processCountryData(src, dest) {
 	let lines = 0;
+	const dataFile = path.join(dataPath, dest);
+	const tmpDataFile = path.join(tmpPath, src);
+
+	rimraf(dataFile);
+	mkdir(dataFile);
+
+	process.stdout.write('\n');
+	log.progress('Processing country data (this may take a moment)');
+	let tstart = Date.now();
+	const datFile = fs.createWriteStream(dataFile);
+
 	function processLine(line) {
 		const fields = CSVtoArray(line);
-		if (!fields || fields.length < 6) return console.warn('weird line: %s::', line);
+		if (!fields || fields.length < 6) return log.warn('Malformed line detected:', line);
 
 		lines++;
 
@@ -353,16 +405,6 @@ async function processCountryData(src, dest) {
 		}
 	}
 
-	const dataFile = path.join(dataPath, dest);
-	const tmpDataFile = path.join(tmpPath, src);
-
-	rimraf(dataFile);
-	mkdir(dataFile);
-
-	process.stdout.write('\nProcessing data (may take a moment)...');
-	var tstart = Date.now();
-	var datFile = fs.createWriteStream(dataFile);
-
 	const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile), crlfDelay: Infinity });
 	let i = 0;
 	for await (const line of rl) {
@@ -371,16 +413,26 @@ async function processCountryData(src, dest) {
 		await processLine(line);
 	}
 	datFile.close();
-	console.log(' DONE');
+	log.done();
 }
 
 async function processCityData(src, dest) {
 	let lines = 0;
+	const dataFile = path.join(dataPath, dest);
+	const tmpDataFile = path.join(tmpPath, src);
+
+	rimraf(dataFile);
+
+	process.stdout.write('\n');
+	log.progress('Processing city data (this may take a moment)');
+	let tstart = Date.now();
+	const datFile = fs.createWriteStream(dataFile);
+
 	async function processLine(line) {
 		if (line.match(/^Copyright/) || !line.match(/\d/)) return;
 
 		const fields = CSVtoArray(line);
-		if (!fields) return console.warn('Weird line: %s::', line);
+		if (!fields) return log.warn('Malformed line detected:', line);
 		let sip;
 		let eip;
 		let rngip;
@@ -450,7 +502,7 @@ async function processCityData(src, dest) {
 
 		if (Date.now() - tstart > 5000) {
 			tstart = Date.now();
-			process.stdout.write('\nStill working (' + lines + ')...');
+			process.stdout.write('\n[INFO] Processing... (' + lines + ' entries) ');
 		}
 
 		if (datFile._writableState.needDrain) {
@@ -462,15 +514,6 @@ async function processCityData(src, dest) {
 		}
 	}
 
-	const dataFile = path.join(dataPath, dest);
-	const tmpDataFile = path.join(tmpPath, src);
-
-	rimraf(dataFile);
-
-	process.stdout.write('\nProcessing data (may take a moment)...');
-	var tstart = Date.now();
-	var datFile = fs.createWriteStream(dataFile);
-
 	const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile), crlfDelay: Infinity });
 	let i = 0;
 	for await (const line of rl) {
@@ -484,6 +527,13 @@ async function processCityData(src, dest) {
 function processCityDataNames(src, dest, cb) {
 	let locId = null;
 	let linesCount = 0;
+	const dataFile = path.join(dataPath, dest);
+	const tmpDataFile = path.join(tmpPath, src);
+
+	rimraf(dataFile);
+
+	const datFile = fs.openSync(dataFile, 'w');
+
 	function processLine(line) {
 		if (line.match(/^Copyright/) || !line.match(/\d/)) return;
 
@@ -491,7 +541,7 @@ function processCityDataNames(src, dest, cb) {
 		const fields = CSVtoArray(line);
 		if (!fields) {
 			// Lots of cities contain ` or ' in the name and can't be parsed correctly with current method
-			console.warn('Weird line: %s::', line);
+			log.warn('Malformed line detected:', line);
 			return;
 		}
 
@@ -519,13 +569,6 @@ function processCityDataNames(src, dest, cb) {
 		linesCount++;
 	}
 
-	const dataFile = path.join(dataPath, dest);
-	const tmpDataFile = path.join(tmpPath, src);
-
-	rimraf(dataFile);
-
-	var datFile = fs.openSync(dataFile, 'w');
-
 	const rl = readline.createInterface({ input: fs.createReadStream(tmpDataFile).pipe(decodeStream('utf-8')), output: process.stdout, terminal: false });
 
 	let lineCount = 0;
@@ -538,6 +581,10 @@ function processCityDataNames(src, dest, cb) {
 	rl.on('close', cb);
 }
 
+// ============================================================================
+// Main Processing Dispatcher
+// ============================================================================
+
 function processData(database, cb) {
 	if (database.skip) return cb(null, database);
 
@@ -563,27 +610,36 @@ function processData(database, cb) {
 	} else if (type === 'city') {
 		processCityDataNames(src[0], dest[0], () => {
 			processCityData(src[1], dest[1]).then(() => {
-				console.log('\nCity data processed');
+				process.stdout.write('\n');
+				log.info('City IPv4 data processed');
 				return processCityData(src[2], dest[2]);
 			}).then(() => {
-				console.log(' DONE');
+				log.info('City IPv6 data processed');
 				cb(null, database);
 			});
 		});
 	}
 }
 
+// ============================================================================
+// Checksum Management
+// ============================================================================
+
 function updateChecksum(database, cb) {
 	if (database.skip || !database.checkValue) return cb(); // Don't need to update checksums because it was not fetched or did not change
 
 	fs.writeFile(path.join(dataPath, database.type + '.checksum'), database.checkValue, 'utf8', err => {
-		if (err) console.log('Failed to Update checksums! Database:', database.type);
+		if (err) log.error('Failed to update checksum for database:', database.type);
 		cb();
 	});
 }
 
+// ============================================================================
+// Main Execution Flow
+// ============================================================================
+
 if (!license_key) {
-	console.error('ERROR: Missing license_key');
+	log.error('Missing license_key');
 	process.exit(1);
 }
 
@@ -594,10 +650,11 @@ async.eachSeries(databases, (database, nextDatabase) => {
 	async.seq(check, fetch, extract, processData, updateChecksum)(database, nextDatabase);
 }, err => {
 	if (err) {
-		console.error('Failed to update databases from MaxMind!', err);
+		log.error('Failed to update databases from MaxMind!', err);
 		process.exit(1);
 	} else {
-		console.log('Successfully updated databases from MaxMind');
+		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');
 		} else {