@toon-protocol/townhouse 0.1.2 → 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
@@ -3029,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 {
@@ -3089,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 });
@@ -3141,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);
@@ -3263,25 +3285,7 @@ async function handleHsUp(_configPath, configDir, config, docker, options) {
       writtenAt: (/* @__PURE__ */ new Date()).toISOString()
     });
     ribbon.start("live", hostname);
-    if (shouldRenderInk()) {
-      try {
-        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();
-      } 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"
-        );
-      }
-    }
+    await attachDashboard(hostname);
   } catch (err) {
     const { exitCode } = renderFailure(err);
     process.exitCode = exitCode;