@vlandoss/localproxy 0.0.1 → 0.0.2-git-b8d71ee.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vlandoss/localproxy",
-  "version": "0.0.1",
+  "version": "0.0.2-git-b8d71ee.0",
   "description": "Simple local development proxy automation",
   "homepage": "https://github.com/variableland/dx/tree/main/packages/localproxy#readme",
   "bugs": {
@@ -26,8 +26,8 @@
   "dependencies": {
     "@inquirer/prompts": "^7.8.4",
     "commander": "13.1.0",
-    "@vlandoss/clibuddy": "0.0.5",
-    "@vlandoss/loggy": "0.0.4"
+    "@vlandoss/loggy": "0.0.4",
+    "@vlandoss/clibuddy": "0.0.5"
   },
   "publishConfig": {
     "access": "public"

package/src/commands/clean.ts

@@ -1,3 +1,4 @@
+import { password as passwordPrompt } from "@inquirer/prompts";
 import { createCommand } from "commander";
 import { CaddyService } from "~/services/caddy";
 import { HostsService } from "~/services/hosts";
@@ -19,8 +20,12 @@ export function createCleanCommand({ caddyfilePath }: Context) {
       const localDomains = caddyService.getLocalDomains();
       const hosts = localDomains.map((d) => d.host);
 
+      const password = await passwordPrompt({
+        message: "sudo password to manage hosts",
+      });
+
       const hostsService = new HostsService(hosts);
-      await hostsService.clean(options);
+      await hostsService.clean({ ...options, password });
 
       logger.success("localproxy clean completed");
     });

package/src/commands/setup.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs/promises";
 import path from "node:path";
-import { editor } from "@inquirer/prompts";
+import { editor as editorPrompt, password as passwordPrompt } from "@inquirer/prompts";
 import { createCommand } from "commander";
 import { CaddyService } from "~/services/caddy";
 import { HostsService } from "~/services/hosts";
@@ -65,7 +65,7 @@ export function createSetupCommand({ binDir, installDir, caddyfilePath }: Contex
         ? await fs.readFile(caddyfilePath, "utf-8")
         : await fs.readFile(exampleCaddyFilePath, "utf-8");
 
-      const fileContent = await editor({
+      const fileContent = await editorPrompt({
         message: "Caddyfile",
         default: defaultContent,
       });
@@ -80,8 +80,12 @@ export function createSetupCommand({ binDir, installDir, caddyfilePath }: Contex
       const localDomains = caddyService.getLocalDomains();
       const hosts = localDomains.map((d) => d.host);
 
+      const password = await passwordPrompt({
+        message: "sudo password to manage hosts",
+      });
+
       const hostsService = new HostsService(hosts);
-      await hostsService.setup(options);
+      await hostsService.setup({ ...options, password });
 
       logger.success("localproxy setup completed");
     });

package/src/services/caddy.ts

@@ -56,11 +56,11 @@ export class CaddyService {
     const { $ } = this.#shell({ verbose });
 
     try {
-      debug("Starting Caddy...");
+      logger.start("Starting Caddy");
 
       await $`caddy start -c ${this.#configPath} --pidfile ${this.#pidFilePath} > /dev/null 2>&1`;
 
-      debug("Caddy started");
+      logger.success("Caddy started");
     } catch {
       logger.error("Can't start Caddy");
       process.exit(1);
@@ -71,12 +71,12 @@ export class CaddyService {
     const { $ } = this.#shell({ verbose });
 
     try {
-      debug("Stopping Caddy...");
+      logger.start("Stopping Caddy");
 
       await $`caddy stop -c ${this.#configPath}`;
       this.#deleteCaddyPid();
 
-      debug("Caddy stopped");
+      logger.success("Caddy stopped");
     } catch {
       logger.error("Can't stop Caddy");
       process.exit(1);

package/src/services/hosts.ts

@@ -3,6 +3,7 @@ import { quietShell, silentShell, verboseShell } from "./shell";
 
 type SetupOptions = {
   verbose: boolean;
+  password: string;
 };
 
 const debug = logger.subdebug("hosts");
@@ -18,8 +19,24 @@ export class HostsService {
     return verbose ? verboseShell : silentShell;
   }
 
+  async #auth(password: string) {
+    if (!password) {
+      throw new Error("Password is required");
+    }
+
+    // Asking sudo directly in JS is unreliable,
+    // so we do it through a shell command
+    await silentShell.child({
+      stdio: ["ignore", "ignore", "pipe"],
+    }).$`echo "${password}" | sudo -S -v`;
+  }
+
   async setup(options: SetupOptions) {
-    await verboseShell.$`sudo hosts backups create`;
+    await this.#auth(options.password);
+
+    const { stdout } = await verboseShell.$`sudo hosts backups create`;
+    const backupPath = stdout.match(/(\/[^\s]+)/)?.[1];
+    debug("Backup created at %s", backupPath);
 
     for (const host of this.#hosts) {
       await this.addHost(host, options);
@@ -27,23 +44,25 @@ export class HostsService {
   }
 
   async clean(options: SetupOptions) {
+    await this.#auth(options.password);
+
     for (const host of this.#hosts) {
       await this.removeHost(host, options);
     }
   }
 
   async findHost(host: string) {
-    const currentHost = await quietShell.$`hosts show "${host}"`.text();
-    debug("Host %s is %s", host, currentHost ? "present" : "absent");
-    return currentHost;
+    const { exitCode } = await quietShell.$`hosts show "${host}"`.nothrow();
+    debug("Host %s is %s", host, !exitCode ? "present" : "absent");
+    return !exitCode;
   }
 
   async addHost(host: string, options: SetupOptions) {
     const { $ } = this.#shell(options);
 
-    const currentHost = await this.findHost(host);
+    const found = await this.findHost(host);
 
-    if (!currentHost) {
+    if (!found) {
       await $`sudo hosts add 127.0.0.1 ${host}`;
     }
   }
@@ -51,9 +70,9 @@ export class HostsService {
   async removeHost(host: string, options: SetupOptions) {
     const { $ } = this.#shell(options);
 
-    const currentHost = await this.findHost(host);
+    const found = await this.findHost(host);
 
-    if (!currentHost) {
+    if (!found) {
       await $`sudo hosts remove ${host}`;
     }
   }

package/src/services/shell.ts

@@ -6,11 +6,11 @@ export const quietShell = createShellService({
 });
 
 export const silentShell = quietShell.child({
-  stdio: ["ignore", "ignore", "ignore"],
+  stdio: "ignore",
 });
 
 export const verboseShell = quietShell.child({
   quiet: false,
   verbose: true,
-  stdio: ["inherit", "inherit", "inherit"],
+  stdio: "inherit",
 });