nuxt-gin-tools 0.2.5 → 0.2.7

package/index.js

@@ -1,5 +1,38 @@
 #!/usr/bin/env node
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -8,7 +41,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // 导入构建和打包功能
 const pack_1 = __importDefault(require("./src/pack"));
 // 导入开发模式功能
-const develop_1 = __importDefault(require("./src/develop"));
+const develop_1 = __importStar(require("./src/develop"));
 // 导入API生成功能
 const api_generate_1 = __importDefault(require("./src/api-generate"));
 // 导入安装后处理功能
@@ -30,6 +63,14 @@ switch (args[0]) {
         // 启动开发模式
         (0, develop_1.default)();
         break;
+    case "dev:nuxt":
+        // 仅启动 Nuxt 开发模式
+        (0, develop_1.developNuxt)();
+        break;
+    case "dev:go":
+        // 仅启动 Go 开发模式
+        (0, develop_1.developGo)();
+        break;
     case "build":
         // 执行构建和打包操作
         (0, pack_1.default)();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-gin-tools",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "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/dev-go.js

@@ -23,6 +23,7 @@ const cwd = process.cwd();
 const RESTART_DEBOUNCE_MS = 150;
 const SHUTDOWN_TIMEOUT_MS = 2000;
 const LOG_TAG = "go-watch";
+const GO_WATCH_PREFIX = chalk_1.default.bgMagenta.white(`[${LOG_TAG}]`);
 const serverConfigPath = (0, path_1.join)(cwd, "server.config.json");
 const ginPort = getGinPort();
 function getGinPort() {
@@ -96,7 +97,7 @@ function loadWatchConfig() {
         parsedConfig = JSON.parse((0, fs_extra_1.readFileSync)(configPath, "utf-8"));
     }
     catch (_j) {
-        console.warn(chalk_1.default.green(`[${LOG_TAG}] invalid watch config JSON, fallback to defaults: ${configPath}`));
+        console.warn(`${GO_WATCH_PREFIX} invalid watch config JSON, fallback to defaults: ${configPath}`);
         return defaultConfig;
     }
     const includeExt = toStringArray((_a = parsedConfig.includeExt) !== null && _a !== void 0 ? _a : parsedConfig.include_ext)
@@ -183,7 +184,7 @@ function quote(arg) {
 function runGoProcess() {
     const command = `go run ${quote("main.go")}`;
     killGinPortIfNeeded();
-    console.log(chalk_1.default.green(`[${LOG_TAG}] start: ${command}`));
+    console.log(`${GO_WATCH_PREFIX} start: ${command}`);
     return (0, child_process_1.spawn)(command, {
         cwd,
         shell: true,
@@ -240,7 +241,7 @@ function startGoDev() {
         const watchRoots = watchConfig.includeDir.length
             ? watchConfig.includeDir.map((dir) => (0, path_1.join)(cwd, dir))
             : [cwd];
-        console.log(chalk_1.default.green(`[${LOG_TAG}] watching: ${watchRoots.map((item) => toProjectRelative(item)).join(", ")}`));
+        console.log(`${GO_WATCH_PREFIX} watching: ${watchRoots.map((item) => toProjectRelative(item)).join(", ")}`);
         let restarting = false;
         let goProc = runGoProcess();
         let restartTimer = null;
@@ -265,7 +266,7 @@ function startGoDev() {
                     return;
                 }
                 restarting = true;
-                console.log(chalk_1.default.green(`[${LOG_TAG}] ${eventName}: ${relPath}, restarting...`));
+                console.log(`${GO_WATCH_PREFIX} ${eventName}: ${relPath}, restarting...`);
                 yield stopGoProcess(goProc);
                 goProc = runGoProcess();
                 restarting = false;
@@ -276,7 +277,7 @@ function startGoDev() {
             .on("change", (filePath) => triggerRestart("change", filePath))
             .on("unlink", (filePath) => triggerRestart("unlink", filePath))
             .on("error", (error) => {
-            console.error(chalk_1.default.green(`[${LOG_TAG}] watcher error: ${String(error)}`));
+            console.error(`${GO_WATCH_PREFIX} watcher error: ${String(error)}`);
         });
         const shutdown = () => __awaiter(this, void 0, void 0, function* () {
             if (restartTimer) {
@@ -299,7 +300,7 @@ function startGoDev() {
 if (require.main === module) {
     // 兼容直接执行该文件（例如 node src/dev-go.js）。
     startGoDev().catch((error) => {
-        console.error(chalk_1.default.green(`[${LOG_TAG}] failed to start: ${String(error)}`));
+        console.error(`${GO_WATCH_PREFIX} failed to start: ${String(error)}`);
         process.exit(1);
     });
 }

package/src/develop.d.ts

@@ -6,4 +6,16 @@
  * @returns {Promise<void>} 仅在开发进程退出或出现异常时返回。
  */
 export declare function develop(): Promise<void>;
+/**
+ * 仅启动 Nuxt 开发服务（带 nuxt 标签输出）。
+ *
+ * @returns {Promise<void>} 仅在开发进程退出或出现异常时返回。
+ */
+export declare function developNuxt(): Promise<void>;
+/**
+ * 仅启动 Go 开发监听流程。
+ *
+ * @returns {Promise<void>} 仅在开发进程退出或出现异常时返回。
+ */
+export declare function developGo(): Promise<void>;
 export default develop;

package/src/develop.js

@@ -13,6 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.develop = develop;
+exports.developNuxt = developNuxt;
+exports.developGo = developGo;
 const concurrently_1 = __importDefault(require("concurrently"));
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -22,6 +24,37 @@ const dev_go_1 = require("./dev-go");
 const utils_1 = require("./utils");
 const cwd = process.cwd();
 const serverConfig = (0, fs_extra_1.readJSONSync)((0, path_1.join)(cwd, "server.config.json"));
+function prepareDevelop() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const cleanupBeforeDevelop = serverConfig.cleanupBeforeDevelop === true;
+        if (cleanupBeforeDevelop) {
+            yield (0, cleanup_1.default)();
+            yield (0, postinstall_1.default)();
+            return;
+        }
+        if (!(0, fs_extra_1.existsSync)((0, path_1.join)(cwd, "vue/.nuxt")) || !(0, fs_extra_1.existsSync)((0, path_1.join)(cwd, "go.sum"))) {
+            yield (0, cleanup_1.default)();
+            yield (0, postinstall_1.default)();
+        }
+    });
+}
+function runNuxtDev() {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield (0, concurrently_1.default)([
+            {
+                command: `npx nuxt dev --port=${serverConfig.nuxtPort} --host`,
+                name: "nuxt",
+                prefixColor: "blue",
+            },
+        ]).result;
+    });
+}
+function runGoDev() {
+    return __awaiter(this, void 0, void 0, function* () {
+        (0, fs_extra_1.ensureDirSync)((0, path_1.join)(cwd, ".build/.server"));
+        yield (0, dev_go_1.startGoDev)();
+    });
+}
 /**
  * 启动本地开发环境。
  *
@@ -31,35 +64,43 @@ const serverConfig = (0, fs_extra_1.readJSONSync)((0, path_1.join)(cwd, "server.
  */
 function develop() {
     return __awaiter(this, void 0, void 0, function* () {
-        const cleanupBeforeDevelop = serverConfig.cleanupBeforeDevelop === true;
         const killPortBeforeDevelop = serverConfig.killPortBeforeDevelop !== false;
-        // 如果配置为开发前清理，则直接执行清理和安装后处理
-        if (cleanupBeforeDevelop) {
-            yield (0, cleanup_1.default)();
-            yield (0, postinstall_1.default)();
-        }
-        else {
-            // 否则仅在关键依赖缺失时执行
-            if (!(0, fs_extra_1.existsSync)((0, path_1.join)(cwd, "vue/.nuxt")) || !(0, fs_extra_1.existsSync)((0, path_1.join)(cwd, "go.sum"))) {
-                yield (0, cleanup_1.default)();
-                yield (0, postinstall_1.default)();
-            }
-        }
+        yield prepareDevelop();
         // 在开发前确保占用端口被释放
         if (killPortBeforeDevelop) {
             (0, utils_1.killPorts)([serverConfig.ginPort, serverConfig.nuxtPort]);
         }
-        (0, fs_extra_1.ensureDirSync)((0, path_1.join)(cwd, ".build/.server"));
-        // Nuxt 保持在 concurrently 中运行，统一复用 nuxt 标签输出。
-        const nuxtTask = (0, concurrently_1.default)([
-            {
-                command: `npx nuxt dev --port=${serverConfig.nuxtPort} --host`,
-                name: "nuxt",
-                prefixColor: "blue",
-            },
-        ]).result;
-        // Go 侧直接调用本地 dev-go 逻辑，避免额外 shell 路径和引号问题。
-        yield Promise.all([(0, dev_go_1.startGoDev)(), nuxtTask]);
+        yield Promise.all([runGoDev(), runNuxtDev()]);
+    });
+}
+/**
+ * 仅启动 Nuxt 开发服务（带 nuxt 标签输出）。
+ *
+ * @returns {Promise<void>} 仅在开发进程退出或出现异常时返回。
+ */
+function developNuxt() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const killPortBeforeDevelop = serverConfig.killPortBeforeDevelop !== false;
+        yield prepareDevelop();
+        if (killPortBeforeDevelop) {
+            (0, utils_1.killPorts)([serverConfig.nuxtPort]);
+        }
+        yield runNuxtDev();
+    });
+}
+/**
+ * 仅启动 Go 开发监听流程。
+ *
+ * @returns {Promise<void>} 仅在开发进程退出或出现异常时返回。
+ */
+function developGo() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const killPortBeforeDevelop = serverConfig.killPortBeforeDevelop !== false;
+        yield prepareDevelop();
+        if (killPortBeforeDevelop) {
+            (0, utils_1.killPorts)([serverConfig.ginPort]);
+        }
+        yield runGoDev();
     });
 }
 exports.default = develop;

package/src/nuxt-config.js

@@ -30,13 +30,16 @@ function createDefaultConfig({ serverConfig, apiBasePath }) {
      * 例如，将 "https://example.com/api-go" 转换为 "/api-go"
      */
     const thisBasePath = apiBasePath.replace(/^https?:[/]{2}[^/]+/, "");
+    const normalizedProxyBasePath = thisBasePath.endsWith("/")
+        ? thisBasePath.slice(0, -1)
+        : thisBasePath;
     /**
      * 目标服务器的 URL
      * 格式为：http://localhost:ginPort/serverBasePath
      * 其中，ginPort 是从 serverConfig 中获取的 Gin 服务器的端口号
      * serverBasePath 是从 MyNuxtConfig 中获取的服务器基础路径
      */
-    const target = `http://localhost:${serverConfig.ginPort}${thisBasePath}`;
+    const target = `http://localhost:${serverConfig.ginPort}${normalizedProxyBasePath}`;
     return {
         buildDir: "vue/.nuxt", // 设置构建目录为 "vue/.nuxt"，表示 Nuxt 项目的构建输出将存放在该目录下
         srcDir: "vue", // 设置源代码目录为 "vue"，表示 Nuxt 项目的源代码将存放在该目录下
@@ -85,15 +88,26 @@ function createDefaultConfig({ serverConfig, apiBasePath }) {
             },
             devProxy: {
                 // 定义代理规则，将匹配 thisBasePath 的请求代理到目标服务器
-                [thisBasePath]: {
+                [normalizedProxyBasePath]: {
                     // 目标服务器的 URL
                     target: target,
                     // 是否改变请求的源，设置为 true 可以避免跨域问题
                     changeOrigin: true,
+                    // 启用 WebSocket 代理
+                    ws: true,
                 },
             },
         },
         vite: {
+            server: {
+                proxy: {
+                    [normalizedProxyBasePath]: {
+                        target,
+                        changeOrigin: true,
+                        ws: true,
+                    },
+                },
+            },
             // 配置 Vite 插件
             plugins: [],
             // 配置 esbuild 编译器的选项