mybase 1.0.39 → 1.0.41

package/README.md

@@ -33,7 +33,7 @@ var { isLocal } = require('mybase')
 ### isMochaRunning
 ### ip2int(), int2ip()
 ### ensureProperty(obj,'tier.tier',defaultValue)
-
+### Geoip2Paths() : boolean | object
 ### arrayRandomItem(array,defaultValue=false)
 ### maxmindOpen(geoipFile) : <Promise>
 

package/mybase.js

@@ -2,6 +2,8 @@ const aesjs = require("aes-js")
 const debug = require('debug')('mybase')
 const os = require('os')
 const fs = require('fs')
+const path = require('path')
+
 const net = require('net')
 const chalk = require('chalk')
 const punycode = require('punycode');
@@ -56,6 +58,22 @@ function validIp(str) {
     return false
 }
 
+function Geoip2Paths() {
+    function firstExisting(paths) {
+        if (Array.isArray(paths))
+            for(let fpath of paths)
+                if (fs.existsSync(fpath)) return fpath
+        return false
+    }
+
+    return {
+        country:firstExisting(['/opt/geoip2/GeoIP2-Country.mmdb','/usr/local/var/GeoIP/GeoIP2-Country.mmdb','/var/lib/GeoIP/GeoIP2-Country.mmdb','/usr/share/GeoIP/GeoIP2-Country.mmdb',path.join(__dirname, 'assets/GeoIP2-Country.mmdb')]),
+        city:firstExisting(['/opt/geoip2/GeoIP2-City.mmdb','/usr/local/var/GeoIP/GeoIP2-City.mmdb','/var/lib/GeoIP/GeoIP2-City.mmdb','/usr/share/GeoIP/GeoIP2-City.mmdb',path.join(__dirname, 'assets/GeoIP2-City.mmdb')]),
+        isp:firstExisting(['/opt/geoip2/GeoIP2-ISP.mmdb','/usr/local/var/GeoIP/GeoIP2-ISP.mmdb','/var/lib/GeoIP/GeoIP2-ISP.mmdb','/usr/share/GeoIP/GeoIP2-ISP.mmdb',path.join(__dirname, 'assets/GeoIP2-ISP.mmdb')]),
+        ct:firstExisting(['/opt/geoip2/GeoIP2-Connection-Type.mmdb','/usr/local/var/GeoIP/GeoIP2-Connection-Type.mmdb','/var/lib/GeoIP/GeoIP2-Connection-Type.mmdb','/usr/share/GeoIP/GeoIP2-Connection-Type.mmdb',path.join(__dirname, 'assets/GeoIP2-Connection-Type.mmdb')]),
+    }
+}
+
 function validIpNative(str) {
     return (net.isIP(str)!==0)
     // const octet = '(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0)';
@@ -447,6 +465,22 @@ function validUUID4(uuid) {
     return new RegExp(/^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i).test(uuid)
 }
 
+function promiseTimeout(ms, promise) {
+    // Create a promise that rejects in <ms> milliseconds
+    let timeout = new Promise((resolve, reject) => {
+        let id = setTimeout(() => {
+            clearTimeout(id);
+            reject('TIMEDOUT')
+        }, ms)
+    })
+
+    // Returns a race between our timeout and the passed in promise
+    return Promise.race([
+        promise,
+        timeout
+    ])
+}
+
 async function portCheck_tcp (port, {timeout = 1000, host='127.0.0.1'} = {}) {
 	const promise = new Promise(((resolve, reject) => {
 		const socket = new net.Socket();
@@ -563,5 +597,7 @@ module.exports = {
     portCheck_tcp,
     asJSON,
     ensureProperty,
-    arrayRandomItem
+    arrayRandomItem,
+    promiseTimeout,
+    Geoip2Paths
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mybase",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "description": "",
   "main": "mybase.js",
   "scripts": {