whistle.mockbubu 1.0.0-dev.4 → 2.0.0

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

@@ -1,33 +1,41 @@
-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,
+  }), (ctx) => {
     try {
-      const { localStorage } = ctx.req
-      const { versionName, content = {}, name } = ctx.request.body || {}
+      const { groupManager } = ctx
+      const { versionName, content = {}, name, description = '' } = ctx.request.body || {}
 
-      addNewVersion({
-        storage: localStorage,
-        filename: name,
-        versionName,
-        content,
-      })
+      console.log('[mockbubu] 创建版本:', { versionName, name, description })
+
+      // 获取当前组ID，使用组级别的版本管理
+      const currentGroupId = groupManager.getCurrentGroupId()
+      groupManager.addGroupVersion(currentGroupId, name, versionName, content, description)
 
-      ctx.body = createSuccessResponse({
+      // 立即读取已保存的版本，确认时间戳等信息
+      const versions = groupManager.getGroupVersions(currentGroupId, name)
+      const newVersion = versions.find(v => v.filename === versionName)
+
+      console.log('[mockbubu] 创建后读取版本:', newVersion)
+
+      ctx.body = createSuccessResponse(newVersion || {
         filename: versionName,
         content,
+        description,
+        createTime: Date.now(),
+        updateTime: Date.now(),
       }, '版本创建成功')
     } catch (error) {
       ctx.body = createErrorResponse(error.message)
@@ -35,23 +43,26 @@ module.exports = (router) => {
   })
 
   // 删除版本
-  router.post('/cgi-bin/mockbubu/delete-version', (ctx) => {
+  router.post('/cgi-bin/mockbubu/delete-version', validate({
+    name: validateFilename,
+    versionName: validateVersionName,
+  }), (ctx) => {
     try {
-      const { localStorage } = ctx.req
+      const { groupManager } = ctx
       const { versionName, name } = ctx.request.body || {}
 
-      const mockVersion = getPropertyAttr(localStorage, name, 'mockVersion')
+      // 获取当前组ID和配置
+      const currentGroupId = groupManager.getCurrentGroupId()
+      const groupConfig = groupManager.getGroupFileConfig(currentGroupId, name)
 
       // 如果删除的是当前mock版本，则清除mock版本设置
-      if (versionName === mockVersion) {
-        removePropertyAttr(localStorage, name, 'mockVersion')
+      if (versionName === groupConfig.mockVersion) {
+        groupConfig.mockVersion = null
+        groupManager.setGroupFileConfig(currentGroupId, name, groupConfig)
       }
 
-      deleteVersion({
-        storage: localStorage,
-        filename: name,
-        versionName,
-      })
+      // 使用组级别的版本删除
+      groupManager.deleteGroupVersion(currentGroupId, name, versionName)
 
       ctx.body = createSuccessResponse(null, '版本删除成功')
     } catch (error) {
@@ -60,17 +71,18 @@ module.exports = (router) => {
   })
 
   // 更新版本内容
-  router.post('/cgi-bin/mockbubu/update-version-content', (ctx) => {
+  router.post('/cgi-bin/mockbubu/update-version-content', validate({
+    name: validateFilename,
+    versionName: validateVersionName,
+    content: validateMockData,
+  }), (ctx) => {
     try {
-      const { localStorage } = ctx.req
+      const { groupManager } = ctx
       const { versionName, content, name } = ctx.request.body || {}
 
-      updateVersionContent({
-        storage: localStorage,
-        filename: name,
-        versionName,
-        content,
-      })
+      // 获取当前组ID，使用组级别的版本内容更新
+      const currentGroupId = groupManager.getCurrentGroupId()
+      groupManager.updateGroupVersionContent(currentGroupId, name, versionName, content)
 
       ctx.body = createSuccessResponse(null, '版本内容更新成功')
     } catch (error) {
@@ -78,18 +90,32 @@ module.exports = (router) => {
     }
   })
 
-  // 更新版本名称
-  router.post('/cgi-bin/mockbubu/update-version-name', (ctx) => {
+  // 更新版本名称（已废弃，使用 update-version-meta 代替）
+  router.post('/cgi-bin/mockbubu/update-version-name', validate({
+    name: validateFilename,
+    versionName: validateVersionName,
+    newVersion: validateVersionName,
+  }), (ctx) => {
     try {
-      const { localStorage } = ctx.req
+      const { groupManager } = ctx
       const { versionName, name, newVersion } = ctx.request.body || {}
 
-      updateVersionName({
-        storage: localStorage,
-        filename: name,
-        versionName,
-        newVersion,
-      })
+      // 获取当前组ID，使用组级别的版本元信息更新
+      const currentGroupId = groupManager.getCurrentGroupId()
+      const groupConfig = groupManager.getGroupFileConfig(currentGroupId, name)
+
+      // 获取原描述
+      const versions = groupManager.getGroupVersions(currentGroupId, name)
+      const oldVersion = versions.find(v => v.filename === versionName)
+      const description = oldVersion?.description || ''
+
+      groupManager.updateGroupVersionMeta(currentGroupId, name, versionName, newVersion, description)
+
+      // 如果更新的是当前mock版本，需要更新mockVersion属性
+      if (versionName === groupConfig.mockVersion && versionName !== newVersion) {
+        groupConfig.mockVersion = newVersion
+        groupManager.setGroupFileConfig(currentGroupId, name, groupConfig)
+      }
 
       ctx.body = createSuccessResponse(null, '版本名称更新成功')
     } catch (error) {
@@ -98,12 +124,21 @@ module.exports = (router) => {
   })
 
   // 获取版本列表
-  router.post('/cgi-bin/mockbubu/get-versions', (ctx) => {
+  router.post('/cgi-bin/mockbubu/get-versions', validate({
+    name: validateFilename,
+  }), (ctx) => {
     try {
-      const { localStorage } = ctx.req
+      const { groupManager } = ctx
       const { name } = ctx.request.body || {}
 
-      const list = getVersions({ storage: localStorage, filename: name }) || []
+      // 获取当前组ID，使用组级别的版本列表获取
+      const currentGroupId = groupManager.getCurrentGroupId()
+      const list = groupManager.getGroupVersions(currentGroupId, name) || []
+
+      console.log('[mockbubu] 获取版本列表:', name, 'group:', currentGroupId, 'count:', list.length)
+      if (list.length > 0) {
+        console.log('[mockbubu] 第一个版本示例:', list[0])
+      }
 
       ctx.body = createSuccessResponse(list, '获取版本列表成功')
     } catch (error) {
@@ -112,16 +147,59 @@ module.exports = (router) => {
   })
 
   // 设置mock的版本
-  router.post('/cgi-bin/mockbubu/set-mock-version', (ctx) => {
+  router.post('/cgi-bin/mockbubu/set-mock-version', validate({
+    name: validateFilename,
+    versionName: (val) => {
+      // versionName 可以为空字符串（表示清除版本）
+      if (val === '') return null
+      return validateVersionName(val)
+    },
+  }), (ctx) => {
     try {
-      const { localStorage } = ctx.req
+      const { groupManager } = ctx
       const { name, versionName } = ctx.request.body || {}
 
-      setProperty(localStorage, name, { mockVersion: versionName })
+      // 获取当前组ID和配置
+      const currentGroupId = groupManager.getCurrentGroupId()
+      const groupConfig = groupManager.getGroupFileConfig(currentGroupId, name)
+
+      // 更新 mockVersion
+      groupConfig.mockVersion = versionName || null
+      groupManager.setGroupFileConfig(currentGroupId, name, groupConfig)
 
       ctx.body = createSuccessResponse(null, 'Mock版本设置成功')
     } catch (error) {
       ctx.body = createErrorResponse(error.message)
     }
   })
+
+  // 更新版本元信息（名称和描述）
+  router.post('/cgi-bin/mockbubu/update-version-meta', validate({
+    name: validateFilename,
+    versionName: validateVersionName,
+    newVersionName: validateVersionName,
+  }), (ctx) => {
+    try {
+      const { groupManager } = ctx
+      const { name, versionName, newVersionName, description = '' } = ctx.request.body || {}
+
+      console.log('[mockbubu] 更新版本元信息:', { name, versionName, newVersionName, description })
+
+      // 获取当前组ID，使用组级别的版本元信息更新
+      const currentGroupId = groupManager.getCurrentGroupId()
+      groupManager.updateGroupVersionMeta(currentGroupId, name, versionName, newVersionName, description)
+
+      // 如果更新的是当前mock版本，需要更新mockVersion属性
+      const groupConfig = groupManager.getGroupFileConfig(currentGroupId, name)
+      if (versionName === groupConfig.mockVersion && versionName !== newVersionName) {
+        groupConfig.mockVersion = newVersionName
+        groupManager.setGroupFileConfig(currentGroupId, name, groupConfig)
+      }
+
+      ctx.body = createSuccessResponse(null, '版本信息更新成功')
+    } catch (error) {
+      console.error('[mockbubu] 更新版本元信息失败:', error)
+      ctx.body = createErrorResponse(error.message)
+    }
+  })
 }

package/lib/uiServer/util.js

@@ -1,8 +1,9 @@
 const {
   getApiList,
+  getGroupFileList,
   getProperty,
 } = require('../utils')
-const { RangeFilterMap, RuleFilterMap, LockedFilterMap } = require('../const')
+const { RangeFilterMap, RuleFilterMap, LockedFilterMap, MethodFilterMap, StatusFilterMap } = require('../const')
 
 // 统一错误响应格式
 const createErrorResponse = (message, code = 500) => ({
@@ -33,6 +34,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 +54,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 +77,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 +90,64 @@ const handleFilterList = (list, filterOptions) => {
   return filteredList
 }
 
+/**
+ * 过滤组配置,只保留组级别的字段
+ * 移除全局元数据字段 (query, payload, method, rule, status, pattern, ruleValue, url, date)
+ */
+const filterGroupConfig = (groupConfig) => {
+  if (!groupConfig) return {}
+  const validKeys = ['mock', 'locked', 'mockVersion', 'mockTime']
+  const filtered = {}
+
+  Object.keys(groupConfig).forEach(key => {
+    // 保留基础配置字段
+    if (validKeys.includes(key)) {
+      filtered[key] = groupConfig[key]
+    } else if (key.startsWith('version.') || key.startsWith('versionMeta.')) {
+      // 保留版本相关字段
+      filtered[key] = groupConfig[key]
+    }
+    // 其他字段(如 query, payload 等全局元数据)被过滤掉
+  })
+
+  return filtered
+}
+
 // 获取文件列表（包含文件属性数据）
-const getFullDataList = (localStorage) => {
-  // 获取接口列表
-  const list = getApiList(localStorage) || []
+// 完全隔离架构：直接获取当前组的文件列表
+const getFullDataList = (localStorage, groupManager, groupId) => {
+  if (!groupManager || !groupId) {
+    // 向后兼容：如果没有提供 groupManager，使用旧逻辑
+    const list = getApiList(localStorage) || []
+    return list.map((item) => {
+      const props = getProperty(localStorage, item.name) || {}
+      delete item.data
+      return { ...item, ...props }
+    })
+  }
+
+  // 新逻辑：直接获取当前组的文件列表
+  const list = getGroupFileList(localStorage, groupId) || []
+  const result = []
 
-  // 合并属性数据
   list.forEach((item) => {
-    const props = getProperty(localStorage, item.name) || {}
-    delete item.data
-    Object.assign(item, props)
+    // 读取组元数据（已合并全局元数据 + 组配置）
+    const config = groupManager.getGroupFileConfig(groupId, item.name)
+
+    if (config) {
+      result.push({
+        name: item.name,
+        ...config, // 包含 url, method, date, status, rule, mock, locked 等
+      })
+    }
   })
-  return list
+
+  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,
+}