litestar-vite-plugin 0.23.1 → 0.23.3

package/dist/js/index.js

@@ -8,6 +8,7 @@ import { checkBackendAvailability, loadLitestarMeta } from "./litestar-meta.js";
 import { readBridgeConfig } from "./shared/bridge-schema.js";
 import { DEBOUNCE_MS } from "./shared/constants.js";
 import { createLogger } from "./shared/logger.js";
+import { resolveLitestarPort } from "./shared/network.js";
 import { resolveDefaultSdkClientPlugin } from "./shared/typegen-core.js";
 import { createLitestarTypeGenPlugin } from "./shared/typegen-plugin.js";
 import { buildInputOptions, resolveUserBuildInput } from "./shared/vite-compat.js";
@@ -59,6 +60,9 @@ function normalizeAppUrl(appUrl, _fallbackPort) {
   }
   try {
     const url = new URL(appUrl);
+    if (url.hostname === "0.0.0.0" || url.hostname === "[::]") {
+      url.hostname = "localhost";
+    }
     const rebuilt = url.origin + (url.pathname === "/" ? "" : url.pathname) + (url.search ?? "") + (url.hash ?? "");
     return { url: rebuilt };
   } catch {
@@ -86,7 +90,8 @@ function resolveLitestarPlugin(pluginConfig) {
       const runtimeAssetUrl = normalizeAssetUrl(env.ASSET_URL || pluginConfig.assetUrl);
       const buildAssetUrl = pluginConfig.deployAssetUrl ?? runtimeAssetUrl;
       const serverConfig = command === "serve" ? resolveDevelopmentEnvironmentServerConfig(pluginConfig.detectTls) ?? resolveEnvironmentServerConfig(env) : void 0;
-      const effectiveAppUrl = env.APP_URL || pythonDefaults?.appUrl || void 0;
+      const effectiveAppUrl = normalizeAppUrl(env.APP_URL || pythonDefaults?.appUrl || void 0).url ?? void 0;
+      const proxyHmrClientPort = pythonDefaults?.proxyMode === "vite" ? resolveLitestarPort(pythonDefaults.litestarPort, effectiveAppUrl, process.env) : null;
       const withProxyErrorSilencer = (proxyConfig) => {
         if (!proxyConfig) return void 0;
         return Object.fromEntries(
@@ -118,7 +123,7 @@ function resolveLitestarPlugin(pluginConfig) {
       };
       const explicitServerOrigin = typeof userConfig.server?.origin === "string" && userConfig.server.origin.length > 0 ? userConfig.server.origin : void 0;
       const shouldForceDirectServerOrigin = explicitServerOrigin !== void 0 || pythonDefaults?.proxyMode === "direct";
-      const proxyOriginDefault = !explicitServerOrigin && pythonDefaults?.proxyMode === "vite" && pythonDefaults.appUrl ? pythonDefaults.appUrl : void 0;
+      const proxyOriginDefault = !explicitServerOrigin && pythonDefaults?.proxyMode === "vite" ? effectiveAppUrl : void 0;
       const devBase = pluginConfig.assetUrl.startsWith("/") ? pluginConfig.assetUrl : pluginConfig.assetUrl.replace(/\/+$/, "");
       ensureCommandShouldRunInEnvironment(command, env, mode);
       return {
@@ -139,6 +144,7 @@ function resolveLitestarPlugin(pluginConfig) {
           // Result: base="/static/" + path="vite-hmr" = "/static/vite-hmr"
           hmr: userConfig.server?.hmr === false ? false : {
             path: "vite-hmr",
+            ...proxyHmrClientPort ? { clientPort: proxyHmrClientPort } : {},
             ...serverConfig?.hmr ?? {},
             ...userConfig.server?.hmr === true ? {} : userConfig.server?.hmr
           },
@@ -243,10 +249,7 @@ function resolveLitestarPlugin(pluginConfig) {
         const address = server.httpServer?.address();
         const isAddressInfo = (x) => typeof x === "object";
         if (isAddressInfo(address)) {
-          const explicitServerOrigin = typeof userConfig.server?.origin === "string" && userConfig.server.origin.length > 0 ? userConfig.server.origin : void 0;
-          const configuredServerOrigin = typeof server.config.server.origin === "string" && server.config.server.origin.length > 0 && server.config.server.origin !== "__litestar_vite_placeholder__" ? server.config.server.origin : void 0;
-          const hotfileOrigin = configuredServerOrigin ?? explicitServerOrigin;
-          viteDevServerUrl = hotfileOrigin ? hotfileOrigin : resolveDevServerUrl(address, server.config, userConfig);
+          viteDevServerUrl = resolveDevServerUrl(address, server.config, userConfig);
           fs.mkdirSync(path.dirname(pluginConfig.hotFile), { recursive: true });
           fs.writeFileSync(pluginConfig.hotFile, viteDevServerUrl);
           setTimeout(async () => {
@@ -804,8 +807,8 @@ function resolveDevServerUrl(address, config, userConfig) {
   } else if (host === "::" || host === "[::]") {
     host = "[::1]";
   }
-  const configHmrClientPort = typeof config.server.hmr === "object" ? config.server.hmr.clientPort : null;
-  const port = configHmrClientPort ?? address.port;
+  const userHmrClientPort = typeof userConfig.server?.hmr === "object" ? userConfig.server.hmr.clientPort : null;
+  const port = userHmrClientPort ?? address.port;
   return `${protocol}://${host}:${port}`;
 }
 function isIpv6(address) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "litestar-vite-plugin",
-  "version": "0.23.1",
+  "version": "0.23.3",
   "type": "module",
   "description": "Litestar plugin for Vite.",
   "keywords": [