mybase 1.0.34 → 1.0.37

package/README.md

@@ -34,7 +34,7 @@ var { isLocal } = require('mybase')
 ### ip2int(), int2ip()
 ### ensureProperty(obj,'tier.tier',defaultValue)
 
-
+### arrayRandomItem(array,defaultValue=false)
 ### maxmindOpen(geoipFile) : <Promise>
 ```
     var handle = await maxmindOpen(config.geoip.country)

package/mybase.js

@@ -6,7 +6,7 @@ const chalk = require('chalk')
 const punycode = require('punycode');
 const _validURL = require('@7c/validurl')
 const { match } = require('assert');
-
+const validator = require('validator')
 
 Date.prototype.yyyymmdd = function() {
     var mm = this.getMonth() + 1; // getMonth() is zero-based
@@ -23,6 +23,8 @@ function validHPassword(hpassword) { return (hpassword && hpassword.length === 1
 function validEmail_old(email) { return (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email)) }
 
 function validEmail(email) { 
+    return validator.isEmail(email)
+    // giving up old style, was not reliable
     // 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
@@ -30,6 +32,12 @@ 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 arrayRandomItem(arry,defaultValue=false) {
+    if (Array.isArray(arry)) {
+        return arry[Math.floor(Math.random()*arry.length)]
+    }
+    return defaultValue
+}
 
 function validIp(str) {
     if (str && typeof str==='string') {
@@ -333,7 +341,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
@@ -472,6 +515,7 @@ module.exports = {
     validHPassword,
     validEmail,
     validHostname,
+    validHostname2,
     validIp,validIpNative,
     validUUID4,
     getTemp,
@@ -487,5 +531,6 @@ module.exports = {
     isMochaRunning,
     portCheck_tcp,
     asJSON,
-    ensureProperty
+    ensureProperty,
+    arrayRandomItem
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mybase",
-  "version": "1.0.34",
+  "version": "1.0.37",
   "description": "",
   "main": "mybase.js",
   "scripts": {
@@ -12,7 +12,8 @@
     "@7c/validurl": "0.0.3",
     "chalk": "^3.0.0",
     "debug": "^4.3.1",
-    "punycode": "^2.1.1"
+    "punycode": "^2.1.1",
+    "validator": "^13.7.0"
   },
   "devDependencies": {
     "chai": "^4.2.0",