napcat-plugin-debug-cli 1.2.6 → 1.2.8

package/cli.mjs

@@ -5141,7 +5141,7 @@ class RpcClient {
           this.pending.delete(id);
           reject(new Error("RPC timeout"));
         }
-      }, 1e4);
+      }, 3e4);
     });
   }
 }
@@ -5251,6 +5251,23 @@ function copyDirRecursive(src, dest) {
     else fs.copyFileSync(srcPath, destPath);
   }
 }
+function collectFiles(dir, prefix = "") {
+  const files = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const relPath = prefix ? `${prefix}/${entry.name}` : entry.name;
+    const fullPath = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      files.push(...collectFiles(fullPath, relPath));
+    } else {
+      files.push({
+        path: relPath,
+        content: fs.readFileSync(fullPath).toString("base64"),
+        encoding: "base64"
+      });
+    }
+  }
+  return files;
+}
 function countFiles(dir) {
   let count = 0;
   for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
@@ -5259,7 +5276,7 @@ function countFiles(dir) {
   }
   return count;
 }
-async function deployPlugin(projectDir, remotePluginPath, rpc) {
+async function deployPlugin(projectDir, remotePluginPath, rpc, supportsRemoteTransfer) {
   const distDir = path.resolve(projectDir, "dist");
   if (!fs.existsSync(distDir)) {
     logErr(`dist/ 目录不存在: ${distDir}`);
@@ -5283,34 +5300,44 @@ async function deployPlugin(projectDir, remotePluginPath, rpc) {
     logErr(`解析 dist/package.json 失败: ${e.message}`);
     return false;
   }
-  const destDir = path.join(remotePluginPath, pluginName);
-  logInfo(`部署 ${co(pluginName, C.bold, C.cyan)} → ${co(destDir, C.dim)}`);
+  logInfo(`部署 ${co(pluginName, C.bold, C.cyan)} → 远程插件目录`);
   try {
-    if (fs.existsSync(destDir)) {
-      fs.rmSync(destDir, { recursive: true, force: true });
+    if (supportsRemoteTransfer) {
+      await rpc.call("removeDir", pluginName);
+      const files = collectFiles(distDir, pluginName);
+      await rpc.call("writeFiles", files);
+    } else {
+      const destPath = path.join(remotePluginPath, pluginName);
+      if (fs.existsSync(destPath)) {
+        fs.rmSync(destPath, { recursive: true, force: true });
+      }
+      copyDirRecursive(distDir, destPath);
     }
-    copyDirRecursive(distDir, destDir);
-    logOk(`文件复制完成 (${countFiles(distDir)} 个文件)`);
+    logOk(`文件部署完成 (${countFiles(distDir)} 个文件)`);
   } catch (e) {
-    logErr(`复制文件失败: ${e.message}`);
+    logErr(`部署失败: ${e.message}`);
     return false;
   }
   try {
-    await rpc.call("reloadPlugin", pluginName);
-    logOk(`${co(pluginName, C.green, C.bold)} 重载成功`);
-  } catch {
-    try {
-      logInfo("插件未注册，尝试从目录加载...");
-      await rpc.call("loadDirectoryPlugin", pluginName);
+    const ok = await rpc.call("reloadPlugin", pluginName);
+    if (ok) {
+      logOk(`${co(pluginName, C.green, C.bold)} 重载成功`);
+    } else {
+      logInfo("插件未注册或重载失败，尝试从目录加载...");
       try {
-        await rpc.call("setPluginStatus", pluginName, true);
-        await rpc.call("loadPluginById", pluginName);
-      } catch {
+        await rpc.call("loadDirectoryPlugin", pluginName);
+        try {
+          await rpc.call("setPluginStatus", pluginName, true);
+          await rpc.call("loadPluginById", pluginName);
+        } catch {
+        }
+        logOk(`${co(pluginName, C.green, C.bold)} 首次加载成功`);
+      } catch (e2) {
+        logWarn(`自动加载失败: ${e2.message}，请手动 load ${pluginName}`);
       }
-      logOk(`${co(pluginName, C.green, C.bold)} 首次加载成功`);
-    } catch (e2) {
-      logWarn(`自动加载失败: ${e2.message}，请手动 load ${pluginName}`);
     }
+  } catch (e) {
+    logErr(`重载失败: ${e.message}`);
   }
   return true;
 }
@@ -5329,6 +5356,7 @@ async function main() {
   let rpc = null;
   let watcher = null;
   let remotePluginPath = null;
+  let supportsRemoteTransfer = false;
   const dirToId = /* @__PURE__ */ new Map();
   async function refreshMap() {
     if (!rpc) return;
@@ -5366,8 +5394,14 @@ async function main() {
         } catch (e) {
           logWarn(`获取信息失败: ${e.message}`);
         }
+        try {
+          await rpc.call("removeDir", "__probe_nonexistent__");
+          supportsRemoteTransfer = true;
+        } catch {
+          supportsRemoteTransfer = false;
+        }
         if (opts.deploy && remotePluginPath && rpc) {
-          const ok = await deployPlugin(path.resolve(opts.deploy), remotePluginPath, rpc);
+          const ok = await deployPlugin(path.resolve(opts.deploy), remotePluginPath, rpc, supportsRemoteTransfer);
           ws.close(1e3);
           process.exit(ok ? 0 : 1);
         }
@@ -5378,7 +5412,7 @@ async function main() {
           watcher = createWatcher(remotePluginPath, onFileChange);
           watcher.start();
         }
-        startRepl(rpc, watcher, remotePluginPath, onFileChange);
+        startRepl(rpc, watcher, remotePluginPath, onFileChange, supportsRemoteTransfer);
       }
       if (msg.method === "event" && opts.verbose) {
         logInfo(`事件: ${JSON.stringify(msg.params).substring(0, 100)}`);
@@ -5399,7 +5433,7 @@ async function main() {
     process.exit(0);
   });
 }
-function startRepl(rpc, watcher, remotePath, onFileChange) {
+function startRepl(rpc, watcher, remotePath, onFileChange, supportsRemoteTransfer) {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout, prompt: co("debug> ", C.cyan) });
   rl.prompt();
   rl.on("line", async (line) => {
@@ -5484,7 +5518,7 @@ function startRepl(rpc, watcher, remotePath, onFileChange) {
             break;
           }
           const dir = args[0] || ".";
-          await deployPlugin(path.resolve(dir), remotePath, rpc);
+          await deployPlugin(path.resolve(dir), remotePath, rpc, supportsRemoteTransfer);
           break;
         }
         case "watch": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "napcat-plugin-debug-cli",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "type": "module",
   "description": "NapCat 插件调试 CLI — 连接调试服务实现热重载",
   "author": "NapNeko",

package/vite.mjs

@@ -52,7 +52,7 @@ class SimpleRpcClient {
           this.pending.delete(id);
           reject(new Error("RPC timeout"));
         }
-      }, 1e4);
+      }, 3e4);
     });
   }
   get connected() {
@@ -82,6 +82,23 @@ function countFiles(dir) {
   }
   return count;
 }
+function collectFiles(dir, prefix = "") {
+  const files = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const relPath = prefix ? `${prefix}/${entry.name}` : entry.name;
+    const fullPath = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      files.push(...collectFiles(fullPath, relPath));
+    } else {
+      files.push({
+        path: relPath,
+        content: fs.readFileSync(fullPath).toString("base64"),
+        encoding: "base64"
+      });
+    }
+  }
+  return files;
+}
 function napcatHmrPlugin(options = {}) {
   const {
     wsUrl = "ws://127.0.0.1:8998",
@@ -93,6 +110,7 @@ function napcatHmrPlugin(options = {}) {
   const webuiConfigs = webui ? Array.isArray(webui) ? webui : [webui] : [];
   let rpc = null;
   let remotePluginPath = null;
+  let supportsRemoteTransfer = false;
   let connecting = false;
   let config;
   let isFirstBuild = true;
@@ -134,6 +152,12 @@ function napcatHmrPlugin(options = {}) {
                 log(`远程插件目录: ${co(info.pluginPath, C.dim)}`);
               } catch {
               }
+              try {
+                await rpc.call("removeDir", "__probe_nonexistent__");
+                supportsRemoteTransfer = true;
+              } catch {
+                supportsRemoteTransfer = false;
+              }
               connecting = false;
               resolve(true);
             }
@@ -148,6 +172,7 @@ function napcatHmrPlugin(options = {}) {
         ws.on("close", () => {
           rpc = null;
           remotePluginPath = null;
+          supportsRemoteTransfer = false;
           connecting = false;
         });
       });
@@ -178,15 +203,31 @@ function napcatHmrPlugin(options = {}) {
       logErr("解析 dist/package.json 失败");
       return;
     }
-    const destDir = path.join(remotePluginPath, pluginName);
-    try {
-      if (fs.existsSync(destDir)) {
-        fs.rmSync(destDir, { recursive: true, force: true });
+    if (supportsRemoteTransfer) {
+      try {
+        await rpc.call("removeDir", pluginName);
+      } catch (e) {
+        logErr(`清理远程目录失败: ${e.message}`);
+        return;
+      }
+      try {
+        const files = collectFiles(distDir, pluginName);
+        await rpc.call("writeFiles", files);
+      } catch (e) {
+        logErr(`传输文件失败: ${e.message}`);
+        return;
+      }
+    } else {
+      const destDir = path.join(remotePluginPath, pluginName);
+      try {
+        if (fs.existsSync(destDir)) {
+          fs.rmSync(destDir, { recursive: true, force: true });
+        }
+        copyDirRecursive(distDir, destDir);
+      } catch (e) {
+        logErr(`复制文件失败: ${e.message}`);
+        return;
       }
-      copyDirRecursive(distDir, destDir);
-    } catch (e) {
-      logErr(`复制文件失败: ${e.message}`);
-      return;
     }
     const projectRoot = config.root || process.cwd();
     for (const wc of webuiConfigs) {
@@ -214,20 +255,23 @@ function napcatHmrPlugin(options = {}) {
         continue;
       }
       try {
-        const webuiDestDir = path.join(destDir, webuiTargetDir);
-        copyDirRecursive(webuiDistDir, webuiDestDir);
+        if (supportsRemoteTransfer) {
+          const webuiFiles = collectFiles(webuiDistDir, `${pluginName}/${webuiTargetDir}`);
+          await rpc.call("writeFiles", webuiFiles);
+        } else {
+          const destDir = path.join(remotePluginPath, pluginName);
+          const webuiDestDir = path.join(destDir, webuiTargetDir);
+          copyDirRecursive(webuiDistDir, webuiDestDir);
+        }
         logOk(`WebUI (${webuiTargetDir}) 已部署 (${countFiles(webuiDistDir)} 个文件)`);
       } catch (e) {
         logErr(`WebUI (${webuiTargetDir}) 部署失败: ${e.message}`);
       }
     }
-    try {
-      const reloaded = await rpc.call("reloadPlugin", pluginName);
-      if (reloaded === false) {
-        throw new Error("not registered");
-      }
+    const reloaded = await rpc.call("reloadPlugin", pluginName);
+    if (reloaded) {
       logHmr(`${co(pluginName, C.green, C.bold)} 已重载 (${countFiles(distDir)} 个文件)`);
-    } catch {
+    } else {
       try {
         await rpc.call("loadDirectoryPlugin", pluginName);
         try {
@@ -260,7 +304,6 @@ function napcatHmrPlugin(options = {}) {
     } catch {
       return;
     }
-    const destDir = path.join(remotePluginPath, pluginName);
     const projectRoot = config.root || process.cwd();
     let hasChanges = false;
     for (const wc of webuiConfigs) {
@@ -288,11 +331,18 @@ function napcatHmrPlugin(options = {}) {
         continue;
       }
       try {
-        const webuiDestDir = path.join(destDir, webuiTargetDir);
-        if (fs.existsSync(webuiDestDir)) {
-          fs.rmSync(webuiDestDir, { recursive: true, force: true });
+        if (supportsRemoteTransfer) {
+          await rpc.call("removeDir", `${pluginName}/${webuiTargetDir}`);
+          const webuiFiles = collectFiles(webuiDistDir, `${pluginName}/${webuiTargetDir}`);
+          await rpc.call("writeFiles", webuiFiles);
+        } else {
+          const destDir = path.join(remotePluginPath, pluginName);
+          const webuiDestDir = path.join(destDir, webuiTargetDir);
+          if (fs.existsSync(webuiDestDir)) {
+            fs.rmSync(webuiDestDir, { recursive: true, force: true });
+          }
+          copyDirRecursive(webuiDistDir, webuiDestDir);
         }
-        copyDirRecursive(webuiDistDir, webuiDestDir);
         logOk(`WebUI (${webuiTargetDir}) 已部署 (${countFiles(webuiDistDir)} 个文件)`);
         hasChanges = true;
       } catch (e) {