@dcrays/dcgchat 0.1.9 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/dcgchat",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "type": "module",
   "description": "OpenClaw channel plugin for DCG Chat (WebSocket)",
   "main": "index.ts",

package/src/skill.ts

@@ -2,6 +2,7 @@
 import axios from 'axios';
 /** @ts-ignore */
 import unzipper from 'unzipper';
+import { pipeline } from "stream/promises";
 import fs from 'fs';
 import path from 'path';
 import { logDcgchat } from './log.js';
@@ -53,36 +54,74 @@ export async function installSkill(params: ISkillParams, msgContent: Record<stri
     fs.mkdirSync(skillDir, { recursive: true });
     // 解压文件到目标目录，跳过顶层文件夹
     await new Promise((resolve, reject) => {
-      response.data
-        .pipe(unzipper.Parse())
-        .on('entry', (entry: any) => {
-          const entryPath = entry.path;
-          // 跳过顶层目录，只处理子文件和文件夹
-          const pathParts = entryPath.split('/');
-          if (pathParts.length > 1) {
-            // 移除第一级目录
-            const newPath = pathParts.slice(1).join('/');
-            const targetPath = path.join(skillDir, newPath);
-            
-            if (entry.type === 'Directory') {
-              fs.mkdirSync(targetPath, { recursive: true });
-              entry.autodrain();
-            } else {
-              // 确保父目录存在
-              const parentDir = path.dirname(targetPath);
-              if (!fs.existsSync(parentDir)) {
-                fs.mkdirSync(parentDir, { recursive: true });
-              }
-              entry.pipe(fs.createWriteStream(targetPath));
-            }
-          } else {
-            entry.autodrain();
-          }
-        })
-        .on('close', resolve)
-        .on('error', reject);
+  const tasks: Promise<void>[] = [];
+  let rootDir: string | null = null;
+  let hasError = false;
+  
+  response.data
+    .pipe(unzipper.Parse())
+    .on("entry", (entry: any) => {
+      if (hasError) {
+        entry.autodrain();
+        return;
+      }
+      
+      try {
+        const entryPath = entry.path;
+        const pathParts = entryPath.split("/");
+        
+        // 检测根目录
+        if (!rootDir && pathParts.length > 1) {
+          rootDir = pathParts[0];
+        }
+
+        let newPath = entryPath;
+
+        // 移除顶层文件夹
+        if (rootDir && entryPath.startsWith(rootDir + "/")) {
+          newPath = entryPath.slice(rootDir.length + 1);
+        }
+
+        if (!newPath) {
+          entry.autodrain();
+          return;
+        }
+        
+        const targetPath = path.join(skillDir, newPath);
+
+        if (entry.type === "Directory") {
+          fs.mkdirSync(targetPath, { recursive: true });
+          entry.autodrain();
+        } else {
+          const parentDir = path.dirname(targetPath);
+          fs.mkdirSync(parentDir, { recursive: true });
+          const writeStream = fs.createWriteStream(targetPath);
+          const task = pipeline(entry, writeStream).catch((err) => {
+            hasError = true;
+            throw new Error(`解压文件失败 ${entryPath}: ${err.message}`);
+          });
+          tasks.push(task);
+        }
+      } catch (err) {
+        hasError = true;
+        entry.autodrain();
+        reject(new Error(`处理entry失败: ${err}`));
+      }
+    })
+    .on("close", async () => {
+      try {
+        await Promise.all(tasks);
+        resolve(null);
+      } catch (err) {
+        reject(err);
+      }
+    })
+    .on("error", (err) => {
+      hasError = true;
+      reject(new Error(`解压流错误: ${err.message}`));
     });
-    sendEvent({ ...msgContent, status: 'ok' })
+  });
+  sendEvent({ ...msgContent, status: 'ok' })
   } catch (error) {
     // 如果安装失败，清理目录
     if (fs.existsSync(skillDir)) {