-
-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #52 from VikramTiwari/updates-for-license-key
fix: update config to use license key
- Loading branch information
Showing
8 changed files
with
467 additions
and
226 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,118 +1,122 @@ | ||
| 'use strict' | ||
| "use strict"; | ||
|
|
||
| const debug = require('debug')('geo-from-ip:updater') | ||
| const fs = require('fs') | ||
| const zlib = require('zlib') | ||
| const async = require('async') | ||
| const request = require('request') | ||
| const debug = require("debug")("geo-from-ip:updater"); | ||
| const fs = require("fs"); | ||
| const path = require("path"); | ||
| const util = require("util"); | ||
| const streamPipeline = util.promisify(require("stream").pipeline); | ||
| const fetch = require("node-fetch"); | ||
| const targz = require("targz"); | ||
|
|
||
| const config = require('../mmdb/config') | ||
| debug(`Running update script with config: ${JSON.stringify(config)}`) | ||
| if (process.env.MAXMIND_LICENSE_KEY === undefined) { | ||
| debug( | ||
| "Seems like you forgot to add MAXMIND_LICENSE_KEY to your environment variables. Read more: https://github.com/VikramTiwari/geo-from-ip#how-to-use" | ||
| ); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| const config = require("../mmdb/config"); | ||
|
|
||
| /** | ||
| * check if remote file is newer | ||
| * @param {String} dest path for local file | ||
| * @param {String} remote path for remote file | ||
| * @param {Function} cb true/false | ||
| * uncompresses the zipped file into folders and does cleanup of remaining files and folders | ||
| * @param {String} zipped path to zipped file | ||
| * @param {Object} database database object | ||
| */ | ||
| function isRemoteNewer (dest, remote, cb) { | ||
| // if no file | ||
| if (!fs.existsSync(dest)) { | ||
| cb(null, false) | ||
| } else { | ||
| // if dest file is not a file, remove it | ||
| const stats = fs.statSync(dest) | ||
| if (!stats.isFile()) { | ||
| debug(`${dest} is not a file`) | ||
| fs.unlink(dest, () => { | ||
| debug(`${dest} deleted`) | ||
| }) | ||
| } | ||
|
|
||
| request( | ||
| async function uncompress(zipped, database) { | ||
| new Promise((resolve, reject) => { | ||
| targz.decompress( | ||
| { | ||
| url: remote, | ||
| headers: { | ||
| 'If-Modified-Since': stats.mtime.toUTCString() | ||
| src: zipped, | ||
| dest: config.dbDir, | ||
| tar: { | ||
| ignore: function(name) { | ||
| return path.extname(name) !== ".mmdb"; | ||
| } | ||
| } | ||
| }, | ||
| res => { | ||
| if (res === null) { | ||
| cb(null, true) | ||
| err => { | ||
| if (err) { | ||
| debug(err); | ||
| reject(); | ||
| } else { | ||
| cb(null, false) | ||
| fs.readdirSync(config.dbDir).forEach(file => { | ||
| if (fs.lstatSync(`${config.dbDir}/${file}`).isDirectory()) { | ||
| fs.renameSync( | ||
| `${config.dbDir}/${file}/${database.filename}.mmdb`, | ||
| `${config.dbDir}/${database.filename}.mmdb` | ||
| ); | ||
| fs.rmdirSync(`${config.dbDir}/${file}`); | ||
| } | ||
| }); | ||
| fs.unlinkSync(`${config.dbDir}/${database.filename}.tar.gz`); | ||
| resolve(); | ||
| } | ||
| } | ||
| ) | ||
| } | ||
| ); | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * downloads file | ||
| * @param {String} dest path for local file | ||
| * @param {String} remote path for remote file | ||
| * @param {Function} cb true/false | ||
| * download database and unzip | ||
| * | ||
| * @param {Object} database database to download | ||
| */ | ||
| function download (dest, remote, cb) { | ||
| request | ||
| .get(remote) | ||
| .pipe(zlib.createGunzip()) | ||
| .pipe(fs.createWriteStream(dest)) | ||
| .on('error', error => { | ||
| cb(error, false) | ||
| }) | ||
| .on('finish', () => { | ||
| cb(null, true) | ||
| }) | ||
| async function download(database) { | ||
| const zipped = `${config.dbDir}/${database.filename}.tar.gz`; | ||
| const response = await fetch(database.remote); | ||
| await streamPipeline(response.body, fs.createWriteStream(zipped)); | ||
| debug("download complete, uncompressing"); | ||
| await uncompress(zipped, database); | ||
| debug("ready!"); | ||
| } | ||
|
|
||
| /** | ||
| * runs downloads for all the files | ||
| * @param {String} item which database | ||
| * @param {Function} cb true/false | ||
| * check if remote file is newer | ||
| * | ||
| * @param {Object} database database to download | ||
| */ | ||
| function dl (item, cb) { | ||
| const dest = config.dbDir + '/' + item.local | ||
| async function isRemoteNewer(database) { | ||
| const mmdb = `${config.dbDir}/${database.filename}.mmdb`; | ||
| // if no file | ||
| if (!fs.existsSync(mmdb)) { | ||
| debug("file does not exist"); | ||
| return true; | ||
| } else { | ||
| // if dest file is not a file, remove it | ||
| const stats = fs.statSync(mmdb); | ||
| if (!stats.isFile()) { | ||
| debug(`${mmdb} is not a file`); | ||
| fs.unlinkSync(mmdb, () => { | ||
| debug(`${mmdb} deleted`); | ||
| }); | ||
| } | ||
|
|
||
| isRemoteNewer(dest, item.remote, (err, newer) => { | ||
| if (err) { | ||
| cb(err, false) | ||
| } else if (!err && newer) { | ||
| cb(null, false) | ||
| } else if (!err && !newer) { | ||
| // begin downloading | ||
| debug(`downloading ${dest}`) | ||
| const response = await fetch(database.remote, { | ||
| method: "GET", | ||
| headers: { | ||
| "If-Modified-Since": stats.mtime.toUTCString() | ||
| } | ||
| }); | ||
|
|
||
| download(dest, item.remote, (err, done) => { | ||
| if (err) { | ||
| cb(err, false) | ||
| } else if (!err && !done) { | ||
| cb(null, false) | ||
| } else if (!err && done) { | ||
| cb(null, true) | ||
| } | ||
| }) | ||
| if (response === null) { | ||
| return true; | ||
| } | ||
| }) | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Runs a sync function to download the files | ||
| * | ||
| * @param {any} cb | ||
| * sync databases to local | ||
| */ | ||
| function sync (cb) { | ||
| async.eachSeries(config.geoIpDbs, dl, err => { | ||
| cb(err, true) | ||
| }) | ||
| function sync() { | ||
| config.geoIpDbs.forEach(async database => { | ||
| if (await isRemoteNewer(database)) { | ||
| debug("remote is newer, downloading"); | ||
| await download(database); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| async.eachSeries(config.geoIpDbs, dl, err => { | ||
| if (err) { | ||
| debug(`🚨 Error: ${err}`) | ||
| } else { | ||
| debug(`🚀 All set!`) | ||
| } | ||
| }) | ||
| sync(); | ||
|
|
||
| module.exports.sync = sync | ||
| module.exports.sync = sync; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.