@fyresmith/hive-server 2.0.2-beta.0 → 2.2.0

package/cli/main.js

@@ -703,6 +703,11 @@ export async function runCli(argv = process.argv) {
   registerTunnelCommands(program);
   registerServiceCommands(program);
 
+  if ((argv?.length ?? 0) <= 2) {
+    program.outputHelp();
+    return EXIT.OK;
+  }
+
   program.exitOverride();
 
   try {
@@ -710,7 +715,13 @@ export async function runCli(argv = process.argv) {
     return EXIT.OK;
   } catch (err) {
     if (err instanceof CommanderError) {
-      if (err.code === 'commander.helpDisplayed') return EXIT.OK;
+      if (
+        err.code === 'commander.helpDisplayed'
+        || err.code === 'commander.help'
+        || err.message === '(outputHelp)'
+      ) {
+        return EXIT.OK;
+      }
       throw new CliError(err.message, err.exitCode ?? EXIT.FAIL);
     }
     throw err;
@@ -720,7 +731,7 @@ export async function runCli(argv = process.argv) {
 export async function runCliOrExit(argv = process.argv) {
   try {
     const code = await runCli(argv);
-    process.exit(code);
+    process.exitCode = code;
   } catch (err) {
     const exitCode = err instanceof CliError ? err.exitCode : EXIT.FAIL;
     const message = err instanceof Error ? err.message : String(err);

package/cli/tunnel.js

@@ -163,8 +163,24 @@ export async function installCloudflaredService() {
 export async function cloudflaredServiceStatus() {
   const platform = detectPlatform();
   if (platform === 'darwin') {
-    const { stdout } = await run('launchctl', ['list']);
-    return stdout.includes('cloudflared');
+    const userList = await run('launchctl', ['list']).catch(() => ({ stdout: '' }));
+    if (userList.stdout.toLowerCase().includes('cloudflared')) {
+      return true;
+    }
+
+    const systemLabel = 'com.cloudflare.cloudflared';
+    const systemPrint = await run('launchctl', ['print', `system/${systemLabel}`])
+      .catch((err) => ({ stdout: err?.stdout ?? '', stderr: err?.stderr ?? '' }));
+    const combined = `${systemPrint.stdout}\n${systemPrint.stderr}`.toLowerCase();
+    if (
+      combined
+      && !combined.includes('could not find service')
+      && !combined.includes('service does not exist')
+    ) {
+      return true;
+    }
+
+    return existsSync('/Library/LaunchDaemons/com.cloudflare.cloudflared.plist');
   }
   const { stdout } = await run('systemctl', ['is-active', 'cloudflared']);
   return stdout.trim() === 'active';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fyresmith/hive-server",
-  "version": "2.0.2-beta.0",
+  "version": "2.2.0",
   "type": "module",
   "description": "Collaborative Obsidian vault server",
   "main": "index.js",