mybase 1.0.29 → 1.0.33

package/README.md

@@ -32,6 +32,7 @@ var { isLocal } = require('mybase')
 ### array_shuffle(array)
 ### isMochaRunning
 ### ip2int(), int2ip()
+### ensureProperty(obj,'tier.tier',defaultValue)
 
 
 ### maxmindOpen(geoipFile) : <Promise>

package/mybase.js

@@ -21,7 +21,13 @@ Date.prototype.yyyymmdd = function() {
 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 validEmail(email) { 
+    // taken from https://www.w3resource.com/javascript/form/email-validation.php
+    // strange looking emails might be indeed valid
+    // check https://www.w3resource.com/javascript/form/example-javascript-form-validation-email-REC-2822.html
+    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) {
@@ -29,7 +35,7 @@ function validIp(str) {
         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
+                if (parseInt(octet)>=0 && parseInt(octet)<=255) continue
                 return false
             }
             return true
@@ -118,10 +124,12 @@ function vaultRead(vault, key) {
     })
 }
 
-function vaultFill(vault, obj, ignoreError = false) {
+function vaultFill(vault, obj, ignoreError = false, keepCache=true) {
     // v2.1
     // fills all strings with ^vault@/secret/... with proper vault values
     // if you call it again, it does reload the configuration
+    // v2.2 
+    // supports keepCache - if vault fails, we will keep previous values instead of filling with false
     return new Promise(async function(resolve, reject) {
         function findVaultKeyMappings(config, keys = []) {
 
@@ -152,6 +160,11 @@ function vaultFill(vault, obj, ignoreError = false) {
                 if (config[i] !== null) {
                     
                     if (config[i] && config[i].constructor.name === 'Object' && config[i].hasOwnProperty('__vaultkey')) {
+                        if (keepCache) {
+                            if (vaultResults[config[i]['__vaultkey']]) config[i] = vaultResults[config[i]['__vaultkey']]
+                        }
+                        
+                        else
                         config[i] = vaultResults[config[i]['__vaultkey']]
                         continue
                     }
@@ -192,7 +205,6 @@ function vaultFill(vault, obj, ignoreError = false) {
 
         resolve(true)
     })
-
 }
 
 
@@ -418,6 +430,22 @@ async function portCheck_tcp (port, {timeout = 1000, host='127.0.0.1'} = {}) {
 	}
 }
 
+function ensureProperty(target, propsString, defaultValue = false, debug = false) {
+    function iterate(o, parts) {
+        if (debug) console.log(parts)
+        let pname = parts.shift()
+        if (debug) console.log(`iterate`, o, pname)
+        if (o.hasOwnProperty(pname) && typeof o[pname] === 'object' && parts.length > 0) return iterate(o[pname], parts)
+        if (debug) console.log(`--`, o, pname, o[pname], parts)
+        if (o.hasOwnProperty(pname) && parts.length === 0) return o[pname]
+        if (debug) console.log(`+++`)
+        return defaultValue
+    }
+    var parts = propsString.split('.')
+    return iterate(target, parts)
+}
+
+
 
 function int2ip (ipInt) {
     return ( (ipInt>>>24) +'.' + (ipInt>>16 & 255) +'.' + (ipInt>>8 & 255) +'.' + (ipInt & 255) );
@@ -457,5 +485,6 @@ module.exports = {
     object_shuffle,
     isMochaRunning,
     portCheck_tcp,
-    asJSON
+    asJSON,
+    ensureProperty
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mybase",
-  "version": "1.0.29",
+  "version": "1.0.33",
   "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"