@nurix/apollo 0.5.3 → 0.5.5

package/dist/commands/search.js

@@ -2,7 +2,7 @@
 // the Apollo Directory. `apollo search <kw>` searches the apps users built (the
 // headline); `apollo search services <kw>` searches the services registry. Both
 // support --json (raw results for agents), --category/--type, and --limit.
-import { resolveAdminUrl, resolveApolloUrl, searchApps, searchCatalogue, } from "../lib/apollo_client.js";
+import { resolveApolloUrl, searchApps, searchCatalogue, } from "../lib/apollo_client.js";
 // `apollo search <keywords...>` — apps (the headline).
 export async function runSearch(keywords, options, globals) {
     const query = keywords.join(" ").trim();
@@ -11,8 +11,8 @@ export async function runSearch(keywords, options, globals) {
         process.exitCode = 1;
         return;
     }
-    const adminUrl = resolveAdminUrl(globals);
-    const results = await searchApps(adminUrl, query, { category: options.category, limit: options.limit });
+    const baseUrl = resolveApolloUrl(globals);
+    const results = await searchApps(baseUrl, query, { category: options.category, limit: options.limit });
     if (options.json) {
         console.log(JSON.stringify(results, null, 2));
         return;

package/dist/index.js

@@ -24,7 +24,6 @@ program
     .description("Bootstrap NuStack services into your repo via the Apollo discovery plane.")
     .version(version)
     .option("--apollo-url <url>", "Apollo base URL (defaults to $APOLLO_URL, then the hosted instance)")
-    .option("--admin-url <url>", "Apollo base URL for app search (defaults to $APOLLO_ADMIN_URL, then the hosted Apollo instance)")
     // Bare `apollo`: bootstrap — check sign-in, login if needed, then init.
     .action(async () => runBootstrap(program.opts()));
 program.addHelpText("after", "\nRun `apollo` with no command to bootstrap: it checks your sign-in, runs login if needed, then init.");
@@ -103,4 +102,30 @@ search
     .option("--type <type>", "filter services by type")
     .option("--limit <n>", "max results (default 20)", toLimit)
     .action(async (keywords, options) => runSearchServices(keywords, options, program.opts()));
-await program.parseAsync(process.argv);
+// Translate an unexpected throw (mostly network failures from the read-only
+// commands that call the client directly) into a single clean stderr line —
+// never a raw Node stack trace. Interactive commands frame their own errors.
+function describeError(error) {
+    const cause = error?.cause;
+    const code = cause?.code;
+    if (code === "ENOTFOUND" || code === "EAI_AGAIN") {
+        return "couldn't resolve the Apollo host — check your connection or pass --apollo-url.";
+    }
+    if (code === "ECONNREFUSED") {
+        return "the Apollo host refused the connection — is it up? Override with --apollo-url.";
+    }
+    if (error instanceof Error && (error.name === "TimeoutError" || error.name === "AbortError")) {
+        return "the request to Apollo timed out — check your connection or try again.";
+    }
+    if (error instanceof Error && error.message === "fetch failed") {
+        return "couldn't reach Apollo — check your connection or pass --apollo-url.";
+    }
+    return error instanceof Error ? error.message : String(error);
+}
+try {
+    await program.parseAsync(process.argv);
+}
+catch (error) {
+    console.error(`apollo: ${describeError(error)}`);
+    process.exitCode = 1;
+}

package/dist/lib/apollo_client.js

@@ -1,18 +1,11 @@
 // packages/cli/src/lib/apollo_client.ts - HTTP client for the Apollo discovery
 // plane: catalogue fetch + credential exchange + key validation.
-const DEFAULT_APOLLO_URL = "https://apollo.nurix-ai.co";
-// App search now lives on the merged Apollo worker (same origin as everything
-// else); there is no separate admin host.
-const DEFAULT_ADMIN_URL = "https://apollo.nurix-ai.co";
+const DEFAULT_APOLLO_URL = "https://apollo.nustack.tech";
 const REQUEST_TIMEOUT_MS = 10_000;
 // Resolve the Apollo base URL: --apollo-url flag > APOLLO_URL env > hosted default.
 export function resolveApolloUrl(options) {
     return (options.apolloUrl ?? process.env.APOLLO_URL ?? DEFAULT_APOLLO_URL).replace(/\/+$/, "");
 }
-// Resolve the admin base URL (app search): --admin-url > APOLLO_ADMIN_URL > hosted admin.
-export function resolveAdminUrl(options) {
-    return (options.adminUrl ?? process.env.APOLLO_ADMIN_URL ?? DEFAULT_ADMIN_URL).replace(/\/+$/, "");
-}
 // Fetch the public discovery catalogue.
 export async function fetchCatalogue(baseUrl) {
     const response = await fetch(`${baseUrl}/api/catalog.json`, {
@@ -66,9 +59,9 @@ export async function fetchBrokeredCredential(baseUrl, appKey, service) {
     return { url: payload.url ?? null, key: payload.key, meta: payload.meta ?? null };
 }
 // Search published marketplace apps by keyword — the Apollo Directory headline.
-// Extends admin-panel's public GET /api/v2/apps with ?q= (the `{ data }` envelope).
-export async function searchApps(adminUrl, query, opts = {}) {
-    const url = new URL(`${adminUrl}/api/v2/apps`);
+// Extends the apollo Worker's public GET /api/v2/apps with ?q= (the `{ data }` envelope).
+export async function searchApps(baseUrl, query, opts = {}) {
+    const url = new URL(`${baseUrl}/api/v2/apps`);
     url.searchParams.set("q", query);
     if (opts.category)
         url.searchParams.set("category", opts.category);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nurix/apollo",
-    "version": "0.5.3",
+    "version": "0.5.5",
     "description": "The apollo CLI — bootstrap NuStack services into a repo via the Apollo discovery plane.",
     "type": "module",
     "private": false,
@@ -23,6 +23,8 @@
         "build": "tsc && node scripts/copy_schema.mjs",
         "dev": "tsc --watch",
         "typecheck": "tsc --noEmit",
+        "test": "vitest run",
+        "test:watch": "vitest",
         "prepublishOnly": "npm run build"
     },
     "dependencies": {
@@ -33,7 +35,8 @@
     },
     "devDependencies": {
         "@types/node": "^22.10.0",
-        "typescript": "catalog:"
+        "typescript": "catalog:",
+        "vitest": "latest"
     },
     "publishConfig": {
         "access": "restricted"