@marko/run 0.1.4 → 0.1.6

package/dist/cli/index.mjs

@@ -1,11 +1,13 @@
 #!/usr/bin/env node
 
 // src/cli/index.ts
+import sade from "sade";
+
+// src/cli/commands.ts
 import path3 from "path";
-import fs4 from "fs";
+import fs3 from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { build as viteBuild, resolveConfig } from "vite";
-import sade from "sade";
 
 // src/vite/utils/config.ts
 var PluginConfigKey = "__MARKO_RUN_PLUGIN_CONFIG__";
@@ -21,82 +23,15 @@ var getExternalPluginOptions = (viteConfig) => getConfig(viteConfig, PluginConfi
 var setExternalPluginOptions = (viteConfig, value) => setConfig(viteConfig, PluginConfigKey, value);
 var setExternalAdapterOptions = (viteConfig, value) => setConfig(viteConfig, AdapterConfigKey, value);
 
-// src/cli/index.ts
+// src/cli/commands.ts
 import { MemoryStore } from "@marko/vite";
 
-// src/vite/utils/server.ts
-import net from "net";
-import cp from "child_process";
-import { parse, config } from "dotenv";
-import fs from "fs";
-async function parseEnv(envFile) {
-  if (fs.existsSync(envFile)) {
-    const content = await fs.promises.readFile(envFile, "utf8");
-    return parse(content);
-  }
-}
-async function spawnServer(cmd, port = 0, env, cwd2 = process.cwd(), wait = 3e4) {
-  if (port <= 0) {
-    port = await getAvailablePort();
-  }
-  if (typeof env === "string") {
-    env = await parseEnv(env);
-  }
-  const proc = cp.spawn(cmd, {
-    cwd: cwd2,
-    shell: true,
-    stdio: "inherit",
-    windowsHide: true,
-    env: { ...env, NODE_ENV: "development", ...process.env, PORT: `${port}` }
-  });
-  const close = () => {
-    proc.unref();
-    proc.kill();
-  };
-  let remaining = wait > 0 ? wait : Infinity;
-  while (!await isPortInUse(port)) {
-    if (remaining >= 100) {
-      remaining -= 100;
-      await sleep(100);
-    } else {
-      close();
-      throw new Error(
-        `site-write: timeout while wating for server to start on port "${port}".`
-      );
-    }
-  }
-  return {
-    port,
-    close
-  };
-}
-async function isPortInUse(port) {
-  return new Promise((resolve) => {
-    const connection = net.connect(port).setNoDelay(true).setKeepAlive(false).on("error", () => done(false)).on("connect", () => done(true));
-    function done(connected) {
-      connection.end();
-      resolve(connected);
-    }
-  });
-}
-async function getAvailablePort() {
-  return new Promise((resolve) => {
-    const server = net.createServer().listen(0, () => {
-      const { port } = server.address();
-      server.close(() => resolve(port));
-    });
-  });
-}
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 // src/vite/plugin.ts
 import path2 from "path";
 import crypto from "crypto";
-import fs3 from "fs";
+import fs2 from "fs";
 import glob from "glob";
-import { mergeConfig, resolvePackageData } from "vite";
+import { mergeConfig } from "vite";
 import markoVitePlugin, { FileStore } from "@marko/vite";
 
 // src/vite/constants.ts
@@ -122,16 +57,16 @@ var routeableFileRegex = new RegExp(
 );
 
 // src/vite/routes/walk.ts
-import fs2 from "fs";
+import fs from "fs";
 import path from "path";
 
 // src/vite/utils/ast.ts
 import * as t from "@babel/types";
 
 // src/vite/utils/log.ts
+import zlib from "node:zlib";
 import Table from "cli-table3";
 import kleur from "kleur";
-import { gzipSizeSync } from "gzip-size";
 import format from "human-format";
 var HttpVerbColors = {
   get: kleur.green,
@@ -152,6 +87,7 @@ async function resolveAdapter(root, options, log) {
   if (adapter !== void 0) {
     return adapter;
   }
+  const { resolvePackageData } = await import("vite");
   const pkg = resolvePackageData(".", root);
   if (pkg) {
     const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
@@ -173,48 +109,12 @@ async function resolveAdapter(root, options, log) {
   return module.default();
 }
 
-// src/cli/index.ts
+// src/cli/commands.ts
 var __dirname2 = fileURLToPath2(new URL(".", import.meta.url));
-var cwd = process.cwd();
 var defaultPort = +process.env.PORT || 3e3;
 var defaultConfigFileBases = ["serve.config", "vite.config"];
 var defaultConfigFileExts = [".js", ".cjs", ".mjs", ".ts", ".mts"];
-var prog = sade("marko-run").version("0.0.1").option(
-  "-c, --config",
-  `Provide path to a Vite config file (by default looks for a file starting with ${defaultConfigFileBases.join(
-    " or "
-  )} with one of these extensions: ${defaultConfigFileExts.join(", ")})`
-).option("-e, --env", "Provide path to a dotenv file");
-prog.command("preview [entry]").describe("Start a production-like server for already-built app files").option(
-  "-o, --output",
-  "Directory to serve files from, and write asset files to if `--build` (default: )"
-).option(
-  "-p, --port",
-  "Port the server should listen on (defaults: `$PORT` env variable or 3000)"
-).option("-f, --file", "Output file to start").action(async (entry, opts) => {
-  process.env.NODE_ENV = "production";
-  const config2 = await getViteConfig(cwd, opts.config);
-  await build(entry, config2, opts.output, false, opts.env);
-  await preview(opts.entry, config2, opts.port, opts.output, opts.env);
-});
-prog.command("dev [entry]", "", { default: true }).describe("Start development server in watch mode").option(
-  "-p, --port",
-  "Port the dev server should listen on (defaults: 'preview.port' in config, or `$PORT` env variable, or 3000)"
-).example("dev --config vite.config.js").action(async (entry, opts) => {
-  const cmd = opts._.length ? `${entry} ${opts._.join(" ")}` : entry ? `node ${entry}` : void 0;
-  const config2 = await getViteConfig(cwd, opts.config);
-  await dev(cmd, config2, opts.port, opts.env);
-});
-prog.command("build [entry]").describe("Build the application (without serving it)").option(
-  "-o, --output",
-  "Directory to write built files (default: 'build.outDir' in Vite config)"
-).option("--skip-client", "Skip the client-side build").example("build --config vite.config.js").action(async (entry, opts) => {
-  process.env.NODE_ENV = "production";
-  const config2 = await getViteConfig(cwd, opts.config);
-  await build(entry, config2, opts.ouput, opts["skip-client"], opts.env);
-});
-prog.parse(process.argv);
-async function preview(entry, configFile, port, outDir, envFile) {
+async function preview(entry, cwd, configFile, port, outDir, envFile, args = []) {
   const resolvedConfig = await resolveConfig(
     { root: cwd, configFile, logLevel: "silent", build: { outDir } },
     "serve"
@@ -233,9 +133,16 @@ async function preview(entry, configFile, port, outDir, envFile) {
   if (envFile) {
     envFile = path3.resolve(cwd, envFile);
   }
-  await adapter.startPreview(dir, entryFile, port, envFile);
+  const options = {
+    cwd,
+    dir,
+    args,
+    port,
+    envFile
+  };
+  return await adapter.startPreview(entryFile, options);
 }
-async function dev(cmd, configFile, port, envFile) {
+async function dev(entry, cwd, configFile, port, envFile, args = []) {
   const resolvedConfig = await resolveConfig(
     { root: cwd, configFile, logLevel: "silent" },
     "build"
@@ -246,24 +153,25 @@ async function dev(cmd, configFile, port, envFile) {
   if (envFile) {
     envFile = path3.resolve(cwd, envFile);
   }
-  if (cmd) {
-    await spawnServer(cmd, port, envFile);
-  } else {
-    const adapter = await resolveAdapter2(resolvedConfig);
-    if (!adapter) {
-      throw new Error(
-        "No adapter specified for 'dev' command without custom target"
-      );
-    } else if (!adapter.startDev) {
-      throw new Error(
-        `Adapter '${adapter.name}' does not support 'serve' command`
-      );
-    } else {
-      await adapter.startDev(configFile, port, envFile);
-    }
+  const adapter = await resolveAdapter2(resolvedConfig);
+  if (!adapter) {
+    throw new Error(
+      "No adapter specified for 'dev' command without custom target"
+    );
+  } else if (!adapter.startDev) {
+    throw new Error(
+      `Adapter '${adapter.name}' does not support 'serve' command`
+    );
   }
+  const options = {
+    cwd,
+    args,
+    port,
+    envFile
+  };
+  return await adapter.startDev(entry, { root: cwd, configFile }, options);
 }
-async function build(entry, configFile, outDir, skipClient = false, envFile) {
+async function build(entry, cwd, configFile, outDir, envFile) {
   var _a;
   const resolvedConfig = await resolveConfig(
     { root: cwd, configFile, logLevel: "silent" },
@@ -311,20 +219,18 @@ async function build(entry, configFile, outDir, skipClient = false, envFile) {
       }
     }
   });
-  if (!skipClient) {
-    await viteBuild({
-      ...buildConfig,
-      build: {
-        ...buildConfig.build,
-        sourcemap: true
-      }
-    });
-  }
+  await viteBuild({
+    ...buildConfig,
+    build: {
+      ...buildConfig.build,
+      sourcemap: true
+    }
+  });
 }
 function findFileWithExt(dir, base, extensions = defaultConfigFileExts) {
   for (const ext of extensions) {
     const filePath = path3.join(dir, base + ext);
-    if (fs4.existsSync(filePath)) {
+    if (fs3.existsSync(filePath)) {
       return filePath;
     }
   }
@@ -333,7 +239,7 @@ function findFileWithExt(dir, base, extensions = defaultConfigFileExts) {
 async function getViteConfig(dir, configFile, bases = defaultConfigFileBases) {
   if (configFile) {
     const configFilePath = path3.join(dir, configFile);
-    if (!fs4.existsSync(configFilePath)) {
+    if (!fs3.existsSync(configFilePath)) {
       throw new Error(`No config file found at '${configFilePath}'`);
     }
     return configFile;
@@ -346,10 +252,58 @@ async function getViteConfig(dir, configFile, bases = defaultConfigFileBases) {
   }
   return path3.join(__dirname2, "default.config.mjs");
 }
-async function resolveAdapter2(config2) {
-  const options = getExternalPluginOptions(config2);
+async function resolveAdapter2(config) {
+  const options = getExternalPluginOptions(config);
   if (!options) {
     throw new Error("Unable to resolve @marko/run options");
   }
-  return resolveAdapter(config2.root, options);
+  return resolveAdapter(config.root, options);
 }
+
+// src/cli/index.ts
+var prog = sade("marko-run").version("0.0.1").option(
+  "-c, --config",
+  `Provide path to a Vite config file (by default looks for a file starting with ${defaultConfigFileBases.join(
+    " or "
+  )} with one of these extensions: ${defaultConfigFileExts.join(", ")})`
+).option("-e, --env", "Provide path to a dotenv file");
+prog.command("preview [entry]").describe("Start a production-like server for already-built app files").option(
+  "-o, --output",
+  "Directory to serve files from, and write asset files to if `--build` (default: 'build.outDir' in Vite config)"
+).option(
+  "-p, --port",
+  "Port the server should listen on (defaults: `$PORT` env variable or 3000)"
+).option("-f, --file", "Output file to start").action(async (entry, opts) => {
+  process.env.NODE_ENV = "production";
+  const cwd = process.cwd();
+  const args = process.argv.slice(entry ? 4 : 3);
+  const config = await getViteConfig(cwd, opts.config);
+  await build(entry, cwd, config, opts.output, opts.env);
+  await preview(
+    opts.file,
+    cwd,
+    config,
+    opts.port,
+    opts.output,
+    opts.env,
+    args
+  );
+});
+prog.command("dev [entry]", "", { default: true }).describe("Start development server in watch mode").option(
+  "-p, --port",
+  "Port the dev server should listen on (defaults: 'preview.port' in config, or `$PORT` env variable, or 3000)"
+).example("dev --config vite.config.js").action(async (entry, opts) => {
+  const cwd = process.cwd();
+  const args = process.argv.slice(entry ? 4 : 3);
+  const config = await getViteConfig(cwd, opts.config);
+  await dev(entry, cwd, config, opts.port, opts.env, args);
+});
+prog.command("build [entry]").describe("Build the application (without serving it)").option(
+  "-o, --output",
+  "Directory to write built files (default: 'build.outDir' in Vite config)"
+).example("build --config vite.config.js").action(async (entry, opts) => {
+  const cwd = process.cwd();
+  const config = await getViteConfig(cwd, opts.config);
+  await build(entry, cwd, config, opts.ouput, opts.env);
+});
+prog.parse(process.argv);

package/dist/index.html

@@ -0,0 +1 @@
+<!doctype html><html lang=en><head><meta charset=UTF-8><title>@marko/run Test Fixture</title><script async type="module" crossorigin src="/assets/__marko-run__route__index.marko-3cfb730f.js"></script></head><body><div id=app>Page rendered</div></body></html>

package/dist/runtime/index.d.ts

@@ -1,11 +1,12 @@
-import type { HandlerLike, ParamsObject, Route as AnyRoute, Context as AnyContext } from "./types";
+import type { HandlerLike, ParamsObject, Route as AnyRoute, Context as AnyContext, RuntimeModule } from "./types";
 declare global {
+    var __marko_run__: RuntimeModule;
     namespace MarkoRun {
         const NotHandled: unique symbol;
         const NotMatched: unique symbol;
         interface Route extends AnyRoute {
         }
-        interface Context extends AnyContext<Route> {
+        interface Context extends AnyContext {
         }
         type Handler<Params extends ParamsObject = {}, Meta = unknown> = HandlerLike<AnyRoute<Params, Meta, string>>;
         function route<Params extends ParamsObject = {}, Meta = unknown>(handler: Handler<Params, Meta>): typeof handler;

package/dist/runtime/router.cjs

@@ -25,14 +25,20 @@ __export(router_exports, {
   match: () => match
 });
 module.exports = __toCommonJS(router_exports);
-function notImplemented() {
-  throw new Error(
-    "This should have been replaced by the @marko/run plugin at build/dev time"
-  );
+function fromRuntime(name) {
+  return (...args) => {
+    const runtime = globalThis.__marko_run__;
+    if (!runtime) {
+      throw new Error(
+        "This should have been replaced by the @marko/run plugin at build/dev time"
+      );
+    }
+    return runtime[name](...args);
+  };
 }
-var fetch = notImplemented;
-var match = notImplemented;
-var invoke = notImplemented;
+var fetch = fromRuntime("fetch");
+var match = fromRuntime("match");
+var invoke = fromRuntime("invoke");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   fetch,

package/dist/runtime/router.js

@@ -1,12 +1,18 @@
 // src/runtime/router.ts
-function notImplemented() {
-  throw new Error(
-    "This should have been replaced by the @marko/run plugin at build/dev time"
-  );
+function fromRuntime(name) {
+  return (...args) => {
+    const runtime = globalThis.__marko_run__;
+    if (!runtime) {
+      throw new Error(
+        "This should have been replaced by the @marko/run plugin at build/dev time"
+      );
+    }
+    return runtime[name](...args);
+  };
 }
-var fetch = notImplemented;
-var match = notImplemented;
-var invoke = notImplemented;
+var fetch = fromRuntime("fetch");
+var match = fromRuntime("match");
+var invoke = fromRuntime("invoke");
 export {
   fetch,
   invoke,

package/dist/vite/index.cjs

@@ -680,7 +680,9 @@ function renderRouter(routes, options = {
       `import page${key} from '${virtualFilePrefix}/${markoRunFilePrefix}special__${key}.marko${serverEntryQuery}';`
     );
   }
-  writer.writeLines("").writeBlockStart(`export function match(method, pathname) {`).writeLines(
+  writer.writeLines(`
+globalThis.__marko_run__ = { match, fetch, invoke };
+    `).writeBlockStart(`export function match(method, pathname) {`).writeLines(
     `if (!pathname) {
     pathname = '/';
   } else if (pathname.charAt(0) !== '/') {
@@ -829,7 +831,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
     if (terminal || (dynamic == null ? void 0 : dynamic.route)) {
       closeCount++;
       writer.writeBlockStart(`if (!${index} || ${index} === len) {`);
-      let value = `pathname.slice(${offset}, ${index} ? -1 : len)`;
+      let value = `decodeURIComponent(pathname.slice(${offset}, ${index} ? -1 : len))`;
       if (dynamic == null ? void 0 : dynamic.route) {
         const segment = `s${next}`;
         writer.writeLines(`const ${segment} = ${value};`);
@@ -868,7 +870,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
         writer.writeBlockStart(`if (${index} && ${index} !== len) {`);
         closeCount++;
       }
-      let value = `pathname.slice(${offset}, ${index} - 1)`;
+      let value = `decodeURIComponent(pathname.slice(${offset}, ${index} - 1))`;
       if ((dynamic == null ? void 0 : dynamic.static) || (dynamic == null ? void 0 : dynamic.dynamic)) {
         const segment = `s${next}`;
         writer.writeLines(`const ${segment} = ${value};`);
@@ -880,11 +882,12 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
           writer.writeBlockStart(`switch (${value}.toLowerCase()) {`);
         }
         for (const child of children) {
+          const decodedKey = decodeURIComponent(child.key);
           if (useSwitch) {
-            writer.writeBlockStart(`case '${child.key}': {`);
+            writer.writeBlockStart(`case '${decodedKey}': {`);
           } else {
             writer.writeBlockStart(
-              `if (${value}.toLowerCase() === '${child.key}') {`
+              `if (${value}.toLowerCase() === '${decodedKey}') {`
             );
           }
           const nextOffset = typeof offset === "string" ? index : offset + child.key.length + 1;
@@ -914,6 +917,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
   }
 }
 function wrapPropertyName(name) {
+  name = decodeURIComponent(name);
   return /^[^A-Za-z_$]|[^A-Za-z0-9$_]/.test(name) ? `'${name}'` : name;
 }
 function renderParamsInfo(params, pathIndex) {
@@ -1014,7 +1018,10 @@ interface NoMeta {}
     const routeType = `Route${route.index}`;
     const pathType = `\`${route.path.replace(
       /\/\$(\$?)([^\/]*)/,
-      (_, catchAll, name) => catchAll ? `/:${name || "rest"}*` : `/:${name}`
+      (_, catchAll, name) => {
+        name = decodeURIComponent(name);
+        return catchAll ? `/:${name || "rest"}*` : `/:${name}`;
+      }
     )}\``;
     const paramsType = (params == null ? void 0 : params.length) ? renderParamsInfoType(params) : "NoParams";
     let metaType = "NoMeta";
@@ -1022,10 +1029,10 @@ interface NoMeta {}
       const isGet = page || ((_a = handler == null ? void 0 : handler.verbs) == null ? void 0 : _a.includes("get"));
       const isPost = (_b = handler == null ? void 0 : handler.verbs) == null ? void 0 : _b.includes("post");
       if (isGet || isPost) {
-        const path3 = route.path.replace(
-          /\$(\$?)([^/]+)/g,
-          (_, s, name) => s ? `\${...${name}}` : `\${${name}}`
-        );
+        const path3 = route.path.replace(/\$(\$?)([^/]+)/g, (_, catchAll, name) => {
+          name = decodeURIComponent(name);
+          return catchAll ? `\${...${name}}` : `\${${name}}`;
+        });
         const splatIndex = path3.indexOf("/${...");
         if (splatIndex >= 0) {
           const path22 = path3.slice(0, splatIndex) || "/";
@@ -1236,9 +1243,9 @@ function getExportIdentifiers(astProgramNode) {
 }
 
 // src/vite/utils/log.ts
+var import_node_zlib = __toESM(require("node:zlib"), 1);
 var import_cli_table3 = __toESM(require("cli-table3"), 1);
 var import_kleur = __toESM(require("kleur"), 1);
-var import_gzip_size = require("gzip-size");
 var import_human_format = __toESM(require("human-format"), 1);
 var HttpVerbColors = {
   get: import_kleur.default.green,
@@ -1324,17 +1331,20 @@ function computeRouteSize(route, bundle) {
   }
   return [0, 0];
 }
-function byteSize(str) {
-  return new Blob([str]).size;
+function gzipSize(source) {
+  return import_node_zlib.default.gzipSync(source, { level: 9 }).length;
+}
+function byteSize(source) {
+  return new Blob([source]).size;
 }
 function computeChunkSize(chunk, bundle, seen = /* @__PURE__ */ new Set()) {
   if (chunk.type === "asset") {
     return [
       byteSize(chunk.source),
-      (0, import_gzip_size.gzipSizeSync)(chunk.source)
+      gzipSize(chunk.source)
     ];
   }
-  const size = [byteSize(chunk.code), (0, import_gzip_size.gzipSizeSync)(chunk.code)];
+  const size = [byteSize(chunk.code), gzipSize(chunk.code)];
   for (const id of chunk.imports) {
     if (!seen.has(id)) {
       const [bytes, compBytes] = computeChunkSize(bundle[id], bundle, seen);
@@ -1424,7 +1434,7 @@ function markoRun(opts = {}) {
       const filepath = import_path2.default.join(typesDir, "routes.d.ts");
       const data = await renderRouteTypeInfo(
         routes,
-        import_path2.default.relative(typesDir, routesDir),
+        import_path2.default.relative(typesDir, resolvedRoutesDir),
         adapter
       );
       if (data !== typesFile || !import_fs2.default.existsSync(filepath)) {
@@ -1537,6 +1547,9 @@ function markoRun(opts = {}) {
           define: isBuild ? {
             "process.env.NODE_ENV": "'production'"
           } : void 0,
+          ssr: {
+            noExternal: /@marko\/run/
+          },
           build: {
             emptyOutDir: isSSRBuild
           }
@@ -1774,7 +1787,8 @@ async function resolveAdapter(root, options, log) {
   if (adapter !== void 0) {
     return adapter;
   }
-  const pkg = (0, import_vite.resolvePackageData)(".", root);
+  const { resolvePackageData } = await import("vite");
+  const pkg = resolvePackageData(".", root);
   if (pkg) {
     const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
     for (const name of Object.keys(dependecies)) {
@@ -1800,6 +1814,7 @@ var import_net = __toESM(require("net"), 1);
 var import_child_process = __toESM(require("child_process"), 1);
 var import_dotenv = require("dotenv");
 var import_fs3 = __toESM(require("fs"), 1);
+var import_cluster = __toESM(require("cluster"), 1);
 async function parseEnv(envFile) {
   if (import_fs3.default.existsSync(envFile)) {
     const content = await import_fs3.default.promises.readFile(envFile, "utf8");
@@ -1809,14 +1824,14 @@ async function parseEnv(envFile) {
 function loadEnv(envFile) {
   (0, import_dotenv.config)({ path: envFile });
 }
-async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4) {
+async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
   if (typeof env === "string") {
     env = await parseEnv(env);
   }
-  const proc = import_child_process.default.spawn(cmd, {
+  const proc = import_child_process.default.spawn(cmd, args, {
     cwd,
     shell: true,
     stdio: "inherit",
@@ -1827,32 +1842,45 @@ async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4)
     proc.unref();
     proc.kill();
   };
+  try {
+    await waitForServer(port, wait);
+  } catch (err) {
+    close();
+    throw err;
+  }
+  return {
+    port,
+    close
+  };
+}
+async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
-  while (!await isPortInUse(port)) {
+  let connection;
+  while (!(connection = await getConnection(port))) {
     if (remaining >= 100) {
       remaining -= 100;
       await sleep(100);
     } else {
-      close();
       throw new Error(
         `site-write: timeout while wating for server to start on port "${port}".`
       );
     }
   }
-  return {
-    port,
-    close
-  };
+  return connection;
 }
-async function isPortInUse(port) {
+async function getConnection(port) {
   return new Promise((resolve) => {
-    const connection = import_net.default.connect(port).setNoDelay(true).setKeepAlive(false).on("error", () => done(false)).on("connect", () => done(true));
-    function done(connected) {
+    const connection = import_net.default.connect(port).setNoDelay(true).setKeepAlive(false).on("error", () => {
       connection.end();
-      resolve(connected);
-    }
+      resolve(null);
+    }).on("connect", () => {
+      resolve(connection);
+    });
   });
 }
+async function isPortInUse(port) {
+  return Boolean(await getConnection(port));
+}
 async function getAvailablePort() {
   return new Promise((resolve) => {
     const server = import_net.default.createServer().listen(0, () => {