@xopcai/xopc 0.0.89 → 0.0.91

package/dist/src/infra/update-restart.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-restart.js","names":[],"sources":["../../../src/infra/update-restart.ts"],"sourcesContent":["/**\n * Gateway restart after xopc update — daemon, unmanaged, or in-process respawn.\n */\n\nimport { loadConfig } from '../config/loader.js';\nimport { resolveConfigPath } from '../config/paths.js';\nimport { isRestartEnabled } from '../config/commands.flags.js';\nimport { resolveGatewayService } from '../daemon/service.js';\nimport type { GatewayService } from '../daemon/types.js';\nimport {\n  findVerifiedGatewayListenerPidsOnPortSync,\n  signalVerifiedGatewayPidSync,\n} from './gateway-processes.js';\nimport { authorizeGatewaySigusr1Restart, writeGatewayRestartIntentSync } from './restart.js';\nimport { createLogger } from '../utils/logger.js';\n\nconst log = createLogger('UpdateRestart');\n\nconst DEFAULT_HEALTH_ATTEMPTS = 120;\nconst DEFAULT_HEALTH_DELAY_MS = 500;\n\nexport type UpdateRestartResult = {\n  ok: boolean;\n  mode: 'in-process' | 'daemon' | 'unmanaged' | 'skipped' | 'disabled' | 'failed';\n  message?: string;\n};\n\nexport type InProcessRestartTrigger = () => { ok: boolean; mode?: string; message?: string };\n\nexport function isRunningInsideGatewayService(\n  env: Record<string, string | undefined> = process.env,\n): boolean {\n  return env.XOPC_SERVICE_MARKER?.trim() === '1';\n}\n\nfunction resolveGatewayPort(configPath?: string): number {\n  const config = loadConfig(configPath ?? resolveConfigPath());\n  return typeof config.gateway?.port === 'number' ? config.gateway.port : 18790;\n}\n\nfunction parsePortFromArgs(programArguments: string[] | undefined): number | null {\n  if (!programArguments?.length) {\n    return null;\n  }\n  for (let i = 0; i < programArguments.length; i += 1) {\n    const arg = programArguments[i];\n    if (arg === '--port') {\n      const parsed = parseInt(String(programArguments[i + 1]), 10);\n      if (Number.isFinite(parsed) && parsed > 0) {\n        return parsed;\n      }\n    }\n    if (arg?.startsWith('--port=')) {\n      const parsed = parseInt(arg.split('=', 2)[1] ?? '', 10);\n      if (Number.isFinite(parsed) && parsed > 0) {\n        return parsed;\n      }\n    }\n  }\n  return null;\n}\n\nasync function resolveRestartPort(service: GatewayService): Promise<number> {\n  const command = await service.readCommand(process.env).catch(() => null);\n  return parsePortFromArgs(command?.programArguments) ?? resolveGatewayPort();\n}\n\nasync function waitForGatewayHealth(port: number, expectedVersion?: string): Promise<boolean> {\n  for (let attempt = 0; attempt < DEFAULT_HEALTH_ATTEMPTS; attempt += 1) {\n    try {\n      const controller = new AbortController();\n      const timeout = setTimeout(() => controller.abort(), 1500);\n      const response = await fetch(`http://127.0.0.1:${port}/api/health`, {\n        method: 'GET',\n        signal: controller.signal,\n      });\n      clearTimeout(timeout);\n      if (!response.ok) {\n        await new Promise((r) => setTimeout(r, DEFAULT_HEALTH_DELAY_MS));\n        continue;\n      }\n      if (expectedVersion) {\n        const body = (await response.json()) as { version?: string };\n        if (body.version && body.version !== expectedVersion) {\n          await new Promise((r) => setTimeout(r, DEFAULT_HEALTH_DELAY_MS));\n          continue;\n        }\n      }\n      return true;\n    } catch {\n      await new Promise((r) => setTimeout(r, DEFAULT_HEALTH_DELAY_MS));\n    }\n  }\n  return false;\n}\n\nasync function restartUnmanagedGateway(port: number, configPath?: string): Promise<UpdateRestartResult> {\n  const config = loadConfig(configPath ?? resolveConfigPath());\n  if (!isRestartEnabled(config)) {\n    return {\n      ok: false,\n      mode: 'disabled',\n      message:\n        'Gateway restart is disabled in config (commands.restart=false). Restart manually: xopc gateway restart',\n    };\n  }\n\n  const pids = findVerifiedGatewayListenerPidsOnPortSync(port).filter(\n    (pid): pid is number => Number.isFinite(pid) && pid > 0,\n  );\n  if (pids.length === 0) {\n    return {\n      ok: false,\n      mode: 'failed',\n      message: `No gateway listener found on port ${port}.`,\n    };\n  }\n  if (pids.length > 1) {\n    return {\n      ok: false,\n      mode: 'failed',\n      message: `Multiple gateway processes on port ${port}; use \"xopc gateway status\" before retrying.`,\n    };\n  }\n\n  const targetPid = pids[0];\n  if (process.platform === 'win32') {\n    writeGatewayRestartIntentSync({ targetPid });\n    signalVerifiedGatewayPidSync(targetPid, 'SIGTERM');\n  } else {\n    authorizeGatewaySigusr1Restart();\n    signalVerifiedGatewayPidSync(targetPid, 'SIGUSR1');\n  }\n\n  return {\n    ok: true,\n    mode: 'unmanaged',\n    message: `Gateway restart signal sent to process ${targetPid} on port ${port}.`,\n  };\n}\n\nasync function restartDaemonGateway(\n  service: GatewayService,\n  port: number,\n  expectedVersion?: string,\n): Promise<UpdateRestartResult> {\n  try {\n    const loaded = await service.isLoaded({ env: process.env });\n    if (!loaded) {\n      return restartUnmanagedGateway(port);\n    }\n    await service.restart({ env: process.env, stdout: process.stdout });\n    const healthy = await waitForGatewayHealth(port, expectedVersion);\n    if (!healthy) {\n      log.warn({ port, expectedVersion }, 'Gateway restart completed but health check timed out');\n      return {\n        ok: true,\n        mode: 'daemon',\n        message: 'Gateway service restarted; health check timed out (gateway may still be starting).',\n      };\n    }\n    return {\n      ok: true,\n      mode: 'daemon',\n      message: 'Gateway service restarted successfully.',\n    };\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err);\n    log.warn({ err, port }, `Daemon restart failed: ${message}`);\n    return { ok: false, mode: 'failed', message };\n  }\n}\n\nexport async function maybeRestartGatewayAfterUpdate(params: {\n  shouldRestart?: boolean;\n  expectedVersion?: string;\n  configPath?: string;\n  triggerInProcessRestart?: InProcessRestartTrigger;\n}): Promise<UpdateRestartResult> {\n  if (params.shouldRestart === false) {\n    return { ok: true, mode: 'skipped', message: 'Restart skipped (--no-restart).' };\n  }\n\n  const config = loadConfig(params.configPath ?? resolveConfigPath());\n  if (!isRestartEnabled(config)) {\n    return {\n      ok: false,\n      mode: 'disabled',\n      message:\n        'Gateway restart is disabled (commands.restart=false). Restart manually: xopc gateway restart',\n    };\n  }\n\n  if (isRunningInsideGatewayService() && params.triggerInProcessRestart) {\n    const result = params.triggerInProcessRestart();\n    if (!result.ok) {\n      return {\n        ok: false,\n        mode: 'failed',\n        message: result.message ?? 'In-process gateway restart failed.',\n      };\n    }\n    log.info({ mode: result.mode }, 'Scheduled in-process gateway restart after update');\n    return {\n      ok: true,\n      mode: 'in-process',\n      message: result.message ?? 'Gateway restart scheduled.',\n    };\n  }\n\n  const service = await resolveGatewayService();\n  const port = await resolveRestartPort(service);\n  return restartDaemonGateway(service, port, params.expectedVersion);\n}\n"],"mappings":"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"}

package/dist/src/infra/update-runner.d.ts

@@ -1,19 +1,107 @@
-import type { UpdateChannel } from './update-channels.js';
+import { createDefaultCommandRunner } from './run-command.js';
+import { type UpdateChannel } from './update-channels.js';
+import { type ExtensionPostUpdateResult } from '../extensions/update.js';
+import { type GlobalInstallManager } from './update-global.js';
+import { type InProcessRestartTrigger, type UpdateRestartResult } from './update-restart.js';
+export type UpdateStepResult = {
+    name: string;
+    command: string;
+    cwd: string;
+    durationMs: number;
+    exitCode: number | null;
+    stdoutTail?: string | null;
+    stderrTail?: string | null;
+};
+export type UpdatePostUpdateResult = {
+    extensions?: ExtensionPostUpdateResult;
+    restart?: UpdateRestartResult;
+};
+export type UpdateRunResult = {
+    status: 'ok' | 'error' | 'skipped';
+    mode: 'git' | 'pnpm' | 'npm' | 'unknown';
+    root?: string;
+    reason?: string;
+    before?: {
+        sha?: string | null;
+        version?: string | null;
+    };
+    after?: {
+        sha?: string | null;
+        version?: string | null;
+    };
+    steps: UpdateStepResult[];
+    durationMs: number;
+    postUpdate?: UpdatePostUpdateResult;
+};
+export type UpdateStepInfo = {
+    name: string;
+    command: string;
+    index: number;
+    total: number;
+};
+export type UpdateStepCompletion = UpdateStepInfo & {
+    durationMs: number;
+    exitCode: number | null;
+    stderrTail?: string | null;
+};
+export type UpdateStepProgress = {
+    onStepStart?: (step: UpdateStepInfo) => void;
+    onStepComplete?: (step: UpdateStepCompletion) => void;
+};
+export type UpdateInstallSurface = {
+    kind: 'git';
+    mode: 'git';
+    root: string;
+    packageRoot: string;
+} | {
+    kind: 'global';
+    mode: GlobalInstallManager;
+    root: string;
+    packageRoot: string;
+} | {
+    kind: 'package-root';
+    mode: 'unknown';
+    root: string;
+    packageRoot: string;
+} | {
+    kind: 'missing';
+    mode: 'unknown';
+    root?: string;
+    packageRoot?: undefined;
+};
+type UpdateRunnerOptions = {
+    cwd?: string;
+    argv1?: string;
+    channel?: UpdateChannel;
+    timeoutMs?: number;
+    progress?: UpdateStepProgress;
+    skipExtensionSync?: boolean;
+    shouldRestart?: boolean;
+    triggerInProcessRestart?: InProcessRestartTrigger;
+};
+export declare function resolveUpdateInstallSurface(opts?: Pick<UpdateRunnerOptions, 'cwd' | 'argv1' | 'timeoutMs'>): Promise<UpdateInstallSurface>;
+export declare function runGatewayUpdate(opts?: UpdateRunnerOptions): Promise<UpdateRunResult>;
+export declare function runGatewayUpdateWithPostSteps(opts?: UpdateRunnerOptions): Promise<UpdateRunResult>;
+export declare function formatUpdateApiResult(result: UpdateRunResult, channel: UpdateChannel): Record<string, unknown>;
 export type AutoUpdateResult = {
     ok: boolean;
     exitCode: number | null;
     reason?: string;
     stdout?: string;
     stderr?: string;
+    result?: UpdateRunResult;
 };
 export declare function runAutoUpdateCommand(params: {
     channel: UpdateChannel;
     root?: string | null;
     timeoutMs?: number;
+    triggerInProcessRestart?: InProcessRestartTrigger;
 }): Promise<AutoUpdateResult>;
 export declare function runAutoUpdateCommandWithProgress(params: {
     channel: UpdateChannel;
     root?: string | null;
     timeoutMs?: number;
+    triggerInProcessRestart?: InProcessRestartTrigger;
     onProgress?: (line: string, source: 'stdout' | 'stderr') => void | Promise<void>;
 }): Promise<AutoUpdateResult>;
+export { createDefaultCommandRunner };