happy-stacks 0.2.0 → 0.4.0

package/scripts/setup.mjs

@@ -1,111 +1,44 @@
-import './utils/env.mjs';
+import './utils/env/env.mjs';
 import { spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { parseArgs } from './utils/cli/args.mjs';
 import { printResult, wantsHelp, wantsJson } from './utils/cli/cli.mjs';
-import { getRootDir, resolveStackEnvPath } from './utils/paths.mjs';
+import { getRootDir, resolveStackEnvPath } from './utils/paths/paths.mjs';
 import { isTty, promptSelect, withRl } from './utils/cli/wizard.mjs';
-import { getCanonicalHomeDir } from './utils/config.mjs';
-import { ensureEnvLocalUpdated } from './utils/env_local.mjs';
-import { run, runCapture } from './utils/proc.mjs';
-import { fetchHappyHealth } from './utils/server.mjs';
+import { getCanonicalHomeDir } from './utils/env/config.mjs';
+import { ensureEnvLocalUpdated } from './utils/env/env_local.mjs';
+import { run, runCapture } from './utils/proc/proc.mjs';
+import { waitForHappyHealthOk } from './utils/server/server.mjs';
 import { tailscaleServeEnable, tailscaleServeHttpsUrlForInternalServerUrl } from './tailscale.mjs';
-import { getRuntimeDir } from './utils/runtime.mjs';
+import { getRuntimeDir } from './utils/paths/runtime.mjs';
 import { readFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
-import { parseDotenv } from './utils/dotenv.mjs';
 import { installService } from './service.mjs';
-import { getDevAuthKeyPath } from './utils/dev_auth_key.mjs';
-import { isSandboxed, sandboxAllowsGlobalSideEffects } from './utils/sandbox.mjs';
-
-function boolFromFlagsOrKv({ flags, kv, onFlag, offFlag, key, defaultValue }) {
-  if (flags.has(offFlag)) return false;
-  if (flags.has(onFlag)) return true;
-  if (key && kv.has(key)) {
-    const raw = String(kv.get(key) ?? '').trim().toLowerCase();
-    if (raw === '1' || raw === 'true' || raw === 'yes' || raw === 'y') return true;
-    if (raw === '0' || raw === 'false' || raw === 'no' || raw === 'n') return false;
-  }
-  return defaultValue;
-}
-
-function normalizeProfile(raw) {
-  const v = (raw ?? '').trim().toLowerCase();
-  if (!v) return '';
-  if (v === 'selfhost' || v === 'self-host' || v === 'self_host' || v === 'host') return 'selfhost';
-  if (v === 'dev' || v === 'developer' || v === 'develop') return 'dev';
-  return '';
-}
-
-function normalizeServer(raw) {
-  const v = (raw ?? '').trim().toLowerCase();
-  if (!v) return '';
-  if (v === 'light' || v === 'server-light' || v === 'happy-server-light') return 'happy-server-light';
-  if (v === 'server' || v === 'full' || v === 'happy-server') return 'happy-server';
-  return '';
-}
-
-function boolFromFlags({ flags, onFlag, offFlag, defaultValue }) {
-  if (flags.has(offFlag)) return false;
-  if (flags.has(onFlag)) return true;
-  return defaultValue;
-}
-
-async function commandExists(cmd) {
-  try {
-    const out = (await runCapture('sh', ['-lc', `command -v ${cmd} >/dev/null 2>&1 && echo yes || echo no`])).trim();
-    return out === 'yes';
-  } catch {
-    return false;
-  }
-}
-
-async function openUrl(url) {
-  const u = String(url ?? '').trim();
-  if (!u) return false;
-  if (process.platform === 'darwin') {
-    await run('open', [u]).catch(() => {});
-    return true;
-  }
-  if (process.platform === 'linux') {
-    if (await commandExists('xdg-open')) {
-      await run('xdg-open', [u]).catch(() => {});
-      return true;
-    }
-    return false;
-  }
-  return false;
-}
-
-async function waitForHealthOk(internalServerUrl, { timeoutMs = 60_000 } = {}) {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    // eslint-disable-next-line no-await-in-loop
-    const health = await fetchHappyHealth(internalServerUrl);
-    if (health.ok) {
-      return true;
-    }
-    // eslint-disable-next-line no-await-in-loop
-    await new Promise((r) => setTimeout(r, 300));
-  }
-  return false;
-}
-
-function parseEnvFileText(text) {
+import { getDevAuthKeyPath } from './utils/auth/dev_key.mjs';
+import { isSandboxed, sandboxAllowsGlobalSideEffects } from './utils/env/sandbox.mjs';
+import { boolFromFlags, boolFromFlagsOrKv } from './utils/cli/flags.mjs';
+import { normalizeProfile, normalizeServerComponent } from './utils/cli/normalize.mjs';
+import { openUrlInBrowser } from './utils/ui/browser.mjs';
+import { commandExists } from './utils/proc/commands.mjs';
+import { readEnvValueFromFile } from './utils/env/read.mjs';
+import { readServerPortFromEnvFile, resolveServerPortFromEnv } from './utils/server/port.mjs';
+import { guidedStackWebSignupThenLogin } from './utils/auth/guided_stack_web_login.mjs';
+
+async function resolveMainWebappUrlForAuth({ rootDir, port }) {
   try {
-    return parseDotenv(text ?? '');
-  } catch {
-    return new Map();
-  }
-}
-
-async function readEnvValueFromFile(envPath, key) {
-  try {
-    if (!envPath || !existsSync(envPath)) return '';
-    const raw = await readFile(envPath, 'utf-8');
-    const parsed = parseEnvFileText(raw);
-    return (parsed.get(key) ?? '').trim();
+    const raw = await runCapture(process.execPath, [join(rootDir, 'scripts', 'auth.mjs'), 'login', '--print', '--json'], {
+      cwd: rootDir,
+      env: {
+        ...process.env,
+        HAPPY_STACKS_SERVER_PORT: String(port),
+        HAPPY_LOCAL_SERVER_PORT: String(port),
+      },
+    });
+    const parsed = JSON.parse(String(raw ?? '').trim());
+    const cmd = typeof parsed?.cmd === 'string' ? parsed.cmd : '';
+    const m = cmd.match(/HAPPY_WEBAPP_URL="([^"]+)"/);
+    return m?.[1] ? String(m[1]) : '';
   } catch {
     return '';
   }
@@ -116,33 +49,28 @@ async function resolveMainServerPort() {
   // - explicit env var
   // - main stack env file (preferred)
   // - default
-  const fromEnv =
-    (process.env.HAPPY_LOCAL_SERVER_PORT ?? process.env.HAPPY_STACKS_SERVER_PORT ?? '').toString().trim();
-  if (fromEnv) {
-    const n = Number(fromEnv);
-    return Number.isFinite(n) && n > 0 ? n : 3005;
+  const hasEnvOverride =
+    (process.env.HAPPY_STACKS_SERVER_PORT ?? process.env.HAPPY_LOCAL_SERVER_PORT ?? '').toString().trim() !== '';
+  if (hasEnvOverride) {
+    return resolveServerPortFromEnv({ env: process.env, defaultPort: 3005 });
   }
   const envPath = resolveStackEnvPath('main').envPath;
-  const v =
-    (await readEnvValueFromFile(envPath, 'HAPPY_LOCAL_SERVER_PORT')) ||
-    (await readEnvValueFromFile(envPath, 'HAPPY_STACKS_SERVER_PORT')) ||
-    '';
-  if (v) {
-    const n = Number(v);
-    return Number.isFinite(n) && n > 0 ? n : 3005;
-  }
-  return 3005;
+  return await readServerPortFromEnvFile(envPath, { defaultPort: 3005 });
 }
 
 async function ensureSetupConfigPersisted({ rootDir, profile, serverComponent, tailscaleWanted, menubarMode }) {
+  const repoSourceForProfile =
+    profile === 'selfhost' ? (serverComponent === 'happy-server-light' ? 'forks' : 'upstream') : null;
   const updates = [
     { key: 'HAPPY_STACKS_SERVER_COMPONENT', value: serverComponent },
     { key: 'HAPPY_LOCAL_SERVER_COMPONENT', value: serverComponent },
-    // Default for selfhost: upstream.
-    ...(profile === 'selfhost'
+    // Default for selfhost:
+    // - full server: upstream (slopus/*)
+    // - server-light: forks (sqlite server-light is not available upstream today)
+    ...(repoSourceForProfile
       ? [
-          { key: 'HAPPY_STACKS_REPO_SOURCE', value: 'upstream' },
-          { key: 'HAPPY_LOCAL_REPO_SOURCE', value: 'upstream' },
+          { key: 'HAPPY_STACKS_REPO_SOURCE', value: repoSourceForProfile },
+          { key: 'HAPPY_LOCAL_REPO_SOURCE', value: repoSourceForProfile },
         ]
       : []),
     { key: 'HAPPY_STACKS_MENUBAR_MODE', value: menubarMode },
@@ -393,8 +321,8 @@ async function cmdSetup({ rootDir, argv }) {
   const supportsAutostart = platform === 'darwin' || platform === 'linux';
   const supportsMenubar = platform === 'darwin';
 
-  const serverFromArg = normalizeServer(kv.get('--server'));
-  let serverComponent = serverFromArg || normalizeServer(process.env.HAPPY_STACKS_SERVER_COMPONENT) || 'happy-server-light';
+  const serverFromArg = normalizeServerComponent(kv.get('--server'));
+  let serverComponent = serverFromArg || normalizeServerComponent(process.env.HAPPY_STACKS_SERVER_COMPONENT) || 'happy-server-light';
   if (profile === 'selfhost' && interactive && !serverFromArg) {
     serverComponent = await withRl(async (rl) => {
       const picked = await promptSelect(rl, {
@@ -606,10 +534,11 @@ async function cmdSetup({ rootDir, argv }) {
     }
   } else {
     // Selfhost setup: run non-interactively and keep it simple.
+    const repoFlag = serverComponent === 'happy-server-light' ? '--forks' : '--upstream';
     await runNodeScript({
       rootDir,
       rel: 'scripts/install.mjs',
-      args: [`--server=${serverComponent}`, '--upstream'],
+      args: [`--server=${serverComponent}`, repoFlag],
     });
   }
 
@@ -645,12 +574,12 @@ async function cmdSetup({ rootDir, argv }) {
         // eslint-disable-next-line no-console
         console.log(res.enableUrl);
         // Best-effort open
-        await openUrl(res.enableUrl);
+        await openUrlInBrowser(res.enableUrl).catch(() => {});
       }
     } catch (e) {
       // eslint-disable-next-line no-console
       console.log('[setup] tailscale not available. Install it from: https://tailscale.com/download');
-      await openUrl('https://tailscale.com/download');
+      await openUrlInBrowser('https://tailscale.com/download').catch(() => {});
     }
   }
 
@@ -664,7 +593,7 @@ async function cmdSetup({ rootDir, argv }) {
       await spawnDetachedNodeScript({ rootDir, rel: 'scripts/run.mjs', args: [] });
     }
 
-    const ready = await waitForHealthOk(internalServerUrl, { timeoutMs: 90_000 });
+    const ready = await waitForHappyHealthOk(internalServerUrl, { timeoutMs: 90_000 });
     if (!ready) {
       // eslint-disable-next-line no-console
       console.log(`[setup] started, but server did not become healthy yet: ${internalServerUrl}`);
@@ -688,46 +617,20 @@ async function cmdSetup({ rootDir, argv }) {
         // eslint-disable-next-line no-console
         console.log('[setup] auth: already configured (access.key exists)');
       } else {
-        // Before starting an interactive login, offer the best available shortcut in this order:
-        // For selfhost profile:
-        // - prefer reusing legacy ~/.happy creds if present (maintainers often already have a local install)
-        // - otherwise, run the normal login flow
-        let reused = false;
         if (interactive) {
-          const legacyAccessKey = join(homedir(), '.happy', 'cli', 'access.key');
-          const allowLegacy = !isSandboxed() || sandboxAllowsGlobalSideEffects();
-          const hasLegacy = allowLegacy && existsSync(legacyAccessKey);
-
-          if (hasLegacy) {
-            const options = [];
-            if (hasLegacy) {
-              options.push({ label: 'reuse legacy ~/.happy (symlink; stays up to date)', value: 'legacy-link' });
-              options.push({ label: 'reuse legacy ~/.happy (copy; more isolated)', value: 'legacy-copy' });
-            }
-            options.push({ label: 'do login flow instead', value: 'login' });
-
-            const choice = await withRl(async (rl) => {
-              return await promptSelect(rl, {
-                title:
-                  'We found existing credentials on this machine. How should Happy Stacks main authenticate?',
-                options,
-                defaultIndex: 0,
-              });
-            });
-
-            if (choice === 'legacy-link') {
-              await runNodeScript({ rootDir, rel: 'scripts/auth.mjs', args: ['copy-from', 'legacy', '--allow-main', '--link'] });
-              reused = existsSync(accessKey);
-            } else if (choice === 'legacy-copy') {
-              await runNodeScript({ rootDir, rel: 'scripts/auth.mjs', args: ['copy-from', 'legacy', '--allow-main'] });
-              reused = existsSync(accessKey);
-            }
-          }
-        }
-
-        if (!reused) {
-          await runNodeScript({ rootDir, rel: 'scripts/auth.mjs', args: ['login', `--context=${ctx}`] });
+          const webappUrl = await resolveMainWebappUrlForAuth({ rootDir, port });
+          await guidedStackWebSignupThenLogin({ webappUrl, stackName: 'main' });
         }
+        await runNodeScript({
+          rootDir,
+          rel: 'scripts/auth.mjs',
+          args: ['login', `--context=${ctx}`, '--quiet'],
+          env: {
+            ...process.env,
+            HAPPY_STACKS_SERVER_PORT: String(port),
+            HAPPY_LOCAL_SERVER_PORT: String(port),
+          },
+        });
 
         if (!existsSync(accessKey)) {
           // eslint-disable-next-line no-console
@@ -742,7 +645,7 @@ async function cmdSetup({ rootDir, argv }) {
       console.log('[setup] tip: when you are ready, authenticate with: happys auth login');
     }
 
-    await openUrl(openTarget);
+    await openUrlInBrowser(openTarget).catch(() => {});
     // eslint-disable-next-line no-console
     console.log(`[setup] open: ${openTarget}`);
   }