xinyu-pro 0.22.6 → 0.23.0

package/app/api/plugins/route.ts

@@ -1,11 +1,18 @@
 // app/api/plugins/route.ts - 插件 CRUD API
 
 import { NextRequest, NextResponse } from 'next/server';
-import { execute } from '@/lib/db';
-import { ensureDb } from '@/lib/db-init';
-import { writePluginCode, deletePluginCode, getPluginDir } from '@/lib/plugin-files';
+import { execute } from '@/lib/server/db';
+import { ensureDb } from '@/lib/server/db-init';
+import {
+  writePluginCode,
+  deletePluginCode,
+  getPluginDir,
+  getPluginCodeRelativePath,
+  PLUGIN_ROOT
+} from '@/lib/server/plugin-files';
 import path from 'path';
 import { promises as fs } from 'fs';
+import { PROJECT_ROOT } from '@/lib/server/plugin-files';
 
 /** 解析 JSON 字段 */
 function parseJsonField<T>(value: unknown): T {
@@ -40,6 +47,7 @@ function parsePermissions(value: unknown): {
 function rowToPlugin(row: Record<string, unknown>) {
   const perms = parsePermissions(row.ui_permissions);
   return {
+    fileEntry: (row.file_entry as string) || 'plugin.js',
     id: row.id,
     name: row.name,
     version: row.version,
@@ -49,7 +57,6 @@ function rowToPlugin(row: Record<string, unknown>) {
     icon: row.icon,
     minAppVersion: row.min_app_version,
     code: '',
-    codePath: (row.code_path as string) || '',
     configSchema: parseJsonField(row.config_schema),
     uiSlots: parseJsonField(row.ui_slots),
     ...perms,
@@ -58,6 +65,10 @@ function rowToPlugin(row: Record<string, unknown>) {
       const parsed = parseJsonField(row.dependencies);
       return Array.isArray(parsed) ? parsed : [];
     })(),
+    commands: (() => {
+      const parsed = parseJsonField(row.commands);
+      return Array.isArray(parsed) ? parsed : [];
+    })(),
     createdAt: row.created_at,
     updatedAt: row.updated_at,
   };
@@ -66,16 +77,66 @@ function rowToPlugin(row: Record<string, unknown>) {
 /** 异步填充插件代码（从文件读取） */
 async function fillPluginCode(plugin: ReturnType<typeof rowToPlugin>): Promise<typeof plugin> {
   try {
-    const codeFileName = plugin.codePath ? (plugin.codePath.split('/').pop() || 'plugin.js') : 'plugin.js';
-    const pluginDir = getPluginDir(plugin.id as string);
-    const filePath = path.join(pluginDir, codeFileName);
-    plugin.code = await fs.readFile(filePath, 'utf-8');
+    const codeFilePath = path.join(getPluginDir(plugin.id as string), plugin.fileEntry);
+    plugin.code = await fs.readFile(codeFilePath, 'utf-8');
   } catch {
     plugin.code = '';
   }
   return plugin;
 }
 
+// 同步绑定配置的辅助函数
+async function syncBindingsForPlugin(pluginId: string, configSchema: any[]) {
+  if (!configSchema || configSchema.length === 0) return;
+
+  try {
+    const [bindings] = await execute(
+      'SELECT * FROM extension_bindings WHERE extension_id = ?',
+      [pluginId]
+    );
+
+    const pluginBindings = bindings as Record<string, unknown>[];
+    if (pluginBindings.length === 0) return;
+
+    const schemaKeys = new Set(configSchema.map((f: any) => f.key));
+
+    for (const binding of pluginBindings) {
+      const oldConfig: Record<string, any> = JSON.parse(binding.config as string) || {};
+      const newConfig: Record<string, unknown> = {};
+      let changed = false;
+
+      // 处理新增和保留的配置项
+      for (const field of configSchema) {
+        if (field.key in oldConfig) {
+          newConfig[field.key] = oldConfig[field.key];
+        } else {
+          newConfig[field.key] = field.defaultValue ?? '';
+          changed = true;
+        }
+      }
+
+      // 检查被删除的配置项
+      for (const key of Object.keys(oldConfig)) {
+        if (!schemaKeys.has(key)) {
+          changed = true;
+        }
+      }
+
+      if (changed) {
+        await execute(
+          `UPDATE extension_bindings
+           SET config = ?, updated_at = CURRENT_TIMESTAMP 
+           WHERE id = ?`,
+          [JSON.stringify(newConfig), binding.id]
+        );
+      }
+    }
+  } catch (e) {
+    console.error(`同步插件 ${pluginId} 绑定配置失败:`, e);
+    // 不抛出错误，避免影响主流程
+  }
+}
+
 // GET: 获取所有插件或单个插件
 export async function GET(request: NextRequest) {
   try {
@@ -106,7 +167,10 @@ export async function GET(request: NextRequest) {
 
     query += ' ORDER BY updated_at DESC';
     const [rows] = await execute(query, params);
-    const plugins = await Promise.all((rows as Record<string, unknown>[]).map(r => fillPluginCode(rowToPlugin(r))));
+    const plugins = await Promise.all(
+      (rows as Record<string, unknown>[])
+        .map(r => fillPluginCode(rowToPlugin(r)))
+    );
     return NextResponse.json(plugins);
   } catch (e) {
     console.error('获取插件失败:', e);
@@ -119,14 +183,57 @@ export async function POST(request: NextRequest) {
   try {
     await ensureDb();
     const body = await request.json();
-    const { id, name, version, description, author, type, icon, minAppVersion, code, configSchema, uiSlots, commonPermissions, exclusivePermissions, requiredPermissions, publicExports, dependencies } = body;
+    const { id, name, version, description, author, type, icon, minAppVersion, code, configSchema, uiSlots, commonPermissions, exclusivePermissions, requiredPermissions, publicExports, dependencies, commands } = body;
 
-    if (!id || !name || !version || !type || !code) {
-      return NextResponse.json({ error: '缺少必填字段 (id, name, version, type, code)' }, { status: 400 });
+    if (!id || !name || !version || !type) {
+      return NextResponse.json({ error: '缺少必填字段 (id, name, version, type)' }, { status: 400 });
     }
 
-    // 将代码写入文件
-    const codePath = await writePluginCode(id, code);
+    let fileEntry: string;
+
+    if (code) {
+      // 有 code 时，写入单个代码文件（兼容旧流程）
+      fileEntry = await writePluginCode(id, code);
+    } else {
+      // 无 code 时，生成 .xye 结构（manifest.json + plugin.js）
+      const pluginDir = getPluginDir(id);
+      await fs.mkdir(pluginDir, { recursive: true });
+
+      // 生成 manifest.json
+      const manifest = {
+        pluginEntry: 'plugin.js',
+        id,
+        name,
+        version,
+        description: description || '',
+        author: author || '',
+        type,
+        icon: icon || undefined,
+        minAppVersion: minAppVersion || undefined,
+        configSchema: configSchema || [],
+        uiSlots: uiSlots || [],
+        commonPermissions: commonPermissions || [],
+        exclusivePermissions: exclusivePermissions || [],
+        requiredPermissions: requiredPermissions || [],
+        publicExports: publicExports || null,
+        dependencies: dependencies || [],
+        commands: commands || [],
+      };
+      await fs.writeFile(
+        path.join(pluginDir, 'manifest.json'),
+        JSON.stringify(manifest, null, 2),
+        'utf-8'
+      );
+
+      // 生成默认 plugin.js
+      const defaultCode = `function setup(xinyu) {\n  // 在此编写插件逻辑\n  \n}\n`;
+      await fs.writeFile(path.join(pluginDir, 'plugin.js'), defaultCode, 'utf-8');
+
+      fileEntry = getPluginCodeRelativePath(id, 'plugin.js');
+
+      // 写入 manifest.json → 同步数据库字段
+      // 由于这是新插件，database fields will use the body params below
+    }
 
     const permissionsJson = JSON.stringify({
       commonPermissions: commonPermissions || [],
@@ -135,19 +242,28 @@ export async function POST(request: NextRequest) {
     });
 
     await execute(
-      `INSERT INTO extensions (id, name, version, description, author, type, icon, min_app_version, code_path, config_schema, ui_slots, ui_permissions, public_exports, dependencies)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      `INSERT INTO extensions (id, name, version, description, author, type, icon, min_app_version, file_entry, config_schema, ui_slots, ui_permissions, public_exports, dependencies, commands)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
        ON CONFLICT(id) DO UPDATE SET
        name = excluded.name, version = excluded.version, description = excluded.description,
        author = excluded.author, type = excluded.type, icon = excluded.icon,
-       min_app_version = excluded.min_app_version, code_path = excluded.code_path,
+       min_app_version = excluded.min_app_version, file_entry = excluded.file_entry,
        config_schema = excluded.config_schema, ui_slots = excluded.ui_slots,
        ui_permissions = excluded.ui_permissions,
-       public_exports = excluded.public_exports, dependencies = excluded.dependencies`,
-      [id, name, version, description || '', author || '', type, icon || '', minAppVersion || '', codePath,
+       public_exports = excluded.public_exports, dependencies = excluded.dependencies,
+       commands = excluded.commands`,
+      [id, name, version, description || '', author || '', type, icon || '', minAppVersion || '', fileEntry,
        JSON.stringify(configSchema || []), JSON.stringify(uiSlots || []),
        permissionsJson,
-       JSON.stringify(publicExports || null), JSON.stringify(dependencies || null)]
+       JSON.stringify(publicExports || null), JSON.stringify(dependencies || null), JSON.stringify(commands || null)]
+    );
+
+    // 为新插件创建默认全局绑定
+    await execute(
+      `INSERT INTO extension_bindings (extension_id, scope, world_id, enabled, config, sort_order)
+       VALUES (?, 'global', '', 0, '{}', 0)
+       ON CONFLICT(extension_id, scope, world_id) DO NOTHING`,
+      [id]
     );
 
     return NextResponse.json({ success: true, id });
@@ -157,137 +273,115 @@ export async function POST(request: NextRequest) {
   }
 }
 
-// PUT: 更新插件
+// app/api/plugins/route.ts - PUT 方法
+
 export async function PUT(request: NextRequest) {
   try {
-    await ensureDb();
     const body = await request.json();
-    const { id, newId, ...fields } = body;
+    const { id, newId, ...updateFields } = body;
 
     if (!id) {
       return NextResponse.json({ error: '缺少插件 ID' }, { status: 400 });
     }
 
-    // 处理 ID 变更
+    await ensureDb();
+
+    let finalId: string = id;
     if (newId && newId !== id) {
-      // 检查新 ID 是否已存在
       const [existing] = await execute('SELECT id FROM extensions WHERE id = ?', [newId]);
       if ((existing as Record<string, unknown>[]).length > 0) {
         return NextResponse.json({ error: `插件 ID「${newId}」已存在` }, { status: 409 });
       }
-      // 更新子表引用和父表 ID
-      const rawDb = (await import('@/lib/db')).getRawDb();
-      rawDb?.run('PRAGMA foreign_keys = OFF');
-      try {
-        await execute('UPDATE extensions SET id = ? WHERE id = ?', [newId, id]);
-        await execute('UPDATE extension_bindings SET extension_id = ? WHERE extension_id = ?', [newId, id]);
-      } finally {
-        rawDb?.run('PRAGMA foreign_keys = ON');
-      }
-      // 后续字段更新使用新 ID
-      fields.id = newId;
-      // 重命名插件目录（data/plugins/{oldId}/ → data/plugins/{newId}/）
+
+      const rawDb = (await import('@/lib/server/db')).getRawDb();
+      if (!rawDb) return NextResponse.json({ error: '数据库连接失败' }, { status: 500 });
+
+      // 先重命名目录（失败则提前返回，不碰数据库）
       const oldDir = getPluginDir(id);
       const newDir = getPluginDir(newId);
       try {
         await fs.rename(oldDir, newDir);
-      } catch (e) {
-        console.error(`重命名插件目录失败: ${oldDir} → ${newDir}`, e);
-        // 回滚数据库
-        rawDb?.run('PRAGMA foreign_keys = OFF');
-        try {
-          await execute('UPDATE extensions SET id = ? WHERE id = ?', [id, newId]);
-          await execute('UPDATE extension_bindings SET extension_id = ? WHERE extension_id = ?', [id, newId]);
-        } finally {
-          rawDb?.run('PRAGMA foreign_keys = ON');
-        }
+      } catch (err) {
+        console.error(`重命名插件目录失败: ${oldDir} → ${newDir}`, err);
         return NextResponse.json({ error: '重命名插件目录失败' }, { status: 500 });
       }
-      // 更新 code_path 中的目录名
-      const [codePathRows] = await execute('SELECT code_path FROM extensions WHERE id = ?', [newId]);
-      const cpRows = codePathRows as Record<string, string>[];
-      if (cpRows.length > 0 && cpRows[0].code_path) {
-        const oldCodePath = cpRows[0].code_path;
-        const newCodePath = oldCodePath.replace(`data/plugins/${id}/`, `data/plugins/${newId}/`);
-        if (newCodePath !== oldCodePath) {
-          await execute('UPDATE extensions SET code_path = ? WHERE id = ?', [newCodePath, newId]);
-        }
+
+      // 目录成功 → 更新数据库（临时禁用外键）
+      rawDb.run('PRAGMA foreign_keys = OFF');
+      try {
+        await execute('UPDATE extensions SET id = ? WHERE id = ?', [newId, id]);
+        await execute('UPDATE extension_bindings SET extension_id = ? WHERE extension_id = ?', [newId, id]);
+        await execute('UPDATE plugin_storage SET plugin_id = ? WHERE plugin_id = ?', [newId, id]);
+        finalId = newId;
+      } finally {
+        rawDb.run('PRAGMA foreign_keys = ON');
       }
     }
 
-    const updates: string[] = [];
-    const params: (string | number | null)[] = [];
-
-    const allowedFields = ['name', 'version', 'description', 'author', 'type', 'icon', 'minAppVersion', 'code', 'configSchema', 'uiSlots', 'commonPermissions', 'exclusivePermissions', 'requiredPermissions', 'publicExports', 'dependencies', 'id'];
-    const columnMap: Record<string, string> = {
-      minAppVersion: 'min_app_version',
-      configSchema: 'config_schema',
-      uiSlots: 'ui_slots',
-      commonPermissions: 'ui_permissions',
-      exclusivePermissions: 'ui_permissions',
-      requiredPermissions: 'ui_permissions',
-      publicExports: 'public_exports',
-      dependencies: 'dependencies',
-    };
+    // 更新其他字段
+    const updated: Map<string, any> = new Map<string, any>();
 
-    // code 字段特殊处理：写入文件，数据库存路径
-    const targetId = newId || id;
-    if (fields.code !== undefined) {
-      const [existingRows] = await execute('SELECT code_path FROM extensions WHERE id = ?', [targetId]);
-      const erRows = existingRows as Record<string, string>[];
-      const currentCodePath = erRows.length > 0 ? erRows[0].code_path : null;
-      const entryFile = currentCodePath ? currentCodePath.split('/').pop() : undefined;
-      const codePath = await writePluginCode(targetId, String(fields.code), entryFile);
-      updates.push('code_path = ?');
-      params.push(codePath);
-      delete fields.code;
+    if (updateFields.name !== undefined) {
+      updated.set('name', updateFields.name);
     }
-
-    // 权限字段需要合并更新
-    const permFields = ['commonPermissions', 'exclusivePermissions', 'requiredPermissions'];
-    const hasPermUpdate = permFields.some(f => fields[f] !== undefined);
-
-    if (hasPermUpdate) {
-      const [rows] = await execute('SELECT ui_permissions FROM extensions WHERE id = ?', [targetId]);
-      const permRows = rows as Record<string, unknown>[];
-      const currentPerms = permRows.length > 0 ? parsePermissions(permRows[0].ui_permissions) : {};
-      const newPerms = {
-        commonPermissions: fields.commonPermissions !== undefined ? fields.commonPermissions : (currentPerms.commonPermissions || []),
-        exclusivePermissions: fields.exclusivePermissions !== undefined ? fields.exclusivePermissions : (currentPerms.exclusivePermissions || []),
-        requiredPermissions: fields.requiredPermissions !== undefined ? fields.requiredPermissions : (currentPerms.requiredPermissions || []),
-      };
-      updates.push('ui_permissions = ?');
-      params.push(JSON.stringify(newPerms));
+    if (updateFields.version !== undefined) {
+      updated.set('version', updateFields.version);
     }
-
-    for (const field of allowedFields) {
-      if (permFields.includes(field)) continue;
-      if (field === 'id') continue;
-      if (fields[field] !== undefined) {
-        const col = columnMap[field] || field;
-        updates.push(`${col} = ?`);
-        if (field === 'configSchema' || field === 'uiSlots' || field === 'publicExports' || field === 'dependencies') {
-          params.push(JSON.stringify(fields[field]));
-        } else {
-          params.push(fields[field]);
-        }
-      }
+    if (updateFields.description !== undefined) {
+      updated.set('description', updateFields.description);
+    }
+    if (updateFields.author !== undefined) {
+      updated.set('author', updateFields.author);
+    }
+    if (updateFields.type !== undefined) {
+      updated.set('type', updateFields.type);
+    }
+    if (updateFields.icon !== undefined) {
+      updated.set('icon', updateFields.icon);
+    }
+    if (updateFields.configSchema !== undefined) {
+      updated.set('config_schema', JSON.stringify(updateFields.configSchema));
+    }
+    if (updateFields.publicExports !== undefined) {
+      updated.set('public_exports', JSON.stringify(updateFields.publicExports));
+    }
+    if (updateFields.dependencies !== undefined) {
+      updated.set('dependencies', JSON.stringify(updateFields.dependencies));
+    }
+    if (updateFields.commands !== undefined) {
+      updated.set('commands', JSON.stringify(updateFields.commands));
+    }
+    if (updateFields.pluginEntry !== undefined) {
+      updated.set('file_entry', updateFields.pluginEntry);
+    }
+    if (updateFields.minAppVersion !== undefined) {
+      updated.set('min_app_version', updateFields.minAppVersion);
+    }
+    // 处理权限字段
+    if (updateFields.commonPermissions !== undefined ||
+        updateFields.exclusivePermissions !== undefined ||
+        updateFields.requiredPermissions !== undefined) {
+      updated.set('ui_permissions', JSON.stringify({
+        commonPermissions: updateFields.commonPermissions || [],
+        exclusivePermissions: updateFields.exclusivePermissions || [],
+        requiredPermissions: updateFields.requiredPermissions || [],
+      }));
     }
 
-    if (updates.length === 0) {
-      return NextResponse.json({ success: true, id: targetId });
+    if (updated.size > 0) {
+      await execute(`UPDATE extensions SET ${Array.from(updated.keys()).map(k => `${k} = ?`).join(', ')} WHERE id = ?`,
+        [...Array.from(updated.values()), finalId]);
     }
 
-    params.push(targetId);
-    await execute(
-      `UPDATE extensions SET ${updates.join(', ')} WHERE id = ?`,
-      params
-    );
+    // 同步绑定配置
+    if (updateFields.configSchema !== undefined) {
+      await syncBindingsForPlugin(finalId, updateFields.configSchema as any[]);
+    }
 
-    return NextResponse.json({ success: true, id: targetId });
+    return NextResponse.json({ success: true, id: finalId });
   } catch (e) {
     console.error('更新插件失败:', e);
-    return NextResponse.json({ error: '更新插件失败' }, { status: 500 });
+    return NextResponse.json({ error: '更新失败' }, { status: 500 });
   }
 }
 
@@ -303,6 +397,8 @@ export async function DELETE(request: NextRequest) {
     }
 
     await execute('DELETE FROM extensions WHERE id = ?', [id]);
+    await execute("DELETE FROM extension_bindings WHERE extension_id = ?", [id]);
+    await execute('DELETE FROM plugin_storage WHERE plugin_id = ?', [id]);
     await deletePluginCode(id);
     return NextResponse.json({ success: true, id });
   } catch (e) {

package/app/api/plugins/scan/route.ts

@@ -213,7 +213,7 @@ export async function POST(request: NextRequest) {
 /** 尝试使用 AI API 进行深度分析 */
 async function aiAnalysis(code: string, manifest?: ScanRequest['manifest']): Promise<ScanResult | null> {
   try {
-    const { getAiConfig } = await import('@/lib/get-ai-config');
+    const { getAiConfig } = await import('@/lib/server/get-ai-config');
     const config = await getAiConfig();
     if (!config.apiKey) return null;
 

package/app/api/plugins/storage/route.ts

@@ -1,8 +1,8 @@
 // app/api/plugins/storage/route.ts - 插件持久化存储 API
 
 import { NextRequest, NextResponse } from 'next/server';
-import { execute } from '@/lib/db';
-import { ensureDb } from '@/lib/db-init';
+import { execute } from '@/lib/server/db';
+import { ensureDb } from '@/lib/server/db-init';
 
 /** 验证 pluginId 格式（防止 SQL 注入） */
 function isValidPluginId(id: string): boolean {
@@ -11,7 +11,7 @@ function isValidPluginId(id: string): boolean {
 
 /** 验证 key 格式 */
 function isValidKey(key: string): boolean {
-  return typeof key === 'string' && key.length > 0 && key.length <= 200;
+  return key.length > 0 && key.length <= 200;
 }
 
 /**

package/app/api/plugins/toggle/route.ts

@@ -0,0 +1,21 @@
+// app/api/plugins/toggle/route.ts - 插件切换 API
+
+import { NextRequest, NextResponse } from 'next/server';
+import { ensureDb } from '@/lib/server/db-init';
+import { enablePlugin, disablePlugin } from "@/lib/server/plugin-utils";
+
+export async function POST(request: NextRequest) {
+  try {
+    await ensureDb();
+    const { pluginId, enabled, scope, worldId } = await request.json();
+    if (enabled) {
+      await enablePlugin(pluginId, scope, worldId);
+    } else {
+      await disablePlugin(pluginId, scope, worldId);
+    }
+    return NextResponse.json({ success: true });
+  } catch (e) {
+    console.error('插件状态切换失败:', e);
+    return NextResponse.json({ error: '插件状态切换失败' }, { status: 500 });
+  }
+}

package/app/api/sessions/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { execute } from '@/lib/db';
-import { ensureDb } from '@/lib/db-init';
+import { execute } from '@/lib/server/db';
+import { ensureDb } from '@/lib/server/db-init';
 
 interface SessionRow {
   id: string;
@@ -108,8 +108,9 @@ export async function DELETE(request: NextRequest) {
     const id = searchParams.get('id');
 
     if (action === 'clearAll') {
-      await execute('DELETE FROM game_sessions');
+      await execute('DELETE FROM game_sessions WHERE TRUE');
       await execute("DELETE FROM extension_bindings WHERE scope = 'world'");
+      await execute("DELETE FROM plugin_storage WHERE TRUE");
       return NextResponse.json({ success: true, message: '已清除所有会话' });
     }
 
@@ -123,6 +124,10 @@ export async function DELETE(request: NextRequest) {
         "DELETE FROM extension_bindings WHERE scope = 'world' AND world_id = ?",
         [id]
       );
+      await execute(
+        "DELETE FROM plugin_storage WHERE world_id = ?",
+        [id]
+      );
       return NextResponse.json({ success: true, id });
     }
 

package/app/api/settings/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { execute } from '@/lib/db';
-import { ensureDb } from '@/lib/db-init';
+import { execute } from '@/lib/server/db';
+import { ensureDb } from '@/lib/server/db-init';
 
 export const dynamic = 'force-dynamic';
 

package/app/api/suggest-fields/route.ts

@@ -1,7 +1,7 @@
 // app/api/suggest-fields/route.ts - AI 智能补全字段 API
 
 import { NextRequest, NextResponse } from 'next/server';
-import { getAiConfig } from '@/lib/get-ai-config';
+import { getAiConfig } from '@/lib/server/get-ai-config';
 
 const SYSTEM_PROMPT = `你是一个 RPG 世界卡片设计专家。根据模板名称和已有字段的键名、类型，为每个字段智能补全默认值、占位文本、选项等内容。
 

package/app/api/templates/route.ts

@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { execute } from '@/lib/db';
-import { ensureDb } from '@/lib/db-init';
+import { execute } from '@/lib/server/db';
+import { ensureDb } from '@/lib/server/db-init';
 
 interface TemplateRow {
   id: string;