beignet 0.3.0 → 0.5.0

package/README.md

@@ -13,6 +13,7 @@ Beignet provides two layers of Bitcoin wallet functionality:
 
 1. [Getting Started](#getting-started)
 2. [On-Chain Wallet](#on-chain-wallet)
+   - [Leveled Logging](#leveled-logging)
 3. [Lightning Network](#lightning-network)
    - [Lightning Quick Start (BeignetNode)](#lightning-quick-start-beignetnode)
    - [Decision-Support APIs](#decision-support-apis)
@@ -341,6 +342,27 @@ const wallet = await Wallet.create({
 });
 ```
 
+### Leveled Logging
+
+Diagnostic output (debug/info/warn/error) flows through a small injectable logger, kept separate from the Lightning node's persisted structured action log (`getActionLog`). The `ILogger` interface is four methods, `debug`/`info`/`warn`/`error`(`message: string, meta?: unknown`), with level filtering `debug < info < warn < error` plus `'silent'`:
+
+```typescript
+import { Wallet, createConsoleLogger, noopLogger } from 'beignet';
+
+const wallet = await Wallet.create({
+  mnemonic,
+  logger: createConsoleLogger('warn'), // only warn + error reach the console
+  // logger: noopLogger,               // fully silent
+  // logger: myLogger,                 // any ILogger: route into your own stack
+  // ...
+});
+```
+
+- **`Wallet.create({ logger })`** defaults to `createConsoleLogger('info')`, which preserves the wallet's historical console output. `disableMessages` is independent and keeps its existing meaning: it only gates `onMessage` callbacks.
+- **`LightningNode`** accepts `logger` in `INodeConfig` / `fromMnemonic` options and defaults to `noopLogger` (the node prints nothing, as before). Every structured action-log entry is additionally mirrored to `logger.debug('category:action', data)`.
+- **`BeignetNode.create({ logger, logLevel })`**: log entries that pass `logLevel` are forwarded to the injected logger (in addition to the `'log'` event), and the logger is injected into the underlying `Wallet` and `LightningNode`. Without `logger`, behavior is unchanged (events only).
+- **Daemon:** `beignet start --log-level <debug|info|warn|error|silent>` (or `BEIGNET_LOG_LEVEL`, or `logLevel` in `~/.beignet/config.json`) prints leveled diagnostics to stderr. Unset keeps the daemon silent (the default); stdout stays reserved for command output.
+
 ## Lightning Network
 
 ### Lightning Quick Start (BeignetNode)

package/dist/cli/auth.js

@@ -0,0 +1,335 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiKeyAuthenticator = exports.scopesAllowRoute = exports.getRouteScopes = exports.ROUTE_SCOPES = exports.AUTH_KEY_OVERRIDES_STORAGE_KEY = exports.API_SCOPES = void 0;
+const crypto_1 = require("crypto");
+const errors_1 = require("./errors");
+exports.API_SCOPES = new Set([
+    'readonly',
+    'invoice',
+    'admin'
+]);
+exports.AUTH_KEY_OVERRIDES_STORAGE_KEY = 'daemon:auth-key-overrides:v1';
+exports.ROUTE_SCOPES = {
+    'GET /info': ['readonly'],
+    'GET /balance': ['readonly'],
+    'GET /peers': ['readonly'],
+    'GET /channels': ['readonly'],
+    'GET /channels/ready': ['readonly'],
+    'GET /payments': ['readonly'],
+    'GET /payment': ['readonly'],
+    'GET /payment/proof': ['readonly'],
+    'GET /payment/verify-proof': ['readonly'],
+    'GET /forwards': ['readonly'],
+    'GET /forwards/summary': ['readonly'],
+    'GET /readiness': ['readonly'],
+    'GET /stats': ['readonly'],
+    'GET /spend-limit': ['readonly'],
+    'GET /liquidity': ['readonly'],
+    'GET /watchtowers': ['readonly'],
+    'GET /advisor/recommendations': ['readonly'],
+    'GET /fees': ['readonly'],
+    'GET /fees/estimates': ['readonly'],
+    'GET /transactions': ['readonly'],
+    'GET /transactions/boostable': ['readonly'],
+    'GET /utxos': ['readonly'],
+    'GET /address/labels': ['readonly'],
+    'GET /wallet/descriptors': ['readonly'],
+    'GET /channel': ['readonly'],
+    'GET /channel/health': ['readonly'],
+    'GET /channel/policy': ['readonly'],
+    'GET /channel/diagnostics': ['readonly'],
+    'GET /channel/suggestions': ['readonly'],
+    'GET /logs': ['readonly'],
+    'GET /node/uri': ['readonly'],
+    'GET /trusted-peers': ['readonly'],
+    'GET /can-send': ['readonly'],
+    'GET /graph/info': ['readonly'],
+    'GET /graph/node': ['readonly'],
+    'GET /graph/channel': ['readonly'],
+    'GET /graph/describe': ['readonly'],
+    'GET /backup/scb': ['readonly'],
+    'GET /backup/peer-retrieved': ['readonly'],
+    'GET /queue': ['readonly'],
+    'POST /route/estimate': ['readonly'],
+    'POST /route/query': ['readonly'],
+    'POST /payment/estimate': ['readonly'],
+    'POST /message/verify': ['readonly'],
+    'POST /address/validate': ['readonly'],
+    'POST /node/wait-ready': ['readonly'],
+    'POST /channel/wait-ready': ['readonly'],
+    'GET /invoices': ['readonly', 'invoice'],
+    'GET /invoice': ['readonly', 'invoice'],
+    'GET /invoices/held': ['readonly', 'invoice'],
+    'GET /offers': ['readonly', 'invoice'],
+    'GET /can-receive': ['readonly', 'invoice'],
+    'GET /events': ['readonly', 'invoice'],
+    'POST /invoice/decode': ['readonly', 'invoice'],
+    'POST /invoice/validate': ['readonly', 'invoice'],
+    'POST /offer/decode': ['readonly', 'invoice'],
+    'POST /payment/wait': ['readonly', 'invoice'],
+    'POST /invoice/create': ['invoice'],
+    'POST /invoice/create-hold': ['invoice'],
+    'POST /invoice/settle-hold': ['invoice'],
+    'POST /invoice/cancel-hold': ['invoice'],
+    'POST /offer/create': ['invoice'],
+    'POST /address/new': ['invoice'],
+    'GET /mnemonic': [],
+    'GET /webhooks': [],
+    'POST /send': [],
+    'POST /send-max': [],
+    'POST /tx/bump-fee': [],
+    'POST /tx/boost': [],
+    'POST /consolidate': [],
+    'POST /invoice/pay': [],
+    'POST /invoice/pay-safe': [],
+    'POST /invoice/pay-async': [],
+    'POST /invoice/pay-retry': [],
+    'POST /keysend': [],
+    'POST /keysend/safe': [],
+    'POST /offer/pay': [],
+    'POST /payment/send-to-route': [],
+    'POST /payment/cancel': [],
+    'POST /queue/add': [],
+    'POST /queue/cancel': [],
+    'POST /rebalance': [],
+    'POST /advisor/execute-rebalances': [],
+    'POST /recover-fallback-funds': [],
+    'POST /utxo/freeze': [],
+    'POST /utxo/unfreeze': [],
+    'POST /address/label': [],
+    'POST /wallet/refresh': [],
+    'POST /psbt/build': [],
+    'POST /psbt/import-signed': [],
+    'POST /psbt/combine': [],
+    'POST /peer/connect': [],
+    'POST /peer/disconnect': [],
+    'POST /peers/bootstrap': [],
+    'POST /peers/connect-seeds': [],
+    'POST /trusted-peer/add': [],
+    'POST /trusted-peer/remove': [],
+    'POST /channel/open': [],
+    'POST /channel/open-zeroconf': [],
+    'POST /channel/open-v2': [],
+    'POST /channel/open-and-wait': [],
+    'POST /channel/connect-and-open': [],
+    'POST /channels/ensure-minimum': [],
+    'POST /channel/close': [],
+    'POST /channel/forceclose': [],
+    'POST /channel/splice-in': [],
+    'POST /channel/splice-out': [],
+    'POST /channel/update-commitment-feerate': [],
+    'POST /channel/update-fee': [],
+    'POST /channel/update-policy': [],
+    'POST /message/sign': [],
+    'POST /gossip/sync': [],
+    'POST /gossip/sync-rapid': [],
+    'POST /route/probe': [],
+    'POST /payment/metadata': [],
+    'POST /backup': [],
+    'POST /backup/trigger': [],
+    'POST /restore/scb': [],
+    'POST /watchtower/add': [],
+    'DELETE /watchtower/remove': [],
+    'POST /webhooks/register': [],
+    'DELETE /webhooks/unregister': [],
+    'POST /stop': [],
+    'GET /auth/keys': [],
+    'POST /auth/keys/revoke': [],
+    'POST /auth/keys/rotate': []
+};
+function getRouteScopes(routeKey) {
+    return exports.ROUTE_SCOPES[routeKey] ?? [];
+}
+exports.getRouteScopes = getRouteScopes;
+function scopesAllowRoute(scopes, routeKey) {
+    if (scopes.has('admin'))
+        return true;
+    return getRouteScopes(routeKey).some((s) => scopes.has(s));
+}
+exports.scopesAllowRoute = scopesAllowRoute;
+function sha256(input) {
+    return (0, crypto_1.createHash)('sha256').update(input, 'utf8').digest();
+}
+const SHA256_HEX_RE = /^[0-9a-f]{64}$/;
+class ApiKeyAuthenticator {
+    constructor(apiToken, apiKeys) {
+        this.candidates = [];
+        this.revoked = new Set();
+        this.keyNames = [];
+        this.overrides = {};
+        this.store = null;
+        if (apiToken) {
+            this.candidates.push({
+                name: null,
+                digest: sha256(apiToken),
+                scopes: new Set(['admin'])
+            });
+        }
+        for (const def of apiKeys ?? []) {
+            this.addKeyDefinition(def, apiToken);
+        }
+    }
+    addKeyDefinition(def, apiToken) {
+        if (!def || typeof def.name !== 'string' || def.name.trim() === '') {
+            throw new errors_1.BeignetError('INVALID_PARAMS', 'apiKeys entries require a non-empty name');
+        }
+        if (typeof def.key !== 'string' || def.key === '') {
+            throw new errors_1.BeignetError('INVALID_PARAMS', `apiKeys entry "${def.name}" requires a non-empty key`);
+        }
+        if (!Array.isArray(def.scopes) ||
+            def.scopes.length === 0 ||
+            def.scopes.some((s) => !exports.API_SCOPES.has(s))) {
+            throw new errors_1.BeignetError('INVALID_PARAMS', `apiKeys entry "${def.name}" requires scopes from: readonly, invoice, admin`);
+        }
+        if (this.keyNames.includes(def.name)) {
+            throw new errors_1.BeignetError('INVALID_PARAMS', `Duplicate apiKeys name "${def.name}"`);
+        }
+        if (apiToken !== undefined && def.key === apiToken) {
+            throw new errors_1.BeignetError('INVALID_PARAMS', `apiKeys entry "${def.name}" duplicates the legacy apiToken value`);
+        }
+        let expiresAtMs;
+        if (def.expiresAt !== undefined) {
+            expiresAtMs =
+                typeof def.expiresAt === 'string' ? Date.parse(def.expiresAt) : NaN;
+            if (!Number.isFinite(expiresAtMs)) {
+                throw new errors_1.BeignetError('INVALID_PARAMS', `apiKeys entry "${def.name}" has an unparseable expiresAt ` +
+                    `(use ISO 8601, e.g. "2027-01-01T00:00:00Z")`);
+            }
+        }
+        const digest = sha256(def.key);
+        for (const existing of this.candidates) {
+            if (existing.name !== null && (0, crypto_1.timingSafeEqual)(existing.digest, digest)) {
+                throw new errors_1.BeignetError('INVALID_PARAMS', `apiKeys entry "${def.name}" duplicates the key of "${existing.name}"`);
+            }
+        }
+        this.keyNames.push(def.name);
+        this.candidates.push({
+            name: def.name,
+            digest,
+            scopes: new Set(def.scopes),
+            configDigestHex: digest.toString('hex'),
+            expiresAt: def.expiresAt,
+            expiresAtMs
+        });
+    }
+    get enabled() {
+        return this.candidates.length > 0;
+    }
+    isExpired(candidate) {
+        return (candidate.expiresAtMs !== undefined && Date.now() >= candidate.expiresAtMs);
+    }
+    attachOverrideStore(store) {
+        this.store = store;
+        const loaded = store.load();
+        const kept = {};
+        let pruned = false;
+        for (const [name, override] of Object.entries(loaded ?? {})) {
+            const candidate = this.candidates.find((c) => c.name === name);
+            if (!candidate ||
+                typeof override !== 'object' ||
+                override === null ||
+                typeof override.configDigest !== 'string' ||
+                override.configDigest !== candidate.configDigestHex ||
+                (override.keyDigest !== undefined &&
+                    !SHA256_HEX_RE.test(override.keyDigest))) {
+                pruned = true;
+                continue;
+            }
+            kept[name] = override;
+            if (override.keyDigest !== undefined) {
+                candidate.digest = Buffer.from(override.keyDigest, 'hex');
+                candidate.rotatedAt = override.rotatedAt;
+            }
+            if (override.revoked === true) {
+                this.revoked.add(name);
+            }
+            if (override.expiresAt !== undefined) {
+                const ms = typeof override.expiresAt === 'string'
+                    ? Date.parse(override.expiresAt)
+                    : NaN;
+                if (Number.isFinite(ms)) {
+                    candidate.expiresAt = override.expiresAt;
+                    candidate.expiresAtMs = ms;
+                }
+            }
+        }
+        this.overrides = kept;
+        if (pruned)
+            store.save(kept);
+    }
+    authenticate(header) {
+        if (!header)
+            return { ok: false };
+        const match = header.match(/^bearer\s+(.+)$/i);
+        if (!match)
+            return { ok: false };
+        const presented = sha256(match[1]);
+        let matched = null;
+        for (const candidate of this.candidates) {
+            const equal = (0, crypto_1.timingSafeEqual)(candidate.digest, presented);
+            if (equal &&
+                matched === null &&
+                (candidate.name === null || !this.revoked.has(candidate.name)) &&
+                !this.isExpired(candidate)) {
+                matched = candidate;
+            }
+        }
+        if (!matched)
+            return { ok: false };
+        return { ok: true, keyName: matched.name, scopes: matched.scopes };
+    }
+    revoke(name) {
+        const candidate = this.candidates.find((c) => c.name === name);
+        if (!candidate || candidate.name === null)
+            return false;
+        this.revoked.add(name);
+        this.overrides = {
+            ...this.overrides,
+            [name]: {
+                ...(this.overrides[name] ?? {
+                    configDigest: candidate.configDigestHex ?? ''
+                }),
+                revoked: true
+            }
+        };
+        this.store?.save(this.overrides);
+        return true;
+    }
+    rotate(name) {
+        const candidate = this.candidates.find((c) => c.name === name);
+        if (!candidate || candidate.name === null)
+            return null;
+        const newKey = (0, crypto_1.randomBytes)(32).toString('hex');
+        const newDigest = sha256(newKey);
+        const rotatedAt = new Date().toISOString();
+        const override = {
+            ...(this.overrides[name] ?? {
+                configDigest: candidate.configDigestHex ?? ''
+            }),
+            keyDigest: newDigest.toString('hex'),
+            rotatedAt
+        };
+        delete override.revoked;
+        const next = { ...this.overrides, [name]: override };
+        this.store?.save(next);
+        this.overrides = next;
+        candidate.digest = newDigest;
+        candidate.rotatedAt = rotatedAt;
+        this.revoked.delete(name);
+        return { name, key: newKey, rotatedAt };
+    }
+    listKeys() {
+        return this.candidates
+            .filter((c) => c.name !== null)
+            .map((c) => ({
+            name: c.name,
+            scopes: [...c.scopes],
+            revoked: this.revoked.has(c.name),
+            expired: this.isExpired(c),
+            ...(c.expiresAt !== undefined ? { expiresAt: c.expiresAt } : {}),
+            ...(c.rotatedAt !== undefined ? { rotatedAt: c.rotatedAt } : {})
+        }));
+    }
+}
+exports.ApiKeyAuthenticator = ApiKeyAuthenticator;
+//# sourceMappingURL=auth.js.map

package/dist/cli/auth.js.map

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

package/dist/cli/beignet-node.js

@@ -33,6 +33,7 @@ const instance_lock_1 = require("./instance-lock");
 const crypto = __importStar(require("crypto"));
 const events_1 = require("events");
 const wallet_1 = require("../wallet");
+const logger_1 = require("../logger");
 const helpers_1 = require("../utils/helpers");
 const conversion_1 = require("../utils/conversion");
 const wallet_2 = require("../types/wallet");
@@ -145,13 +146,6 @@ async function resolveHostToIPv4(host) {
         return host;
     }
 }
-const LOG_PRIORITY = {
-    debug: 0,
-    info: 1,
-    warn: 2,
-    error: 3,
-    silent: 4
-};
 class BeignetNode extends events_1.EventEmitter {
     on(event, listener) {
         return super.on(event, listener);
@@ -187,10 +181,13 @@ class BeignetNode extends events_1.EventEmitter {
         this.dataDir = dataDir;
     }
     log(level, message, data) {
-        if (LOG_PRIORITY[level] < LOG_PRIORITY[this.logLevel])
+        if (logger_1.LOG_LEVEL_PRIORITY[level] < logger_1.LOG_LEVEL_PRIORITY[this.logLevel])
             return;
         const entry = { level, message, data, timestamp: Date.now() };
         this.emit('log', entry);
+        if (this.logger && level !== 'silent') {
+            this.logger[level](message, data);
+        }
     }
     static async create(opts = {}) {
         const mnemonic = opts.mnemonic || (0, helpers_1.generateMnemonic)();
@@ -204,6 +201,8 @@ class BeignetNode extends events_1.EventEmitter {
     async init(opts) {
         if (opts.logLevel)
             this.logLevel = opts.logLevel;
+        if (opts.logger)
+            this.logger = opts.logger;
         this.autoGossipSync = opts.autoGossipSync ?? true;
         this.peerStorageEnabled = opts.peerStorageEnabled ?? true;
         this.rapidGossipSync = opts.rapidGossipSync ?? true;
@@ -247,9 +246,13 @@ class BeignetNode extends events_1.EventEmitter {
         if (!opts.dataDir) {
             const legacyDb = path.join(DEFAULT_DATA_DIR, `${networkName}.db`);
             if (fs.existsSync(legacyDb) && !fs.existsSync(dbPath)) {
-                console.warn(`[beignet] Found a legacy shared database at ${legacyDb}. ` +
+                const legacyMsg = `[beignet] Found a legacy shared database at ${legacyDb}. ` +
                     `Storage is now per-wallet (${dbPath}), so it is no longer auto-loaded. ` +
-                    `If it held this wallet's channels, re-run with dataDir set to "${DEFAULT_DATA_DIR}" to use it.`);
+                    `If it held this wallet's channels, re-run with dataDir set to "${DEFAULT_DATA_DIR}" to use it.`;
+                this.log('warn', legacyMsg);
+                if (!this.logger) {
+                    console.warn(legacyMsg);
+                }
             }
         }
         let encryptionKey;
@@ -280,6 +283,7 @@ class BeignetNode extends events_1.EventEmitter {
                 servers: electrumServer
             },
             disableMessagesOnCreate: true,
+            ...(this.logger ? { logger: this.logger } : {}),
             rbf: true,
             storage: (0, wallet_storage_1.createWalletStorage)(this.storage)
         });
@@ -383,6 +387,7 @@ class BeignetNode extends events_1.EventEmitter {
             largeChannels: opts.largeChannels,
             chainBackend: electrumBackend,
             feeEstimator: electrumBackend,
+            logger: this.logger,
             sweepDestinationScript,
             socks5Proxy,
             peerStorageEnabled: this.peerStorageEnabled,
@@ -566,6 +571,14 @@ class BeignetNode extends events_1.EventEmitter {
             catch {
             }
         }
+        if (opts.websocketPort) {
+            try {
+                await this.node.listenWebSocket(opts.websocketPort);
+                this._websocketPort = opts.websocketPort;
+            }
+            catch {
+            }
+        }
         if (opts.connectTimeoutMs !== undefined && opts.connectTimeoutMs > 0) {
             this._connectTimeoutMs = opts.connectTimeoutMs;
         }
@@ -634,7 +647,7 @@ class BeignetNode extends events_1.EventEmitter {
     getInfo() {
         const info = this.node.getNodeInfo();
         const lightningBalance = this.getLightningBalanceSats();
-        return {
+        const result = {
             nodeId: info.nodeId,
             alias: info.alias,
             network: this.networkName,
@@ -647,6 +660,10 @@ class BeignetNode extends events_1.EventEmitter {
             peerCount: info.peerCount,
             listening: this.node.isListening()
         };
+        if (this._websocketPort !== undefined) {
+            result.websocketPort = this._websocketPort;
+        }
+        return result;
     }
     getMnemonic() {
         return this.mnemonic;
@@ -1150,12 +1167,14 @@ class BeignetNode extends events_1.EventEmitter {
     getWallet() {
         return this.wallet;
     }
-    async connectPeer(pubkey, host, port) {
-        const target = host !== undefined && port !== undefined
-            ? `${host}:${port}`
-            : 'resolved address (gossip graph / DNS bootstrap)';
+    async connectPeer(pubkey, host, port, transport) {
+        const target = transport?.type === 'ws' && transport.url !== undefined
+            ? transport.url
+            : host !== undefined && port !== undefined
+                ? `${host}:${port}`
+                : 'resolved address (gossip graph / DNS bootstrap)';
         let timer;
-        const connectPromise = this.node.connectPeer(pubkey, host, port);
+        const connectPromise = this.node.connectPeer(pubkey, host, port, transport);
         const timeoutPromise = new Promise((_, reject) => {
             timer = setTimeout(() => reject(new errors_1.BeignetError('CONNECT_TIMEOUT', `connectPeer timed out after ${this._connectTimeoutMs}ms (is ${target} the peer's P2P address?)`)), this._connectTimeoutMs);
         });