From a8d1b4fdb1f4cc3c879f2ebddea4e6047beb6e91 Mon Sep 17 00:00:00 2001
From: hanquliu <admin@hanquliu-Mini.local>
Date: Mon, 20 Nov 2023 20:12:39 +0800
Subject: [PATCH 01/10] feat: refactor with typescript to support esm and cjs
 both

---
 .eslintrc                                |   9 ++
 .eslintrc.js                             |   8 -
 .gitignore                               |   2 +
 bin/{detect-port.js => detect-port.ts}   |  13 +-
 index.js                                 |   4 -
 lib/wait-port.js                         |  32 ----
 package.json                             |  59 +++++--
 lib/detect-port.js => src/detect-port.ts |  59 ++++---
 src/index.ts                             |   3 +
 src/wait-port.ts                         |  35 +++++
 test/cli.test.js                         |  50 ------
 test/cli.test.ts                         |  58 +++++++
 test/detect-port.test.js                 | 189 -----------------------
 test/detect-port.test.ts                 | 188 ++++++++++++++++++++++
 test/mocha.opts                          |   1 -
 test/wait-port.test.js                   |  35 -----
 test/wait-port.test.ts                   |  33 ++++
 tsconfig.json                            |   8 +
 18 files changed, 420 insertions(+), 366 deletions(-)
 create mode 100644 .eslintrc
 delete mode 100644 .eslintrc.js
 rename bin/{detect-port.js => detect-port.ts} (91%)
 delete mode 100644 index.js
 delete mode 100644 lib/wait-port.js
 rename lib/detect-port.js => src/detect-port.ts (57%)
 create mode 100644 src/index.ts
 create mode 100644 src/wait-port.ts
 delete mode 100644 test/cli.test.js
 create mode 100644 test/cli.test.ts
 delete mode 100644 test/detect-port.test.js
 create mode 100644 test/detect-port.test.ts
 delete mode 100644 test/mocha.opts
 delete mode 100644 test/wait-port.test.js
 create mode 100644 test/wait-port.test.ts
 create mode 100644 tsconfig.json

diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..3c4ba9b
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,9 @@
+{
+  "extends": [
+    "eslint-config-egg/typescript",
+    "eslint-config-egg/lib/rules/enforce-node-prefix"
+  ],
+  "rules": {
+    "@typescript-eslint/ban-ts-comment": "off"
+  }
+}
\ No newline at end of file
diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index ed9eafd..0000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict';
-
-module.exports = {
-  extends: 'eslint-config-egg',
-  parserOptions: {
-    ecmaVersion: 2020,
-  },
-};
diff --git a/.gitignore b/.gitignore
index 8dfbbd1..c0a0f5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ node_modules
 coverage
 *.un~
 *.sw*
+.tshy*
+dist/
\ No newline at end of file
diff --git a/bin/detect-port.js b/bin/detect-port.ts
similarity index 91%
rename from bin/detect-port.js
rename to bin/detect-port.ts
index 84da022..d035ec1 100644
--- a/bin/detect-port.js
+++ b/bin/detect-port.ts
@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
-'use strict';
-
-const pkg = require('../package');
+import pkg from '../package.json';
+import detectPort from '../src/detect-port.js';
 
 const args = process.argv.slice(2);
 let arg_0 = args[0];
 
 if (arg_0 && [ '-v', '--version' ].includes(arg_0.toLowerCase())) {
   console.log(pkg.version);
+
   process.exit(0);
 }
 
@@ -21,18 +21,15 @@ const removeByValue = (arr, val) => {
   }
 };
 
-const main = require('..');
-
 const port = parseInt(arg_0, 10);
 const isVerbose = args.includes('--verbose');
 
 removeByValue(args, '--verbose');
 arg_0 = args[0];
-
 if (!arg_0) {
   const random = Math.floor(9000 + Math.random() * (65535 - 9000));
 
-  main(random, (err, port) => {
+  detectPort(random, (err, port) => {
     if (isVerbose) {
       if (err) {
         console.log(`get available port failed with ${err}`);
@@ -61,7 +58,7 @@ if (!arg_0) {
   console.log(`    ${pkg.homepage}`);
   console.log();
 } else {
-  main(port, (err, _port) => {
+  detectPort(port, (err, _port) => {
     if (isVerbose) {
       if (err) {
         console.log(`get available port failed with ${err}`);
diff --git a/index.js b/index.js
deleted file mode 100644
index 2dc88ab..0000000
--- a/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-'use strict';
-
-module.exports = require('./lib/detect-port');
-module.exports.waitPort = require('./lib/wait-port');
diff --git a/lib/wait-port.js b/lib/wait-port.js
deleted file mode 100644
index 2322aae..0000000
--- a/lib/wait-port.js
+++ /dev/null
@@ -1,32 +0,0 @@
-'use strict';
-
-const debug = require('debug')('wait-port');
-const detect = require('./detect-port');
-
-const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
-
-async function waitPort(port, options = {}) {
-  const { retryInterval = 1000, retries = Infinity } = options;
-  let count = 1;
-
-  async function loop() {
-    debug('retries', retries, 'count', count);
-    if (count > retries) {
-      const err = new Error('retries exceeded');
-      err.retries = retries;
-      err.count = count;
-      throw err;
-    }
-    count++;
-    const freePort = await detect(port);
-    if (freePort === port) {
-      await sleep(retryInterval);
-      return loop();
-    }
-    return true;
-  }
-
-  return await loop();
-}
-
-module.exports = waitPort;
diff --git a/package.json b/package.json
index 2104d7e..ecbc739 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "detect": "./bin/detect-port.js",
     "detect-port": "./bin/detect-port.js"
   },
-  "main": "index.js",
+  "main": "./dist/commonjs/index.js",
   "files": [
     "bin",
     "lib",
@@ -21,28 +21,55 @@
     "url": "git://github.com/node-modules/detect-port.git"
   },
   "dependencies": {
-    "address": "^1.0.1",
-    "debug": "4"
+    "address": "^2.0.1"
   },
   "devDependencies": {
-    "command-line-test": "1",
-    "egg-bin": "^5.2.0",
-    "eslint": "^8.23.1",
-    "eslint-config-egg": "^12.0.0",
-    "git-contributor": "1",
-    "mm": "^2.1.0",
-    "pedding": "^1.1.0",
-    "power-assert": "^1.6.1"
+    "@eggjs/tsconfig": "^1.3.3",
+    "@types/node": "^20.9.0",
+    "c8": "^8.0.1",
+    "egg-bin": "^6.5.2",
+    "eslint": "^8.52.0",
+    "eslint-config-egg": "^13.0.0",
+    "execa": "^8.0.1",
+    "git-contributor": "^2.1.5",
+    "strip-ansi": "^7.1.0",
+    "ts-node": "^10.9.1",
+    "tshy": "^1.8.0",
+    "tshy-after": "^1.0.0",
+    "tsx": "^4.1.2",
+    "typescript": "^5.2.2"
   },
   "scripts": {
-    "test": "egg-bin test",
-    "ci": "npm run lint && egg-bin cov",
-    "lint": "eslint .",
-    "contributor": "git-contributor"
+    "test": "npm run lint -- --fix && tsx --test test/*.test.ts",
+    "lint": "eslint src test --ext ts",
+    "ci": "npm run lint && npm run cov && npm run prepublishOnly",
+    "contributor": "git-contributor",
+    "prepublishOnly": "npm run tsc && tshy && tshy-after",
+    "tsc": "tsc ./bin/detect-port.ts --resolveJsonModule --esModuleInterop",
+    "cov": "c8 npm test"
   },
   "engines": {
     "node": ">= 4.0.0"
   },
   "homepage": "https://github.com/node-modules/detect-port",
-  "license": "MIT"
+  "license": "MIT",
+  "tshy": {
+    "exports": {
+      ".": "./src/index.ts"
+    }
+  },
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/index.d.ts",
+        "default": "./dist/commonjs/index.js"
+      }
+    }
+  },
+  "types": "./dist/commonjs/index.d.ts",
+  "type": "module"
 }
diff --git a/lib/detect-port.js b/src/detect-port.ts
similarity index 57%
rename from lib/detect-port.js
rename to src/detect-port.ts
index c94ceb0..981d603 100644
--- a/lib/detect-port.js
+++ b/src/detect-port.ts
@@ -1,24 +1,35 @@
-'use strict';
+import net from 'node:net';
+import { ip } from 'address';
+import { debuglog } from 'node:util';
 
-const net = require('net');
-const address = require('address');
-const debug = require('debug')('detect-port');
+const debug = debuglog('detect-port');
 
-module.exports = (port, callback) => {
-  let hostname = '';
+type DetectPortCallback = (err: Error | null, port: number) => void;
 
-  if (typeof port === 'object' && port) {
+interface PortConfig {
+  port?: number | string;
+  hostname?: string | undefined;
+  callback?: DetectPortCallback;
+}
+
+export default function detectPort(port?: number | PortConfig | string): Promise<number>;
+export default function detectPort(callback: DetectPortCallback): void;
+export default function detectPort(port: number | PortConfig | string | undefined, callback: DetectPortCallback): void;
+export default function detectPort(port?: number | string | PortConfig | DetectPortCallback, callback?: DetectPortCallback) {
+  let hostname: string | undefined = '';
+
+  if (port && typeof port === 'object') {
     hostname = port.hostname;
     callback = port.callback;
     port = port.port;
   } else {
     if (typeof port === 'function') {
       callback = port;
-      port = null;
+      port = void 0;
     }
   }
 
-  port = parseInt(port) || 0;
+  port = parseInt(port as unknown as string) || 0;
   let maxPort = port + 10;
   if (maxPort > 65535) {
     maxPort = 65535;
@@ -29,13 +40,13 @@ module.exports = (port, callback) => {
   }
   // promise
   return new Promise(resolve => {
-    tryListen(port, maxPort, hostname, (_, realPort) => {
+    tryListen(port as number, maxPort, hostname, (_, realPort) => {
       resolve(realPort);
     });
   });
-};
+}
 
-function tryListen(port, maxPort, hostname, callback) {
+function tryListen(port: number, maxPort: number, hostname: string | undefined, callback: (...args: any[]) => void) {
   function handleError() {
     port++;
     if (port >= maxPort) {
@@ -50,7 +61,7 @@ function tryListen(port, maxPort, hostname, callback) {
   if (hostname) {
     listen(port, hostname, (err, realPort) => {
       if (err) {
-        if (err.code === 'EADDRNOTAVAIL') {
+        if ((err as any).code === 'EADDRNOTAVAIL') {
           return callback(new Error('the ip that is not unknown on the machine'));
         }
         return handleError();
@@ -60,34 +71,34 @@ function tryListen(port, maxPort, hostname, callback) {
     });
   } else {
     // 1. check null
-    listen(port, null, (err, realPort) => {
+    listen(port, void 0, (err, realPort) => {
       // ignore random listening
       if (port === 0) {
         return callback(err, realPort);
       }
 
       if (err) {
-        return handleError(err);
+        return handleError();
       }
 
       // 2. check 0.0.0.0
       listen(port, '0.0.0.0', err => {
         if (err) {
-          return handleError(err);
+          return handleError();
         }
 
         // 3. check localhost
         listen(port, 'localhost', err => {
           // if localhost refer to the ip that is not unkonwn on the machine, you will see the error EADDRNOTAVAIL
           // https://stackoverflow.com/questions/10809740/listen-eaddrnotavail-error-in-node-js
-          if (err && err.code !== 'EADDRNOTAVAIL') {
-            return handleError(err);
+          if (err && (err as any).code !== 'EADDRNOTAVAIL') {
+            return handleError();
           }
 
           // 4. check current ip
-          listen(port, address.ip(), (err, realPort) => {
+          listen(port, ip(), (err, realPort) => {
             if (err) {
-              return handleError(err);
+              return handleError();
             }
 
             callback(null, realPort);
@@ -98,21 +109,23 @@ function tryListen(port, maxPort, hostname, callback) {
   }
 }
 
-function listen(port, hostname, callback) {
+function listen(port: number, hostname: string | undefined, callback: (...args: any[]) => void) {
   const server = new net.Server();
 
   server.on('error', err => {
     debug('listen %s:%s error: %s', hostname, port, err);
     server.close();
-    if (err.code === 'ENOTFOUND') {
+
+    if ((err as any).code === 'ENOTFOUND') {
       debug('ignore dns ENOTFOUND error, get free %s:%s', hostname, port);
       return callback(null, port);
     }
+
     return callback(err);
   });
 
   server.listen(port, hostname, () => {
-    port = server.address().port;
+    port = (server.address() as net.AddressInfo).port;
     server.close();
     debug('get free %s:%s', hostname, port);
     return callback(null, port);
diff --git a/src/index.ts b/src/index.ts
new file mode 100644
index 0000000..8b5ce6c
--- /dev/null
+++ b/src/index.ts
@@ -0,0 +1,3 @@
+import detectPort from './detect-port.js';
+
+export default detectPort;
diff --git a/src/wait-port.ts b/src/wait-port.ts
new file mode 100644
index 0000000..b9a1a97
--- /dev/null
+++ b/src/wait-port.ts
@@ -0,0 +1,35 @@
+import { debuglog } from 'node:util';
+import detectPort from './detect-port.js';
+
+const debug = debuglog('wait-port');
+
+const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+
+export interface WaitPortOptions {
+  retryInterval?: number;
+  retries?: number;
+}
+
+export default async function waitPort(port: number, options: WaitPortOptions = {}) {
+  const { retryInterval = 1000, retries = Infinity } = options;
+  let count = 1;
+
+  async function loop() {
+    debug('retries', retries, 'count', count);
+    if (count > retries) {
+      const err = new Error('retries exceeded');
+      (err as any).retries = retries;
+      (err as any).count = count;
+      throw err;
+    }
+    count++;
+    const freePort = await detectPort(port);
+    if (freePort === port) {
+      await sleep(retryInterval);
+      return loop();
+    }
+    return true;
+  }
+
+  return await loop();
+}
diff --git a/test/cli.test.js b/test/cli.test.js
deleted file mode 100644
index a5067ab..0000000
--- a/test/cli.test.js
+++ /dev/null
@@ -1,50 +0,0 @@
-'use strict';
-
-const path = require('path');
-const assert = require('assert');
-const CliTest = require('command-line-test');
-
-const pkg = require('../package');
-
-const cliTest = new CliTest();
-const binFile = path.resolve(pkg.bin[pkg.name]);
-
-describe('command-line tool test', () => {
-
-  it('should show version and exit', async () => {
-    let res = await cliTest.exec(`node ${binFile} -v`, {});
-    assert.equal(res.stdout, pkg.version);
-    res = await cliTest.exec(`node ${binFile} --version`, {});
-    assert(res.stdout.includes(pkg.version));
-  });
-
-  it('should output usage information', async () => {
-    let res = await cliTest.exec(`node ${binFile} -h`, {});
-    assert(res.stdout.includes(pkg.description));
-    res = await cliTest.exec(`node ${binFile} --help`, {});
-    assert(res.stdout.includes(pkg.description));
-    res = await cliTest.exec(`node ${binFile} help`, {});
-    assert(res.stdout.includes(pkg.description));
-    res = await cliTest.exec(`node ${binFile} xxx`, {});
-    assert(res.stdout.includes(pkg.description));
-  });
-
-  it('should output available port randomly', async () => {
-    const res = await cliTest.exec(`node ${binFile}`, {});
-    const port = parseInt(res.stdout.trim(), 10);
-    assert(port >= 9000 && port < 65535);
-  });
-
-  it('should output available port from the given port', async () => {
-    const givenPort = 9000;
-    const res = await cliTest.exec(`node ${binFile} ${givenPort}`, {});
-    const port = parseInt(res.stdout.trim(), 10);
-    assert(port >= givenPort && port < 65535);
-  });
-
-  it('should output verbose logs', async () => {
-    const res = await cliTest.exec(`node ${binFile} --verbose`, {});
-    assert(res.stdout.includes('random'));
-  });
-
-});
diff --git a/test/cli.test.ts b/test/cli.test.ts
new file mode 100644
index 0000000..6695600
--- /dev/null
+++ b/test/cli.test.ts
@@ -0,0 +1,58 @@
+import stripAnsi from 'strip-ansi';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { describe, it } from 'node:test';
+import { execaNode } from 'execa';
+import { strict as assert } from 'node:assert';
+import pkg from '../package.json';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const execaNodeWithLoader = (async (scripPath, args, options) => {
+  return execaNode(scripPath, args, {
+    ...options,
+    verbose: true,
+    nodeOptions: [ '--loader', 'tsx' ],
+  });
+}) as typeof execaNode;
+
+describe('test/cli.test.js', async () => {
+  const binFile = path.join(__dirname, '../bin/detect-port.ts');
+
+  it('should show version', async () => {
+    let res = await execaNodeWithLoader(binFile, [ '-v' ]);
+    assert(res.stdout, pkg.version);
+    res = await execaNodeWithLoader(binFile, [ '--version' ]);
+    assert(res.stdout, pkg.version);
+  });
+
+  it('should output usage information', async () => {
+    let res = await execaNodeWithLoader(binFile, [ '-h' ]);
+    assert(res.stdout.includes(pkg.description));
+    res = await execaNodeWithLoader(binFile, [ '--help' ]);
+    assert(res.stdout.includes(pkg.description));
+    res = await await execaNodeWithLoader(binFile, [ 'help' ]);
+    assert(res.stdout.includes(pkg.description));
+    res = await await execaNodeWithLoader(binFile, [ 'xxx' ]);
+    assert(res.stdout.includes(pkg.description));
+  });
+
+  it('should output available port randomly', { only: true }, async () => {
+    const res = await execaNodeWithLoader(binFile);
+    const port = parseInt(stripAnsi(res.stdout).trim(), 10);
+    assert(port >= 9000 && port < 65535);
+  });
+
+  it('should output available port from the given port', async () => {
+    const givenPort = 9000;
+    const res = await execaNodeWithLoader(binFile, [ givenPort + '' ]);
+    const port = parseInt(stripAnsi(res.stdout).trim(), 10);
+    assert(port >= givenPort && port < 65535);
+  });
+
+  it('should output verbose logs', async () => {
+    const res = await execaNodeWithLoader(binFile, [ '--verbose' ]);
+    assert(res.stdout.includes('random'));
+  });
+});
diff --git a/test/detect-port.test.js b/test/detect-port.test.js
deleted file mode 100644
index af1b3a5..0000000
--- a/test/detect-port.test.js
+++ /dev/null
@@ -1,189 +0,0 @@
-'use strict';
-
-const mm = require('mm');
-const dns = require('dns');
-const net = require('net');
-const pedding = require('pedding');
-const address = require('address');
-const assert = require('power-assert');
-
-const detectPort = require('..');
-
-describe('test/detect-port.test.js', () => {
-  describe('detect port test', () => {
-    const servers = [];
-    before(done => {
-      done = pedding(13, done);
-      const server = new net.Server();
-      server.listen(3000, 'localhost', done);
-      server.on('error', err => {
-        console.error('listen localhost error:', err);
-      });
-      servers.push(server);
-
-      const server2 = new net.Server();
-      server2.listen(4000, address.ip(), done);
-      servers.push(server2);
-
-      const server3 = new net.Server();
-      server3.listen(8080, '0.0.0.0', done);
-      servers.push(server3);
-
-      for (let port = 7000; port < 7010; port++) {
-        const server = new net.Server();
-        if (port % 3 === 0) {
-          server.listen(port, done);
-        } else if (port % 3 === 1) {
-          server.listen(port, 'localhost', done);
-        } else {
-          server.listen(port, address.ip(), done);
-        }
-        servers.push(server);
-      }
-    });
-    after(() => {
-      servers.forEach(server => server.close());
-    });
-
-    afterEach(mm.restore);
-
-    it('get random port', done => {
-      detectPort((_, port) => {
-        assert(port >= 1024 && port < 65535);
-        done();
-      });
-    });
-
-    it('callback with occupied port', done => {
-      const _port = 80;
-      detectPort(_port, (_, port) => {
-        assert(port >= _port && port < 65535);
-        done();
-      });
-    });
-
-    it('work with listening next port 3001 because 3000 was listened to localhost', done => {
-      const port = 3000;
-      detectPort(port, (_, realPort) => {
-        assert(realPort === 3001);
-        done();
-      });
-    });
-
-    it('should listen next port 4001 when localhost is not binding', done => {
-      // https://github.com/nodejs/node/blob/6af72d4b037eba38d94395f57a03a498a2efef09/lib/net.js#L1463
-      // mock dns.lookup
-      mm(dns, '__rawLookup', dns.lookup);
-      mm(dns, 'lookup', (address, callback) => {
-        if (address !== 'localhost') {
-          return dns.__rawLookup(address, callback);
-        }
-        process.nextTick(() => {
-          const err = new Error(`getaddrinfo ENOTFOUND ${address}`);
-          err.code = 'ENOTFOUND';
-          callback(err);
-        });
-      });
-      const port = 4000;
-      detectPort(port, (_, realPort) => {
-        assert(realPort === 4001);
-        done();
-      });
-    });
-
-    it('work with listening next port 4001 because 4000 was listened to ' + address.ip(), done => {
-      const port = 4000;
-      detectPort(port, (_, realPort) => {
-        assert(realPort === 4001);
-        done();
-      });
-    });
-
-    it('work with listening next port 8081 because 8080 was listened to 0.0.0.0:8080', done => {
-      const port = 8080;
-      detectPort(port, (_, realPort) => {
-        assert(realPort === 8081);
-        done();
-      });
-    });
-
-    it('work with listening random port when try port hit maxPort', done => {
-      const port = 7000;
-      detectPort(port, (_, realPort) => {
-        assert(realPort < 7000 || realPort > 7009);
-        done();
-      });
-    });
-
-    it('work with sending object with hostname', done => {
-      const port = 7000;
-      const hostname = '127.0.0.1';
-      detectPort({
-        port,
-        hostname,
-        callback: (_, realPort) => {
-          assert(realPort >= 7000 && realPort < 65535);
-          done();
-        },
-      });
-    });
-
-    it('promise with sending object with hostname', done => {
-      const port = 7000;
-      const hostname = '127.0.0.1';
-      detectPort({
-        port,
-        hostname,
-      }).then(realPort => {
-        assert(realPort >= 7000 && realPort < 65535);
-        done();
-      });
-    });
-
-    it('callback with string arg', done => {
-      const _port = '8080';
-      detectPort(_port, (_, port) => {
-        assert(port >= 8080 && port < 65535);
-        done();
-      });
-    });
-
-    it('callback with wrong arguments', done => {
-      detectPort('oooo', (_, port) => {
-        assert(port > 0);
-        done();
-      });
-    });
-
-    it('generator usage', async () => {
-      const _port = 8080;
-      const port = await detectPort(_port);
-      assert(port >= _port && port < 65535);
-    });
-
-    it('promise usage', done => {
-      const _port = 8080;
-      detectPort(_port)
-        .then(port => {
-          assert(port >= _port && port < 65535);
-          done();
-        })
-        .catch(done);
-    });
-
-    it('promise with wrong arguments', done => {
-      detectPort()
-        .then(port => {
-          assert(port > 0);
-          done();
-        })
-        .catch(done);
-    });
-
-    it('generator with wrong arguments and return random port', async () => {
-      const port = await detectPort('oooo');
-      assert(port > 0);
-      assert(typeof port === 'number');
-    });
-  });
-});
diff --git a/test/detect-port.test.ts b/test/detect-port.test.ts
new file mode 100644
index 0000000..f1593fc
--- /dev/null
+++ b/test/detect-port.test.ts
@@ -0,0 +1,188 @@
+import dns from 'node:dns';
+import net from 'node:net';
+import { strict as assert } from 'node:assert';
+import { mock, describe, it, before, after } from 'node:test';
+import { ip } from 'address';
+
+import detectPort from '../src/detect-port.js';
+
+describe('test/detect-port.test.js', () => {
+  describe('detect port test', () => {
+    const servers: net.Server[] = [];
+    before((_, done) => {
+      let count = 0;
+      const cb = mock.fn((err?: Error) => {
+        if (err) {
+          done(err);
+        }
+        count += 1;
+        if (count === 13) {
+          done();
+        }
+      });
+      const server = new net.Server();
+      server.listen(3000, 'localhost', cb);
+      server.on('error', err => {
+        console.error('listen localhost error:', err);
+      });
+      servers.push(server);
+
+      const server2 = new net.Server();
+      server2.listen(4000, ip(), cb);
+      servers.push(server2);
+
+      const server3 = new net.Server();
+      server3.listen(8080, '0.0.0.0', cb);
+      servers.push(server3);
+
+      for (let port = 7000; port < 7010; port++) {
+        const server = new net.Server();
+        if (port % 3 === 0) {
+          server.listen(port, cb);
+        } else if (port % 3 === 1) {
+          server.listen(port, 'localhost', cb);
+        } else {
+          server.listen(port, ip(), cb);
+        }
+        servers.push(server);
+      }
+    });
+    after(() => {
+      servers.forEach(server => server.close());
+      mock.reset();
+    });
+
+    it('get random port with callback', (_, done) => {
+      detectPort((_, port) => {
+        assert(port >= 1024 && port < 65535);
+        done();
+      });
+
+    });
+
+    it('get random port with promise', async () => {
+      const port = await detectPort();
+
+      assert(port >= 1024 && port < 65535);
+    });
+
+    it('with occupied port', async () => {
+      const port = 80;
+      const realPort = await detectPort(port);
+
+      assert(realPort >= port && realPort < 65535);
+    });
+
+    it('work with listening next port 3001 because 3000 was listened to localhost', async () => {
+      const port = 3000;
+      const realPort = await detectPort(port);
+
+      assert(realPort === 3001);
+    });
+
+    it('should listen next port 4001 when localhost is not binding', async t => {
+      t.mock.method(dns, 'lookup', (address: string, callback: (...args: any[]) => void) => {
+        if (address !== 'localhost') {
+          return dns.lookup(address, callback);
+        }
+        process.nextTick(() => {
+          const err = new Error(`getaddrinfo ENOTFOUND ${address}`);
+          (err as any).code = 'ENOTFOUND';
+          callback(err);
+        });
+      }, { times: 1 });
+
+      const port = 4000;
+      const realPort = await detectPort(port);
+
+      assert(realPort === 4001);
+
+      t.mock.reset();
+    });
+
+    it('work with listening next port 4001 because 4000 was listened to ' + ip(), async () => {
+      const port = 4000;
+      const realPort = await detectPort(port);
+
+      assert(realPort === 4001);
+    });
+
+    it('work with listening next port 8081 because 8080 was listened to 0.0.0.0:8080', async () => {
+      const port = 8080;
+      const realPort = await detectPort(port);
+
+      assert(realPort === 8081);
+    });
+
+    it('work with listening random port when try port hit maxPort', async () => {
+      const port = 7000;
+      const realPort = await detectPort(port);
+      assert(realPort < 7000 || realPort > 7009);
+    });
+
+    it('work with sending object with hostname', (_, done) => {
+      const port = 7000;
+      const hostname = '127.0.0.1';
+      detectPort({
+        port,
+        hostname,
+        callback: (_, realPort) => {
+          assert(realPort >= 7000 && realPort < 65535);
+          done();
+        },
+      });
+    });
+
+    it('promise with sending object with hostname', async () => {
+      const port = 7000;
+      const hostname = '127.0.0.1';
+      const realPort = await detectPort({
+        port,
+        hostname,
+      });
+      assert(realPort >= 7000 && realPort < 65535);
+    });
+
+    it('with string arg', async () => {
+      const port = '8080';
+      const realPort = await detectPort(port);
+      assert(realPort >= 8080 && realPort < 65535);
+    });
+
+    it('with wrong arguments', async () => {
+      const port = await detectPort('oooo');
+      assert(port && port > 0);
+    });
+
+    it('generator usage', async () => {
+      const port = 8080;
+      const realPort = await detectPort(port);
+      assert(realPort >= port && realPort < 65535);
+    });
+
+    it('promise usage', (_, done) => {
+      const _port = 8080;
+      detectPort(_port)
+        .then(port => {
+          assert(port >= _port && port < 65535);
+          done();
+        })
+        .catch(done);
+    });
+
+    it('promise with wrong arguments', (_, done) => {
+      detectPort()
+        .then(port => {
+          assert(port > 0);
+          done();
+        })
+        .catch(done);
+    });
+
+    it('generator with wrong arguments and return random port', async () => {
+      const port = await detectPort('oooo');
+      assert(port > 0);
+      assert(typeof port === 'number');
+    });
+  });
+});
diff --git a/test/mocha.opts b/test/mocha.opts
deleted file mode 100644
index de65ecc..0000000
--- a/test/mocha.opts
+++ /dev/null
@@ -1 +0,0 @@
---timeout 30000
\ No newline at end of file
diff --git a/test/wait-port.test.js b/test/wait-port.test.js
deleted file mode 100644
index 84f407a..0000000
--- a/test/wait-port.test.js
+++ /dev/null
@@ -1,35 +0,0 @@
-'use strict';
-
-const mm = require('mm');
-const net = require('net');
-
-const { waitPort } = require('..');
-
-describe('test/wait-port.test.js', () => {
-  describe('wait for port', () => {
-    const servers = [];
-    after(() => {
-      servers.forEach(server => server.close());
-    });
-
-    afterEach(mm.restore);
-
-    it('should be work', done => {
-      const port = 9090;
-      const server = new net.Server();
-      server.listen(port, '0.0.0.0');
-      servers.push(server);
-      setTimeout(() => {
-        waitPort(port).then().finally(done);
-      });
-    });
-
-    it('should be work when retries exceeded', done => {
-      const port = 9093;
-      waitPort(port, {
-        retries: 3,
-        retryInterval: 100,
-      }).then().finally(done);
-    });
-  });
-});
diff --git a/test/wait-port.test.ts b/test/wait-port.test.ts
new file mode 100644
index 0000000..a1e41a0
--- /dev/null
+++ b/test/wait-port.test.ts
@@ -0,0 +1,33 @@
+import net from 'node:net';
+import { describe, it, after } from 'node:test';
+import { strict as assert } from 'node:assert';
+
+import waitPort from '../src/wait-port.js';
+
+describe('test/wait-port.test.js', () => {
+  describe('wait for port', () => {
+    const servers: net.Server[] = [];
+    after(() => {
+      servers.forEach(server => server.close());
+    });
+
+    it('should be work', (_, done) => {
+      const port = 9090;
+      const server = new net.Server();
+      server.listen(port, '0.0.0.0');
+      servers.push(server);
+      setTimeout(() => {
+        waitPort(port).then().finally(done);
+      });
+    });
+
+    it('should be work when retries exceeded', async () => {
+      try {
+        const port = 9093;
+        await waitPort(port, { retries: 3, retryInterval: 100 });
+      } catch (err:any) {
+        assert(err.message === 'retries exceeded');
+      }
+    });
+  });
+});
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000..10b9c72
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,8 @@
+{
+    "extends": "@eggjs/tsconfig",
+    "compilerOptions": {
+        "target": "es2022",
+        "module": "nodenext",
+        "moduleResolution": "nodenext"
+    }
+}
\ No newline at end of file

From c8ccfdf993274cc877395117268187de9b502168 Mon Sep 17 00:00:00 2001
From: hanquliu <admin@hanquliu-Mini.local>
Date: Mon, 20 Nov 2023 21:11:05 +0800
Subject: [PATCH 02/10] chore: node.js version in ci

---
 .github/workflows/nodejs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 22a8662..c4ab048 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -15,4 +15,4 @@ jobs:
     uses: artusjs/github-actions/.github/workflows/node-test.yml@v1
     with:
       os: 'ubuntu-latest'
-      version: '14, 16, 18'
+      version: '16, 18, 20'

From e72caf96fd409f5f8781c7d06bf78cfbe935d1c5 Mon Sep 17 00:00:00 2001
From: hanquliu <admin@hanquliu-Mini.local>
Date: Tue, 21 Nov 2023 17:27:11 +0800
Subject: [PATCH 03/10] export waitPort

---
 package.json | 1 -
 src/index.ts | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ecbc739..a3f6024 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
     "@eggjs/tsconfig": "^1.3.3",
     "@types/node": "^20.9.0",
     "c8": "^8.0.1",
-    "egg-bin": "^6.5.2",
     "eslint": "^8.52.0",
     "eslint-config-egg": "^13.0.0",
     "execa": "^8.0.1",
diff --git a/src/index.ts b/src/index.ts
index 8b5ce6c..e7782f1 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,3 +1,6 @@
 import detectPort from './detect-port.js';
+import waitPort from './wait-port.js';
 
 export default detectPort;
+
+export { waitPort };

From b7bcccf270edc4788ad5dfb48fb44b7213840f5f Mon Sep 17 00:00:00 2001
From: fengmk2 <fengmk2@gmail.com>
Date: Wed, 8 May 2024 16:19:48 +0800
Subject: [PATCH 04/10] f

---
 .github/workflows/codeql-analysis.yml | 74 ---------------------------
 .github/workflows/nodejs.yml          |  7 +--
 .github/workflows/release.yml         |  6 +--
 .gitignore                            |  3 +-
 bin/detect-port.ts                    |  9 +++-
 package.json                          |  7 +--
 test/cli.test.ts                      |  4 +-
 7 files changed, 20 insertions(+), 90 deletions(-)
 delete mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index 0c8cb40..0000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "master" ]
-  schedule:
-    - cron: '38 21 * * 1'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-        
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
-    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-    # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index c4ab048..075facf 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -3,16 +3,13 @@ name: CI
 on:
   push:
     branches: [ master ]
-
   pull_request:
     branches: [ master ]
 
-  workflow_dispatch: {}
-
 jobs:
   Job:
     name: Node.js
-    uses: artusjs/github-actions/.github/workflows/node-test.yml@v1
+    uses: node-modules/github-actions/.github/workflows/node-test.yml@master
     with:
       os: 'ubuntu-latest'
-      version: '16, 18, 20'
+      version: '16, 18, 20, 22'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1612587..1c6cbb1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,14 +4,10 @@ on:
   push:
     branches: [ master ]
 
-  workflow_dispatch: {}
-
 jobs:
   release:
     name: Node.js
-    uses: artusjs/github-actions/.github/workflows/node-release.yml@v1
+    uses: node-modules/github-actions/.github/workflows/node-release.yml@master
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
-    with:
-      checkTest: false
diff --git a/.gitignore b/.gitignore
index c0a0f5d..ad548be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ coverage
 *.un~
 *.sw*
 .tshy*
-dist/
\ No newline at end of file
+dist/
+package-lock.json
diff --git a/bin/detect-port.ts b/bin/detect-port.ts
index d035ec1..b75d161 100644
--- a/bin/detect-port.ts
+++ b/bin/detect-port.ts
@@ -1,8 +1,15 @@
 #!/usr/bin/env node
 
-import pkg from '../package.json';
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
+import { readFileSync } from 'node:fs';
 import detectPort from '../src/detect-port.js';
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const pkgFile = path.join(__dirname, '../package.json');
+const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
+
 const args = process.argv.slice(2);
 let arg_0 = args[0];
 
diff --git a/package.json b/package.json
index a3f6024..d97805a 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "@eggjs/tsconfig": "^1.3.3",
     "@types/node": "^20.9.0",
     "c8": "^8.0.1",
+    "egg-bin": "^6.9.0",
     "eslint": "^8.52.0",
     "eslint-config-egg": "^13.0.0",
     "execa": "^8.0.1",
@@ -35,17 +36,17 @@
     "ts-node": "^10.9.1",
     "tshy": "^1.8.0",
     "tshy-after": "^1.0.0",
-    "tsx": "^4.1.2",
     "typescript": "^5.2.2"
   },
   "scripts": {
-    "test": "npm run lint -- --fix && tsx --test test/*.test.ts",
+    "test": "npm run lint -- --fix && egg-bin test",
     "lint": "eslint src test --ext ts",
     "ci": "npm run lint && npm run cov && npm run prepublishOnly",
     "contributor": "git-contributor",
     "prepublishOnly": "npm run tsc && tshy && tshy-after",
     "tsc": "tsc ./bin/detect-port.ts --resolveJsonModule --esModuleInterop",
-    "cov": "c8 npm test"
+    "clean": "",
+    "cov": "egg-bin cov"
   },
   "engines": {
     "node": ">= 4.0.0"
diff --git a/test/cli.test.ts b/test/cli.test.ts
index 6695600..2b3eda5 100644
--- a/test/cli.test.ts
+++ b/test/cli.test.ts
@@ -4,10 +4,12 @@ import { fileURLToPath } from 'node:url';
 import { describe, it } from 'node:test';
 import { execaNode } from 'execa';
 import { strict as assert } from 'node:assert';
-import pkg from '../package.json';
+import { readFileSync } from 'node:fs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+const pkgFile = path.join(__dirname, '../package.json');
+const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
 
 const execaNodeWithLoader = (async (scripPath, args, options) => {
   return execaNode(scripPath, args, {

From fd74c4c39e6ad0fed841772448197d3efe51bd3d Mon Sep 17 00:00:00 2001
From: fengmk2 <fengmk2@gmail.com>
Date: Wed, 29 May 2024 23:41:17 +0800
Subject: [PATCH 05/10] f

---
 CHANGELOG.md |  94 +++++++++++++++++++++++++++++++++++++++++++++++++++
 HISTORY.md   |  91 -------------------------------------------------
 README.md    |  25 ++++++--------
 logo.png     | Bin 22145 -> 0 bytes
 package.json |   2 +-
 5 files changed, 106 insertions(+), 106 deletions(-)
 delete mode 100644 HISTORY.md
 delete mode 100644 logo.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5984fa..4b3f9a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,3 +13,97 @@
 ### Features
 
 * use address@2 ([#53](https://github.com/node-modules/detect-port/issues/53)) ([55f48d7](https://github.com/node-modules/detect-port/commit/55f48d755f3c8b480d4e4ce1065abc1c8e3c5a19))
+
+---
+
+
+1.5.1 / 2022-09-23
+==================
+
+**fixes**
+  * [[`9dd9ce3`](http://github.com/node-modules/detect-port/commit/9dd9ce34b560a434ee3a393f6ddea884691f632f)] - fix: add #!/usr/bin/env node header (#49) (达峰的夏天 <<xudafeng@126.com>>)
+
+1.5.0 / 2022-09-21
+==================
+
+**features**
+  * [[`618dec5`](http://github.com/node-modules/detect-port/commit/618dec5661d94535800089f9d941f4896825cb69)] - feat: support wait port (#46) (达峰的夏天 <<xudafeng@126.com>>)
+
+**fixes**
+  * [[`a54e2ef`](http://github.com/node-modules/detect-port/commit/a54e2ef70e388ed4b0c7a4b79ad88bc91e0f8ae3)] - fix: typo on line 54 (#45) (Yavuz Akyuz <<56271907+yavuzakyuz@users.noreply.github.com>>)
+
+**others**
+  * [[`28f07b3`](http://github.com/node-modules/detect-port/commit/28f07b31a7c591cb28b13281246c7f0c64c3dded)] - 🤖 TEST: Run CI on Github Action (#47) (fengmk2 <<fengmk2@gmail.com>>)
+  * [[`ae55c95`](http://github.com/node-modules/detect-port/commit/ae55c956ca36749e22c48b8d1a7d98afec2e6a4d)] - Create codeql-analysis.yml (fengmk2 <<fengmk2@gmail.com>>)
+  * [[`f35409d`](http://github.com/node-modules/detect-port/commit/f35409d53f9298a60e2c6c1560f42ea182025dd4)] - chore: update project config (xudafeng <<xudafeng@126.com>>)
+  * [[`cd21d30`](http://github.com/node-modules/detect-port/commit/cd21d3044db73d1556bf264209c8fd0ee08fa9c4)] - chore: update readme (#43) (XiaoRui <<xiangwu619@gmail.com>>)
+  * [[`da01e68`](http://github.com/node-modules/detect-port/commit/da01e68b43952e06430cc42f873e4253d8cba09e)] - chore: add .editorconfig (#42) (达峰的夏天 <<xudafeng@126.com>>)
+  * [[`a2c6b04`](http://github.com/node-modules/detect-port/commit/a2c6b043954895cba9cbae369e0d79a337c9d73a)] - chore: update repo config (#41) (达峰的夏天 <<xudafeng@126.com>>)
+  * [[`8da6f33`](http://github.com/node-modules/detect-port/commit/8da6f33e10b44cdbcfb9eb5727b0f2117e6929e9)] - chore: update readme (#38) (达峰的夏天 <<xudafeng@126.com>>)
+  * [[`ee88ccb`](http://github.com/node-modules/detect-port/commit/ee88ccb9e2a747dc84a30bcfc1cd4c73b64e3ea5)] - chore: remove unuse file (fengmk2 <<fengmk2@gmail.com>>)
+
+1.3.0 / 2018-11-20
+==================
+
+**features**
+  * [[`a00357a`](http://github.com/node-modules/detect-port/commit/a00357aea32c4f011b7240641cb8da2dfc97b491)] - feat: support detect port with custom hostname (#35) (Ender Lee <<34906299+chnliquan@users.noreply.github.com>>)
+
+**others**
+  * [[`671094f`](http://github.com/node-modules/detect-port/commit/671094f3a3660a29a0920d78e39d17f8dead0b7a)] - update readme (xudafeng <<xudafeng@126.com>>)
+  * [[`285e59b`](http://github.com/node-modules/detect-port/commit/285e59b0464d670c886007ff5052892393d57314)] - chore: add files to package.json (fengmk2 <<fengmk2@gmail.com>>)
+
+1.2.3 / 2018-05-16
+==================
+
+**fixes**
+  * [[`64777f8`](http://github.com/node-modules/detect-port/commit/64777f85cc519c9c4c2c84c23d2afed6a916f3c4)] - fix: ignore EADDRNOTAVAIL error when listen localhost (#33) (Haoliang Gao <<sakura9515@gmail.com>>)
+  * [[`398bc4f`](http://github.com/node-modules/detect-port/commit/398bc4f65f4d61ddfdc9bf7721118ea1a3bb6289)] - fix: handle 0.0.0.0:port binding (#26) (fengmk2 <<fengmk2@gmail.com>>)
+
+**others**
+  * [[`aedf44f`](http://github.com/node-modules/detect-port/commit/aedf44fc3f949de9ec187bdc8ee4d8daf84d6c2b)] - doc: tweak description (xudafeng <<xudafeng@126.com>>)
+  * [[`b7ff76f`](http://github.com/node-modules/detect-port/commit/b7ff76f24db3d8d9123cbf396b9032b05a6b7146)] - update FAQ & contributor (xudafeng <<xudafeng@126.com>>)
+  * [[`4a9e127`](http://github.com/node-modules/detect-port/commit/4a9e127b6d01bd45d9b689bd931d878aa9b5d397)] - cli tweak to verbose (#25) (xdf <<xudafeng@126.com>>),
+
+1.1.3 / 2017-05-24
+==================
+
+  * fix: should ignore getaddrinfo ENOTFOUND error (#22)
+
+1.1.2 / 2017-05-11
+==================
+
+  * fix: should double check 0.0.0.0 and localhost (#20)
+  * docs: ignore type of port when checking if it's occupied (#18)
+
+# 1.1.1 / 2017-03-17
+
+  * fix: try to use next available port (#16)
+
+# 1.1.0 / 2016-01-17
+
+  * Use server listen to detect port
+
+# 1.0.7 / 2016-12-11
+
+  * Early return for rejected promise
+  * Prevent promsie swallow in callback
+
+# 1.0.6 / 2016-11-29
+
+  * Bump version for new Repo
+
+# 0.1.4 / 2015-08-24
+
+  * Support promise
+
+# 0.1.2 / 2014-05-31
+
+  * Fix commander
+
+# 0.1.1 / 2014-05-30
+
+  * Add command line support
+
+# 0.1.0  / 2014-05-29
+
+  * Initial release
diff --git a/HISTORY.md b/HISTORY.md
deleted file mode 100644
index 42d0532..0000000
--- a/HISTORY.md
+++ /dev/null
@@ -1,91 +0,0 @@
-
-1.5.1 / 2022-09-23
-==================
-
-**fixes**
-  * [[`9dd9ce3`](http://github.com/node-modules/detect-port/commit/9dd9ce34b560a434ee3a393f6ddea884691f632f)] - fix: add #!/usr/bin/env node header (#49) (达峰的夏天 <<xudafeng@126.com>>)
-
-1.5.0 / 2022-09-21
-==================
-
-**features**
-  * [[`618dec5`](http://github.com/node-modules/detect-port/commit/618dec5661d94535800089f9d941f4896825cb69)] - feat: support wait port (#46) (达峰的夏天 <<xudafeng@126.com>>)
-
-**fixes**
-  * [[`a54e2ef`](http://github.com/node-modules/detect-port/commit/a54e2ef70e388ed4b0c7a4b79ad88bc91e0f8ae3)] - fix: typo on line 54 (#45) (Yavuz Akyuz <<56271907+yavuzakyuz@users.noreply.github.com>>)
-
-**others**
-  * [[`28f07b3`](http://github.com/node-modules/detect-port/commit/28f07b31a7c591cb28b13281246c7f0c64c3dded)] - 🤖 TEST: Run CI on Github Action (#47) (fengmk2 <<fengmk2@gmail.com>>)
-  * [[`ae55c95`](http://github.com/node-modules/detect-port/commit/ae55c956ca36749e22c48b8d1a7d98afec2e6a4d)] - Create codeql-analysis.yml (fengmk2 <<fengmk2@gmail.com>>)
-  * [[`f35409d`](http://github.com/node-modules/detect-port/commit/f35409d53f9298a60e2c6c1560f42ea182025dd4)] - chore: update project config (xudafeng <<xudafeng@126.com>>)
-  * [[`cd21d30`](http://github.com/node-modules/detect-port/commit/cd21d3044db73d1556bf264209c8fd0ee08fa9c4)] - chore: update readme (#43) (XiaoRui <<xiangwu619@gmail.com>>)
-  * [[`da01e68`](http://github.com/node-modules/detect-port/commit/da01e68b43952e06430cc42f873e4253d8cba09e)] - chore: add .editorconfig (#42) (达峰的夏天 <<xudafeng@126.com>>)
-  * [[`a2c6b04`](http://github.com/node-modules/detect-port/commit/a2c6b043954895cba9cbae369e0d79a337c9d73a)] - chore: update repo config (#41) (达峰的夏天 <<xudafeng@126.com>>)
-  * [[`8da6f33`](http://github.com/node-modules/detect-port/commit/8da6f33e10b44cdbcfb9eb5727b0f2117e6929e9)] - chore: update readme (#38) (达峰的夏天 <<xudafeng@126.com>>)
-  * [[`ee88ccb`](http://github.com/node-modules/detect-port/commit/ee88ccb9e2a747dc84a30bcfc1cd4c73b64e3ea5)] - chore: remove unuse file (fengmk2 <<fengmk2@gmail.com>>)
-
-1.3.0 / 2018-11-20
-==================
-
-**features**
-  * [[`a00357a`](http://github.com/node-modules/detect-port/commit/a00357aea32c4f011b7240641cb8da2dfc97b491)] - feat: support detect port with custom hostname (#35) (Ender Lee <<34906299+chnliquan@users.noreply.github.com>>)
-
-**others**
-  * [[`671094f`](http://github.com/node-modules/detect-port/commit/671094f3a3660a29a0920d78e39d17f8dead0b7a)] - update readme (xudafeng <<xudafeng@126.com>>)
-  * [[`285e59b`](http://github.com/node-modules/detect-port/commit/285e59b0464d670c886007ff5052892393d57314)] - chore: add files to package.json (fengmk2 <<fengmk2@gmail.com>>)
-
-1.2.3 / 2018-05-16
-==================
-
-**fixes**
-  * [[`64777f8`](http://github.com/node-modules/detect-port/commit/64777f85cc519c9c4c2c84c23d2afed6a916f3c4)] - fix: ignore EADDRNOTAVAIL error when listen localhost (#33) (Haoliang Gao <<sakura9515@gmail.com>>)
-  * [[`398bc4f`](http://github.com/node-modules/detect-port/commit/398bc4f65f4d61ddfdc9bf7721118ea1a3bb6289)] - fix: handle 0.0.0.0:port binding (#26) (fengmk2 <<fengmk2@gmail.com>>)
-
-**others**
-  * [[`aedf44f`](http://github.com/node-modules/detect-port/commit/aedf44fc3f949de9ec187bdc8ee4d8daf84d6c2b)] - doc: tweak description (xudafeng <<xudafeng@126.com>>)
-  * [[`b7ff76f`](http://github.com/node-modules/detect-port/commit/b7ff76f24db3d8d9123cbf396b9032b05a6b7146)] - update FAQ & contributor (xudafeng <<xudafeng@126.com>>)
-  * [[`4a9e127`](http://github.com/node-modules/detect-port/commit/4a9e127b6d01bd45d9b689bd931d878aa9b5d397)] - cli tweak to verbose (#25) (xdf <<xudafeng@126.com>>),
-
-1.1.3 / 2017-05-24
-==================
-
-  * fix: should ignore getaddrinfo ENOTFOUND error (#22)
-
-1.1.2 / 2017-05-11
-==================
-
-  * fix: should double check 0.0.0.0 and localhost (#20)
-  * docs: ignore type of port when checking if it's occupied (#18)
-
-# 1.1.1 / 2017-03-17
-
-  * fix: try to use next available port (#16)
-
-# 1.1.0 / 2016-01-17
-
-  * Use server listen to detect port
-
-# 1.0.7 / 2016-12-11
-
-  * Early return for rejected promise
-  * Prevent promsie swallow in callback
-
-# 1.0.6 / 2016-11-29
-
-  * Bump version for new Repo
-
-# 0.1.4 / 2015-08-24
-
-  * Support promise
-
-# 0.1.2 / 2014-05-31
-
-  * Fix commander
-
-# 0.1.1 / 2014-05-30
-
-  * Add command line support
-
-# 0.1.0  / 2014-05-29
-
-  * Initial release
diff --git a/README.md b/README.md
index 455d3ae..31b14e9 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,18 @@
-[![logo][logo-image]][logo-url]
-
----
+# detect-port
 
 [![NPM version][npm-image]][npm-url]
-[![build status][travis-image]][travis-url]
+[![CI](https://github.com/node-modules/detect-port/actions/workflows/nodejs.yml/badge.svg)](https://github.com/node-modules/detect-port/actions/workflows/nodejs.yml)
 [![Test coverage][codecov-image]][codecov-url]
+[![Known Vulnerabilities][snyk-image]][snyk-url]
 [![npm download][download-image]][download-url]
 
-[logo-image]: ./logo.png
-[logo-url]: https://npmjs.org/package/detect-port
-[npm-image]: https://img.shields.io/npm/v/detect-port.svg
+[npm-image]: https://img.shields.io/npm/v/detect-port.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/detect-port
-[travis-image]: https://img.shields.io/travis/node-modules/detect-port.svg
-[travis-url]: https://travis-ci.org/node-modules/detect-port
-[codecov-image]: https://img.shields.io/coveralls/node-modules/detect-port.svg
+[codecov-image]: https://codecov.io/gh/node-modules/detect-port/branch/master/graph/badge.svg
 [codecov-url]: https://codecov.io/gh/node-modules/detect-port
-[download-image]: https://img.shields.io/npm/dm/detect-port.svg
+[snyk-image]: https://snyk.io/test/npm/detect-port/badge.svg?style=flat-square
+[snyk-url]: https://snyk.io/test/npm/detect-port
+[download-image]: https://img.shields.io/npm/dm/detect-port.svg?style=flat-square
 [download-url]: https://npmjs.org/package/detect-port
 
 > Node.js implementation of port detector
@@ -39,7 +36,7 @@
 ## Usage
 
 ```bash
-$ npm i detect-port --save
+npm i detect-port
 ```
 
 ```javascript
@@ -65,7 +62,7 @@ detect(port)
 ## Command Line Tool
 
 ```bash
-$ npm i detect-port -g
+npm i detect-port -g
 ```
 
 ### Quick Start
@@ -88,7 +85,7 @@ $ detect --help
 
 Most likely network error, check that your `/etc/hosts` and make sure the content below:
 
-```
+```bash
 127.0.0.1       localhost
 255.255.255.255 broadcasthost
 ::1             localhost
diff --git a/logo.png b/logo.png
deleted file mode 100644
index 2dc13db1073f76e113568ba30ae76d9837aa74eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22145
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
ZC$!{H1=G^`+~DDW=<6EXEJNBo{V!4CTHpWx

diff --git a/package.json b/package.json
index d97805a..07024e5 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "cov": "egg-bin cov"
   },
   "engines": {
-    "node": ">= 4.0.0"
+    "node": ">= 16.0.0"
   },
   "homepage": "https://github.com/node-modules/detect-port",
   "license": "MIT",

From 48abebe85eb1395bb9cb74d0ee5a74759e3ffd8c Mon Sep 17 00:00:00 2001
From: fengmk2 <fengmk2@gmail.com>
Date: Thu, 30 May 2024 00:01:31 +0800
Subject: [PATCH 06/10] fix tests

---
 .eslintrc                               |  7 ++---
 bin/{detect-port.ts => detect-port.cjs} |  9 ++----
 package.json                            | 10 +++----
 src/index.ts                            |  2 +-
 test/cli.test.ts                        | 39 ++++++++++---------------
 test/wait-port.test.ts                  | 15 +++++-----
 tsconfig.json                           | 10 ++++---
 7 files changed, 38 insertions(+), 54 deletions(-)
 rename bin/{detect-port.ts => detect-port.cjs} (88%)
 mode change 100644 => 100755

diff --git a/.eslintrc b/.eslintrc
index 3c4ba9b..9bcdb46 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -2,8 +2,5 @@
   "extends": [
     "eslint-config-egg/typescript",
     "eslint-config-egg/lib/rules/enforce-node-prefix"
-  ],
-  "rules": {
-    "@typescript-eslint/ban-ts-comment": "off"
-  }
-}
\ No newline at end of file
+  ]
+}
diff --git a/bin/detect-port.ts b/bin/detect-port.cjs
old mode 100644
new mode 100755
similarity index 88%
rename from bin/detect-port.ts
rename to bin/detect-port.cjs
index b75d161..3660e2c
--- a/bin/detect-port.ts
+++ b/bin/detect-port.cjs
@@ -1,12 +1,9 @@
 #!/usr/bin/env node
 
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
-import { readFileSync } from 'node:fs';
-import detectPort from '../src/detect-port.js';
+const path = require('node:path');
+const { readFileSync } = require('node:fs');
+const { detectPort } = require('../');
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
 const pkgFile = path.join(__dirname, '../package.json');
 const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
 
diff --git a/package.json b/package.json
index 07024e5..7f4c194 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
     "port"
   ],
   "bin": {
-    "detect": "./bin/detect-port.js",
-    "detect-port": "./bin/detect-port.js"
+    "detect": "bin/detect-port.cjs",
+    "detect-port": "bin/detect-port.cjs"
   },
   "main": "./dist/commonjs/index.js",
   "files": [
@@ -25,8 +25,8 @@
   },
   "devDependencies": {
     "@eggjs/tsconfig": "^1.3.3",
+    "@types/mocha": "^10.0.6",
     "@types/node": "^20.9.0",
-    "c8": "^8.0.1",
     "egg-bin": "^6.9.0",
     "eslint": "^8.52.0",
     "eslint-config-egg": "^13.0.0",
@@ -43,9 +43,7 @@
     "lint": "eslint src test --ext ts",
     "ci": "npm run lint && npm run cov && npm run prepublishOnly",
     "contributor": "git-contributor",
-    "prepublishOnly": "npm run tsc && tshy && tshy-after",
-    "tsc": "tsc ./bin/detect-port.ts --resolveJsonModule --esModuleInterop",
-    "clean": "",
+    "prepublishOnly": "tshy && tshy-after",
     "cov": "egg-bin cov"
   },
   "engines": {
diff --git a/src/index.ts b/src/index.ts
index e7782f1..871cb06 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -3,4 +3,4 @@ import waitPort from './wait-port.js';
 
 export default detectPort;
 
-export { waitPort };
+export { waitPort, detectPort };
diff --git a/test/cli.test.ts b/test/cli.test.ts
index 2b3eda5..2fe2b7f 100644
--- a/test/cli.test.ts
+++ b/test/cli.test.ts
@@ -1,7 +1,6 @@
 import stripAnsi from 'strip-ansi';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { describe, it } from 'node:test';
 import { execaNode } from 'execa';
 import { strict as assert } from 'node:assert';
 import { readFileSync } from 'node:fs';
@@ -11,50 +10,42 @@ const __dirname = path.dirname(__filename);
 const pkgFile = path.join(__dirname, '../package.json');
 const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
 
-const execaNodeWithLoader = (async (scripPath, args, options) => {
-  return execaNode(scripPath, args, {
-    ...options,
-    verbose: true,
-    nodeOptions: [ '--loader', 'tsx' ],
-  });
-}) as typeof execaNode;
-
-describe('test/cli.test.js', async () => {
-  const binFile = path.join(__dirname, '../bin/detect-port.ts');
+describe.skip('test/cli.test.js', async () => {
+  const binFile = path.join(__dirname, '../bin/detect-port.cjs');
 
   it('should show version', async () => {
-    let res = await execaNodeWithLoader(binFile, [ '-v' ]);
+    let res = await execaNode(binFile, [ '-v' ]);
     assert(res.stdout, pkg.version);
-    res = await execaNodeWithLoader(binFile, [ '--version' ]);
+    res = await execaNode(binFile, [ '--version' ]);
     assert(res.stdout, pkg.version);
   });
 
   it('should output usage information', async () => {
-    let res = await execaNodeWithLoader(binFile, [ '-h' ]);
+    let res = await execaNode(binFile, [ '-h' ]);
     assert(res.stdout.includes(pkg.description));
-    res = await execaNodeWithLoader(binFile, [ '--help' ]);
+    res = await execaNode(binFile, [ '--help' ]);
     assert(res.stdout.includes(pkg.description));
-    res = await await execaNodeWithLoader(binFile, [ 'help' ]);
+    res = await execaNode(binFile, [ 'help' ]);
     assert(res.stdout.includes(pkg.description));
-    res = await await execaNodeWithLoader(binFile, [ 'xxx' ]);
+    res = await execaNode(binFile, [ 'xxx' ]);
     assert(res.stdout.includes(pkg.description));
   });
 
-  it('should output available port randomly', { only: true }, async () => {
-    const res = await execaNodeWithLoader(binFile);
-    const port = parseInt(stripAnsi(res.stdout).trim(), 10);
-    assert(port >= 9000 && port < 65535);
-  });
+  // it('should output available port randomly', { only: true }, async () => {
+  //   const res = await execaNode(binFile);
+  //   const port = parseInt(stripAnsi(res.stdout).trim(), 10);
+  //   assert(port >= 9000 && port < 65535);
+  // });
 
   it('should output available port from the given port', async () => {
     const givenPort = 9000;
-    const res = await execaNodeWithLoader(binFile, [ givenPort + '' ]);
+    const res = await execaNode(binFile, [ givenPort + '' ]);
     const port = parseInt(stripAnsi(res.stdout).trim(), 10);
     assert(port >= givenPort && port < 65535);
   });
 
   it('should output verbose logs', async () => {
-    const res = await execaNodeWithLoader(binFile, [ '--verbose' ]);
+    const res = await execaNode(binFile, [ '--verbose' ]);
     assert(res.stdout.includes('random'));
   });
 });
diff --git a/test/wait-port.test.ts b/test/wait-port.test.ts
index a1e41a0..95b3551 100644
--- a/test/wait-port.test.ts
+++ b/test/wait-port.test.ts
@@ -1,8 +1,6 @@
 import net from 'node:net';
-import { describe, it, after } from 'node:test';
 import { strict as assert } from 'node:assert';
-
-import waitPort from '../src/wait-port.js';
+import { waitPort, detectPort } from '../src/index.js';
 
 describe('test/wait-port.test.js', () => {
   describe('wait for port', () => {
@@ -11,14 +9,15 @@ describe('test/wait-port.test.js', () => {
       servers.forEach(server => server.close());
     });
 
-    it('should be work', (_, done) => {
-      const port = 9090;
+    it('should be work', async () => {
+      const port = await detectPort();
       const server = new net.Server();
       server.listen(port, '0.0.0.0');
       servers.push(server);
       setTimeout(() => {
-        waitPort(port).then().finally(done);
-      });
+        server.close();
+      }, 2000);
+      await waitPort(56888);
     });
 
     it('should be work when retries exceeded', async () => {
@@ -26,7 +25,7 @@ describe('test/wait-port.test.js', () => {
         const port = 9093;
         await waitPort(port, { retries: 3, retryInterval: 100 });
       } catch (err:any) {
-        assert(err.message === 'retries exceeded');
+        assert.equal(err.message, 'retries exceeded');
       }
     });
   });
diff --git a/tsconfig.json b/tsconfig.json
index 10b9c72..6c0f511 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,8 +1,10 @@
 {
     "extends": "@eggjs/tsconfig",
     "compilerOptions": {
-        "target": "es2022",
-        "module": "nodenext",
-        "moduleResolution": "nodenext"
+      "strict": true,
+      "noImplicitAny": true,
+      "target": "ES2022",
+      "module": "NodeNext",
+      "moduleResolution": "NodeNext"
     }
-}
\ No newline at end of file
+  }

From 815eb45e3f09463ec8b0aec1aac183c523b79986 Mon Sep 17 00:00:00 2001
From: fengmk2 <fengmk2@gmail.com>
Date: Sun, 8 Dec 2024 11:14:51 +0800
Subject: [PATCH 07/10] f

---
 CONTRIBUTING.md          |  2 +-
 README.md                | 16 +++----
 package.json             | 16 +++----
 src/detect-port.ts       | 19 ++++----
 src/wait-port.ts         |  4 +-
 test/cli.test.ts         |  2 +-
 test/detect-port.test.ts | 96 ++++++++++++++++++++--------------------
 test/wait-port.test.ts   | 14 +++---
 8 files changed, 83 insertions(+), 86 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 31b836a..e5678a5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,4 +2,4 @@
 
 - Fork the project, make a change, and send a pull request;
 - Have a look at code style now before starting;
-- Make sure the tests case (`$ make test`) pass before sending a pull request;
+- Make sure the tests case (`$ npm test`) pass before sending a pull request;
diff --git a/README.md b/README.md
index 31b14e9..9a31c9f 100644
--- a/README.md
+++ b/README.md
@@ -91,18 +91,12 @@ Most likely network error, check that your `/etc/hosts` and make sure the conten
 ::1             localhost
 ```
 
-<!-- GITCONTRIBUTOR_START -->
-
-## Contributors
-
-|[<img src="https://avatars.githubusercontent.com/u/1011681?v=4" width="100px;"/><br/><sub><b>xudafeng</b></sub>](https://github.com/xudafeng)<br/>|[<img src="https://avatars.githubusercontent.com/u/156269?v=4" width="100px;"/><br/><sub><b>fengmk2</b></sub>](https://github.com/fengmk2)<br/>|[<img src="https://avatars.githubusercontent.com/u/1044425?v=4" width="100px;"/><br/><sub><b>ziczhu</b></sub>](https://github.com/ziczhu)<br/>|[<img src="https://avatars.githubusercontent.com/u/810438?v=4" width="100px;"/><br/><sub><b>gaearon</b></sub>](https://github.com/gaearon)<br/>|[<img src="https://avatars.githubusercontent.com/u/34906299?v=4" width="100px;"/><br/><sub><b>chnliquan</b></sub>](https://github.com/chnliquan)<br/>|[<img src="https://avatars.githubusercontent.com/u/360661?v=4" width="100px;"/><br/><sub><b>popomore</b></sub>](https://github.com/popomore)<br/>|
-| :---: | :---: | :---: | :---: | :---: | :---: |
-[<img src="https://avatars.githubusercontent.com/u/52845048?v=4" width="100px;"/><br/><sub><b>snapre</b></sub>](https://github.com/snapre)<br/>|[<img src="https://avatars.githubusercontent.com/u/56271907?v=4" width="100px;"/><br/><sub><b>yavuzakyuz</b></sub>](https://github.com/yavuzakyuz)<br/>|[<img src="https://avatars.githubusercontent.com/u/197375?v=4" width="100px;"/><br/><sub><b>antife-yinyue</b></sub>](https://github.com/antife-yinyue)<br/>
+## License
 
-This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Wed Sep 21 2022 23:10:27 GMT+0800`.
+[MIT](LICENSE)
 
-<!-- GITCONTRIBUTOR_END -->
+## Contributors
 
-## License
+[![Contributors](https://contrib.rocks/image?repo=node-modules/detect-port)](https://github.com/node-modules/detect-port/graphs/contributors)
 
-[MIT](LICENSE)
+Made with [contributors-img](https://contrib.rocks).
diff --git a/package.json b/package.json
index 7f4c194..0daf256 100644
--- a/package.json
+++ b/package.json
@@ -12,9 +12,8 @@
   },
   "main": "./dist/commonjs/index.js",
   "files": [
-    "bin",
-    "lib",
-    "index.js"
+    "dist",
+    "src"
   ],
   "repository": {
     "type": "git",
@@ -26,15 +25,14 @@
   "devDependencies": {
     "@eggjs/tsconfig": "^1.3.3",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.9.0",
+    "@types/node": "^22.10.1",
     "egg-bin": "^6.9.0",
     "eslint": "^8.52.0",
     "eslint-config-egg": "^13.0.0",
     "execa": "^8.0.1",
-    "git-contributor": "^2.1.5",
+    "mm": "^3.4.0",
     "strip-ansi": "^7.1.0",
-    "ts-node": "^10.9.1",
-    "tshy": "^1.8.0",
+    "tshy": "^3.0.2",
     "tshy-after": "^1.0.0",
     "typescript": "^5.2.2"
   },
@@ -42,7 +40,6 @@
     "test": "npm run lint -- --fix && egg-bin test",
     "lint": "eslint src test --ext ts",
     "ci": "npm run lint && npm run cov && npm run prepublishOnly",
-    "contributor": "git-contributor",
     "prepublishOnly": "tshy && tshy-after",
     "cov": "egg-bin cov"
   },
@@ -69,5 +66,6 @@
     }
   },
   "types": "./dist/commonjs/index.d.ts",
-  "type": "module"
+  "type": "module",
+  "module": "./dist/esm/index.js"
 }
diff --git a/src/detect-port.ts b/src/detect-port.ts
index 981d603..0b2d3a3 100644
--- a/src/detect-port.ts
+++ b/src/detect-port.ts
@@ -1,10 +1,10 @@
-import net from 'node:net';
-import { ip } from 'address';
+import { createServer, AddressInfo } from 'node:net';
 import { debuglog } from 'node:util';
+import { ip } from 'address';
 
 const debug = debuglog('detect-port');
 
-type DetectPortCallback = (err: Error | null, port: number) => void;
+type DetectPortCallback = (err: Error | null, port?: number) => void;
 
 interface PortConfig {
   port?: number | string;
@@ -46,7 +46,7 @@ export default function detectPort(port?: number | string | PortConfig | DetectP
   });
 }
 
-function tryListen(port: number, maxPort: number, hostname: string | undefined, callback: (...args: any[]) => void) {
+function tryListen(port: number, maxPort: number, hostname: string | undefined, callback: DetectPortCallback) {
   function handleError() {
     port++;
     if (port >= maxPort) {
@@ -109,10 +109,10 @@ function tryListen(port: number, maxPort: number, hostname: string | undefined,
   }
 }
 
-function listen(port: number, hostname: string | undefined, callback: (...args: any[]) => void) {
-  const server = new net.Server();
+function listen(port: number, hostname: string | undefined, callback: DetectPortCallback) {
+  const server = createServer();
 
-  server.on('error', err => {
+  server.once('error', err => {
     debug('listen %s:%s error: %s', hostname, port, err);
     server.close();
 
@@ -124,10 +124,11 @@ function listen(port: number, hostname: string | undefined, callback: (...args:
     return callback(err);
   });
 
+  debug('try listen %d on %s', port, hostname);
   server.listen(port, hostname, () => {
-    port = (server.address() as net.AddressInfo).port;
-    server.close();
+    port = (server.address() as AddressInfo).port;
     debug('get free %s:%s', hostname, port);
+    server.close();
     return callback(null, port);
   });
 }
diff --git a/src/wait-port.ts b/src/wait-port.ts
index b9a1a97..d025d78 100644
--- a/src/wait-port.ts
+++ b/src/wait-port.ts
@@ -1,7 +1,7 @@
 import { debuglog } from 'node:util';
 import detectPort from './detect-port.js';
 
-const debug = debuglog('wait-port');
+const debug = debuglog('detect-port:wait-port');
 
 const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
 
@@ -15,7 +15,7 @@ export default async function waitPort(port: number, options: WaitPortOptions =
   let count = 1;
 
   async function loop() {
-    debug('retries', retries, 'count', count);
+    debug('wait port %d, retries %d, count %d', port, retries, count);
     if (count > retries) {
       const err = new Error('retries exceeded');
       (err as any).retries = retries;
diff --git a/test/cli.test.ts b/test/cli.test.ts
index 2fe2b7f..c87995e 100644
--- a/test/cli.test.ts
+++ b/test/cli.test.ts
@@ -10,7 +10,7 @@ const __dirname = path.dirname(__filename);
 const pkgFile = path.join(__dirname, '../package.json');
 const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
 
-describe.skip('test/cli.test.js', async () => {
+describe.skip('test/cli.test.ts', async () => {
   const binFile = path.join(__dirname, '../bin/detect-port.cjs');
 
   it('should show version', async () => {
diff --git a/test/detect-port.test.ts b/test/detect-port.test.ts
index f1593fc..6a6d704 100644
--- a/test/detect-port.test.ts
+++ b/test/detect-port.test.ts
@@ -1,17 +1,19 @@
 import dns from 'node:dns';
 import net from 'node:net';
 import { strict as assert } from 'node:assert';
-import { mock, describe, it, before, after } from 'node:test';
 import { ip } from 'address';
+import mm from 'mm';
 
 import detectPort from '../src/detect-port.js';
 
-describe('test/detect-port.test.js', () => {
+describe('test/detect-port.test.ts', () => {
+  afterEach(mm.restore);
+
   describe('detect port test', () => {
     const servers: net.Server[] = [];
-    before((_, done) => {
+    before(done => {
       let count = 0;
-      const cb = mock.fn((err?: Error) => {
+      const cb = (err?: Error) => {
         if (err) {
           done(err);
         }
@@ -19,23 +21,23 @@ describe('test/detect-port.test.js', () => {
         if (count === 13) {
           done();
         }
-      });
+      };
       const server = new net.Server();
-      server.listen(3000, 'localhost', cb);
+      server.listen(23000, 'localhost', cb);
       server.on('error', err => {
         console.error('listen localhost error:', err);
       });
       servers.push(server);
 
       const server2 = new net.Server();
-      server2.listen(4000, ip(), cb);
+      server2.listen(24000, ip(), cb);
       servers.push(server2);
 
       const server3 = new net.Server();
-      server3.listen(8080, '0.0.0.0', cb);
+      server3.listen(28080, '0.0.0.0', cb);
       servers.push(server3);
 
-      for (let port = 7000; port < 7010; port++) {
+      for (let port = 27000; port < 27010; port++) {
         const server = new net.Server();
         if (port % 3 === 0) {
           server.listen(port, cb);
@@ -47,17 +49,17 @@ describe('test/detect-port.test.js', () => {
         servers.push(server);
       }
     });
+
     after(() => {
       servers.forEach(server => server.close());
-      mock.reset();
     });
 
-    it('get random port with callback', (_, done) => {
+    it('get random port with callback', done => {
       detectPort((_, port) => {
+        assert(port);
         assert(port >= 1024 && port < 65535);
         done();
       });
-
     });
 
     it('get random port with promise', async () => {
@@ -66,87 +68,87 @@ describe('test/detect-port.test.js', () => {
       assert(port >= 1024 && port < 65535);
     });
 
-    it('with occupied port', async () => {
+    it('with occupied port, like "listen EACCES: permission denied"', async () => {
       const port = 80;
       const realPort = await detectPort(port);
-
       assert(realPort >= port && realPort < 65535);
     });
 
-    it('work with listening next port 3001 because 3000 was listened to localhost', async () => {
-      const port = 3000;
+    it('work with listening next port 23001 because 23000 was listened to localhost', async () => {
+      const port = 23000;
       const realPort = await detectPort(port);
-
-      assert(realPort === 3001);
+      assert(realPort);
+      assert.equal(realPort, 23001);
     });
 
-    it('should listen next port 4001 when localhost is not binding', async t => {
-      t.mock.method(dns, 'lookup', (address: string, callback: (...args: any[]) => void) => {
+    it('should listen next port 24001 when localhost is not binding', async () => {
+      mm(dns, 'lookup', (...args: any[]) => {
+        mm.restore();
+        const address = args[0] as string;
         if (address !== 'localhost') {
-          return dns.lookup(address, callback);
+          return dns.lookup(args[0], args[1], args[2]);
         }
         process.nextTick(() => {
           const err = new Error(`getaddrinfo ENOTFOUND ${address}`);
           (err as any).code = 'ENOTFOUND';
+          const callback = args[-1];
           callback(err);
         });
-      }, { times: 1 });
+      });
 
-      const port = 4000;
+      const port = 24000;
       const realPort = await detectPort(port);
-
-      assert(realPort === 4001);
-
-      t.mock.reset();
+      assert.equal(realPort, 24001);
     });
 
-    it('work with listening next port 4001 because 4000 was listened to ' + ip(), async () => {
-      const port = 4000;
+    it('work with listening next port 24001 because 24000 was listened to ' + ip(), async () => {
+      const port = 24000;
       const realPort = await detectPort(port);
 
-      assert(realPort === 4001);
+      assert(realPort === 24001);
     });
 
-    it('work with listening next port 8081 because 8080 was listened to 0.0.0.0:8080', async () => {
-      const port = 8080;
+    it('work with listening next port 28081 because 28080 was listened to 0.0.0.0:28080', async () => {
+      const port = 28080;
       const realPort = await detectPort(port);
 
-      assert(realPort === 8081);
+      assert(realPort === 28081);
     });
 
     it('work with listening random port when try port hit maxPort', async () => {
-      const port = 7000;
+      const port = 27000;
       const realPort = await detectPort(port);
-      assert(realPort < 7000 || realPort > 7009);
+      assert(realPort < 27000 || realPort > 27009);
     });
 
-    it('work with sending object with hostname', (_, done) => {
-      const port = 7000;
+    it('work with sending object with hostname', done => {
+      const port = 27000;
       const hostname = '127.0.0.1';
       detectPort({
         port,
         hostname,
         callback: (_, realPort) => {
-          assert(realPort >= 7000 && realPort < 65535);
+          assert(realPort);
+          assert(realPort >= 27000 && realPort < 65535);
           done();
         },
       });
     });
 
     it('promise with sending object with hostname', async () => {
-      const port = 7000;
+      const port = 27000;
       const hostname = '127.0.0.1';
       const realPort = await detectPort({
         port,
         hostname,
       });
-      assert(realPort >= 7000 && realPort < 65535);
+      assert(realPort >= 27000 && realPort < 65535);
     });
 
     it('with string arg', async () => {
-      const port = '8080';
+      const port = '28080';
       const realPort = await detectPort(port);
-      assert(realPort >= 8080 && realPort < 65535);
+      assert(realPort >= 28080 && realPort < 65535);
     });
 
     it('with wrong arguments', async () => {
@@ -154,14 +156,14 @@ describe('test/detect-port.test.js', () => {
       assert(port && port > 0);
     });
 
-    it('generator usage', async () => {
-      const port = 8080;
+    it('async/await usage', async () => {
+      const port = 28080;
       const realPort = await detectPort(port);
       assert(realPort >= port && realPort < 65535);
     });
 
-    it('promise usage', (_, done) => {
-      const _port = 8080;
+    it('promise usage', done => {
+      const _port = 28080;
       detectPort(_port)
         .then(port => {
           assert(port >= _port && port < 65535);
@@ -170,7 +172,7 @@ describe('test/detect-port.test.js', () => {
         .catch(done);
     });
 
-    it('promise with wrong arguments', (_, done) => {
+    it('promise with wrong arguments', done => {
       detectPort()
         .then(port => {
           assert(port > 0);
diff --git a/test/wait-port.test.ts b/test/wait-port.test.ts
index 95b3551..a25ce28 100644
--- a/test/wait-port.test.ts
+++ b/test/wait-port.test.ts
@@ -1,23 +1,25 @@
-import net from 'node:net';
+import { once } from 'node:events';
+import { createServer, Server } from 'node:net';
 import { strict as assert } from 'node:assert';
 import { waitPort, detectPort } from '../src/index.js';
 
-describe('test/wait-port.test.js', () => {
+describe('test/wait-port.test.ts', () => {
   describe('wait for port', () => {
-    const servers: net.Server[] = [];
+    const servers: Server[] = [];
     after(() => {
       servers.forEach(server => server.close());
     });
 
     it('should be work', async () => {
       const port = await detectPort();
-      const server = new net.Server();
-      server.listen(port, '0.0.0.0');
+      const server = createServer();
       servers.push(server);
+      server.listen(port, '0.0.0.0');
+      await once(server, 'listening');
       setTimeout(() => {
         server.close();
       }, 2000);
-      await waitPort(56888);
+      await waitPort(port);
     });
 
     it('should be work when retries exceeded', async () => {

From 74f08a477e5ff76dbf4fedee959259be41eaada6 Mon Sep 17 00:00:00 2001
From: fengmk2 <fengmk2@gmail.com>
Date: Sun, 8 Dec 2024 11:32:28 +0800
Subject: [PATCH 08/10] fix bin

---
 package.json                                  |  8 +++++---
 bin/detect-port.cjs => src/bin/detect-port.ts | 11 +++++------
 test/cli.test.ts                              |  4 ++--
 test/detect-port.test.ts                      |  7 +++----
 test/wait-port.test.ts                        |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)
 rename bin/detect-port.cjs => src/bin/detect-port.ts (88%)

diff --git a/package.json b/package.json
index 0daf256..7045884 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
     "port"
   ],
   "bin": {
-    "detect": "bin/detect-port.cjs",
-    "detect-port": "bin/detect-port.cjs"
+    "detect": "dist/commonjs/bin/detect-port.js",
+    "detect-port": "dist/commonjs//detect-port.js"
   },
   "main": "./dist/commonjs/index.js",
   "files": [
@@ -37,10 +37,12 @@
     "typescript": "^5.2.2"
   },
   "scripts": {
-    "test": "npm run lint -- --fix && egg-bin test",
+    "pretest": "npm run lint -- --fix && npm run prepublishOnly",
+    "test": "egg-bin test",
     "lint": "eslint src test --ext ts",
     "ci": "npm run lint && npm run cov && npm run prepublishOnly",
     "prepublishOnly": "tshy && tshy-after",
+    "precov": "npm run prepublishOnly",
     "cov": "egg-bin cov"
   },
   "engines": {
diff --git a/bin/detect-port.cjs b/src/bin/detect-port.ts
similarity index 88%
rename from bin/detect-port.cjs
rename to src/bin/detect-port.ts
index 3660e2c..96c9df8 100755
--- a/bin/detect-port.cjs
+++ b/src/bin/detect-port.ts
@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-const path = require('node:path');
-const { readFileSync } = require('node:fs');
-const { detectPort } = require('../');
+import path from 'node:path';
+import { readFileSync } from 'node:fs';
+import detectPort from '../detect-port.js';
 
-const pkgFile = path.join(__dirname, '../package.json');
+const pkgFile = path.join(__dirname, '../../../package.json');
 const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
 
 const args = process.argv.slice(2);
@@ -12,11 +12,10 @@ let arg_0 = args[0];
 
 if (arg_0 && [ '-v', '--version' ].includes(arg_0.toLowerCase())) {
   console.log(pkg.version);
-
   process.exit(0);
 }
 
-const removeByValue = (arr, val) => {
+const removeByValue = (arr: string[], val: string) => {
   for (let i = 0; i < arr.length; i++) {
     if (arr[i] === val) {
       arr.splice(i, 1);
diff --git a/test/cli.test.ts b/test/cli.test.ts
index c87995e..0489400 100644
--- a/test/cli.test.ts
+++ b/test/cli.test.ts
@@ -10,8 +10,8 @@ const __dirname = path.dirname(__filename);
 const pkgFile = path.join(__dirname, '../package.json');
 const pkg = JSON.parse(readFileSync(pkgFile, 'utf-8'));
 
-describe.skip('test/cli.test.ts', async () => {
-  const binFile = path.join(__dirname, '../bin/detect-port.cjs');
+describe('test/cli.test.ts', async () => {
+  const binFile = path.join(__dirname, '../dist/commonjs/bin/detect-port.js');
 
   it('should show version', async () => {
     let res = await execaNode(binFile, [ '-v' ]);
diff --git a/test/detect-port.test.ts b/test/detect-port.test.ts
index 6a6d704..1cd2a5a 100644
--- a/test/detect-port.test.ts
+++ b/test/detect-port.test.ts
@@ -101,18 +101,17 @@ describe('test/detect-port.test.ts', () => {
       assert.equal(realPort, 24001);
     });
 
-    it('work with listening next port 24001 because 24000 was listened to ' + ip(), async () => {
+    it('work with listening next port 24001 because 24000 was listened', async () => {
       const port = 24000;
       const realPort = await detectPort(port);
-
-      assert(realPort === 24001);
+      assert.equal(realPort, 24001);
     });
 
     it('work with listening next port 28081 because 28080 was listened to 0.0.0.0:28080', async () => {
       const port = 28080;
       const realPort = await detectPort(port);
 
-      assert(realPort === 28081);
+      assert.equal(realPort, 28081);
     });
 
     it('work with listening random port when try port hit maxPort', async () => {
diff --git a/test/wait-port.test.ts b/test/wait-port.test.ts
index a25ce28..88edabb 100644
--- a/test/wait-port.test.ts
+++ b/test/wait-port.test.ts
@@ -26,7 +26,7 @@ describe('test/wait-port.test.ts', () => {
       try {
         const port = 9093;
         await waitPort(port, { retries: 3, retryInterval: 100 });
-      } catch (err:any) {
+      } catch (err: any) {
         assert.equal(err.message, 'retries exceeded');
       }
     });

From f566c2d8ee13d4a21d6016fe8b37e778632f4749 Mon Sep 17 00:00:00 2001
From: fengmk2 <fengmk2@gmail.com>
Date: Sun, 8 Dec 2024 11:40:33 +0800
Subject: [PATCH 09/10] f

---
 src/index.ts           |  4 ++--
 src/wait-port.ts       | 20 +++++++++++++++-----
 test/wait-port.test.ts |  7 +++++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 871cb06..ebad509 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,6 +1,6 @@
 import detectPort from './detect-port.js';
-import waitPort from './wait-port.js';
 
 export default detectPort;
 
-export { waitPort, detectPort };
+export { detectPort };
+export * from './wait-port.js';
diff --git a/src/wait-port.ts b/src/wait-port.ts
index d025d78..82809a9 100644
--- a/src/wait-port.ts
+++ b/src/wait-port.ts
@@ -1,25 +1,35 @@
 import { debuglog } from 'node:util';
+import { setTimeout as sleep } from 'node:timers/promises';
 import detectPort from './detect-port.js';
 
 const debug = debuglog('detect-port:wait-port');
 
-const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
+export class WaitPortRetryError extends Error {
+  retries: number;
+  count: number;
+
+  constructor(message: string, retries: number, count: number, options?: ErrorOptions) {
+    super(message, options);
+    this.name = this.constructor.name;
+    this.retries = retries;
+    this.count = count;
+    Error.captureStackTrace(this, this.constructor);
+  }
+}
 
 export interface WaitPortOptions {
   retryInterval?: number;
   retries?: number;
 }
 
-export default async function waitPort(port: number, options: WaitPortOptions = {}) {
+export async function waitPort(port: number, options: WaitPortOptions = {}) {
   const { retryInterval = 1000, retries = Infinity } = options;
   let count = 1;
 
   async function loop() {
     debug('wait port %d, retries %d, count %d', port, retries, count);
     if (count > retries) {
-      const err = new Error('retries exceeded');
-      (err as any).retries = retries;
-      (err as any).count = count;
+      const err = new WaitPortRetryError('retries exceeded', retries, count);
       throw err;
     }
     count++;
diff --git a/test/wait-port.test.ts b/test/wait-port.test.ts
index 88edabb..e5d6218 100644
--- a/test/wait-port.test.ts
+++ b/test/wait-port.test.ts
@@ -1,7 +1,7 @@
 import { once } from 'node:events';
 import { createServer, Server } from 'node:net';
 import { strict as assert } from 'node:assert';
-import { waitPort, detectPort } from '../src/index.js';
+import { waitPort, detectPort, WaitPortRetryError } from '../src/index.js';
 
 describe('test/wait-port.test.ts', () => {
   describe('wait for port', () => {
@@ -26,8 +26,11 @@ describe('test/wait-port.test.ts', () => {
       try {
         const port = 9093;
         await waitPort(port, { retries: 3, retryInterval: 100 });
-      } catch (err: any) {
+      } catch (err: unknown) {
+        assert(err instanceof WaitPortRetryError);
         assert.equal(err.message, 'retries exceeded');
+        assert.equal(err.retries, 3);
+        assert.equal(err.count, 4);
       }
     });
   });

From 8bf89038344b948573fc7e0b780529c2029d0d7b Mon Sep 17 00:00:00 2001
From: fengmk2 <fengmk2@gmail.com>
Date: Sun, 8 Dec 2024 11:44:43 +0800
Subject: [PATCH 10/10] f

---
 README.md          | 3 +++
 package.json       | 2 +-
 src/detect-port.ts | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9a31c9f..65620b4 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
 [![Test coverage][codecov-image]][codecov-url]
 [![Known Vulnerabilities][snyk-image]][snyk-url]
 [![npm download][download-image]][download-url]
+[![Node.js Version][node-version-image]][node-version-url]
 
 [npm-image]: https://img.shields.io/npm/v/detect-port.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/detect-port
@@ -14,6 +15,8 @@
 [snyk-url]: https://snyk.io/test/npm/detect-port
 [download-image]: https://img.shields.io/npm/dm/detect-port.svg?style=flat-square
 [download-url]: https://npmjs.org/package/detect-port
+[node-version-image]: https://img.shields.io/node/v/detect-port.svg?style=flat-square
+[node-version-url]: https://nodejs.org/en/download/
 
 > Node.js implementation of port detector
 
diff --git a/package.json b/package.json
index 7045884..63ab590 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   ],
   "bin": {
     "detect": "dist/commonjs/bin/detect-port.js",
-    "detect-port": "dist/commonjs//detect-port.js"
+    "detect-port": "dist/commonjs/bin/detect-port.js"
   },
   "main": "./dist/commonjs/index.js",
   "files": [
diff --git a/src/detect-port.ts b/src/detect-port.ts
index 0b2d3a3..1a30168 100644
--- a/src/detect-port.ts
+++ b/src/detect-port.ts
@@ -62,7 +62,7 @@ function tryListen(port: number, maxPort: number, hostname: string | undefined,
     listen(port, hostname, (err, realPort) => {
       if (err) {
         if ((err as any).code === 'EADDRNOTAVAIL') {
-          return callback(new Error('the ip that is not unknown on the machine'));
+          return callback(new Error('The IP address is not available on this machine'));
         }
         return handleError();
       }