routstrd 0.3.0 → 0.3.2

package/src/utils/daemon-client.ts

@@ -35,13 +35,20 @@ export function getDaemonBaseUrl(config: RoutstrdConfig): string {
   );
 }
 
-export async function callDaemon(
+export function getAuthBaseUrl(config: RoutstrdConfig): string {
+  if (config.authUrl) {
+    return config.authUrl.replace(/\/$/, "");
+  }
+  return getDaemonBaseUrl(config);
+}
+
+async function _callUrl(
+  baseUrl: string,
   path: string,
-  options: { method?: "GET" | "POST" | "PATCH" | "DELETE"; body?: object } = {},
+  options: { method?: "GET" | "POST" | "PATCH" | "DELETE"; body?: object },
+  config: RoutstrdConfig,
 ): Promise<CommandResponse> {
   const { method = "GET", body } = options;
-  const config = await loadConfig();
-  const baseUrl = getDaemonBaseUrl(config);
   const url = `${baseUrl}${path}`;
 
   const bodyString = body ? JSON.stringify(body) : undefined;
@@ -50,7 +57,7 @@ export async function callDaemon(
     : undefined;
 
   let authorization: string | undefined;
-  if (config.daemonUrl && config.nsec) {
+  if ((config.daemonUrl || config.authUrl) && config.nsec) {
     const secretKey = parseSecretKey(config.nsec);
     authorization = await createNIP98Authorization(
       secretKey,
@@ -77,6 +84,26 @@ export async function callDaemon(
   return response.json() as Promise<CommandResponse>;
 }
 
+export async function callDaemon(
+  path: string,
+  options: { method?: "GET" | "POST" | "PATCH" | "DELETE"; body?: object } = {},
+): Promise<CommandResponse> {
+  const config = await loadConfig();
+  const baseUrl = getDaemonBaseUrl(config);
+  return _callUrl(baseUrl, path, options, config);
+}
+
+/** Like callDaemon but sends requests to the auth proxy URL instead.
+ *  Falls back to the daemon URL if no authUrl is configured. */
+export async function callAuth(
+  path: string,
+  options: { method?: "GET" | "POST" | "PATCH" | "DELETE"; body?: object } = {},
+): Promise<CommandResponse> {
+  const config = await loadConfig();
+  const baseUrl = getAuthBaseUrl(config);
+  return _callUrl(baseUrl, path, options, config);
+}
+
 export async function isDaemonRunning(): Promise<boolean> {
   try {
     const config = await loadConfig();

package/new-task.md

@@ -1,60 +0,0 @@
-# Hot-reload NWC connection (remove restart requirement)
-
-## Problem
-
-`nwc connect` and `nwc disconnect` require a daemon restart to take effect. The
-CLI writes the new connection string to disk, but the daemon never re-reads it.
-
-## Current flow
-
-1. **Startup** — `createWalletAdapter` reads `options.nwcConnectionString` and
-   creates a `WalletConnect` (relay pool + NWC wallet service) once:
-   ```ts
-   // src/daemon/wallet/index.ts:70-78
-   if (options.nwcConnectionString) {
-     wallet = WalletConnect.fromConnectURI(options.nwcConnectionString, { pool });
-   }
-   ```
-
-2. **CLI `nwc connect`** — HTTP handler at `POST /nwc/connect` only calls
-   `saveDaemonConfig(config)`. The running `WalletConnect` instance is untouched.
-
-3. **Result** — the old connection (or lack thereof) stays active until restart.
-
-## What needs to happen
-
-Provide a way for the daemon to tear down the old `WalletConnect` and create a
-new one from the updated connection string, triggered by the HTTP handler,
-**without restarting the process**.
-
-### Key pieces
-
-- **`src/daemon/wallet/index.ts`** — `createWalletAdapter` needs to expose a
-  `reconnect(connectionString: string)` method that:
-  - Closes the old relay pool / WalletConnect
-  - Creates a new `WalletConnect` from the new connection string
-  - Updates the adapter's internal `wallet` reference
-  - If connection string is empty/undefined, disconnects and sets `wallet` to
-    `undefined`
-  
-- **`src/daemon/http/index.ts`** — `POST /nwc/connect` and `POST /nwc/disconnect`
-  handlers should call `reconnect()` after saving config, and drop the "Restart
-  daemon" message.
-
-- **`src/daemon/index.ts`** — may need to store the `reconnect` function and pass
-  it through `DaemonDeps` to the HTTP handler.
-
-- **`src/cli.ts`** — remove `console.log("\nRun 'routstrd restart' to connect...")`
-  from the connect/disconnect commands.
-
-### Considerations
-
-- The `WalletConnect` instance is referenced in the auto-refill loop (passed to
-  `startAutoRefillLoop`). After a reconnect, the auto-refill loop's captured
-  `wallet` reference would be stale. The loop already reads config from disk
-  each cycle, so it should also reference the latest `wallet` instance.
-  - Could make the auto-refill loop accept a `getWallet: () => WalletConnect |
-    undefined` getter, same pattern as the config getter.
-- Relay pool cleanup — `applesauce-wallet-connect` / `applesauce-relay` may need
-  explicit `pool.close()` or `pool.destroy()` to free connections.
-- Edge case: a refill is in progress when reconnect is triggered.