@jesec/flood 0.0.0-master.a2bcabc → 0.0.0-master.a4dd536

package/node_modules/geoip-country/lib/geoip.js

@@ -1,6 +1,7 @@
 var fs = require('fs');
 var net = require('net');
 var path = require('path');
+var exec = require('child_process').exec;
 
 fs.existsSync = fs.existsSync || path.existsSync;
 
@@ -422,6 +423,39 @@ module.exports = {
 		return n;
 	},
 
+	/**
+	 * @param {string} [license_key]
+	 * 		Without license_key, you need to set GEOLITE2_LICENSE_KEY as environmental variable
+	 * @param {function} [callback]
+	 */
+	updateDatabase(license_key, callback){
+		var command = 'node ' + path.join(__dirname, '..', 'scripts', 'updatedb.js')
+		var options = {encoding: 'utf-8'}
+		if(typeof license_key === 'function'){
+			callback = license_key
+		} else {
+			options.env = {GEOLITE2_LICENSE_KEY: license_key}
+		}
+		if(!callback){
+			callback = function(){}
+		}
+
+		exec(command, options, function(error, stdout, stderr){
+			if(error){
+				return callback(error, stdout, stderr);
+			}
+			//Reload data
+			async.series([
+				function (cb) {
+					preload(cb);
+				},
+				function (cb) {
+					preload6(cb);
+				}
+			], callback);
+		});
+	},
+
 	// Start watching for data updates. The watcher waits one minute for file transfer to 
 	// completete before triggering the callback.
 	startWatchingDataUpdate: function (callback) {

package/node_modules/geoip-country/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "geoip-country",
-	"version": "4.0.68",
+	"version": "4.1.60",
 	"description": "Less memory usage version of geoip-lite, by supporting only country lookup.",
 	"keywords": [
 		"geo",
@@ -37,9 +37,8 @@
 		"update-package": "node scripts/update-package.js"
 	},
 	"dependencies": {
-		"async": "^2.6.1",
+		"async": "^2.6.4",
 		"colors": "^1.4.0",
-		"glob": "^7.1.6",
 		"iconv-lite": "^0.5.2",
 		"ip-address": "^6.3.0",
 		"lazy": "^1.0.11",
@@ -50,7 +49,7 @@
 		"update": true
 	},
 	"devDependencies": {
-		"nodeunit-x": "^0.13.0"
+		"nodeunit-x": "^0.15.0"
 	},
 	"license": "MaxMind GeoLite2 License"
 }

package/node_modules/geoip-country/scripts/updatedb.js

@@ -3,7 +3,7 @@
 'use strict';
 
 var user_agent = 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.36 Safari/537.36';
-var download_server = 'https://geoip.maxmind.com/app/geoip_download';
+var download_server = 'https://download.maxmind.com/app/geoip_download';
 var license_key = process.env.npm_config_license_key || process.env.GEOLITE2_LICENSE_KEY || null;
 
 var fs = require('fs');
@@ -15,7 +15,6 @@ fs.existsSync = fs.existsSync || path.existsSync;
 
 var async = require('async');
 var colors = require('colors');
-var glob = require('glob');
 var iconv = require('iconv-lite');
 var lazy = require('lazy');
 var rimraf = require('rimraf').sync;
@@ -160,7 +159,7 @@ function fetch(database, cb) {
 			}
 
 			client.abort();
-			process.exit();
+			process.exit(1);
 		}
 
 		var tmpFileStream = fs.createWriteStream(tmpFile);
@@ -570,9 +569,8 @@ rimraf(tmpPath);
 mkdir(tmpPath);
 
 async.eachSeries(databases, function(database, nextDatabase) {
-	if (database.type.indexOf('city') !== -1) return;
+	if (database.type.indexOf('city') !== -1) return nextDatabase();
 	async.seq(fetch, extract, processData)(database, nextDatabase);
-
 }, function(err) {
 	if (err) {
 		console.log('Failed to Update Databases from MaxMind.'.red);
@@ -580,7 +578,6 @@ async.eachSeries(databases, function(database, nextDatabase) {
 	} else {
 		console.log('Successfully Updated Databases from MaxMind.'.green);
 		if (process.argv[2] == 'debug') console.log('Notice: temporary files are not deleted for debug purposes.'.bold.yellow);
-		else rimraf(tmpPath);
-		process.exit(0);
+		else setTimeout(function(){rimraf(tmpPath);}, 100);
 	}
 });

package/node_modules/geoip-country/test/tests.js

@@ -2,6 +2,7 @@ console.time('StartUpTime')
 var geoip = require('../lib/geoip');
 console.timeEnd('StartUpTime')
 
+
 module.exports = {
 	testLookup: function(test) {
 		test.expect(2);

package/node_modules/glob/README.md

@@ -276,6 +276,9 @@ the filesystem.
 * `absolute` Set to true to always receive absolute paths for matched
   files.  Unlike `realpath`, this also affects the values returned in
   the `match` event.
+* `fs` File-system object with Node's `fs` API. By default, the built-in
+  `fs` module will be used. Set to a volume provided by a library like
+  `memfs` to avoid using the "real" file-system.
 
 ## Comparisons to other fnmatch/glob implementations
 

package/node_modules/glob/common.js

@@ -10,6 +10,7 @@ function ownProp (obj, field) {
   return Object.prototype.hasOwnProperty.call(obj, field)
 }
 
+var fs = require("fs")
 var path = require("path")
 var minimatch = require("minimatch")
 var isAbsolute = require("path-is-absolute")
@@ -75,6 +76,7 @@ function setopts (self, pattern, options) {
   self.stat = !!options.stat
   self.noprocess = !!options.noprocess
   self.absolute = !!options.absolute
+  self.fs = options.fs || fs
 
   self.maxLength = options.maxLength || Infinity
   self.cache = options.cache || Object.create(null)
@@ -108,6 +110,8 @@ function setopts (self, pattern, options) {
   // Note that they are not supported in Glob itself anyway.
   options.nonegate = true
   options.nocomment = true
+  // always treat \ in patterns as escapes, not path separators
+  options.allowWindowsEscape = false
 
   self.minimatch = new Minimatch(pattern, options)
   self.options = self.minimatch.options

package/node_modules/glob/glob.js

@@ -40,7 +40,6 @@
 
 module.exports = glob
 
-var fs = require('fs')
 var rp = require('fs.realpath')
 var minimatch = require('minimatch')
 var Minimatch = minimatch.Minimatch
@@ -343,7 +342,10 @@ Glob.prototype._process = function (pattern, index, inGlobStar, cb) {
   var read
   if (prefix === null)
     read = '.'
-  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+  else if (isAbsolute(prefix) ||
+      isAbsolute(pattern.map(function (p) {
+        return typeof p === 'string' ? p : '[*]'
+      }).join('/'))) {
     if (!prefix || !isAbsolute(prefix))
       prefix = '/' + prefix
     read = prefix
@@ -501,7 +503,7 @@ Glob.prototype._readdirInGlobStar = function (abs, cb) {
   var lstatcb = inflight(lstatkey, lstatcb_)
 
   if (lstatcb)
-    fs.lstat(abs, lstatcb)
+    self.fs.lstat(abs, lstatcb)
 
   function lstatcb_ (er, lstat) {
     if (er && er.code === 'ENOENT')
@@ -542,7 +544,7 @@ Glob.prototype._readdir = function (abs, inGlobStar, cb) {
   }
 
   var self = this
-  fs.readdir(abs, readdirCb(this, abs, cb))
+  self.fs.readdir(abs, readdirCb(this, abs, cb))
 }
 
 function readdirCb (self, abs, cb) {
@@ -746,13 +748,13 @@ Glob.prototype._stat = function (f, cb) {
   var self = this
   var statcb = inflight('stat\0' + abs, lstatcb_)
   if (statcb)
-    fs.lstat(abs, statcb)
+    self.fs.lstat(abs, statcb)
 
   function lstatcb_ (er, lstat) {
     if (lstat && lstat.isSymbolicLink()) {
       // If it's a symlink, then treat it as the target, unless
       // the target does not exist, then treat it as a file.
-      return fs.stat(abs, function (er, stat) {
+      return self.fs.stat(abs, function (er, stat) {
         if (er)
           self._stat2(f, abs, null, lstat, cb)
         else

package/node_modules/glob/package.json

@@ -2,7 +2,10 @@
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
   "name": "glob",
   "description": "a little globber",
-  "version": "7.1.7",
+  "version": "7.2.3",
+  "publishConfig": {
+    "tag": "v7-legacy"
+  },
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/node-glob.git"
@@ -20,11 +23,12 @@
     "fs.realpath": "^1.0.0",
     "inflight": "^1.0.4",
     "inherits": "2",
-    "minimatch": "^3.0.4",
+    "minimatch": "^3.1.1",
     "once": "^1.3.0",
     "path-is-absolute": "^1.0.0"
   },
   "devDependencies": {
+    "memfs": "^3.2.0",
     "mkdirp": "0",
     "rimraf": "^2.2.8",
     "tap": "^15.0.6",

package/node_modules/glob/sync.js

@@ -1,7 +1,6 @@
 module.exports = globSync
 globSync.GlobSync = GlobSync
 
-var fs = require('fs')
 var rp = require('fs.realpath')
 var minimatch = require('minimatch')
 var Minimatch = minimatch.Minimatch
@@ -49,7 +48,7 @@ function GlobSync (pattern, options) {
 }
 
 GlobSync.prototype._finish = function () {
-  assert(this instanceof GlobSync)
+  assert.ok(this instanceof GlobSync)
   if (this.realpath) {
     var self = this
     this.matches.forEach(function (matchset, index) {
@@ -73,7 +72,7 @@ GlobSync.prototype._finish = function () {
 
 
 GlobSync.prototype._process = function (pattern, index, inGlobStar) {
-  assert(this instanceof GlobSync)
+  assert.ok(this instanceof GlobSync)
 
   // Get the first [n] parts of pattern that are all strings.
   var n = 0
@@ -110,7 +109,10 @@ GlobSync.prototype._process = function (pattern, index, inGlobStar) {
   var read
   if (prefix === null)
     read = '.'
-  else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) {
+  else if (isAbsolute(prefix) ||
+      isAbsolute(pattern.map(function (p) {
+        return typeof p === 'string' ? p : '[*]'
+      }).join('/'))) {
     if (!prefix || !isAbsolute(prefix))
       prefix = '/' + prefix
     read = prefix
@@ -246,7 +248,7 @@ GlobSync.prototype._readdirInGlobStar = function (abs) {
   var lstat
   var stat
   try {
-    lstat = fs.lstatSync(abs)
+    lstat = this.fs.lstatSync(abs)
   } catch (er) {
     if (er.code === 'ENOENT') {
       // lstat failed, doesn't exist
@@ -283,7 +285,7 @@ GlobSync.prototype._readdir = function (abs, inGlobStar) {
   }
 
   try {
-    return this._readdirEntries(abs, fs.readdirSync(abs))
+    return this._readdirEntries(abs, this.fs.readdirSync(abs))
   } catch (er) {
     this._readdirError(abs, er)
     return null
@@ -442,7 +444,7 @@ GlobSync.prototype._stat = function (f) {
   if (!stat) {
     var lstat
     try {
-      lstat = fs.lstatSync(abs)
+      lstat = this.fs.lstatSync(abs)
     } catch (er) {
       if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
         this.statCache[abs] = false
@@ -452,7 +454,7 @@ GlobSync.prototype._stat = function (f) {
 
     if (lstat && lstat.isSymbolicLink()) {
       try {
-        stat = fs.statSync(abs)
+        stat = this.fs.statSync(abs)
       } catch (er) {
         stat = lstat
       }

package/node_modules/minimatch/README.md

@@ -2,7 +2,7 @@
 
 A minimal matching utility.
 
-[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.svg)](http://travis-ci.org/isaacs/minimatch)
+[![Build Status](https://travis-ci.org/isaacs/minimatch.svg?branch=master)](http://travis-ci.org/isaacs/minimatch)
 
 
 This is the matching library used internally by npm.
@@ -171,6 +171,27 @@ Suppress the behavior of treating a leading `!` character as negation.
 Returns from negate expressions the same as if they were not negated.
 (Ie, true on a hit, false on a miss.)
 
+### partial
+
+Compare a partial path to a pattern.  As long as the parts of the path that
+are present are not contradicted by the pattern, it will be treated as a
+match.  This is useful in applications where you're walking through a
+folder structure, and don't yet have the full path, but want to ensure that
+you do not walk down paths that can never be a match.
+
+For example,
+
+```js
+minimatch('/a/b', '/a/*/c/d', { partial: true })  // true, might be /a/b/c/d
+minimatch('/a/b', '/**/d', { partial: true })     // true, might be /a/b/.../d
+minimatch('/x/y/z', '/a/**/z', { partial: true }) // false, because x !== a
+```
+
+### allowWindowsEscape
+
+Windows path separator `\` is by default converted to `/`, which
+prohibits the usage of `\` as a escape character. This flag skips that
+behavior and allows using the escape character.
 
 ## Comparisons to other fnmatch/glob implementations