Update

5 files changed, 195 insertions, 154 deletions

diff --git a/commands/installable.js b/commands/installable.js
index 6e76115..fc0f221 100644
--- a/commands/installable.js
+++ b/commands/installable.js
@@ -1,5 +1,5 @@
 module.exports = async () => {
-    let packages = JSON.parse(fs.readFileSync(home + "/repository/list.json").toString());
+    let packages = JSON.parse(fs.readFileSync(home + "/repository/list.json").toString()).sort();
     let installed = JSON.parse(fs.readFileSync(home + "/installed.json").toString()).map(i => i.id);
     let installs = JSON.parse(fs.readFileSync(home + "/installed.json").toString());
 
diff --git a/commands/installed.js b/commands/installed.js
index b24d2bd..c893af0 100644
--- a/commands/installed.js
+++ b/commands/installed.js
@@ -1,5 +1,5 @@
 module.exports = async () => {
-    let packages = JSON.parse(fs.readFileSync(home + "/repository/list.json").toString());
+    let packages = JSON.parse(fs.readFileSync(home + "/repository/list.json").toString()).sort();
     let installed = JSON.parse(fs.readFileSync(home + "/installed.json").toString()).map(i => i.id);
     let installs = JSON.parse(fs.readFileSync(home + "/installed.json").toString());
 
diff --git a/commands/list.js b/commands/list.js
index 9dc0020..b0f9e5e 100644
--- a/commands/list.js
+++ b/commands/list.js
@@ -1,5 +1,5 @@
 module.exports = async () => {
-    let packages = JSON.parse(fs.readFileSync(home + "/repository/list.json").toString());
+    let packages = JSON.parse(fs.readFileSync(home + "/repository/list.json").toString()).sort();
     let installed = JSON.parse(fs.readFileSync(home + "/installed.json").toString()).map(i => i.id);
     let installs = JSON.parse(fs.readFileSync(home + "/installed.json").toString());
 
diff --git a/commands/upgrade.js b/commands/upgrade.js
index 01f6be9..93d906d 100644
--- a/commands/upgrade.js
+++ b/commands/upgrade.js
@@ -1,11 +1,132 @@
+async function processQueue() {
+    let pack = installed.filter(i => i.id === queue[0])[0];
+    let dir = pack.id.substring(0, 1).replace(/[^a-zA-Z0-9]/gm, "#");
+    let pkg = JSON.parse(fs.readFileSync(home + "/repository/" + dir + "/" + pack.id + ".json").toString());
+    let installable = true;
+
+    let version = pkg.verdata.latest;
+    let publisher = pkg.verdata.publisher.name;
+    let publisherMail = pkg.verdata.publisher.email;
+    let date = moment(pkg.verdata.date).fromNow();
+
+    let signed = false;
+    let signInfo = "";
+    let verified = false;
+
+    if (pkg.sign.signed) {
+        signed = true;
+        verified = pkg.sign.verified;
+        if (pkg.sign.signer.name && pkg.sign.signer.email && pkg.sign.key) {
+            signInfo = pkg.sign.signer.name + " <" + pkg.sign.signer.email + "> " + c.gray("(" + pkg.sign.key + ")");
+        } else if (pkg.sign.signer.name && pkg.sign.key) {
+            signInfo = pkg.sign.signer.name + c.gray(" (" + pkg.sign.key + ")");
+        } else if (pkg.sign.signer.email && pkg.sign.key) {
+            signInfo = pkg.sign.signer.email + c.gray(" (" + pkg.sign.key + ")");
+        } else if (pkg.sign.key) {
+            signInfo = pkg.sign.key;
+        }
+    }
+
+    spinner = ora("Checking dependencies...").start();
+    for (let dependency of pkg.depends) {
+        let cmd = "which";
+        if (os.platform() === "win32") { cmd = "where"; }
+        try {
+            if (require('child_process').spawnSync(cmd, [dependency]).status !== 0) {
+                spinner.fail("Checking dependencies... failed")
+                die(c.red("error: ") + "package '" + pack.id + "' depends on '" + dependency + "' which is not installed");
+            }
+        } catch (e) {
+            spinner.fail("Checking dependencies... failed")
+            die(c.red("error: ") + "unable to check for '" + dependency + "'");
+        }
+    }
+    spinner.succeed("Checking dependencies... done")
+
+    console.log("  Installing '" + pkg.name + "'...")
+    console.log("      version:   " + pack.version + " -> " + version);
+    console.log("      release:   " + date);
+    console.log("      publisher: " + publisher + " <" + publisherMail + ">");
+
+    if (signed) {
+        if (verified) {
+            console.log("      security:  " + c.green("verified") + " " + signInfo);
+        } else {
+            console.log("      security:  " + c.yellow("unverified") + " " + signInfo);
+        }
+    } else {
+        console.log("      security:  " + c.red.inverse("unsafe"));
+    }
+
+    try {
+        if (!signed && !(await prompts.confirm({
+            message: "This package is unsafe, installing it may damage your system. Are you sure you want to continue?",
+            initial: false
+        }))) {
+            installable = false;
+        }
+    } catch (e) {
+        installable = false;
+    }
+
+    if (installable) {
+        if (fs.existsSync(home + "/buildroot")) { fs.rmSync(home + "/buildroot", { recursive: true }) }
+        require('../hooks/clone')(pkg.repo, pkg.branch, async () => {
+            spinner = ora("Extracting package...").start();
+            if (fs.existsSync(home + "/packages/" + pkg.id + "--update-" + version)) fs.rmSync(home + "/packages/" + pkg.id + "--update-" + version, { recursive: true })
+            fs.renameSync(home + "/buildroot", home + "/packages/" + pkg.id + "--update-" + version);
+            let change = require('../hooks/diff')(pkg.id, pkg.id + "--update-" + version);
+            require('../hooks/apply_update')(pkg.id, pkg.id + "--update-" + version);
+            fs.rmSync(home + "/packages/" + pkg.id + "--update-" + version, { recursive: true });
+            delete installed[installed.map(i => i.id).indexOf(pkg.id)];
+            installed.push({
+                id: pkg.id,
+                date: new Date().toISOString(),
+                version,
+                files: require('../hooks/files')(pkg.id)
+            })
+            fs.writeFileSync(os.homedir() + "/.twilight/installed.json", JSON.stringify(installed));
+            spinner.succeed("Extracting package... done");
+            console.log("  Size change: " + change);
+
+            if (os.platform() === "win32" && typeof pkg.executable.windows === "string") {
+                fs.writeFileSync(os.homedir() + "/.twilight/binaries/" + pkg.id + ".bat", pkg.executable.windows);
+            } else if (os.platform() === "linux" && typeof pkg.executable.linux === "string") {
+                fs.writeFileSync(os.homedir() + "/.twilight/binaries/" + exec, pkg.executable.linux);
+                require('child_process').spawnSync("chmod", [ "+x", os.homedir() + "/.twilight/binaries/" + exec ])
+            } else if (os.platform() === "darwin" && typeof pkg.executable.mac === "string") {
+                fs.writeFileSync(os.homedir() + "/.twilight/binaries/" + exec, pkg.executable.mac);
+                require('child_process').spawnSync("chmod", [ "+x", os.homedir() + "/.twilight/binaries/" + exec ])
+            }
+
+            let postinstall = [];
+            if (os.platform() === "win32") postinstall = pkg.postinstall.windows;
+            if (os.platform() === "linux") postinstall = pkg.postinstall.linux;
+            if (os.platform() === "darwin") postinstall = pkg.postinstall.mac;
+
+            if (postinstall.length > 0) {
+                spinner = ora("Running post-install hooks...").start();
+                for (let hook of postinstall) {
+                    require('child_process').execSync(hook, { stdio: "inherit" })
+                }
+                spinner.succeed("Running post-install hooks... done");
+            }
+
+            queue.shift();
+            if (queue.length > 0) await processQueue();
+        })
+    }
+}
+
 module.exports = async (argv) => {
-    const installed = JSON.parse(fs.readFileSync(home + "/installed.json").toString());
+    global.installed = JSON.parse(fs.readFileSync(home + "/installed.json").toString());
 
     let spinner = ora("Reading package lists...").start();
     let packages = JSON.parse(fs.readFileSync(home + "/repository/list.json").toString());
     spinner.succeed("Reading packages lists... done");
     let updated = false;
     let affected = false;
+    global.queue = [];
 
     for (let pack of installed) {
         if (!packages.includes(pack.id)) {
@@ -17,6 +138,25 @@ module.exports = async (argv) => {
             if ((argv.package !== undefined && argv.package === pack.id) || argv.package === undefined) {
                 updated = true;
 
+                if (os.platform() === "win32" && pkg.platforms.windows === 0) {
+                    console.log(c.yellow("warn: ") + "package '" + pack.id + "' not available on platform 'win32' anymore");
+                    installable = false;
+                } else if (os.platform() === "linux" && pkg.platforms.linux === 0) {
+                    console.log(c.yellow("warn: ") + "package '" + pack.id + "' not available on platform 'linux' anymore");
+                    installable = false;
+                } else if (os.platform() === "darwin" && pkg.platforms.mac === 0) {
+                    console.log(c.yellow("warn: ") + "package '" + pack.id + "' not available on platform 'macos' anymore");
+                    installable = false;
+                }
+
+                if (os.platform() === "win32" && pkg.platforms.windows === 1) {
+                    console.log(c.yellow("warn: ") + "package '" + pack.id + "' is experimental on platform 'win32'");
+                } else if (os.platform() === "linux" && pkg.platforms.linux === 1) {
+                    console.log(c.yellow("warn: ") + "package '" + pack.id + "' is experimental on platform 'linux'");
+                } else if (os.platform() === "darwin" && pkg.platforms.mac === 1) {
+                    console.log(c.yellow("warn: ") + "package '" + pack.id + "' is experimental on platform 'macos'");
+                }
+
                 if (installable) {
                     let version = pkg.verdata.latest;
                     let publisher = pkg.verdata.publisher.name;
@@ -42,113 +182,8 @@ module.exports = async (argv) => {
                     }
 
                     if (pack.version !== version) {
+                        queue.push(pack.id);
                         affected = true;
-
-                        if (os.platform() === "win32" && pkg.platforms.windows === 0) {
-                            console.log(c.yellow("warn: ") + "package '" + pack.id + "' not available on platform 'win32' anymore");
-                            installable = false;
-                        } else if (os.platform() === "linux" && pkg.platforms.linux === 0) {
-                            console.log(c.yellow("warn: ") + "package '" + pack.id + "' not available on platform 'linux' anymore");
-                            installable = false;
-                        } else if (os.platform() === "darwin" && pkg.platforms.mac === 0) {
-                            console.log(c.yellow("warn: ") + "package '" + pack.id + "' not available on platform 'macos' anymore");
-                            installable = false;
-                        }
-
-                        if (os.platform() === "win32" && pkg.platforms.windows === 1) {
-                            console.log(c.yellow("warn: ") + "package '" + pack.id + "' is experimental on platform 'win32'");
-                        } else if (os.platform() === "linux" && pkg.platforms.linux === 1) {
-                            console.log(c.yellow("warn: ") + "package '" + pack.id + "' is experimental on platform 'linux'");
-                        } else if (os.platform() === "darwin" && pkg.platforms.mac === 1) {
-                            console.log(c.yellow("warn: ") + "package '" + pack.id + "' is experimental on platform 'macos'");
-                        }
-
-                        spinner = ora("Checking dependencies...").start();
-                        for (let dependency of pkg.depends) {
-                            let cmd = "which";
-                            if (os.platform() === "win32") { cmd = "where"; }
-                            try {
-                                if (require('child_process').spawnSync(cmd, [dependency]).status !== 0) {
-                                    spinner.fail("Checking dependencies... failed")
-                                    die(c.red("error: ") + "package '" + pack.id + "' depends on '" + dependency + "' which is not installed");
-                                }
-                            } catch (e) {
-                                spinner.fail("Checking dependencies... failed")
-                                die(c.red("error: ") + "unable to check for '" + dependency + "'");
-                            }
-                        }
-                        spinner.succeed("Checking dependencies... done")
-
-                        console.log("  Installing '" + pkg.name + "'...")
-                        console.log("      version:   " + pack.version + " -> " + version);
-                        console.log("      release:   " + date);
-                        console.log("      publisher: " + publisher + " <" + publisherMail + ">");
-
-                        if (signed) {
-                            if (verified) {
-                                console.log("      security:  " + c.green("verified") + " " + signInfo);
-                            } else {
-                                console.log("      security:  " + c.yellow("unverified") + " " + signInfo);
-                            }
-                        } else {
-                            console.log("      security:  " + c.red.inverse("unsafe"));
-                        }
-
-                        try {
-                            if (!signed && !(await prompts.confirm({
-                                message: "This package is unsafe, installing it may damage your system. Are you sure you want to continue?",
-                                initial: false
-                            }))) {
-                                installable = false;
-                            }
-                        } catch (e) {
-                            installable = false;
-                        }
-
-                        if (installable) {
-                            if (fs.existsSync(home + "/buildroot")) { fs.rmSync(home + "/buildroot", { recursive: true }) }
-                            require('../hooks/clone')(pkg.repo, pkg.branch, () => {
-                                spinner = ora("Extracting package...").start();
-                                if (fs.existsSync(home + "/packages/" + pkg.id + "--update-" + version)) fs.rmSync(home + "/packages/" + pkg.id + "--update-" + version, { recursive: true })
-                                fs.renameSync(home + "/buildroot", home + "/packages/" + pkg.id + "--update-" + version);
-                                let change = require('../hooks/diff')(pkg.id, pkg.id + "--update-" + version);
-                                require('../hooks/apply_update')(pkg.id, pkg.id + "--update-" + version);
-                                fs.rmSync(home + "/packages/" + pkg.id + "--update-" + version, { recursive: true });
-                                delete installed[installed.map(i => i.id).indexOf(pkg.id)];
-                                installed.push({
-                                    id: pkg.id,
-                                    date: new Date().toISOString(),
-                                    version,
-                                    files: require('../hooks/files')(pkg.id)
-                                })
-                                fs.writeFileSync(os.homedir() + "/.twilight/installed.json", JSON.stringify(installed));
-                                spinner.succeed("Extracting package... done");
-                                console.log("  Size change: " + change);
-
-                                if (os.platform() === "win32" && typeof pkg.executable.windows === "string") {
-                                    fs.writeFileSync(os.homedir() + "/.twilight/binaries/" + pkg.id + ".bat", pkg.executable.windows);
-                                } else if (os.platform() === "linux" && typeof pkg.executable.linux === "string") {
-                                    fs.writeFileSync(os.homedir() + "/.twilight/binaries/" + exec, pkg.executable.linux);
-                                    require('child_process').spawnSync("chmod", [ "+x", os.homedir() + "/.twilight/binaries/" + exec ])
-                                } else if (os.platform() === "darwin" && typeof pkg.executable.mac === "string") {
-                                    fs.writeFileSync(os.homedir() + "/.twilight/binaries/" + exec, pkg.executable.mac);
-                                    require('child_process').spawnSync("chmod", [ "+x", os.homedir() + "/.twilight/binaries/" + exec ])
-                                }
-
-                                let postinstall = [];
-                                if (os.platform() === "win32") postinstall = pkg.postinstall.windows;
-                                if (os.platform() === "linux") postinstall = pkg.postinstall.linux;
-                                if (os.platform() === "darwin") postinstall = pkg.postinstall.mac;
-
-                                if (postinstall.length > 0) {
-                                    spinner = ora("Running post-install hooks...").start();
-                                    for (let hook of postinstall) {
-                                        require('child_process').execSync(hook, { stdio: "inherit" })
-                                    }
-                                    spinner.succeed("Running post-install hooks... done");
-                                }
-                            })
-                        }
                     } else if (argv.package !== undefined && argv.package === pack.id) {
                         die(c.red("error: ") + "package '" + argv.package + "' is up to date");
                     }
@@ -166,4 +201,6 @@ module.exports = async (argv) => {
     if (!affected) {
         die("All packages are up to date");
     }
+
+    await processQueue();
 }
\ No newline at end of file
diff --git a/hooks/update.js b/hooks/update.js
index 412c733..edfa79c 100644
--- a/hooks/update.js
+++ b/hooks/update.js
@@ -13,57 +13,61 @@ module.exports = async () => {
     for (let pkg of list) {
         spinner.text = "Fetching package lists... " + Math.round((index / list.length) * 100) + "%";
         let dir = pkg.substring(0, 1).replace(/[^a-zA-Z0-9]/gm, "#");
-        let pack = (await axios.get("https://twipkg.cdn.minteck.org/" + dir + "/" + pkg + ".json")).data;
-
-        let verdata = (await axios.get(pack.version)).data;
-        pack.verdata = {
-            latest: verdata.commit.short_id,
-            publisher: {
-                name: verdata.commit.author_name,
-                email: verdata.commit.author_email
-            },
-            date: verdata.commit.created_at
-        }
-
-        if (typeof pack.pointrelease === "string") {
-            pack.verdata.latest = pack.pointrelease;
-        }
-
-        let signRaw = { error: "404 Not Found" };
         try {
-            signRaw = (await axios.get(pack.signature.replace("{version}", verdata.commit.id))).data;
-        } catch (e) {}
-        pack.sign = {
-            signed: false,
-            verified: false,
-            key: null,
-            signer: {
-                name: null,
-                email: null
-            }
-        }
-        if (signRaw.error !== "404 Not Found") {
-            pack.sign.signed = true;
-            if (signRaw.verification_status === "verified") {
-                pack.sign.verified = true;
-            } else {
-                pack.sign.verified = false;
+            let pack = (await axios.get("https://twipkg.cdn.minteck.org/" + dir + "/" + pkg + ".json")).data;
+
+            let verdata = (await axios.get(pack.version)).data;
+            pack.verdata = {
+                latest: verdata.commit.short_id,
+                publisher: {
+                    name: verdata.commit.author_name,
+                    email: verdata.commit.author_email
+                },
+                date: verdata.commit.created_at
             }
-            if (signRaw.gpg_key_user_name) {
-                pack.sign.signer.name = signRaw.gpg_key_user_name;
+
+            if (typeof pack.pointrelease === "string") {
+                pack.verdata.latest = pack.pointrelease;
             }
-            if (signRaw.gpg_key_user_email) {
-                pack.sign.signer.email = signRaw.gpg_key_user_email;
+
+            let signRaw = { error: "404 Not Found" };
+            try {
+                signRaw = (await axios.get(pack.signature.replace("{version}", verdata.commit.id))).data;
+            } catch (e) {}
+            pack.sign = {
+                signed: false,
+                verified: false,
+                key: null,
+                signer: {
+                    name: null,
+                    email: null
+                }
             }
-            if (signRaw.gpg_key_primary_keyid) {
-                pack.sign.key = signRaw.gpg_key_primary_keyid;
+            if (signRaw.error !== "404 Not Found") {
+                pack.sign.signed = true;
+                if (signRaw.verification_status === "verified") {
+                    pack.sign.verified = true;
+                } else {
+                    pack.sign.verified = false;
+                }
+                if (signRaw.gpg_key_user_name) {
+                    pack.sign.signer.name = signRaw.gpg_key_user_name;
+                }
+                if (signRaw.gpg_key_user_email) {
+                    pack.sign.signer.email = signRaw.gpg_key_user_email;
+                }
+                if (signRaw.gpg_key_primary_keyid) {
+                    pack.sign.key = signRaw.gpg_key_primary_keyid;
+                }
             }
-        }
 
-        if (!fs.existsSync(home + "/repository/" + dir)) {
-            fs.mkdirSync(home + "/repository/" + dir);
+            if (!fs.existsSync(home + "/repository/" + dir)) {
+                fs.mkdirSync(home + "/repository/" + dir);
+            }
+            fs.writeFileSync(home + "/repository/" + dir + "/" + pkg + ".json", JSON.stringify(pack));
+        } catch (e) {
+            console.log("\n" + c.yellow("warn:") + " package '" + pkg + "' is not available on the repository yet");
         }
-        fs.writeFileSync(home + "/repository/" + dir + "/" + pkg + ".json", JSON.stringify(pack));
 
         index++;
     }