@nocobase/cli 2.1.0-beta.8 → 2.2.0-alpha.1

package/dist/lib/app-health.js

@@ -0,0 +1,139 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { buildLocalApiBaseUrl, buildLocalAppUrl } from './app-public-path.js';
+import { startDockerLogFollower } from './docker-log-stream.js';
+import { printInfo } from './ui.js';
+const APP_HEALTH_CHECK_INTERVAL_MS = 2_000;
+const APP_HEALTH_CHECK_TIMEOUT_MS = 600_000;
+const APP_HEALTH_CHECK_REQUEST_TIMEOUT_MS = 5_000;
+const APP_HEALTH_CHECK_PROGRESS_LOG_INTERVAL_MS = 10_000;
+function trimValue(value) {
+    return String(value ?? '').trim();
+}
+function buildHealthCheckUrl(apiBaseUrl) {
+    return `${apiBaseUrl.replace(/\/+$/, '')}/__health_check`;
+}
+async function sleep(ms) {
+    await new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function requestAppHealthCheck(params) {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => {
+        controller.abort();
+    }, params.requestTimeoutMs ?? APP_HEALTH_CHECK_REQUEST_TIMEOUT_MS);
+    try {
+        const response = await (params.fetchImpl ?? fetch)(params.healthCheckUrl, {
+            method: 'GET',
+            signal: controller.signal,
+        });
+        const text = await response.text().catch(() => '');
+        const body = text.replace(/\s+/g, ' ').trim() || 'No response yet';
+        return {
+            ok: response.ok && text.trim().toLowerCase() === 'ok',
+            message: `HTTP ${response.status}: ${body}`,
+        };
+    }
+    catch (error) {
+        if (error instanceof Error && error.name === 'AbortError') {
+            return {
+                ok: false,
+                message: `No response within ${Math.ceil((params.requestTimeoutMs ?? APP_HEALTH_CHECK_REQUEST_TIMEOUT_MS) / 1000)}s`,
+            };
+        }
+        return {
+            ok: false,
+            message: error instanceof Error ? error.message : String(error),
+        };
+    }
+    finally {
+        clearTimeout(timeout);
+    }
+}
+export class AppHealthCheckError extends Error {
+}
+export function formatAppUrl(port, appPublicPath) {
+    return buildLocalAppUrl(port, appPublicPath);
+}
+export function resolveManagedAppApiBaseUrl(runtime, options) {
+    const override = trimValue(options?.portOverride);
+    if (override) {
+        return buildLocalApiBaseUrl(override, runtime.env.config?.appPublicPath);
+    }
+    const baseUrl = trimValue(runtime.env.baseUrl);
+    if (baseUrl) {
+        return baseUrl.replace(/\/+$/, '');
+    }
+    const appPort = runtime.env.appPort === undefined || runtime.env.appPort === null
+        ? ''
+        : trimValue(runtime.env.appPort);
+    return buildLocalApiBaseUrl(appPort, runtime.env.config?.appPublicPath);
+}
+export async function isAppReady(apiBaseUrl, options) {
+    const baseUrl = trimValue(apiBaseUrl);
+    if (!baseUrl) {
+        return false;
+    }
+    const result = await requestAppHealthCheck({
+        healthCheckUrl: buildHealthCheckUrl(baseUrl),
+        fetchImpl: options?.fetchImpl,
+        requestTimeoutMs: options?.requestTimeoutMs,
+    });
+    return result.ok;
+}
+export async function waitForAppReady(params) {
+    const apiBaseUrl = trimValue(params.apiBaseUrl);
+    if (!apiBaseUrl) {
+        printInfo(`Skipping health check for "${params.envName}" because no local API URL is saved for this env.`);
+        return;
+    }
+    const healthCheckUrl = buildHealthCheckUrl(apiBaseUrl);
+    const startedAt = Date.now();
+    const timeoutMs = params.timeoutMs ?? APP_HEALTH_CHECK_TIMEOUT_MS;
+    const intervalMs = params.intervalMs ?? APP_HEALTH_CHECK_INTERVAL_MS;
+    const progressLogIntervalMs = Math.max(1, params.progressLogIntervalMs ?? APP_HEALTH_CHECK_PROGRESS_LOG_INTERVAL_MS);
+    let lastMessage = 'No response yet';
+    let nextProgressLogAt = startedAt + progressLogIntervalMs;
+    printInfo(`Waiting for NocoBase to become ready for "${params.envName}"...`);
+    const dockerLogFollower = params.verbose && params.containerName ? startDockerLogFollower(params.containerName) : undefined;
+    try {
+        while (Date.now() - startedAt < timeoutMs) {
+            const result = await requestAppHealthCheck({
+                healthCheckUrl,
+                fetchImpl: params.fetchImpl,
+                requestTimeoutMs: params.requestTimeoutMs,
+            });
+            if (result.ok) {
+                return;
+            }
+            lastMessage = result.message;
+            const now = Date.now();
+            if (now >= nextProgressLogAt) {
+                const elapsedSeconds = Math.max(1, Math.floor((now - startedAt) / 1000));
+                printInfo(`Still waiting for "${params.envName}"... (${elapsedSeconds}s elapsed)`);
+                while (nextProgressLogAt <= now) {
+                    nextProgressLogAt += progressLogIntervalMs;
+                }
+            }
+            const remainingMs = timeoutMs - (Date.now() - startedAt);
+            if (remainingMs <= 0) {
+                break;
+            }
+            await sleep(Math.min(intervalMs, remainingMs));
+        }
+        const hints = [
+            params.logHint,
+            params.containerName ? `docker logs ${params.containerName}` : undefined,
+        ].filter(Boolean);
+        const hintText = hints.length > 0 ? ` ${hints.join(' ')}` : '';
+        throw new AppHealthCheckError(`NocoBase did not become ready in time for "${params.envName}". Expected \`${healthCheckUrl}\` to respond with \`ok\`, but the last status was: ${lastMessage}.${hintText}`);
+    }
+    finally {
+        await dockerLogFollower?.stop();
+    }
+}

package/dist/lib/app-managed-resources.js

@@ -0,0 +1,337 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { mkdir, readdir } from 'node:fs/promises';
+import { resolveAppPublicPath } from './app-public-path.js';
+import { dockerContainerExists, managedAppLifecycleEnvVars, runLocalNocoBaseCommand, startDockerContainer, } from './app-runtime.js';
+import { deriveBuiltinDbConnection, resolveBuiltinDbConnection } from './builtin-db.js';
+import { resolveConfiguredStoragePath } from './env-paths.js';
+import { resolveDockerEnvFileArg } from "./docker-env-file.js";
+import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "./docker-image.js";
+import { commandSucceeds, ensureDockerDaemonRunning, run } from './run-npm.js';
+import Install from '../commands/install.js';
+const DOCKER_APP_STORAGE_DESTINATION = '/app/nocobase/storage';
+function commandStdio(verbose) {
+    return verbose ? 'inherit' : 'ignore';
+}
+async function ensureDockerNetwork(networkName) {
+    await ensureDockerDaemonRunning('prepare Docker resources for this environment');
+    if (await commandSucceeds('docker', ['network', 'inspect', networkName])) {
+        return;
+    }
+    await run('docker', ['network', 'create', networkName], {
+        errorName: 'docker network create',
+    });
+}
+function localSourceLabel(source) {
+    return source === 'git' ? 'Git checkout' : 'npm app';
+}
+function trimValue(value) {
+    return String(value ?? '').trim();
+}
+function pushOptionalEnvArg(args, key, value) {
+    if (typeof value === 'string') {
+        if (!value) {
+            return;
+        }
+        args.push('-e', `${key}=${value}`);
+        return;
+    }
+    if (typeof value === 'boolean') {
+        args.push('-e', `${key}=${String(value)}`);
+    }
+}
+function resolveDockerClientAssetsExtractEnabled(envValue) {
+    const text = trimValue(envValue).toLowerCase();
+    if (!text) {
+        return true;
+    }
+    if (['0', 'false', 'no', 'off'].includes(text)) {
+        return false;
+    }
+    return true;
+}
+function normalizeDockerPlatform(value) {
+    const text = trimValue(value);
+    if (!text || text === 'auto') {
+        return undefined;
+    }
+    if (text === 'linux/amd64' || text === 'linux/arm64') {
+        return text;
+    }
+    return undefined;
+}
+function formatBuiltinDbFailure(envName, message) {
+    return [
+        `Couldn't restore the built-in database for "${envName}".`,
+        'Check the saved database settings, local storage path, and Docker runtime, then try again.',
+        `Details: ${message}`,
+    ].join('\n');
+}
+function formatLocalSourceRestoreFailure(envName, source, message) {
+    const sourceLabel = source === 'git' ? 'the saved Git checkout' : 'the saved npm app';
+    return [
+        `Couldn't restore NocoBase files for "${envName}".`,
+        `The CLI was not able to download ${sourceLabel} before starting the app again.`,
+        'Check the saved source settings for this env, then try again.',
+        `Details: ${message}`,
+    ].join('\n');
+}
+function formatLocalPostinstallFailure(envName, message) {
+    return [
+        `Couldn't prepare NocoBase for "${envName}".`,
+        'The CLI was not able to run `nocobase-v1 postinstall` before starting the local app.',
+        'Check the local dependencies, storage path, and saved env settings, then try again.',
+        `Details: ${message}`,
+    ].join('\n');
+}
+function formatSavedDockerSettingsIncomplete(envName, missing) {
+    return [
+        `Can't start NocoBase for "${envName}" yet.`,
+        `The saved Docker settings for this env are incomplete. Missing: ${missing.join(', ')}.`,
+        `Re-run \`nb init --ui --env ${envName}\` to refresh this env config, then try again.`,
+    ].join('\n');
+}
+function formatDockerAppRecreateFailure(envName, message) {
+    return [
+        `Couldn't start NocoBase for "${envName}".`,
+        'The CLI was not able to recreate the saved Docker app container successfully.',
+        'Check the saved Docker image, container settings, and database connection, then try again.',
+        `Details: ${message}`,
+    ].join('\n');
+}
+async function localProjectHasFiles(projectRoot) {
+    try {
+        const entries = await readdir(projectRoot);
+        return entries.length > 0;
+    }
+    catch (_error) {
+        return false;
+    }
+}
+export async function buildSavedDockerRunArgs(runtime, options) {
+    const config = runtime.env.config ?? {};
+    const storagePath = trimValue(resolveConfiguredStoragePath(config));
+    const envFile = await resolveDockerEnvFileArg(runtime.envName, config);
+    const appPort = runtime.env.appPort === undefined || runtime.env.appPort === null
+        ? ''
+        : trimValue(runtime.env.appPort);
+    const appKey = trimValue(config.appKey);
+    const appPublicPath = trimValue(config.appPublicPath);
+    const timeZone = trimValue(config.timezone) || Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC';
+    const builtinDbConnection = config.builtinDb ? deriveBuiltinDbConnection(runtime) : undefined;
+    const dbDialect = builtinDbConnection?.dbDialect || trimValue(config.dbDialect);
+    const dbHost = builtinDbConnection?.dbHost || trimValue(config.dbHost);
+    const dbPort = builtinDbConnection?.dbPort || trimValue(config.dbPort);
+    const dbDatabase = trimValue(config.dbDatabase);
+    const dbUser = trimValue(config.dbUser);
+    const dbPassword = trimValue(config.dbPassword);
+    const dbSchema = trimValue(config.dbSchema);
+    const dbTablePrefix = trimValue(config.dbTablePrefix);
+    const dbUnderscored = typeof config.dbUnderscored === 'boolean' ? config.dbUnderscored : undefined;
+    const extractClientAssets = resolveDockerClientAssetsExtractEnabled(process.env.NOCOBASE_EXTRACT_CLIENT_ASSETS);
+    const dockerRegistry = trimValue(config.dockerRegistry) || DEFAULT_DOCKER_REGISTRY;
+    const version = trimValue(config.downloadVersion) || DEFAULT_DOCKER_VERSION;
+    const imageRef = resolveDockerImageRef(dockerRegistry, version, {
+        defaultRegistry: DEFAULT_DOCKER_REGISTRY,
+        defaultVersion: DEFAULT_DOCKER_VERSION,
+    });
+    const missing = [];
+    if (!storagePath) {
+        missing.push('storagePath');
+    }
+    if (!appKey) {
+        missing.push('appKey');
+    }
+    if (!dbDialect) {
+        missing.push('dbDialect');
+    }
+    if (!dbHost) {
+        missing.push('dbHost');
+    }
+    if (!dbPort) {
+        missing.push('dbPort');
+    }
+    if (!dbDatabase) {
+        missing.push('dbDatabase');
+    }
+    if (!dbUser) {
+        missing.push('dbUser');
+    }
+    if (!dbPassword) {
+        missing.push('dbPassword');
+    }
+    if (missing.length > 0) {
+        throw new Error(formatSavedDockerSettingsIncomplete(runtime.envName, missing));
+    }
+    const args = [
+        'run',
+        '-d',
+        '--name',
+        runtime.containerName,
+        '--restart',
+        'always',
+        '--network',
+        runtime.workspaceName,
+    ];
+    const dockerPlatform = normalizeDockerPlatform(config.dockerPlatform);
+    if (dockerPlatform) {
+        args.push('--platform', dockerPlatform);
+    }
+    if (appPort) {
+        args.push('-p', `${appPort}:80`);
+    }
+    if (envFile) {
+        args.push('--env-file', envFile);
+    }
+    for (const [key, value] of Object.entries(options?.initEnvVars ?? {})) {
+        args.push('-e', `${key}=${value}`);
+    }
+    const lifecycleEnvVars = managedAppLifecycleEnvVars();
+    args.push('-e', `APP_ENV=${lifecycleEnvVars.APP_ENV}`, '-e', `NODE_ENV=${lifecycleEnvVars.NODE_ENV}`, '-e', `APP_KEY=${appKey}`, '-e', `DB_DIALECT=${dbDialect}`, '-e', `DB_HOST=${dbHost}`, '-e', `DB_PORT=${dbPort}`, '-e', `DB_DATABASE=${dbDatabase}`, '-e', `DB_USER=${dbUser}`, '-e', `DB_PASSWORD=${dbPassword}`, '-e', `TZ=${timeZone}`, '-v', `${storagePath}:${DOCKER_APP_STORAGE_DESTINATION}`);
+    pushOptionalEnvArg(args, 'APP_PUBLIC_PATH', appPublicPath ? resolveAppPublicPath(appPublicPath) : undefined);
+    pushOptionalEnvArg(args, 'DB_SCHEMA', dbSchema || undefined);
+    pushOptionalEnvArg(args, 'DB_TABLE_PREFIX', dbTablePrefix || undefined);
+    pushOptionalEnvArg(args, 'DB_UNDERSCORED', dbUnderscored);
+    pushOptionalEnvArg(args, 'NOCOBASE_EXTRACT_CLIENT_ASSETS', extractClientAssets);
+    args.push(imageRef);
+    return {
+        appPort: appPort || undefined,
+        storagePath,
+        envFile,
+        imageRef,
+        args,
+    };
+}
+export async function recreateSavedDockerApp(runtime, options) {
+    const plan = await buildSavedDockerRunArgs(runtime, {
+        initEnvVars: options?.initEnvVars,
+    });
+    try {
+        await ensureDockerNetwork(runtime.workspaceName);
+        await mkdir(plan.storagePath, { recursive: true });
+        await run('docker', plan.args, {
+            errorName: 'docker run',
+            stdio: commandStdio(options?.verbose),
+        });
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (message.includes(`Can't start NocoBase for "${runtime.envName}" yet.`)
+            || message.includes(`Couldn't start NocoBase for "${runtime.envName}".`)) {
+            throw error instanceof Error ? error : new Error(message);
+        }
+        throw new Error(formatDockerAppRecreateFailure(runtime.envName, message));
+    }
+}
+export async function ensureBuiltinDbReady(runtime, options) {
+    const config = runtime.env.config ?? {};
+    if (!config.builtinDb) {
+        return;
+    }
+    const builtinDbConnection = await resolveBuiltinDbConnection(runtime);
+    const plan = Install.buildBuiltinDbPlan({
+        envName: runtime.envName,
+        workspaceName: runtime.workspaceName,
+        dockerContainerPrefix: runtime.dockerContainerPrefix,
+        appPath: config.appPath,
+        storagePath: config.storagePath,
+        source: runtime.source,
+        dbDialect: builtinDbConnection.dbDialect,
+        dbHost: builtinDbConnection.dbHost,
+        dbPort: builtinDbConnection.dbPort,
+        dbDatabase: config.dbDatabase,
+        dbUser: config.dbUser,
+        dbPassword: config.dbPassword,
+        builtinDbImage: config.builtinDbImage,
+    });
+    options?.onStartTask?.(`Restoring the built-in ${plan.dbDialect} database for "${runtime.envName}"...`);
+    try {
+        await ensureDockerNetwork(plan.networkName);
+        if (await dockerContainerExists(plan.containerName)) {
+            const state = await startDockerContainer(plan.containerName, {
+                stdio: commandStdio(options?.verbose),
+            });
+            options?.onSucceedTask?.(state === 'already-running'
+                ? `The built-in ${plan.dbDialect} database is already running for "${runtime.envName}" at ${plan.dbHost}:${plan.dbPort}.`
+                : `The built-in ${plan.dbDialect} database is running for "${runtime.envName}" at ${plan.dbHost}:${plan.dbPort}.`);
+            return;
+        }
+        await mkdir(plan.dataDir, { recursive: true });
+        await run('docker', plan.args, {
+            errorName: 'docker run',
+            stdio: commandStdio(options?.verbose),
+        });
+        options?.onSucceedTask?.(`The built-in ${plan.dbDialect} database is running for "${runtime.envName}" at ${plan.dbHost}:${plan.dbPort}.`);
+    }
+    catch (error) {
+        options?.onFailTask?.(`Failed to restore the built-in database for "${runtime.envName}".`);
+        throw new Error(formatBuiltinDbFailure(runtime.envName, error instanceof Error ? error.message : String(error)));
+    }
+}
+export function buildSavedLocalDownloadArgv(runtime, options) {
+    const config = runtime.env.config ?? {};
+    const argv = ['-y', '--no-intro'];
+    if (options?.verbose) {
+        argv.push('--verbose');
+    }
+    argv.push('--source', runtime.source, '--replace', '--output-dir', runtime.projectRoot);
+    const version = String(config.downloadVersion ?? '').trim();
+    const gitUrl = String(config.gitUrl ?? '').trim();
+    const npmRegistry = String(config.npmRegistry ?? '').trim();
+    if (version) {
+        argv.push('--version', version);
+    }
+    if (gitUrl) {
+        argv.push('--git-url', gitUrl);
+    }
+    if (npmRegistry) {
+        argv.push('--npm-registry', npmRegistry);
+    }
+    if (config.devDependencies === true) {
+        argv.push('--dev-dependencies');
+    }
+    if (config.build === false) {
+        argv.push('--no-build');
+    }
+    if (config.buildDts === true) {
+        argv.push('--build-dts');
+    }
+    return argv;
+}
+export async function ensureSavedLocalSource(runtime, runCommand, options) {
+    if (await localProjectHasFiles(runtime.projectRoot)) {
+        return;
+    }
+    const sourceLabel = localSourceLabel(runtime.source);
+    options?.onStartTask?.(`Restoring the saved ${sourceLabel} for "${runtime.envName}"...`);
+    try {
+        await runCommand('source:download', buildSavedLocalDownloadArgv(runtime, {
+            verbose: options?.verbose,
+        }));
+        options?.onSucceedTask?.(`NocoBase files are ready for "${runtime.envName}".`);
+    }
+    catch (error) {
+        options?.onFailTask?.(`Failed to restore NocoBase files for "${runtime.envName}".`);
+        throw new Error(formatLocalSourceRestoreFailure(runtime.envName, runtime.source, error instanceof Error ? error.message : String(error)));
+    }
+}
+export async function ensureLocalPostinstall(runtime, options) {
+    options?.onStartTask?.(`Running local postinstall for "${runtime.envName}"...`);
+    try {
+        await runLocalNocoBaseCommand(runtime, ['postinstall'], {
+            env: options?.env,
+            stdio: commandStdio(options?.verbose),
+        });
+        options?.onSucceedTask?.(`Local postinstall finished for "${runtime.envName}".`);
+    }
+    catch (error) {
+        options?.onFailTask?.(`Failed to run local postinstall for "${runtime.envName}".`);
+        throw new Error(formatLocalPostinstallFailure(runtime.envName, error instanceof Error ? error.message : String(error)));
+    }
+}

package/dist/lib/app-public-path.js

@@ -0,0 +1,80 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { readFile } from 'node:fs/promises';
+import path from 'node:path';
+const DEFAULT_APP_PUBLIC_PATH = '/';
+const DEFAULT_DIST_SEGMENT = 'dist';
+const DIST_CLIENT_DIR = 'dist-client';
+const DIST_CLIENT_ACTIVE_VERSION_FILE = 'active-version';
+function trimValue(value) {
+    const text = String(value ?? '').trim();
+    return text || undefined;
+}
+export function resolveAppPublicPath(appPublicPath = DEFAULT_APP_PUBLIC_PATH) {
+    const normalized = String(appPublicPath || DEFAULT_APP_PUBLIC_PATH)
+        .trim()
+        .replace(/\/+/g, '/')
+        .replace(/\/?$/, '/');
+    const withLeadingSlash = normalized.startsWith('/') ? normalized : `/${normalized}`;
+    return withLeadingSlash || DEFAULT_APP_PUBLIC_PATH;
+}
+export function appendAppPublicPath(appPublicPath, segment, options) {
+    const publicPath = resolveAppPublicPath(appPublicPath).replace(/\/+$/, '');
+    const normalizedSegment = String(segment || '')
+        .trim()
+        .replace(/^\/+/, '')
+        .replace(options?.trailingSlash ? /\/+$/ : /\/*$/, '');
+    const joinedPath = normalizedSegment ? `${publicPath}/${normalizedSegment}` : publicPath || '/';
+    if (options?.trailingSlash) {
+        return joinedPath.endsWith('/') ? joinedPath : `${joinedPath}/`;
+    }
+    return joinedPath || '/';
+}
+export function resolveDistPublicPath(appPublicPath) {
+    return appendAppPublicPath(appPublicPath, DEFAULT_DIST_SEGMENT, { trailingSlash: true });
+}
+export function buildDefaultCdnBaseUrl(appPublicPath, version) {
+    const normalizedVersion = String(version || '')
+        .trim()
+        .replace(/^\/+|\/+$/g, '');
+    return `${resolveDistPublicPath(appPublicPath)}${normalizedVersion}/`;
+}
+export function buildLocalAppUrl(port, appPublicPath) {
+    const value = trimValue(port);
+    if (!value) {
+        return undefined;
+    }
+    const publicPath = resolveAppPublicPath(appPublicPath);
+    return publicPath === '/' ? `http://127.0.0.1:${value}` : `http://127.0.0.1:${value}${publicPath}`;
+}
+export function buildLocalApiBaseUrl(port, appPublicPath) {
+    const value = trimValue(port);
+    if (!value) {
+        return undefined;
+    }
+    return `http://127.0.0.1:${value}${appendAppPublicPath(appPublicPath, 'api', { trailingSlash: false })}`;
+}
+export function resolveDistClientRoot(storagePath) {
+    return path.join(storagePath, DIST_CLIENT_DIR);
+}
+export function resolveDistClientVersionRoot(storagePath, version) {
+    return path.join(resolveDistClientRoot(storagePath), version);
+}
+export function resolveDistClientActiveVersionFile(storagePath) {
+    return path.join(resolveDistClientRoot(storagePath), DIST_CLIENT_ACTIVE_VERSION_FILE);
+}
+export async function readDistClientActiveVersion(storagePath) {
+    try {
+        const content = await readFile(resolveDistClientActiveVersionFile(storagePath), 'utf8');
+        return trimValue(content);
+    }
+    catch {
+        return undefined;
+    }
+}