mybase 1.1.12 → 1.1.14

package/mybase.js

@@ -6,7 +6,6 @@ const fs = require('fs')
 const path = require('path')
 const net = require('net')
 const chalk = require('chalk')
-const punycode = require('punycode');
 const _validURL = require('@7c/validurl')
 const validator = require('validator')
 const sha512 = require('js-sha512')
@@ -91,9 +90,8 @@ function randomHPassword(length=10) {
     let plain = randomString(length)
     return sha512(plain)
 }
-function validEmail_old(email) { return (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email)) }
 
-function validEmail(email) { 
+function validEmail(email) {  //! ported
     if (typeof email==='string')
         return validator.isEmail(email) // validator needs a string
     return false
@@ -637,11 +635,11 @@ function ensureProperty(target, propsString, defaultValue = false, debug = false
 
 
 
-function int2ip (ipInt) {
+function int2ip (ipInt) { // ported into IPAddress
     return ( (ipInt>>>24) +'.' + (ipInt>>16 & 255) +'.' + (ipInt>>8 & 255) +'.' + (ipInt & 255) );
 }
 
-function ip2int(ip) {
+function ip2int(ip) { // ported into IPAddress
     return ip.split('.').reduce(function(ipInt, octet) { return (ipInt<<8) + parseInt(octet, 10)}, 0) >>> 0;
 }
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "mybase",
-  "version": "1.1.12",
+  "version": "1.1.14",
   "description": "",
   "main": "mybase.js",
   "scripts": {
-    "test": "jest"
+    "test": "jest --forceExit --verbose"
   },
   "author": "",
   "license": "ISC",
@@ -27,6 +27,7 @@
     "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.11",
     "@types/node": "^20.11.5",
+    "@types/validator": "^13.11.8",
     "chai": "^4.2.0",
     "jest": "^29.7.0",
     "mocha": "^8.2.1",

package/ts/funcs/randomTCPPort.js

@@ -47,38 +47,54 @@ const net = __importStar(require("net"));
  */
 function randomTCPPort(timeout = 1000, fromPort = 1025, untilPort = 65534, tries = 1000, host = '127.0.0.1') {
     return __awaiter(this, void 0, void 0, function* () {
-        // check if the given port range is valid
-        if (fromPort > untilPort)
-            return false;
-        // check if the given port range is valid
-        if (fromPort < 0 || untilPort < 0)
-            return false;
-        // check if the given port range is valid
-        if (fromPort > 65535 || untilPort > 65535)
-            return false;
-        // this function shall return a random port number that is not in use and we should validate this port number by trying to listen to it and releasing
-        // this port number immediately
-        // this function should be used for testing purposes only
-        // this function is not suitable for production use
-        for (let i = 0; i < tries; i++) {
-            let port = Math.floor(Math.random() * (untilPort - fromPort + 1) + fromPort);
-            let server = net.createServer();
-            let checkPort = new Promise((resolve, reject) => {
-                server.on('error', (err) => {
-                    // any error should raise problem
-                    resolve(false);
-                });
-                server.on('listening', () => {
-                    server.close();
-                    resolve(true);
-                });
+        return new Promise(function (resolve, reject) {
+            return __awaiter(this, void 0, void 0, function* () {
+                // check if the given port range is valid
+                if (fromPort > untilPort)
+                    return resolve(false);
+                // check if the given port range is valid
+                if (fromPort < 0 || untilPort < 0)
+                    return resolve(false);
+                // check if the given port range is valid
+                if (fromPort > 65535 || untilPort > 65535)
+                    return resolve(false);
+                // this function shall return a random port number that is not in use and we should validate this port number by trying to listen to it and releasing
+                // this port number immediately
+                // this function should be used for testing purposes only
+                // this function is not suitable for production use
+                while (true && tries > 0) {
+                    tries--;
+                    let port = Math.floor(Math.random() * (untilPort - fromPort + 1) + fromPort);
+                    let server = net.createServer();
+                    let checkPort = new Promise((resolveInner, reject) => {
+                        server.on('error', (err) => {
+                            // any error should raise problem
+                            resolveInner(false);
+                        });
+                        server.on('listening', () => {
+                            resolveInner(true);
+                        });
+                    });
+                    server.listen(port, host);
+                    let result = yield checkPort;
+                    if (result) {
+                        let to = setTimeout(() => {
+                            return resolve(port);
+                        }, 1000);
+                        server.on('close', () => {
+                            clearTimeout(to);
+                            return resolve(port);
+                        });
+                        server.close();
+                        return;
+                    }
+                    else
+                        server.close();
+                }
+                if (tries === 0)
+                    return resolve(false);
             });
-            server.listen(port, host);
-            let result = yield checkPort;
-            if (result)
-                return port;
-        }
-        return false;
+        });
     });
 }
 exports.randomTCPPort = randomTCPPort;

package/ts/funcs/randomTCPPort.ts

@@ -1,3 +1,4 @@
+import { wait } from './wait'
 import * as net from 'net'
 
 /**
@@ -11,34 +12,48 @@ import * as net from 'net'
  * @param tries the number of tries to find a port number
  * @param host the host to bind to
  */
-export async function randomTCPPort(timeout:number=1000,fromPort:number=1025,untilPort:number=65534,tries=1000,host='127.0.0.1') : Promise<number|false> {
-    // check if the given port range is valid
-    if (fromPort>untilPort) return false
-    // check if the given port range is valid
-    if (fromPort<0 || untilPort<0) return false
-    // check if the given port range is valid
-    if (fromPort>65535 || untilPort>65535) return false
+export async function randomTCPPort(timeout: number = 1000, fromPort: number = 1025, untilPort: number = 65534, tries = 1000, host = '127.0.0.1'): Promise<number | false> {
+    return new Promise(async function (resolve, reject) {
+        // check if the given port range is valid
+        if (fromPort > untilPort) return resolve(false)
+        // check if the given port range is valid
+        if (fromPort < 0 || untilPort < 0) return resolve(false)
+        // check if the given port range is valid
+        if (fromPort > 65535 || untilPort > 65535) return resolve(false)
 
-	// this function shall return a random port number that is not in use and we should validate this port number by trying to listen to it and releasing
-    // this port number immediately
-    // this function should be used for testing purposes only
-    // this function is not suitable for production use
-    for(let i=0; i<tries; i++) {
-        let port = Math.floor(Math.random() * (untilPort - fromPort + 1) + fromPort)
-        let server = net.createServer()
-        let checkPort = new Promise((resolve,reject) => {
-            server.on('error', (err) => {
-                // any error should raise problem
-                resolve(false)
+        // this function shall return a random port number that is not in use and we should validate this port number by trying to listen to it and releasing
+        // this port number immediately
+        // this function should be used for testing purposes only
+        // this function is not suitable for production use
+        while(true && tries > 0) {
+            tries--
+            let port = Math.floor(Math.random() * (untilPort - fromPort + 1) + fromPort)
+            let server = net.createServer()
+            let checkPort = new Promise((resolveInner, reject) => {
+                server.on('error', (err) => {
+                    // any error should raise problem
+                    resolveInner(false)
+                })
+                server.on('listening', () => {
+                    resolveInner(true)
+                })
             })
-            server.on('listening', () => {
+            server.listen(port, host)
+            let result = await checkPort
+            if (result) {
+                let to = setTimeout(() => {
+                    return resolve(port)
+                },1000)
+                server.on('close', () => {
+                    clearTimeout(to)
+                    return resolve(port)
+                })
                 server.close()
-                resolve(true)
-            })
-        })
-        server.listen(port,host)
-        let result = await checkPort
-        if (result) return port
-    }
-    return false
-}
+                return
+            } else server.close()
+        }
+        if (tries===0) 
+            return resolve(false)
+    })
+
+}

package/ts/funcs/validEmail.d.ts

@@ -0,0 +1 @@
+export declare function validEmail(email: string): boolean;

package/ts/funcs/validEmail.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validEmail = void 0;
+const validator_1 = __importDefault(require("validator"));
+function validEmail(email) {
+    if (typeof email === 'string')
+        return validator_1.default.isEmail(email); // validator needs a string
+    return false;
+    // 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
+    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);
+}
+exports.validEmail = validEmail;

package/ts/funcs/validEmail.test.js

@@ -0,0 +1,31 @@
+const { validEmail } = require('./validEmail')
+
+// since we use validator, we do not need to test it further
+// detailed tests with millions of emails are in tests/ folder which is .gitignored
+
+describe('validEmail', () => {
+    test('should return true for a valid email', () => {
+        const email = 'test@example.com'
+        expect(validEmail(email)).toBe(true)
+    })
+
+    test('should return false for an invalid email', () => {
+        const email = 'invalidemail'
+        expect(validEmail(email)).toBe(false)
+    })
+
+    test('should return false for an empty email', () => {
+        const email = ''
+        expect(validEmail(email)).toBe(false)
+    })
+
+    test('should return false for a null email', () => {
+        const email = null
+        expect(validEmail(email)).toBe(false)
+    })
+
+    test('should return false for a non-string email', () => {
+        const email = 12345
+        expect(validEmail(email)).toBe(false)
+    })
+})

package/ts/funcs/validEmail.ts

@@ -0,0 +1,13 @@
+import validator from 'validator'
+
+export function validEmail(email:string) { 
+    if (typeof email==='string')
+        return validator.isEmail(email) // validator needs a string
+    return false
+    // 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
+    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)
+}

package/ts/index.d.ts

@@ -15,3 +15,4 @@ export * from "./funcs/ip2int";
 export * from "./funcs/int2ip";
 export * from "./funcs/randomIP6";
 export * from "./funcs/randomTCPPort";
+export * from "./funcs/validEmail";

package/ts/index.js

@@ -31,3 +31,4 @@ __exportStar(require("./funcs/ip2int"), exports);
 __exportStar(require("./funcs/int2ip"), exports);
 __exportStar(require("./funcs/randomIP6"), exports);
 __exportStar(require("./funcs/randomTCPPort"), exports);
+__exportStar(require("./funcs/validEmail"), exports);

package/ts/index.ts

@@ -15,4 +15,5 @@ export * from "./funcs/ip2int"
 export * from "./funcs/int2ip"
 export * from "./funcs/randomIP6"
 export * from "./funcs/randomTCPPort"
+export * from "./funcs/validEmail"