@wizardconnect/core 0.1.0 → 0.1.4

package/dist/connection-manager.d.ts

@@ -1,45 +1,34 @@
 import { LogScope } from "./log.js";
 import { EventEmitter } from "eventemitter3";
 export interface VisibilityChangeContext<TClient> {
-  client: TClient;
-  state: "hidden" | "visible";
-  setPaused: (_value: boolean) => void;
-  isPaused: () => boolean;
-  startConnectionLoop: () => void;
+    client: TClient;
+    state: "hidden" | "visible";
+    setPaused: (_value: boolean) => void;
+    isPaused: () => boolean;
+    startConnectionLoop: () => void;
 }
-export interface ConnectionManagerOptions<
-  TClient extends ConnectionClient = ConnectionClient,
-> {
-  reconnectInterval?: number;
-  maxReconnectAttempts?: number;
-  enableVisibilityHandling?: boolean;
-  scope?: LogScope;
-  onVisibilityChange?: (
-    _context: VisibilityChangeContext<TClient>,
-  ) => void | Promise<void>;
+export interface ConnectionManagerOptions<TClient extends ConnectionClient = ConnectionClient> {
+    reconnectInterval?: number;
+    maxReconnectAttempts?: number;
+    enableVisibilityHandling?: boolean;
+    scope?: LogScope;
+    onVisibilityChange?: (_context: VisibilityChangeContext<TClient>) => void | Promise<void>;
 }
 export interface ConnectionClient extends EventEmitter {
-  connect(): Promise<void>;
-  disconnect(..._args: any[]): Promise<void | boolean>;
+    connect(): Promise<void>;
+    disconnect(..._args: any[]): Promise<void | boolean>;
 }
 export interface ConnectionManagerResult {
-  cleanup: () => Promise<void>;
-  startConnectionLoop: () => void;
+    cleanup: () => Promise<void>;
+    startConnectionLoop: () => void;
 }
-export declare const createConnectionManager: <
-  TClient extends ConnectionClient,
->(
-  client: TClient,
-  callbacks: {
+export declare const createConnectionManager: <TClient extends ConnectionClient>(client: TClient, callbacks: {
     onConnected: (_client: TClient) => void;
     onReconnecting: (_client: TClient, _reason: string | null) => void;
     onDisconnected: (_client: TClient) => void;
     onError?: (_client: TClient, _error: any) => void;
-  },
-  events: {
+}, events: {
     connected: string;
     disconnected: string;
     error?: string;
-  },
-  options?: ConnectionManagerOptions<TClient>,
-) => ConnectionManagerResult;
+}, options?: ConnectionManagerOptions<TClient>) => ConnectionManagerResult;

package/dist/connection-manager.js

@@ -1,157 +1,155 @@
+// Copyright (C) 2026 Whiterun LLC,
+// This software is licensed under the GNU Lesser General Public License (LGPL), version 3.0 or later.
+// A copy of the license can be found in the LICENSE file or at https://www.gnu.org/licenses/lgpl-3.0.html
 import { debug, Scope } from "./log.js";
 async function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+    return new Promise((resolve) => setTimeout(resolve, ms));
 }
-export const createConnectionManager = (
-  client,
-  callbacks,
-  events,
-  options = {},
-) => {
-  const {
-    reconnectInterval = 5000,
-    maxReconnectAttempts = Infinity,
-    enableVisibilityHandling = true,
-    scope = Scope.Network,
-    onVisibilityChange,
-  } = options;
-  let isPaused = false;
-  let reconnectLoop = null;
-  let visibilityChangeHandler = null;
-  const triggerReconnect = (reason) => {
-    if (!isPaused) {
-      callbacks.onReconnecting(client, reason);
-      reconnectLoop = null;
-      startConnectionLoop();
-    }
-  };
-  const onConnected = () => callbacks.onConnected(client);
-  client.on(events.connected, onConnected);
-  const onDisconnected = (...args) => {
-    const err = args[0] instanceof Error ? args[0].message : null;
-    debug(scope, "Disconnected event received", err);
-    triggerReconnect(err);
-  };
-  const onError = (err) => {
-    const errorMsg = err?.message || String(err);
-    debug(scope, "Error event received", errorMsg);
-    triggerReconnect(errorMsg);
-    if (callbacks.onError) {
-      callbacks.onError(client, err);
-    }
-  };
-  client.on(events.disconnected, onDisconnected);
-  if (events.error) {
-    client.on(events.error, onError);
-  }
-  const setupVisibilityHandling = () => {
-    if (typeof document === "undefined") {
-      return;
+export const createConnectionManager = (client, callbacks, events, options = {}) => {
+    const { reconnectInterval = 5000, maxReconnectAttempts = Infinity, enableVisibilityHandling = true, scope = Scope.Network, onVisibilityChange, } = options;
+    let isPaused = false;
+    let reconnectLoop = null;
+    let visibilityChangeHandler = null;
+    const triggerReconnect = (reason) => {
+        if (!isPaused) {
+            callbacks.onReconnecting(client, reason);
+            reconnectLoop = null;
+            startConnectionLoop();
+        }
+    };
+    const onConnected = () => callbacks.onConnected(client);
+    client.on(events.connected, onConnected);
+    const onDisconnected = (...args) => {
+        const err = args[0] instanceof Error ? args[0].message : null;
+        debug(scope, "Disconnected event received", err);
+        triggerReconnect(err);
+    };
+    const onError = (err) => {
+        const errorMsg = err?.message || String(err);
+        debug(scope, "Error event received", errorMsg);
+        triggerReconnect(errorMsg);
+        if (callbacks.onError) {
+            callbacks.onError(client, err);
+        }
+    };
+    client.on(events.disconnected, onDisconnected);
+    if (events.error) {
+        client.on(events.error, onError);
     }
-    visibilityChangeHandler = () => {
-      const state = document.visibilityState;
-      if (onVisibilityChange) {
-        const context = {
-          client,
-          state,
-          setPaused: (value) => {
-            isPaused = value;
-          },
-          isPaused: () => isPaused,
-          startConnectionLoop,
+    const setupVisibilityHandling = () => {
+        if (typeof document === "undefined") {
+            return;
+        }
+        visibilityChangeHandler = () => {
+            const state = document.visibilityState;
+            if (onVisibilityChange) {
+                const context = {
+                    client,
+                    state,
+                    setPaused: (value) => {
+                        isPaused = value;
+                    },
+                    isPaused: () => isPaused,
+                    startConnectionLoop,
+                };
+                (async () => {
+                    try {
+                        await onVisibilityChange(context);
+                    }
+                    catch (err) {
+                        debug(scope, "Error in custom visibility change handler:", err);
+                    }
+                })();
+                return;
+            }
+            if (state === "hidden") {
+                isPaused = true;
+                (async () => {
+                    try {
+                        await client.disconnect();
+                        callbacks.onDisconnected(client);
+                    }
+                    catch (err) {
+                        debug(scope, "Error disconnecting on visibility change:", err);
+                    }
+                })();
+            }
+            else if (state === "visible") {
+                if (isPaused) {
+                    isPaused = false;
+                    startConnectionLoop();
+                }
+            }
         };
-        (async () => {
-          try {
-            await onVisibilityChange(context);
-          } catch (err) {
-            debug(scope, "Error in custom visibility change handler:", err);
-          }
-        })();
-        return;
-      }
-      if (state === "hidden") {
-        isPaused = true;
-        (async () => {
-          try {
-            await client.disconnect();
-            callbacks.onDisconnected(client);
-          } catch (err) {
-            debug(scope, "Error disconnecting on visibility change:", err);
-          }
-        })();
-      } else if (state === "visible") {
-        if (isPaused) {
-          isPaused = false;
-          startConnectionLoop();
+        document.addEventListener("visibilitychange", visibilityChangeHandler);
+    };
+    const startConnectionLoop = () => {
+        if (reconnectLoop) {
+            return;
         }
-      }
+        reconnectLoop = (async () => {
+            let reconnectAttempts = 0;
+            let wasConnected = false;
+            while (true) {
+                if (isPaused) {
+                    await sleep(1000);
+                    continue;
+                }
+                try {
+                    await client.connect();
+                    // onConnected is fired via the "connection" event emitted inside client.connect()
+                    // — do NOT call callbacks.onConnected here too, that would double-fire it.
+                    reconnectAttempts = 0;
+                    wasConnected = true;
+                    reconnectLoop = null;
+                    return;
+                }
+                catch (e) {
+                    reconnectAttempts++;
+                    if (wasConnected || reconnectAttempts === 1) {
+                        callbacks.onReconnecting(client, `${e}`);
+                        wasConnected = false;
+                    }
+                    if (reconnectAttempts > maxReconnectAttempts) {
+                        callbacks.onDisconnected(client);
+                        reconnectLoop = null;
+                        return;
+                    }
+                    try {
+                        await client.disconnect();
+                    }
+                    catch (disconnectError) {
+                        debug(scope, "Failed to disconnect client", disconnectError);
+                    }
+                    await sleep(reconnectInterval);
+                }
+            }
+        })();
     };
-    document.addEventListener("visibilitychange", visibilityChangeHandler);
-  };
-  const startConnectionLoop = () => {
-    if (reconnectLoop) {
-      return;
+    if (enableVisibilityHandling) {
+        setupVisibilityHandling();
     }
-    reconnectLoop = (async () => {
-      let reconnectAttempts = 0;
-      let wasConnected = false;
-      while (true) {
-        if (isPaused) {
-          await sleep(1000);
-          continue;
+    const cleanup = async () => {
+        isPaused = true;
+        if (typeof document !== "undefined" && visibilityChangeHandler !== null) {
+            document.removeEventListener("visibilitychange", visibilityChangeHandler);
         }
+        client.off(events.connected, onConnected);
+        client.off(events.disconnected, onDisconnected);
+        if (events.error) {
+            client.off(events.error, onError);
+        }
+        callbacks.onDisconnected(client);
         try {
-          await client.connect();
-          // onConnected is fired via the "connection" event emitted inside client.connect()
-          // — do NOT call callbacks.onConnected here too, that would double-fire it.
-          reconnectAttempts = 0;
-          wasConnected = true;
-          reconnectLoop = null;
-          return;
-        } catch (e) {
-          reconnectAttempts++;
-          if (wasConnected || reconnectAttempts === 1) {
-            callbacks.onReconnecting(client, `${e}`);
-            wasConnected = false;
-          }
-          if (reconnectAttempts > maxReconnectAttempts) {
-            callbacks.onDisconnected(client);
-            reconnectLoop = null;
-            return;
-          }
-          try {
             await client.disconnect();
-          } catch (disconnectError) {
-            debug(scope, "Failed to disconnect client", disconnectError);
-          }
-          await sleep(reconnectInterval);
         }
-      }
-    })();
-  };
-  if (enableVisibilityHandling) {
-    setupVisibilityHandling();
-  }
-  const cleanup = async () => {
-    isPaused = true;
-    if (typeof document !== "undefined" && visibilityChangeHandler !== null) {
-      document.removeEventListener("visibilitychange", visibilityChangeHandler);
-    }
-    client.off(events.connected, onConnected);
-    client.off(events.disconnected, onDisconnected);
-    if (events.error) {
-      client.off(events.error, onError);
-    }
-    callbacks.onDisconnected(client);
-    try {
-      await client.disconnect();
-    } catch (e) {
-      debug(scope, "Failed to disconnect client during cleanup", e);
-    }
-  };
-  return {
-    cleanup,
-    startConnectionLoop,
-  };
+        catch (e) {
+            debug(scope, "Failed to disconnect client during cleanup", e);
+        }
+    };
+    return {
+        cleanup,
+        startConnectionLoop,
+    };
 };
-//# sourceMappingURL=connection-manager.js.map
+//# sourceMappingURL=connection-manager.js.map

package/dist/connection-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../src/connection-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../src/connection-manager.ts"],"names":[],"mappings":"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"}

package/dist/dapp-relay.d.ts

@@ -3,25 +3,23 @@ import { RelayStatusCallback } from "./relay-handler.js";
 import { KeyExchangeCredentials } from "./key-exchange.js";
 import { EventEmitter } from "eventemitter3";
 export interface DappRelayOptions {
-  explicitRelayUrls?: string[];
-  reconnectInterval?: number;
-  maxReconnectAttempts?: number;
-  existingCredentials?: {
-    privateKey: string;
-    secret: string;
-  };
+    explicitRelayUrls?: string[];
+    reconnectInterval?: number;
+    maxReconnectAttempts?: number;
+    existingCredentials?: {
+        privateKey: string;
+        secret: string;
+        walletPublicKey: string;
+    };
 }
 export interface DappRelayResult {
-  client: RelayClient;
-  uri: string;
-  qrUri: string;
-  credentials: KeyExchangeCredentials;
-  events: EventEmitter<{
-    keyexchangecomplete: [walletPublicKey: Uint8Array];
-  }>;
-  cleanup: () => void;
+    client: RelayClient;
+    uri: string;
+    qrUri: string;
+    credentials: KeyExchangeCredentials;
+    events: EventEmitter<{
+        keyexchangecomplete: [walletPublicKey: Uint8Array];
+    }>;
+    cleanup: () => void;
 }
-export declare function initiateDappRelay(
-  statusCallback: RelayStatusCallback,
-  options?: DappRelayOptions,
-): DappRelayResult;
+export declare function initiateDappRelay(statusCallback: RelayStatusCallback, options?: DappRelayOptions): DappRelayResult;

package/dist/dapp-relay.js

@@ -1,129 +1,117 @@
-import { initiateRelay } from "./relay-handler.js";
+// Copyright (C) 2026 Whiterun LLC,
+// This software is licensed under the GNU Lesser General Public License (LGPL), version 3.0 or later.
+// A copy of the license can be found in the LICENSE file or at https://www.gnu.org/licenses/lgpl-3.0.html
+import { initiateRelay, } from "./relay-handler.js";
 import { RelayMsgAction } from "./protocols/hdwalletv1.js";
-import {
-  generateKeyExchangeCredentials,
-  encodeKeyExchangeURI,
-  DEFAULT_RELAY_HOSTNAME,
-  DEFAULT_RELAY_PORT,
-  DEFAULT_RELAY_PROTOCOL,
-} from "./key-exchange.js";
+import { generateKeyExchangeCredentials, encodeKeyExchangeURI, DEFAULT_RELAY_HOSTNAME, DEFAULT_RELAY_PORT, DEFAULT_RELAY_PROTOCOL, } from "./key-exchange.js";
 import { hexToBin, binToHex } from "@bitauth/libauth";
 import { EventEmitter } from "eventemitter3";
 import { deriveNostrPublicKey } from "./utilnostr.js";
 import { error as logError, warn, Scope } from "./log.js";
 export function initiateDappRelay(statusCallback, options = {}) {
-  const events = new EventEmitter();
-  let credentials;
-  let dappPrivateKey;
-  if (options.existingCredentials) {
-    const privateKeyHex = options.existingCredentials.privateKey;
-    if (privateKeyHex.length !== 64) {
-      throw new Error("Private key must be 64 hex characters (32 bytes)");
-    }
-    dappPrivateKey = hexToBin(privateKeyHex);
-    const dappPublicKeyHex = deriveNostrPublicKey(dappPrivateKey);
-    credentials = {
-      privateKey: privateKeyHex,
-      publicKey: dappPublicKeyHex,
-      secret: options.existingCredentials.secret,
-    };
-  } else {
-    credentials = generateKeyExchangeCredentials();
-    dappPrivateKey = hexToBin(credentials.privateKey);
-  }
-  let uriOptions = {};
-  if (options.explicitRelayUrls && options.explicitRelayUrls.length > 0) {
-    const relayUrl = options.explicitRelayUrls[0];
-    const hostMatch = relayUrl.match(/^wss?:\/\/([^:/]+)/);
-    const portMatch = relayUrl.match(/:(\d+)/);
-    if (hostMatch) {
-      uriOptions.hostname = hostMatch[1];
-    }
-    if (portMatch) {
-      uriOptions.port = parseInt(portMatch[1], 10);
+    const events = new EventEmitter();
+    let credentials;
+    let dappPrivateKey;
+    if (options.existingCredentials) {
+        const privateKeyHex = options.existingCredentials.privateKey;
+        if (privateKeyHex.length !== 64) {
+            throw new Error("Private key must be 64 hex characters (32 bytes)");
+        }
+        dappPrivateKey = hexToBin(privateKeyHex);
+        const dappPublicKeyHex = deriveNostrPublicKey(dappPrivateKey);
+        credentials = {
+            privateKey: privateKeyHex,
+            publicKey: dappPublicKeyHex,
+            secret: options.existingCredentials.secret,
+        };
     }
-    if (relayUrl.startsWith("wss://")) {
-      uriOptions.protocol = "wss";
-    } else if (relayUrl.startsWith("ws://")) {
-      uriOptions.protocol = "ws";
+    else {
+        credentials = generateKeyExchangeCredentials();
+        dappPrivateKey = hexToBin(credentials.privateKey);
     }
-  }
-  const { uri, qrUri } = encodeKeyExchangeURI(
-    credentials.publicKey,
-    credentials.secret,
-    uriOptions,
-  );
-  let relayClient = null;
-  let keyExchanged = false;
-  let walletPublicKeyNostr = null;
-  const wrappedCallback = (payload) => {
-    if (!relayClient) {
-      relayClient = payload.client;
-      relayClient.on("message", async (message) => {
-        if (message.action === RelayMsgAction.WalletReady) {
-          const walletReady = message;
-          if (walletReady.secret !== credentials.secret) {
-            if (!keyExchanged) {
-              logError(Scope.Relay, "Key exchange failed: secret mismatch");
-            }
-            return;
-          }
-          const receivedWalletKey = hexToBin(walletReady.public_key);
-          if (receivedWalletKey.length !== 32) {
-            logError(Scope.Relay, "Invalid wallet public key length");
-            return;
-          }
-          if (keyExchanged && walletPublicKeyNostr) {
-            if (
-              binToHex(receivedWalletKey) !== binToHex(walletPublicKeyNostr)
-            ) {
-              warn(
-                Scope.Relay,
-                "Different wallet connected (different public key)",
-              );
-            }
-          }
-          walletPublicKeyNostr = receivedWalletKey;
-          relayClient.setPairedPublicKey(receivedWalletKey);
-          if (!keyExchanged) {
-            keyExchanged = true;
-            events.emit("keyexchangecomplete", receivedWalletKey);
-          }
-          // NOTE: do NOT return — message also propagates to DappConnectionManager's listener
+    let uriOptions = {};
+    if (options.explicitRelayUrls && options.explicitRelayUrls.length > 0) {
+        const relayUrl = options.explicitRelayUrls[0];
+        const hostMatch = relayUrl.match(/^wss?:\/\/([^:/]+)/);
+        const portMatch = relayUrl.match(/:(\d+)/);
+        if (hostMatch) {
+            uriOptions.hostname = hostMatch[1];
+        }
+        if (portMatch) {
+            uriOptions.port = parseInt(portMatch[1], 10);
+        }
+        if (relayUrl.startsWith("wss://")) {
+            uriOptions.protocol = "wss";
+        }
+        else if (relayUrl.startsWith("ws://")) {
+            uriOptions.protocol = "ws";
         }
-      });
     }
-    if (payload.status.status === "connected") {
-      if (walletPublicKeyNostr && relayClient) {
-        relayClient.setPairedPublicKey(walletPublicKeyNostr);
+    const { uri, qrUri } = encodeKeyExchangeURI(credentials.publicKey, credentials.secret, uriOptions);
+    let relayClient = null;
+    let keyExchanged = false;
+    let walletPublicKeyNostr = null;
+    if (options.existingCredentials) {
+        walletPublicKeyNostr = hexToBin(options.existingCredentials.walletPublicKey);
         keyExchanged = true;
-      }
     }
-    statusCallback(payload);
-  };
-  const relayUrls =
-    options.explicitRelayUrls && options.explicitRelayUrls.length > 0
-      ? options.explicitRelayUrls
-      : [
-          `${DEFAULT_RELAY_PROTOCOL}://${DEFAULT_RELAY_HOSTNAME}:${DEFAULT_RELAY_PORT}`,
+    const wrappedCallback = (payload) => {
+        if (!relayClient) {
+            relayClient = payload.client;
+            relayClient.on("message", async (message) => {
+                if (message.action === RelayMsgAction.WalletReady) {
+                    const walletReady = message;
+                    if (walletReady.secret !== credentials.secret) {
+                        if (!keyExchanged) {
+                            logError(Scope.Relay, "Key exchange failed: secret mismatch");
+                        }
+                        return;
+                    }
+                    const receivedWalletKey = hexToBin(walletReady.public_key);
+                    if (receivedWalletKey.length !== 32) {
+                        logError(Scope.Relay, "Invalid wallet public key length");
+                        return;
+                    }
+                    if (keyExchanged && walletPublicKeyNostr) {
+                        if (binToHex(receivedWalletKey) !== binToHex(walletPublicKeyNostr)) {
+                            warn(Scope.Relay, "Different wallet connected (different public key)");
+                        }
+                    }
+                    walletPublicKeyNostr = receivedWalletKey;
+                    relayClient.setPairedPublicKey(receivedWalletKey);
+                    if (!keyExchanged) {
+                        keyExchanged = true;
+                        events.emit("keyexchangecomplete", receivedWalletKey);
+                    }
+                    // NOTE: do NOT return — message also propagates to DappConnectionManager's listener
+                }
+            });
+        }
+        if (payload.status.status === "connected") {
+            if (walletPublicKeyNostr && relayClient) {
+                relayClient.setPairedPublicKey(walletPublicKeyNostr);
+                keyExchanged = true;
+            }
+        }
+        statusCallback(payload);
+    };
+    const relayUrls = options.explicitRelayUrls && options.explicitRelayUrls.length > 0
+        ? options.explicitRelayUrls
+        : [
+            `${DEFAULT_RELAY_PROTOCOL}://${DEFAULT_RELAY_HOSTNAME}:${DEFAULT_RELAY_PORT}`,
         ];
-  const cleanup = initiateRelay(
-    wrappedCallback,
-    dappPrivateKey,
-    new Uint8Array(33),
-    {
-      explicitRelayUrls: relayUrls,
-      reconnectInterval: options.reconnectInterval,
-      maxReconnectAttempts: options.maxReconnectAttempts,
-    },
-  );
-  return {
-    client: relayClient,
-    uri,
-    qrUri,
-    credentials,
-    events,
-    cleanup,
-  };
+    const cleanup = initiateRelay(wrappedCallback, dappPrivateKey, new Uint8Array(33), {
+        explicitRelayUrls: relayUrls,
+        reconnectInterval: options.reconnectInterval,
+        maxReconnectAttempts: options.maxReconnectAttempts,
+    });
+    return {
+        client: relayClient,
+        uri,
+        qrUri,
+        credentials,
+        events,
+        cleanup,
+    };
 }
-//# sourceMappingURL=dapp-relay.js.map
+//# sourceMappingURL=dapp-relay.js.map