Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Use get-port with portNumbers range for sequential port selection

Damian Legawiece76a5f256cf4
diff --git a/packages/create-spree-app/package.json b/packages/create-spree-app/package.json
index e2a57863c0..114c660ea4 100644
--- a/packages/create-spree-app/package.json
+++ b/packages/create-spree-app/package.json
@@ -46,6 +46,7 @@
"@clack/prompts": "^0.10.0",
"commander": "^13.1.0",
"execa": "^9.5.2",
+ "get-port": "^7.1.0",
"picocolors": "^1.1.1"
},
"devDependencies": {
diff --git a/packages/create-spree-app/src/index.ts b/packages/create-spree-app/src/index.ts
index e2ac1954fc..e10c2529f4 100644
--- a/packages/create-spree-app/src/index.ts
+++ b/packages/create-spree-app/src/index.ts
@@ -1,9 +1,10 @@
import { Command } from 'commander'
import * as p from '@clack/prompts'
import pc from 'picocolors'
+import getPort, { portNumbers } from 'get-port'
import { runPrompts } from './prompts.js'
import { scaffold } from './scaffold.js'
-import { detectPackageManager, getAvailablePort } from './utils.js'
+import { detectPackageManager } from './utils.js'
import { DEFAULT_SPREE_PORT } from './constants.js'
import type { PackageManager } from './types.js'
@@ -36,7 +37,7 @@ const program = new Command()
})
const preferred = Number(flags.port)
- const port = await getAvailablePort(preferred)
+ const port = await getPort({ port: portNumbers(preferred, preferred + 100) })
if (port !== preferred) {
p.log.warn(`Port ${preferred} is in use, using port ${pc.bold(String(port))} instead.`)
}
diff --git a/packages/create-spree-app/src/utils.ts b/packages/create-spree-app/src/utils.ts
index 5717d7ee82..836a060795 100644
--- a/packages/create-spree-app/src/utils.ts
+++ b/packages/create-spree-app/src/utils.ts
@@ -1,6 +1,5 @@
import { execaCommand } from 'execa'
import crypto from 'node:crypto'
-import net from 'node:net'
import { platform } from 'node:os'
import type { PackageManager } from './types.js'
@@ -34,22 +33,6 @@ export function runCommand(pm: PackageManager): string {
return 'pnpm'
}
-export async function getAvailablePort(preferred: number): Promise<number> {
- for (let port = preferred; port < preferred + 100; port++) {
- if (await isPortAvailable(port)) return port
- }
- throw new Error(`No available port found in range ${preferred}-${preferred + 99}`)
-}
-
-function isPortAvailable(port: number): Promise<boolean> {
- return new Promise((resolve) => {
- const server = net.createServer()
- server.once('error', () => resolve(false))
- server.once('listening', () => server.close(() => resolve(true)))
- server.listen(port)
- })
-}
-
export async function openBrowser(url: string): Promise<void> {
const os = platform()
const cmd = os === 'darwin' ? 'open' : os === 'win32' ? 'start' : 'xdg-open'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 92a12ddc44..eb8cd27e89 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -60,6 +60,9 @@ importers:
execa:
specifier: ^9.5.2
version: 9.6.1
+ get-port:
+ specifier: ^7.1.0
+ version: 7.1.0
picocolors:
specifier: ^1.1.1
version: 1.1.1
@@ -1109,6 +1112,10 @@ packages:
resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
engines: {node: 6.* || 8.* || >= 10.*}
+ resolution: {integrity: sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==}
+ engines: {node: '>=16'}
+
resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==}
engines: {node: '>=18'}
@@ -2747,6 +2754,8 @@ snapshots:
+
dependencies:
'@sec-ant/readable-stream': 0.4.1