nuxt-gin-tools 0.2.9 → 0.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-gin-tools",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "This project is used as a dependency for [nuxt-gin-starter](https://github.com/RapboyGao/nuxt-gin-starter.git)",
   "bin": {
     "nuxt-gin": "index.js"

package/src/nuxt-config.d.ts

@@ -19,12 +19,6 @@ export interface ServerConfigJson {
     ginPort: number;
 }
 export interface MyNuxtConfig {
-    /**
-     * 服务器基础路径
-     * 用于指定服务器端路由的基础路径
-     * 例如，如果服务器端路由为 /api，则 serverBasePath 为 /api
-     */
-    apiBasePath: string;
     /**
      * WebSocket 代理基础路径列表（可选）
      * 例如：["/ws-go", "/socket"]

package/src/nuxt-config.js

@@ -24,46 +24,18 @@ exports.createDefaultConfig = createDefaultConfig;
  * });
  * ```
  */
-function createDefaultConfig({ serverConfig, apiBasePath, wsProxyBasePaths = [], }) {
-    /**
-     * 处理基础路径，去除协议和域名部分，只保留路径部分
-     * 例如，将 "https://example.com/api-go" 转换为 "/api-go"
-     */
-    const thisBasePath = apiBasePath.replace(/^https?:[/]{2}[^/]+/, "");
-    const normalizedProxyBasePath = thisBasePath.endsWith("/")
-        ? thisBasePath.slice(0, -1)
-        : thisBasePath;
-    const normalizeBasePath = (rawPath) => {
-        const trimmed = rawPath.replace(/^https?:[/]{2}[^/]+/, "");
-        if (!trimmed)
-            return "/";
-        if (trimmed === "/")
-            return "/";
-        return trimmed.endsWith("/") ? trimmed.slice(0, -1) : trimmed;
-    };
-    const buildTarget = (basePath) => `http://localhost:${serverConfig.ginPort}${basePath}`;
-    /**
-     * 目标服务器的 URL
-     * 格式为：http://localhost:ginPort/serverBasePath
-     * 其中，ginPort 是从 serverConfig 中获取的 Gin 服务器的端口号
-     * serverBasePath 是从 MyNuxtConfig 中获取的服务器基础路径
-     */
-    const target = buildTarget(normalizedProxyBasePath);
-    const proxyEntries = {
-        [normalizedProxyBasePath]: {
-            target,
-            changeOrigin: true,
-            ws: true,
-        },
-    };
-    for (const rawPath of wsProxyBasePaths) {
-        const normalizedPath = normalizeBasePath(rawPath);
-        proxyEntries[normalizedPath] = {
-            target: buildTarget(normalizedPath),
-            changeOrigin: true,
-            ws: true,
-        };
-    }
+function createDefaultConfig({ serverConfig }) {
+    // Proxy target should point to backend origin only.
+    // The matched route prefix (e.g. /api-go/v1, /ws-go) is preserved by proxy itself.
+    // If target also appends basePath, final upstream path becomes duplicated and can
+    // break websocket upgrades with ECONNRESET.
+    const buildTarget = () => `http://127.0.0.1:${serverConfig.ginPort}`;
+    const normalizedBaseUrl = serverConfig.baseUrl.endsWith("/")
+        ? serverConfig.baseUrl.slice(0, -1)
+        : serverConfig.baseUrl;
+    const escapedBaseUrl = normalizedBaseUrl.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    // 匹配所有“不以 baseUrl 开头”的路径，例如 baseUrl=/vue 时会匹配 /api、/ws、/health 等。
+    const nonBaseUrlProxyPattern = `^/(?!${escapedBaseUrl.slice(1)}(?:/|$)).*`;
     return {
         buildDir: "vue/.nuxt", // 设置构建目录为 "vue/.nuxt"，表示 Nuxt 项目的构建输出将存放在该目录下
         srcDir: "vue", // 设置源代码目录为 "vue"，表示 Nuxt 项目的源代码将存放在该目录下
@@ -105,17 +77,15 @@ function createDefaultConfig({ serverConfig, apiBasePath, wsProxyBasePaths = [],
                 maxAge: "1728000",
             },
         },
-        nitro: {
-            output: {
-                // 设置输出目录为 "vue/.nuxt", 表示 Nitro 的构建输出
-                dir: "vue/.output",
-            },
-            // 定义代理规则，将匹配基础路径的请求代理到目标服务器
-            devProxy: proxyEntries,
-        },
         vite: {
             server: {
-                proxy: proxyEntries,
+                proxy: {
+                    [nonBaseUrlProxyPattern]: {
+                        target: buildTarget(),
+                        changeOrigin: true,
+                        ws: true,
+                    },
+                },
             },
             // 配置 Vite 插件
             plugins: [],