@cogcoin/client 1.2.2 → 1.2.3

package/README.md

@@ -1,6 +1,6 @@
 # `@cogcoin/client`
 
-`@cogcoin/client@1.2.2` is the reference Cogcoin client package for applications that want a local wallet, durable SQLite-backed state, and a managed Bitcoin Core integration around `@cogcoin/indexer`. It publishes the reusable client APIs, the SQLite adapter, the managed `bitcoind` integration, and the first-party `cogcoin` CLI in one package.
+`@cogcoin/client@1.2.3` is the reference Cogcoin client package for applications that want a local wallet, durable SQLite-backed state, and a managed Bitcoin Core integration around `@cogcoin/indexer`. It publishes the reusable client APIs, the SQLite adapter, the managed `bitcoind` integration, and the first-party `cogcoin` CLI in one package.
 
 Use Node 22 or newer.
 

package/dist/wallet/lifecycle/repair-bitcoind.js

@@ -4,7 +4,7 @@ import { persistWalletCoinControlStateIfNeeded } from "../coin-control.js";
 import { createWalletSecretReference } from "../state/provider.js";
 import { recreateManagedCoreWalletReplica, verifyManagedCoreWalletReplica } from "./managed-core.js";
 import { pathExists } from "./context.js";
-import { clearManagedBitcoindArtifacts, isManagedBitcoindRpcUnavailableError, mapBitcoindCompatibilityToRepairIssue, mapBitcoindRepairHealth, waitForProcessExit, } from "./repair-runtime.js";
+import { clearManagedBitcoindArtifactsForDataDir, isManagedBitcoindRpcUnavailableError, mapBitcoindCompatibilityToRepairIssue, mapBitcoindRepairHealth, waitForProcessExit, } from "./repair-runtime.js";
 export async function repairManagedBitcoindStage(options) {
     let state = options.state;
     let repairStateNeedsPersist = options.repairStateNeedsPersist;
@@ -40,7 +40,7 @@ export async function repairManagedBitcoindStage(options) {
                 if (initialBitcoindProbe.compatibility !== "rawtx-zmq-missing") {
                     throw new Error("managed_bitcoind_process_id_unavailable");
                 }
-                await clearManagedBitcoindArtifacts(options.servicePaths);
+                await clearManagedBitcoindArtifactsForDataDir(options.servicePaths, options.context.dataDir);
                 bitcoindServiceAction = "restarted-missing-rawtx-zmq";
             }
             else {
@@ -53,7 +53,7 @@ export async function repairManagedBitcoindStage(options) {
                     }
                 }
                 await waitForProcessExit(processId, 15_000, "managed_bitcoind_stop_timeout");
-                await clearManagedBitcoindArtifacts(options.servicePaths);
+                await clearManagedBitcoindArtifactsForDataDir(options.servicePaths, options.context.dataDir);
                 bitcoindServiceAction = initialBitcoindProbe.compatibility === "rawtx-zmq-missing"
                     ? "restarted-missing-rawtx-zmq"
                     : "stopped-incompatible-service";
@@ -68,7 +68,7 @@ export async function repairManagedBitcoindStage(options) {
                 options.servicePaths.bitcoindWalletStatusPath,
             ].map(pathExists));
             if (hasStaleArtifacts.some(Boolean)) {
-                await clearManagedBitcoindArtifacts(options.servicePaths);
+                await clearManagedBitcoindArtifactsForDataDir(options.servicePaths, options.context.dataDir);
                 bitcoindServiceAction = "cleared-stale-artifacts";
             }
         }
@@ -161,7 +161,7 @@ export async function repairManagedBitcoindStage(options) {
                     dataDir: options.context.dataDir,
                 });
                 try {
-                    await clearManagedBitcoindArtifacts(options.servicePaths);
+                    await clearManagedBitcoindArtifactsForDataDir(options.servicePaths, options.context.dataDir);
                 }
                 finally {
                     await retryLock.release();

package/dist/wallet/lifecycle/repair-runtime.d.ts

@@ -33,5 +33,6 @@ export declare function isManagedBitcoindRpcUnavailableError(error: unknown): bo
 export declare function waitForProcessExit(pid: number, timeoutMs?: number, errorCode?: string): Promise<void>;
 export declare function clearIndexerDaemonArtifacts(servicePaths: ReturnType<typeof resolveManagedServicePaths>): Promise<void>;
 export declare function clearManagedBitcoindArtifacts(servicePaths: ReturnType<typeof resolveManagedServicePaths>): Promise<void>;
+export declare function clearManagedBitcoindArtifactsForDataDir(servicePaths: ReturnType<typeof resolveManagedServicePaths>, dataDir: string): Promise<void>;
 export declare function stopRecordedManagedProcess(pid: number | null, errorCode: string): Promise<void>;
 export declare function clearOrphanedRepairLocks(lockPaths: readonly string[]): Promise<void>;

package/dist/wallet/lifecycle/repair-runtime.js

@@ -1,5 +1,5 @@
-import { access, constants, mkdir, readFile, rm } from "node:fs/promises";
-import { dirname } from "node:path";
+import { access, constants, mkdir, readdir, readFile, rm } from "node:fs/promises";
+import { dirname, join } from "node:path";
 import { attachOrStartIndexerDaemon, probeIndexerDaemon, readSnapshotWithRetry, } from "../../bitcoind/indexer-daemon.js";
 import { probeManagedBitcoindService } from "../../bitcoind/service.js";
 import { resolveManagedServicePaths } from "../../bitcoind/service-paths.js";
@@ -184,11 +184,62 @@ export async function clearIndexerDaemonArtifacts(servicePaths) {
     await rm(servicePaths.indexerDaemonSocketPath, { force: true }).catch(() => undefined);
 }
 export async function clearManagedBitcoindArtifacts(servicePaths) {
-    await rm(servicePaths.bitcoindStatusPath, { force: true }).catch(() => undefined);
-    await rm(servicePaths.bitcoindPidPath, { force: true }).catch(() => undefined);
-    await rm(servicePaths.bitcoindReadyPath, { force: true }).catch(() => undefined);
-    await rm(servicePaths.bitcoindRuntimeConfigPath, { force: true }).catch(() => undefined);
-    await rm(servicePaths.bitcoindWalletStatusPath, { force: true }).catch(() => undefined);
+    await clearManagedBitcoindArtifactRoot(servicePaths.walletRuntimeRoot);
+}
+async function readManagedBitcoindStatusAtRoot(serviceRoot) {
+    try {
+        return JSON.parse(await readFile(join(serviceRoot, "bitcoind-status.json"), "utf8"));
+    }
+    catch {
+        return null;
+    }
+}
+async function clearManagedBitcoindArtifactRoot(serviceRoot) {
+    await rm(join(serviceRoot, "bitcoind-status.json"), { force: true }).catch(() => undefined);
+    await rm(join(serviceRoot, "bitcoind.pid"), { force: true }).catch(() => undefined);
+    await rm(join(serviceRoot, "bitcoind.ready"), { force: true }).catch(() => undefined);
+    await rm(join(serviceRoot, "bitcoind-config.json"), { force: true }).catch(() => undefined);
+    await rm(join(serviceRoot, "bitcoind-wallet.json"), { force: true }).catch(() => undefined);
+}
+async function stopManagedBitcoindPid(pid) {
+    if (pid === null || !await isProcessAlive(pid)) {
+        return;
+    }
+    try {
+        process.kill(pid, "SIGTERM");
+    }
+    catch (error) {
+        if (!(error instanceof Error && "code" in error && error.code === "ESRCH")) {
+            throw error;
+        }
+    }
+    await waitForProcessExit(pid, 15_000, "managed_bitcoind_stop_timeout");
+}
+export async function clearManagedBitcoindArtifactsForDataDir(servicePaths, dataDir) {
+    const serviceRoots = new Set([servicePaths.walletRuntimeRoot]);
+    const runtimeEntries = await readdir(servicePaths.runtimeRoot, { withFileTypes: true }).catch((error) => {
+        if (error instanceof Error && "code" in error && error.code === "ENOENT") {
+            return [];
+        }
+        throw error;
+    });
+    for (const entry of runtimeEntries) {
+        if (!entry.isDirectory()) {
+            continue;
+        }
+        const serviceRoot = join(servicePaths.runtimeRoot, entry.name);
+        const status = await readManagedBitcoindStatusAtRoot(serviceRoot);
+        if (status?.dataDir === dataDir) {
+            serviceRoots.add(serviceRoot);
+        }
+    }
+    for (const serviceRoot of serviceRoots) {
+        const status = await readManagedBitcoindStatusAtRoot(serviceRoot);
+        if (status?.dataDir === dataDir) {
+            await stopManagedBitcoindPid(status.processId);
+        }
+        await clearManagedBitcoindArtifactRoot(serviceRoot);
+    }
 }
 export async function stopRecordedManagedProcess(pid, errorCode) {
     if (pid === null || !await isProcessAlive(pid)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cogcoin/client",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Store-backed Cogcoin client with wallet flows, SQLite persistence, and managed Bitcoin Core integration.",
   "license": "MIT",
   "type": "module",