mybase 1.1.12 → 1.1.13

package/package.json

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

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)
+    })
+
+}