@wraps.dev/cli 2.22.0 → 2.22.2

package/dist/cli.js

@@ -24129,6 +24129,11 @@ function truncate(str, len) {
   if (!str) return pc30.dim("\u2014");
   return str.length > len ? `${str.slice(0, len - 1)}\u2026` : str;
 }
+var ANSI_PATTERN = new RegExp(`${String.fromCharCode(27)}\\[[0-9;]*m`, "g");
+function padVisible(str, len) {
+  const visibleLength = str.replace(ANSI_PATTERN, "").length;
+  return visibleLength >= len ? str : str + " ".repeat(len - visibleLength);
+}
 async function emailLogsList(options) {
   const token = await resolveTokenAsync({ token: options.token });
   if (!token) {
@@ -24177,9 +24182,9 @@ async function emailLogsList(options) {
   const header = pc30.bold("Time".padEnd(COL.time)) + "  " + pc30.bold("Status".padEnd(COL.status)) + "  " + pc30.bold("To".padEnd(COL.to)) + "  " + pc30.bold("Subject".padEnd(COL.subject)) + "  " + pc30.bold("Message ID");
   const rows = data.logs.map((log59) => {
     const time = relativeTime(log59.createdAt).padEnd(COL.time);
-    const status2 = colorStatus(log59.status.padEnd(COL.status));
-    const to = truncate(log59.recipient, COL.to).padEnd(COL.to);
-    const subject = truncate(log59.subject, COL.subject).padEnd(COL.subject);
+    const status2 = padVisible(colorStatus(log59.status), COL.status);
+    const to = padVisible(truncate(log59.recipient, COL.to), COL.to);
+    const subject = padVisible(truncate(log59.subject, COL.subject), COL.subject);
     const msgId = truncate(log59.messageId, COL.msgId);
     return `${time}  ${status2}  ${to}  ${subject}  ${msgId}`;
   });
@@ -32055,6 +32060,44 @@ import { confirm as confirm19, intro as intro36, isCancel as isCancel27, log as
 import * as pulumi24 from "@pulumi/pulumi";
 import pc44 from "picocolors";
 init_events();
+
+// src/utils/selfhost/api-url.ts
+init_esm_shims();
+init_metadata();
+var SELFHOST_API_FUNCTION_NAME = "wraps-selfhost-api";
+async function resolveSelfhostApiUrl(region) {
+  try {
+    const { LambdaClient: LambdaClient3, GetFunctionUrlConfigCommand } = await import("@aws-sdk/client-lambda");
+    const lambda5 = new LambdaClient3({ region });
+    const result = await lambda5.send(
+      new GetFunctionUrlConfigCommand({
+        FunctionName: SELFHOST_API_FUNCTION_NAME
+      })
+    );
+    return result.FunctionUrl ?? null;
+  } catch {
+    return null;
+  }
+}
+async function reconcileSelfhostApiUrl(metadata, region) {
+  const selfhost = metadata.services.selfhost;
+  if (!selfhost) {
+    return null;
+  }
+  if (selfhost.apiUrl) {
+    return selfhost.apiUrl;
+  }
+  const recovered = await resolveSelfhostApiUrl(region);
+  if (!recovered) {
+    return null;
+  }
+  selfhost.apiUrl = recovered;
+  metadata.timestamp = (/* @__PURE__ */ new Date()).toISOString();
+  await saveConnectionMetadata(metadata);
+  return recovered;
+}
+
+// src/commands/platform/connect.ts
 init_aws();
 init_config();
 init_errors();
@@ -32447,8 +32490,7 @@ async function resolveOrganization() {
   return orgs.find((o) => o.id === selected) || null;
 }
 async function registerConnection(params) {
-  const baseURL = getApiBaseUrl();
-  const response = await fetch(`${baseURL}/v1/connections`, {
+  const response = await fetch(`${params.baseURL}/v1/connections`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -32472,8 +32514,13 @@ async function registerConnection(params) {
 }
 async function authenticatedConnect(token, options) {
   const startTime = Date.now();
+  const selfhosted = options.selfhosted === true;
   if (!isJsonMode()) {
-    intro36(pc44.bold("Connect to Wraps Platform"));
+    intro36(
+      pc44.bold(
+        selfhosted ? "Connect to Self-Hosted Wraps" : "Connect to Wraps Platform"
+      )
+    );
   }
   const progress = new DeploymentProgress();
   try {
@@ -32481,12 +32528,30 @@ async function authenticatedConnect(token, options) {
       options,
       progress
     );
+    const selfhostService = metadata.services.selfhost;
+    if (selfhosted && selfhostService) {
+      await reconcileSelfhostApiUrl(metadata, region);
+    }
+    if (selfhosted && !selfhostService?.apiUrl) {
+      progress.stop();
+      log38.error(
+        `No reachable self-hosted deployment found for account ${pc44.cyan(identity.accountId)} in region ${pc44.cyan(region)}`
+      );
+      console.log(
+        `
+Run ${pc44.cyan("wraps selfhost deploy")} to finish deploying the self-hosted control plane first.
+`
+      );
+      process.exit(1);
+    }
+    const apiBaseUrl = selfhosted && selfhostService ? selfhostService.apiUrl : getApiBaseUrl();
+    const dashboardUrl = selfhosted && selfhostService ? selfhostService.config.appUrl : getAppBaseUrl();
     const hasEmail = !!metadata.services.email?.config;
     const org = await resolveOrganization();
     if (!org) {
       progress.stop();
       log38.error(
-        "No organizations found. Sign in at https://app.wraps.dev to create one."
+        `No organizations found. Sign in at ${dashboardUrl} to create one.`
       );
       process.exit(1);
     }
@@ -32499,7 +32564,7 @@ async function authenticatedConnect(token, options) {
         if (!isJsonMode()) {
           progress.stop();
           log38.warn(
-            "Event tracking must be enabled to connect to the Wraps Platform."
+            selfhosted ? "Event tracking must be enabled to connect to your self-hosted instance." : "Event tracking must be enabled to connect to the Wraps Platform."
           );
         }
         const enableTracking = options.yes || await confirm19({
@@ -32537,8 +32602,9 @@ async function authenticatedConnect(token, options) {
       features.sms = metadata.services.sms.config;
     }
     const result = await progress.execute(
-      "Registering connection with Wraps Platform",
+      selfhosted ? "Registering connection with your self-hosted instance" : "Registering connection with Wraps Platform",
       async () => registerConnection({
+        baseURL: apiBaseUrl,
         token,
         orgId: org.id,
         accountId: identity.accountId,
@@ -32595,17 +32661,22 @@ You can try the manual flow: ${pc44.cyan("wraps auth logout")} then ${pc44.cyan(
         region,
         organizationId: org.id,
         connectionId: result.connectionId,
-        webhookConnected: true
+        webhookConnected: true,
+        selfhosted
       });
     } else {
-      outro24(pc44.green("Platform connection complete!"));
+      outro24(
+        pc44.green(
+          selfhosted ? "Self-hosted connection complete!" : "Platform connection complete!"
+        )
+      );
       console.log();
       console.log(
         pc44.dim(
           "Events from your AWS infrastructure will stream to the dashboard."
         )
       );
-      console.log(`  Dashboard: ${pc44.cyan("https://app.wraps.dev")}`);
+      console.log(`  Dashboard: ${pc44.cyan(dashboardUrl)}`);
       console.log();
     }
     const duration = Date.now() - startTime;
@@ -32635,6 +32706,22 @@ async function connect3(options) {
     await authenticatedConnect(token, options);
     return;
   }
+  if (options.selfhosted) {
+    if (isJsonMode()) {
+      jsonError("platform.connect", {
+        code: "NOT_AUTHENTICATED",
+        message: "Not signed in to the self-hosted instance.",
+        suggestion: "Run `wraps selfhost login` first."
+      });
+    } else {
+      intro36(pc44.bold("Connect to Self-Hosted Wraps"));
+      log38.error("You need to sign in to your self-hosted instance first.");
+      console.log(`
+Run ${pc44.cyan("wraps selfhost login")} first.
+`);
+    }
+    process.exit(1);
+  }
   const startTime = Date.now();
   intro36(pc44.bold("Connect to Wraps Platform"));
   const progress = new DeploymentProgress();
@@ -33913,12 +34000,13 @@ async function selfhostDeploy(options) {
     timestamp: deployedAt,
     services: {}
   };
+  const priorApiUrl = savedMetadata.services.selfhost?.apiUrl ?? "";
   savedMetadata.services.selfhost = {
     deployedAt,
     pulumiStackName: stackName,
     config: selfhostConfig,
-    apiUrl: ""
-    // Updated with real URL after Pulumi succeeds
+    apiUrl: priorApiUrl
+    // Refreshed from Pulumi outputs after deploy succeeds
   };
   savedMetadata.timestamp = deployedAt;
   await saveConnectionMetadata(savedMetadata);
@@ -34084,12 +34172,12 @@ async function selfhostDeploy(options) {
 // src/commands/selfhost/env.ts
 init_esm_shims();
 init_events();
+import * as clack45 from "@clack/prompts";
+import pc48 from "picocolors";
 init_aws();
 init_json_output();
 init_metadata();
 init_region_resolver();
-import * as clack45 from "@clack/prompts";
-import pc48 from "picocolors";
 async function selfhostEnv(options) {
   const startTime = Date.now();
   if (!isJsonMode()) {
@@ -34113,7 +34201,8 @@ Run ${pc48.cyan("wraps selfhost deploy")} to deploy the self-hosted control plan
     process.exit(1);
     return;
   }
-  const { config: config2, apiUrl } = metadata.services.selfhost;
+  const { config: config2 } = metadata.services.selfhost;
+  const apiUrl = await reconcileSelfhostApiUrl(metadata, region);
   if (!apiUrl) {
     clack45.log.error(
       "Self-hosted deployment is incomplete \u2014 API URL is not available yet."
@@ -34338,13 +34427,13 @@ Run ${pc49.cyan("wraps selfhost deploy")} to deploy the self-hosted control plan
 // src/commands/selfhost/status.ts
 init_esm_shims();
 init_events();
+import * as clack47 from "@clack/prompts";
+import pc50 from "picocolors";
 init_aws();
 init_json_output();
 init_metadata();
 init_output();
 init_region_resolver();
-import * as clack47 from "@clack/prompts";
-import pc50 from "picocolors";
 function displaySelfhostStatus(options) {
   const lines = [];
   lines.push(pc50.bold(pc50.green("Self-Hosted Control Plane Active")));
@@ -34392,9 +34481,10 @@ Run ${pc50.cyan("wraps selfhost deploy")} to deploy the self-hosted control plan
   progress.stop();
   const selfhostService = metadata.services.selfhost;
   const config2 = selfhostService.config;
+  const apiUrl = await reconcileSelfhostApiUrl(metadata, region) ?? selfhostService.apiUrl;
   const statusData = {
     region,
-    apiUrl: selfhostService.apiUrl,
+    apiUrl,
     deployedAt: selfhostService.deployedAt,
     neonProjectId: config2.neonProjectId,
     appUrl: config2.appUrl,
@@ -43175,7 +43265,8 @@ Run ${pc67.cyan("wraps --help")} for available commands.
             region: flags.region,
             force: flags.force,
             yes: flags.yes,
-            json: flags.json
+            json: flags.json,
+            selfhosted: true
           });
           break;
         default: