nuxt-gin-tools 0.2.13 → 0.2.15

package/README.md

@@ -88,6 +88,22 @@ Go 监听规则来自 `.go-watch.json`（见下文）。
 - `killPortBeforeDevelop`: 开发前是否释放端口（默认 `true`）
 - `cleanupBeforeDevelop`: 开发前是否执行 cleanup（默认 `false`）
 
+### 3) 开发环境向前端暴露 `ginPort`
+
+`createDefaultConfig` 会在 Nuxt `runtimeConfig.public` 中注入 `ginPort`：
+
+- 开发环境：`useRuntimeConfig().public.ginPort` 为 `server.config.json` 的 `ginPort`
+- 生产环境：`useRuntimeConfig().public.ginPort` 为 `null`
+- 所有环境：`useRuntimeConfig().public.isDevelopment` 直接暴露当前是否开发环境
+
+前端示例：
+
+```ts
+const config = useRuntimeConfig();
+const ginPort = config.public.ginPort;
+const isDevelopment = config.public.isDevelopment;
+```
+
 ### 2) `.go-watch.json`
 
 Go 监听配置文件，示例：
@@ -132,4 +148,3 @@ NUXT_GIN_WATCH_CONFIG=/path/to/.go-watch.json
 
 - Go 侧热更新已不再依赖 Air。
 - 当前方案为：`chokidar` 监听文件变化 + 重启 `go run main.go`。
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-gin-tools",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "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

@@ -1,5 +1,6 @@
 import type { NuxtConfig } from "nuxt/config";
-import type { IncomingMessage, ServerResponse } from "node:http";
+import { type IncomingMessage, type ServerResponse } from "node:http";
+import type { Socket } from "node:net";
 export interface ServerConfigJson {
     /** 前端基础 URL */
     baseUrl: string;
@@ -9,11 +10,6 @@ export interface ServerConfigJson {
     ginPort: number;
 }
 export interface MyNuxtConfig {
-    /**
-     * 开发期是否将访问 Nuxt 端口（baseUrl 下的页面请求）重定向到 Gin 端口。
-     * 默认 true。
-     */
-    redirectNuxtToGinInDev?: boolean;
     /** 服务器配置 */
     serverConfig: ServerConfigJson;
 }

package/src/nuxt-config.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDefaultConfig = createDefaultConfig;
+const node_http_1 = require("node:http");
+function isDevEnvironment() {
+    return process.env.NODE_ENV !== "production";
+}
 function normalizePathPrefix(value) {
     const withLeadingSlash = value.startsWith("/") ? value : `/${value}`;
     if (withLeadingSlash !== "/" && withLeadingSlash.endsWith("/")) {
@@ -23,11 +27,67 @@ function isBaseUrlRequest(baseUrl, requestPath) {
     }
     return requestPath === baseUrl || requestPath.startsWith(`${baseUrl}/`);
 }
+function forwardToGin(ginPort, req, res) {
+    var _a;
+    const proxyReq = (0, node_http_1.request)({
+        hostname: "127.0.0.1",
+        port: ginPort,
+        path: (_a = req.url) !== null && _a !== void 0 ? _a : "/",
+        method: req.method,
+        headers: Object.assign(Object.assign({}, req.headers), { host: `127.0.0.1:${ginPort}` }),
+    }, (proxyRes) => {
+        var _a;
+        res.writeHead((_a = proxyRes.statusCode) !== null && _a !== void 0 ? _a : 502, proxyRes.headers);
+        proxyRes.pipe(res);
+    });
+    proxyReq.on("error", (error) => {
+        const message = error instanceof Error ? error.message : String(error);
+        res.statusCode = 502;
+        res.setHeader("content-type", "application/json; charset=utf-8");
+        res.end(JSON.stringify({ error: "Bad Gateway", message }));
+    });
+    req.pipe(proxyReq);
+}
+function forwardWebSocketToGin(ginPort, req, clientSocket, clientHead) {
+    var _a, _b;
+    const proxyReq = (0, node_http_1.request)({
+        hostname: "127.0.0.1",
+        port: ginPort,
+        path: (_a = req.url) !== null && _a !== void 0 ? _a : "/",
+        method: (_b = req.method) !== null && _b !== void 0 ? _b : "GET",
+        headers: Object.assign(Object.assign({}, req.headers), { host: `127.0.0.1:${ginPort}`, connection: "Upgrade" }),
+    });
+    proxyReq.on("upgrade", (proxyRes, proxySocket, proxyHead) => {
+        var _a, _b;
+        const statusLine = `HTTP/1.1 ${(_a = proxyRes.statusCode) !== null && _a !== void 0 ? _a : 101} ${(_b = proxyRes.statusMessage) !== null && _b !== void 0 ? _b : "Switching Protocols"}\r\n`;
+        const headers = proxyRes.rawHeaders;
+        let headerText = "";
+        for (let i = 0; i < headers.length; i += 2) {
+            headerText += `${headers[i]}: ${headers[i + 1]}\r\n`;
+        }
+        clientSocket.write(`${statusLine}${headerText}\r\n`);
+        if (clientHead.length > 0) {
+            proxySocket.write(clientHead);
+        }
+        if (proxyHead.length > 0) {
+            clientSocket.write(proxyHead);
+        }
+        proxySocket.pipe(clientSocket).pipe(proxySocket);
+    });
+    proxyReq.on("error", () => {
+        if (!clientSocket.destroyed) {
+            clientSocket.destroy();
+        }
+    });
+    proxyReq.end();
+}
 /**
  * 创建默认的 Nuxt 配置。
  */
-function createDefaultConfig({ serverConfig, redirectNuxtToGinInDev = true, }) {
+function createDefaultConfig({ serverConfig, }) {
+    const development = isDevEnvironment();
     const baseUrl = normalizeBaseUrl(serverConfig.baseUrl);
+    const publicGinPort = development ? serverConfig.ginPort : null;
     return {
         buildDir: "vue/.nuxt",
         srcDir: "vue",
@@ -41,6 +101,14 @@ function createDefaultConfig({ serverConfig, redirectNuxtToGinInDev = true, }) {
             },
         },
         app: { baseURL: serverConfig.baseUrl },
+        runtimeConfig: {
+            public: {
+                // Frontend can read this via useRuntimeConfig().public.ginPort in dev.
+                ginPort: publicGinPort,
+                // Frontend can use this to branch dev/prod logic directly.
+                isDevelopment: development,
+            },
+        },
         devServer: {
             port: serverConfig.nuxtPort,
             cors: {
@@ -55,27 +123,28 @@ function createDefaultConfig({ serverConfig, redirectNuxtToGinInDev = true, }) {
             server: {},
             plugins: [
                 {
-                    name: "nuxt-gin-base-url-redirect",
+                    name: "nuxt-gin-base-url-proxy",
                     configureServer(server) {
                         server.middlewares.use((req, res, next) => {
-                            var _a, _b;
-                            const requestUrl = (_a = req.url) !== null && _a !== void 0 ? _a : "/";
-                            const requestPath = requestUrl.split("?")[0] || "/";
-                            const method = (_b = req.method) !== null && _b !== void 0 ? _b : "GET";
-                            const acceptsHtml = typeof req.headers.accept === "string" &&
-                                req.headers.accept.includes("text/html");
-                            if (redirectNuxtToGinInDev === true &&
-                                !isViteInternalRequest(requestPath) &&
-                                isBaseUrlRequest(baseUrl, requestPath) &&
-                                (method === "GET" || method === "HEAD") &&
-                                acceptsHtml) {
-                                res.statusCode = 307;
-                                res.setHeader("Location", `http://127.0.0.1:${serverConfig.ginPort}${requestUrl}`);
-                                res.end();
+                            var _a;
+                            const requestPath = ((_a = req.url) !== null && _a !== void 0 ? _a : "/").split("?")[0] || "/";
+                            const shouldForward = !isViteInternalRequest(requestPath) && !isBaseUrlRequest(baseUrl, requestPath);
+                            if (shouldForward) {
+                                forwardToGin(serverConfig.ginPort, req, res);
                                 return;
                             }
                             next();
                         });
+                        if (server.httpServer) {
+                            server.httpServer.on("upgrade", (req, socket, head) => {
+                                var _a;
+                                const requestPath = ((_a = req.url) !== null && _a !== void 0 ? _a : "/").split("?")[0] || "/";
+                                const shouldForward = !isViteInternalRequest(requestPath) && !isBaseUrlRequest(baseUrl, requestPath);
+                                if (shouldForward) {
+                                    forwardWebSocketToGin(serverConfig.ginPort, req, socket, head);
+                                }
+                            });
+                        }
                     },
                 },
             ],