cispacempt-v2 0.1.0 → 0.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "main": "src/index.js",
   "name": "cispacempt-v2",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Fast CI engine for CodespaceMPT with script stages and file system hooks",
   "author": "argentidev",
   "license": "MIT",

package/src/index.js

@@ -2,8 +2,92 @@ const path = require("path"),
     os = require("os"),
     fs = require("fs"),
     { spawn } = require("child_process"),
-    { prepareProotEnv } = require("./lib/prootEnv"),
     yaml = require("js-yaml"),
+    https = require("https"),
+    { spawnSync } = require("child_process"),
+    rootfsMap = {
+        debian: "https://github.com/EXALAB/Anlinux-Resources/blob/master/Rootfs/Debian/arm64/debian-rootfs-arm64.tar.xz",
+        alpine: "https://dl-cdn.alpinelinux.org/alpine/latest-stable/releases/x86_64/alpine-minirootfs-3.19.1-x86_64.tar.gz",
+        ubuntu: "https://partner-images.canonical.com/core/focal/current/ubuntu-focal-core-cloudimg-amd64-root.tar.gz",
+        arch: "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-bootstrap-x86_64.tar.gz",
+        void: "https://repo-default.voidlinux.org/live/current/void-x86_64-ROOTFS-20230628.tar.xz",
+        fedora: "https://download.fedoraproject.org/pub/fedora/linux/releases/39/Container/x86_64/images/Fedora-Container-Base-39-1.5.x86_64.tar.xz",
+        centos: "https://buildlogs.centos.org/centos/7/container/x86_64/images/CentOS-7-Container-7.9.2009-20210916.0.x86_64.tar.xz"
+    };
+    
+    const downloadFile = (url, dest) => new Promise((resolve, reject) => {
+        console.log(`Starting download from: ${url}`);
+        const file = fs.createWriteStream(dest);
+    
+        const request = https.get(url, (response) => {
+            if (response.statusCode >= 300 && response.statusCode < 400 && response.headers.location) {
+                console.log(`Redirected to: ${response.headers.location}`);
+                // Si hay redirección, cerrar este stream y descargar la nueva url
+                file.close();
+                fs.unlinkSync(dest);
+                return downloadFile(response.headers.location, dest).then(resolve).catch(reject);
+            }
+    
+            if (response.statusCode !== 200) {
+                file.close();
+                fs.unlinkSync(dest);
+                return reject(new Error(`Failed to download file, status code: ${response.statusCode}`));
+            }
+    
+            response.pipe(file);
+    
+            file.on("finish", () => {
+                console.log(`Download finished: ${dest}`);
+                file.close(resolve);
+            });
+        });
+    
+        request.on("error", (err) => {
+            console.error(`Download error: ${err.message}`);
+            file.close();
+            fs.unlinkSync(dest);
+            reject(err);
+        });
+    
+        file.on("error", (err) => {
+            console.error(`File write error: ${err.message}`);
+            file.close();
+            fs.unlinkSync(dest);
+            reject(err);
+        });
+    }),    
+    prepareProotEnv = async (osName, cacheDir) => {
+        const prootBin = path.join(cacheDir, "proot");
+        const rootfsDir = path.join(cacheDir, `rootfs_${osName}`);
+        const tarball = path.join(cacheDir, `${osName}.tar.${osName.includes("xz") ? "xz" : "gz"}`);
+    
+        // Crear el directorio cacheDir si no existe
+        fs.mkdirSync(cacheDir, { recursive: true });
+
+        // Descargar proot
+        if (!fs.existsSync(prootBin)) {
+            const url = "https://proot.gitlab.io/proot/bin/proot";
+            await downloadFile(url, prootBin);
+            fs.chmodSync(prootBin, 0o755);
+        }
+    
+        // Descargar rootfs
+        if (!fs.existsSync(rootfsDir)) {
+            const url = rootfsMap[osName]; 
+            if (!url) throw new Error(`Unsupported OS "${osName}"`);
+            await downloadFile(url, tarball);
+    
+            fs.mkdirSync(rootfsDir, { recursive: true });
+    
+            // Extraer el tarball
+            const extCmd = tarball.endsWith(".xz") ? "tar -xJf" : "tar -xzf";
+            spawnSync(extCmd, [tarball, "-C", rootfsDir], { shell: true });
+    
+            fs.unlinkSync(tarball); // limpiar
+        }
+
+        return { prootBin, rootfsDir };
+    },
     getCPUUsageSnapshot = function () {
         const cpus = os.cpus();
         return cpus.map(cpu => ({ ...cpu.times }));
@@ -214,8 +298,9 @@ module.exports = {
                             await new Promise(async (res) => {
                                 const commandToRun = resolvedCommand;
                                 let finalCommand;
-                                if (ciScript.os && Object.keys(require("./lib/prootEnv").prepareProotEnv.rootfsMap || {}).includes(ciScript.os)) {
+                                if (ciScript.os && Object.keys(rootfsMap || {}).includes(ciScript.os)) {
                                     const { prootBin, rootfsDir } = await prepareProotEnv(ciScript.os, path.join(__dirname, "ci_proot_cache"));
+                                    console.log("PROOT BIN:", prootBin, fs.existsSync(prootBin)); 
 
                                     finalCommand = `${prootBin} -R ${rootfsDir} -b ${tempDir}:/sandbox -w /sandbox /bin/sh -c "${commandToRun.replace(/"/g, '\\"')}"`;
                                 } else {

package/src/lib/prootEnv.js

@@ -1,59 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-const { spawnSync } = require("child_process");
-const https = require("https");
-
-const rootfsMap = {
-    debian: "https://github.com/Proot-me/proot-distro/releases/download/20240515/debian-rootfs.tar.gz",
-    alpine: "https://dl-cdn.alpinelinux.org/alpine/latest-stable/releases/x86_64/alpine-minirootfs-3.19.1-x86_64.tar.gz",
-    ubuntu: "https://partner-images.canonical.com/core/focal/current/ubuntu-focal-core-cloudimg-amd64-root.tar.gz",
-    arch: "https://mirror.rackspace.com/archlinux/iso/latest/archlinux-bootstrap-x86_64.tar.gz",
-    void: "https://repo-default.voidlinux.org/live/current/void-x86_64-ROOTFS-20230628.tar.xz",
-    fedora: "https://download.fedoraproject.org/pub/fedora/linux/releases/39/Container/x86_64/images/Fedora-Container-Base-39-1.5.x86_64.tar.xz",
-    centos: "https://buildlogs.centos.org/centos/7/container/x86_64/images/CentOS-7-Container-7.9.2009-20210916.0.x86_64.tar.xz"
-};
-
-const downloadFile = (url, dest) => new Promise((resolve, reject) => {
-    const file = fs.createWriteStream(dest);
-    https.get(url, (response) => {
-        response.pipe(file);
-        file.on("finish", () => {
-            file.close(resolve);
-        });
-    }).on("error", (err) => {
-        fs.unlinkSync(dest);
-        reject(err);
-    });
-});
-
-async function prepareProotEnv(osName, cacheDir) {
-    const prootBin = path.join(cacheDir, "proot");
-    const rootfsDir = path.join(cacheDir, `rootfs_${osName}`);
-    const tarball = path.join(cacheDir, `${osName}.tar.${osName.includes("xz") ? "xz" : "gz"}`);
-
-    // Descargar proot
-    if (!fs.existsSync(prootBin)) {
-        const url = "https://github.com/proot-me/proot/releases/download/v5.3.0/proot-static";
-        await downloadFile(url, prootBin);
-        fs.chmodSync(prootBin, 0o755);
-    }
-
-    // Descargar rootfs
-    if (!fs.existsSync(rootfsDir)) {
-        const url = rootfsMap[osName];
-        if (!url) throw new Error(`Unsupported OS "${osName}"`);
-        await downloadFile(url, tarball);
-
-        fs.mkdirSync(rootfsDir, { recursive: true });
-
-        // Extraer el tarball
-        const extCmd = tarball.endsWith(".xz") ? "tar -xJf" : "tar -xzf";
-        spawnSync(extCmd, [tarball, "-C", rootfsDir], { shell: true });
-
-        fs.unlinkSync(tarball); // limpiar
-    }
-
-    return { prootBin, rootfsDir };
-}
-
-module.exports = { prepareProotEnv };