whistle.mockbubu 1.0.0-dev.4 → 2.0.0-beta.0

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

@@ -1,126 +1,271 @@
-const {
-  addNewVersion,
-  updateVersionContent,
-  deleteVersion,
-  updateVersionName,
-  getVersions,
-  setProperty,
-  getPropertyAttr,
-  removePropertyAttr,
-} = require('../../utils')
 const { createErrorResponse, createSuccessResponse } = require('../util')
+const {
+  validateFilename,
+  validateVersionName,
+  validateMockData,
+  validate,
+} = require('../validator')
 
 
 module.exports = (router) => {
   // 新增版本
-  router.post('/cgi-bin/mockbubu/add-new-version', (ctx) => {
+  router.post('/cgi-bin/mockbubu/add-new-version', validate({
+    name: validateFilename,
+    versionName: validateVersionName,
+    content: validateMockData,
+  }), async (ctx) => {
     try {
-      const { localStorage } = ctx.req
-      const { versionName, content = {}, name } = ctx.request.body || {}
+      const { groupManager, storageAdapter } = ctx
+      const { versionName, content = {}, name, description = '' } = ctx.request.body || {}
+
+      // 获取当前组ID
+      const currentGroupId = await groupManager.getCurrentGroupId()
+
+      // 使用 V3 Storage 从索引查找文件ID
+      const v3Storage = storageAdapter.v3Storage
+      const index = await v3Storage.getIndex(currentGroupId)
+      const fileEntry = index.files.find(f => f.url === name)
+      if (!fileEntry) {
+        throw new Error('文件不存在')
+      }
 
-      addNewVersion({
-        storage: localStorage,
-        filename: name,
-        versionName,
+      // 使用 V3 Storage 创建版本
+      const newVersion = await v3Storage.createVersion(currentGroupId, fileEntry.id, versionName, {
         content,
+        description,
       })
 
-      ctx.body = createSuccessResponse({
-        filename: versionName,
-        content,
-      }, '版本创建成功')
+      ctx.body = createSuccessResponse(newVersion, '版本创建成功')
     } catch (error) {
+      console.error('[mockbubu 2025/11/19 21:30:00] 创建版本失败:', error.message)
       ctx.body = createErrorResponse(error.message)
     }
   })
 
   // 删除版本
-  router.post('/cgi-bin/mockbubu/delete-version', (ctx) => {
+  router.post('/cgi-bin/mockbubu/delete-version', validate({
+    name: validateFilename,
+  }), async (ctx) => {
     try {
-      const { localStorage } = ctx.req
-      const { versionName, name } = ctx.request.body || {}
+      const { groupManager, storageAdapter } = ctx
+      const { versionId, name } = ctx.request.body || {}
+
+      if (!versionId) {
+        throw new Error('缺少版本ID参数')
+      }
 
-      const mockVersion = getPropertyAttr(localStorage, name, 'mockVersion')
+      // 获取当前组ID
+      const currentGroupId = await groupManager.getCurrentGroupId()
 
-      // 如果删除的是当前mock版本，则清除mock版本设置
-      if (versionName === mockVersion) {
-        removePropertyAttr(localStorage, name, 'mockVersion')
+      // 使用 V3 Storage 从索引查找文件ID
+      const v3Storage = storageAdapter.v3Storage
+      const index = await v3Storage.getIndex(currentGroupId)
+      const fileEntry = index.files.find(f => f.url === name)
+      if (!fileEntry) {
+        throw new Error('文件不存在')
       }
 
-      deleteVersion({
-        storage: localStorage,
-        filename: name,
-        versionName,
-      })
+      // 获取组文件配置(检查是否是当前mock版本)
+      const groupConfig = await groupManager.getGroupFileConfig(currentGroupId, name)
+
+      // 如果删除的是当前mock版本,先获取版本name进行比较
+      const version = await v3Storage.getVersionById(currentGroupId, fileEntry.id, versionId)
+
+      if (version && version.name === groupConfig.mockVersion) {
+        // 清除mock版本设置
+        groupConfig.mockVersion = null
+        await groupManager.setGroupFileConfig(currentGroupId, name, groupConfig)
+      }
+
+      // 使用 V3 Storage 删除版本
+      await v3Storage.deleteVersion(currentGroupId, fileEntry.id, versionId)
 
       ctx.body = createSuccessResponse(null, '版本删除成功')
     } catch (error) {
+      console.error('[mockbubu 2025/11/19 21:30:00] 删除版本失败:', error.message)
       ctx.body = createErrorResponse(error.message)
     }
   })
 
   // 更新版本内容
-  router.post('/cgi-bin/mockbubu/update-version-content', (ctx) => {
+  router.post('/cgi-bin/mockbubu/update-version-content', validate({
+    name: validateFilename,
+    content: validateMockData,
+  }), async (ctx) => {
     try {
-      const { localStorage } = ctx.req
-      const { versionName, content, name } = ctx.request.body || {}
+      const { groupManager, storageAdapter } = ctx
+      const { versionId, content, name } = ctx.request.body || {}
+
+      if (!versionId) {
+        throw new Error('缺少版本ID参数')
+      }
+
+      // 获取当前组ID
+      const currentGroupId = await groupManager.getCurrentGroupId()
 
-      updateVersionContent({
-        storage: localStorage,
-        filename: name,
-        versionName,
+      // 使用 V3 Storage 从索引查找文件ID
+      const v3Storage = storageAdapter.v3Storage
+      const index = await v3Storage.getIndex(currentGroupId)
+      const fileEntry = index.files.find(f => f.url === name)
+      if (!fileEntry) {
+        throw new Error('文件不存在')
+      }
+
+      // 使用 V3 Storage 更新版本
+      await v3Storage.updateVersion(currentGroupId, fileEntry.id, versionId, {
         content,
       })
 
       ctx.body = createSuccessResponse(null, '版本内容更新成功')
     } catch (error) {
+      console.error('[mockbubu 2025/11/19 21:30:00] 更新版本内容失败:', error.message)
       ctx.body = createErrorResponse(error.message)
     }
   })
 
-  // 更新版本名称
-  router.post('/cgi-bin/mockbubu/update-version-name', (ctx) => {
+  // 获取版本列表
+  router.post('/cgi-bin/mockbubu/get-versions', validate({
+    name: validateFilename,
+  }), async (ctx) => {
     try {
-      const { localStorage } = ctx.req
-      const { versionName, name, newVersion } = ctx.request.body || {}
+      const { groupManager, storageAdapter } = ctx
+      const { name } = ctx.request.body || {}
 
-      updateVersionName({
-        storage: localStorage,
-        filename: name,
-        versionName,
-        newVersion,
-      })
+      // 获取当前组ID
+      const currentGroupId = await groupManager.getCurrentGroupId()
 
-      ctx.body = createSuccessResponse(null, '版本名称更新成功')
+      // 使用 V3 Storage 从索引查找文件ID
+      const v3Storage = storageAdapter.v3Storage
+      const index = await v3Storage.getIndex(currentGroupId)
+      const fileEntry = index.files.find(f => f.url === name)
+      if (!fileEntry) {
+        throw new Error('文件不存在')
+      }
+
+      // 使用 V3 Storage 获取版本列表
+      const versions = await v3Storage.listVersions(currentGroupId, fileEntry.id)
+
+      ctx.body = createSuccessResponse(versions, '获取版本列表成功')
     } catch (error) {
+      console.error('[mockbubu 2025/11/19 21:30:00] 获取版本列表失败:', error.message)
       ctx.body = createErrorResponse(error.message)
     }
   })
 
-  // 获取版本列表
-  router.post('/cgi-bin/mockbubu/get-versions', (ctx) => {
+  // 设置mock的版本
+  router.post('/cgi-bin/mockbubu/set-mock-version', validate({
+    name: validateFilename,
+  }), async (ctx) => {
     try {
-      const { localStorage } = ctx.req
-      const { name } = ctx.request.body || {}
+      const { groupManager } = ctx
+      const { name, versionName } = ctx.request.body || {}
 
-      const list = getVersions({ storage: localStorage, filename: name }) || []
+      // 获取当前组ID和配置
+      const currentGroupId = await groupManager.getCurrentGroupId()
+      const groupConfig = await groupManager.getGroupFileConfig(currentGroupId, name)
 
-      ctx.body = createSuccessResponse(list, '获取版本列表成功')
+      // 更新 mockVersion (使用版本name,不是ID)
+      groupConfig.mockVersion = versionName || null
+      await groupManager.setGroupFileConfig(currentGroupId, name, groupConfig)
+
+      ctx.body = createSuccessResponse(null, 'Mock版本设置成功')
     } catch (error) {
+      console.error('[mockbubu 2025/11/19 21:30:00] 设置Mock版本失败:', error.message)
       ctx.body = createErrorResponse(error.message)
     }
   })
 
-  // 设置mock的版本
-  router.post('/cgi-bin/mockbubu/set-mock-version', (ctx) => {
+  // 更新版本元信息（名称和描述）
+  router.post('/cgi-bin/mockbubu/update-version-meta', validate({
+    name: validateFilename,
+    newVersionName: validateVersionName,
+  }), async (ctx) => {
     try {
-      const { localStorage } = ctx.req
-      const { name, versionName } = ctx.request.body || {}
+      const { groupManager, storageAdapter } = ctx
+      const { name, versionId, newVersionName, description = '' } = ctx.request.body || {}
 
-      setProperty(localStorage, name, { mockVersion: versionName })
+      if (!versionId) {
+        throw new Error('缺少版本ID参数')
+      }
 
-      ctx.body = createSuccessResponse(null, 'Mock版本设置成功')
+      // 获取当前组ID
+      const currentGroupId = await groupManager.getCurrentGroupId()
+
+      // 使用 V3 Storage 从索引查找文件ID
+      const v3Storage = storageAdapter.v3Storage
+      const index = await v3Storage.getIndex(currentGroupId)
+      const fileEntry = index.files.find(f => f.url === name)
+      if (!fileEntry) {
+        throw new Error('文件不存在')
+      }
+
+      // 使用 V3 Storage 更新版本元信息
+      const oldVersion = await v3Storage.getVersionById(currentGroupId, fileEntry.id, versionId)
+      if (!oldVersion) {
+        throw new Error('版本不存在')
+      }
+
+      await v3Storage.updateVersion(currentGroupId, fileEntry.id, versionId, {
+        name: newVersionName,
+        description,
+      })
+
+      // 如果更新的是当前mock版本的名称,需要同步更新 mockVersion
+      const groupConfig = await groupManager.getGroupFileConfig(currentGroupId, name)
+      if (oldVersion.name === groupConfig.mockVersion && oldVersion.name !== newVersionName) {
+        groupConfig.mockVersion = newVersionName
+        await groupManager.setGroupFileConfig(currentGroupId, name, groupConfig)
+      }
+
+      ctx.body = createSuccessResponse(null, '版本信息更新成功')
+    } catch (error) {
+      console.error('[mockbubu 2025/11/19 21:30:00] 更新版本元信息失败:', error.message)
+      ctx.body = createErrorResponse(error.message)
+    }
+  })
+
+  // 兼容旧路由：更新版本名称（已废弃）
+  router.post('/cgi-bin/mockbubu/update-version-name', validate({
+    name: validateFilename,
+    versionName: validateVersionName,
+    newVersion: validateVersionName,
+  }), async (ctx) => {
+    try {
+      const { groupManager, storageAdapter } = ctx
+      const { versionName, name, newVersion } = ctx.request.body || {}
+
+      // 获取当前组ID
+      const currentGroupId = await groupManager.getCurrentGroupId()
+
+      // 使用 V3 Storage 从索引查找文件ID
+      const v3Storage = storageAdapter.v3Storage
+      const index = await v3Storage.getIndex(currentGroupId)
+      const fileEntry = index.files.find(f => f.url === name)
+      if (!fileEntry) {
+        throw new Error('文件不存在')
+      }
+
+      // 使用 V3 Storage 通过名称找到版本ID
+      const version = await v3Storage.getVersionByName(currentGroupId, fileEntry.id, versionName)
+      if (!version) {
+        throw new Error('版本不存在')
+      }
+
+      // 更新版本名称
+      await v3Storage.updateVersion(currentGroupId, fileEntry.id, version.id, {
+        name: newVersion,
+      })
+
+      // 如果更新的是当前mock版本,需要更新mockVersion属性
+      const groupConfig = await groupManager.getGroupFileConfig(currentGroupId, name)
+      if (versionName === groupConfig.mockVersion && versionName !== newVersion) {
+        groupConfig.mockVersion = newVersion
+        await groupManager.setGroupFileConfig(currentGroupId, name, groupConfig)
+      }
+
+      ctx.body = createSuccessResponse(null, '版本名称更新成功')
     } catch (error) {
+      console.error('[mockbubu 2025/11/19 21:30:00] 更新版本名称失败:', error.message)
       ctx.body = createErrorResponse(error.message)
     }
   })

package/lib/uiServer/util.js

@@ -1,8 +1,7 @@
 const {
-  getApiList,
-  getProperty,
+  getGroupFileList,
 } = require('../utils')
-const { RangeFilterMap, RuleFilterMap, LockedFilterMap } = require('../const')
+const { RangeFilterMap, RuleFilterMap, LockedFilterMap, MethodFilterMap, StatusFilterMap } = require('../const')
 
 // 统一错误响应格式
 const createErrorResponse = (message, code = 500) => ({
@@ -14,7 +13,7 @@ const createErrorResponse = (message, code = 500) => ({
 const createSuccessResponse = (data = null, message = '操作成功') => ({
   code: 200,
   msg: message,
-  ...(data && { data }),
+  ...(data !== null && data !== undefined && { data }),
 })
 
 // 执行筛选
@@ -33,6 +32,13 @@ const execFilter = (result, filter) => {
       return item[key] === value
     case 'unequal':
       return item[key] !== value
+    case 'range':
+      // 范围筛选，value 是 [min, max] 数组
+      if (Array.isArray(value) && value.length === 2) {
+        const itemValue = item[key]
+        return itemValue >= value[0] && itemValue <= value[1]
+      }
+      break
     }
 
     return true
@@ -46,7 +52,7 @@ const handleFilterList = (list, filterOptions) => {
   if (!Array.isArray(list) || !filterOptions) return []
 
   const filters = []
-  const { name, rule, range, ruleValue, locked } = filterOptions
+  const { name, rule, range, ruleValue, locked, method, status } = filterOptions
   if (name) {
     filters.push({
       key: 'name',
@@ -69,6 +75,10 @@ const handleFilterList = (list, filterOptions) => {
   RuleFilterMap[ruleValue] && filters.push(RuleFilterMap[ruleValue])
   // 锁定筛选
   LockedFilterMap[locked] && filters.push(LockedFilterMap[locked])
+  // HTTP Method 筛选
+  MethodFilterMap[method] && filters.push(MethodFilterMap[method])
+  // 状态码筛选
+  StatusFilterMap[status] && filters.push(StatusFilterMap[status])
 
   // 执行筛选
   const filteredList = filters.reduce((result, filter) => {
@@ -78,22 +88,70 @@ const handleFilterList = (list, filterOptions) => {
   return filteredList
 }
 
-// 获取文件列表（包含文件属性数据）
-const getFullDataList = (localStorage) => {
-  // 获取接口列表
-  const list = getApiList(localStorage) || []
-
-  // 合并属性数据
-  list.forEach((item) => {
-    const props = getProperty(localStorage, item.name) || {}
-    delete item.data
-    Object.assign(item, props)
+/**
+ * 过滤组配置,只保留组级别的字段
+ * 移除全局元数据字段 (query, payload, method, rule, status, pattern, ruleValue, url, date)
+ * 移除版本字段 (version.*, versionMeta.*) - 版本通过单独的 versions 数组导出
+ */
+const filterGroupConfig = (groupConfig) => {
+  if (!groupConfig) return {}
+  // 保留基础配置 + 元数据字段
+  // 元数据字段（url, method, date, status等）对于文件列表显示是必需的
+  const validKeys = ['mock', 'locked', 'mockVersion', 'mockTime', 'url', 'method', 'date', 'status', 'rule', 'ruleValue']
+  const filtered = {}
+
+  Object.keys(groupConfig).forEach(key => {
+    // 仅保留基础配置字段和元数据字段
+    if (validKeys.includes(key)) {
+      filtered[key] = groupConfig[key]
+    }
+    // 版本字段通过 versions 数组单独导出，不在 groupConfig 中保留
   })
-  return list
+
+  return filtered
+}
+
+// 获取文件列表（包含文件属性数据）
+// 完全隔离架构：直接获取当前组的文件列表
+const getFullDataList = async (storageAdapter, groupManager, groupId) => {
+  // 获取组的物理文件列表并合并配置
+  const list = await getGroupFileList(storageAdapter, groupId) || []
+  const result = []
+  const v3Storage = storageAdapter.getV3Storage()
+
+  // ⚠️ 强制刷新索引缓存
+  v3Storage.invalidateIndex(groupId)
+
+  // 获取索引以查找真实的 fileId
+  const index = await v3Storage.getIndex(groupId)
+
+  for (let idx = 0; idx < list.length; idx++) {
+    const item = list[idx]
+    const config = await groupManager.getGroupFileConfig(groupId, item.name)
+
+    if (config && config.url) {
+      // 从索引查找真实的 fileId（而不是生成）
+      const indexEntry = index.files.find(f => f.url === item.name)
+      const fileId = indexEntry ? indexEntry.id : null
+
+      result.push({
+        name: item.name,
+        id: fileId, // 添加 fileId 字段
+        ...config,
+        // ✨ Phase 3.1: 从索引获取增强字段
+        domain: indexEntry?.domain || null,
+        pathname: indexEntry?.pathname || null,
+        urlHash: indexEntry?.urlHash || null,
+      })
+    }
+  }
+
+  return result
 }
 
 exports.createErrorResponse = createErrorResponse
 exports.createSuccessResponse = createSuccessResponse
 exports.execFilter = execFilter
 exports.handleFilterList = handleFilterList
+exports.filterGroupConfig = filterGroupConfig
 exports.getFullDataList = getFullDataList

package/lib/uiServer/validator.js

@@ -0,0 +1,105 @@
+/**
+ * 参数验证工具
+ */
+
+// 验证文件名
+const validateFilename = (name) => {
+  if (!name || typeof name !== 'string') {
+    return '文件名不能为空'
+  }
+  if (name.length > 2048) {
+    return '文件名长度不能超过 2048 字符'
+  }
+  return null
+}
+
+// 验证版本名
+const validateVersionName = (versionName) => {
+  if (!versionName || typeof versionName !== 'string') {
+    return '版本名不能为空'
+  }
+  if (versionName.length > 20) {
+    return '版本名长度不能超过 20 字符'
+  }
+  // 不允许可能导致存储问题的特殊字符
+  // 允许: 中文、字母、数字、下划线、连字符、空格
+  // 不允许: / \ : * ? " < > | 等文件系统保留字符
+  // eslint-disable-next-line no-useless-escape
+  if (/[\/\\:*?"<>|]/.test(versionName)) {
+    return '版本名不能包含特殊字符 / \\ : * ? " < > |'
+  }
+  return null
+}
+
+// 验证 mock 数据内容
+const validateMockData = (data) => {
+  // 允许 undefined (使用默认值)，但不允许 null
+  if (data === null) {
+    return 'Mock 数据不能为 null'
+  }
+  // 如果 data 是 undefined，跳过大小检查（会使用默认值）
+  if (data === undefined) {
+    return null
+  }
+  // 限制大小为 5MB
+  const dataStr = typeof data === 'string' ? data : JSON.stringify(data)
+  if (dataStr.length > 5 * 1024 * 1024) {
+    return 'Mock 数据大小不能超过 5MB'
+  }
+  return null
+}
+
+// 验证布尔值
+const validateBoolean = (value, fieldName) => {
+  if (typeof value !== 'boolean') {
+    return `${fieldName} 必须是布尔值`
+  }
+  return null
+}
+
+// 验证 ruleValue
+const validateRuleValue = (ruleValue) => {
+  const validValues = ['pathname', 'href', 'pattern']
+  if (!ruleValue || !validValues.includes(ruleValue)) {
+    return `ruleValue 必须是 ${validValues.join(', ')} 之一`
+  }
+  return null
+}
+
+// 创建验证中间件
+const validate = (schema) => {
+  return async (ctx, next) => {
+    const body = ctx.request.body || {}
+    const errors = []
+
+    Object.keys(schema).forEach((key) => {
+      const validator = schema[key]
+      const value = body[key]
+      const error = validator(value)
+      if (error) {
+        errors.push({ field: key, message: error })
+      }
+    })
+
+    if (errors.length > 0) {
+      ctx.status = 400
+      ctx.body = {
+        code: 400,
+        msg: '参数验证失败',
+        data: errors,
+      }
+      return
+    }
+
+    await next()
+  }
+}
+
+module.exports = {
+  validateFilename,
+  validateVersionName,
+  validateMockData,
+  validateBoolean,
+  validateRuleValue,
+  validate,
+}