@obbyx/cli 0.1.2 → 0.1.3

package/dist/commands/balance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"balance.d.ts","sourceRoot":"","sources":["../../src/commands/balance.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtD,wBAAgB,cAAc,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,cAAc,GAAG,GAAG,CA6BjE"}
+{"version":3,"file":"balance.d.ts","sourceRoot":"","sources":["../../src/commands/balance.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtD,wBAAgB,cAAc,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,cAAc,GAAG,GAAG,CA0BjE"}

package/dist/commands/balance.js

@@ -1,4 +1,5 @@
-import { toDisplay } from '@obbyx/obyte';
+import { ObbyxError, toDisplay } from '@obbyx/obyte';
+import { parseBalances } from '@obbyx/x402-obyte';
 import { loadWallet } from '@obbyx/obyte/wallet';
 import { connect, resolveNetwork } from '../runtime.js';
 export function balanceCommand({ out, done }) {
@@ -10,11 +11,12 @@ export function balanceCommand({ out, done }) {
             const wallet = loadWallet(network);
             const client = connect(network, a.hub);
             try {
-                const balances = (await client.api.getBalances([wallet.address]));
-                const mine = balances[wallet.address] ?? {};
-                const bytes = mine['base'] ?? { stable: 0, pending: 0 };
+                const mine = parseBalances(await client.api.getBalances([wallet.address]), wallet.address);
+                if (mine === undefined)
+                    throw new ObbyxError('ledger_unavailable', 'Malformed balances');
+                const bytes = mine['base'] ?? { stable: 0n, pending: 0n };
                 out(`${wallet.address} on ${network.caip2}`);
-                out(`  GBYTE: ${toDisplay(BigInt(bytes.stable), 9)} stable, ${toDisplay(BigInt(bytes.pending), 9)} pending`);
+                out(`  GBYTE: ${toDisplay(bytes.stable, 9)} stable, ${toDisplay(bytes.pending, 9)} pending`);
                 for (const [asset, b] of Object.entries(mine)) {
                     if (asset !== 'base')
                         out(`  ${asset}: ${b.stable} stable, ${b.pending} pending (atomic units)`);

package/dist/commands/balance.js.map

@@ -1 +1 @@
-{"version":3,"file":"balance.js","sourceRoot":"","sources":["../../src/commands/balance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAGxD,MAAM,UAAU,cAAc,CAAC,EAAE,GAAG,EAAE,IAAI,EAAkB;IAC1D,OAAO;QACL,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,mBAAmB;QAC7B,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACnB,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;YACvC,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAG/D,CAAC;gBACF,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;gBACxD,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC7C,GAAG,CACD,YAAY,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,YAAY,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,UAAU,CACxG,CAAC;gBACF,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9C,IAAI,KAAK,KAAK,MAAM;wBAClB,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,MAAM,YAAY,CAAC,CAAC,OAAO,yBAAyB,CAAC,CAAC;gBAC/E,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,CAAC;YACD,IAAI,CAAC,CAAC,CAAC,CAAC;QACV,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"balance.js","sourceRoot":"","sources":["../../src/commands/balance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAGxD,MAAM,UAAU,cAAc,CAAC,EAAE,GAAG,EAAE,IAAI,EAAkB;IAC1D,OAAO;QACL,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,mBAAmB;QAC7B,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACnB,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;YACvC,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC3F,IAAI,IAAI,KAAK,SAAS;oBAAE,MAAM,IAAI,UAAU,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAC;gBACzF,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;gBAC1D,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC7C,GAAG,CACD,YAAY,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,YAAY,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,UAAU,CACxF,CAAC;gBACF,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9C,IAAI,KAAK,KAAK,MAAM;wBAClB,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,MAAM,YAAY,CAAC,CAAC,OAAO,yBAAyB,CAAC,CAAC;gBAC/E,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,CAAC;YACD,IAAI,CAAC,CAAC,CAAC,CAAC;QACV,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/commands/pay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pay.d.ts","sourceRoot":"","sources":["../../src/commands/pay.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtD,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AACD,wBAAgB,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,CA4G3E"}
+{"version":3,"file":"pay.d.ts","sourceRoot":"","sources":["../../src/commands/pay.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtD,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AACD,wBAAgB,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,CAmF3E"}

package/dist/commands/pay.js

@@ -49,34 +49,7 @@ export function payCommand({ out, err, done }) {
             const logger = cliLogger();
             const client = connect(network, a.hub);
             try {
-                const composer = reservingComposer(client, network, wallet.address, logger);
-                const mechanism = new ExactObyteClient({
-                    client,
-                    network: network.caip2,
-                    privateKey: wallet.privateKey,
-                    logger,
-                    composer,
-                    maxFee,
-                });
-                // Use a payment channel to this seller when one is open (instant, no fee per call).
-                const batch = new BatchObyteClient({
-                    client,
-                    network,
-                    privateKey: wallet.privateKey,
-                    store: new ClientChannelStore(channelStorePath(network)),
-                    logger,
-                    maxAmount: new Map([['base', max]]),
-                    composer,
-                });
-                const headers = {};
-                for (const h of a.header ?? []) {
-                    const i = h.indexOf(':');
-                    if (i <= 0)
-                        throw new ObbyxError('usage', `Bad --header "${h}" (expected "Name: value")`);
-                    headers[h.slice(0, i).trim()] = h.slice(i + 1).trim();
-                }
-                if (a.data !== undefined)
-                    headers['content-type'] ??= 'application/json';
+                const headers = parseHeaders(a.header ?? [], a.data !== undefined);
                 const method = a.method ?? (a.data === undefined ? 'GET' : 'POST');
                 try {
                     const result = await payingFetch(a.url, {
@@ -85,7 +58,7 @@ export function payCommand({ out, err, done }) {
                         ...(a.data === undefined ? {} : { body: a.data }),
                         ...(a.payment === undefined ? {} : { paymentHeader: a.payment }),
                     }, {
-                        mechanisms: { exact: mechanism, batch },
+                        mechanisms: mechanisms({ client, network, wallet, max, maxFee, logger }),
                         network: network.caip2,
                         maxAmount: new Map([['base', max]]),
                         logger,
@@ -112,4 +85,44 @@ export function payCommand({ out, err, done }) {
         },
     };
 }
+/** `--header 'Name: value'` options; a body defaults to JSON. */
+function parseHeaders(list, hasBody) {
+    const headers = {};
+    for (const h of list) {
+        const i = h.indexOf(':');
+        if (i <= 0)
+            throw new ObbyxError('usage', `Bad --header "${h}" (expected "Name: value")`);
+        headers[h.slice(0, i).trim()] = h.slice(i + 1).trim();
+    }
+    if (hasBody)
+        headers['content-type'] ??= 'application/json';
+    return headers;
+}
+/**
+ * The wallet's payment mechanisms: an open channel to the seller first
+ * (instant, no fee per call), otherwise an on-chain unit. One coin composer
+ * for both, so concurrent payments never pick the same coins.
+ */
+function mechanisms({ client, network, wallet, max, maxFee, logger, }) {
+    const composer = reservingComposer(client, network, wallet.address, logger);
+    return {
+        exact: new ExactObyteClient({
+            client,
+            network: network.caip2,
+            privateKey: wallet.privateKey,
+            logger,
+            composer,
+            maxFee,
+        }),
+        batch: new BatchObyteClient({
+            client,
+            network,
+            privateKey: wallet.privateKey,
+            store: new ClientChannelStore(channelStorePath(network)),
+            logger,
+            maxAmount: new Map([['base', max]]),
+            composer,
+        }),
+    };
+}
 //# sourceMappingURL=pay.js.map

package/dist/commands/pay.js.map

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

package/dist/lib/channels.d.ts

@@ -7,18 +7,21 @@ import { type ReservingComposer } from '@obbyx/x402-obyte';
  * State lives in `$OBBYX_HOME/channels-<network>.db`.
  */
 export declare function channelStorePath(network: ObyteNetwork, env?: NodeJS.ProcessEnv): string;
-export declare function channelCommand(args: {
+interface ChannelArgs {
     sub: string | undefined;
     target: string | undefined;
     deposit?: string;
     amount?: string;
     timeout?: string;
-}, ctx: {
+}
+interface ChannelContext {
     network: ObyteNetwork;
     client: obyte.Client;
     privateKey: Uint8Array;
     logger: Logger;
     out: (s?: string) => void;
     composer?: ReservingComposer;
-}): Promise<number>;
+}
+export declare function channelCommand(args: ChannelArgs, ctx: ChannelContext): Promise<number>;
+export {};
 //# sourceMappingURL=channels.d.ts.map

package/dist/lib/channels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channels.d.ts","sourceRoot":"","sources":["../../src/lib/channels.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAEL,KAAK,YAAY,EAIlB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAQL,KAAK,iBAAiB,EACvB,MAAM,mBAAmB,CAAC;AAG3B;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,YAAY,EACrB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAER;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE;IACJ,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,EACD,GAAG,EAAE;IACH,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1B,QAAQ,CAAC,EAAE,iBAAiB,CAAC;CAC9B,GACA,OAAO,CAAC,MAAM,CAAC,CAuGjB"}
+{"version":3,"file":"channels.d.ts","sourceRoot":"","sources":["../../src/lib/channels.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAEL,KAAK,YAAY,EAIlB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAQL,KAAK,iBAAiB,EACvB,MAAM,mBAAmB,CAAC;AAG3B;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,YAAY,EACrB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAER;AAED,UAAU,WAAW;IACnB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,cAAc;IACtB,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1B,QAAQ,CAAC,EAAE,iBAAiB,CAAC;CAC9B;AAYD,wBAAsB,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAwB5F"}

package/dist/lib/channels.js

@@ -9,97 +9,104 @@ import { obbyxHome } from '@obbyx/obyte/wallet';
 export function channelStorePath(network, env = process.env) {
     return join(obbyxHome(env), `channels-${network.name}.db`);
 }
+const gbyte = (v) => `${toDisplay(v, 9)} GBYTE`;
 export async function channelCommand(args, ctx) {
+    const run = SUBCOMMANDS[args.sub ?? ''];
+    if (run === undefined) {
+        throw new ObbyxError('usage', `channel ${Object.keys(SUBCOMMANDS).join('|')}`);
+    }
     const store = new ClientChannelStore(channelStorePath(ctx.network));
-    const opts = {
-        client: ctx.client,
-        network: ctx.network,
-        privateKey: ctx.privateKey,
-        store,
-        logger: ctx.logger,
-        ...(ctx.composer ? { composer: ctx.composer } : {}),
-    };
-    const { out } = ctx;
-    const gbyte = (v) => `${toDisplay(v, 9)} GBYTE`;
     try {
-        switch (args.sub) {
-            case 'open': {
-                if (args.target === undefined)
-                    throw new ObbyxError('usage', 'channel open <seller address> --deposit <GBYTE>');
-                if (args.deposit === undefined)
-                    throw new ObbyxError('usage', 'channel open needs --deposit <GBYTE>');
-                const timeout = Number(args.timeout ?? 86_400);
-                if (!Number.isInteger(timeout) || timeout < 60)
-                    throw new ObbyxError('usage', '--window must be ≥ 60 seconds');
-                const { aa, unit } = await openChannel(opts, {
-                    payTo: args.target,
-                    deposit: fromDisplay(args.deposit, 9),
-                    timeout,
-                });
-                out(`Channel ${aa} opened to ${args.target}`);
-                out(`  deposit: ${args.deposit} GBYTE, dispute window: ${timeout} s`);
-                out(`  unit: ${unit}\n  ${explorerUnitUrl(ctx.network, unit)}`);
-                out('Usable once the deposit is stable (minutes under load, up to ~2 h when the network is quiet): obbyx channel status ' +
-                    aa);
-                return 0;
-            }
-            case 'deposit': {
-                const ch = need(store, args.target);
-                if (args.amount === undefined)
-                    throw new ObbyxError('usage', 'channel deposit <aa> --amount <GBYTE>');
-                const unit = await deposit(opts, ch.aa, fromDisplay(args.amount, 9));
-                out(`Deposited ${args.amount} GBYTE to ${ch.aa}: ${unit}`);
-                return 0;
-            }
-            case 'list': {
-                const all = store.list().filter((c) => c.network === ctx.network.caip2);
-                if (all.length === 0)
-                    out('No channels. Open one with: obbyx channel open <seller> --deposit <GBYTE>');
-                for (const c of all) {
-                    out(`${c.aa}  seller ${c.payTo}  period ${c.period}  spent ${gbyte(c.committed)}${c.pending ? '  (voucher pending)' : ''}`);
-                }
-                return 0;
-            }
-            case 'status': {
-                const ch = need(store, args.target);
-                const vars = await hubCall(() => ctx.client.api.getAaStateVars({ address: ch.aa }), 15_000);
-                if (vars.kind !== 'ok')
-                    throw new ObbyxError('ledger_unavailable', vars.error);
-                const v = vars.value;
-                out(`Channel ${ch.aa} → seller ${ch.payTo}`);
-                out(`  on-chain: period ${v['period'] ?? '-'}, deposit ${gbyte(BigInt(Number(v['balanceB'] ?? 0)))}` +
-                    (v['close_initiated_by']
-                        ? `, CLOSING (initiated by ${v['close_initiated_by'] === 'A' ? 'seller' : 'you'})`
-                        : ''));
-                out(`  local:    period ${ch.period}, spent ${gbyte(ch.committed)}${ch.pending ? `, pending voucher ${ch.pending.amountSpent}` : ''}`);
-                if (v['period'] === undefined)
-                    out('  The deposit is not credited yet (waiting for stability).');
-                return 0;
-            }
-            case 'close': {
-                const ch = need(store, args.target);
-                if (ch.pending) {
-                    throw new ObbyxError('payment_pending', 'A voucher has an unknown outcome; retry that request before closing');
-                }
-                const unit = await closeChannel(opts, ch.aa, ch.period, ch.committed);
-                out(`Close requested for period ${ch.period}, declaring ${gbyte(ch.committed)} spent: ${unit}`);
-                out(`The seller confirms at once if this is right; otherwise run \`obbyx channel confirm ${ch.aa}\` after ${ch.timeout} s.`);
-                return 0;
-            }
-            case 'confirm': {
-                const ch = need(store, args.target);
-                const unit = await confirmClose(opts, ch.aa, ch.period);
-                out(`Close confirmed for period ${ch.period}: ${unit}`);
-                return 0;
-            }
-            default:
-                throw new ObbyxError('usage', 'channel open|deposit|list|status|close|confirm');
-        }
+        await run({
+            args,
+            ctx,
+            store,
+            opts: {
+                client: ctx.client,
+                network: ctx.network,
+                privateKey: ctx.privateKey,
+                store,
+                logger: ctx.logger,
+                ...(ctx.composer ? { composer: ctx.composer } : {}),
+            },
+        });
+        return 0;
     }
     finally {
         store.close();
     }
 }
+const SUBCOMMANDS = {
+    open: openCommand,
+    deposit: depositCommand,
+    list: listCommand,
+    status: statusCommand,
+    close: closeCommand,
+    confirm: confirmCommand,
+};
+async function openCommand({ args, ctx, opts }) {
+    if (args.target === undefined)
+        throw new ObbyxError('usage', 'channel open <seller address> --deposit <GBYTE>');
+    if (args.deposit === undefined)
+        throw new ObbyxError('usage', 'channel open needs --deposit <GBYTE>');
+    const timeout = Number(args.timeout ?? 86_400);
+    if (!Number.isInteger(timeout) || timeout < 60)
+        throw new ObbyxError('usage', '--window must be ≥ 60 seconds');
+    const { aa, unit } = await openChannel(opts, {
+        payTo: args.target,
+        deposit: fromDisplay(args.deposit, 9),
+        timeout,
+    });
+    ctx.out(`Channel ${aa} opened to ${args.target}`);
+    ctx.out(`  deposit: ${args.deposit} GBYTE, dispute window: ${timeout} s`);
+    ctx.out(`  unit: ${unit}\n  ${explorerUnitUrl(ctx.network, unit)}`);
+    ctx.out('Usable once the deposit is stable (minutes under load, up to ~2 h when the network is quiet): obbyx channel status ' +
+        aa);
+}
+async function depositCommand({ args, ctx, store, opts }) {
+    const ch = need(store, args.target);
+    if (args.amount === undefined)
+        throw new ObbyxError('usage', 'channel deposit <aa> --amount <GBYTE>');
+    const unit = await deposit(opts, ch.aa, fromDisplay(args.amount, 9));
+    ctx.out(`Deposited ${args.amount} GBYTE to ${ch.aa}: ${unit}`);
+}
+async function listCommand({ ctx, store }) {
+    const all = store.list().filter((c) => c.network === ctx.network.caip2);
+    if (all.length === 0)
+        ctx.out('No channels. Open one with: obbyx channel open <seller> --deposit <GBYTE>');
+    for (const c of all) {
+        ctx.out(`${c.aa}  seller ${c.payTo}  period ${c.period}  spent ${gbyte(c.committed)}${c.pending ? '  (voucher pending)' : ''}`);
+    }
+}
+async function statusCommand({ args, ctx, store }) {
+    const ch = need(store, args.target);
+    const vars = await hubCall(() => ctx.client.api.getAaStateVars({ address: ch.aa }), 15_000);
+    if (vars.kind !== 'ok')
+        throw new ObbyxError('ledger_unavailable', vars.error);
+    const v = vars.value;
+    ctx.out(`Channel ${ch.aa} → seller ${ch.payTo}`);
+    ctx.out(`  on-chain: period ${v['period'] ?? '-'}, deposit ${gbyte(BigInt(Number(v['balanceB'] ?? 0)))}` +
+        (v['close_initiated_by']
+            ? `, CLOSING (initiated by ${v['close_initiated_by'] === 'A' ? 'seller' : 'you'})`
+            : ''));
+    ctx.out(`  local:    period ${ch.period}, spent ${gbyte(ch.committed)}${ch.pending ? `, pending voucher ${ch.pending.amountSpent}` : ''}`);
+    if (v['period'] === undefined)
+        ctx.out('  The deposit is not credited yet (waiting for stability).');
+}
+async function closeCommand({ args, ctx, store, opts }) {
+    const ch = need(store, args.target);
+    if (ch.pending) {
+        throw new ObbyxError('payment_pending', 'A voucher has an unknown outcome; retry that request before closing');
+    }
+    const unit = await closeChannel(opts, ch.aa, ch.period, ch.committed);
+    ctx.out(`Close requested for period ${ch.period}, declaring ${gbyte(ch.committed)} spent: ${unit}`);
+    ctx.out(`The seller confirms at once if this is right; otherwise run \`obbyx channel confirm ${ch.aa}\` after ${ch.timeout} s.`);
+}
+async function confirmCommand({ args, ctx, store, opts }) {
+    const ch = need(store, args.target);
+    const unit = await confirmClose(opts, ch.aa, ch.period);
+    ctx.out(`Close confirmed for period ${ch.period}: ${unit}`);
+}
 function need(store, aa) {
     if (aa === undefined)
         throw new ObbyxError('usage', 'channel address required');

package/dist/lib/channels.js.map

@@ -1 +1 @@
-{"version":3,"file":"channels.js","sourceRoot":"","sources":["../../src/lib/channels.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"channels.js","sourceRoot":"","sources":["../../src/lib/channels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EACL,UAAU,EAEV,eAAe,EACf,WAAW,EACX,SAAS,GACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAEL,kBAAkB,EAClB,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,OAAO,EACP,WAAW,GAEZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,OAAqB,EACrB,MAAyB,OAAO,CAAC,GAAG;IAEpC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,YAAY,OAAO,CAAC,IAAI,KAAK,CAAC,CAAC;AAC7D,CAAC;AA2BD,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC;AAExD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAiB,EAAE,GAAmB;IACzE,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IACxC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,UAAU,CAAC,OAAO,EAAE,WAAW,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,kBAAkB,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IACpE,IAAI,CAAC;QACH,MAAM,GAAG,CAAC;YACR,IAAI;YACJ,GAAG;YACH,KAAK;YACL,IAAI,EAAE;gBACJ,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,UAAU,EAAE,GAAG,CAAC,UAAU;gBAC1B,KAAK;gBACL,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACpD;SACF,CAAC,CAAC;QACH,OAAO,CAAC,CAAC;IACX,CAAC;YAAS,CAAC;QACT,KAAK,CAAC,KAAK,EAAE,CAAC;IAChB,CAAC;AACH,CAAC;AAED,MAAM,WAAW,GAAuD;IACtE,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,cAAc;IACvB,IAAI,EAAE,WAAW;IACjB,MAAM,EAAE,aAAa;IACrB,KAAK,EAAE,YAAY;IACnB,OAAO,EAAE,cAAc;CACxB,CAAC;AAEF,KAAK,UAAU,WAAW,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAc;IACxD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;QAC3B,MAAM,IAAI,UAAU,CAAC,OAAO,EAAE,iDAAiD,CAAC,CAAC;IACnF,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;QAC5B,MAAM,IAAI,UAAU,CAAC,OAAO,EAAE,sCAAsC,CAAC,CAAC;IACxE,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC;IAC/C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,EAAE;QAC5C,MAAM,IAAI,UAAU,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAC;IACjE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE;QAC3C,KAAK,EAAE,IAAI,CAAC,MAAM;QAClB,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACrC,OAAO;KACR,CAAC,CAAC;IACH,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,GAAG,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,OAAO,2BAA2B,OAAO,IAAI,CAAC,CAAC;IAC1E,GAAG,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACpE,GAAG,CAAC,GAAG,CACL,qHAAqH;QACnH,EAAE,CACL,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAc;IAClE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;QAC3B,MAAM,IAAI,UAAU,CAAC,OAAO,EAAE,uCAAuC,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACrE,GAAG,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,MAAM,aAAa,EAAE,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,EAAE,GAAG,EAAE,KAAK,EAAc;IACnD,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxE,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAClB,GAAG,CAAC,GAAG,CAAC,2EAA2E,CAAC,CAAC;IACvF,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;QACpB,GAAG,CAAC,GAAG,CACL,GAAG,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC,MAAM,WAAW,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,EAAE,CACvH,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAc;IAC3D,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5F,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI;QAAE,MAAM,IAAI,UAAU,CAAC,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/E,MAAM,CAAC,GAAG,IAAI,CAAC,KAAoD,CAAC;IACpE,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;IACjD,GAAG,CAAC,GAAG,CACL,sBAAsB,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,aAAa,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;QAC9F,CAAC,CAAC,CAAC,oBAAoB,CAAC;YACtB,CAAC,CAAC,2BAA2B,CAAC,CAAC,oBAAoB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG;YAClF,CAAC,CAAC,EAAE,CAAC,CACV,CAAC;IACF,GAAG,CAAC,GAAG,CACL,sBAAsB,EAAE,CAAC,MAAM,WAAW,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAClI,CAAC;IACF,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,SAAS;QAC3B,GAAG,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC;AAC1E,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAc;IAChE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACf,MAAM,IAAI,UAAU,CAClB,iBAAiB,EACjB,qEAAqE,CACtE,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;IACtE,GAAG,CAAC,GAAG,CACL,8BAA8B,EAAE,CAAC,MAAM,eAAe,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,WAAW,IAAI,EAAE,CAC3F,CAAC;IACF,GAAG,CAAC,GAAG,CACL,uFAAuF,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,OAAO,KAAK,CACxH,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAc;IAClE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IACxD,GAAG,CAAC,GAAG,CAAC,8BAA8B,EAAE,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,IAAI,CAAC,KAAyB,EAAE,EAAsB;IAC7D,IAAI,EAAE,KAAK,SAAS;QAAE,MAAM,IAAI,UAAU,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC;IAChF,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzB,IAAI,EAAE,KAAK,SAAS;QAClB,MAAM,IAAI,UAAU,CAAC,YAAY,EAAE,mBAAmB,EAAE,4BAA4B,CAAC,CAAC;IACxF,OAAO,EAAE,CAAC;AACZ,CAAC"}

package/dist/lib/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/lib/doctor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,YAAY,EAAa,MAAM,cAAc,CAAC;AAW5D,wBAAsB,MAAM,CAC1B,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,GACrE,OAAO,CAAC,MAAM,CAAC,CAmHjB"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/lib/doctor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,YAAY,EAAa,MAAM,cAAc,CAAC;AAe5D,wBAAsB,MAAM,CAC1B,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,GACrE,OAAO,CAAC,MAAM,CAAC,CAWjB"}

package/dist/lib/doctor.js

@@ -1,59 +1,71 @@
-import { existsSync, statSync } from 'node:fs';
+import { existsSync, readFileSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import obyte from 'obyte';
 import { toDisplay } from '@obbyx/obyte';
-import { ClientChannelStore, CoinReservations, hubCall } from '@obbyx/x402-obyte';
+import { ClientChannelStore, CoinReservations, hubCall, parseBalances } from '@obbyx/x402-obyte';
 import { channelStorePath } from './channels.js';
 import { obbyxHome, walletPath } from '@obbyx/obyte/wallet';
+const MARK = { ok: '✓', warn: '!', fail: '✗' };
+const HUB_TIMEOUT_MS = 10_000;
 export async function doctor(network, opts) {
     const results = [];
     const report = (status, what, detail = '') => {
         results.push(status);
-        opts.out(`${status === 'ok' ? '✓' : status === 'warn' ? '!' : '✗'} ${what}${detail ? ` — ${detail}` : ''}`);
+        opts.out(`${MARK[status]} ${what}${detail ? ` — ${detail}` : ''}`);
     };
-    // Wallet
+    const address = checkWallet(network, report);
+    await checkHub(network, opts.hub ?? network.defaultHubUrl, address, report);
+    checkLocalState(network, report);
+    if (opts.facilitator !== undefined)
+        await checkFacilitator(network, opts.facilitator, report);
+    return results.includes('fail') ? 1 : 0;
+}
+/** The wallet file exists and only its owner can read it; returns its address. */
+function checkWallet(network, report) {
     const wallet = walletPath(network);
-    let address;
     if (!existsSync(wallet)) {
         report('fail', 'wallet', `missing; run: obbyx init --network ${network.name}`);
+        return undefined;
     }
-    else if ((statSync(wallet).mode & 0o077) !== 0) {
+    if ((statSync(wallet).mode & 0o077) !== 0) {
         report('fail', 'wallet', `${wallet} is readable by others; run: chmod 600 ${wallet}`);
+        return undefined;
     }
-    else {
-        const { readFileSync } = await import('node:fs');
-        address = JSON.parse(readFileSync(wallet, 'utf8')).address;
-        report('ok', 'wallet', `${address} (${wallet})`);
-    }
-    // Hub
-    const client = new obyte.Client(opts.hub ?? network.defaultHubUrl, { testnet: network.testnet });
+    const address = JSON.parse(readFileSync(wallet, 'utf8')).address;
+    report('ok', 'wallet', `${address} (${wallet})`);
+    return address;
+}
+/** The hub answers; then the wallet's bytes balance (empty on testnet is only a warning). */
+async function checkHub(network, hubUrl, address, report) {
+    const client = new obyte.Client(hubUrl, { testnet: network.testnet });
     try {
         const started = Date.now();
-        const mci = await hubCall(() => client.api.getLastMci(), 10_000);
+        const mci = await hubCall(() => client.api.getLastMci(), HUB_TIMEOUT_MS);
         if (mci.kind !== 'ok') {
-            report('fail', 'hub', `${opts.hub ?? network.defaultHubUrl}: ${mci.error}`);
+            report('fail', 'hub', `${hubUrl}: ${mci.error}`);
+            return;
         }
-        else {
-            report('ok', 'hub', `${opts.hub ?? network.defaultHubUrl}, last MCI ${mci.value}, ${Date.now() - started} ms`);
-            if (address !== undefined) {
-                const b = await hubCall(() => client.api.getBalances([address]), 10_000);
-                if (b.kind === 'ok') {
-                    const base = b.value[address]?.['base'];
-                    const stable = BigInt(base?.stable ?? 0);
-                    const pending = BigInt(base?.pending ?? 0);
-                    report(stable === 0n ? (network.testnet ? 'warn' : 'fail') : 'ok', 'balance', `${toDisplay(stable, 9)} GBYTE stable, ${toDisplay(pending, 9)} pending` +
-                        (stable === 0n && network.testnet ? '; run: obbyx faucet' : ''));
-                }
-                else {
-                    report('warn', 'balance', b.error);
-                }
-            }
+        report('ok', 'hub', `${hubUrl}, last MCI ${mci.value}, ${Date.now() - started} ms`);
+        if (address === undefined)
+            return;
+        const b = await hubCall(() => client.api.getBalances([address]), HUB_TIMEOUT_MS);
+        if (b.kind !== 'ok') {
+            report('warn', 'balance', b.error);
+            return;
         }
+        const base = parseBalances(b.value, address)?.['base'];
+        const stable = base?.stable ?? 0n;
+        const pending = base?.pending ?? 0n;
+        const empty = stable === 0n;
+        report(empty ? (network.testnet ? 'warn' : 'fail') : 'ok', 'balance', `${toDisplay(stable, 9)} GBYTE stable, ${toDisplay(pending, 9)} pending` +
+            (empty && network.testnet ? '; run: obbyx faucet' : ''));
     }
     finally {
         client.close();
     }
-    // Local payment state
+}
+/** Coin reservations and channels with an unknown outcome (warnings, never failures). */
+function checkLocalState(network, report) {
     const coinsPath = join(obbyxHome(), `coins-${network.name}.db`);
     if (existsSync(coinsPath)) {
         const reservations = new CoinReservations(coinsPath);
@@ -74,24 +86,21 @@ export async function doctor(network, opts) {
                 ? `, ${pending.length} with a voucher of unknown outcome (retry that request with --payment)`
                 : ''));
     }
-    // Facilitator (optional)
-    if (opts.facilitator !== undefined) {
-        try {
-            const res = await fetch(new URL('/supported', opts.facilitator), {
-                signal: AbortSignal.timeout(10_000),
-            });
-            const supported = (await res.json());
-            const kinds = (supported.kinds ?? [])
-                .filter((k) => k.network === network.caip2)
-                .map((k) => k.scheme);
-            report(kinds.length > 0 ? 'ok' : 'fail', 'facilitator', kinds.length > 0
-                ? `${opts.facilitator}: ${kinds.join(', ')}`
-                : `does not serve ${network.caip2}`);
-        }
-        catch (err) {
-            report('fail', 'facilitator', `${opts.facilitator}: ${err instanceof Error ? err.message : String(err)}`);
-        }
+}
+/** The facilitator answers /supported and serves this network. */
+async function checkFacilitator(network, facilitator, report) {
+    try {
+        const res = await fetch(new URL('/supported', facilitator), {
+            signal: AbortSignal.timeout(HUB_TIMEOUT_MS),
+        });
+        const supported = (await res.json());
+        const kinds = (supported.kinds ?? [])
+            .filter((k) => k.network === network.caip2)
+            .map((k) => k.scheme);
+        report(kinds.length > 0 ? 'ok' : 'fail', 'facilitator', kinds.length > 0 ? `${facilitator}: ${kinds.join(', ')}` : `does not serve ${network.caip2}`);
+    }
+    catch (err) {
+        report('fail', 'facilitator', `${facilitator}: ${err instanceof Error ? err.message : String(err)}`);
     }
-    return results.includes('fail') ? 1 : 0;
 }
 //# sourceMappingURL=doctor.js.map

package/dist/lib/doctor.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@obbyx/cli",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "obbyx command line: Obyte wallet, testnet faucet, paying x402 APIs, payment channels, diagnostics",
   "keywords": [
     "x402",
@@ -37,9 +37,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@obbyx/obyte": "^0.1.0",
-    "@obbyx/sdk": "^0.2.0",
-    "@obbyx/x402-obyte": "^0.2.1",
+    "@obbyx/obyte": "^0.1.1",
+    "@obbyx/sdk": "^0.2.1",
+    "@obbyx/x402-obyte": "^0.2.2",
     "@x402/core": "^2.29.0",
     "obyte": "0.2.1",
     "yargs": "^18.2.0"

package/src/commands/balance.ts

@@ -1,4 +1,5 @@
-import { toDisplay } from '@obbyx/obyte';
+import { ObbyxError, toDisplay } from '@obbyx/obyte';
+import { parseBalances } from '@obbyx/x402-obyte';
 import { loadWallet } from '@obbyx/obyte/wallet';
 import { connect, resolveNetwork } from '../runtime.js';
 import type { CommandContext, Cmd } from './types.js';
@@ -12,15 +13,12 @@ export function balanceCommand({ out, done }: CommandContext): Cmd {
       const wallet = loadWallet(network);
       const client = connect(network, a.hub);
       try {
-        const balances = (await client.api.getBalances([wallet.address])) as Record<
-          string,
-          Record<string, { stable: number; pending: number }>
-        >;
-        const mine = balances[wallet.address] ?? {};
-        const bytes = mine['base'] ?? { stable: 0, pending: 0 };
+        const mine = parseBalances(await client.api.getBalances([wallet.address]), wallet.address);
+        if (mine === undefined) throw new ObbyxError('ledger_unavailable', 'Malformed balances');
+        const bytes = mine['base'] ?? { stable: 0n, pending: 0n };
         out(`${wallet.address} on ${network.caip2}`);
         out(
-          `  GBYTE: ${toDisplay(BigInt(bytes.stable), 9)} stable, ${toDisplay(BigInt(bytes.pending), 9)} pending`,
+          `  GBYTE: ${toDisplay(bytes.stable, 9)} stable, ${toDisplay(bytes.pending, 9)} pending`,
         );
         for (const [asset, b] of Object.entries(mine)) {
           if (asset !== 'base')

package/src/commands/pay.ts

@@ -1,4 +1,6 @@
-import { ObbyxError, fromDisplay } from '@obbyx/obyte';
+import type obyte from 'obyte';
+import { ObbyxError, type ObyteNetwork, fromDisplay } from '@obbyx/obyte';
+import type { Logger } from '@obbyx/obyte/logger';
 import { loadWallet } from '@obbyx/obyte/wallet';
 import { BatchObyteClient, ClientChannelStore, ExactObyteClient } from '@obbyx/x402-obyte';
 import { PaymentPendingError, payingFetch } from '@obbyx/sdk';
@@ -71,32 +73,7 @@ export function payCommand({ out, err, done }: CommandContext): Cmd<PayArgs> {
       const logger = cliLogger();
       const client = connect(network, a.hub);
       try {
-        const composer = reservingComposer(client, network, wallet.address, logger);
-        const mechanism = new ExactObyteClient({
-          client,
-          network: network.caip2,
-          privateKey: wallet.privateKey,
-          logger,
-          composer,
-          maxFee,
-        });
-        // Use a payment channel to this seller when one is open (instant, no fee per call).
-        const batch = new BatchObyteClient({
-          client,
-          network,
-          privateKey: wallet.privateKey,
-          store: new ClientChannelStore(channelStorePath(network)),
-          logger,
-          maxAmount: new Map([['base', max]]),
-          composer,
-        });
-        const headers: Record<string, string> = {};
-        for (const h of a.header ?? []) {
-          const i = h.indexOf(':');
-          if (i <= 0) throw new ObbyxError('usage', `Bad --header "${h}" (expected "Name: value")`);
-          headers[h.slice(0, i).trim()] = h.slice(i + 1).trim();
-        }
-        if (a.data !== undefined) headers['content-type'] ??= 'application/json';
+        const headers = parseHeaders(a.header ?? [], a.data !== undefined);
         const method = a.method ?? (a.data === undefined ? 'GET' : 'POST');
         try {
           const result = await payingFetch(
@@ -108,7 +85,7 @@ export function payCommand({ out, err, done }: CommandContext): Cmd<PayArgs> {
               ...(a.payment === undefined ? {} : { paymentHeader: a.payment }),
             },
             {
-              mechanisms: { exact: mechanism, batch },
+              mechanisms: mechanisms({ client, network, wallet, max, maxFee, logger }),
               network: network.caip2,
               maxAmount: new Map([['base', max]]),
               logger,
@@ -133,3 +110,59 @@ export function payCommand({ out, err, done }: CommandContext): Cmd<PayArgs> {
     },
   };
 }
+
+/** `--header 'Name: value'` options; a body defaults to JSON. */
+function parseHeaders(list: readonly string[], hasBody: boolean): Record<string, string> {
+  const headers: Record<string, string> = {};
+  for (const h of list) {
+    const i = h.indexOf(':');
+    if (i <= 0) throw new ObbyxError('usage', `Bad --header "${h}" (expected "Name: value")`);
+    headers[h.slice(0, i).trim()] = h.slice(i + 1).trim();
+  }
+  if (hasBody) headers['content-type'] ??= 'application/json';
+  return headers;
+}
+
+/**
+ * The wallet's payment mechanisms: an open channel to the seller first
+ * (instant, no fee per call), otherwise an on-chain unit. One coin composer
+ * for both, so concurrent payments never pick the same coins.
+ */
+function mechanisms({
+  client,
+  network,
+  wallet,
+  max,
+  maxFee,
+  logger,
+}: {
+  client: obyte.Client;
+  network: ObyteNetwork;
+  wallet: { address: string; privateKey: Uint8Array };
+  /** Most this call may cost (atomic units of bytes). */
+  max: bigint;
+  /** Most network fee an on-chain payment may cost (bytes). */
+  maxFee: bigint;
+  logger: Logger;
+}): { exact: ExactObyteClient; batch: BatchObyteClient } {
+  const composer = reservingComposer(client, network, wallet.address, logger);
+  return {
+    exact: new ExactObyteClient({
+      client,
+      network: network.caip2,
+      privateKey: wallet.privateKey,
+      logger,
+      composer,
+      maxFee,
+    }),
+    batch: new BatchObyteClient({
+      client,
+      network,
+      privateKey: wallet.privateKey,
+      store: new ClientChannelStore(channelStorePath(network)),
+      logger,
+      maxAmount: new Map([['base', max]]),
+      composer,
+    }),
+  };
+}

package/src/lib/channels.ts

@@ -31,127 +31,151 @@ export function channelStorePath(
   return join(obbyxHome(env), `channels-${network.name}.db`);
 }
 
-export async function channelCommand(
-  args: {
-    sub: string | undefined;
-    target: string | undefined;
-    deposit?: string;
-    amount?: string;
-    timeout?: string;
-  },
-  ctx: {
-    network: ObyteNetwork;
-    client: obyte.Client;
-    privateKey: Uint8Array;
-    logger: Logger;
-    out: (s?: string) => void;
-    composer?: ReservingComposer;
-  },
-): Promise<number> {
+interface ChannelArgs {
+  sub: string | undefined;
+  target: string | undefined;
+  deposit?: string;
+  amount?: string;
+  timeout?: string;
+}
+
+interface ChannelContext {
+  network: ObyteNetwork;
+  client: obyte.Client;
+  privateKey: Uint8Array;
+  logger: Logger;
+  out: (s?: string) => void;
+  composer?: ReservingComposer;
+}
+
+/** What a subcommand gets: the parsed arguments, the context, the open store and client options. */
+interface ChannelRun {
+  readonly args: ChannelArgs;
+  readonly ctx: ChannelContext;
+  readonly store: ClientChannelStore;
+  readonly opts: BatchClientOptions;
+}
+
+const gbyte = (v: bigint) => `${toDisplay(v, 9)} GBYTE`;
+
+export async function channelCommand(args: ChannelArgs, ctx: ChannelContext): Promise<number> {
+  const run = SUBCOMMANDS[args.sub ?? ''];
+  if (run === undefined) {
+    throw new ObbyxError('usage', `channel ${Object.keys(SUBCOMMANDS).join('|')}`);
+  }
   const store = new ClientChannelStore(channelStorePath(ctx.network));
-  const opts: BatchClientOptions = {
-    client: ctx.client,
-    network: ctx.network,
-    privateKey: ctx.privateKey,
-    store,
-    logger: ctx.logger,
-    ...(ctx.composer ? { composer: ctx.composer } : {}),
-  };
-  const { out } = ctx;
-  const gbyte = (v: bigint) => `${toDisplay(v, 9)} GBYTE`;
   try {
-    switch (args.sub) {
-      case 'open': {
-        if (args.target === undefined)
-          throw new ObbyxError('usage', 'channel open <seller address> --deposit <GBYTE>');
-        if (args.deposit === undefined)
-          throw new ObbyxError('usage', 'channel open needs --deposit <GBYTE>');
-        const timeout = Number(args.timeout ?? 86_400);
-        if (!Number.isInteger(timeout) || timeout < 60)
-          throw new ObbyxError('usage', '--window must be ≥ 60 seconds');
-        const { aa, unit } = await openChannel(opts, {
-          payTo: args.target,
-          deposit: fromDisplay(args.deposit, 9),
-          timeout,
-        });
-        out(`Channel ${aa} opened to ${args.target}`);
-        out(`  deposit: ${args.deposit} GBYTE, dispute window: ${timeout} s`);
-        out(`  unit: ${unit}\n  ${explorerUnitUrl(ctx.network, unit)}`);
-        out(
-          'Usable once the deposit is stable (minutes under load, up to ~2 h when the network is quiet): obbyx channel status ' +
-            aa,
-        );
-        return 0;
-      }
-      case 'deposit': {
-        const ch = need(store, args.target);
-        if (args.amount === undefined)
-          throw new ObbyxError('usage', 'channel deposit <aa> --amount <GBYTE>');
-        const unit = await deposit(opts, ch.aa, fromDisplay(args.amount, 9));
-        out(`Deposited ${args.amount} GBYTE to ${ch.aa}: ${unit}`);
-        return 0;
-      }
-      case 'list': {
-        const all = store.list().filter((c) => c.network === ctx.network.caip2);
-        if (all.length === 0)
-          out('No channels. Open one with: obbyx channel open <seller> --deposit <GBYTE>');
-        for (const c of all) {
-          out(
-            `${c.aa}  seller ${c.payTo}  period ${c.period}  spent ${gbyte(c.committed)}${c.pending ? '  (voucher pending)' : ''}`,
-          );
-        }
-        return 0;
-      }
-      case 'status': {
-        const ch = need(store, args.target);
-        const vars = await hubCall(() => ctx.client.api.getAaStateVars({ address: ch.aa }), 15_000);
-        if (vars.kind !== 'ok') throw new ObbyxError('ledger_unavailable', vars.error);
-        const v = vars.value as Record<string, number | string | undefined>;
-        out(`Channel ${ch.aa} → seller ${ch.payTo}`);
-        out(
-          `  on-chain: period ${v['period'] ?? '-'}, deposit ${gbyte(BigInt(Number(v['balanceB'] ?? 0)))}` +
-            (v['close_initiated_by']
-              ? `, CLOSING (initiated by ${v['close_initiated_by'] === 'A' ? 'seller' : 'you'})`
-              : ''),
-        );
-        out(
-          `  local:    period ${ch.period}, spent ${gbyte(ch.committed)}${ch.pending ? `, pending voucher ${ch.pending.amountSpent}` : ''}`,
-        );
-        if (v['period'] === undefined)
-          out('  The deposit is not credited yet (waiting for stability).');
-        return 0;
-      }
-      case 'close': {
-        const ch = need(store, args.target);
-        if (ch.pending) {
-          throw new ObbyxError(
-            'payment_pending',
-            'A voucher has an unknown outcome; retry that request before closing',
-          );
-        }
-        const unit = await closeChannel(opts, ch.aa, ch.period, ch.committed);
-        out(
-          `Close requested for period ${ch.period}, declaring ${gbyte(ch.committed)} spent: ${unit}`,
-        );
-        out(
-          `The seller confirms at once if this is right; otherwise run \`obbyx channel confirm ${ch.aa}\` after ${ch.timeout} s.`,
-        );
-        return 0;
-      }
-      case 'confirm': {
-        const ch = need(store, args.target);
-        const unit = await confirmClose(opts, ch.aa, ch.period);
-        out(`Close confirmed for period ${ch.period}: ${unit}`);
-        return 0;
-      }
-      default:
-        throw new ObbyxError('usage', 'channel open|deposit|list|status|close|confirm');
-    }
+    await run({
+      args,
+      ctx,
+      store,
+      opts: {
+        client: ctx.client,
+        network: ctx.network,
+        privateKey: ctx.privateKey,
+        store,
+        logger: ctx.logger,
+        ...(ctx.composer ? { composer: ctx.composer } : {}),
+      },
+    });
+    return 0;
   } finally {
     store.close();
   }
 }
 
+const SUBCOMMANDS: Record<string, (run: ChannelRun) => Promise<void>> = {
+  open: openCommand,
+  deposit: depositCommand,
+  list: listCommand,
+  status: statusCommand,
+  close: closeCommand,
+  confirm: confirmCommand,
+};
+
+async function openCommand({ args, ctx, opts }: ChannelRun): Promise<void> {
+  if (args.target === undefined)
+    throw new ObbyxError('usage', 'channel open <seller address> --deposit <GBYTE>');
+  if (args.deposit === undefined)
+    throw new ObbyxError('usage', 'channel open needs --deposit <GBYTE>');
+  const timeout = Number(args.timeout ?? 86_400);
+  if (!Number.isInteger(timeout) || timeout < 60)
+    throw new ObbyxError('usage', '--window must be ≥ 60 seconds');
+  const { aa, unit } = await openChannel(opts, {
+    payTo: args.target,
+    deposit: fromDisplay(args.deposit, 9),
+    timeout,
+  });
+  ctx.out(`Channel ${aa} opened to ${args.target}`);
+  ctx.out(`  deposit: ${args.deposit} GBYTE, dispute window: ${timeout} s`);
+  ctx.out(`  unit: ${unit}\n  ${explorerUnitUrl(ctx.network, unit)}`);
+  ctx.out(
+    'Usable once the deposit is stable (minutes under load, up to ~2 h when the network is quiet): obbyx channel status ' +
+      aa,
+  );
+}
+
+async function depositCommand({ args, ctx, store, opts }: ChannelRun): Promise<void> {
+  const ch = need(store, args.target);
+  if (args.amount === undefined)
+    throw new ObbyxError('usage', 'channel deposit <aa> --amount <GBYTE>');
+  const unit = await deposit(opts, ch.aa, fromDisplay(args.amount, 9));
+  ctx.out(`Deposited ${args.amount} GBYTE to ${ch.aa}: ${unit}`);
+}
+
+async function listCommand({ ctx, store }: ChannelRun): Promise<void> {
+  const all = store.list().filter((c) => c.network === ctx.network.caip2);
+  if (all.length === 0)
+    ctx.out('No channels. Open one with: obbyx channel open <seller> --deposit <GBYTE>');
+  for (const c of all) {
+    ctx.out(
+      `${c.aa}  seller ${c.payTo}  period ${c.period}  spent ${gbyte(c.committed)}${c.pending ? '  (voucher pending)' : ''}`,
+    );
+  }
+}
+
+async function statusCommand({ args, ctx, store }: ChannelRun): Promise<void> {
+  const ch = need(store, args.target);
+  const vars = await hubCall(() => ctx.client.api.getAaStateVars({ address: ch.aa }), 15_000);
+  if (vars.kind !== 'ok') throw new ObbyxError('ledger_unavailable', vars.error);
+  const v = vars.value as Record<string, number | string | undefined>;
+  ctx.out(`Channel ${ch.aa} → seller ${ch.payTo}`);
+  ctx.out(
+    `  on-chain: period ${v['period'] ?? '-'}, deposit ${gbyte(BigInt(Number(v['balanceB'] ?? 0)))}` +
+      (v['close_initiated_by']
+        ? `, CLOSING (initiated by ${v['close_initiated_by'] === 'A' ? 'seller' : 'you'})`
+        : ''),
+  );
+  ctx.out(
+    `  local:    period ${ch.period}, spent ${gbyte(ch.committed)}${ch.pending ? `, pending voucher ${ch.pending.amountSpent}` : ''}`,
+  );
+  if (v['period'] === undefined)
+    ctx.out('  The deposit is not credited yet (waiting for stability).');
+}
+
+async function closeCommand({ args, ctx, store, opts }: ChannelRun): Promise<void> {
+  const ch = need(store, args.target);
+  if (ch.pending) {
+    throw new ObbyxError(
+      'payment_pending',
+      'A voucher has an unknown outcome; retry that request before closing',
+    );
+  }
+  const unit = await closeChannel(opts, ch.aa, ch.period, ch.committed);
+  ctx.out(
+    `Close requested for period ${ch.period}, declaring ${gbyte(ch.committed)} spent: ${unit}`,
+  );
+  ctx.out(
+    `The seller confirms at once if this is right; otherwise run \`obbyx channel confirm ${ch.aa}\` after ${ch.timeout} s.`,
+  );
+}
+
+async function confirmCommand({ args, ctx, store, opts }: ChannelRun): Promise<void> {
+  const ch = need(store, args.target);
+  const unit = await confirmClose(opts, ch.aa, ch.period);
+  ctx.out(`Close confirmed for period ${ch.period}: ${unit}`);
+}
+
 function need(store: ClientChannelStore, aa: string | undefined) {
   if (aa === undefined) throw new ObbyxError('usage', 'channel address required');
   const ch = store.get(aa);

package/src/lib/doctor.ts

@@ -1,8 +1,8 @@
-import { existsSync, statSync } from 'node:fs';
+import { existsSync, readFileSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import obyte from 'obyte';
 import { type ObyteNetwork, toDisplay } from '@obbyx/obyte';
-import { ClientChannelStore, CoinReservations, hubCall } from '@obbyx/x402-obyte';
+import { ClientChannelStore, CoinReservations, hubCall, parseBalances } from '@obbyx/x402-obyte';
 import { channelStorePath } from './channels.js';
 import { obbyxHome, walletPath } from '@obbyx/obyte/wallet';
 
@@ -11,69 +11,82 @@ import { obbyxHome, walletPath } from '@obbyx/obyte/wallet';
  * Exit code 0 when nothing failed (warnings allowed).
  */
 type Status = 'ok' | 'warn' | 'fail';
+type Report = (status: Status, what: string, detail?: string) => void;
+
+const MARK: Record<Status, string> = { ok: '✓', warn: '!', fail: '✗' };
+const HUB_TIMEOUT_MS = 10_000;
 
 export async function doctor(
   network: ObyteNetwork,
   opts: { hub?: string; facilitator?: string; out: (s: string) => void },
 ): Promise<number> {
   const results: Status[] = [];
-  const report = (status: Status, what: string, detail = '') => {
+  const report: Report = (status, what, detail = '') => {
     results.push(status);
-    opts.out(
-      `${status === 'ok' ? '✓' : status === 'warn' ? '!' : '✗'} ${what}${detail ? ` — ${detail}` : ''}`,
-    );
+    opts.out(`${MARK[status]} ${what}${detail ? ` — ${detail}` : ''}`);
   };
+  const address = checkWallet(network, report);
+  await checkHub(network, opts.hub ?? network.defaultHubUrl, address, report);
+  checkLocalState(network, report);
+  if (opts.facilitator !== undefined) await checkFacilitator(network, opts.facilitator, report);
+  return results.includes('fail') ? 1 : 0;
+}
 
-  // Wallet
+/** The wallet file exists and only its owner can read it; returns its address. */
+function checkWallet(network: ObyteNetwork, report: Report): string | undefined {
   const wallet = walletPath(network);
-  let address: string | undefined;
   if (!existsSync(wallet)) {
     report('fail', 'wallet', `missing; run: obbyx init --network ${network.name}`);
-  } else if ((statSync(wallet).mode & 0o077) !== 0) {
+    return undefined;
+  }
+  if ((statSync(wallet).mode & 0o077) !== 0) {
     report('fail', 'wallet', `${wallet} is readable by others; run: chmod 600 ${wallet}`);
-  } else {
-    const { readFileSync } = await import('node:fs');
-    address = (JSON.parse(readFileSync(wallet, 'utf8')) as { address: string }).address;
-    report('ok', 'wallet', `${address} (${wallet})`);
+    return undefined;
   }
+  const address = (JSON.parse(readFileSync(wallet, 'utf8')) as { address: string }).address;
+  report('ok', 'wallet', `${address} (${wallet})`);
+  return address;
+}
 
-  // Hub
-  const client = new obyte.Client(opts.hub ?? network.defaultHubUrl, { testnet: network.testnet });
+/** The hub answers; then the wallet's bytes balance (empty on testnet is only a warning). */
+async function checkHub(
+  network: ObyteNetwork,
+  hubUrl: string,
+  address: string | undefined,
+  report: Report,
+): Promise<void> {
+  const client = new obyte.Client(hubUrl, { testnet: network.testnet });
   try {
     const started = Date.now();
-    const mci = await hubCall(() => client.api.getLastMci(), 10_000);
+    const mci = await hubCall(() => client.api.getLastMci(), HUB_TIMEOUT_MS);
     if (mci.kind !== 'ok') {
-      report('fail', 'hub', `${opts.hub ?? network.defaultHubUrl}: ${mci.error}`);
-    } else {
-      report(
-        'ok',
-        'hub',
-        `${opts.hub ?? network.defaultHubUrl}, last MCI ${mci.value}, ${Date.now() - started} ms`,
-      );
-      if (address !== undefined) {
-        const b = await hubCall(() => client.api.getBalances([address]), 10_000);
-        if (b.kind === 'ok') {
-          const base = (
-            b.value as Record<string, Record<string, { stable: number; pending: number }>>
-          )[address]?.['base'];
-          const stable = BigInt(base?.stable ?? 0);
-          const pending = BigInt(base?.pending ?? 0);
-          report(
-            stable === 0n ? (network.testnet ? 'warn' : 'fail') : 'ok',
-            'balance',
-            `${toDisplay(stable, 9)} GBYTE stable, ${toDisplay(pending, 9)} pending` +
-              (stable === 0n && network.testnet ? '; run: obbyx faucet' : ''),
-          );
-        } else {
-          report('warn', 'balance', b.error);
-        }
-      }
+      report('fail', 'hub', `${hubUrl}: ${mci.error}`);
+      return;
+    }
+    report('ok', 'hub', `${hubUrl}, last MCI ${mci.value}, ${Date.now() - started} ms`);
+    if (address === undefined) return;
+    const b = await hubCall(() => client.api.getBalances([address]), HUB_TIMEOUT_MS);
+    if (b.kind !== 'ok') {
+      report('warn', 'balance', b.error);
+      return;
     }
+    const base = parseBalances(b.value, address)?.['base'];
+    const stable = base?.stable ?? 0n;
+    const pending = base?.pending ?? 0n;
+    const empty = stable === 0n;
+    report(
+      empty ? (network.testnet ? 'warn' : 'fail') : 'ok',
+      'balance',
+      `${toDisplay(stable, 9)} GBYTE stable, ${toDisplay(pending, 9)} pending` +
+        (empty && network.testnet ? '; run: obbyx faucet' : ''),
+    );
   } finally {
     client.close();
   }
+}
 
-  // Local payment state
+/** Coin reservations and channels with an unknown outcome (warnings, never failures). */
+function checkLocalState(network: ObyteNetwork, report: Report): void {
   const coinsPath = join(obbyxHome(), `coins-${network.name}.db`);
   if (existsSync(coinsPath)) {
     const reservations = new CoinReservations(coinsPath);
@@ -102,32 +115,32 @@ export async function doctor(
           : ''),
     );
   }
+}
 
-  // Facilitator (optional)
-  if (opts.facilitator !== undefined) {
-    try {
-      const res = await fetch(new URL('/supported', opts.facilitator), {
-        signal: AbortSignal.timeout(10_000),
-      });
-      const supported = (await res.json()) as { kinds?: { scheme: string; network: string }[] };
-      const kinds = (supported.kinds ?? [])
-        .filter((k) => k.network === network.caip2)
-        .map((k) => k.scheme);
-      report(
-        kinds.length > 0 ? 'ok' : 'fail',
-        'facilitator',
-        kinds.length > 0
-          ? `${opts.facilitator}: ${kinds.join(', ')}`
-          : `does not serve ${network.caip2}`,
-      );
-    } catch (err) {
-      report(
-        'fail',
-        'facilitator',
-        `${opts.facilitator}: ${err instanceof Error ? err.message : String(err)}`,
-      );
-    }
+/** The facilitator answers /supported and serves this network. */
+async function checkFacilitator(
+  network: ObyteNetwork,
+  facilitator: string,
+  report: Report,
+): Promise<void> {
+  try {
+    const res = await fetch(new URL('/supported', facilitator), {
+      signal: AbortSignal.timeout(HUB_TIMEOUT_MS),
+    });
+    const supported = (await res.json()) as { kinds?: { scheme: string; network: string }[] };
+    const kinds = (supported.kinds ?? [])
+      .filter((k) => k.network === network.caip2)
+      .map((k) => k.scheme);
+    report(
+      kinds.length > 0 ? 'ok' : 'fail',
+      'facilitator',
+      kinds.length > 0 ? `${facilitator}: ${kinds.join(', ')}` : `does not serve ${network.caip2}`,
+    );
+  } catch (err) {
+    report(
+      'fail',
+      'facilitator',
+      `${facilitator}: ${err instanceof Error ? err.message : String(err)}`,
+    );
   }
-
-  return results.includes('fail') ? 1 : 0;
 }