vxrn 2.13.8 → 2.13.9

package/src/config/getOptionsFilled.ts

@@ -1,8 +1,9 @@
 import { createHash } from 'node:crypto'
+import { existsSync } from 'node:fs'
+import { readFile } from 'node:fs/promises'
 import { createRequire } from 'node:module'
 import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { readPackageJSON } from 'pkg-types'
+import { basename, dirname, join, resolve } from 'node:path'
 import type { Mode, VXRNOptions } from '../types'
 import { getServerOptionsFilled } from './getServerOptionsFilled'
 import { readState } from '../utils/state'
@@ -38,6 +39,14 @@ const require = createRequire(import.meta.url)
  *   * Over time, we can progressively eliminate dependencies on
  *     `VXRNOptionsFilled` across the codebase.
  */
+export type PackageJSON = {
+  name?: string
+  version?: string
+  dependencies?: Record<string, string>
+  devDependencies?: Record<string, string>
+  [key: string]: any
+}
+
 export type VXRNOptionsFilled = Awaited<ReturnType<typeof fillOptions>>
 
 let optionsFilled: VXRNOptionsFilled | null = null
@@ -115,6 +124,30 @@ export function getOptionsFilled() {
   return optionsFilled
 }
 
+async function readPackageJSON(cwd = process.cwd()): Promise<PackageJSON> {
+  // nearest package.json walking up, stopping above the shallowest
+  // node_modules segment, matching the pkg-types lookup this replaces
+  let stopDir: string | null = null
+  for (let dir = resolve(cwd); ; ) {
+    if (basename(dir) === 'node_modules') stopDir = dir
+    const parent = dirname(dir)
+    if (parent === dir) break
+    dir = parent
+  }
+  let dir = resolve(cwd)
+  for (;;) {
+    const candidate = join(dir, 'package.json')
+    if (existsSync(candidate)) {
+      return JSON.parse(await readFile(candidate, 'utf8'))
+    }
+    if (stopDir && resolve(dir) === stopDir) break
+    const parent = dirname(dir)
+    if (parent === dir) break
+    dir = parent
+  }
+  throw new Error(`Cannot find matching package.json in ${cwd} or parent directories`)
+}
+
 function hashString(str: string): string {
   const hash = createHash('sha256') // Create a hash object with the desired algorithm (e.g., 'sha256')
   hash.update(str) // Update the hash content with the input string

package/src/config/getServerOptionsFilled.test.ts

@@ -1,6 +1,22 @@
+import { createServer } from 'node:net'
 import { describe, expect, test } from 'vitest'
 import { getServerOptionsFilled } from './getServerOptionsFilled'
 
+async function occupyPort(): Promise<{ port: number; close: () => Promise<void> }> {
+  const server = createServer()
+  await new Promise<void>((resolve) => {
+    server.listen({ port: 0, host: '0.0.0.0' }, () => resolve())
+  })
+  const port = (server.address() as { port: number }).port
+  return {
+    port,
+    close: () =>
+      new Promise<void>((resolve, reject) => {
+        server.close((err) => (err ? reject(err) : resolve()))
+      }),
+  }
+}
+
 describe('getServerOptionsFilled', () => {
   test('uses the configured TLS protocol in the public server URL', async () => {
     const server = await getServerOptionsFilled(
@@ -21,4 +37,25 @@ describe('getServerOptionsFilled', () => {
       key: 'private-key',
     })
   })
+
+  test('resolves an explicitly requested free port', async () => {
+    const occupied = await occupyPort()
+    const port = occupied.port
+    await occupied.close()
+
+    const server = await getServerOptionsFilled({ port }, 'dev')
+
+    expect(server.port).toBe(port)
+  })
+
+  test('rejects an explicitly requested port that is already in use', async () => {
+    const occupied = await occupyPort()
+    try {
+      await expect(getServerOptionsFilled({ port: occupied.port }, 'dev')).rejects.toThrow(
+        `Port ${occupied.port} is already in use`
+      )
+    } finally {
+      await occupied.close()
+    }
+  })
 })

package/src/config/getServerOptionsFilled.ts

@@ -1,6 +1,62 @@
-import { getPort } from 'get-port-please'
+import { createServer } from 'node:net'
 import type { Mode, VXRNOptions, VXRNServeOptionsFilled } from '../types'
 
+// ports browsers refuse to connect to, so binding one would serve nothing.
+// same list get-port-please filters; vxrn's default ranges never hit it.
+const UNSAFE_PORTS = new Set([
+  1, 7, 9, 11, 13, 15, 17, 19, 20, 21, 22, 23, 25, 37, 42, 43, 53, 69, 77, 79, 87,
+  95, 101, 102, 103, 104, 109, 110, 111, 113, 115, 117, 119, 123, 135, 137, 139,
+  143, 161, 179, 389, 427, 465, 512, 513, 514, 515, 526, 530, 531, 532, 540, 548,
+  554, 556, 563, 587, 601, 636, 989, 990, 993, 995, 1719, 1720, 1723, 2049, 3659,
+  4045, 5060, 5061, 6000, 6566, 6665, 6666, 6667, 6668, 6669, 6697, 10080,
+])
+
+const HOSTNAME_RE = /^(?!-)[\d.:A-Za-z-]{1,63}(?<!-)$/
+
+function tryPort(port: number, host: string | undefined): Promise<number | false> {
+  return new Promise((resolve) => {
+    const server = createServer()
+    server.unref()
+    server.on('error', () => {
+      resolve(false)
+    })
+    server.listen({ port, host }, () => {
+      const bound = (server.address() as { port: number }).port
+      server.close(() => {
+        resolve(!UNSAFE_PORTS.has(bound) && bound)
+      })
+    })
+  })
+}
+
+async function getPort({
+  port,
+  portRange,
+  host,
+}: {
+  port: number
+  portRange: [number, number]
+  host: string | undefined
+}): Promise<number> {
+  if (host && !HOSTNAME_RE.test(host)) {
+    host = '127.0.0.1'
+  }
+  const ports = [port]
+  for (let p = portRange[0]; p <= portRange[1]; p++) {
+    ports.push(p)
+  }
+  for (const p of ports) {
+    if (!p || UNSAFE_PORTS.has(p)) continue
+    const found = await tryPort(p, host)
+    if (found) return found
+  }
+  const random = await tryPort(0, host)
+  if (random) return random
+  throw new Error(
+    `Unable to find an available port ${host ? `on host ${JSON.stringify(host)}` : 'on any host'} (tried ${portRange.join('-')})`
+  )
+}
+
 export async function getServerOptionsFilled(
   serverOptions: VXRNOptions['server'],
   mode: Mode

package/src/exports/build.ts

@@ -1,6 +1,6 @@
-import FSExtra from 'fs-extra'
-import { rm } from 'node:fs/promises'
+import { readFile, rm, writeFile } from 'node:fs/promises'
 import { sep } from 'node:path'
+import { readJSON } from '../utils/fs'
 import type { OutputAsset, OutputChunk, RolldownOutput } from 'rolldown'
 import {
   loadConfigFromFile,
@@ -355,11 +355,11 @@ export const build = async (optionsIn: VXRNOptions, buildArgs: BuildArgs = {}) =
   }
 
   if (serverOptions !== false) {
-    clientManifest = await FSExtra.readJSON(`${outDir}/client/.vite/manifest.json`)
+    clientManifest = await readJSON(`${outDir}/client/.vite/manifest.json`)
 
     // temp fix - react native web is importing non-existent react 19 apis
-    const old = await FSExtra.readFile(serverEntry, 'utf-8')
-    await FSExtra.writeFile(
+    const old = await readFile(serverEntry, 'utf-8')
+    await writeFile(
       serverEntry,
       old
         .replace(

package/src/exports/clean.test.ts

@@ -107,7 +107,7 @@ async function tryConnect(port: number): Promise<Socket | undefined> {
 }
 
 // outermost node_modules above the test, so a bundled worker's bare
-// imports (vite, fs-extra, ...) resolve the way the workspace lays out
+// imports (vite, picocolors, ...) resolve the way the workspace lays out
 function outermostNodeModules(from: string): string {
   let dir = from
   let found: string | undefined

package/src/exports/dev.ts

@@ -1,11 +1,11 @@
 import { execFileSync } from 'node:child_process'
-import FSExtra from 'fs-extra'
+import { mkdir } from 'node:fs/promises'
 import colors from 'picocolors'
 import { debounce } from 'perfect-debounce'
 import { normalizePath, type PluginOption, type ViteDevServer } from 'vite'
 import type { VXRNOptions } from '../types'
 
-const { ensureDir } = FSExtra
+const ensureDir = (dir: string) => mkdir(dir, { recursive: true })
 
 function readParentPid(pid: number): number | undefined {
   try {
@@ -31,19 +31,18 @@ function processExists(pid: number): boolean {
 
 // Exit if we become orphaned (parent dies). `bun run` stays between One and
 // its launcher, so monitor the launcher's PID too instead of only Bun's PID.
+// PID 1 is a live container or machine init, not a dead parent.
 function setupOrphanDetection() {
   if (process.platform === 'win32') return
 
   const initialPpid = process.ppid
   const launcherPid = readParentPid(initialPpid)
-  if (initialPpid === 1 || launcherPid === 1) {
-    process.exit(0)
-  }
+  const watchedLauncher = launcherPid !== undefined && launcherPid > 1 ? launcherPid : undefined
 
   const interval = setInterval(() => {
     if (
       process.ppid !== initialPpid ||
-      (launcherPid !== undefined && !processExists(launcherPid))
+      (watchedLauncher !== undefined && !processExists(watchedLauncher))
     ) {
       process.exit(0)
     }

package/src/exports/prebuild.ts

@@ -1,5 +1,5 @@
 import { detectPackageManager, type PackageManagerName } from '@vxrn/utils'
-import FSExtra from 'fs-extra'
+import { readFile, writeFile } from 'node:fs/promises'
 import path from 'node:path'
 import { fillOptions } from '../config/getOptionsFilled'
 import { applyBuiltInPatches } from '../utils/patches'
@@ -38,7 +38,7 @@ export const prebuild = async ({
 
   try {
     const packageJsonPath = path.join(root, 'package.json')
-    const packageJsonContents = await FSExtra.readFile(packageJsonPath, 'utf8')
+    const packageJsonContents = await readFile(packageJsonPath, 'utf8')
     const { devDependencies } = JSON.parse(packageJsonContents)
     if (!devDependencies?.['@react-native-community/template']) {
       const installCommand: `${PackageManagerName} ${'add' | 'install'} ${'-D'} ${'@react-native-community/template'}` =
@@ -126,9 +126,9 @@ export async function replaceInUTF8File(
   findThis: string,
   replaceWith: string
 ) {
-  const fileContent = await FSExtra.readFile(filePath, 'utf8')
+  const fileContent = await readFile(filePath, 'utf8')
   const replacedFileContent = fileContent.replace(findThis, replaceWith)
   if (replacedFileContent !== fileContent) {
-    await FSExtra.writeFile(filePath, replacedFileContent, 'utf8')
+    await writeFile(filePath, replacedFileContent, 'utf8')
   }
 }