@bitsocial/bitsocial-cli 0.19.59 → 0.19.60

package/README.md

@@ -344,7 +344,7 @@ EXAMPLES
   $ bitsocial challenge install ./my-local-challenge
 ```
 
-_See code: [src/cli/commands/challenge/install.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/challenge/install.ts)_
+_See code: [src/cli/commands/challenge/install.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/challenge/install.ts)_
 
 ## `bitsocial challenge list`
 
@@ -367,7 +367,7 @@ EXAMPLES
   $ bitsocial challenge list -q
 ```
 
-_See code: [src/cli/commands/challenge/list.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/challenge/list.ts)_
+_See code: [src/cli/commands/challenge/list.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/challenge/list.ts)_
 
 ## `bitsocial challenge remove NAME`
 
@@ -392,7 +392,7 @@ EXAMPLES
   $ bitsocial challenge remove @scope/my-challenge
 ```
 
-_See code: [src/cli/commands/challenge/remove.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/challenge/remove.ts)_
+_See code: [src/cli/commands/challenge/remove.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/challenge/remove.ts)_
 
 ## `bitsocial community create`
 
@@ -422,7 +422,7 @@ EXAMPLES
     $ bitsocial community create --jsonFile ./create-options.json
 ```
 
-_See code: [src/cli/commands/community/create.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/community/create.ts)_
+_See code: [src/cli/commands/community/create.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/community/create.ts)_
 
 ## `bitsocial community delete ADDRESSES`
 
@@ -447,7 +447,7 @@ EXAMPLES
   $ bitsocial community delete 12D3KooWG3XbzoVyAE6Y9vHZKF64Yuuu4TjdgQKedk14iYmTEPWu
 ```
 
-_See code: [src/cli/commands/community/delete.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/community/delete.ts)_
+_See code: [src/cli/commands/community/delete.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/community/delete.ts)_
 
 ## `bitsocial community edit ADDRESS`
 
@@ -517,7 +517,7 @@ EXAMPLES
     $ bitsocial community edit bitsocial.bso --jsonFile ./edit-options.json
 ```
 
-_See code: [src/cli/commands/community/edit.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/community/edit.ts)_
+_See code: [src/cli/commands/community/edit.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/community/edit.ts)_
 
 ## `bitsocial community get [ADDRESS]`
 
@@ -548,7 +548,7 @@ EXAMPLES
   $ bitsocial community get --publicKey 12D3KooWG3XbzoVyAE6Y9vHZKF64Yuuu4TjdgQKedk14iYmTEPWu
 ```
 
-_See code: [src/cli/commands/community/get.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/community/get.ts)_
+_See code: [src/cli/commands/community/get.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/community/get.ts)_
 
 ## `bitsocial community list`
 
@@ -571,7 +571,7 @@ EXAMPLES
   $ bitsocial community list
 ```
 
-_See code: [src/cli/commands/community/list.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/community/list.ts)_
+_See code: [src/cli/commands/community/list.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/community/list.ts)_
 
 ## `bitsocial community start ADDRESSES`
 
@@ -605,7 +605,7 @@ EXAMPLES
     $ bitsocial community start $(bitsocial community list -q) --concurrency 1
 ```
 
-_See code: [src/cli/commands/community/start.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/community/start.ts)_
+_See code: [src/cli/commands/community/start.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/community/start.ts)_
 
 ## `bitsocial community stop ADDRESSES`
 
@@ -630,7 +630,7 @@ EXAMPLES
   $ bitsocial community stop Qmb99crTbSUfKXamXwZBe829Vf6w5w5TktPkb6WstC9RFW
 ```
 
-_See code: [src/cli/commands/community/stop.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/community/stop.ts)_
+_See code: [src/cli/commands/community/stop.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/community/stop.ts)_
 
 ## `bitsocial daemon`
 
@@ -671,7 +671,7 @@ EXAMPLES
   $ bitsocial daemon --chainProviderUrls https://mainnet.infura.io/v3/YOUR_KEY
 ```
 
-_See code: [src/cli/commands/daemon.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/daemon.ts)_
+_See code: [src/cli/commands/daemon.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/daemon.ts)_
 
 ## `bitsocial help [COMMAND]`
 
@@ -737,7 +737,7 @@ EXAMPLES
   $ bitsocial logs --stdout -f
 ```
 
-_See code: [src/cli/commands/logs.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/logs.ts)_
+_See code: [src/cli/commands/logs.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/logs.ts)_
 
 ## `bitsocial update check`
 
@@ -754,7 +754,7 @@ EXAMPLES
   $ bitsocial update check
 ```
 
-_See code: [src/cli/commands/update/check.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/update/check.ts)_
+_See code: [src/cli/commands/update/check.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/update/check.ts)_
 
 ## `bitsocial update install [VERSION]`
 
@@ -786,7 +786,7 @@ EXAMPLES
   $ bitsocial update install --no-restart-daemons
 ```
 
-_See code: [src/cli/commands/update/install.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/update/install.ts)_
+_See code: [src/cli/commands/update/install.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/update/install.ts)_
 
 ## `bitsocial update versions`
 
@@ -808,7 +808,7 @@ EXAMPLES
   $ bitsocial update versions --limit 5
 ```
 
-_See code: [src/cli/commands/update/versions.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.59/src/cli/commands/update/versions.ts)_
+_See code: [src/cli/commands/update/versions.ts](https://github.com/bitsocialnet/bitsocial-cli/blob/v0.19.60/src/cli/commands/update/versions.ts)_
 <!-- commandsstop -->
 
 ## Contribution

package/dist/cli/commands/daemon.d.ts

@@ -5,7 +5,6 @@ export interface KeepKuboUpTickDeps {
     pkcOptionsFromFlag: {
         kuboRpcClientsOptions?: unknown;
     } | undefined;
-    usingDifferentProcessRpc: boolean;
     hasKuboProcess: boolean;
     hasPendingKuboStart: boolean;
     keepKuboUp: () => Promise<void>;

package/dist/cli/commands/daemon.js

@@ -44,13 +44,13 @@ const defaultPkcOptions = {
 export async function runKeepKuboUpTick(deps) {
     let isRpcPortTaken = false;
     try {
-        isRpcPortTaken = await deps.tcpPortUsedCheck(Number(deps.pkcRpcUrl.port), deps.pkcRpcUrl.hostname);
-        if (!deps.pkcOptionsFromFlag?.kuboRpcClientsOptions && !isRpcPortTaken && !deps.usingDifferentProcessRpc)
+        isRpcPortTaken = await deps.tcpPortUsedCheck(Number(deps.pkcRpcUrl.port), toConnectableHostname(deps.pkcRpcUrl.hostname));
+        if (!deps.pkcOptionsFromFlag?.kuboRpcClientsOptions && !isRpcPortTaken)
             await deps.keepKuboUp();
-        else if (deps.pkcOptionsFromFlag?.kuboRpcClientsOptions && !deps.usingDifferentProcessRpc)
+        else if (deps.pkcOptionsFromFlag?.kuboRpcClientsOptions)
             await deps.keepKuboUp();
         // Retry if kubo died and onKuboExit's restart attempt failed (e.g. transient port conflict)
-        else if (!deps.hasKuboProcess && !deps.hasPendingKuboStart && !deps.usingDifferentProcessRpc)
+        else if (!deps.hasKuboProcess && !deps.hasPendingKuboStart)
             await deps.keepKuboUp();
     }
     catch (error) {
@@ -225,6 +225,14 @@ export default class Daemon extends Command {
                 this.error("Can't provide pkcOptions.kuboRpcClientsOptions as an array with more than 1 element, or as a non array");
             if (pkcOptionsFromFlag?.ipfsGatewayUrls && pkcOptionsFromFlag.ipfsGatewayUrls.length !== 1)
                 this.error("Can't provide pkcOptions.ipfsGatewayUrls as an array with more than 1 element, or as a non array");
+            const rpcConnectHostname = toConnectableHostname(pkcRpcUrl.hostname);
+            const isRpcPortAlreadyTaken = await tcpPortUsed.check(Number(pkcRpcUrl.port), rpcConnectHostname);
+            if (isRpcPortAlreadyTaken) {
+                this.error(`PKC RPC port is already in use at ${pkcRpcUrl} (another bitsocial daemon is likely running). ` +
+                    `To talk to the running daemon, use other bitsocial commands with --pkcRpcUrl ${pkcRpcUrl} ` +
+                    `(e.g. 'bitsocial community list --pkcRpcUrl ${pkcRpcUrl}'). ` +
+                    `To run a second daemon, restart with a different port, e.g. --pkcRpcUrl ws://${pkcRpcUrl.hostname}:${Number(pkcRpcUrl.port) + 1}.`);
+            }
             const ipfsConfig = await loadKuboConfigFile(pkcOptionsFromFlag?.dataPath || defaultPkcOptions.dataPath);
             const kuboRpcEndpoint = pkcOptionsFromFlag?.kuboRpcClientsOptions
                 ? new URL(pkcOptionsFromFlag.kuboRpcClientsOptions[0].toString())
@@ -264,7 +272,7 @@ export default class Daemon extends Command {
                 if (mainProcessExited)
                     return;
                 const kuboApiPort = Number(kuboRpcEndpoint.port);
-                if (kuboProcess || pendingKuboStart || usingDifferentProcessRpc)
+                if (kuboProcess || pendingKuboStart)
                     return; // already started, no need to intervene
                 const connectHostname = toConnectableHostname(kuboRpcEndpoint.hostname);
                 const isKuboApiPortTaken = await tcpPortUsed.check(kuboApiPort, connectHostname);
@@ -353,34 +361,24 @@ export default class Daemon extends Command {
                 currentProcess.once("exit", onKuboExit);
             };
             let startedOwnRpc = false;
-            let usingDifferentProcessRpc = false;
             let daemonServer;
             const createOrConnectRpc = async () => {
                 if (mainProcessExited)
                     return;
                 if (startedOwnRpc)
                     return;
-                const isRpcPortTaken = await tcpPortUsed.check(Number(pkcRpcUrl.port), pkcRpcUrl.hostname);
-                if (isRpcPortTaken && usingDifferentProcessRpc)
-                    return;
+                // Re-check the port: the early fail-fast at startup is a few ms before this runs,
+                // so a TOCTOU race could let another process grab the port in between. If that
+                // happens we must fail rather than silently leaving the daemon without an RPC.
+                const isRpcPortTaken = await tcpPortUsed.check(Number(pkcRpcUrl.port), rpcConnectHostname);
                 if (isRpcPortTaken) {
-                    log(`PKC RPC is already running (${pkcRpcUrl}) by another program. bitsocial-cli will use the running RPC server, and if shuts down, bitsocial-cli will start a new RPC instance`);
-                    console.log("Using the already started RPC server at:", pkcRpcUrl);
-                    console.log("bitsocial-cli daemon will monitor the PKC RPC and kubo ipfs API to make sure they're always up");
-                    const PKC = await import("@pkcprotocol/pkc-js");
-                    const pkc = await PKC.default({ pkcRpcClientsOptions: [pkcRpcUrl.toString()] });
-                    await new Promise((resolve) => pkc.once("communitieschange", resolve));
-                    pkc.on("error", (error) => console.error("Error from pkc instance", error));
-                    console.log(`Communities in data path: `, pkc.communities);
-                    usingDifferentProcessRpc = true;
-                    return;
+                    throw new Error(`PKC RPC port ${pkcRpcUrl.hostname}:${pkcRpcUrl.port} (${pkcRpcUrl}) became occupied before the daemon could bind it.`);
                 }
                 // Load installed challenge packages before starting the RPC server
                 const loadedChallenges = await loadChallengesIntoPKC(mergedPkcOptions.dataPath);
                 if (loadedChallenges.length > 0)
                     console.log(`Loaded challenge packages: ${loadedChallenges.join(", ")}`);
                 daemonServer = await startDaemonServer(pkcRpcUrl, ipfsGatewayEndpoint, mergedPkcOptions);
-                usingDifferentProcessRpc = false;
                 startedOwnRpc = true;
                 console.log(`pkc rpc: listening on ${pkcRpcUrl} (local connections only)`);
                 console.log(`pkc rpc: listening on ${pkcRpcUrl}${daemonServer.rpcAuthKey} (secret auth key for remote connections)`);
@@ -401,8 +399,8 @@ export default class Daemon extends Command {
                         console.log(`WebUI (${webui.name}${desc}): http://${remoteIpAddress}:${rpcPort}${webui.endpointRemote}`);
                 }
             };
-            const isRpcPortTaken = await tcpPortUsed.check(Number(pkcRpcUrl.port), pkcRpcUrl.hostname);
-            if (!pkcOptionsFromFlag?.kuboRpcClientsOptions && !isRpcPortTaken && !usingDifferentProcessRpc)
+            // RPC port was already verified free above (fail-fast); only the kuboRpcClientsOptions branch skips local kubo.
+            if (!pkcOptionsFromFlag?.kuboRpcClientsOptions)
                 await keepKuboUp();
             await createOrConnectRpc();
             let keepKuboUpInterval;
@@ -503,7 +501,6 @@ export default class Daemon extends Command {
                     pkcRpcUrl,
                     tcpPortUsedCheck: (port, host) => tcpPortUsed.check(port, host),
                     pkcOptionsFromFlag,
-                    usingDifferentProcessRpc,
                     hasKuboProcess: !!kuboProcess,
                     hasPendingKuboStart: !!pendingKuboStart,
                     keepKuboUp,

package/dist/ipfs/startIpfs.d.ts

@@ -1,3 +1,4 @@
 import { ChildProcessWithoutNullStreams } from "child_process";
 export declare function mergeCliDefaultsIntoIpfsConfig(log: any, ipfsConfigPath: string, apiUrl: URL, gatewayUrl: URL): Promise<void>;
+export declare function _gatherChildOutput(log: any, child: ChildProcessWithoutNullStreams): Promise<null>;
 export declare function startKuboNode(apiUrl: URL, gatewayUrl: URL, dataPath: string, onSpawn?: (process: ChildProcessWithoutNullStreams) => void): Promise<ChildProcessWithoutNullStreams>;

package/dist/ipfs/startIpfs.js

@@ -64,32 +64,37 @@ export async function mergeCliDefaultsIntoIpfsConfig(log, ipfsConfigPath, apiUrl
 }
 // use this custom function instead of spawnSync for better logging
 // also spawnSync might have been causing crash on start on windows
-function _spawnAsync(log, ...args) {
+// Listens on 'close' (not 'exit') so all stderr 'data' events have been delivered
+// before we read errorMessage — otherwise on macOS a fast-exiting child can deliver
+// its exit signal before its stderr drains, producing a rejection with an empty
+// message and breaking the "configuration file already exists" suppression upstream.
+export function _gatherChildOutput(log, child) {
     return new Promise((resolve, reject) => {
-        //@ts-ignore
-        const spawedProcess = spawn(...args);
         let errorMessage = "";
-        spawedProcess.on("exit", (exitCode, signal) => {
+        child.on("close", (exitCode, signal) => {
             if (exitCode === 0)
-                resolve(null);
-            else {
-                const error = new Error(errorMessage);
-                Object.assign(error, { exitCode, pid: spawedProcess.pid, signal });
-                reject(error);
-            }
+                return resolve(null);
+            const error = new Error(errorMessage);
+            Object.assign(error, { exitCode, pid: child.pid, signal });
+            reject(error);
         });
-        spawedProcess.stderr.on("data", (data) => {
+        child.stderr.on("data", (data) => {
             log.trace(data.toString());
             errorMessage += data.toString();
         });
-        spawedProcess.stdin.on("data", (data) => log.trace(data.toString()));
-        spawedProcess.stdout.on("data", (data) => log.trace(data.toString()));
-        spawedProcess.on("error", (data) => {
+        child.stdin.on("data", (data) => log.trace(data.toString()));
+        child.stdout.on("data", (data) => log.trace(data.toString()));
+        child.on("error", (data) => {
             errorMessage += data.toString();
             log.error(data.toString());
         });
     });
 }
+function _spawnAsync(log, ...args) {
+    //@ts-ignore
+    const child = spawn(...args);
+    return _gatherChildOutput(log, child);
+}
 let cachedMultiaddrFactory;
 async function getMultiaddrFactory() {
     if (!cachedMultiaddrFactory) {

package/oclif.manifest.json

@@ -770,5 +770,5 @@
       ]
     }
   },
-  "version": "0.19.59"
+  "version": "0.19.60"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bitsocial/bitsocial-cli",
-    "version": "0.19.59",
+    "version": "0.19.60",
     "description": "Command line interface to Bitsocial API",
     "types": "./dist/index.d.ts",
     "homepage": "https://github.com/bitsocialnet/bitsocial-cli",