mybase 1.0.25 → 1.0.30

package/README.md

@@ -31,6 +31,7 @@ var { isLocal } = require('mybase')
 ### object_shuffle(object)
 ### array_shuffle(array)
 ### isMochaRunning
+### ip2int(), int2ip()
 
 
 ### maxmindOpen(geoipFile) : <Promise>

package/mybase.js

@@ -18,12 +18,27 @@ Date.prototype.yyyymmdd = function() {
     ].join('');
 };
 
-function validHPassword(hpassword) { return (hpassword && hpassword.length === 128 && hpassword.search(/^[a-z0-9]+$/) == 0) }
+function validHPassword(hpassword) { return (hpassword && hpassword.length === 128 && hpassword.search(/^[a-f0-9]+$/) == 0) }
 
 function validEmail_old(email) { return (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email)) }
 function validEmail(email) { return (/(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/).test(email)}
 
+
 function validIp(str) {
+    if (str && typeof str==='string') {
+        let splitted
+        if (splitted=str.match(/^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$/)) {
+            for(let octet of splitted) {
+                if (parseInt(octet)>=0 || parseInt(octet)<=255) continue
+                return false
+            }
+            return true
+        }
+    }
+    return false
+}
+
+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)';
     // const regex = new RegExp(`^${octet}\\.${octet}\\.${octet}\\.${octet}$`);
@@ -34,7 +49,6 @@ function randomIP() {
     function int2ip (ipInt) {
         return ( (ipInt>>>24) +'.' + (ipInt>>16 & 255) +'.' + (ipInt>>8 & 255) +'.' + (ipInt & 255) );
     }
-    
     return int2ip(Math.random()*Math.pow(2,32))
 }
 
@@ -50,6 +64,11 @@ function validURL(host) {
     return _validURL(host)
 }
 
+function asJSON(str) {
+    if (!str || typeof str!=='string') return false
+    try { return JSON.parse(str)}catch(_) {}
+    return false
+}
 
 function isObject(a) {
     return (!!a) && (a.constructor === Object);
@@ -400,7 +419,16 @@ async function portCheck_tcp (port, {timeout = 1000, host='127.0.0.1'} = {}) {
 }
 
 
+function int2ip (ipInt) {
+    return ( (ipInt>>>24) +'.' + (ipInt>>16 & 255) +'.' + (ipInt>>8 & 255) +'.' + (ipInt & 255) );
+}
+
+function ip2int(ip) {
+    return ip.split('.').reduce(function(ipInt, octet) { return (ipInt<<8) + parseInt(octet, 10)}, 0) >>> 0;
+}
+
 module.exports = {
+    ip2int,int2ip,
     canReadAndWrite,
     softexit,
     randomString,
@@ -415,7 +443,7 @@ module.exports = {
     validHPassword,
     validEmail,
     validHostname,
-    validIp,
+    validIp,validIpNative,
     validUUID4,
     getTemp,
     getMysql,
@@ -428,5 +456,6 @@ module.exports = {
     array_shuffle,
     object_shuffle,
     isMochaRunning,
-    portCheck_tcp
+    portCheck_tcp,
+    asJSON
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mybase",
-  "version": "1.0.25",
+  "version": "1.0.30",
   "description": "",
   "main": "mybase.js",
   "scripts": {
@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@7c/validurl": "0.0.2",
+    "@7c/validurl": "0.0.3",
     "chalk": "^3.0.0",
     "debug": "^4.3.1",
     "punycode": "^2.1.1"