vite-plugin-phpsandbox 0.1.1 → 0.3.0

package/README.md

@@ -23,18 +23,6 @@ export default defineConfig({
 
 The plugin only applies when `PHPSANDBOX_TYPE` is set.
 
-## Options
-
-```ts
-type PhpSandboxOptions = {
-  allowedHosts?: true | string[];
-  enabled?: boolean;
-  hmrPort?: number;
-  publicHost?: string;
-  publicClientPort?: number;
-};
-```
-
 ## Environment Variables
 
 The plugin reads these environment variables by default:
@@ -46,14 +34,16 @@ The plugin reads these environment variables by default:
 ## Behavior
 
 - Does nothing unless `PHPSANDBOX_TYPE` is set.
-- Resolves the HMR port from the `hmrPort` option only.
-- Resolves the public host from `publicHost`, or derives `${SUBDOMAIN}-${hmrPort}.${NOTEBOOK_HOST}`.
-- Resolves the public client port from the `publicClientPort` option only.
+- Uses `5173` as the stable HMR port.
+- Derives the public host as `${SUBDOMAIN}-5173.${NOTEBOOK_HOST}` when both values exist.
+- Uses `443` as the public HMR client port.
 - Defaults `server.host` to `true` only when the project has not set `server.host`.
-- Merges `.${NOTEBOOK_HOST}` and the derived public host into `server.allowedHosts` by default instead of disabling host checks globally.
-- Creates a stable local HMR server on `0.0.0.0:${hmrPort}` unless `PHPSANDBOX_TYPE=laravel`.
+- Adds `.${NOTEBOOK_HOST}` and the derived public host to `server.allowedHosts` unless the project has set `server.allowedHosts = true`.
+- Creates a stable local HMR server on `0.0.0.0:5173` unless `PHPSANDBOX_TYPE=laravel`.
+- Fails startup if the local HMR server cannot bind to `0.0.0.0:5173`.
 - Advertises HMR over `wss://${publicHost}:${publicClientPort}` when a public host is available.
 - Preserves `server.hmr = false` if the consuming project disables HMR explicitly.
+- Logs the resolved sandbox type, host, HMR endpoint, and allowed hosts after config resolution.
 
 ## Laravel Mode
 
@@ -62,9 +52,5 @@ When `PHPSANDBOX_TYPE=laravel`, the plugin does not create a standalone HMR serv
 ## API
 
 ```ts
-import phpSandboxPlugin, {
-  phpSandbox,
-  type PhpSandboxEnv,
-  type PhpSandboxOptions,
-} from "vite-plugin-phpsandbox";
+import phpSandboxPlugin, { phpSandbox } from "vite-plugin-phpsandbox";
 ```

package/dist/index.cjs

@@ -36,8 +36,8 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_node_http = __toESM(require("http"), 1);
-var DEFAULT_HMR_PORT = 5173;
-var DEFAULT_PUBLIC_CLIENT_PORT = 443;
+var HMR_PORT = 5173;
+var PUBLIC_CLIENT_PORT = 443;
 var GLOBAL_KEY = "__phpSandboxViteState__";
 function getGlobalState() {
   const g = globalThis;
@@ -52,30 +52,60 @@ function normalizeSandboxType(value) {
   const normalized = value?.trim().toLowerCase();
   return normalized ? normalized : void 0;
 }
-function resolveHmrPort(options) {
-  return options.hmrPort ?? DEFAULT_HMR_PORT;
-}
-function resolvePublicClientPort(options) {
-  return options.publicClientPort ?? DEFAULT_PUBLIC_CLIENT_PORT;
-}
-function resolvePublicHost(options, env, hmrPort) {
-  return options.publicHost ?? (env.SUBDOMAIN && env.NOTEBOOK_HOST ? `${env.SUBDOMAIN}-${hmrPort}.${env.NOTEBOOK_HOST}` : void 0);
+function resolvePublicHost(env) {
+  return env.SUBDOMAIN && env.NOTEBOOK_HOST ? `${env.SUBDOMAIN}-${HMR_PORT}.${env.NOTEBOOK_HOST}` : void 0;
 }
 function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
-function acquireServer(state, port) {
+function toListenError(error, port) {
+  const code = isRecord(error) ? error.code : void 0;
+  if (code === "EADDRINUSE") {
+    return new Error(
+      `[vite-plugin-phpsandbox] HMR port ${port} is already in use.`
+    );
+  }
+  const message = error instanceof Error ? error.message : String(error);
+  return new Error(
+    `[vite-plugin-phpsandbox] Failed to bind HMR server on 0.0.0.0:${port}: ${message}`
+  );
+}
+async function listen(server, port) {
+  await new Promise((resolve, reject) => {
+    const cleanup = () => {
+      server.off("error", onError);
+      server.off("listening", onListening);
+    };
+    const onError = (error) => {
+      cleanup();
+      reject(toListenError(error, port));
+    };
+    const onListening = () => {
+      cleanup();
+      resolve();
+    };
+    server.once("error", onError);
+    server.once("listening", onListening);
+    try {
+      server.listen(port, "0.0.0.0");
+    } catch (error) {
+      cleanup();
+      reject(toListenError(error, port));
+    }
+  });
+}
+function logServerError(error) {
+  console.error("[vite-plugin-phpsandbox] HMR server error:", error);
+}
+async function acquireServer(state, port) {
   const existing = state.servers.get(port);
   if (existing) {
     state.refs.set(port, (state.refs.get(port) ?? 0) + 1);
     return existing;
   }
   const server = import_node_http.default.createServer();
-  server.on("error", (error) => {
-    if (error.code === "EADDRINUSE") return;
-    console.error("[vite-plugin-phpsandbox] HMR server error:", error);
-  });
-  server.listen(port, "0.0.0.0");
+  await listen(server, port);
+  server.on("error", logServerError);
   state.servers.set(port, server);
   state.refs.set(port, 1);
   return server;
@@ -89,83 +119,161 @@ function releaseServer(state, port, server) {
   state.refs.delete(port);
   if (state.servers.get(port) !== server) return;
   state.servers.delete(port);
+  server.off("error", logServerError);
   if (server.listening) {
     server.close();
   }
 }
-function resolveAllowedHosts(existingAllowedHosts, optionAllowedHosts, notebookHost, publicHost) {
-  if (optionAllowedHosts === true || existingAllowedHosts === true) {
-    return true;
-  }
-  const merged = new Set(Array.isArray(existingAllowedHosts) ? existingAllowedHosts : []);
-  if (Array.isArray(optionAllowedHosts)) {
-    for (const host of optionAllowedHosts) {
-      merged.add(host);
-    }
-  }
-  if (notebookHost) {
-    merged.add(`.${notebookHost}`);
-  }
-  if (publicHost) {
-    merged.add(publicHost);
-  }
-  return merged.size > 0 ? Array.from(merged) : existingAllowedHosts;
+function resolveAllowedHosts(existingAllowedHosts, notebookHost, publicHost) {
+  if (existingAllowedHosts === true) return true;
+  const hosts = [
+    ...Array.isArray(existingAllowedHosts) ? existingAllowedHosts : [],
+    ...notebookHost ? [`.${notebookHost}`] : [],
+    ...publicHost ? [publicHost] : []
+  ];
+  return hosts.length > 0 ? Array.from(new Set(hosts)) : existingAllowedHosts;
+}
+function resolveExistingHmrOptions(serverOptions) {
+  return isRecord(serverOptions.hmr) ? serverOptions.hmr : void 0;
+}
+function resolveHmrOptions(existingServer, publicHost, hmrServer) {
+  if (existingServer.hmr === false) return false;
+  return {
+    ...resolveExistingHmrOptions(existingServer),
+    port: HMR_PORT,
+    ...hmrServer ? { server: hmrServer } : {},
+    ...publicHost ? {
+      protocol: "wss",
+      host: publicHost,
+      clientPort: PUBLIC_CLIENT_PORT
+    } : {}
+  };
 }
-function phpSandboxPlugin(options = {}, env = process.env) {
-  let managedHmrPort;
+function shouldCreateHmrServer(existingServer, isLaravel) {
+  return !isLaravel && existingServer.hmr !== false;
+}
+function resolveServerConfig(existingServer, env, isLaravel, publicHost, hmrServer) {
+  return {
+    ...existingServer,
+    host: existingServer.host ?? true,
+    ...isLaravel ? { port: HMR_PORT } : {},
+    hmr: resolveHmrOptions(existingServer, publicHost, hmrServer),
+    allowedHosts: resolveAllowedHosts(
+      existingServer.allowedHosts,
+      env.NOTEBOOK_HOST,
+      publicHost
+    )
+  };
+}
+function formatHost(host) {
+  if (host === true) return "0.0.0.0";
+  if (host === false || host === void 0) return "vite default";
+  return String(host);
+}
+function formatAllowedHosts(allowedHosts) {
+  if (allowedHosts === true) return "all";
+  if (Array.isArray(allowedHosts)) return allowedHosts.join(", ") || "none";
+  return "vite default";
+}
+function formatHmrEndpoint(hmr) {
+  if (!hmr || !hmr.host) return "none";
+  const protocol = hmr.protocol ?? "ws";
+  const port = hmr.clientPort ?? hmr.port;
+  return port ? `${protocol}://${hmr.host}:${port}` : `${protocol}://${hmr.host}`;
+}
+function formatHmrSummary(serverOptions, hasManagedServer) {
+  if (serverOptions.hmr === false) return "disabled";
+  const hmr = resolveExistingHmrOptions(serverOptions);
+  const localEndpoint = hasManagedServer ? `0.0.0.0:${HMR_PORT}` : `vite:${serverOptions.port ?? HMR_PORT}`;
+  return `${localEndpoint}, public=${formatHmrEndpoint(hmr)}`;
+}
+function formatStartupLog(sandboxType, serverOptions, hasManagedServer) {
+  return [
+    "[vite-plugin-phpsandbox] enabled",
+    `type=${sandboxType}`,
+    `host=${formatHost(serverOptions.host)}`,
+    `hmr=${formatHmrSummary(serverOptions, hasManagedServer)}`,
+    `allowedHosts=${formatAllowedHosts(serverOptions.allowedHosts)}`
+  ].join(" | ");
+}
+function phpSandboxPlugin() {
   let managedHmrServer;
+  let releaseManagedHmrServer;
+  let sandboxType;
+  let needsHmrServer = false;
+  let startupLog;
+  function setManagedHmrServer(server) {
+    if (managedHmrServer === server) return;
+    releaseManagedHmrServer?.();
+    managedHmrServer = server;
+    if (!server) {
+      releaseManagedHmrServer = void 0;
+      return;
+    }
+    let released = false;
+    releaseManagedHmrServer = () => {
+      if (released) return;
+      released = true;
+      if (managedHmrServer === server) {
+        managedHmrServer = void 0;
+        releaseManagedHmrServer = void 0;
+      }
+      releaseServer(getGlobalState(), HMR_PORT, server);
+    };
+  }
   return {
     name: "vite-plugin-phpsandbox",
     apply: "serve",
     enforce: "post",
     config(userConfig) {
-      if (options.enabled === false) return {};
-      const sandboxType = normalizeSandboxType(env.PHPSANDBOX_TYPE);
-      if (!sandboxType) return {};
-      const hmrPort = resolveHmrPort(options);
-      const publicClientPort = resolvePublicClientPort(options);
-      const publicHost = resolvePublicHost(options, env, hmrPort);
+      const env = process.env;
+      sandboxType = normalizeSandboxType(env.PHPSANDBOX_TYPE);
+      if (!sandboxType) {
+        needsHmrServer = false;
+        startupLog = void 0;
+        return {};
+      }
       const isLaravel = sandboxType === "laravel";
+      const publicHost = resolvePublicHost(env);
       const existingServer = userConfig.server ?? {};
-      const existingHmr = isRecord(existingServer.hmr) ? existingServer.hmr : void 0;
-      const hmrDisabled = existingServer.hmr === false;
-      const allowedHosts = resolveAllowedHosts(
-        existingServer.allowedHosts,
-        options.allowedHosts,
-        env.NOTEBOOK_HOST,
-        publicHost
-      );
-      const hmrServer = isLaravel || hmrDisabled ? void 0 : acquireServer(getGlobalState(), hmrPort);
-      managedHmrPort = hmrServer ? hmrPort : void 0;
-      managedHmrServer = hmrServer;
+      needsHmrServer = shouldCreateHmrServer(existingServer, isLaravel);
       return {
-        server: {
-          ...existingServer,
-          host: existingServer.host ?? true,
-          ...isLaravel ? { port: hmrPort } : {},
-          ...hmrDisabled ? { hmr: false } : {
-            hmr: {
-              ...existingHmr,
-              port: hmrPort,
-              ...hmrServer ? { server: hmrServer } : {},
-              ...publicHost ? {
-                protocol: "wss",
-                host: publicHost,
-                clientPort: publicClientPort
-              } : {}
-            }
-          },
-          allowedHosts
-        }
+        server: resolveServerConfig(
+          existingServer,
+          env,
+          isLaravel,
+          publicHost,
+          void 0
+        )
       };
     },
-    configureServer(server) {
-      if (!managedHmrServer || managedHmrPort === void 0) return;
-      const hmrPort = managedHmrPort;
-      const hmrServer = managedHmrServer;
-      server.httpServer?.once("close", () => {
-        releaseServer(getGlobalState(), hmrPort, hmrServer);
-      });
+    configResolved(config) {
+      if (!sandboxType) return;
+      const nextStartupLog = formatStartupLog(
+        sandboxType,
+        config.server,
+        needsHmrServer
+      );
+      if (nextStartupLog === startupLog) return;
+      startupLog = nextStartupLog;
+      console.info(nextStartupLog);
+    },
+    async configureServer(server) {
+      if (!sandboxType) return;
+      if (needsHmrServer) {
+        const hmrServer = managedHmrServer ?? await acquireServer(getGlobalState(), HMR_PORT);
+        setManagedHmrServer(hmrServer);
+        const hmrConfig = server.config.server.hmr;
+        if (isRecord(hmrConfig)) {
+          hmrConfig.server = hmrServer;
+        }
+      }
+      const release = releaseManagedHmrServer;
+      if (!release) return;
+      server.httpServer?.once("close", release);
+    },
+    closeBundle() {
+      releaseManagedHmrServer?.();
     }
   };
 }

package/dist/index.d.cts

@@ -1,36 +1,6 @@
 import { Plugin } from 'vite';
 
-type PhpSandboxEnv = {
-    SUBDOMAIN?: string;
-    NOTEBOOK_HOST?: string;
-    PHPSANDBOX_TYPE?: string;
-};
-type PhpSandboxOptions = {
-    /**
-     * Defaults to merging `.${NOTEBOOK_HOST}` and the derived public host into
-     * `server.allowedHosts`.
-     * - true: disable host checks entirely
-     * - array: merge with existing allowedHosts
-     */
-    allowedHosts?: true | string[];
-    /**
-     * Explicitly disable the plugin.
-     */
-    enabled?: boolean;
-    /**
-     * Defaults to 5173.
-     */
-    hmrPort?: number;
-    /**
-     * Defaults to `${SUBDOMAIN}-${port}.${NOTEBOOK_HOST}` when env values exist.
-     */
-    publicHost?: string;
-    /**
-     * Defaults to 443.
-     */
-    publicClientPort?: number;
-};
-declare function phpSandboxPlugin(options?: PhpSandboxOptions, env?: PhpSandboxEnv): Plugin;
+declare function phpSandboxPlugin(): Plugin;
 declare const phpSandbox: typeof phpSandboxPlugin;
 
-export { type PhpSandboxEnv, type PhpSandboxOptions, phpSandboxPlugin as default, phpSandbox, phpSandboxPlugin };
+export { phpSandboxPlugin as default, phpSandbox, phpSandboxPlugin };

package/dist/index.d.ts

@@ -1,36 +1,6 @@
 import { Plugin } from 'vite';
 
-type PhpSandboxEnv = {
-    SUBDOMAIN?: string;
-    NOTEBOOK_HOST?: string;
-    PHPSANDBOX_TYPE?: string;
-};
-type PhpSandboxOptions = {
-    /**
-     * Defaults to merging `.${NOTEBOOK_HOST}` and the derived public host into
-     * `server.allowedHosts`.
-     * - true: disable host checks entirely
-     * - array: merge with existing allowedHosts
-     */
-    allowedHosts?: true | string[];
-    /**
-     * Explicitly disable the plugin.
-     */
-    enabled?: boolean;
-    /**
-     * Defaults to 5173.
-     */
-    hmrPort?: number;
-    /**
-     * Defaults to `${SUBDOMAIN}-${port}.${NOTEBOOK_HOST}` when env values exist.
-     */
-    publicHost?: string;
-    /**
-     * Defaults to 443.
-     */
-    publicClientPort?: number;
-};
-declare function phpSandboxPlugin(options?: PhpSandboxOptions, env?: PhpSandboxEnv): Plugin;
+declare function phpSandboxPlugin(): Plugin;
 declare const phpSandbox: typeof phpSandboxPlugin;
 
-export { type PhpSandboxEnv, type PhpSandboxOptions, phpSandboxPlugin as default, phpSandbox, phpSandboxPlugin };
+export { phpSandboxPlugin as default, phpSandbox, phpSandboxPlugin };

package/dist/index.js

@@ -1,7 +1,7 @@
 // src/index.ts
 import http from "http";
-var DEFAULT_HMR_PORT = 5173;
-var DEFAULT_PUBLIC_CLIENT_PORT = 443;
+var HMR_PORT = 5173;
+var PUBLIC_CLIENT_PORT = 443;
 var GLOBAL_KEY = "__phpSandboxViteState__";
 function getGlobalState() {
   const g = globalThis;
@@ -16,30 +16,60 @@ function normalizeSandboxType(value) {
   const normalized = value?.trim().toLowerCase();
   return normalized ? normalized : void 0;
 }
-function resolveHmrPort(options) {
-  return options.hmrPort ?? DEFAULT_HMR_PORT;
-}
-function resolvePublicClientPort(options) {
-  return options.publicClientPort ?? DEFAULT_PUBLIC_CLIENT_PORT;
-}
-function resolvePublicHost(options, env, hmrPort) {
-  return options.publicHost ?? (env.SUBDOMAIN && env.NOTEBOOK_HOST ? `${env.SUBDOMAIN}-${hmrPort}.${env.NOTEBOOK_HOST}` : void 0);
+function resolvePublicHost(env) {
+  return env.SUBDOMAIN && env.NOTEBOOK_HOST ? `${env.SUBDOMAIN}-${HMR_PORT}.${env.NOTEBOOK_HOST}` : void 0;
 }
 function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
-function acquireServer(state, port) {
+function toListenError(error, port) {
+  const code = isRecord(error) ? error.code : void 0;
+  if (code === "EADDRINUSE") {
+    return new Error(
+      `[vite-plugin-phpsandbox] HMR port ${port} is already in use.`
+    );
+  }
+  const message = error instanceof Error ? error.message : String(error);
+  return new Error(
+    `[vite-plugin-phpsandbox] Failed to bind HMR server on 0.0.0.0:${port}: ${message}`
+  );
+}
+async function listen(server, port) {
+  await new Promise((resolve, reject) => {
+    const cleanup = () => {
+      server.off("error", onError);
+      server.off("listening", onListening);
+    };
+    const onError = (error) => {
+      cleanup();
+      reject(toListenError(error, port));
+    };
+    const onListening = () => {
+      cleanup();
+      resolve();
+    };
+    server.once("error", onError);
+    server.once("listening", onListening);
+    try {
+      server.listen(port, "0.0.0.0");
+    } catch (error) {
+      cleanup();
+      reject(toListenError(error, port));
+    }
+  });
+}
+function logServerError(error) {
+  console.error("[vite-plugin-phpsandbox] HMR server error:", error);
+}
+async function acquireServer(state, port) {
   const existing = state.servers.get(port);
   if (existing) {
     state.refs.set(port, (state.refs.get(port) ?? 0) + 1);
     return existing;
   }
   const server = http.createServer();
-  server.on("error", (error) => {
-    if (error.code === "EADDRINUSE") return;
-    console.error("[vite-plugin-phpsandbox] HMR server error:", error);
-  });
-  server.listen(port, "0.0.0.0");
+  await listen(server, port);
+  server.on("error", logServerError);
   state.servers.set(port, server);
   state.refs.set(port, 1);
   return server;
@@ -53,83 +83,161 @@ function releaseServer(state, port, server) {
   state.refs.delete(port);
   if (state.servers.get(port) !== server) return;
   state.servers.delete(port);
+  server.off("error", logServerError);
   if (server.listening) {
     server.close();
   }
 }
-function resolveAllowedHosts(existingAllowedHosts, optionAllowedHosts, notebookHost, publicHost) {
-  if (optionAllowedHosts === true || existingAllowedHosts === true) {
-    return true;
-  }
-  const merged = new Set(Array.isArray(existingAllowedHosts) ? existingAllowedHosts : []);
-  if (Array.isArray(optionAllowedHosts)) {
-    for (const host of optionAllowedHosts) {
-      merged.add(host);
-    }
-  }
-  if (notebookHost) {
-    merged.add(`.${notebookHost}`);
-  }
-  if (publicHost) {
-    merged.add(publicHost);
-  }
-  return merged.size > 0 ? Array.from(merged) : existingAllowedHosts;
+function resolveAllowedHosts(existingAllowedHosts, notebookHost, publicHost) {
+  if (existingAllowedHosts === true) return true;
+  const hosts = [
+    ...Array.isArray(existingAllowedHosts) ? existingAllowedHosts : [],
+    ...notebookHost ? [`.${notebookHost}`] : [],
+    ...publicHost ? [publicHost] : []
+  ];
+  return hosts.length > 0 ? Array.from(new Set(hosts)) : existingAllowedHosts;
+}
+function resolveExistingHmrOptions(serverOptions) {
+  return isRecord(serverOptions.hmr) ? serverOptions.hmr : void 0;
+}
+function resolveHmrOptions(existingServer, publicHost, hmrServer) {
+  if (existingServer.hmr === false) return false;
+  return {
+    ...resolveExistingHmrOptions(existingServer),
+    port: HMR_PORT,
+    ...hmrServer ? { server: hmrServer } : {},
+    ...publicHost ? {
+      protocol: "wss",
+      host: publicHost,
+      clientPort: PUBLIC_CLIENT_PORT
+    } : {}
+  };
 }
-function phpSandboxPlugin(options = {}, env = process.env) {
-  let managedHmrPort;
+function shouldCreateHmrServer(existingServer, isLaravel) {
+  return !isLaravel && existingServer.hmr !== false;
+}
+function resolveServerConfig(existingServer, env, isLaravel, publicHost, hmrServer) {
+  return {
+    ...existingServer,
+    host: existingServer.host ?? true,
+    ...isLaravel ? { port: HMR_PORT } : {},
+    hmr: resolveHmrOptions(existingServer, publicHost, hmrServer),
+    allowedHosts: resolveAllowedHosts(
+      existingServer.allowedHosts,
+      env.NOTEBOOK_HOST,
+      publicHost
+    )
+  };
+}
+function formatHost(host) {
+  if (host === true) return "0.0.0.0";
+  if (host === false || host === void 0) return "vite default";
+  return String(host);
+}
+function formatAllowedHosts(allowedHosts) {
+  if (allowedHosts === true) return "all";
+  if (Array.isArray(allowedHosts)) return allowedHosts.join(", ") || "none";
+  return "vite default";
+}
+function formatHmrEndpoint(hmr) {
+  if (!hmr || !hmr.host) return "none";
+  const protocol = hmr.protocol ?? "ws";
+  const port = hmr.clientPort ?? hmr.port;
+  return port ? `${protocol}://${hmr.host}:${port}` : `${protocol}://${hmr.host}`;
+}
+function formatHmrSummary(serverOptions, hasManagedServer) {
+  if (serverOptions.hmr === false) return "disabled";
+  const hmr = resolveExistingHmrOptions(serverOptions);
+  const localEndpoint = hasManagedServer ? `0.0.0.0:${HMR_PORT}` : `vite:${serverOptions.port ?? HMR_PORT}`;
+  return `${localEndpoint}, public=${formatHmrEndpoint(hmr)}`;
+}
+function formatStartupLog(sandboxType, serverOptions, hasManagedServer) {
+  return [
+    "[vite-plugin-phpsandbox] enabled",
+    `type=${sandboxType}`,
+    `host=${formatHost(serverOptions.host)}`,
+    `hmr=${formatHmrSummary(serverOptions, hasManagedServer)}`,
+    `allowedHosts=${formatAllowedHosts(serverOptions.allowedHosts)}`
+  ].join(" | ");
+}
+function phpSandboxPlugin() {
   let managedHmrServer;
+  let releaseManagedHmrServer;
+  let sandboxType;
+  let needsHmrServer = false;
+  let startupLog;
+  function setManagedHmrServer(server) {
+    if (managedHmrServer === server) return;
+    releaseManagedHmrServer?.();
+    managedHmrServer = server;
+    if (!server) {
+      releaseManagedHmrServer = void 0;
+      return;
+    }
+    let released = false;
+    releaseManagedHmrServer = () => {
+      if (released) return;
+      released = true;
+      if (managedHmrServer === server) {
+        managedHmrServer = void 0;
+        releaseManagedHmrServer = void 0;
+      }
+      releaseServer(getGlobalState(), HMR_PORT, server);
+    };
+  }
   return {
     name: "vite-plugin-phpsandbox",
     apply: "serve",
     enforce: "post",
     config(userConfig) {
-      if (options.enabled === false) return {};
-      const sandboxType = normalizeSandboxType(env.PHPSANDBOX_TYPE);
-      if (!sandboxType) return {};
-      const hmrPort = resolveHmrPort(options);
-      const publicClientPort = resolvePublicClientPort(options);
-      const publicHost = resolvePublicHost(options, env, hmrPort);
+      const env = process.env;
+      sandboxType = normalizeSandboxType(env.PHPSANDBOX_TYPE);
+      if (!sandboxType) {
+        needsHmrServer = false;
+        startupLog = void 0;
+        return {};
+      }
       const isLaravel = sandboxType === "laravel";
+      const publicHost = resolvePublicHost(env);
       const existingServer = userConfig.server ?? {};
-      const existingHmr = isRecord(existingServer.hmr) ? existingServer.hmr : void 0;
-      const hmrDisabled = existingServer.hmr === false;
-      const allowedHosts = resolveAllowedHosts(
-        existingServer.allowedHosts,
-        options.allowedHosts,
-        env.NOTEBOOK_HOST,
-        publicHost
-      );
-      const hmrServer = isLaravel || hmrDisabled ? void 0 : acquireServer(getGlobalState(), hmrPort);
-      managedHmrPort = hmrServer ? hmrPort : void 0;
-      managedHmrServer = hmrServer;
+      needsHmrServer = shouldCreateHmrServer(existingServer, isLaravel);
       return {
-        server: {
-          ...existingServer,
-          host: existingServer.host ?? true,
-          ...isLaravel ? { port: hmrPort } : {},
-          ...hmrDisabled ? { hmr: false } : {
-            hmr: {
-              ...existingHmr,
-              port: hmrPort,
-              ...hmrServer ? { server: hmrServer } : {},
-              ...publicHost ? {
-                protocol: "wss",
-                host: publicHost,
-                clientPort: publicClientPort
-              } : {}
-            }
-          },
-          allowedHosts
-        }
+        server: resolveServerConfig(
+          existingServer,
+          env,
+          isLaravel,
+          publicHost,
+          void 0
+        )
       };
     },
-    configureServer(server) {
-      if (!managedHmrServer || managedHmrPort === void 0) return;
-      const hmrPort = managedHmrPort;
-      const hmrServer = managedHmrServer;
-      server.httpServer?.once("close", () => {
-        releaseServer(getGlobalState(), hmrPort, hmrServer);
-      });
+    configResolved(config) {
+      if (!sandboxType) return;
+      const nextStartupLog = formatStartupLog(
+        sandboxType,
+        config.server,
+        needsHmrServer
+      );
+      if (nextStartupLog === startupLog) return;
+      startupLog = nextStartupLog;
+      console.info(nextStartupLog);
+    },
+    async configureServer(server) {
+      if (!sandboxType) return;
+      if (needsHmrServer) {
+        const hmrServer = managedHmrServer ?? await acquireServer(getGlobalState(), HMR_PORT);
+        setManagedHmrServer(hmrServer);
+        const hmrConfig = server.config.server.hmr;
+        if (isRecord(hmrConfig)) {
+          hmrConfig.server = hmrServer;
+        }
+      }
+      const release = releaseManagedHmrServer;
+      if (!release) return;
+      server.httpServer?.once("close", release);
+    },
+    closeBundle() {
+      releaseManagedHmrServer?.();
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-phpsandbox",
-  "version": "0.1.1",
+  "version": "0.3.0",
   "description": "Vite plugin for PHP sandbox environments that need stable HMR over public proxy hosts.",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -37,7 +37,7 @@
     "build": "tsup src/index.ts --format esm,cjs --dts",
     "check": "tsc --noEmit",
     "release:check": "npm run check && npm run build && npm pack --dry-run",
-    "release": "npm version patch && npm run release:check && npm publish",
+    "release": "npm version minor && npm run release:check && npm publish",
     "prepublishOnly": "npm run build && npm run check"
   },
   "devDependencies": {