@topolo/cli 0.1.28 → 0.1.29

package/dist/index.js

@@ -89,7 +89,7 @@ var SERVICES = {
   inventory: "https://inventory.topolo.app",
   learn: "https://learn-api.topolo.app",
   localize: "https://localize.topolo.app",
-  mail: "https://mail.topolo.app",
+  mail: "https://mail-api.topolo.app",
   mdm: "https://mdm-api.topolo.app",
   messages: "https://messages.topolo.app",
   nexus: "https://nexus-api.topolo.app",
@@ -925,15 +925,17 @@ var APPLICATIONS = {
           "mail.topolo.app"
         ],
         "routes": [],
-        "serviceId": "mail"
+        "serviceId": null
       },
       {
         "name": "topolo-mail-api",
         "kind": "worker",
-        "apiUrl": null,
-        "domains": [],
+        "apiUrl": "https://mail-api.topolo.app",
+        "domains": [
+          "mail-api.topolo.app"
+        ],
         "routes": [],
-        "serviceId": null
+        "serviceId": "mail"
       }
     ]
   },
@@ -2052,10 +2054,7 @@ function resolveCatalogServiceUrl(entry, options = {}) {
   if (override) return override;
   const apiBaseUrl = firstString(entry.apiBaseUrl, entry.api_base_url);
   if (apiBaseUrl) return apiBaseUrl;
-  const bundledUrl = firstBundledServiceUrl(keys);
-  const liveUrl = firstString(entry.baseUrl);
-  if (bundledUrl && (!liveUrl || sameUrlEnvironment(bundledUrl, liveUrl))) return bundledUrl;
-  return liveUrl ?? bundledUrl ?? null;
+  return null;
 }
 function resolveServiceUrl(service, overrides) {
   const override = resolveServiceUrlOverride([service], overrides);
@@ -2097,34 +2096,12 @@ function resolveServiceUrlOverride(keys, overrides) {
   }
   return null;
 }
-function firstBundledServiceUrl(keys) {
-  for (const key of keys) {
-    const url = DEFAULT_SERVICE_URLS[key];
-    if (url) return url;
-  }
-  return null;
-}
 function firstString(...values) {
   for (const value of values) {
     if (typeof value === "string" && value.trim()) return value.trim();
   }
   return null;
 }
-function sameUrlEnvironment(left, right) {
-  return urlEnvironment(left) === urlEnvironment(right);
-}
-function urlEnvironment(value) {
-  try {
-    const url = new URL(value);
-    const host = url.hostname.toLowerCase();
-    if (host === "localhost" || host === "127.0.0.1") return "local";
-    if (host.endsWith(".stg.topolo.us") || host.includes("topolo-staging")) return "staging";
-    if (host.endsWith(".topolo.app") || host.endsWith(".topolo.us")) return "production";
-    return "external";
-  } catch {
-    return "external";
-  }
-}
 var WRITE_METHODS = /* @__PURE__ */ new Set(["POST", "PUT", "PATCH", "DELETE"]);
 var TOPOLO_ACTION_ID_HEADER = "X-Topolo-Action-Id";
 var TOPOLO_ACTION_NAME_HEADER = "X-Topolo-Action-Name";
@@ -2295,7 +2272,7 @@ var TopoloClient = class _TopoloClient {
   async resolveLiveCallableService(serviceKey) {
     const catalog = await this.listServices();
     const match = catalog.find((entry) => catalogEntryMatches(entry, serviceKey));
-    if (!match || !isCallableCatalogEntry(match)) return null;
+    if (!match) return null;
     const baseUrl = resolveCatalogServiceUrl(match, {
       serviceKey,
       overrides: this.serviceUrls
@@ -2393,7 +2370,6 @@ var TopoloClient = class _TopoloClient {
         slug: typeof s.app_slug === "string" ? s.app_slug : null,
         name: typeof s.name === "string" ? s.name : null,
         description: typeof s.description === "string" ? s.description : null,
-        baseUrl: typeof s.base_url === "string" ? s.base_url : null,
         apiBaseUrl: typeof s.api_base_url === "string" ? s.api_base_url : typeof s.apiBaseUrl === "string" ? s.apiBaseUrl : null,
         launchUrl: typeof s.launch_url === "string" ? s.launch_url : typeof s.launchUrl === "string" ? s.launchUrl : null,
         status: typeof s.status === "string" ? s.status : null,
@@ -2480,7 +2456,6 @@ var TopoloClient = class _TopoloClient {
       slug: app.id,
       name: app.name ?? app.id,
       description: null,
-      baseUrl: app.productionUrl ?? null,
       apiBaseUrl: null,
       launchUrl: app.productionUrl ?? null,
       status: "bundled",
@@ -2573,13 +2548,6 @@ function catalogEntryLookupKeys(entry) {
   }
   return [...keys];
 }
-function isCallableCatalogEntry(entry) {
-  const kind = normalizeLookupKey(entry.surfaceKind || "");
-  if (kind === "api" || kind === "technical_service" || kind === "service") return true;
-  return Boolean(
-    (entry.baseUrl || entry.apiBaseUrl) && catalogEntryLookupKeys(entry).some((key) => Object.prototype.hasOwnProperty.call(DEFAULT_SERVICE_URLS, key))
-  );
-}
 function normalizeActionCatalogEntry(item) {
   if (!item || typeof item !== "object" || Array.isArray(item)) return null;
   const a = item;
@@ -8252,7 +8220,7 @@ function applicationRowsFromCatalog(catalog) {
     name: entry.name ?? entry.slug ?? entry.serviceId,
     appDir: "-",
     packageName: null,
-    productionUrl: entry.baseUrl,
+    productionUrl: entry.launchUrl ?? null,
     services: [displayCatalogId(entry)],
     deployTargets: 0
   })).sort((left, right) => left.id.localeCompare(right.id));
@@ -8849,22 +8817,23 @@ function buildRows(catalog, overrides, environment = selectedEnvironment()) {
       defaultUrl,
       effectiveUrl,
       overridden: Boolean(configuredUrl && configuredUrl !== defaultUrl),
-      environmentSafe: environment !== "staging" || isStagingUrl(effectiveUrl),
+      environmentSafe: environment !== "staging" || !effectiveUrl || isStagingUrl(effectiveUrl),
       permissions: [...entry.permissions]
     };
   }).sort((left, right) => left.id.localeCompare(right.id));
 }
 function formatRows2(rows, environment = selectedEnvironment()) {
   const idWidth = Math.max(3, ...rows.map((r) => r.id.length));
-  const urlWidth = Math.max(7, ...rows.map((r) => r.effectiveUrl.length));
+  const urlWidth = Math.max(7, ...rows.map((r) => (r.effectiveUrl ?? "-").length));
   const lines = [];
   lines.push(`Environment: ${environment}`);
   lines.push("");
   lines.push(`${"ID".padEnd(idWidth)}  ${"URL".padEnd(urlWidth)}  OVERRIDE  READY`);
   lines.push(`${"-".repeat(idWidth)}  ${"-".repeat(urlWidth)}  --------  -----`);
   for (const r of rows) {
+    const effectiveUrl = r.effectiveUrl ?? "-";
     lines.push(
-      `${r.id.padEnd(idWidth)}  ${r.effectiveUrl.padEnd(urlWidth)}  ${r.overridden ? "yes" : "".padEnd(8)}  ${r.environmentSafe ? "yes" : "no"}`
+      `${r.id.padEnd(idWidth)}  ${effectiveUrl.padEnd(urlWidth)}  ${r.overridden ? "yes" : "".padEnd(8)}  ${r.environmentSafe ? "yes" : "no"}`
     );
   }
   return lines.join("\n");
@@ -8885,7 +8854,7 @@ function displayServiceId(entry) {
   return serviceIdCandidates(entry.slug || entry.serviceId)[0] || entry.serviceId;
 }
 function defaultServiceUrl(id, entry) {
-  return resolveCatalogServiceUrl(entry, { serviceKey: id }) ?? DEFAULT_SERVICE_URLS[id] ?? "";
+  return resolveCatalogServiceUrl(entry, { serviceKey: id });
 }
 function configuredServiceUrl(id, overrides) {
   if (!overrides) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topolo/cli",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "Command-line interface for Topolo developers, operators, and agents, with internal first-party scaffolding available under the topolo platform namespace.",
   "type": "module",
   "bin": {