@toon-protocol/townhouse 0.1.1 → 0.1.3

package/dist/cli.js

@@ -27,7 +27,7 @@ import {
   serviceFromContainerName,
   tailContainerLogs,
   writeHsConnectorConfig
-} from "./chunk-W33MEOPM.js";
+} from "./chunk-QHFUIWEN.js";
 import "./chunk-5O4SBV5O.js";
 import {
   CONTAINER_PREFIX
@@ -46,7 +46,8 @@ import {
   existsSync,
   renameSync,
   rmSync,
-  statSync
+  statSync,
+  realpathSync
 } from "fs";
 import { join, resolve, dirname } from "path";
 import { homedir } from "os";
@@ -2026,6 +2027,18 @@ Flags:
   If no flags given, starts all enabled nodes from config.`;
 var DEFAULT_CONFIG_DIR = join(homedir(), ".townhouse");
 var DEFAULT_CONFIG_PATH = join(DEFAULT_CONFIG_DIR, "config.yaml");
+function printInitNextStep(dir) {
+  const isDefaultDir = dir === resolve(DEFAULT_CONFIG_DIR);
+  const cmd = isDefaultDir ? "npx @toon-protocol/townhouse hs up" : `npx @toon-protocol/townhouse hs up -c ${join(dir, "config.yaml")}`;
+  console.log("");
+  console.log("Next \u2014 start your node:");
+  console.log(`  ${cmd}`);
+  console.log("");
+  console.log(
+    "First run pulls container images and bootstraps a hidden service."
+  );
+  console.log("It can take a few minutes; progress is shown throughout.");
+}
 async function handleInit(force, configDir, password, preset, yes) {
   const dir = resolve(configDir ?? DEFAULT_CONFIG_DIR);
   const configPath = join(dir, "config.yaml");
@@ -2059,9 +2072,17 @@ async function handleInit(force, configDir, password, preset, yes) {
   console.log(`Config created at ${configPath}`);
   const walletPath = join(dir, "wallet.enc");
   if (existsSync(walletPath) && !force) {
+    console.log("");
     console.log(
-      `Wallet already exists at ${walletPath}. Skipping wallet generation.`
+      `Wallet already exists at ${walletPath} \u2014 keeping your existing keys.`
     );
+    console.log(
+      "Your seed phrase from the first run is still valid; nothing changed."
+    );
+    console.log(
+      "(Re-run with --force to regenerate, which REPLACES your keys.)"
+    );
+    printInitNextStep(dir);
     return;
   }
   const walletPassword = password ?? process.env["TOWNHOUSE_WALLET_PASSWORD"];
@@ -2095,6 +2116,7 @@ async function handleInit(force, configDir, password, preset, yes) {
     console.log(`  ${"".padEnd(6)} EVM:   ${info.evmAddress}`);
   }
   walletManager.lock();
+  printInitNextStep(dir);
 }
 async function handleSetup(configDir, port, noBrowser, dockerInstance, browserOpener) {
   const dir = resolve(configDir ?? DEFAULT_CONFIG_DIR);
@@ -3007,8 +3029,52 @@ function isAnonBootstrapTimeout(err) {
 ${err.stderr ?? ""}`;
   return /connector.*unhealthy|dependency.*connector.*fail/i.test(text);
 }
+async function attachDashboard(hostname) {
+  if (!shouldRenderInk()) return;
+  try {
+    const { mountTui } = await import("./tui-QE3ZRZO3.js");
+    const apiUrlOverride = process.env["HS_TOWNHOUSE_API_URL"];
+    const mountOpts = apiUrlOverride !== void 0 ? { apiUrl: apiUrlOverride } : {};
+    const instance = mountTui(mountOpts);
+    await instance.waitUntilExit();
+  } catch (tuiErr) {
+    const detail = tuiErr instanceof Error ? tuiErr.message : String(tuiErr);
+    console.error("");
+    console.error(`Your node is live at ${hostname}.`);
+    console.error(
+      `The live dashboard could not open (${detail}) \u2014 this is a display issue, not a node issue. Your node keeps running.`
+    );
+    console.error(
+      "Stop it anytime with:  npx @toon-protocol/townhouse hs down"
+    );
+  }
+}
 async function handleHsUp(_configPath, configDir, config, docker, options) {
   const { password, force, skipPreflight, hsOverrides } = options;
+  if (!force) {
+    const adminClientFactory = hsOverrides?.createAdminClient ?? ((url, t) => new ConnectorAdminClient(url, t));
+    const probe = adminClientFactory(HS_CONNECTOR_ADMIN_URL, 3e3);
+    try {
+      const existing = await probe.getHsHostname();
+      if (existing.hostname !== null) {
+        console.log(`Apex live at ${existing.hostname}`);
+        _writeHostJson(configDir, {
+          hostname: existing.hostname,
+          publishedAt: existing.publishedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+          writtenAt: (/* @__PURE__ */ new Date()).toISOString()
+        });
+        await attachDashboard(existing.hostname);
+        return;
+      }
+    } catch (probeErr) {
+      const msg = probeErr instanceof Error ? probeErr.message : String(probeErr);
+      if (msg.includes("anon-disabled")) {
+        const { exitCode } = renderFailure(probeErr);
+        process.exitCode = exitCode;
+        return;
+      }
+    }
+  }
   if (!skipPreflight) {
     const preflight = hsOverrides?.checkPortCollisions ?? ((d) => checkHsPortCollisions(d));
     try {
@@ -3042,7 +3108,7 @@ async function handleHsUp(_configPath, configDir, config, docker, options) {
     resolvedPassword = await promptPassword("Wallet password: ");
   } else {
     console.error(
-      "Wallet password required. Use --password flag or TOWNHOUSE_WALLET_PASSWORD env var."
+      "Wallet password required, but no interactive terminal is available to prompt.\nPass --password <pw> or set TOWNHOUSE_WALLET_PASSWORD."
     );
     process.exitCode = 1;
     return;
@@ -3067,29 +3133,6 @@ async function handleHsUp(_configPath, configDir, config, docker, options) {
   }
   const ribbon = new OnboardingRibbon();
   try {
-    if (!force) {
-      const adminClientFactory = hsOverrides?.createAdminClient ?? ((url, t) => new ConnectorAdminClient(url, t));
-      const probe = adminClientFactory(HS_CONNECTOR_ADMIN_URL, 3e3);
-      try {
-        const existing = await probe.getHsHostname();
-        if (existing.hostname !== null) {
-          console.log(`Apex live at ${existing.hostname}`);
-          _writeHostJson(configDir, {
-            hostname: existing.hostname,
-            publishedAt: existing.publishedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
-            writtenAt: (/* @__PURE__ */ new Date()).toISOString()
-          });
-          return;
-        }
-      } catch (probeErr) {
-        const msg = probeErr instanceof Error ? probeErr.message : String(probeErr);
-        if (msg.includes("anon-disabled")) {
-          const { exitCode } = renderFailure(probeErr);
-          process.exitCode = exitCode;
-          return;
-        }
-      }
-    }
     writeHsConnectorConfig(configDir, config, { force });
     const materialize = hsOverrides?.materializeComposeTemplate ?? materializeComposeTemplate;
     const { composePath } = materialize("hs", { townhouseHome: configDir });
@@ -3119,6 +3162,7 @@ async function handleHsUp(_configPath, configDir, config, docker, options) {
         ribbon.start("bootstrap");
       }
     });
+    ribbon.stop();
     if (typeof orch.pullImage === "function") {
       try {
         const apexImages = await collectApexImageRefs(configDir);
@@ -3132,11 +3176,18 @@ async function handleHsUp(_configPath, configDir, config, docker, options) {
             console.log(`  [${pulled}/${apexImages.length}] ${ref}`);
             await orch.pullImage(ref);
           }
+        } else {
+          console.log(
+            "No pinned image manifest found \u2014 Docker will pull images on demand."
+          );
+          console.log(
+            "First start can take several minutes with limited progress output."
+          );
         }
       } catch (pullErr) {
         const detail = pullErr instanceof Error ? pullErr.message : String(pullErr);
-        console.error(
-          `[townhouse hs up] pre-pull skipped (non-fatal, compose will retry): ${detail}`
+        console.log(
+          `Could not pre-pull images (${detail}). Docker will pull them during startup \u2014 this is normal and may take a few minutes.`
         );
       }
     }
@@ -3157,6 +3208,10 @@ async function handleHsUp(_configPath, configDir, config, docker, options) {
       resolve(config.wallet.encrypted_path)
     );
     process.env["TOWNHOUSE_DOCKER_GID"] = String(dockerSockGid);
+    if (!bootstrapStarted) {
+      bootstrapStarted = true;
+      ribbon.start("bootstrap");
+    }
     const MAX_ANON_RETRIES = 3;
     try {
       for (let attempt = 1; attempt <= MAX_ANON_RETRIES; attempt++) {
@@ -3230,13 +3285,7 @@ async function handleHsUp(_configPath, configDir, config, docker, options) {
       writtenAt: (/* @__PURE__ */ new Date()).toISOString()
     });
     ribbon.start("live", hostname);
-    if (shouldRenderInk()) {
-      const { mountTui } = await import("./tui-OIFXGBTL.js");
-      const apiUrlOverride = process.env["HS_TOWNHOUSE_API_URL"];
-      const mountOpts = apiUrlOverride !== void 0 ? { apiUrl: apiUrlOverride } : {};
-      const instance = mountTui(mountOpts);
-      await instance.waitUntilExit();
-    }
+    await attachDashboard(hostname);
   } catch (err) {
     const { exitCode } = renderFailure(err);
     process.exitCode = exitCode;
@@ -3672,7 +3721,14 @@ async function main(argv, dockerInstance, browserOpener, hsOverrides, nodeComman
   }
 }
 var invokedFile = process.argv[1];
-var invokedDirectly = typeof invokedFile === "string" && import.meta.url === pathToFileURL(invokedFile).href;
+var invokedDirectly = false;
+if (typeof invokedFile === "string") {
+  try {
+    invokedDirectly = import.meta.url === pathToFileURL(realpathSync(invokedFile)).href;
+  } catch {
+    invokedDirectly = import.meta.url === pathToFileURL(invokedFile).href;
+  }
+}
 if (invokedDirectly) {
   main(process.argv.slice(2)).catch((error) => {
     if (error instanceof CliHelpRequested) {