From 09379ae501d1325e0a5fc1014e5fbbc85c3c6492 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 23 Aug 2022 11:25:59 -0700 Subject: [PATCH 1/5] Remove check-db for Netlify. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index cbfe94da..0b9cb141 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ }, "scripts": { "dev": "next dev", - "build": "npm-run-all build-db check-db build-tracker build-geo build-app", - "start": "npm-run-all start-next", + "build": "npm-run-all build-db build-tracker build-geo build-app", + "start": "start-next", "build-docker": "npm-run-all build-db build-tracker build-geo build-app", "start-docker": "npm-run-all check-db update-tracker start-server", "start-env": "node scripts/start-env.js", From 131a0968dd7fab1a91b8b077aeb7f91bc2fcc377 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 23 Aug 2022 11:41:35 -0700 Subject: [PATCH 2/5] Added check-db back. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b9cb141..cd078391 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "scripts": { "dev": "next dev", - "build": "npm-run-all build-db build-tracker build-geo build-app", + "build": "npm-run-all build-db check-db build-tracker build-geo build-app", "start": "start-next", "build-docker": "npm-run-all build-db build-tracker build-geo build-app", "start-docker": "npm-run-all check-db update-tracker start-server", From d3f5f42d02645da9cca8d81cf295b0409f3e4be8 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 23 Aug 2022 11:52:55 -0700 Subject: [PATCH 3/5] Fix geo lookup for Netlify. --- lib/request.js | 3 +-- netlify.toml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/request.js b/lib/request.js index 210921b9..cb9abc7b 100644 --- a/lib/request.js +++ b/lib/request.js @@ -1,4 +1,3 @@ -import path from 'path'; import requestIp from 'request-ip'; import { browserName, detectOS } from 'detect-browser'; import isLocalhost from 'is-localhost-ip'; @@ -68,7 +67,7 @@ export async function getCountry(req, ip) { // Database lookup if (!lookup) { - lookup = await maxmind.open(path.resolve('node_modules/.geo/GeoLite2-Country.mmdb')); + lookup = await maxmind.open('./node_modules/.geo/GeoLite2-Country.mmdb'); } const result = lookup.get(ip); diff --git a/netlify.toml b/netlify.toml index 51e90db9..0d8c6fc1 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,2 +1,2 @@ [functions] -included_files = ["node_modules/.geo/*.mmdb"] +included_files = ["node_modules/.geo/**"] From f9e4838d88da0c26951f944997fcfa07ba9db163 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 23 Aug 2022 12:09:03 -0700 Subject: [PATCH 4/5] Fix geo lookup for Vercel. --- lib/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/request.js b/lib/request.js index cb9abc7b..6ca684e2 100644 --- a/lib/request.js +++ b/lib/request.js @@ -67,7 +67,7 @@ export async function getCountry(req, ip) { // Database lookup if (!lookup) { - lookup = await maxmind.open('./node_modules/.geo/GeoLite2-Country.mmdb'); + lookup = await maxmind.open('node_modules/.geo/GeoLite2-Country.mmdb'); } const result = lookup.get(ip); From 39c0ea11c3d8fa1f7167bde407cb5cbe00f86ac3 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 23 Aug 2022 12:12:28 -0700 Subject: [PATCH 5/5] Updated request-ip package. --- lib/request.js | 3 ++- package.json | 2 +- yarn.lock | 15 ++++----------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/lib/request.js b/lib/request.js index 6ca684e2..210921b9 100644 --- a/lib/request.js +++ b/lib/request.js @@ -1,3 +1,4 @@ +import path from 'path'; import requestIp from 'request-ip'; import { browserName, detectOS } from 'detect-browser'; import isLocalhost from 'is-localhost-ip'; @@ -67,7 +68,7 @@ export async function getCountry(req, ip) { // Database lookup if (!lookup) { - lookup = await maxmind.open('node_modules/.geo/GeoLite2-Country.mmdb'); + lookup = await maxmind.open(path.resolve('node_modules/.geo/GeoLite2-Country.mmdb')); } const result = lookup.get(ip); diff --git a/package.json b/package.json index cd078391..b0ee7429 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "react-tooltip": "^4.2.21", "react-use-measure": "^2.0.4", "react-window": "^1.8.6", - "request-ip": "^2.1.3", + "request-ip": "^3.3.0", "semver": "^7.3.6", "thenby": "^1.3.4", "timezone-support": "^2.0.2", diff --git a/yarn.lock b/yarn.lock index e448c012..98144f5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4081,11 +4081,6 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is_js@^0.9.0: - version "0.9.0" - resolved "https://registry.npmjs.org/is_js/-/is_js-0.9.0.tgz" - integrity sha512-8Y5EHSH+TonfUHX2g3pMJljdbGavg55q4jmHzghJCdqYDbdNROC8uw/YFQwIRCRqRJT1EY3pJefz+kglw+o7sg== - isbot@^3.4.5: version "3.5.0" resolved "https://registry.npmjs.org/isbot/-/isbot-3.5.0.tgz" @@ -5669,12 +5664,10 @@ regjsparser@^0.8.2: dependencies: jsesc "~0.5.0" -request-ip@^2.1.3: - version "2.2.0" - resolved "https://registry.npmjs.org/request-ip/-/request-ip-2.2.0.tgz" - integrity sha512-Hn4zUAr+XHbUs2RrfHur62t7+UhvtevqK32ordFewguEfNHUkhSdYgbG7PDGmXZEzqEXll9bei0+VMe6gkmuUQ== - dependencies: - is_js "^0.9.0" +request-ip@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/request-ip/-/request-ip-3.3.0.tgz#863451e8fec03847d44f223e30a5d63e369fa611" + integrity sha512-cA6Xh6e0fDBBBwH77SLJaJPBmD3nWVAcF9/XAcsrIHdjhFzFiB5aNQFytdjCGPezU3ROwrR11IddKAM08vohxA== request@2.88.0: version "2.88.0"