@fyresmith/hive-server 2.1.0 → 2.3.0

package/README.md

@@ -127,8 +127,11 @@ Diagnostics:
 ```bash
 hive doctor
 hive status
+hive update
 ```
 
+`hive update` installs the latest npm release for the current package and then restarts the Hive OS service and cloudflared service when they are installed.
+
 ## Migration Notes
 
 On first `hive setup`, if legacy `server/.env` exists and no `~/.hive/config.json` exists, setup will offer to import legacy env values.

package/cli/main.js

@@ -1,6 +1,8 @@
 import { existsSync } from 'fs';
-import { access } from 'fs/promises';
+import { access, readFile } from 'fs/promises';
 import { constants as fsConstants } from 'fs';
+import { homedir } from 'os';
+import { join } from 'path';
 import process from 'process';
 import { Command, CommanderError } from 'commander';
 import prompts from 'prompts';
@@ -26,11 +28,12 @@ import {
   writeEnvFile,
 } from './env-file.js';
 import { isPortAvailable, pathExists, validateDomain } from './checks.js';
-import { run } from './exec.js';
+import { run, runInherit } from './exec.js';
 import {
   cloudflaredServiceStatus,
   installCloudflaredService,
   runTunnelForeground,
+  restartCloudflaredServiceIfInstalled,
   setupTunnel,
   tunnelStatus,
   getCloudflaredPath,
@@ -85,6 +88,54 @@ function resolveServiceConfig(config) {
   };
 }
 
+async function loadPackageMeta() {
+  const raw = await readFile(new URL('../package.json', import.meta.url), 'utf-8');
+  const parsed = JSON.parse(raw);
+  const name = String(parsed?.name ?? '').trim();
+  const version = String(parsed?.version ?? '').trim() || 'unknown';
+  if (!name) {
+    throw new CliError('Could not resolve package name from package.json', EXIT.FAIL);
+  }
+  return { name, version };
+}
+
+function isHiveServiceInstalled({ servicePlatform, serviceName }) {
+  if (servicePlatform === 'launchd') {
+    return existsSync(join(homedir(), 'Library', 'LaunchAgents', `${serviceName}.plist`));
+  }
+  return existsSync(`/etc/systemd/system/${serviceName}.service`);
+}
+
+async function runUpdateFlow(options = {}) {
+  section('Hive Update');
+
+  const { config } = await resolveContext({});
+  const pkg = await loadPackageMeta();
+  const packageName = requiredOrFallback(options.package, pkg.name);
+  const hiveService = resolveServiceConfig(config);
+
+  info(`Current CLI version: ${pkg.version}`);
+  info(`Updating ${packageName} from npm (latest)`);
+  await runInherit('npm', ['install', '-g', `${packageName}@latest`]);
+  success(`Installed latest ${packageName}`);
+
+  if (isHiveServiceInstalled(hiveService)) {
+    info(`Restarting Hive service: ${hiveService.serviceName}`);
+    await restartHiveService(hiveService);
+    success('Hive service restarted');
+  } else {
+    info(`Hive service not installed: ${hiveService.serviceName}`);
+  }
+
+  info('Restarting cloudflared service if installed');
+  const tunnelRestart = await restartCloudflaredServiceIfInstalled();
+  if (tunnelRestart.installed) {
+    success('cloudflared service restarted');
+  } else {
+    info('cloudflared service not installed');
+  }
+}
+
 async function loadValidatedEnv(envFile, { requireFile = true } = {}) {
   if (requireFile && !existsSync(envFile)) {
     throw new CliError(`Env file not found: ${envFile}. Run: hive env init`, EXIT.FAIL);
@@ -645,6 +696,12 @@ function registerRootCommands(program) {
     .option('--yes', 'non-interactive mode', false)
     .action(runSetupWizard);
 
+  program
+    .command('update')
+    .description('Update Hive from npm and restart installed services')
+    .option('--package <name>', 'npm package override')
+    .action(runUpdateFlow);
+
   program
     .command('doctor')
     .description('Run prerequisite and configuration checks')
@@ -703,6 +760,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 +772,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 +788,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

@@ -160,11 +160,65 @@ export async function installCloudflaredService() {
   await runInherit('sudo', ['cloudflared', 'service', 'install']);
 }
 
+function isMissingCloudflaredService(output) {
+  const text = String(output ?? '').toLowerCase();
+  return (
+    text.includes('could not find service')
+    || text.includes('service does not exist')
+    || text.includes('unit cloudflared.service not found')
+    || text.includes('could not be found')
+    || text.includes('not loaded')
+    || text.includes('no such file or directory')
+  );
+}
+
+export async function restartCloudflaredServiceIfInstalled() {
+  const platform = detectPlatform();
+
+  try {
+    if (platform === 'darwin') {
+      await runInherit('sudo', ['launchctl', 'kickstart', '-k', 'system/com.cloudflare.cloudflared']);
+    } else {
+      await runInherit('sudo', ['systemctl', 'restart', 'cloudflared']);
+    }
+    return { installed: true, restarted: true };
+  } catch (err) {
+    const output = [
+      err?.stdout,
+      err?.stderr,
+      err?.shortMessage,
+      err?.message,
+    ]
+      .filter(Boolean)
+      .join('\n');
+    if (isMissingCloudflaredService(output)) {
+      return { installed: false, restarted: false };
+    }
+    throw err;
+  }
+}
+
 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.1.0",
+  "version": "2.3.0",
   "type": "module",
   "description": "Collaborative Obsidian vault server",
   "main": "index.js",
@@ -31,6 +31,7 @@
     "test": "npm run verify"
   },
   "dependencies": {
+    "@fyresmith/hive-server": "^2.2.0",
     "chalk": "^5.6.2",
     "chokidar": "^3.6.0",
     "commander": "^13.1.0",