Implemented renew (update) command, added list prompt select when no script given & minor patches

Author: Techzy-Programmer

app.meta.ts

@@ -1,6 +1,6 @@
 const getGHRawURL = (branch: string, resource: string) =>
     `https://raw.githubusercontent.com/Techzy-Programmer/dxpm/${branch}${resource}`;
-const VERSION = "v0.2.3-us";
+const VERSION = "v0.2.4-us";
 
 export {
     getGHRawURL,

deps.ts

@@ -9,5 +9,7 @@ export { isPortAvailable } from "https://deno.land/x/[email protected]/mod.ts"
 export { EventEmitter } from "https://deno.land/x/[email protected]/mod.ts";
 export { colors } from "https://deno.land/x/[email protected]/ansi/colors.ts";
 export { Command } from "https://deno.land/x/[email protected]/command/mod.ts";
+export { Select } from "https://deno.land/x/[email protected]/prompt/select.ts";
+export { Confirm } from "https://deno.land/x/[email protected]/prompt/confirm.ts";
 export { isAbsolute, resolve, fromFileUrl, dirname } from "https://deno.land/[email protected]/path/mod.ts";
 export { Cell, Table, type TableType, type RowType, type CellType } from "https://deno.land/x/[email protected]/table/mod.ts";

installer.ts

@@ -1,19 +1,10 @@
-import { dirname } from "./deps.ts";
+import { installBinary } from "./lib/helper/utility.ts";
 import { reloadAndCacheModule } from "./lib/helper/utility.ts";
 
-const dxpmUrl = "https://deno.land/x/dxpm/dxpm.ts";
-const configs = ["-fr", "-A", "--unstable-kv", "-n", "dxpm"];
 const daemonUrl = "https://deno.land/x/dxpm/lib/bg/daemon.ts";
-const installAt = await Deno.realPath(dirname(Deno.execPath()) + "/..");
-
 console.log("Caching required modules...");
 await reloadAndCacheModule(daemonUrl);
 
-const installer = new Deno.Command("deno", {
-    args: ["install", ...configs, "--root", installAt, dxpmUrl],
-    stderr: "null", stdout: "null", stdin: "null"
-}).spawn();
-
-const { success } = await installer.status;
+const success = await installBinary();
 console.log(success ? "\nDXPM 'Deno eXtensible Package Manager' installed successfully!\n"
     : "\nOops! DXPM installation failed, something's quite wrong! Please try again later.\n");

lib/cmd/eject.ts

@@ -1,7 +1,7 @@
 import { printProcessData } from "../helper/logs.ts";
 import { parseConfig } from "../helper/parser.ts";
 import { sendMSG } from "../helper/network.ts";
-import { wlog, elog } from "../helper/logs.ts";
+import { ilog, elog } from "../helper/logs.ts";
 import { SpawnCmd } from "../helper/ipc.ts";
 import { TaskDetail } from "../types.ts";
 import { Command } from "../../deps.ts";
@@ -20,7 +20,7 @@ async function goHandler(config: string | undefined) {
         cwd: Deno.cwd()
     }
 
-    wlog("Script execution initiated");
+    ilog("Script execution initiated");
     const response = await sendMSG<TaskDetail>(spawnCMD);
 
     if (response === "Dead") {

lib/cmd/go.ts

@@ -1,13 +1,11 @@
+import { playCommand, pauseCommand, ejectCommand } from "./ppe.ts";
 import { launchDaemonProc } from "../helper/proc-daemon.ts";
 import { Command, isPortAvailable } from "../../deps.ts";
 import { IPC_HOST, IPC_PORT } from "../helper/ipc.ts";
 import { VERSION } from "../../app.meta.ts";
 import { elog } from "../helper/logs.ts";
-import ejectCommand from "./eject.ts";
 import renewCommand from "./renew.ts";
-import pauseCommand from "./pause.ts";
 import autoCommand from "./auto.ts";
-import playCommand from "./play.ts";
 import showCommand from "./show.ts";
 import spyCommand from "./spy.ts";
 import goCommand from "./go.ts";

lib/cmd/init.ts

@@ -0,0 +1,80 @@
+// Play-Pause-Eject Command Handling
+import { Command } from "../../deps.ts";
+import { sendMSG } from "../helper/network.ts";
+import { askFromKV } from "../helper/utility.ts";
+import { elog, slog, wlog } from "../helper/logs.ts";
+import { PlayPauseEjectCmd } from "../helper/ipc.ts";
+
+// #region Commands Initialization
+
+const optTxt = "Id of script corresponding to one provided in the config file.";
+const optArg = "-s, --script <Id>";
+
+const playCommand = new Command()
+    .description("Re-starts the stopped scripts.").option(optArg, optTxt)
+    .action(({ script }) => ppeHandler(script, "play"));
+
+const pauseCommand = new Command()
+    .description("Stops the active execution of configured scripts.").option(optArg, optTxt)
+    .action(({ script }) => ppeHandler(script, "pause"));
+
+const ejectCommand = new Command()
+    .description("Stop and delete the configured script.").option(optArg, optTxt)
+    .action(({ script }) => ppeHandler(script, "eject"));
+
+// #endregion
+
+const alt = {
+    "play": "start",
+    "pause": "stop",
+    "eject": "delete",
+};
+
+const altPast = {
+    "play": "started",
+    "pause": "stopped",
+    "eject": "deleted",
+};
+
+async function ppeHandler(script: string | undefined, type: "play" | "pause" | "eject") {
+    if (!script) {
+        script = await askFromKV(`Select a script to ${type} (${alt[type]}):`);
+        if (!script) return wlog(`No scripts avaliable to ${type} (${alt[type]})!`);
+    }
+
+    const ejectCmd: PlayPauseEjectCmd = {
+        action: type,
+        script
+    }
+
+    const key = type === "pause" ? "paused" :
+        type === "eject" ? "ejected" : "played";
+
+    const response = await sendMSG<{
+        [key: string]: boolean,
+        found: boolean
+    }>(ejectCmd);
+
+    if (response === "Dead") {
+        elog("SocketIO Error, Connection dead");
+        return;
+    }
+
+    if (!response || !response.found) {
+        elog(`Script with id '${script}' not found!`);
+        return;
+    }
+
+    if (!response[key]) {
+        elog(`Unable to ${alt[type]} script. Please try again later.`);
+        return;
+    }
+
+    slog(`${key}: Script ${altPast[type]} successfully.`);
+}
+
+export {
+    playCommand,
+    pauseCommand,
+    ejectCommand
+};

lib/cmd/pause.ts

@@ -1,19 +1,80 @@
+import { Confirm } from "../../deps.ts";
 import { Command } from "../../deps.ts";
-
-/**
- * [Steps]
- * Cache dxpm.ts from deno.land/x/dxpm
- * Cache daemon.ts from deno.land/x/dxpm
- * Send kill cmd to running instance of daemon.ts
- * Run `deno install` with required flags and args
-*/
+import { VERSION } from "../../app.meta.ts";
+import { elog, ilog, slog, wlog } from "../helper/logs.ts";
+import { getLatestVersion, installBinary, reloadAndCacheModule, killDaemon, delay } from "../helper/utility.ts";
 
 const renewCommand = new Command()
     .description("Updates the DXPM executable to the latest version.")
     .action(renewHandler);
 
-function renewHandler() {
-    console.log("Not implemented yet!");
+async function renewHandler() {
+    ilog("Checking for updates...");
+    const newVer = await getLatestVersion();
+    const baseUrl = "https://deno.land/x/dxpm";
+
+    if (VERSION === newVer) {
+        slog("You are on the latest version.");
+        return;
+    }
+
+    ilog(`Current version: ${VERSION}`);
+    ilog(`New version found: ${newVer}`);
+
+    const update = await Confirm
+        .prompt(`Would you like to update?`);
+
+    if (!update) {
+        wlog("Update aborted.");
+        return;
+    }
+
+    ilog("Starting update operation...");
+    ilog("Caching modules and it's dependencies...");
+    await reloadAndCacheModule(`${baseUrl}/lib/bg/daemon.ts`);
+
+    ilog("Aborting active Daemon instance...");
+    await killDaemon(); // Send kill cmd to running instance of Daemon
+
+    ilog("Installing binary...");
+
+    if (!await installBinary()) {
+        return elog("(Update Error): Failed to install binary.");
+    }
+
+    ilog("Restarting daemon process...");
+    await runDXPM(); await delay(2_000);
+    ilog("Verifying installation...");
+
+    if (await runDXPM("-V") === newVer) {
+        slog("Update complete, You are now on the latest version.");
+        return;
+    }
+
+    elog("(Update Error): Version Mismatch! Check failed.");
+}
+
+async function runDXPM(...progArgs: string[]) {
+    const decoder = new TextDecoder();
+    let dxpmCmd: Deno.Command;
+    progArgs.unshift("dxpm");
+
+    if (Deno.build.os === "windows") {
+        dxpmCmd = new Deno.Command("cmd", {
+            args: ["/C", ...progArgs],
+            stdout: "piped"
+        });
+    } else {
+        dxpmCmd = new Deno.Command("bash", {
+            stdout: "piped",
+            args: progArgs
+        });
+    }
+    
+    const stdOut = await dxpmCmd.spawn().stdout.getReader().read();
+    const stdOutText = decoder.decode(stdOut.value).trim();
+
+    return stdOutText;
 }
 
 export default renewCommand;