mybase 1.0.32 → 1.0.35

package/mybase.js

@@ -26,6 +26,7 @@ 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
+    if (typeof email==='string') email=email.toLowerCase().trim()
     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)
 }
 
@@ -124,10 +125,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 = []) {
 
@@ -158,6 +161,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
                     }
@@ -198,7 +206,6 @@ function vaultFill(vault, obj, ignoreError = false) {
 
         resolve(true)
     })
-
 }
 
 
@@ -326,7 +333,42 @@ function softexit(message = false, seconds = 60, exitcode = 1) {
     setTimeout(() => { process.exit(exitcode) }, seconds * 1000)
 }
 
-function validHostname(domainName) {
+function validHostname(value) {
+    // credit: https://github.com/miguelmota/is-valid-hostname/blob/master/index.js
+    if (typeof value !== 'string') return false
+  
+    const validHostnameChars = /^[a-zA-Z0-9-.]{1,253}\.?$/g
+    if (!validHostnameChars.test(value)) {
+      return false
+    }
+  
+    if (value.endsWith('.')) {
+      value = value.slice(0, value.length - 1)
+    }
+  
+    if (value.length > 253) {
+      return false
+    }
+  
+    const labels = value.split('.')
+  
+    const isValid = labels.every(function (label) {
+      const validLabelChars = /^([a-zA-Z0-9-]+)$/g
+  
+      const validLabel = (
+        validLabelChars.test(label) &&
+        label.length < 64 &&
+        !label.startsWith('-') &&
+        !label.endsWith('-')
+      )
+  
+      return validLabel
+    })
+  
+    return isValid
+  }
+
+function validHostname2(domainName) {
     var domainNameRegex = /^(?:[a-z0-9](?:[a-z0-9_\-]{0,61}[a-z0-9])?\.){0,126}(?:[a-z0-9](?:[a-z0-9\-]{0,61}[a-z0-9]))\.?$/i
     if (!domainName || typeof domainName!=='string') return false
     // is an ip host
@@ -465,6 +507,7 @@ module.exports = {
     validHPassword,
     validEmail,
     validHostname,
+    validHostname2,
     validIp,validIpNative,
     validUUID4,
     getTemp,

package/package.json

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