whistle.mockbubu 1.0.0-dev.4 → 2.0.0

package/lib/utils.js

@@ -28,7 +28,7 @@ const removePropertyAttr = (storage, property, attrName) => {
 const getPropertyAttr = (storage, property, attrName) => {
   const props = storage.getProperty(property)
 
-  return props[attrName]
+  return props ? props[attrName] : undefined
 }
 const getProperty = (storage, property) => {
   return storage.getProperty(property)
@@ -37,7 +37,7 @@ const removeProperty = (storage, property) => {
   return storage.removeProperty(property)
 }
 
-const writeFile = ({ storage, filename, body, properties, encoding }) => {
+const writeFile = ({ storage, filename, body, properties, encoding, groupId }) => {
   switch (encoding) {
   case 'gzip':
     body = zlib.gunzipSync(body)
@@ -68,9 +68,11 @@ const writeFile = ({ storage, filename, body, properties, encoding }) => {
   default:
     content = body
   }
-  storage.writeFile(filename, content)
+
+  // 使用组目录结构: groupId/filename
+  const filePath = groupId ? `${groupId}/${filename}` : filename
+  storage.writeFile(filePath, content)
   setApiListUpdated(storage, true)
-  console.log('%c [ content ]-58', 'font-size:13px; background:pink; color:#bf2c9f;', content)
   // switch (type) {
   // case '[object String]':
   //   storage.writeFile(filename, body)
@@ -86,38 +88,61 @@ const writeFile = ({ storage, filename, body, properties, encoding }) => {
   // }
 }
 
+// ⚠️ 临时保留：为向后兼容暂时保留（将在 Phase 2 完成后移除）
 const getApiList = (storage) => {
   return storage.getFileList()
 }
 
-const updateFile = (storage, filename, body) => {
+// ✅ 新增：按组获取文件列表
+const getGroupFileList = (storage, groupId) => {
+  const allFiles = storage.getFileList()
+  const prefix = `${groupId}/`
+  return allFiles
+    .filter(item => item.name.startsWith(prefix))
+    .map(item => ({
+      ...item,
+      name: item.name.replace(prefix, ''), // 移除前缀，返回原始文件名
+    }))
+}
+
+const updateFile = (storage, filename, body, groupId) => {
   if (!filename) {
     throw new Error('文件名不能为空')
   }
-  // storage.writeFile(filename, JSON.stringify(body))
 
-  const sessionCache = storage.readFile(filename)
+  const filePath = groupId ? `${groupId}/${filename}` : filename
+  const sessionCache = storage.readFile(filePath)
   if (sessionCache) {
     const session = JSON.parse(sessionCache)
     session.res.body = JSON.stringify(body)
-    storage.writeFile(filename, JSON.stringify(session))
+    storage.writeFile(filePath, JSON.stringify(session))
   }
 }
 
-const readFile = (storage, filename) => {
-  // return storage.readFile(filename)
-
-  const sessionCache = storage.readFile(filename)
+const readFile = (storage, filename, groupId) => {
+  const filePath = groupId ? `${groupId}/${filename}` : filename
+  const sessionCache = storage.readFile(filePath)
   if (sessionCache) {
     const resCache = JSON.parse(sessionCache)?.res
-    console.log(resCache)
     return resCache.body
   }
 }
 
-const removeFile = (storage, name) => {
-  storage.removeFile(name)
-  removeProperty(storage, name)
+// 读取完整的 session 数据（包含 req 和 res）
+const readSession = (storage, filename, groupId) => {
+  const filePath = groupId ? `${groupId}/${filename}` : filename
+  const sessionCache = storage.readFile(filePath)
+  if (sessionCache) {
+    return JSON.parse(sessionCache)
+  }
+  return null
+}
+
+const removeFile = (storage, name, groupId) => {
+  const filePath = groupId ? `${groupId}/${name}` : name
+  console.log(`[mockbubu] ❌ removeFile 被调用，彻底删除文件: ${filePath}`)
+  storage.removeFile(filePath)
+  // 注意：不再删除 properties，因为元数据现在由 groupManager 管理
 }
 // 获取mock文件名
 const getFilename = (originalReq) => {
@@ -166,21 +191,52 @@ function getVersionName(name) {
   return 'version.' + name
 }
 
+function getVersionMetaName(name) {
+  return 'versionMeta.' + name
+}
+
+const MAX_VERSION_COUNT = 10 // 最多保留10个版本
+
 /**
  * mock版本管理
  */
 
 // 新增版本
-const addNewVersion = ({ storage, filename, versionName, content }) => {
+const addNewVersion = ({ storage, filename, versionName, content, description = '' }) => {
   const name = getVersionName(versionName)
+  const metaName = getVersionMetaName(versionName)
+
+  // 检查版本数量限制
+  const versions = getVersions({ storage, filename })
+  if (versions.length >= MAX_VERSION_COUNT) {
+    throw new Error(`版本数量已达上限(${MAX_VERSION_COUNT}个)，请删除旧版本后再创建`)
+  }
 
-  setProperty(storage, filename, { [name]: content })
+  // 保存版本内容和元数据
+  const now = Date.now()
+  setProperty(storage, filename, {
+    [name]: content,
+    [metaName]: {
+      description,
+      createTime: now,
+      updateTime: now,
+    },
+  })
 }
 // 更新版本文件内容
 const updateVersionContent = ({ storage, filename, versionName, content }) => {
   const name = getVersionName(versionName)
-
-  setProperty(storage, filename, { [name]: content })
+  const metaName = getVersionMetaName(versionName)
+
+  // 更新内容和修改时间
+  const meta = getPropertyAttr(storage, filename, metaName) || {}
+  setProperty(storage, filename, {
+    [name]: content,
+    [metaName]: {
+      ...meta,
+      updateTime: Date.now(),
+    },
+  })
 }
 // 获取版本文件内容
 const getVersionContent = ({ storage, filename, versionName }) => {
@@ -191,32 +247,91 @@ const getVersionContent = ({ storage, filename, versionName }) => {
 // 删除版本
 const deleteVersion = ({ storage, filename, versionName }) => {
   const name = getVersionName(versionName)
+  const metaName = getVersionMetaName(versionName)
 
   removePropertyAttr(storage, filename, name)
+  removePropertyAttr(storage, filename, metaName)
 }
 // 更新版本名称
 const updateVersionName = ({ storage, filename, versionName, newVersion }) => {
-  const file = getVersionContent(versionName)
+  const content = getVersionContent({ storage, filename, versionName })
+  const oldMetaName = getVersionMetaName(versionName)
+  const meta = getPropertyAttr(storage, filename, oldMetaName) || {}
 
-  addNewVersion(storage, filename, { versionName: newVersion, file })
+  // 删除旧版本
   deleteVersion({ storage, filename, versionName })
+
+  // 创建新版本（保留元数据，但不增加版本数量限制检查）
+  const name = getVersionName(newVersion)
+  const metaName = getVersionMetaName(newVersion)
+  setProperty(storage, filename, {
+    [name]: content,
+    [metaName]: {
+      ...meta,
+      updateTime: Date.now(),
+    },
+  })
 }
+
+// 更新版本元信息（名称和描述）
+const updateVersionMeta = ({ storage, filename, versionName, newVersionName, description }) => {
+  const content = getVersionContent({ storage, filename, versionName })
+  if (!content) {
+    throw new Error('版本不存在')
+  }
+
+  const oldMetaName = getVersionMetaName(versionName)
+  const meta = getPropertyAttr(storage, filename, oldMetaName) || {}
+
+  // 如果版本名变了，删除旧版本
+  if (versionName !== newVersionName) {
+    deleteVersion({ storage, filename, versionName })
+  } else {
+    // 只删除旧的元数据
+    removePropertyAttr(storage, filename, oldMetaName)
+  }
+
+  // 保存新的版本和元数据
+  const newName = getVersionName(newVersionName)
+  const newMetaName = getVersionMetaName(newVersionName)
+  setProperty(storage, filename, {
+    [newName]: content,
+    [newMetaName]: {
+      ...meta,
+      description,
+      updateTime: Date.now(),
+    },
+  })
+}
+
 const getVersions = ({ storage, filename }) => {
   const props = getProperty(storage, filename)
+  if (!props) {
+    return []
+  }
+
   const list = []
 
   Object.keys(props).forEach((key) => {
-    const matchs = key.match(/^version\.{1}(.+)/)
+    const matchs = key.match(/^version\.(.+)/)
 
     if (matchs && matchs[1]) {
+      const versionName = matchs[1]
+      const metaName = getVersionMetaName(versionName)
+      const meta = props[metaName] || {}
+
       list.push({
-        filename: matchs[1],
+        filename: versionName,
         content: props[key],
+        description: meta.description || '',
+        createTime: meta.createTime || 0,
+        updateTime: meta.updateTime || 0,
       })
     }
   })
 
-  return list
+  // 按修改时间倒序排列（最新修改的在前）
+  return list.sort((a, b) => b.updateTime - a.updateTime)
 }
 
 const withTryCatch = (fn) => {
@@ -224,7 +339,11 @@ const withTryCatch = (fn) => {
     try {
       return await fn(...args)
     } catch (e) {
-      console.error('全局捕获异常:', e)
+      // 仅在开发环境输出错误日志
+      if (process.env.NODE_ENV === 'development') {
+        console.error('[mockbubu] 全局捕获异常:', e)
+      }
+      throw e
     }
   }
 }
@@ -233,6 +352,7 @@ exports.addNewVersion = addNewVersion
 exports.updateVersionContent = updateVersionContent
 exports.deleteVersion = deleteVersion
 exports.updateVersionName = updateVersionName
+exports.updateVersionMeta = updateVersionMeta
 exports.getVersions = getVersions
 exports.setProperty = setProperty
 exports.getProperty = getProperty
@@ -241,9 +361,11 @@ exports.getVersionContent = getVersionContent
 exports.removeProperty = removeProperty
 exports.removePropertyAttr = removePropertyAttr
 exports.writeFile = writeFile
-exports.getApiList = getApiList
+exports.getApiList = getApiList // ⚠️ 临时保留用于向后兼容
+exports.getGroupFileList = getGroupFileList // ✅ 新增：按组获取文件列表
 exports.updateFile = updateFile
 exports.readFile = readFile
+exports.readSession = readSession
 exports.removeFile = removeFile
 exports.getFilename = getFilename
 exports.getApiListUpdated = getApiListUpdated

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whistle.mockbubu",
-  "version": "1.0.0-dev.4",
+  "version": "2.0.0",
   "description": "mock response data",
   "scripts": {
     "lint": "eslint . --ext .js",