cc-viewer 1.9.8 → 1.9.10

package/server/lib/plugin-loader.js

@@ -1,8 +1,18 @@
 import { readdirSync, existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
+import { randomBytes } from 'node:crypto';
 import { LOG_DIR } from '../../findcc.js';
 import { PLUGINS_DIR } from '../_paths.js';
+import {
+  parsePluginManifest,
+  computeMainFingerprint,
+  computePanelFingerprint,
+  listPluginDirs,
+  validatePluginName,
+  validateServicePrefix,
+} from './plugin-manifest.js';
+import { reportSwallowed } from './error-report.js';
 
 // 动态获取（LOG_DIR 可能在运行时被 setLogDir 修改）
 export function getPluginsDir() { return join(LOG_DIR, 'plugins'); }
@@ -24,81 +34,280 @@ const HOOK_TYPES = {
 };
 
 let _plugins = [];
+// Full result of the last loadPlugins (directory service/panel plugins and failures included)
+let _entries = [];
+let _generation = 0;
+// Directory plugins with an unchanged fingerprint reuse the old module instance and import URL to avoid repeated reloads
+// accumulate module namespaces in the ESM registry that are never released
+const _moduleCache = new Map(); // mainPath -> { fingerprint, url, module }
 
-/**
- * 扫描 LOG_DIR/plugins/ 目录，动态 import 每个 .js/.mjs 文件
- */
-export async function loadPlugins() {
-  _plugins = [];
+// Runtime event dispatcher (bridge for ctx.events.on): loadPlugins rebuilds _plugins every time,
+// and the loader re-attaches this after each scan so it stays online across hot reloads.
+let _eventDispatcherPlugin = null;
+export function registerEventDispatcherPlugin(plugin) {
+  _eventDispatcherPlugin = plugin;
+  if (plugin && !_plugins.some(p => p.name === plugin.name)) {
+    _plugins.push(plugin);
+  }
+}
 
-  // 读取 disabledPlugins 列表
-  let disabledPlugins = [];
+function readDisabledPlugins() {
   try {
     if (existsSync(getPrefsFilePath())) {
       const prefs = JSON.parse(readFileSync(getPrefsFilePath(), 'utf-8'));
       if (Array.isArray(prefs.disabledPlugins)) {
-        disabledPlugins = prefs.disabledPlugins;
+        return prefs.disabledPlugins;
       }
     }
-  } catch { }
+  } catch (err) {
+    reportSwallowed('plugin-loader.prefs', err);
+  }
+  return [];
+}
 
-  // Load user plugins from LOG_DIR/plugins/
-  if (existsSync(getPluginsDir())) {
-    let files;
+async function importMainModule(mainPath, fingerprint, force) {
+  const cacheKey = mainPath;
+  const cached = _moduleCache.get(cacheKey);
+  if (!force && cached && cached.fingerprint === fingerprint) {
+    return { module: cached.module, url: cached.url, reused: true };
+  }
+  const tag = force ? randomBytes(8).toString('hex') : fingerprint.slice(0, 16);
+  // Fingerprint cache-bust: pathToFileURL wraps the absolute path (Windows-safe); a new query yields a new module instance
+  const mod = await import(pathToFileURL(mainPath).href + '?ccv=' + tag);
+  const url = `${pathToFileURL(mainPath).href}?ccv=${tag}`;
+  const module = mod.default || mod;
+  _moduleCache.set(cacheKey, { fingerprint, url, module });
+  return { module, url, reused: false };
+}
+
+/**
+ * Scan plugin directories (user LOG_DIR/plugins/ and the bundled plugins/) and load every plugin.
+ * - Top-level .js/.mjs: single-file hook plugins (legacy behavior unchanged)
+ * - Top-level directories with plugin.json: directory plugins (hooks optional; service/panel/lifecycle allowed)
+ * Never rejects: a single failure is recorded in that entry's loadError.
+ */
+export async function loadPlugins(opts = {}) {
+  const force = opts.force === true;
+  _plugins = [];
+  _entries = [];
+  if (force) _moduleCache.clear();
+
+  const disabledPlugins = readDisabledPlugins();
+  const seenNames = new Set();
+  const usedPrefixes = new Set();
+
+  const loadFilePlugin = async (dir, file, source) => {
+    const filePath = join(dir, file);
+    const entry = {
+      name: file,
+      source,
+      shape: 'file',
+      file,
+      dir: null,
+      pluginDir: null,
+      manifest: null,
+      plugin: null,
+      service: null,
+      panel: null,
+      fingerprints: null,
+      enabled: true,
+      loadError: null,
+    };
     try {
-      files = readdirSync(getPluginsDir())
-        .filter(f => f.endsWith('.js') || f.endsWith('.mjs'))
-        .sort();
-    } catch {
-      files = [];
-    }
+      // On Windows `file://${C:\...}` yields `file://C:\...` (no third slash, unescaped backslashes);
+      // pathToFileURL guarantees the correct cross-platform form. On POSIX it matches the old string concatenation.
+      const mod = await import(pathToFileURL(filePath).href);
+      const plugin = mod.default || mod;
+      const name = plugin.name || (source === 'bundled' ? file.replace(/\.[cm]?js$/, '') : file);
+      entry.name = name;
+      entry.plugin = plugin;
 
-    for (const file of files) {
-      const filePath = join(getPluginsDir(), file);
-      try {
-        // Windows 下 `file://${C:\...}` 会产生 `file://C:\...`（无第三个 /、反斜杠未转），
-        // pathToFileURL 保证跨平台正确形式。POSIX 下与原先字符串拼接 ESM 行为等价。
-        const mod = await import(pathToFileURL(filePath).href);
-        const plugin = mod.default || mod;
-        const name = plugin.name || file;
-
-        if (disabledPlugins.includes(name)) {
-          if (SHOULD_LOG) console.error(`[CC Viewer] Plugin "${name}" is disabled, skipping.`);
-          continue;
+      if (plugin.service !== undefined) {
+        entry.loadError = 'single-file plugins cannot declare "service"; use a directory plugin with plugin.json';
+        if (SHOULD_LOG) console.error(`[CC Viewer] Plugin "${name}": ${entry.loadError}`);
+        _entries.push(entry);
+        return;
+      }
+      if (disabledPlugins.includes(name)) {
+        entry.enabled = false;
+        if (SHOULD_LOG) console.error(`[CC Viewer] Plugin "${name}" is disabled, skipping.`);
+        _entries.push(entry);
+        return;
+      }
+      if (source === 'user') seenNames.add(name);
+      if (plugin.hooks && typeof plugin.hooks === 'object') {
+        const alreadyLoaded = source === 'bundled' && _plugins.some(p => p.name === name);
+        if (!alreadyLoaded) {
+          _plugins.push({ name, hooks: plugin.hooks, file, ...(source === 'bundled' ? { source } : {}) });
+          if (SHOULD_LOG) console.error(`[CC Viewer] Plugin loaded: ${name} (${file})`);
         }
+      }
+      _entries.push(entry);
+    } catch (err) {
+      entry.loadError = err.message;
+      if (SHOULD_LOG) console.error(`[CC Viewer] Failed to load plugin "${file}":`, err.message);
+      _entries.push(entry);
+    }
+  };
 
-        if (plugin.hooks && typeof plugin.hooks === 'object') {
-          _plugins.push({ name, hooks: plugin.hooks, file });
-          if (SHOULD_LOG) console.error(`[CC Viewer] Plugin loaded: ${name} (${file})`);
+  const loadDirPlugin = async (parentDir, dirName, source) => {
+    const pluginDir = join(parentDir, dirName);
+    const entry = {
+      name: dirName,
+      source,
+      shape: 'dir',
+      file: null,
+      dir: dirName,
+      pluginDir,
+      manifest: null,
+      plugin: null,
+      service: null,
+      panel: null,
+      fingerprints: null,
+      enabled: true,
+      loadError: null,
+    };
+    const { manifest, error } = parsePluginManifest(pluginDir);
+    if (error) {
+      // Directories without plugin.json: ignored (may be a user's asset folder)
+      if (error === 'missing plugin.json') return;
+      entry.loadError = error;
+      _entries.push(entry);
+      return;
+    }
+    entry.manifest = manifest;
+    entry.name = manifest.name;
+
+    if (manifest.panel) {
+      entry.panel = {
+        entryRel: manifest.panel.entryRel,
+        entryPath: manifest.panel.entryPath,
+        rootDir: manifest.panel.rootDir,
+        cssRel: manifest.panel.cssRel,
+        cssPath: manifest.panel.cssPath,
+        title: manifest.panel.title,
+        titleI18n: manifest.panel.titleI18n,
+        icon: manifest.panel.icon,
+        width: manifest.panel.width,
+        desktopOnly: manifest.panel.desktopOnly,
+        fingerprint: computePanelFingerprint(manifest.panel),
+      };
+    }
+    if (manifest.service) {
+      entry.service = {
+        entryRel: manifest.service.entryRel,
+        entryPath: manifest.service.entryPath,
+        prefix: manifest.service.prefix,
+        env: manifest.service.env,
+      };
+    }
+
+    if (disabledPlugins.includes(manifest.name)) {
+      entry.enabled = false;
+      _entries.push(entry);
+      return;
+    }
+    if (!validatePluginName(manifest.name)) {
+      entry.loadError = `invalid plugin name: ${manifest.name}`;
+      _entries.push(entry);
+      return;
+    }
+    if (seenNames.has(manifest.name)) {
+      // User source overrides bundled source: a same-named bundled directory plugin silently yields (same as single-file plugins)
+      if (source === 'bundled') return;
+      entry.enabled = false;
+      entry.loadError = `duplicate plugin name: ${manifest.name}`;
+      _entries.push(entry);
+      return;
+    }
+    if (manifest.service) {
+      if (!validateServicePrefix(manifest.service.prefix) || usedPrefixes.has(manifest.service.prefix)) {
+        entry.loadError = `invalid or duplicate service.prefix: ${manifest.service.prefix}`;
+        _entries.push(entry);
+        return;
+      }
+    }
+
+    // main module (optional): hooks + activate/deactivate/onError
+    let plugin = null;
+    if (manifest.mainPath) {
+      const fingerprint = computeMainFingerprint(manifest.raw, manifest.mainPath, pluginDir);
+      entry.fingerprints = { main: fingerprint };
+      try {
+        const { module } = await importMainModule(manifest.mainPath, fingerprint, force);
+        plugin = module;
+        entry.plugin = plugin;
+        if (plugin && plugin.name && plugin.name !== manifest.name && SHOULD_LOG) {
+          console.error(`[CC Viewer] Plugin "${manifest.name}": module name "${plugin.name}" differs from manifest name, manifest wins.`);
         }
       } catch (err) {
-        if (SHOULD_LOG) console.error(`[CC Viewer] Failed to load plugin "${file}":`, err.message);
+        entry.loadError = `failed to import ${manifest.mainRel}: ${err.message}`;
+        if (SHOULD_LOG) console.error(`[CC Viewer] ${entry.loadError}`);
+        _entries.push(entry);
+        return;
       }
     }
+
+    seenNames.add(manifest.name);
+    if (manifest.service) usedPrefixes.add(manifest.service.prefix);
+
+    // hooks still use the same pipeline; service/panel/activate info lives in entries (filled above)
+    if (plugin && plugin.hooks && typeof plugin.hooks === 'object') {
+      _plugins.push({ name: manifest.name, hooks: plugin.hooks, file: dirName, ...(source === 'bundled' ? { source } : {}) });
+    }
+    if (SHOULD_LOG) console.error(`[CC Viewer] Directory plugin loaded: ${manifest.name} (${dirName})`);
+    _entries.push(entry);
+  };
+
+  // ---- User plugin directory ----
+  const userDir = getPluginsDir();
+  if (existsSync(userDir)) {
+    let dirents;
+    try {
+      dirents = readdirSync(userDir, { withFileTypes: true });
+    } catch {
+      dirents = [];
+    }
+    const files = dirents
+      .filter(d => d.isFile() && (d.name.endsWith('.js') || d.name.endsWith('.mjs')))
+      .map(d => d.name)
+      .sort();
+    for (const file of files) {
+      await loadFilePlugin(userDir, file, 'user');
+    }
+    for (const dirName of listPluginDirs(userDir)) {
+      await loadDirPlugin(userDir, dirName, 'user');
+    }
   }
 
-  // Load bundled plugins from package's plugins/ directory (user plugins take priority)
+  // ---- Bundled plugin directory (user source wins) ----
   const bundledDir = PLUGINS_DIR;
   if (existsSync(bundledDir)) {
-    let bundledFiles;
+    let dirents;
     try {
-      bundledFiles = readdirSync(bundledDir).filter(f => f.endsWith('.js') || f.endsWith('.mjs')).sort();
-    } catch { bundledFiles = []; }
-    for (const file of bundledFiles) {
-      try {
-        const mod = await import(pathToFileURL(join(bundledDir, file)).href);
-        const plugin = mod.default || mod;
-        const name = plugin.name || file.replace(/\.[cm]?js$/, '');
-        if (disabledPlugins.includes(name)) continue;
-        if (_plugins.some(p => p.name === name)) continue;
-        if (!plugin.hooks || typeof plugin.hooks !== 'object') continue;
-        _plugins.push({ name, hooks: plugin.hooks, file, source: 'bundled' });
-        if (SHOULD_LOG) console.error(`[CC Viewer] Bundled plugin loaded: ${name} (${file})`);
-      } catch (err) {
-        if (SHOULD_LOG) console.error(`[CC Viewer] Failed to load bundled plugin "${file}":`, err.message);
-      }
+      dirents = readdirSync(bundledDir, { withFileTypes: true });
+    } catch {
+      dirents = [];
+    }
+    const files = dirents
+      .filter(d => d.isFile() && (d.name.endsWith('.js') || d.name.endsWith('.mjs')))
+      .map(d => d.name)
+      .sort();
+    for (const file of files) {
+      await loadFilePlugin(bundledDir, file, 'bundled');
+    }
+    for (const dirName of listPluginDirs(bundledDir)) {
+      await loadDirPlugin(bundledDir, dirName, 'bundled');
     }
   }
+
+  // Re-attach the runtime's event dispatcher (_plugins was cleared at the top)
+  if (_eventDispatcherPlugin && !_plugins.some(p => p.name === _eventDispatcherPlugin.name)) {
+    _plugins.push(_eventDispatcherPlugin);
+  }
+
+  _generation += 1;
+  return { generation: _generation, entries: _entries };
 }
 
 /**
@@ -140,55 +349,102 @@ export async function runParallelHook(name, context = {}) {
   await Promise.all(tasks);
 }
 
+// ---- Structured access for plugin-runtime ----
+
+export function getPluginEntries() {
+  return _entries;
+}
+
+export function getServiceEntries() {
+  return _entries.filter(e => e.enabled && !e.loadError && e.service);
+}
+
+export function getPluginsGeneration() {
+  return _generation;
+}
+
+// Test-only: reset the module cache (does not affect already imported modules; only later loadPlugins)
+export function _resetModuleCacheForTest() {
+  _moduleCache.clear();
+}
+
 /**
  * 返回所有插件文件信息（含已禁用的），供 /api/plugins 使用
  */
 export function getPluginsInfo() {
-  if (!existsSync(getPluginsDir())) return [];
+  const info = [];
+  const disabledPlugins = readDisabledPlugins();
 
-  let disabledPlugins = [];
-  try {
-    if (existsSync(getPrefsFilePath())) {
-      const prefs = JSON.parse(readFileSync(getPrefsFilePath(), 'utf-8'));
-      if (Array.isArray(prefs.disabledPlugins)) {
-        disabledPlugins = prefs.disabledPlugins;
-      }
+  // Single-file plugins: keep legacy behavior (regex-extract name from source when not loaded)
+  if (existsSync(getPluginsDir())) {
+    let files;
+    try {
+      files = readdirSync(getPluginsDir())
+        .filter(f => f.endsWith('.js') || f.endsWith('.mjs'))
+        .sort();
+    } catch {
+      files = [];
     }
-  } catch { }
 
-  let files;
-  try {
-    files = readdirSync(getPluginsDir())
-      .filter(f => f.endsWith('.js') || f.endsWith('.mjs'))
-      .sort();
-  } catch {
-    return [];
-  }
-
-  return files.map(file => {
-    const loaded = _plugins.find(p => p.file === file);
-    let name = file;
+    for (const file of files) {
+      const loaded = _plugins.find(p => p.file === file);
+      const fileEntry = _entries.find(e => e.shape === 'file' && e.file === file && e.source === 'user');
+      let name = file;
+      let resolvedFromSource = false;
 
-    // 如果插件已加载，使用加载时的 name
-    if (loaded) {
-      name = loaded.name;
-    } else {
-      // 如果插件未加载（可能被禁用），尝试读取文件获取真实的 name
-      try {
-        const filePath = join(getPluginsDir(), file);
-        const content = readFileSync(filePath, 'utf-8');
-        // 简单匹配 name: 'xxx' 或 name: "xxx"
-        const match = content.match(/name\s*:\s*['"]([^'"]+)['"]/);
-        if (match) {
-          name = match[1];
+      if (loaded) {
+        name = loaded.name;
+      } else {
+        try {
+          const filePath = join(getPluginsDir(), file);
+          const content = readFileSync(filePath, 'utf-8');
+          // Simple match for name: 'xxx' or name: "xxx"
+          const match = content.match(/name\s*:\s*['"]([^'"]+)['"]/);
+          if (match) {
+            name = match[1];
+            resolvedFromSource = true;
+          }
+        } catch (err) {
+          reportSwallowed('plugin-loader.info-read', err);
+        }
+        if (!resolvedFromSource && fileEntry) {
+          name = fileEntry.name;
         }
-      } catch {
-        // 读取失败，使用文件名
       }
+
+      const hooks = loaded ? Object.keys(loaded.hooks) : [];
+      const enabled = !disabledPlugins.includes(name);
+      const item = { name, file, hooks, enabled, type: 'hook' };
+      if (fileEntry && fileEntry.loadError) item.loadError = fileEntry.loadError;
+      info.push(item);
+    }
+  }
+
+  // Directory plugins: merge the last loadPlugins result (manifest reads execute no plugin code,
+  // but the list only reflects known state; reload refreshes it)
+  for (const entry of _entries) {
+    if (entry.shape !== 'dir') continue;
+    const item = {
+      name: entry.name,
+      dir: entry.dir,
+      hooks: entry.plugin && entry.plugin.hooks ? Object.keys(entry.plugin.hooks) : [],
+      enabled: entry.enabled && !disabledPlugins.includes(entry.name),
+      type: entry.service ? 'service' : (entry.panel ? 'panel' : (entry.manifest && entry.manifest.mainPath ? 'hook' : 'dir')),
+      source: entry.source,
+    };
+    if (entry.service) item.service = { prefix: entry.service.prefix };
+    if (entry.panel) {
+      item.panel = {
+        title: entry.panel.title,
+        titleI18n: entry.panel.titleI18n,
+        icon: entry.panel.icon,
+        width: entry.panel.width,
+        desktopOnly: entry.panel.desktopOnly,
+      };
     }
+    if (entry.loadError) item.loadError = entry.loadError;
+    info.push(item);
+  }
 
-    const hooks = loaded ? Object.keys(loaded.hooks) : [];
-    const enabled = !disabledPlugins.includes(name);
-    return { name, file, hooks, enabled };
-  });
+  return info;
 }

package/server/lib/plugin-manager.js

@@ -1,7 +1,8 @@
-import { existsSync, mkdirSync, writeFileSync, unlinkSync } from 'node:fs';
-import { join } from 'node:path';
+import { existsSync, mkdirSync, writeFileSync, unlinkSync, rmSync, realpathSync, readFileSync } from 'node:fs';
+import { join, relative, isAbsolute } from 'node:path';
 import { execFile } from 'node:child_process';
 import { tmpdir } from 'node:os';
+import { PLUGIN_NAME_RE } from './plugin-manifest.js';
 
 /**
  * Upload plugin files from a file list.
@@ -116,3 +117,46 @@ export async function installPluginFromUrl(pluginsDir, fileUrl, extractNameScrip
   writeFileSync(join(pluginsDir, filename), content, 'utf-8');
   return { filename };
 }
+
+/**
+ * Delete a directory plugin (service/panel plugin with plugin.json).
+ * Validates: slug shape, realpath containment inside pluginsDir (symlink-safe),
+ * presence of plugin.json, manifest name matching the directory name.
+ * Caller must stop/unload the plugin's service BEFORE calling this (Windows: the
+ * child's cwd is the plugin dir, deletion would EBUSY while it runs).
+ * @param {string} pluginsDir
+ * @param {string} dirName
+ * @throws {Error} with statusCode on validation failure
+ */
+export function deletePluginDir(pluginsDir, dirName) {
+  if (!dirName || !PLUGIN_NAME_RE.test(dirName)) {
+    throw Object.assign(new Error('Invalid directory name'), { statusCode: 400 });
+  }
+  const target = join(pluginsDir, dirName);
+  if (!existsSync(target)) {
+    throw Object.assign(new Error('Directory not found'), { statusCode: 404 });
+  }
+  const realRoot = realpathSync(pluginsDir);
+  const realTarget = realpathSync(target);
+  const rootCmp = process.platform === 'win32' ? realRoot.toLowerCase() : realRoot;
+  const targetCmp = process.platform === 'win32' ? realTarget.toLowerCase() : realTarget;
+  const rel = relative(rootCmp, targetCmp);
+  if (rel === '' || rel.startsWith('..') || isAbsolute(rel)) {
+    throw Object.assign(new Error('Directory escapes plugins root'), { statusCode: 400 });
+  }
+  const manifestPath = join(realTarget, 'plugin.json');
+  if (!existsSync(manifestPath)) {
+    throw Object.assign(new Error('Not a directory plugin (missing plugin.json)'), { statusCode: 400 });
+  }
+  try {
+    const manifest = JSON.parse(readFileSync(manifestPath, 'utf-8'));
+    if (manifest.name && manifest.name !== dirName) {
+      throw Object.assign(new Error(`Manifest name "${manifest.name}" does not match directory "${dirName}"`), { statusCode: 400 });
+    }
+  } catch (err) {
+    if (err.statusCode) throw err;
+    throw Object.assign(new Error('plugin.json is not valid JSON'), { statusCode: 400 });
+  }
+  rmSync(realTarget, { recursive: true, force: true });
+  return { deleted: dirName };
+}