daodou-command 1.4.6 → 1.4.7

package/.idea/workspace.xml

@@ -63,7 +63,7 @@
       <option name="presentableId" value="Default" />
       <updated>1758879086844</updated>
       <workItem from="1758879088110" duration="1336000" />
-      <workItem from="1763003382850" duration="4466000" />
+      <workItem from="1763003382850" duration="5386000" />
     </task>
     <servers />
   </component>

package/CHANGELOG.md

@@ -6,11 +6,20 @@
 并且此项目遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
 
 
+## [1.4.7] - 2025-12-04
+
+### 修复
+- 修复 `dao build` 命令中 Cookie 过期问题
+  - 实现自动捕获和更新 Jenkins 返回的 `Set-Cookie`
+  - 优化 HTTP 请求拦截器，自动管理 Cookie
+  - 增强构建过程中 Session 的稳定性
+
 ## [1.4.6] - 2025-11-13
 
 ### 修复
 - 修复版本更新提示逻辑，当前版本已是最新版本时不再显示更新提示
 - 优化 `getUpdateReminder()` 函数，添加当前版本与最新版本的实时比较
+- 修正 Node.js 引擎版本要求为 `>=20.18.1`
 
 ## [1.4.5] - 2025-11-13
 

package/lib/commands/build.js

@@ -107,6 +107,40 @@ class BuildCommand {
       baseUrl: null,
       auth: null
     };
+
+    // 创建 axios 实例
+    this.axios = axios.create({
+      maxRedirects: 0,
+      validateStatus: s => s < 400 || s === 401 || s === 403 || s === 302
+    });
+
+    // 请求拦截器：自动添加 Cookie
+    this.axios.interceptors.request.use(config => {
+      const cookieString = this.browserAuth.getCookieString();
+      if (cookieString) {
+        config.headers.Cookie = cookieString;
+      }
+      // 确保有 User-Agent
+      if (!config.headers['User-Agent']) {
+        config.headers['User-Agent'] = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36';
+      }
+      return config;
+    });
+
+    // 响应拦截器：自动更新 Cookie
+    this.axios.interceptors.response.use(async response => {
+      const setCookie = response.headers['set-cookie'];
+      if (setCookie) {
+        await this.browserAuth.updateCookiesFromSetCookie(setCookie);
+      }
+      return response;
+    }, async error => {
+      // 即使是错误响应，也可能包含 set-cookie
+      if (error.response && error.response.headers && error.response.headers['set-cookie']) {
+        await this.browserAuth.updateCookiesFromSetCookie(error.response.headers['set-cookie']);
+      }
+      return Promise.reject(error);
+    });
   }
 
   async execute(options = {}) {
@@ -242,19 +276,10 @@ class BuildCommand {
   }
 
   async ensureJenkinsSession() {
-    // 先用当前 cookie 访问 Jenkins 首页，确认是否有效
-    const cookieString = this.browserAuth.cookies
-      ? this.browserAuth.cookies.map(c => `${c.name}=${c.value}`).join('; ')
-      : '';
     try {
-      const resp = await axios.get(this.jenkinsConfig.baseUrl, {
-        headers: {
-          Cookie: cookieString,
-          'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36'
-        },
-        maxRedirects: 0,
-        validateStatus: s => s < 400 || s === 401 || s === 403 || s === 302
-      });
+      // 使用拦截器自动带上 Cookie
+      const resp = await this.axios.get(this.jenkinsConfig.baseUrl);
+      
       // 302 跳转到登录页、401/403 都视为未登录
       if (resp.status === 401 || resp.status === 403) throw new Error('未登录');
       if (resp.status === 302 && resp.headers.location && resp.headers.location.includes('casdoor')) throw new Error('未登录');
@@ -286,11 +311,10 @@ class BuildCommand {
   async triggerBuild(jobName, params) {
     try {
       const url = `${this.jenkinsConfig.baseUrl}job/${encodeURIComponent(jobName)}/buildWithParameters`;
-      let headers = { ...this.jenkinsConfig.auth.headers };
+      let headers = {};
       // 1. 获取 crumb（防止 403）
       try {
-        const crumbResp = await axios.get(`${this.jenkinsConfig.baseUrl}crumbIssuer/api/json`, {
-          headers,
+        const crumbResp = await this.axios.get(`${this.jenkinsConfig.baseUrl}crumbIssuer/api/json`, {
           timeout: 10000
         });
         const { crumb, crumbRequestField } = crumbResp.data;
@@ -299,7 +323,7 @@ class BuildCommand {
         // 如果 crumb 获取失败，继续尝试（部分 Jenkins 关闭了 CSRF 防护）
       }
       // 2. 触发构建
-      const response = await axios.post(url, null, {
+      const response = await this.axios.post(url, null, {
         headers,
         params: params,
         timeout: 30000
@@ -328,8 +352,7 @@ class BuildCommand {
     let count = 0;
     while (!buildNumber && count < 60) { // 最多等2分钟
       try {
-        const response = await axios.get(`${this.jenkinsConfig.baseUrl}queue/item/${queueId}/api/json`, {
-          ...this.jenkinsConfig.auth,
+        const response = await this.axios.get(`${this.jenkinsConfig.baseUrl}queue/item/${queueId}/api/json`, {
           timeout: 10000
         });
         const item = response.data;
@@ -363,8 +386,7 @@ class BuildCommand {
     let lastLogTime = 0;
     while (building) {
       try {
-        const response = await axios.get(`${this.jenkinsConfig.baseUrl}job/${encodeURIComponent(jobName)}/${buildNumber}/api/json`, {
-          ...this.jenkinsConfig.auth,
+        const response = await this.axios.get(`${this.jenkinsConfig.baseUrl}job/${encodeURIComponent(jobName)}/${buildNumber}/api/json`, {
           timeout: 10000
         });
         const buildInfo = response.data;
@@ -378,8 +400,7 @@ class BuildCommand {
         const now = Date.now();
         if (now - lastLogTime > 2900) {
           try {
-            const logResponse = await axios.get(`${this.jenkinsConfig.baseUrl}job/${encodeURIComponent(jobName)}/${buildNumber}/consoleText`, {
-              ...this.jenkinsConfig.auth,
+            const logResponse = await this.axios.get(`${this.jenkinsConfig.baseUrl}job/${encodeURIComponent(jobName)}/${buildNumber}/consoleText`, {
               timeout: 10000
             });
             const log = logResponse.data;

package/lib/utils/browser.js

@@ -109,8 +109,53 @@ class BrowserAuth {
   }
 
   /**
-   * 确保已登录并有可用 cookies
+   * 从 set-cookie 更新 cookies
+   * @param {Array<string>} setCookies 响应头中的 set-cookie 数组
    */
+  async updateCookiesFromSetCookie(setCookies) {
+    if (!setCookies || !Array.isArray(setCookies)) return;
+
+    if (!this.cookies) this.cookies = [];
+
+    let changed = false;
+    setCookies.forEach(str => {
+      // 简单解析：取第一个分号前的部分作为 name=value
+      const firstPart = str.split(';')[0];
+      const [name, ...valueParts] = firstPart.split('=');
+      const value = valueParts.join('=');
+      
+      if (name && value) {
+        const index = this.cookies.findIndex(c => c.name === name);
+        if (index !== -1) {
+          if (this.cookies[index].value !== value) {
+            this.cookies[index].value = value;
+            changed = true;
+          }
+        } else {
+          this.cookies.push({
+            name,
+            value,
+            domain: new URL(this.jenkinsUrl).hostname,
+            path: '/'
+          });
+          changed = true;
+        }
+      }
+    });
+
+    if (changed) {
+      await this.saveCookies();
+    }
+  }
+
+  /**
+   * 获取 Cookie 字符串
+   */
+  getCookieString() {
+    if (!this.cookies) return '';
+    return this.cookies.map(c => `${c.name}=${c.value}`).join('; ');
+  }
+
   async ensureLogin() {
     if (this.loadCookies()) {
       console.log(chalk.green('✅ 已加载保存的cookies'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "daodou-command",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "description": "刀豆命令行工具 - 自动化构建和部署",
   "main": "index.js",
   "bin": {