@beltar/n8n-nodes-extract-archive 1.1.1 → 1.3.0

package/dist/nodes/ExtractArchive/ExtractArchive.node.d.ts

@@ -2,9 +2,10 @@ import { IExecuteFunctions, INodeExecutionData, INodeType, INodeTypeDescription
 export declare class ExtractArchive implements INodeType {
     description: INodeTypeDescription;
     private detectArchiveType;
-    private checkToolAvailable;
     private extractZip;
     private extractRar;
+    private extractNestedZips;
+    private findZipFiles;
     private getAllFiles;
     private matchesFilter;
     private getMimeType;

package/dist/nodes/ExtractArchive/ExtractArchive.node.js

@@ -32,16 +32,17 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExtractArchive = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
-const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
 const crypto = __importStar(require("crypto"));
 const path = __importStar(require("path"));
-const util_1 = require("util");
 const promises_1 = require("stream/promises");
-const execAsync = (0, util_1.promisify)(child_process_1.exec);
+const adm_zip_1 = __importDefault(require("adm-zip"));
 class ExtractArchive {
     constructor() {
         this.description = {
@@ -195,6 +196,13 @@ class ExtractArchive {
                         },
                     },
                 },
+                {
+                    displayName: 'Recursive Extract',
+                    name: 'recursiveExtract',
+                    type: 'boolean',
+                    default: false,
+                    description: 'Whether to recursively extract nested ZIP archives found inside the extracted files until no more ZIP files remain',
+                },
                 {
                     displayName: 'Include Subdirectories',
                     name: 'includeSubdirectories',
@@ -246,26 +254,9 @@ class ExtractArchive {
         // Default to zip
         return 'zip';
     }
-    checkToolAvailable(tool) {
-        try {
-            (0, child_process_1.execSync)(`which ${tool}`, { encoding: 'utf-8', stdio: 'pipe' });
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
     async extractZip(archivePath, outputDir, password) {
-        if (!this.checkToolAvailable('unzip')) {
-            throw new Error('unzip is not installed. Please install it: apk add unzip (Alpine) or apt-get install unzip (Debian/Ubuntu)');
-        }
-        const args = ['-o', '-q']; // Overwrite, quiet
-        if (password) {
-            args.push('-P', password);
-        }
-        args.push(archivePath, '-d', outputDir);
-        const command = `unzip ${args.map(a => `"${a}"`).join(' ')}`;
-        await execAsync(command);
+        const zip = new adm_zip_1.default(archivePath);
+        zip.extractAllTo(outputDir, true, undefined, password || undefined);
     }
     async extractRar(archivePath, outputDir, password) {
         const { createExtractorFromFile } = await Promise.resolve().then(() => __importStar(require('node-unrar-js')));
@@ -279,6 +270,34 @@ class ExtractArchive {
             // Iterating drives extraction; nothing else needed since targetPath handles file writing
         }
     }
+    async extractNestedZips(dir, password) {
+        let foundZip = true;
+        while (foundZip) {
+            foundZip = false;
+            const zipFiles = this.findZipFiles(dir);
+            for (const zipPath of zipFiles) {
+                foundZip = true;
+                const extractTarget = zipPath.replace(/\.zip$/i, '');
+                fs.mkdirSync(extractTarget, { recursive: true });
+                await this.extractZip(zipPath, extractTarget, password);
+                fs.unlinkSync(zipPath);
+            }
+        }
+    }
+    findZipFiles(dir) {
+        const results = [];
+        const entries = fs.readdirSync(dir, { withFileTypes: true });
+        for (const entry of entries) {
+            const fullPath = path.join(dir, entry.name);
+            if (entry.isDirectory()) {
+                results.push(...this.findZipFiles(fullPath));
+            }
+            else if (entry.isFile() && /\.zip$/i.test(entry.name)) {
+                results.push(fullPath);
+            }
+        }
+        return results;
+    }
     getAllFiles(dir, includeSubdirs) {
         const files = [];
         const readDir = (currentDir, relativePath = '') => {
@@ -419,6 +438,11 @@ class ExtractArchive {
                     else if (archiveType === 'rar') {
                         await extractor.extractRar(archivePath, extractDir, password || undefined);
                     }
+                    // Recursively extract nested ZIP archives
+                    const recursiveExtract = this.getNodeParameter('recursiveExtract', itemIndex);
+                    if (recursiveExtract) {
+                        await extractor.extractNestedZips(extractDir, password || undefined);
+                    }
                     // Get all extracted files
                     let files = extractor.getAllFiles(extractDir, includeSubdirectories);
                     // Apply file filter

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beltar/n8n-nodes-extract-archive",
-  "version": "1.1.1",
+  "version": "1.3.0",
   "description": "n8n node to extract ZIP and RAR archive files. Supports binary data or file path input.",
   "keywords": [
     "n8n",
@@ -40,6 +40,7 @@
     ]
   },
   "devDependencies": {
+    "@types/adm-zip": "^0.5.7",
     "@types/node": "^20.10.0",
     "n8n-workflow": "^1.20.0",
     "shx": "^0.4.0",
@@ -52,6 +53,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
+    "adm-zip": "^0.5.16",
     "node-unrar-js": "^2.0.2"
   }
 }