onedeploy-cli 0.1.4 → 0.1.5

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import prompts from "prompts";
 import { loadConfig, saveConfig } from "./config.js";
-import { cleanupNebula, connectNebula, installNebula } from "./nebula.js";
+import { cleanupNebula, connectNebula, installNebula, isNebulaRunning, } from "./nebula.js";
 if (process.argv.includes("--version")) {
     console.log("onedeploy-cli version 0.1.4");
     process.exit();
@@ -104,8 +104,12 @@ const mainMenu = async () => {
     }
     return true;
 };
-// ignore SIGINTs to continue after Nebula is disconnected
-process.on("SIGINT", () => { });
+process.on("SIGINT", () => {
+    if (!isNebulaRunning) {
+        process.exit();
+    }
+    // ignore SIGINTs to continue after Nebula is disconnected
+});
 await installNebula();
 try {
     while (true) {

package/dist/nebula.js

@@ -67,10 +67,23 @@ export const getNebulaCert = async (instance) => {
         "-path",
         `${tmpDir}/nebula-debug.crt`,
     ]);
+    // in case our local time isn't correct, wait for the certificate to become valid
+    const validFrom = stdout.match(/Not before: ([\d-]+ [\d:]+ \+\d+)/);
+    if (validFrom === null) {
+        throw new Error("Invalid Nebula certificate: Missing 'Not before' field.");
+    }
+    const validFromDate = new Date(validFrom[1]);
+    if (validFromDate > new Date()) {
+        const waitTime = validFromDate.getTime() - Date.now();
+        console.log(`Your system clock is running slow! Waiting ${Math.ceil(waitTime / 1000)} seconds for Nebula certificate to become valid...`);
+        await new Promise((resolve) => setTimeout(resolve, waitTime));
+    }
     process.stdout.write(stdout);
 };
+export let isNebulaRunning = false;
 export const connectNebula = async (instance) => {
     await getNebulaCert(instance);
+    isNebulaRunning = true;
     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)
@@ -78,5 +91,6 @@ export const connectNebula = async (instance) => {
         nebula.kill("SIGHUP");
     }, 10 * 60 * 1000);
     await new Promise((resolve) => nebula.on("exit", resolve));
+    isNebulaRunning = false;
     clearInterval(interval);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "onedeploy-cli",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"description": "CLI tool for connecting to OneDeploy via Nebula",
 	"keywords": [
 		"onedeploy",

package/src/index.ts

@@ -1,122 +0,0 @@
-#!/usr/bin/env node
-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([
-		{
-			type: "text",
-			name: "url",
-			message: "Enter OneDeploy URL",
-		},
-		{
-			type: "password",
-			name: "apiKey",
-			message: "Enter OneDeploy API key",
-		},
-	]);
-	if (result.apiKey === undefined || result.url === undefined) {
-		return;
-	}
-	config.instances.push({ url: result.url, apiKey: result.apiKey });
-	await saveConfig(config);
-};
-
-const removeConnection = async () => {
-	const { connection } = await prompts([
-		{
-			type: "select",
-			name: "connection",
-			message: "Select connection to remove",
-			choices: config.instances.map((instance, index) => ({
-				title: instance.url,
-				value: index,
-			})),
-		},
-	]);
-	if (connection === undefined) {
-		return;
-	}
-	const { confirm } = await prompts([
-		{
-			type: "confirm",
-			name: "confirm",
-			message: `Are you sure you want to remove connection to ${config.instances[connection].url}?`,
-			initial: false,
-		},
-	]);
-	if (confirm === true) {
-		config.instances.splice(connection, 1);
-		await saveConfig(config);
-	}
-};
-
-const mainMenu = async (): Promise<boolean> => {
-	const { action } = await prompts([
-		{
-			type: "select",
-			name: "action",
-			message: "What do you want to do?",
-			choices: [
-				{
-					title: "Connect",
-					value: "connect",
-					disabled: config.instances.length === 0,
-				},
-				{
-					title: "Setup new connection",
-					value: "setup",
-				},
-				{
-					title: "Remove connection",
-					value: "remove",
-				},
-			],
-		},
-	]);
-	if (action === "connect") {
-		const result = await prompts([
-			{
-				type: "select",
-				name: "connection",
-				message: "Select OneDeploy instance",
-				choices: config.instances.map((instance) => ({
-					title: instance.url,
-					value: instance,
-				})),
-			},
-		]);
-		if (result.connection !== undefined) {
-			await connectNebula(result.connection);
-		}
-	} else if (action === "setup") {
-		await setupConnection();
-	} else if (action === "remove") {
-		await removeConnection();
-	} else {
-		return false;
-	}
-	return true;
-};
-
-// ignore SIGINTs to continue after Nebula is disconnected
-process.on("SIGINT", () => {});
-await installNebula();
-try {
-	while (true) {
-		const shouldContinue = await mainMenu();
-		if (!shouldContinue) {
-			break;
-		}
-	}
-} finally {
-	await cleanupNebula();
-}