@toon-protocol/connector 2.1.0 → 2.3.0

package/dist/core/connector-node.js

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectorNode = void 0;
 const tslib_1 = require("tslib");
+const fs_1 = require("fs");
+const nodePath = tslib_1.__importStar(require("path"));
 const routing_table_1 = require("../routing/routing-table");
 const btp_client_manager_1 = require("../btp/btp-client-manager");
 const btp_server_1 = require("../btp/btp-server");
 const packet_handler_1 = require("./packet-handler");
 const shared_1 = require("@toon-protocol/shared");
 const types_1 = require("../config/types");
+const transport_1 = require("../transport");
 const payment_handler_1 = require("./payment-handler");
 const types_2 = require("../settlement/types");
 const admin_api_1 = require("../http/admin-api");
@@ -30,6 +33,8 @@ const chain_provider_registry_1 = require("../settlement/provider/chain-provider
 const evm_payment_channel_provider_1 = require("../settlement/provider/evm-payment-channel-provider");
 const claim_sender_db_schema_1 = require("../settlement/claim-sender-db-schema");
 const inbound_claim_validator_1 = require("../btp/inbound-claim-validator");
+const nip59_claim_wrapper_1 = require("../settlement/privacy/nip59-claim-wrapper");
+const utils_1 = require("@noble/hashes/utils");
 const dns_1 = require("dns");
 const package_json_1 = tslib_1.__importDefault(require("../../package.json"));
 class ConnectorNode {
@@ -54,10 +59,17 @@ class ConnectorNode {
     _startTime = new Date();
     _btpServerStarted = false;
     _defaultSettlementTokenId = 'M2M';
+    _transportProvider = null;
+    _transportProviderReady = false;
+    _transportType = null;
+    _lastTransportHealthy = true;
+    _transportHealthInterval = null;
+    _transportHealthIntervalMs;
     get defaultSettlementTokenId() {
         return this._defaultSettlementTokenId;
     }
-    constructor(config, logger) {
+    constructor(config, logger, opts) {
+        this._transportHealthIntervalMs = opts?.transportHealthIntervalMs ?? 30000;
         let resolvedConfig;
         try {
             if (typeof config === 'string') {
@@ -90,6 +102,7 @@ class ConnectorNode {
         }));
         this._routingTable = new routing_table_1.RoutingTable(routingTableEntries, logger.child({ component: 'RoutingTable' }));
         this._btpClientManager = new btp_client_manager_1.BTPClientManager(resolvedConfig.nodeId, logger.child({ component: 'BTPClientManager' }));
+        this._btpClientManager.setAgentFactory((peerUrl) => this._transportProvider?.createAgent(peerUrl));
         this._packetHandler = new packet_handler_1.PacketHandler(this._routingTable, this._btpClientManager, resolvedConfig.nodeId, logger.child({ component: 'PacketHandler' }));
         this._btpServer = new btp_server_1.BTPServer(logger.child({ component: 'BTPServer' }), this._packetHandler);
         this._packetHandler.setBTPServer(this._btpServer);
@@ -195,12 +208,56 @@ class ConnectorNode {
         }, 'Starting connector node');
         try {
             (0, types_1.validateChainProviders)(this._config, this._logger);
-            const settlementEnabled = this._config.settlementInfra?.enabled ?? process.env.SETTLEMENT_ENABLED === 'true';
-            const baseRpcUrl = this._config.settlementInfra?.rpcUrl ?? process.env.BASE_L2_RPC_URL;
-            const registryAddress = this._config.settlementInfra?.registryAddress ?? process.env.TOKEN_NETWORK_REGISTRY;
-            const m2mTokenAddress = this._config.settlementInfra?.tokenAddress ?? process.env.M2M_TOKEN_ADDRESS;
-            const treasuryPrivateKey = this._config.settlementInfra?.privateKey ?? process.env.TREASURY_EVM_PRIVATE_KEY;
-            if (settlementEnabled &&
+            const createdProvider = this._createTransportProvider(this._config.transport);
+            this._transportProvider = createdProvider;
+            this._transportType =
+                this._config.transport === undefined ? 'direct' : this._config.transport.type;
+            try {
+                await createdProvider.start();
+            }
+            catch (err) {
+                this._transportProvider = null;
+                this._transportType = null;
+                this._transportProviderReady = false;
+                throw err;
+            }
+            this._transportProviderReady = true;
+            this._lastTransportHealthy = true;
+            this._transportHealthInterval = setInterval(() => {
+                const provider = this._transportProvider;
+                if (!provider || !this._transportProviderReady)
+                    return;
+                provider
+                    .healthCheck()
+                    .then((healthy) => {
+                    if (this._transportProviderReady && this._transportProvider === provider) {
+                        this._lastTransportHealthy = healthy;
+                    }
+                })
+                    .catch(() => {
+                    if (this._transportProviderReady && this._transportProvider === provider) {
+                        this._lastTransportHealthy = false;
+                    }
+                });
+            }, this._transportHealthIntervalMs);
+            this._transportHealthInterval.unref?.();
+            const evmProviderConfig = this._config.chainProviders?.find((p) => p.chainType === 'evm');
+            const legacySettlementVars = [
+                'BASE_L2_RPC_URL',
+                'SETTLEMENT_ENABLED',
+                'TOKEN_NETWORK_REGISTRY',
+                'M2M_TOKEN_ADDRESS',
+                'TREASURY_EVM_PRIVATE_KEY',
+            ];
+            const detectedLegacyVars = legacySettlementVars.filter((v) => process.env[v]);
+            if (detectedLegacyVars.length > 0) {
+                this._logger.warn({ event: 'legacy_env_vars_detected', vars: detectedLegacyVars }, 'Detected legacy settlement env vars -- these are no longer used. Configure chainProviders with an EVM entry instead.');
+            }
+            const baseRpcUrl = evmProviderConfig?.rpcUrl;
+            const registryAddress = evmProviderConfig?.registryAddress;
+            const m2mTokenAddress = evmProviderConfig?.tokenAddress;
+            const treasuryPrivateKey = evmProviderConfig?.keyId;
+            if (evmProviderConfig &&
                 baseRpcUrl &&
                 registryAddress &&
                 m2mTokenAddress &&
@@ -285,9 +342,8 @@ class ConnectorNode {
                     const tokenAddressMap = new Map();
                     tokenAddressMap.set(this._defaultSettlementTokenId, m2mTokenAddress);
                     tokenAddressMap.set(m2mTokenAddress, m2mTokenAddress);
-                    const defaultSettlementTimeout = this._config.settlementInfra?.settlementTimeoutSecs ?? 86400;
-                    const initialDepositMultiplier = this._config.settlementInfra?.initialDepositMultiplier ??
-                        parseInt(process.env.INITIAL_DEPOSIT_MULTIPLIER ?? '1', 10);
+                    const defaultSettlementTimeout = evmProviderConfig.settlementOptions?.settlementTimeoutSecs ?? 86400;
+                    const initialDepositMultiplier = evmProviderConfig.settlementOptions?.initialDepositMultiplier ?? 1;
                     let accountManager;
                     const tigerBeetleClusterId = process.env.TIGERBEETLE_CLUSTER_ID;
                     const tigerBeetleReplicas = process.env.TIGERBEETLE_REPLICAS;
@@ -346,7 +402,7 @@ class ConnectorNode {
                         this._accountManager = accountManager;
                     }
                     const peerIds = Array.from(peerIdToAddressMap.keys());
-                    const settlementThreshold = BigInt(this._config.settlementInfra?.threshold ?? process.env.SETTLEMENT_THRESHOLD ?? '1000000');
+                    const settlementThreshold = BigInt(evmProviderConfig.settlementOptions?.threshold ?? '1000000');
                     this._logger.info({
                         event: 'settlement_monitor_config',
                         peerIds,
@@ -363,7 +419,7 @@ class ConnectorNode {
                     const chainProviderChainId = this._config.chainProviders?.find((cp) => cp.chainType === 'evm')?.chainId;
                     const primaryChainIdStr = primaryChainId
                         ? `evm:${primaryChainId}`
-                        : chainProviderChainId ?? 'evm:unknown';
+                        : (chainProviderChainId ?? 'evm:unknown');
                     const chainRegistry = new chain_provider_registry_1.ChainProviderRegistry();
                     const evmProvider = new evm_payment_channel_provider_1.EVMPaymentChannelProvider(this._paymentChannelSDK, primaryChainIdStr, m2mTokenAddress, this._logger);
                     chainRegistry.register(evmProvider);
@@ -381,6 +437,23 @@ class ConnectorNode {
                             peerIdToChainMap.set(peerId, primaryChainIdStr);
                         }
                     }
+                    const nip59Enabled = this._config.nip59?.enabled ?? false;
+                    const nip59Wrapper = new nip59_claim_wrapper_1.NIP59ClaimWrapper({
+                        nip59Enabled,
+                        logger: this._logger,
+                    });
+                    const nodeSecp256k1PrivKey = treasuryPrivateKey
+                        ? (0, utils_1.hexToBytes)(treasuryPrivateKey.replace(/^0x/, ''))
+                        : undefined;
+                    const peerIdToNip59PubKey = new Map();
+                    for (const peer of this._config.peers) {
+                        if (peer.nip59PublicKey) {
+                            peerIdToNip59PubKey.set(peer.id, (0, utils_1.hexToBytes)(peer.nip59PublicKey));
+                        }
+                    }
+                    if (nip59Enabled) {
+                        this._logger.info({ event: 'nip59_enabled', peerCount: peerIdToNip59PubKey.size }, 'NIP-59 transport privacy enabled for claim wrapping');
+                    }
                     this._settlementExecutor = new settlement_executor_1.SettlementExecutor({
                         nodeId: this._config.nodeId,
                         defaultSettlementTimeout,
@@ -430,7 +503,7 @@ class ConnectorNode {
                             for (const indexSql of claim_sender_db_schema_1.SENT_CLAIMS_INDEXES) {
                                 claimDb.exec(indexSql);
                             }
-                            const perPacketClaimService = new per_packet_claim_service_1.PerPacketClaimService(chainRegistry, this._channelManager, claimDb, this._logger, this._config.nodeId, peerIdToChainMap);
+                            const perPacketClaimService = new per_packet_claim_service_1.PerPacketClaimService(chainRegistry, this._channelManager, claimDb, this._logger, this._config.nodeId, peerIdToChainMap, nip59Wrapper, nodeSecp256k1PrivKey, peerIdToNip59PubKey);
                             this._packetHandler.setPerPacketClaimService(perPacketClaimService);
                             this._settlementExecutor?.setPerPacketClaimService(perPacketClaimService);
                             this._logger.info({ event: 'per_packet_claims_enabled' }, 'Per-packet claim service wired to PacketHandler and SettlementExecutor');
@@ -441,7 +514,7 @@ class ConnectorNode {
                             throw error;
                         }
                     }
-                    const inboundClaimValidator = new inbound_claim_validator_1.InboundClaimValidator(this._paymentChannelSDK, this._config.nodeId, this._logger, this._channelManager ?? undefined);
+                    const inboundClaimValidator = new inbound_claim_validator_1.InboundClaimValidator(this._paymentChannelSDK, this._config.nodeId, this._logger, this._channelManager ?? undefined, nip59Wrapper, nodeSecp256k1PrivKey);
                     this._btpServer.setInboundClaimValidator((protocolData, ilpPacket, peerId) => inboundClaimValidator.validate(protocolData, ilpPacket, peerId));
                     this._logger.info({ event: 'inbound_claim_validator_enabled' }, 'Inbound claim validator wired to BTP server');
                     if (this._paymentChannelSDK) {
@@ -451,7 +524,7 @@ class ConnectorNode {
                             const receivedClaimDbPath = `./data/received-claims-${this._config.nodeId}.db`;
                             const receivedClaimDb = new BetterSqlite3(receivedClaimDbPath);
                             (0, claim_receiver_db_schema_1.initializeClaimReceiverSchema)(receivedClaimDb);
-                            const claimReceiver = new claim_receiver_1.ClaimReceiver(receivedClaimDb, chainRegistry, this._logger, this._channelManager ?? undefined, peerIdToAddressMap);
+                            const claimReceiver = new claim_receiver_1.ClaimReceiver(receivedClaimDb, chainRegistry, this._logger, this._channelManager ?? undefined, peerIdToAddressMap, nip59Wrapper, nodeSecp256k1PrivKey);
                             claimReceiver.registerWithBTPServer(this._btpServer);
                             if (this._settlementMonitor) {
                                 this._settlementMonitor.setClaimReceiver(claimReceiver);
@@ -468,7 +541,7 @@ class ConnectorNode {
                     if (accountManager) {
                         const settlementConfig = {
                             connectorFeePercentage: this._config.settlement?.connectorFeePercentage ?? 0.1,
-                            enableSettlement: settlementEnabled,
+                            enableSettlement: true,
                             tigerBeetleClusterId: tigerBeetleClusterId ? parseInt(tigerBeetleClusterId, 10) : 0,
                             tigerBeetleReplicas: tigerBeetleReplicas
                                 ? tigerBeetleReplicas.split(',').map((s) => s.trim())
@@ -594,6 +667,24 @@ class ConnectorNode {
                 nodeId: this._config.nodeId,
                 error: errorMessage,
             }, 'Failed to start connector node');
+            if (this._transportHealthInterval) {
+                clearInterval(this._transportHealthInterval);
+                this._transportHealthInterval = null;
+            }
+            if (this._transportProvider) {
+                this._transportProviderReady = false;
+                try {
+                    await this._transportProvider.stop();
+                }
+                catch (stopErr) {
+                    const stopMsg = stopErr instanceof Error ? stopErr.message : String(stopErr);
+                    this._logger.warn({ event: 'transport_rollback_stop_failed', error: stopMsg }, 'Transport provider stop() failed during start() rollback; continuing');
+                }
+                finally {
+                    this._transportProvider = null;
+                    this._transportType = null;
+                }
+            }
             this._healthStatus = 'unhealthy';
             throw error;
         }
@@ -654,6 +745,20 @@ class ConnectorNode {
             }
             await this._healthServer.stop();
             await this._btpServer.stop();
+            if (this._transportHealthInterval) {
+                clearInterval(this._transportHealthInterval);
+                this._transportHealthInterval = null;
+            }
+            if (this._transportProvider) {
+                this._transportProviderReady = false;
+                try {
+                    await this._transportProvider.stop();
+                }
+                finally {
+                    this._transportProvider = null;
+                    this._transportType = null;
+                }
+            }
             this._logger.info({
                 event: 'connector_stopped',
                 nodeId: this._config.nodeId,
@@ -685,6 +790,12 @@ class ConnectorNode {
             nodeId: this._config.nodeId,
             version: package_json_1.default.version,
         };
+        if (this._transportProviderReady && this._transportProvider && this._transportType) {
+            healthStatus.transport = {
+                type: this._transportType,
+                healthy: this._transportType === 'direct' ? true : this._lastTransportHealthy,
+            };
+        }
         return healthStatus;
     }
     get routingTable() {
@@ -693,6 +804,129 @@ class ConnectorNode {
     get btpClientManager() {
         return this._btpClientManager;
     }
+    get transportProvider() {
+        return this._transportProviderReady ? this._transportProvider : null;
+    }
+    _createTransportProvider(cfg) {
+        if (cfg === undefined || cfg.type === 'direct') {
+            const externalUrl = `ws://localhost:${this._config.btpServerPort}`;
+            this._logger.debug({ event: 'direct_transport_external_url_synthesized', externalUrl }, 'DirectTransportProvider externalUrl synthesized from btpServerPort (local placeholder)');
+            return new transport_1.DirectTransportProvider(externalUrl);
+        }
+        if (cfg.type === 'socks5') {
+            let managedClient;
+            let externalUrl = cfg.externalUrl;
+            if (cfg.managed === true) {
+                let cachedFactory;
+                let prewarmError;
+                const prewarmPromise = (0, transport_1.createDefaultAnonFactory)().then((f) => {
+                    cachedFactory = f;
+                }, (err) => {
+                    prewarmError = err;
+                });
+                const anonFactory = (opts) => {
+                    if (cachedFactory) {
+                        return cachedFactory(opts);
+                    }
+                    if (prewarmError) {
+                        if (prewarmError.code === 'MODULE_NOT_FOUND') {
+                            throw prewarmError;
+                        }
+                        throw new Error(`Failed to load optional dependency "@anyone-protocol/anyone-client": ` +
+                            `${prewarmError.message ?? String(prewarmError)}`, { cause: prewarmError });
+                    }
+                    try {
+                        const pkg = '@anyone-protocol/anyone-client';
+                        const mod = require(pkg);
+                        const AnonCtor = mod?.Anon ?? mod?.default?.Anon ?? mod?.default;
+                        if (typeof AnonCtor !== 'function') {
+                            throw new Error('@anyone-protocol/anyone-client did not export an `Anon` constructor');
+                        }
+                        cachedFactory = (o) => new AnonCtor(o);
+                        return cachedFactory(opts);
+                    }
+                    catch (err) {
+                        const cause = err;
+                        if (cause?.code === 'MODULE_NOT_FOUND') {
+                            throw cause;
+                        }
+                        if (cause?.code === 'ERR_REQUIRE_ESM') {
+                            throw new Error(`@anyone-protocol/anyone-client is an ESM-only package; ` +
+                                `the async lazy-import pre-warm had not completed when the factory ` +
+                                `was invoked. This is a timing bug — please file an issue.`, { cause });
+                        }
+                        throw new Error(`Failed to load optional dependency "@anyone-protocol/anyone-client": ` +
+                            `${cause?.message ?? String(err)}`, { cause });
+                    }
+                };
+                void prewarmPromise;
+                managedClient = new transport_1.ManagedAnonClient({
+                    socksProxy: cfg.socksProxy,
+                    hiddenServiceDir: cfg.managedOptions?.hiddenServiceDir,
+                    hiddenServicePort: cfg.managedOptions?.hiddenServicePort,
+                    binaryPath: cfg.managedOptions?.binaryPath,
+                    startupTimeoutMs: cfg.managedOptions?.startupTimeoutMs,
+                    stopTimeoutMs: cfg.managedOptions?.stopTimeoutMs,
+                    logger: this._logger,
+                    anonFactory,
+                });
+                if (externalUrl === 'auto') {
+                    externalUrl = 'wss://pending.invalid/btp';
+                }
+            }
+            else if (externalUrl === 'auto') {
+                throw new Error('_createTransportProvider: transport.externalUrl "auto" requires managed: true');
+            }
+            let resolveExternalUrlOnStart;
+            if (cfg.externalUrl === 'auto') {
+                const hsDir = cfg.managedOptions?.hiddenServiceDir;
+                if (!hsDir) {
+                    throw new Error('_createTransportProvider: transport.externalUrl "auto" requires managedOptions.hiddenServiceDir');
+                }
+                const hostnameReadDeadlineMs = cfg.managedOptions?.startupTimeoutMs ?? 30_000;
+                const HIDDEN_SERVICE_HOSTNAME_RE = /^[a-z2-7]{16}(?:[a-z2-7]{40})?\.(?:anon|onion)$/;
+                resolveExternalUrlOnStart = async () => {
+                    const hostnameFile = nodePath.join(hsDir, 'hostname');
+                    const deadline = Date.now() + hostnameReadDeadlineMs;
+                    let lastErr;
+                    while (Date.now() < deadline) {
+                        try {
+                            const raw = await fs_1.promises.readFile(hostnameFile, 'utf8');
+                            const firstLine = raw.split(/\r?\n/, 1)[0]?.trim() ?? '';
+                            const hostname = firstLine;
+                            if (!hostname) {
+                                lastErr = new Error('hostname file is empty');
+                            }
+                            else if (!HIDDEN_SERVICE_HOSTNAME_RE.test(hostname)) {
+                                lastErr = new Error(`hostname file contents did not match the expected hidden service format ` +
+                                    `(length=${hostname.length}); ignoring and retrying`);
+                            }
+                            else {
+                                return `wss://${hostname}/btp`;
+                            }
+                        }
+                        catch (err) {
+                            lastErr = err;
+                        }
+                        await new Promise((r) => setTimeout(r, 250));
+                    }
+                    const reason = lastErr instanceof Error ? lastErr.message : String(lastErr ?? 'unknown');
+                    throw new Error(`hidden service hostname file "${hostnameFile}" did not become readable ` +
+                        `within ${hostnameReadDeadlineMs}ms (last error: ${reason})`);
+                };
+            }
+            return new transport_1.SocksTransportProvider({
+                socksProxy: cfg.socksProxy,
+                externalUrl,
+                logger: this._logger,
+                managedClient,
+                resolveExternalUrlOnStart,
+            });
+        }
+        const _exhaustive = cfg;
+        throw new Error(`Unsupported transport type: ${JSON.stringify(_exhaustive)} ` +
+            '(Story 35.4 _createTransportProvider exhaustiveness guard)');
+    }
     get paymentChannelSDK() {
         return this._paymentChannelSDK;
     }
@@ -706,11 +940,9 @@ class ConnectorNode {
         return this._chainSDKs.get(chainId) ?? null;
     }
     async _createInMemoryAccountManager() {
-        const snapshotPath = this._config.settlementInfra?.ledgerSnapshotPath ??
-            process.env.LEDGER_SNAPSHOT_PATH ??
-            './data/ledger-snapshot.json';
-        const persistIntervalMs = this._config.settlementInfra?.ledgerPersistIntervalMs ??
-            parseInt(process.env.LEDGER_PERSIST_INTERVAL_MS || '30000', 10);
+        const evmProvider = this._config.chainProviders?.find((p) => p.chainType === 'evm');
+        const snapshotPath = evmProvider?.settlementOptions?.ledgerSnapshotPath ?? './data/ledger-snapshot.json';
+        const persistIntervalMs = evmProvider?.settlementOptions?.ledgerPersistIntervalMs ?? 30000;
         let inMemoryClient;
         try {
             inMemoryClient = new in_memory_ledger_client_1.InMemoryLedgerClient({
@@ -814,8 +1046,10 @@ class ConnectorNode {
             typeof config.authToken !== 'string') {
             throw new Error('authToken must be a string (can be empty for no auth)');
         }
-        if (!config.url.startsWith('ws://') && !config.url.startsWith('wss://')) {
-            throw new Error('URL must start with ws:// or wss://');
+        const PLAIN_WS_PREFIX = 'ws' + '://';
+        const SECURE_WS_PREFIX = 'wss' + '://';
+        if (!config.url.startsWith(PLAIN_WS_PREFIX) && !config.url.startsWith(SECURE_WS_PREFIX)) {
+            throw new Error(`URL must start with ${PLAIN_WS_PREFIX} or ${SECURE_WS_PREFIX}`);
         }
         if (config.routes) {
             for (const route of config.routes) {
@@ -981,7 +1215,7 @@ class ConnectorNode {
             throw new config_loader_1.ConnectorNotStartedError('Connector is not started. Call start() before openChannel().');
         }
         if (!this._channelManager) {
-            throw new Error('Settlement infrastructure not enabled');
+            throw new Error('No EVM chain provider configured -- openChannel requires a chainProviders entry with chainType: "evm"');
         }
         const existingPeers = this._btpClientManager.getPeerIds();
         if (!existingPeers.includes(params.peerId)) {
@@ -1012,7 +1246,7 @@ class ConnectorNode {
             throw new config_loader_1.ConnectorNotStartedError('Connector is not started. Call start() before getChannelState().');
         }
         if (!this._channelManager) {
-            throw new Error('Settlement infrastructure not enabled');
+            throw new Error('No EVM chain provider configured -- openChannel requires a chainProviders entry with chainType: "evm"');
         }
         const metadata = this._channelManager.getChannelById(channelId);
         if (!metadata) {