routstrd 0.2.9 → 0.2.10

package/dist/index.js

@@ -15240,9 +15240,13 @@ async function getClientsList() {
     lastUsed: c.lastUsed
   }));
 }
-async function addDaemonClient(name, clientId) {
+async function addDaemonClient(name) {
   const existingClients = await getClientsList();
-  const existing = clientId ? existingClients.find((c) => c.clientId === clientId) : existingClients.find((c) => c.name === name);
+  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);
   if (existing) {
     const client = {
       id: existing.clientId,
@@ -15253,7 +15257,6 @@ async function addDaemonClient(name, clientId) {
     };
     return { client, created: false };
   }
-  const derivedId = name.replace(/\s+/g, "-").toLowerCase();
   const result = await callDaemon("/clients/add", {
     method: "POST",
     body: { name, id: derivedId }
@@ -15327,7 +15330,7 @@ async function addClientAction(options) {
       if (!integrationFn || !integrationConfig)
         continue;
       try {
-        const { client, created } = await addDaemonClient(integrationConfig.name, integrationConfig.clientId);
+        const { client, created } = await addDaemonClient(integrationConfig.name);
         if (created) {
           logger.log(`Created new API key for ${integrationConfig.name}`);
         } else {
@@ -15554,7 +15557,7 @@ async function isCocodInstalled(cocodPath) {
 // package.json
 var package_default = {
   name: "routstrd",
-  version: "0.2.9",
+  version: "0.2.10",
   module: "src/index.ts",
   type: "module",
   private: false,

package/package.json

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

package/src/utils/clients.ts

@@ -121,12 +121,15 @@ export async function getClientsList(): Promise<ClientEntry[]> {
 
 export async function addDaemonClient(
   name: string,
-  clientId?: string,
 ): Promise<{ message?: string; client: DaemonClient; created: boolean }> {
   const existingClients = await getClientsList();
-  const existing = clientId
-    ? existingClients.find((c) => c.clientId === clientId)
-    : existingClients.find((c) => c.name === name);
+  // 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 === clientId); 
 
   if (existing) {
     const client: DaemonClient = {
@@ -139,9 +142,6 @@ export async function addDaemonClient(
     return { client, created: false };
   }
 
-  // Derive id from name by replacing spaces with hyphens
-  const derivedId = name.replace(/\s+/g, "-").toLowerCase();
-
   const result = await callDaemon("/clients/add", {
     method: "POST",
     body: { name, id: derivedId },
@@ -246,8 +246,7 @@ export async function addClientAction(options: AddClientOptions): Promise<void>
 
       try {
         const { client, created } = await addDaemonClient(
-          integrationConfig.name,
-          integrationConfig.clientId,
+          integrationConfig.name
         );
         if (created) {
           logger.log(`Created new API key for ${integrationConfig.name}`);