fix: explicit port/portRange even if randon is true

unjs · Oct 22, 2023 · 45f71c6 · 45f71c6
1 parent 9091db5
commit 45f71c6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/_internal.ts b/src/_internal.ts
@@ -19,14 +19,25 @@ export function _log(verbose: boolean, message: string) {
   }
 }
 
-export function _generateRange(from: number, to: number): number[] {
+export function _generateRange(
+  range: [from: number, to: number],
+  random?: boolean,
+): number[] {
+  const [from, to] = range;
   if (to < from) {
     return [];
   }
   const r = [];
   for (let index = from; index < to; index++) {
     r.push(index);
   }
+  // Fisher-Yates shuffle algorithm
+  if (random) {
+    for (let i = r.length - 1; i > 0; i--) {
+      const j = Math.floor(Math.random() * (i + 1));
+      [r[i], r[j]] = [r[j], r[i]];
+    }
+  }
   return r;
 }
 

diff --git a/src/get-port.ts b/src/get-port.ts
@@ -44,15 +44,14 @@ export async function getPort(
     ),
   } as GetPortOptions;
 
-  if (options.random) {
+  if (options.random && options.portRange.length === 0 as number) {
     return getRandomPort(options.host);
   }
 
   // Generate list of ports to check
   const portsToCheck: PortNumber[] = [
-    options.port,
-    ...options.ports,
-    ..._generateRange(...options.portRange),
+    ...(options.random ? [] : [options.port, ...options.ports]),
+    ..._generateRange(options.portRange, options.random)
   ].filter((port) => {
     if (!port) {
       return false;
@@ -70,7 +69,7 @@ export async function getPort(
   // Try fallback port range
   if (!availablePort && options.alternativePortRange.length > 0) {
     availablePort = await _findPort(
-      _generateRange(...options.alternativePortRange),
+      _generateRange(options.alternativePortRange),
       options.host,
     );
     _log(