whistle.mockbubu 2.1.5 → 2.2.0-beta.2

package/lib/uiServer/router/files/api-list-router.js

@@ -49,8 +49,7 @@ module.exports = (router) => {
    *       method: 'GET',
    *       status: 200,
    *       mock: true,
-   *       locked: false,
-   *       session: {...}  // 完整会话数据
+   *       locked: false
    *     }
    *   ],
    *   msg: '操作成功'

package/lib/uiServer/router/files/file-config-router.js

@@ -18,7 +18,7 @@ const {
   validateBoolean,
   validate,
 } = require('../../utils/validator')
-const { wrapRouteHandler } = require('../../utils/router-helpers')
+const { wrapRouteHandler, getFileIdByUrl } = require('../../utils/router-helpers')
 
 module.exports = (router) => {
   /**
@@ -115,4 +115,26 @@ module.exports = (router) => {
 
     ctx.body = createSuccessResponse(null, '更新成功')
   }, '更新锁定开关'))
+
+  /**
+   * 更新备注
+   *
+   * 请求体:
+   * { name: 'https://api.example.com/users', remark: '用户列表接口' }
+   */
+  router.post('/cgi-bin/mockbubu/update-api-remark', validate({
+    name: validateFilename,
+    remark: (val) => {
+      if (typeof val !== 'string') return 'remark 必须是字符串'
+      if (val.length > 200) return 'remark 不能超过 200 字'
+      return null
+    },
+  }), wrapRouteHandler(async (ctx) => {
+    const { name, remark } = ctx.request.body
+    const { fileId, currentGroupId, v3Storage } = await getFileIdByUrl(ctx, name)
+
+    await v3Storage.updateFile(currentGroupId, fileId, { remark })
+
+    ctx.body = createSuccessResponse(null, '更新成功')
+  }, '更新备注'))
 }

package/lib/uiServer/router/files/file-save-router.js

@@ -76,11 +76,46 @@ module.exports = (router) => {
 
       console.log(`${LOG_PREFIX.FILE_SAVE} 检查文件是否存在: ${filename}, 结果:`, existingFileEntry ? '已存在' : '不存在')
 
-      // 如果文件已存在（在索引中找到了）
+      // 如果索引中已有记录，验证物理文件是否真实存在
       if (existingFileEntry) {
-        console.log(`${LOG_PREFIX.FILE_SAVE} 文件已存在，跳过保存: ${filename}`)
-        ctx.body = createSuccessResponse({ success: true, skipped: true })
-        return
+        const existingFile = await v3Storage.getFile(currentGroupId, existingFileEntry.id)
+
+        if (existingFile) {
+          // 物理文件存在：同步更新 config 并返回文件信息（含 id）
+          console.log(`${LOG_PREFIX.FILE_SAVE} 文件已存在，同步 config 并返回文件信息: ${filename}`)
+          const configToSet = {
+            mock: config?.mock !== undefined ? config.mock : (existingFile.config?.mock || false),
+            locked: config?.locked !== undefined ? config.locked : (existingFile.config?.locked || false),
+            mockVersion: existingFile.config?.mockVersion || 'source',
+            mockTime: config?.mock ? Date.now() : (existingFile.config?.mockTime || null),
+          }
+          await groupManager.setGroupFileConfig(currentGroupId, filename, configToSet)
+
+          ctx.body = createSuccessResponse({
+            success: true,
+            skipped: true,
+            file: {
+              id: existingFileEntry.id,
+              url: filename,
+              method: existingFile.method || method,
+              status: existingFile.status || status,
+              date: existingFile.date || Date.now(),
+              ...configToSet,
+              rule: existingFile.rule || session.req?.rule || '',
+              pattern: existingFile.pattern || session.req?.pattern || '',
+              ruleValue: existingFile.ruleValue || 'pathname',
+              name: filename,
+            },
+          })
+          return
+        }
+
+        // 物理文件不存在（索引-物理文件不一致）：删除旧记录，重新创建
+        console.warn(`${LOG_PREFIX.FILE_SAVE} 索引-物理文件不一致，删除旧记录并重新创建: ${filename}`)
+        await v3Storage.updateIndex(currentGroupId, {
+          ...indexData,
+          files: indexData.files.filter(f => f.url !== filename),
+        })
       }
 
       // 生成新的文件ID

package/lib/uiServer/router/files/match-version-router.js

@@ -0,0 +1,178 @@
+/**
+ * 文件名: match-version-router.js
+ * 功能: 条件匹配规则路由（match_versions CRUD + 模式切换）
+ *
+ * 接口列表:
+ * - POST /cgi-bin/mockbubu/get-match-versions     获取匹配规则列表
+ * - POST /cgi-bin/mockbubu/add-match-version      新增匹配规则
+ * - POST /cgi-bin/mockbubu/update-match-version   更新规则条件和内容
+ * - POST /cgi-bin/mockbubu/update-match-version-meta  更新规则元信息（名称/描述）
+ * - POST /cgi-bin/mockbubu/delete-match-version   删除匹配规则
+ * - POST /cgi-bin/mockbubu/set-match-mode         切换匹配模式
+ */
+
+const { createSuccessResponse } = require('../../utils/util')
+const { wrapRouteHandler, validateRequiredParams, getFileIdByUrl } = require('../../utils/router-helpers')
+const { MATCH_MODE_VALUE } = require('../../../config/const')
+
+module.exports = (router) => {
+  // 获取匹配规则列表
+  router.post('/cgi-bin/mockbubu/get-match-versions', wrapRouteHandler(async (ctx) => {
+    const { groupManager } = ctx
+    const { url } = ctx.request.body || {}
+
+    validateRequiredParams({ url }, ['url'])
+
+    const currentGroupId = await groupManager.getCurrentGroupId()
+    const matchVersions = await groupManager.getMatchVersions(currentGroupId, url)
+
+    ctx.body = createSuccessResponse({ list: matchVersions }, '获取匹配规则列表成功')
+  }, '获取匹配规则列表'))
+
+  // 新增匹配规则
+  router.post('/cgi-bin/mockbubu/add-match-version', wrapRouteHandler(async (ctx) => {
+    const { groupManager } = ctx
+    const { url, name, description = '' } = ctx.request.body || {}
+
+    validateRequiredParams({ url, name }, ['url', 'name'])
+
+    const currentGroupId = await groupManager.getCurrentGroupId()
+
+    const newMatchVersion = await groupManager.createMatchVersion(currentGroupId, url, {
+      name,
+      description,
+      conditions: [], // 新规则默认空条件（兜底匹配）
+      content: {},
+      priority: 0,
+    })
+
+    ctx.body = createSuccessResponse(newMatchVersion, '匹配规则创建成功')
+  }, '新增匹配规则'))
+
+  // 更新规则（条件 + 内容）
+  router.post('/cgi-bin/mockbubu/update-match-version', wrapRouteHandler(async (ctx) => {
+    const { groupManager } = ctx
+    const { url, matchVersionId, conditions, content } = ctx.request.body || {}
+
+    validateRequiredParams({ url, matchVersionId }, ['url', 'matchVersionId'])
+
+    const currentGroupId = await groupManager.getCurrentGroupId()
+
+    const updates = {}
+    if (conditions !== undefined) updates.conditions = conditions
+    if (content !== undefined) updates.content = content
+
+    await groupManager.updateMatchVersion(currentGroupId, url, matchVersionId, updates)
+
+    ctx.body = createSuccessResponse(null, '匹配规则更新成功')
+  }, '更新匹配规则'))
+
+  // 更新规则元信息（名称 / 描述）
+  router.post('/cgi-bin/mockbubu/update-match-version-meta', wrapRouteHandler(async (ctx) => {
+    const { groupManager } = ctx
+    const { url, matchVersionId, name, description } = ctx.request.body || {}
+
+    validateRequiredParams({ url, matchVersionId }, ['url', 'matchVersionId'])
+
+    const currentGroupId = await groupManager.getCurrentGroupId()
+
+    const updates = {}
+    if (name !== undefined) updates.name = name
+    if (description !== undefined) updates.description = description
+
+    await groupManager.updateMatchVersion(currentGroupId, url, matchVersionId, updates)
+
+    ctx.body = createSuccessResponse(null, '规则信息更新成功')
+  }, '更新规则元信息'))
+
+  // 删除匹配规则
+  router.post('/cgi-bin/mockbubu/delete-match-version', wrapRouteHandler(async (ctx) => {
+    const { groupManager } = ctx
+    const { url, matchVersionId } = ctx.request.body || {}
+
+    validateRequiredParams({ url, matchVersionId }, ['url', 'matchVersionId'])
+
+    const currentGroupId = await groupManager.getCurrentGroupId()
+    const fileConfig = await groupManager.getGroupFileConfig(currentGroupId, url)
+
+    await groupManager.deleteMatchVersion(currentGroupId, url, matchVersionId)
+
+    // 如果删除的是条件匹配模式中的最后一条规则，自动切回版本直选模式
+    const remaining = await groupManager.getMatchVersions(currentGroupId, url)
+    if (remaining.length === 0 && fileConfig.mockVersion === MATCH_MODE_VALUE) {
+      const restoredVersion = fileConfig.prevMockVersion || null
+      fileConfig.mockVersion = restoredVersion
+      fileConfig.prevMockVersion = null
+      await groupManager.setGroupFileConfig(currentGroupId, url, fileConfig)
+    }
+
+    ctx.body = createSuccessResponse(null, '匹配规则删除成功')
+  }, '删除匹配规则'))
+
+  // 切换匹配模式（版本直选 ↔ 条件匹配）
+  router.post('/cgi-bin/mockbubu/set-match-mode', wrapRouteHandler(async (ctx) => {
+    const { storageAdapter, groupManager } = ctx
+    const { url, enable } = ctx.request.body || {}
+
+    validateRequiredParams({ url }, ['url'])
+
+    const currentGroupId = await groupManager.getCurrentGroupId()
+    const fileConfig = await groupManager.getGroupFileConfig(currentGroupId, url)
+
+    if (enable) {
+      // 启用条件匹配模式
+      const prevMockVersion = fileConfig.mockVersion !== MATCH_MODE_VALUE
+        ? fileConfig.mockVersion
+        : fileConfig.prevMockVersion
+
+      fileConfig.prevMockVersion = prevMockVersion || null
+      fileConfig.mockVersion = MATCH_MODE_VALUE
+
+      await groupManager.setGroupFileConfig(currentGroupId, url, fileConfig)
+
+      // 如果 match_versions 为空，自动创建默认规则（内容复制 source body）
+      const matchVersions = await groupManager.getMatchVersions(currentGroupId, url)
+      if (matchVersions.length === 0) {
+        // 获取 source body 作为默认内容
+        let defaultContent = {}
+        try {
+          const { fileId } = await getFileIdByUrl(ctx, url)
+          const v3Storage = storageAdapter.v3Storage
+          const fileData = await v3Storage.getFile(currentGroupId, fileId)
+          if (fileData && fileData.session && fileData.session.res && fileData.session.res.body) {
+            const bodyData = fileData.session.res.body
+            defaultContent = typeof bodyData === 'string' ? JSON.parse(bodyData) : bodyData
+          }
+        } catch (err) {
+          // 解析失败时使用空对象
+          defaultContent = {}
+        }
+
+        await groupManager.createMatchVersion(currentGroupId, url, {
+          name: '默认',
+          description: '兜底规则（空条件匹配所有请求）',
+          conditions: [],
+          content: defaultContent,
+          priority: 0,
+        })
+      }
+
+      const freshMatchVersions = await groupManager.getMatchVersions(currentGroupId, url)
+      ctx.body = createSuccessResponse({
+        prevMockVersion,
+        matchVersions: freshMatchVersions,
+      }, '已切换为条件匹配模式')
+    } else {
+      // 禁用条件匹配模式，恢复上次版本
+      const restoredVersion = fileConfig.prevMockVersion || null
+      fileConfig.mockVersion = restoredVersion
+      fileConfig.prevMockVersion = null
+
+      await groupManager.setGroupFileConfig(currentGroupId, url, fileConfig)
+
+      ctx.body = createSuccessResponse({
+        restoredMockVersion: restoredVersion,
+      }, '已切换为版本直选模式')
+    }
+  }, '切换匹配模式'))
+}

package/lib/uiServer/router/index.js

@@ -11,6 +11,7 @@ const fileCrudRouter = require('./files/file-crud-router')
 const fileConfigRouter = require('./files/file-config-router')
 const versionRouter = require('./files/version-router')
 const batchOperationsRouter = require('./files/batch-operations-router')
+const matchVersionRouter = require('./files/match-version-router')
 
 // groups/ - 组管理路由
 const groupRouter = require('./groups/group-router')
@@ -30,6 +31,7 @@ module.exports = (router, options) => {
   fileConfigRouter(router)
   versionRouter(router)
   batchOperationsRouter(router)
+  matchVersionRouter(router)
 
   // groups/ - 注册组管理路由
   groupRouter(router)

package/lib/uiServer/utils/util.js

@@ -107,7 +107,7 @@ const filterFileConfig = (fileConfig) => {
   return filtered
 }
 
-// 获取文件列表（包含完整 session 数据）
+// 获取文件列表（轻量元数据，不含 session）
 // 完全隔离架构：直接获取当前组的文件列表
 const getFullDataList = async (storageAdapter, groupManager, groupId) => {
   // 获取组的物理文件列表并合并配置
@@ -121,7 +121,9 @@ const getFullDataList = async (storageAdapter, groupManager, groupId) => {
   // 获取索引以查找真实的 fileId（只读取一次）
   const fileIndexData = await v3Storage.getIndex(groupId)
 
-  // ✅ 读取完整数据（包含 session）,支持 Payload/Headers 视图
+  // ✅ 读取文件元数据和配置（不含 session，按需通过 get-api-data 加载）
+  const brokenUrls = [] // 收集物理文件不存在的坏记录，最后批量从索引删除
+
   for (let idx = 0; idx < list.length; idx++) {
     const item = list[idx]
 
@@ -134,7 +136,14 @@ const getFullDataList = async (storageAdapter, groupManager, groupId) => {
       // 读取 file.json (包含 session 数据和配置)
       const fileData = await v3Storage.getFile(groupId, fileId)
 
-      // 返回完整数据（包含 config 配置字段 + session 数据）
+      // 物理文件丢失或损坏：收集后批量清理，避免单条异常导致整个列表接口崩溃
+      if (!fileData) {
+        console.warn(`[util] 物理文件不存在，标记清理: groupId=${groupId}, fileId=${fileId}`)
+        brokenUrls.push(item.name)
+        continue
+      }
+
+      // 返回轻量元数据（config 配置 + 索引信息）
       result.push({
         name: item.name,
         id: fileId,
@@ -150,17 +159,28 @@ const getFullDataList = async (storageAdapter, groupManager, groupId) => {
         rule: indexEntry.rule || '',
         ruleValue: indexEntry.ruleValue || 'pathname',
         pattern: indexEntry.pattern || '',
+        remark: fileData.remark || '',
         domain: indexEntry.domain || null,
         pathname: indexEntry.pathname || null,
         urlHash: indexEntry.urlHash || null,
         // ✅ 添加 captureTime 字段（与 api-list 保持一致）
         captureTime: indexEntry.createTime,
-        // ✅ 直接从 file.json 读取 session 数据
-        session: fileData.session || null,
       })
     }
   }
 
+  // 批量清理索引中物理文件不存在的坏记录（一次写入）
+  if (brokenUrls.length > 0) {
+    console.warn(`[util] 批量清理索引坏记录: ${brokenUrls.length} 条`, brokenUrls)
+    const cleanedIndex = {
+      ...fileIndexData,
+      files: fileIndexData.files.filter(f => !brokenUrls.includes(f.url)),
+    }
+    v3Storage.updateIndex(groupId, cleanedIndex).catch(err => {
+      console.error('[util] 清理索引坏记录失败:', err.message)
+    })
+  }
+
   return result
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whistle.mockbubu",
-  "version": "2.1.5",
+  "version": "2.2.0-beta.2",
   "description": "mock response data",
   "scripts": {
     "lint": "eslint . --ext .js",