routstrd 0.2.10 → 0.2.12

package/dist/index.js

@@ -15243,10 +15243,7 @@ async function getClientsList() {
 async function addDaemonClient(name) {
   const existingClients = await getClientsList();
   const derivedId = name.replace(/\s+/g, "-").toLowerCase();
-  const config = await loadConfig();
-  const suffix = getNpubSuffix2(config);
-  const clientId = suffix ? addSuffixToId(derivedId, suffix) : derivedId;
-  const existing = existingClients.find((c) => c.clientId === clientId);
+  const existing = existingClients.find((c) => c.clientId === derivedId);
   if (existing) {
     const client = {
       id: existing.clientId,
@@ -15257,9 +15254,12 @@ async function addDaemonClient(name) {
     };
     return { client, created: false };
   }
+  const config = await loadConfig();
+  const suffix = getNpubSuffix2(config);
+  const clientId = suffix ? addSuffixToId(derivedId, suffix) : derivedId;
   const result = await callDaemon("/clients/add", {
     method: "POST",
-    body: { name, id: derivedId }
+    body: { name, id: clientId }
   });
   const output4 = result.output;
   if (!output4?.client?.apiKey) {
@@ -15314,6 +15314,7 @@ async function deleteClientAction(id) {
 async function addClientAction(options) {
   await ensureDaemonRunning();
   const config = await loadConfig();
+  const suffix = getNpubSuffix2(config);
   const integrationKeys = [];
   if (options.opencode)
     integrationKeys.push("opencode");
@@ -15339,7 +15340,7 @@ async function addClientAction(options) {
         await integrationFn(config, client.apiKey, integrationConfig);
         console.log(`
   ${integrationConfig.name}:`);
-        console.log(`    Client ID: ${client.id}`);
+        console.log(`    Client ID: ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
         console.log(`    API Key:   ${client.apiKey}`);
       } catch (error) {
         logger.error(`Failed to set up ${integrationConfig.name} integration:`, error);
@@ -15359,7 +15360,7 @@ async function addClientAction(options) {
     if (!created) {
       console.log(`Client '${options.name}' already exists.`);
       console.log(`
-  ID:     ${client.id}`);
+  ID:     ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
       console.log(`  Name:   ${client.name}`);
       console.log(`  API Key: ${client.apiKey}`);
       return;
@@ -15368,7 +15369,7 @@ async function addClientAction(options) {
       console.log(message);
     }
     console.log(`
-  ID:     ${client.id}`);
+  ID:     ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
     console.log(`  Name:   ${client.name}`);
     console.log(`  API Key: ${client.apiKey}`);
     console.log(`
@@ -15557,7 +15558,7 @@ async function isCocodInstalled(cocodPath) {
 // package.json
 var package_default = {
   name: "routstrd",
-  version: "0.2.10",
+  version: "0.2.12",
   module: "src/index.ts",
   type: "module",
   private: false,
@@ -16075,7 +16076,7 @@ npubsCmd.command("list").description("List configured admin npubs").action(async
   const data = result.output?.npubs ? result.output : result;
   const npubs = data?.npubs ?? [];
   if (npubs.length === 0) {
-    console.log("No admin npubs configured.");
+    console.log("No admin npubs configured. Run 'routstrd npubs register' to register yourself as the first admin.");
     return;
   }
   console.log(`Admin npubs (${npubs.length}):`);
@@ -16092,6 +16093,46 @@ npubsCmd.command("list").description("List configured admin npubs").action(async
     console.log(`  ${userNpub}`);
   }
 });
+npubsCmd.command("register").description("Register yourself as the first admin (only when no admins exist)").action(async () => {
+  await ensureDaemonRunning();
+  const config = await loadConfig();
+  const userNpub = getUserNpub(config);
+  if (!userNpub) {
+    console.error("No Nostr identity configured. Run 'routstrd remote <url>' to set one up.");
+    process.exit(1);
+  }
+  const result = await callDaemon("/npubs");
+  if (result.error) {
+    console.log(result.error);
+    process.exit(1);
+  }
+  const data = result.output?.npubs ? result.output : result;
+  const npubs = data?.npubs ?? [];
+  if (npubs.length > 0) {
+    console.log(`Admin npubs already configured (${npubs.length}). Ask your admin to add your npub. 
+ Your npub: ${userNpub}`);
+    return;
+  }
+  const normalized = normalizeNostrPubkey(userNpub);
+  if (!normalized) {
+    console.error("Failed to normalize user npub.");
+    process.exit(1);
+  }
+  const addResult = await callDaemon("/npubs", {
+    method: "POST",
+    body: { npub: npubFromPubkey(normalized) }
+  });
+  if (addResult.error) {
+    console.log(addResult.error);
+    process.exit(1);
+  }
+  const output4 = addResult.output;
+  if (output4?.npub) {
+    console.log(`Successfully registered as first admin npub: ${output4.npub}`);
+  } else {
+    console.log(`Successfully registered as first admin npub: ${userNpub}`);
+  }
+});
 npubsCmd.command("add <npub>").description("Add an admin npub (hex pubkey or npub1...)").action(async (npubArg) => {
   await ensureDaemonRunning();
   const normalized = normalizeNostrPubkey(npubArg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "routstrd",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "module": "src/index.ts",
   "type": "module",
   "private": false,

package/src/cli.ts

@@ -856,7 +856,7 @@ npubsCmd
       : result;
     const npubs = (data as { npubs?: string[] } | undefined)?.npubs ?? [];
     if (npubs.length === 0) {
-      console.log("No admin npubs configured.");
+      console.log("No admin npubs configured. Run 'routstrd npubs register' to register yourself as the first admin.");
       return;
     }
     console.log(`Admin npubs (${npubs.length}):`);
@@ -875,6 +875,55 @@ npubsCmd
     }
   });
 
+npubsCmd
+  .command("register")
+  .description("Register yourself as the first admin (only when no admins exist)")
+  .action(async () => {
+    await ensureDaemonRunning();
+    const config = await loadConfig();
+    const userNpub = getUserNpub(config);
+    if (!userNpub) {
+      console.error(
+        "No Nostr identity configured. Run 'routstrd remote <url>' to set one up.",
+      );
+      process.exit(1);
+    }
+    const result = await callDaemon("/npubs");
+    if (result.error) {
+      console.log(result.error);
+      process.exit(1);
+    }
+    const data = (result.output as { npubs?: string[] } | undefined)?.npubs
+      ? result.output
+      : result;
+    const npubs = (data as { npubs?: string[] } | undefined)?.npubs ?? [];
+    if (npubs.length > 0) {
+      console.log(`Admin npubs already configured (${npubs.length}). Ask your admin to add your npub. \n Your npub: ${userNpub}`);
+      return;
+    }
+    const normalized = normalizeNostrPubkey(userNpub);
+    if (!normalized) {
+      console.error("Failed to normalize user npub.");
+      process.exit(1);
+    }
+    const addResult = await callDaemon("/npubs", {
+      method: "POST",
+      body: { npub: npubFromPubkey(normalized) },
+    });
+    if (addResult.error) {
+      console.log(addResult.error);
+      process.exit(1);
+    }
+    const output = addResult.output as
+      | { npub?: string; added?: boolean; error?: string }
+      | undefined;
+    if (output?.npub) {
+      console.log(`Successfully registered as first admin npub: ${output.npub}`);
+    } else {
+      console.log(`Successfully registered as first admin npub: ${userNpub}`);
+    }
+  });
+
 npubsCmd
   .command("add <npub>")
   .description("Add an admin npub (hex pubkey or npub1...)")

package/src/utils/clients.ts

@@ -125,11 +125,8 @@ export async function addDaemonClient(
   const existingClients = await getClientsList();
   // Derive id from name by replacing spaces with hyphens
   const derivedId = name.replace(/\s+/g, "-").toLowerCase();
-  const config = await loadConfig();
-  const suffix = getNpubSuffix(config);
-  const clientId = suffix ? addSuffixToId(derivedId, suffix) : derivedId;
+  const existing = existingClients.find((c) => c.clientId === derivedId); 
 
-  const existing = existingClients.find((c) => c.clientId === clientId); 
 
   if (existing) {
     const client: DaemonClient = {
@@ -142,9 +139,14 @@ export async function addDaemonClient(
     return { client, created: false };
   }
 
+  const config = await loadConfig();
+  const suffix = getNpubSuffix(config);
+  const clientId = suffix ? addSuffixToId(derivedId, suffix) : derivedId;
+
+
   const result = await callDaemon("/clients/add", {
     method: "POST",
-    body: { name, id: derivedId },
+    body: { name, id: clientId },
   });
 
 
@@ -231,6 +233,7 @@ export interface AddClientOptions {
 export async function addClientAction(options: AddClientOptions): Promise<void> {
   await ensureDaemonRunning();
   const config = await loadConfig();
+  const suffix = getNpubSuffix(config);
 
   const integrationKeys: string[] = [];
   if (options.opencode) integrationKeys.push("opencode");
@@ -256,7 +259,7 @@ export async function addClientAction(options: AddClientOptions): Promise<void>
         await integrationFn(config, client.apiKey, integrationConfig);
 
         console.log(`\n  ${integrationConfig.name}:`);
-        console.log(`    Client ID: ${client.id}`);
+        console.log(`    Client ID: ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
         console.log(`    API Key:   ${client.apiKey}`);
       } catch (error) {
         logger.error(
@@ -283,7 +286,7 @@ export async function addClientAction(options: AddClientOptions): Promise<void>
 
     if (!created) {
       console.log(`Client '${options.name}' already exists.`);
-      console.log(`\n  ID:     ${client.id}`);
+      console.log(`\n  ID:     ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
       console.log(`  Name:   ${client.name}`);
       console.log(`  API Key: ${client.apiKey}`);
       return;
@@ -292,7 +295,7 @@ export async function addClientAction(options: AddClientOptions): Promise<void>
     if (message) {
       console.log(message);
     }
-    console.log(`\n  ID:     ${client.id}`);
+    console.log(`\n  ID:     ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
     console.log(`  Name:   ${client.name}`);
     console.log(`  API Key: ${client.apiKey}`);
     console.log(`\n  Access Routstr at: ${getDaemonBaseUrl(config)}/v1`);