routstrd 0.2.13 → 0.2.15

package/package.json

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

package/src/cli.ts

@@ -7,7 +7,6 @@ import {
   isDaemonRunning,
   loadConfig,
   getDaemonBaseUrl,
-  getNpubSuffix,
   getUserNpub,
 } from "./utils/daemon-client";
 import {
@@ -833,14 +832,19 @@ clientsCmd
     },
   );
 
-// Npubs - manage admin npubs
+// Npubs - manage npubs (admin and user roles)
 const npubsCmd = program
   .command("npubs")
-  .description("Manage admin npubs on the daemon");
+  .description("Manage npubs on the daemon (admin or user roles)");
+
+type NpubEntry = {
+  npub: string;
+  role: string;
+};
 
 npubsCmd
   .command("list")
-  .description("List configured admin npubs")
+  .description("List configured npubs with their roles")
   .action(async () => {
     await ensureDaemonRunning();
     const config = await loadConfig();
@@ -851,20 +855,20 @@ npubsCmd
       process.exit(1);
     }
     // Handle both wrapped { output: { npubs } } and direct { npubs } response formats
-    const data = (result.output as { npubs?: string[] } | undefined)?.npubs
+    const data = (result.output as { npubs?: NpubEntry[] } | undefined)?.npubs
       ? result.output
       : result;
-    const npubs = (data as { npubs?: string[] } | undefined)?.npubs ?? [];
+    const npubs = (data as { npubs?: NpubEntry[] } | undefined)?.npubs ?? [];
     if (npubs.length === 0) {
       console.log("No admin npubs configured. Run 'routstrd npubs register' to register yourself as the first admin.");
       return;
     }
-    console.log(`Admin npubs (${npubs.length}):`);
+    console.log(`Npubs (${npubs.length}):`);
     let found = false;
-    for (const npub of npubs) {
-      const marker = npub === userNpub ? " → you" : "";
-      if (npub === userNpub) found = true;
-      console.log(`- ${npub}${marker}`);
+    for (const entry of npubs) {
+      const marker = entry.npub === userNpub ? " → you" : "";
+      if (entry.npub === userNpub) found = true;
+      console.log(`- ${entry.npub} [${entry.role}]${marker}`);
     }
     if (userNpub && !found) {
       console.log("");
@@ -893,10 +897,10 @@ npubsCmd
       console.log(result.error);
       process.exit(1);
     }
-    const data = (result.output as { npubs?: string[] } | undefined)?.npubs
+    const data = (result.output as { npubs?: NpubEntry[] } | undefined)?.npubs
       ? result.output
       : result;
-    const npubs = (data as { npubs?: string[] } | undefined)?.npubs ?? [];
+    const npubs = (data as { npubs?: NpubEntry[] } | 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;
@@ -926,7 +930,7 @@ npubsCmd
 
 npubsCmd
   .command("add <npub>")
-  .description("Add an admin npub (hex pubkey or npub1...)")
+  .description("Add a npub (hex pubkey or npub1...). First becomes admin, subsequent become user.")
   .action(async (npubArg: string) => {
     await ensureDaemonRunning();
     const normalized = normalizeNostrPubkey(npubArg);
@@ -947,7 +951,7 @@ npubsCmd
       | undefined;
     if (output?.npub) {
       console.log(
-        `${output.added ? "Added" : "Already configured"} admin npub: ${output.npub}`,
+        `${output.added ? "Added" : "Already configured"} npub: ${output.npub}`,
       );
     }
   });

package/src/tui/usage/data.ts

@@ -1,5 +1,5 @@
 import type { UsageTrackingEntry } from "../../daemon/types.ts";
-import { callDaemon, getNpubSuffix, isDaemonRunning, loadConfig } from "../../utils/daemon-client.ts";
+import { callDaemon, isDaemonRunning } from "../../utils/daemon-client.ts";
 import type { ClientStats, DayStats, ModelStats, ProviderStats, UsageStats } from "./types.ts";
 
 export interface BalanceKey {
@@ -82,21 +82,10 @@ export async function fetchUsage(limit = 10000): Promise<UsageStats | null> {
     const result = await callDaemon(`/usage?limit=${limit}`);
     if (result.error) return null;
 
-    // The daemon returns { output: [...] } where output is the entries array directly.
-    // In remote daemon mode, client IDs are suffixed with the last 7 chars of our npub.
-    // Fetch the full daemon result, but only display/aggregate entries for our clients.
+    // The auth proxy filters usage to the authenticated npub's clients and
+    // returns client IDs without the owner suffix.
     const entries = result.output as UsageTrackingEntry[] | undefined;
-    const entriesArray = Array.isArray(entries) ? entries : [];
-    const suffix = getNpubSuffix(await loadConfig());
-    const suffixStr = suffix ? `-${suffix}` : null;
-    const visibleEntries = suffixStr
-      ? entriesArray
-        .filter((entry) => entry.client?.endsWith(suffixStr))
-        .map((entry) => ({
-          ...entry,
-          client: entry.client?.slice(0, -suffixStr.length),
-        }))
-      : entriesArray;
+    const visibleEntries = Array.isArray(entries) ? entries : [];
 
     // Calculate totals from visible entries
     const totals = visibleEntries.reduce(

package/src/utils/clients.ts

@@ -4,49 +4,16 @@ import {
   getDaemonBaseUrl,
   ensureDaemonRunning,
 } from "./daemon-client";
-import {
-  parseSecretKey,
-  npubFromSecretKey,
-} from "./nip98";
-import { type RoutstrdConfig } from "./config";
 import { logger } from "./logger";
 import { CLIENT_INTEGRATIONS, CLIENT_CONFIGS } from "../integrations/registry";
 
-export function getNpubSuffix(config: RoutstrdConfig): string | null {
-  if (!config.daemonUrl || !config.nsec) return null;
-  try {
-    const secretKey = parseSecretKey(config.nsec);
-    const npub = npubFromSecretKey(secretKey);
-    return npub.slice(-7);
-  } catch {
-    return null;
-  }
-}
-
-/**
- * Add suffix to a client ID.
- */
-export function addSuffixToId(id: string, suffix: string): string {
-  return `${id}-${suffix}`;
-}
-
-/**
- * Remove suffix from a client ID if present.
- */
-export function removeSuffixFromId(id: string, suffix: string): string {
-  const suffixStr = `-${suffix}`;
-  if (id.endsWith(suffixStr)) {
-    return id.slice(0, -suffixStr.length);
-  }
-  return id;
-}
-
 export interface ClientEntry {
   clientId: string;
   name: string;
   apiKey: string;
   createdAt: number;
   lastUsed?: number | null;
+  ownerNpub?: string;
 }
 
 export interface DaemonClient {
@@ -55,6 +22,7 @@ export interface DaemonClient {
   apiKey: string;
   createdAt: number;
   lastUsed?: number | null;
+  ownerNpub?: string;
 }
 
 /**
@@ -71,12 +39,14 @@ export function getClientsFromStore(store: { getState(): any }): ClientEntry[] {
       apiKey: string;
       createdAt: number;
       lastUsed?: number | null;
+      ownerNpub?: string;
     }) => ({
       clientId: c.clientId,
       name: c.name,
       apiKey: c.apiKey,
       createdAt: c.createdAt,
       lastUsed: c.lastUsed,
+      ownerNpub: c.ownerNpub,
     }),
   );
 }
@@ -86,7 +56,6 @@ export function getClientsFromStore(store: { getState(): any }): ClientEntry[] {
  * Use this when running remotely (CLI in remote mode).
  */
 export async function getClientsList(): Promise<ClientEntry[]> {
-  const config = await loadConfig();
   const result = await callDaemon("/clients");
   const clients = (
     result.output as
@@ -97,6 +66,7 @@ export async function getClientsList(): Promise<ClientEntry[]> {
             apiKey: string;
             createdAt: number;
             lastUsed?: number | null;
+            ownerNpub?: string;
           }>;
         }
       | undefined
@@ -106,17 +76,14 @@ export async function getClientsList(): Promise<ClientEntry[]> {
     return [];
   }
 
-  const suffix = config.daemonUrl ? getNpubSuffix(config) : null;
-
-  return clients
-    .filter((c) => !suffix || c.id.endsWith(`-${suffix}`))
-    .map((c) => ({
-      clientId: suffix ? removeSuffixFromId(c.id, suffix) : c.id,
-      name: c.name,
-      apiKey: c.apiKey,
-      createdAt: c.createdAt,
-      lastUsed: c.lastUsed,
-    }));
+  return clients.map((c) => ({
+    clientId: c.id,
+    name: c.name,
+    apiKey: c.apiKey,
+    createdAt: c.createdAt,
+    lastUsed: c.lastUsed,
+    ownerNpub: c.ownerNpub,
+  }));
 }
 
 export async function addDaemonClient(
@@ -135,18 +102,14 @@ export async function addDaemonClient(
       apiKey: existing.apiKey,
       createdAt: existing.createdAt,
       lastUsed: existing.lastUsed,
+      ownerNpub: existing.ownerNpub,
     };
     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: clientId },
+    body: { name, id: derivedId },
   });
 
 
@@ -196,13 +159,9 @@ export async function listClientsAction(): Promise<void> {
 export async function deleteClientAction(id: string): Promise<void> {
   await ensureDaemonRunning();
 
-  const config = await loadConfig();
-  const suffix = getNpubSuffix(config);
-  const resolvedId = suffix ? addSuffixToId(id, suffix) : id;
-
   const result = await callDaemon("/clients/delete", {
     method: "POST",
-    body: { id: resolvedId },
+    body: { id },
   });
 
   if (result.error) {
@@ -233,7 +192,6 @@ 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");
@@ -259,7 +217,7 @@ export async function addClientAction(options: AddClientOptions): Promise<void>
         await integrationFn(config, client.apiKey, integrationConfig);
 
         console.log(`\n  ${integrationConfig.name}:`);
-        console.log(`    Client ID: ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
+        console.log(`    Client ID: ${client.id}`);
         console.log(`    API Key:   ${client.apiKey}`);
       } catch (error) {
         logger.error(
@@ -286,7 +244,7 @@ export async function addClientAction(options: AddClientOptions): Promise<void>
 
     if (!created) {
       console.log(`Client '${options.name}' already exists.`);
-      console.log(`\n  ID:     ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
+      console.log(`\n  ID:     ${client.id}`);
       console.log(`  Name:   ${client.name}`);
       console.log(`  API Key: ${client.apiKey}`);
       return;
@@ -295,7 +253,7 @@ export async function addClientAction(options: AddClientOptions): Promise<void>
     if (message) {
       console.log(message);
     }
-    console.log(`\n  ID:     ${suffix ? removeSuffixFromId(client.id, suffix) : client.id}`);
+    console.log(`\n  ID:     ${client.id}`);
     console.log(`  Name:   ${client.name}`);
     console.log(`  API Key: ${client.apiKey}`);
     console.log(`\n  Access Routstr at: ${getDaemonBaseUrl(config)}/v1`);