napcat-plugin-debug-cli 1.2.5 → 1.2.7

package/cli.mjs

@@ -5141,7 +5141,7 @@ class RpcClient {
           this.pending.delete(id);
           reject(new Error("RPC timeout"));
         }
-      }, 1e4);
+      }, 3e4);
     });
   }
 }
@@ -5242,14 +5242,22 @@ function createWatcher(watchPath, onPluginChange) {
     }
   };
 }
-function copyDirRecursive(src, dest) {
-  if (!fs.existsSync(dest)) fs.mkdirSync(dest, { recursive: true });
-  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
-    const srcPath = path.join(src, entry.name);
-    const destPath = path.join(dest, entry.name);
-    if (entry.isDirectory()) copyDirRecursive(srcPath, destPath);
-    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;
@@ -5283,16 +5291,14 @@ 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 });
-    }
-    copyDirRecursive(distDir, destDir);
-    logOk(`文件复制完成 (${countFiles(distDir)} 个文件)`);
+    await rpc.call("removeDir", pluginName);
+    const files = collectFiles(distDir, pluginName);
+    await rpc.call("writeFiles", files);
+    logOk(`文件传输完成 (${countFiles(distDir)} 个文件)`);
   } catch (e) {
-    logErr(`复制文件失败: ${e.message}`);
+    logErr(`部署失败: ${e.message}`);
     return false;
   }
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "napcat-plugin-debug-cli",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "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() {
@@ -65,15 +65,6 @@ class SimpleRpcClient {
     }
   }
 }
-function copyDirRecursive(src, dest) {
-  if (!fs.existsSync(dest)) fs.mkdirSync(dest, { recursive: true });
-  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
-    const srcPath = path.join(src, entry.name);
-    const destPath = path.join(dest, entry.name);
-    if (entry.isDirectory()) copyDirRecursive(srcPath, destPath);
-    else fs.copyFileSync(srcPath, destPath);
-  }
-}
 function countFiles(dir) {
   let count = 0;
   for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
@@ -82,6 +73,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",
@@ -178,14 +186,17 @@ 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 });
-      }
-      copyDirRecursive(distDir, destDir);
+      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}`);
+      logErr(`传输文件失败: ${e.message}`);
       return;
     }
     const projectRoot = config.root || process.cwd();
@@ -196,9 +207,12 @@ function napcatHmrPlugin(options = {}) {
       if (wc.buildCommand) {
         try {
           log(`构建 WebUI (${co(webuiTargetDir, C.cyan)})...`);
+          const webuiEnv = { ...process.env };
+          delete webuiEnv.NODE_ENV;
           execSync(wc.buildCommand, {
             cwd: webuiRoot,
-            stdio: "pipe"
+            stdio: "pipe",
+            env: webuiEnv
           });
           logOk(`WebUI (${webuiTargetDir}) 构建完成`);
         } catch (e) {
@@ -211,8 +225,8 @@ function napcatHmrPlugin(options = {}) {
         continue;
       }
       try {
-        const webuiDestDir = path.join(destDir, webuiTargetDir);
-        copyDirRecursive(webuiDistDir, webuiDestDir);
+        const webuiFiles = collectFiles(webuiDistDir, `${pluginName}/${webuiTargetDir}`);
+        await rpc.call("writeFiles", webuiFiles);
         logOk(`WebUI (${webuiTargetDir}) 已部署 (${countFiles(webuiDistDir)} 个文件)`);
       } catch (e) {
         logErr(`WebUI (${webuiTargetDir}) 部署失败: ${e.message}`);
@@ -257,7 +271,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) {
@@ -267,9 +280,12 @@ function napcatHmrPlugin(options = {}) {
       if (wc.buildCommand) {
         try {
           log(`构建 WebUI (${co(webuiTargetDir, C.cyan)})...`);
+          const webuiEnv = { ...process.env };
+          delete webuiEnv.NODE_ENV;
           execSync(wc.buildCommand, {
             cwd: webuiRoot,
-            stdio: "pipe"
+            stdio: "pipe",
+            env: webuiEnv
           });
           logOk(`WebUI (${webuiTargetDir}) 构建完成`);
         } catch (e) {
@@ -282,11 +298,9 @@ function napcatHmrPlugin(options = {}) {
         continue;
       }
       try {
-        const webuiDestDir = path.join(destDir, webuiTargetDir);
-        if (fs.existsSync(webuiDestDir)) {
-          fs.rmSync(webuiDestDir, { recursive: true, force: true });
-        }
-        copyDirRecursive(webuiDistDir, webuiDestDir);
+        await rpc.call("removeDir", `${pluginName}/${webuiTargetDir}`);
+        const webuiFiles = collectFiles(webuiDistDir, `${pluginName}/${webuiTargetDir}`);
+        await rpc.call("writeFiles", webuiFiles);
         logOk(`WebUI (${webuiTargetDir}) 已部署 (${countFiles(webuiDistDir)} 个文件)`);
         hasChanges = true;
       } catch (e) {