whistle.mockbubu 2.0.0-beta.0 → 2.0.0-beta.2

package/lib/server.js

@@ -9,11 +9,12 @@ const {
 const GroupManager = require('./group-manager')
 const StorageAdapter = require('./storage-adapter')
 
-module.exports = (server, { storage }) => {
+module.exports = (server, options) => {
   console.log('[mockbubu] 🚀 server.js 模块已加载!')
+  const { storage } = options
 
   // 使用 StorageAdapter 包装 Whistle storage
-  const actualBaseDir = storage.baseDir || storage._options?.baseDir
+  const actualBaseDir = options.config.baseDir
   const storageAdapter = new StorageAdapter({ baseDir: actualBaseDir })
 
   // 初始化组管理器（使用适配器）

package/lib/storage-adapter.js

@@ -10,10 +10,19 @@ const path = require('path')
 
 class StorageAdapter {
   constructor(options) {
-    const baseDir = options.baseDir || path.join(
+    // const baseDir = options.baseDir || path.join(
+    //   process.env.HOME,
+    //   '.WhistleAppData/.whistle/.plugins/whistle.mockbubu',
+    // )
+    let baseDir = path.join(
       process.env.HOME,
       '.WhistleAppData/.whistle/.plugins/whistle.mockbubu',
     )
+    if (options.baseDir) {
+      baseDir = `${options.baseDir}/.plugins/whistle.mockbubu`
+    }
+
+    console.log('%c [ baseDir ]-18', 'font-size:13px; background:pink; color:#bf2c9f;', baseDir)
 
     this.v3Storage = new FileSystemStorage(baseDir)
     this.currentGroupId = 'default'

package/lib/storage-v3.js

@@ -271,12 +271,14 @@ class FileSystemStorage {
    * @private
    */
   async _migrateGroupsMetaFromProperties() {
-    // 从 storage-adapter 读取旧的 properties
-    const StorageAdapter = require('./storage-adapter')
-    const adapter = new StorageAdapter({ basePath: this.baseDir })
+    // 直接读取当前目录的 properties 文件(V2 格式)
+    const propertiesPath = path.join(this.baseDir, 'properties')
 
     try {
-      const data = await adapter.getProperty('__groups__')
+      const content = await fs.readFile(propertiesPath, 'utf-8')
+      const properties = JSON.parse(content)
+      const data = properties.__groups__
+
       if (data && data.groups) {
         console.log(`[storage-v3 ${new Date().toLocaleString('zh-CN', { hour12: false })}] 从 properties 迁移 ${data.groups.length} 个组`)
 

package/lib/uiServer/index.js

@@ -18,7 +18,7 @@ module.exports = (server, options) => {
 
   // 使用 StorageAdapter 包装 Whistle storage
   // Whistle storage 对象直接有 baseDir 属性
-  const actualBaseDir = storage.baseDir || storage._options?.baseDir
+  const actualBaseDir = options.config.baseDir
   console.log('[mockbubu] 🔍 UI Server storage.baseDir:', storage.baseDir)
   console.log('[mockbubu] 🔍 UI Server 使用 baseDir:', actualBaseDir)
   const storageAdapter = new StorageAdapter({ baseDir: actualBaseDir })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whistle.mockbubu",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "description": "mock response data",
   "scripts": {
     "lint": "eslint . --ext .js",
@@ -25,7 +25,7 @@
     ".gitignore",
     "index.js",
     "package.json",
-    "*.md",
+    "README.md",
     "step1.png",
     "step2.png"
   ],

package/public/js/app.js

@@ -1068,7 +1068,7 @@ const __default__ = {
     const deleteVersionHandler = (item, index) => {
       (0,_service__WEBPACK_IMPORTED_MODULE_11__.deleteVersion)({
         name: props.api.name,
-        versionName: item.filename
+        versionId: item.id
       }).then(res => {
         const {
           code