@smpx/koa-request 0.4.2 → 0.5.0

package/GeoIP.js

@@ -9,6 +9,7 @@ const fileName = 'GeoLite2-City';
 const fileUrl = `https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/master/redist/${fileName}.tar.gz`;
 const fileDir = __dirname;
 const filePath = `${fileDir}/${fileName}.mmdb`;
+let geoInitPromise;
 let geoip;
 
 function save(url, outDir) {
@@ -84,13 +85,21 @@ async function updateDb() {
 	setTimeout(updateDb, 3 * 24 * 3600 * 1000);
 }
 
+async function geoIpInit() {
+	await download();
+	geoip = await maxmind.open(filePath);
+	if (process.env.NODE_ENV === 'production') {
+		updateDb();
+	}
+}
+
 async function getGeoIp() {
 	if (!geoip) {
-		await download();
-		geoip = await maxmind.open(filePath);
-		if (process.env.NODE_ENV === 'production') {
-			updateDb();
+		if (!geoInitPromise) {
+			geoInitPromise = geoIpInit();
 		}
+		await geoInitPromise;
+		geoInitPromise = null;
 	}
 	return geoip;
 }

package/IPRange.js

@@ -11,6 +11,7 @@ const PRIVATE_IPS = [
 ];
 
 // Source: https://www.lifewire.com/what-is-the-ip-address-of-google-818153
+// https://developers.google.com/search/apis/ipranges/googlebot.json
 const GOOGLE_IPS = [
 	'64.233.160.0 - 64.233.191.255',
 	'66.102.0.0 - 66.102.15.255',
@@ -27,11 +28,16 @@ const GOOGLE_IPS = [
 ];
 
 const SEARCH_IPS = [
-	'178.154.128.0/17', // YANDAX
-	'87.250.224.0/19',	// YANDAX
-	'157.55.0.0/16',	// Microsoft
-	'207.46.0.0/19',	// Microsoft
-	'17.0.0.0/8',		// Apple
+	// BingBot (https://www.bing.com/toolbox/bingbot.json)
+	'157.55.0.0/16',
+	'207.46.0.0/19',
+	'52.167.144.0/24',
+	'40.77.128.0/17',
+	// YANDAX
+	'178.154.128.0/17',
+	'87.250.224.0/19',
+	// Apple
+	'17.0.0.0/8',
 ];
 
 let compiledPrivateIps;

package/Request.js

@@ -1260,7 +1260,7 @@ class Request {
 		let host = refererUri.hostname;
 		const baseDomain = this.baseDomain();
 
-		if (host.endsWith(baseDomain)) {
+		if (host.endsWith(baseDomain) || /^(?:direct|localhost|127|192|172|10)\b/.test(host)) {
 			return {
 				name: host,
 				source: host,
@@ -1423,9 +1423,16 @@ class Request {
 		}
 	}
 
+	geoipLoc() {
+		if (this._giploc === undefined) {
+			this._giploc = GeoIP.getSync(this.ip()) || {};
+		}
+		return this._giploc;
+	}
+
 	ipLocation() {
 		if (this._ipLoc === undefined) {
-			const loc = GeoIP.getSync(this.ip()) || {};
+			const loc = this.geoipLoc();
 			const country = loc.country;
 			const city = loc.city;
 			const state = loc.subdivisions && loc.subdivisions[0];

package/index.js

@@ -1,7 +1,9 @@
 const Request = require('./Request');
 const IPRange = require('./IPRange');
+const GeoIP = require('./GeoIP');
 
 module.exports = {
 	Request,
 	IPRange,
+	GeoIP,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smpx/koa-request",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Handle basic tasks for koajs",
   "main": "index.js",
   "types": "index.d.ts",
@@ -30,14 +30,14 @@
   },
   "homepage": "https://github.com/smartprix/koa-request#readme",
   "dependencies": {
-    "ip": "^1.1.8",
+    "ip": "^2.0.1",
     "koa-basic-auth": "^4.0.0",
     "koa-body": "^5.0.0",
     "koa-send": "^5.0.1",
-    "koa2-ratelimit": "^1.1.1",
-    "maxmind": "^4.3.6",
-    "tar": "^6.1.11",
-    "ua-parser-js": "^1.0.2"
+    "koa2-ratelimit": "^1.1.3",
+    "maxmind": "^4.3.20",
+    "tar": "^6.2.1",
+    "ua-parser-js": "^1.0.38"
   },
   "devDependencies": {
     "eslint": "^5.7.0",