@rezti/dsh-rez-suite 0.1.18 → 0.1.20

package/src/routes.ts

@@ -13,7 +13,7 @@ import {
   writeManagedCredential,
   type RezSystem,
 } from '@rezti/dsh-rez-sso'
-import type { RezConfig, RezMcpServerSpec } from './protocol.ts'
+import type { RezConfig, RezMcpServerSpec, RezUpdateApplyResult, RezUpdateStatus } from './protocol.ts'
 import { isRezRoleId, REZ_API } from './protocol.ts'
 import type { McpHost } from './mcp-host.ts'
 import type { TokenManager } from './token-manager.ts'
@@ -135,11 +135,16 @@ export interface RezRoutesDeps {
   host: McpHost
   tokens: TokenManager
   onCredentialWritten?: (ref: string) => void
+  selfUpdate?: {
+    status: () => Promise<RezUpdateStatus>
+    apply: () => Promise<RezUpdateApplyResult>
+    relaunch: () => void
+  }
 }
 
 /** Build every /api/dsh-rez-suite route (exact paths). */
 export function makeRoutes(deps: RezRoutesDeps): WebRoute[] {
-  const { getConfig, updateConfig, host, tokens, onCredentialWritten } = deps
+  const { getConfig, updateConfig, host, tokens, onCredentialWritten, selfUpdate } = deps
 
   const guard = (req: IncomingMessage, res: ServerResponse, method: string): boolean => {
     if (!isLoopbackRequest(req)) {
@@ -215,5 +220,28 @@ export function makeRoutes(deps: RezRoutesDeps): WebRoute[] {
         writeJson(res, 200, { ok: true })
       },
     },
+    {
+      kind: 'exact',
+      path: REZ_API.update,
+      handler: async (req, res) => {
+        const method = req.method === 'POST' ? 'POST' : 'GET'
+        if (!guard(req, res, method)) return
+        if (selfUpdate === undefined) {
+          writeJson(res, 501, { error: 'self-update is not available' })
+          return
+        }
+        try {
+          if (method === 'GET') {
+            writeJson(res, 200, await selfUpdate.status())
+            return
+          }
+          const result = await selfUpdate.apply()
+          writeJson(res, 200, result)
+          if (result.restarting) setTimeout(() => { selfUpdate.relaunch() }, 400)
+        } catch (error) {
+          writeJson(res, 502, { error: error instanceof Error ? error.message : String(error) })
+        }
+      },
+    },
   ]
 }

package/src/self-update.ts

@@ -0,0 +1,155 @@
+/**
+ * In-place upgrade of @rezti/dsh-rez-suite inside the running dsh profile.
+ * pnpm add writes the new bits; Node cannot replace an already-imported host
+ * module, so we respawn the same argv after the HTTP response flushes.
+ */
+import { spawn } from 'node:child_process'
+import { existsSync, readFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import type { RezUpdateApplyResult, RezUpdateStatus } from './protocol.ts'
+
+export const SUITE_PACKAGE = '@rezti/dsh-rez-suite'
+const NPM_LATEST = 'https://registry.npmjs.org/@rezti/dsh-rez-suite/latest'
+const PNPM_TIMEOUT_MS = 180_000
+
+export function compareVersions(left: string, right: string): number {
+  const a = left.split('.').map((part) => Number.parseInt(part, 10) || 0)
+  const b = right.split('.').map((part) => Number.parseInt(part, 10) || 0)
+  const n = Math.max(a.length, b.length)
+  for (let i = 0; i < n; i += 1) {
+    const av = a[i] ?? 0
+    const bv = b[i] ?? 0
+    if (av > bv) return 1
+    if (av < bv) return -1
+  }
+  return 0
+}
+
+export function readInstalledVersion(packageDir: string): string {
+  const raw = JSON.parse(readFileSync(join(packageDir, 'package.json'), 'utf8')) as { version?: unknown }
+  if (typeof raw.version !== 'string' || raw.version === '') throw new Error('suite package.json missing version')
+  return raw.version
+}
+
+export function findProfileDir(startDir: string): string {
+  let dir = startDir
+  for (let i = 0; i < 12; i += 1) {
+    const manifest = join(dir, 'package.json')
+    if (existsSync(manifest)) {
+      try {
+        const raw = JSON.parse(readFileSync(manifest, 'utf8')) as { dsh?: { profile?: { bundles?: unknown } } }
+        if (Array.isArray(raw.dsh?.profile?.bundles)) return dir
+      } catch {
+        // keep walking
+      }
+    }
+    const parent = dirname(dir)
+    if (parent === dir) break
+    dir = parent
+  }
+  throw new Error('cannot find dsh profile directory (no package.json with dsh.profile.bundles)')
+}
+
+export function shellQuote(value: string): string {
+  return `'${value.replaceAll("'", `'\\''`)}'`
+}
+
+export function relaunchScript(argv: string[], parentPid: number): string {
+  return `while kill -0 ${parentPid} 2>/dev/null; do sleep 0.15; done; sleep 0.25; exec ${argv.map(shellQuote).join(' ')}`
+}
+
+export async function fetchLatestVersion(fetchImpl: typeof fetch = fetch): Promise<string> {
+  const response = await fetchImpl(NPM_LATEST, { headers: { accept: 'application/json' } })
+  if (!response.ok) throw new Error(`npm registry HTTP ${response.status}`)
+  const body = await response.json() as { version?: unknown }
+  if (typeof body.version !== 'string' || body.version === '') throw new Error('npm registry missing version')
+  return body.version
+}
+
+export function runPnpmAdd(cwd: string, spec: string, env: NodeJS.ProcessEnv = process.env): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const child = spawn('pnpm', ['add', spec], { cwd, env, stdio: ['ignore', 'pipe', 'pipe'] })
+    let stderr = ''
+    child.stderr.on('data', (chunk: Buffer) => { stderr += chunk.toString() })
+    const timer = setTimeout(() => {
+      child.kill('SIGTERM')
+      reject(new Error('pnpm add timed out after 3 minutes'))
+    }, PNPM_TIMEOUT_MS)
+    child.on('error', (error) => {
+      clearTimeout(timer)
+      reject(error)
+    })
+    child.on('close', (code) => {
+      clearTimeout(timer)
+      if (code === 0) resolve()
+      else reject(new Error(stderr.trim() || `pnpm add exited ${String(code)}`))
+    })
+  })
+}
+
+export function spawnRelaunch(argv: string[], parentPid: number, cwd: string, env: NodeJS.ProcessEnv = process.env): void {
+  const child = spawn('/bin/bash', ['-c', relaunchScript(argv, parentPid)], {
+    cwd,
+    env,
+    detached: true,
+    stdio: 'ignore',
+  })
+  child.unref()
+}
+
+export interface SelfUpdateIo {
+  packageDir: string
+  fetchLatest: () => Promise<string>
+  install: (profileDir: string, spec: string) => Promise<void>
+  relaunch: () => void
+}
+
+let inflight: Promise<unknown> | undefined
+
+export function createSelfUpdate(io: SelfUpdateIo) {
+  const status = async (): Promise<RezUpdateStatus> => {
+    const installed = readInstalledVersion(io.packageDir)
+    const latest = await io.fetchLatest()
+    return {
+      package: SUITE_PACKAGE,
+      installed,
+      latest,
+      outdated: compareVersions(latest, installed) > 0,
+    }
+  }
+
+  const apply = async (): Promise<RezUpdateApplyResult> => {
+    if (inflight !== undefined) throw new Error('upgrade already running')
+    const work = (async () => {
+      const snapshot = await status()
+      if (!snapshot.outdated) {
+        return { ...snapshot, restarting: false }
+      }
+      const profileDir = findProfileDir(io.packageDir)
+      await io.install(profileDir, `${SUITE_PACKAGE}@${snapshot.latest}`)
+      return { ...snapshot, installed: snapshot.latest, outdated: false, restarting: true }
+    })()
+    inflight = work
+    try {
+      return await work
+    } finally {
+      inflight = undefined
+    }
+  }
+
+  return { status, apply, relaunch: io.relaunch }
+}
+
+export function liveSelfUpdate(): ReturnType<typeof createSelfUpdate> {
+  const packageDir = dirname(fileURLToPath(new URL('.', import.meta.url)))
+  return createSelfUpdate({
+    packageDir,
+    fetchLatest: () => fetchLatestVersion(),
+    install: (profileDir, spec) => runPnpmAdd(profileDir, spec),
+    relaunch: () => {
+      spawnRelaunch(process.argv, process.pid, process.cwd())
+      setTimeout(() => { process.exit(0) }, 50)
+    },
+  })
+}