onedeploy-cli 0.1.2 → 0.1.4

package/README.md

@@ -1,7 +1,28 @@
 # OneDeploy CLI
 
-This CLI allows you to connect to a OneDeploy cluster via [Nebula](https://github.com/slackhq/nebula). First, you need to create an API key on your dashboard. Then, you can `Setup new connection` with your dashboard URL and API key. Afterwards, you can `Connect` to the cluster you added. Please note that Nebula requires administrator permissions to run, so you'll need to enter your password.
+This CLI allows you to connect to a OneDeploy cluster via
+[Nebula](https://github.com/slackhq/nebula).
+
+## Getting Started
+
+Run it using `sudo` on Unix-like systems:
+
+```
+sudo npx onedeploy-cli
+```
+
+or from an administrator prompt on Windows:
+
+```
+npx onedeploy-cli
+```
+
+Then, you need to create an API key on your OneDeploy dashboard. You can
+`Setup new connection` to enter your dashboard URL and API key. Afterwards, you
+can `Connect` to the cluster you added. Please note that connections are stored
+per computer (for the root user), not individually per user.
 
 ## License
 
-The OneDeploy CLI licensed under MIT, see [here](./LICENSE). It uses the Nebula overlay network, which is also MIT licensed.
+The OneDeploy CLI licensed under MIT, see [here](./LICENSE). It uses the Nebula
+overlay network, which is also MIT licensed.

package/dist/index.js

@@ -2,6 +2,10 @@
 import prompts from "prompts";
 import { loadConfig, saveConfig } from "./config.js";
 import { cleanupNebula, connectNebula, installNebula } from "./nebula.js";
+if (process.argv.includes("--version")) {
+    console.log("onedeploy-cli version 0.1.4");
+    process.exit();
+}
 const config = await loadConfig();
 const setupConnection = async () => {
     const result = await prompts([
@@ -100,6 +104,8 @@ const mainMenu = async () => {
     }
     return true;
 };
+// ignore SIGINTs to continue after Nebula is disconnected
+process.on("SIGINT", () => { });
 await installNebula();
 try {
     while (true) {

package/dist/nebula.js

@@ -5,6 +5,7 @@ import { tmpdir } from "node:os";
 import path from "node:path";
 import { Readable } from "node:stream";
 import { promisify } from "node:util";
+import { parse } from "yaml";
 const getNebulaPackageName = () => {
     switch (process.platform) {
         case "linux":
@@ -29,13 +30,13 @@ const nebulaUrl = `https://github.com/slackhq/nebula/releases/download/${nebulaV
 const tmpDir = path.join(tmpdir(), `onedeploy-${randomUUID()}`);
 await mkdir(tmpDir, { recursive: true });
 export const installNebula = async () => {
-    console.log("Downloading Nebula...");
+    console.log(`Downloading Nebula to ${tmpDir}/${packageName}...`);
     const file = await fetch(nebulaUrl);
     if (file.body === null) {
         throw new Error("Could not download Nebula executable.");
     }
     await writeFile(`${tmpDir}/${packageName}`, Readable.from(file.body));
-    console.log("Extracting Nebula...");
+    console.log(`Extracting Nebula to ${tmpDir}/nebula...`);
     await promisify(execFile)("tar", [
         "-xf",
         `${tmpDir}/${packageName}`,
@@ -58,21 +59,19 @@ export const getNebulaCert = async (instance) => {
     const { nebulaConfig } = (await response.json());
     await writeFile(`${tmpDir}/nebula.yml`, nebulaConfig);
     await chmod(`${tmpDir}/nebula.yml`, 0o600);
-};
-const spawnNebula = () => {
-    if (process.platform === "win32") {
-        return spawn("powershell.exe", [
-            "-Command",
-            `Start-Process ${tmpDir}\\nebula.exe -ArgumentList '-config','${tmpDir}\\nebula.yml' -Verb RunAs`,
-        ]);
-    }
-    return spawn("sudo", [`${tmpDir}/nebula`, "-config", `${tmpDir}/nebula.yml`], {
-        stdio: "inherit",
-    });
+    console.log(`Wrote Nebula configuration to ${tmpDir}/nebula.yml`);
+    const parsedConfig = parse(nebulaConfig);
+    await writeFile(`${tmpDir}/nebula-debug.crt`, parsedConfig.pki.cert);
+    const { stdout } = await promisify(execFile)(`${tmpDir}/nebula-cert`, [
+        "print",
+        "-path",
+        `${tmpDir}/nebula-debug.crt`,
+    ]);
+    process.stdout.write(stdout);
 };
 export const connectNebula = async (instance) => {
     await getNebulaCert(instance);
-    const nebula = spawnNebula();
+    const nebula = spawn(`${tmpDir}/nebula`, ["-config", `${tmpDir}/nebula.yml`], { stdio: "inherit" });
     const interval = setInterval(async () => {
         // refresh Nebula cert every 10 minutes (lifetime is 15 minutes)
         await getNebulaCert(instance);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "onedeploy-cli",
-	"version": "0.1.2",
+	"version": "0.1.4",
 	"description": "CLI tool for connecting to OneDeploy via Nebula",
 	"keywords": [
 		"onedeploy",
@@ -39,6 +39,7 @@
 	},
 	"dependencies": {
 		"prompts": "^2.4.2",
+		"yaml": "^2.8.1",
 		"yedra": "^0.17.9"
 	}
 }

package/src/index.ts

@@ -3,6 +3,11 @@ import prompts from "prompts";
 import { loadConfig, saveConfig } from "./config.js";
 import { cleanupNebula, connectNebula, installNebula } from "./nebula.js";
 
+if (process.argv.includes("--version")) {
+	console.log("onedeploy-cli version 0.1.4");
+	process.exit();
+}
+
 const config = await loadConfig();
 
 const setupConnection = async () => {
@@ -100,8 +105,10 @@ const mainMenu = async (): Promise<boolean> => {
 		return false;
 	}
 	return true;
-}
+};
 
+// ignore SIGINTs to continue after Nebula is disconnected
+process.on("SIGINT", () => {});
 await installNebula();
 try {
 	while (true) {