@rsdoctor/utils 1.5.14 → 1.5.15

package/dist/build/server.d.cts

@@ -1,12 +1,13 @@
 import connect from 'connect';
 import http from 'http';
 import { Thirdparty } from '@rsdoctor/types';
+export declare const defaultHost = "127.0.0.1";
 export declare const defaultPort: number;
-export declare function getPort(expectPort: number): Promise<number>;
-export declare const createGetPortSyncFunctionString: (expectPort: number) => string;
-export declare function getPortSync(expectPort: number): number | never;
+export declare function getPort(expectPort: number, host?: string): Promise<number>;
+export declare const createGetPortSyncFunctionString: (expectPort: number, host?: string) => string;
+export declare function getPortSync(expectPort: number, host?: string): number | never;
 export declare function createApp(): connect.Server;
-export declare function createServer(port: number): Promise<{
+export declare function createServer(port: number, host?: string): Promise<{
     app: Thirdparty.connect.Server;
     server: http.Server;
     port: number;

package/dist/build/server.d.ts

@@ -1,12 +1,13 @@
 import connect from 'connect';
 import http from 'http';
 import { Thirdparty } from '@rsdoctor/types';
+export declare const defaultHost = "127.0.0.1";
 export declare const defaultPort: number;
-export declare function getPort(expectPort: number): Promise<number>;
-export declare const createGetPortSyncFunctionString: (expectPort: number) => string;
-export declare function getPortSync(expectPort: number): number | never;
+export declare function getPort(expectPort: number, host?: string): Promise<number>;
+export declare const createGetPortSyncFunctionString: (expectPort: number, host?: string) => string;
+export declare function getPortSync(expectPort: number, host?: string): number | never;
 export declare function createApp(): connect.Server;
-export declare function createServer(port: number): Promise<{
+export declare function createServer(port: number, host?: string): Promise<{
     app: Thirdparty.connect.Server;
     server: http.Server;
     port: number;

package/dist/build.cjs

@@ -165,6 +165,7 @@ for(var __rspack_i in (()=>{
         createApp: ()=>createApp,
         createGetPortSyncFunctionString: ()=>createGetPortSyncFunctionString,
         createServer: ()=>createServer,
+        defaultHost: ()=>defaultHost,
         defaultPort: ()=>defaultPort,
         getPort: ()=>getPort,
         getPortSync: ()=>getPortSync
@@ -283,27 +284,28 @@ for(var __rspack_i in (()=>{
         6667,
         6668,
         6669
-    ], defaultPort = function() {
+    ], defaultHost = '127.0.0.1', defaultPort = function() {
         let port;
         do port = (0, algorithm.random)(3000, 8999);
         while (RESTRICTED_PORTS.includes(port));
         return port;
     }();
-    async function getPort(expectPort) {
+    async function getPort(expectPort, host = defaultHost) {
         return external_get_port_default()({
-            port: expectPort
+            port: expectPort,
+            host
         });
     }
-    let createGetPortSyncFunctionString = (expectPort)=>`
+    let createGetPortSyncFunctionString = (expectPort, host = defaultHost)=>`
 (() => {
 const net = require('net');
 
-function getPort(expectPort) {
+function getPort(expectPort, host) {
   return new Promise((resolve, reject) => {
     const server = net.createServer();
     server.unref();
     server.on('error', reject);
-    server.listen(expectPort, () => {
+    server.listen(expectPort, host, () => {
       const { port } = server.address();
       server.close(() => {
         resolve(port);
@@ -316,7 +318,7 @@ async function getAvailablePort(expectPort) {
   let port = expectPort;
   while (true) {
     try {
-      const res = await getPort(port);
+      const res = await getPort(port, ${JSON.stringify(host)});
       return res;
     } catch (error) {
       port += Math.floor(Math.random() * 100 + 1);
@@ -327,16 +329,19 @@ async function getAvailablePort(expectPort) {
 getAvailablePort(${expectPort}).then(port => process.stdout.write(port.toString()));
 })();
 `.trim();
-    function getPortSync(expectPort) {
-        let statement = '\n' === external_os_default().EOL ? createGetPortSyncFunctionString(expectPort) : createGetPortSyncFunctionString(expectPort).replace(/\n/g, '');
-        return Number((0, external_child_process_namespaceObject.execSync)(`node -e "${statement}"`, {
+    function getPortSync(expectPort, host = defaultHost) {
+        let statement = '\n' === external_os_default().EOL ? createGetPortSyncFunctionString(expectPort, host) : createGetPortSyncFunctionString(expectPort, host).replace(/\n/g, '');
+        return Number((0, external_child_process_namespaceObject.execFileSync)(process.execPath, [
+            '-e',
+            statement
+        ], {
             encoding: 'utf-8'
         }));
     }
     function createApp() {
         return index_js_default()();
     }
-    async function createServer(port) {
+    async function createServer(port, host = defaultHost) {
         let app = createApp(), server = external_http_default().createServer(app), res = {
             app,
             server,
@@ -347,9 +352,12 @@ getAvailablePort(${expectPort}).then(port => process.stdout.write(port.toString(
                     });
                 })
         };
-        return new Promise((resolve)=>{
-            server.listen(port, ()=>{
-                resolve(res);
+        return new Promise((resolve, reject)=>{
+            let onError = (error)=>{
+                reject(error);
+            };
+            server.once('error', onError), server.listen(port, host, ()=>{
+                server.off('error', onError), resolve(res);
             });
         });
     }

package/dist/build.js

@@ -9,7 +9,7 @@ import connect from "../compiled/connect/index.js";
 import http from "http";
 import os from "os";
 import get_port from "get-port";
-import { exec, execSync } from "child_process";
+import { exec, execFileSync } from "child_process";
 import envinfo from "envinfo";
 import { filesize } from "../compiled/filesize/index.js";
 import { memoryUsage, pid } from "process";
@@ -56,6 +56,7 @@ __webpack_require__.r(server_namespaceObject), __webpack_require__.d(server_name
     createApp: ()=>createApp,
     createGetPortSyncFunctionString: ()=>createGetPortSyncFunctionString,
     createServer: ()=>createServer,
+    defaultHost: ()=>defaultHost,
     defaultPort: ()=>defaultPort,
     getPort: ()=>getPort,
     getPortSync: ()=>getPortSync
@@ -140,27 +141,28 @@ let readPackageJson = (file, readFile)=>{
     6667,
     6668,
     6669
-], defaultPort = function() {
+], defaultHost = '127.0.0.1', defaultPort = function() {
     let port;
     do port = random(3000, 8999);
     while (RESTRICTED_PORTS.includes(port));
     return port;
 }();
-async function getPort(expectPort) {
+async function getPort(expectPort, host = defaultHost) {
     return get_port({
-        port: expectPort
+        port: expectPort,
+        host
     });
 }
-let createGetPortSyncFunctionString = (expectPort)=>`
+let createGetPortSyncFunctionString = (expectPort, host = defaultHost)=>`
 (() => {
 const net = require('net');
 
-function getPort(expectPort) {
+function getPort(expectPort, host) {
   return new Promise((resolve, reject) => {
     const server = net.createServer();
     server.unref();
     server.on('error', reject);
-    server.listen(expectPort, () => {
+    server.listen(expectPort, host, () => {
       const { port } = server.address();
       server.close(() => {
         resolve(port);
@@ -173,7 +175,7 @@ async function getAvailablePort(expectPort) {
   let port = expectPort;
   while (true) {
     try {
-      const res = await getPort(port);
+      const res = await getPort(port, ${JSON.stringify(host)});
       return res;
     } catch (error) {
       port += Math.floor(Math.random() * 100 + 1);
@@ -184,16 +186,19 @@ async function getAvailablePort(expectPort) {
 getAvailablePort(${expectPort}).then(port => process.stdout.write(port.toString()));
 })();
 `.trim();
-function getPortSync(expectPort) {
-    let statement = '\n' === os.EOL ? createGetPortSyncFunctionString(expectPort) : createGetPortSyncFunctionString(expectPort).replace(/\n/g, '');
-    return Number(execSync(`node -e "${statement}"`, {
+function getPortSync(expectPort, host = defaultHost) {
+    let statement = '\n' === os.EOL ? createGetPortSyncFunctionString(expectPort, host) : createGetPortSyncFunctionString(expectPort, host).replace(/\n/g, '');
+    return Number(execFileSync(process.execPath, [
+        '-e',
+        statement
+    ], {
         encoding: 'utf-8'
     }));
 }
 function createApp() {
     return connect();
 }
-async function createServer(port) {
+async function createServer(port, host = defaultHost) {
     let app = createApp(), server = http.createServer(app), res = {
         app,
         server,
@@ -204,9 +209,12 @@ async function createServer(port) {
                 });
             })
     };
-    return new Promise((resolve)=>{
-        server.listen(port, ()=>{
-            resolve(res);
+    return new Promise((resolve, reject)=>{
+        let onError = (error)=>{
+            reject(error);
+        };
+        server.once('error', onError), server.listen(port, host, ()=>{
+            server.off('error', onError), resolve(res);
         });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdoctor/utils",
-  "version": "1.5.14",
+  "version": "1.5.15",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/rsdoctor",
@@ -101,7 +101,7 @@
     "picocolors": "^1.1.1",
     "rslog": "^2.1.2",
     "strip-ansi": "^6.0.1",
-    "@rsdoctor/types": "1.5.14"
+    "@rsdoctor/types": "1.5.15"
   },
   "devDependencies": {
     "@types/babel__code-frame": "7.27.0",