@lazycatcloud/lzc-cli 1.3.13 → 2.0.0-pre.0

package/lib/app/project_runtime.js

@@ -0,0 +1,261 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import shellApi from '../shellapi.js';
+import { DebugBridge } from '../debug_bridge.js';
+import { LpkBuild } from './lpk_build.js';
+import { isUserApp } from '../utils.js';
+import { resolveBuildRemoteFromFile, DEFAULT_BUILD_CONFIG_FILE } from '../build_remote.js';
+
+export const DEFAULT_DEPLOY_BUILD_CONFIG_FILE = 'lzc-build.dev.yml';
+export const DEFAULT_RELEASE_BUILD_CONFIG_FILE = 'lzc-build.release.yml';
+
+function isFile(pathname) {
+	return fs.existsSync(pathname) && fs.statSync(pathname).isFile();
+}
+
+export function resolveBuildConfigPath(startDir = process.cwd(), buildConfigFile = DEFAULT_BUILD_CONFIG_FILE) {
+	const configName = String(buildConfigFile ?? DEFAULT_BUILD_CONFIG_FILE).trim() || DEFAULT_BUILD_CONFIG_FILE;
+	if (path.isAbsolute(configName)) {
+		return isFile(configName) ? configName : '';
+	}
+
+	const direct = path.resolve(startDir, configName);
+	if (isFile(direct)) {
+		return direct;
+	}
+
+	if (configName.includes('/') || configName.includes('\\')) {
+		return '';
+	}
+
+	let current = path.resolve(startDir);
+	while (true) {
+		const candidate = path.join(current, configName);
+		if (isFile(candidate)) {
+			return candidate;
+		}
+		const parent = path.dirname(current);
+		if (parent === current) {
+			break;
+		}
+		current = parent;
+	}
+	return '';
+}
+
+export function resolveProjectDeployConfigPath(startDir = process.cwd(), buildConfigFile = '') {
+	return resolvePreferredBuildConfigPath(startDir, buildConfigFile, DEFAULT_DEPLOY_BUILD_CONFIG_FILE);
+}
+
+export function resolveProjectReleaseConfigPath(startDir = process.cwd(), buildConfigFile = '') {
+	return resolvePreferredBuildConfigPath(startDir, buildConfigFile, DEFAULT_RELEASE_BUILD_CONFIG_FILE);
+}
+
+function resolvePreferredBuildConfigPath(startDir, buildConfigFile, preferredConfigFile) {
+	const explicitConfig = String(buildConfigFile ?? '').trim();
+	if (explicitConfig) {
+		const explicitPath = resolveBuildConfigPath(startDir, explicitConfig);
+		if (!explicitPath) {
+			throw new Error(`Build config file not found: ${explicitConfig}`);
+		}
+		return explicitPath;
+	}
+
+	const preferredConfigPath = resolveBuildConfigPath(startDir, preferredConfigFile);
+	if (preferredConfigPath) {
+		return preferredConfigPath;
+	}
+
+	const defaultConfigPath = resolveBuildConfigPath(startDir, DEFAULT_BUILD_CONFIG_FILE);
+	if (!defaultConfigPath) {
+		throw new Error(`Build config file not found: ${preferredConfigFile} or ${DEFAULT_BUILD_CONFIG_FILE}`);
+	}
+	return defaultConfigPath;
+}
+
+export async function resolveProjectRuntime(startDir = process.cwd(), buildConfigFile = DEFAULT_BUILD_CONFIG_FILE) {
+	const configPath = resolveBuildConfigPath(startDir, buildConfigFile);
+	if (!configPath) {
+		throw new Error(`Build config file not found: ${buildConfigFile}`);
+	}
+
+	const projectCwd = path.dirname(configPath);
+	const configName = path.basename(configPath);
+
+	const buildRemote = resolveBuildRemoteFromFile(projectCwd, configName);
+	if (!buildRemote) {
+		await shellApi.init();
+	}
+
+	const lpkBuild = await new LpkBuild(projectCwd, configName).init();
+	const manifest = await lpkBuild.getManifest();
+	const pkgId = String(manifest?.package ?? '').trim();
+	if (!pkgId) {
+		throw new Error('Manifest package is empty');
+	}
+
+	const bridge = new DebugBridge(projectCwd, buildRemote);
+	await bridge.init();
+
+	const userApp = isUserApp(manifest);
+	const composeProjectName = pkgId.replaceAll('.', '');
+	const localVersion = String(manifest?.version ?? '').trim();
+
+	return {
+		projectCwd,
+		configName,
+		configPath,
+		manifest,
+		pkgId,
+		userApp,
+		bridge,
+		composeProjectName,
+		localVersion,
+	};
+}
+
+function firstNonEmptyLine(text) {
+	return String(text ?? '')
+		.split(/\r?\n/)
+		.map((line) => line.trim())
+		.find((line) => line.length > 0);
+}
+
+function parseComposeProjectList(raw) {
+	const text = String(raw ?? '').trim();
+	if (!text) {
+		return [];
+	}
+	try {
+		const parsed = JSON.parse(text);
+		if (!Array.isArray(parsed)) {
+			return [];
+		}
+		return parsed
+			.map((item) => ({
+				name: String(item?.Name ?? '').trim(),
+				status: String(item?.Status ?? '').trim(),
+				configFiles: String(item?.ConfigFiles ?? '').trim(),
+			}))
+			.filter((item) => item.name.length > 0);
+	} catch {
+		return [];
+	}
+}
+
+export async function listComposeProjects(runtime) {
+	try {
+		const output = await runtime.bridge.lzcDockerComposeCapture(['ls', '--format', 'json']);
+		return parseComposeProjectList(output);
+	} catch {
+		return [];
+	}
+}
+
+export async function getComposeProject(runtime) {
+	const projects = await listComposeProjects(runtime);
+	return projects.find((item) => item.name === runtime.composeProjectName) || null;
+}
+
+export async function getProjectDeployInfo(runtime) {
+	const remoteInfo = await runtime.bridge.info(runtime.pkgId);
+	const deployId = String(remoteInfo?.deploy_id ?? '').trim();
+	const deployedVersion = String(remoteInfo?.version ?? '').trim();
+	const domain = String(remoteInfo?.domain ?? '').trim();
+	const appStatus = String(remoteInfo?.status ?? '').trim();
+	const instanceStatus = String(remoteInfo?.instance_status ?? '').trim();
+	const errorReason = String(remoteInfo?.error_reason ?? '').trim();
+	const deployed = appStatus !== '' && appStatus !== 'NotInstalled';
+	const currentVersionDeployed = deployed && runtime.localVersion !== '' && deployedVersion === runtime.localVersion;
+	return {
+		...remoteInfo,
+		deployId,
+		localVersion: runtime.localVersion,
+		deployedVersion,
+		domain,
+		appStatus,
+		instanceStatus,
+		errorReason,
+		deployed,
+		currentVersionDeployed,
+		isRunning: instanceStatus === 'Status_Running',
+	};
+}
+
+export async function getProjectErrmsgByDeployId(runtime, deployId) {
+	const targetDeployId = String(deployId ?? '').trim();
+	if (!targetDeployId) {
+		return '';
+	}
+	try {
+		const errmsgPath = `/data/system/pkgm/run/${targetDeployId}/errmsg`;
+		const raw = await runtime.bridge.hostReadFile(errmsgPath);
+		return String(raw ?? '').trim();
+	} catch {
+		return '';
+	}
+}
+
+export async function ensureProjectRunning(runtime) {
+	const deploy = await getProjectDeployInfo(runtime);
+	if (!deploy.isRunning) {
+		throw new Error('Project app is not running. Run "lzc-cli project start" first.');
+	}
+	return deploy;
+}
+
+export async function getProjectComposePs(runtime) {
+	try {
+		return await runtime.bridge.lzcDockerComposeCapture(['-p', runtime.composeProjectName, 'ps']);
+	} catch {
+		return '';
+	}
+}
+
+export async function findProjectServiceContainer(runtime, service = 'app') {
+	const targetService = String(service || 'app');
+	try {
+		const output = await runtime.bridge.lzcDockerComposeCapture(['-p', runtime.composeProjectName, 'ps', '--status', 'running', '-q', targetService]);
+		return firstNonEmptyLine(output) || '';
+	} catch {
+		return '';
+	}
+}
+
+export async function ensureProjectServiceRunning(runtime, service = 'app') {
+	const targetService = String(service || 'app');
+	const composeProject = await getComposeProject(runtime);
+	if (!composeProject || !composeProject.status.startsWith('running(')) {
+		throw new Error('Project app is not running. Run "lzc-cli project start" first.');
+	}
+	const containerId = await findProjectServiceContainer(runtime, targetService);
+	if (!containerId) {
+		throw new Error(`Service \"${targetService}\" is not running. Run \"lzc-cli project start\" first.`);
+	}
+	return containerId;
+}
+
+export async function getProjectServiceEnv(runtime, service = 'app') {
+	const containerId = await ensureProjectServiceRunning(runtime, service);
+	const output = await runtime.bridge.lzcDockerCapture(['inspect', containerId]);
+	const inspectList = JSON.parse(String(output ?? '').trim());
+	if (!Array.isArray(inspectList) || inspectList.length === 0 || typeof inspectList[0] !== 'object' || !inspectList[0]) {
+		throw new Error(`Invalid inspect output for service "${String(service || 'app')}"`);
+	}
+	const envList = inspectList[0]?.Config?.Env;
+	if (!Array.isArray(envList)) {
+		throw new Error(`Invalid env list for service "${String(service || 'app')}"`);
+	}
+	const envMap = {};
+	for (const item of envList) {
+		const pair = String(item ?? '');
+		const idx = pair.indexOf('=');
+		if (idx <= 0) {
+			continue;
+		}
+		const key = pair.slice(0, idx);
+		const value = pair.slice(idx + 1);
+		envMap[key] = value;
+	}
+	return envMap;
+}

package/lib/app/project_start.js

@@ -0,0 +1,100 @@
+import logger from 'loglevel';
+import { DEFAULT_BUILD_CONFIG_FILE } from '../build_remote.js';
+import { LpkBuild } from './lpk_build.js';
+import { resolveProjectRuntime, getProjectDeployInfo, getProjectComposePs } from './project_runtime.js';
+
+function sleep(ms) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function waitProjectRunning(runtime, timeoutMs = 90000) {
+	const startedAt = Date.now();
+	while (Date.now() - startedAt <= timeoutMs) {
+		const deploy = await getProjectDeployInfo(runtime);
+		if (deploy.isRunning) {
+			return deploy;
+		}
+		await sleep(1000);
+	}
+	return null;
+}
+
+async function waitProjectNotRunning(runtime, timeoutMs = 30000) {
+	const startedAt = Date.now();
+	while (Date.now() - startedAt <= timeoutMs) {
+		const deploy = await getProjectDeployInfo(runtime);
+		if (!deploy.isRunning) {
+			return deploy;
+		}
+		await sleep(1000);
+	}
+	return null;
+}
+
+async function deployCurrentVersion(runtime) {
+	const lpkBuild = await new LpkBuild(runtime.projectCwd, runtime.configName).init();
+	lpkBuild.onBeforeBuildPackage(async (options) => {
+		delete options['devshell'];
+		return options;
+	});
+	const pkgPath = await lpkBuild.exec();
+	logger.info(`Install package: ${pkgPath}`);
+	await runtime.bridge.install(pkgPath, runtime.pkgId);
+}
+
+export function projectStartCommand() {
+	return {
+		command: 'start',
+		desc: 'Start project app',
+		builder: (args) => {
+			args.option('c', {
+				alias: 'config',
+				describe: 'Build config file name',
+				type: 'string',
+				default: DEFAULT_BUILD_CONFIG_FILE,
+			});
+			args.option('restart', {
+				describe: 'Force restart app instance',
+				type: 'boolean',
+				default: false,
+			});
+		},
+		handler: async ({ config, restart }) => {
+			const runtime = await resolveProjectRuntime(process.cwd(), config);
+			let deploy = await getProjectDeployInfo(runtime);
+
+			if (!deploy.currentVersionDeployed) {
+				logger.info('Current project version is not deployed. Build and install current version.');
+				await deployCurrentVersion(runtime);
+				deploy = await getProjectDeployInfo(runtime);
+			}
+
+			if (restart) {
+				if (deploy.isRunning) {
+					logger.info('Restart requested. Pause app instance first.');
+					await runtime.bridge.pause(runtime.pkgId);
+					deploy = await waitProjectNotRunning(runtime);
+					if (!deploy) {
+						throw new Error('Project app is still running after pause. Please check app status and try again.');
+					}
+				}
+				logger.info('Restart requested. Resume app instance.');
+				await runtime.bridge.resume(runtime.pkgId);
+			} else if (!deploy.isRunning) {
+				logger.info('App is not running. Resume app instance.');
+				await runtime.bridge.resume(runtime.pkgId);
+			}
+
+			deploy = await waitProjectRunning(runtime);
+			if (!deploy) {
+				throw new Error('Project app is still not running. Please check app status and try again.');
+			}
+
+			logger.info('Project app is running.');
+			const psOutput = await getProjectComposePs(runtime);
+			if (psOutput) {
+				console.log(psOutput);
+			}
+		},
+	};
+}

package/lib/appstore/index.js

@@ -1,10 +1,12 @@
-import { Publish } from './publish.js';
-import logger from 'loglevel';
-import { PrePublish } from './prePublish.js';
-import { reLogin, request } from './login.js';
 import fs from 'node:fs';
+import logger from 'loglevel';
+
 import { sleep } from '../utils.js';
 import { t } from '../i18n/index.js';
+
+import { Publish } from './publish.js';
+import { PrePublish } from './prePublish.js';
+import { reLogin, request } from './login.js';
 import { appStoreServerUrl } from './env.js';
 
 export function appstoreCommand(program) {
@@ -19,18 +21,18 @@ export function appstoreCommand(program) {
 		{
 			command: 'pre-publish <pkgPath>',
 			desc: t('lzc_cli.lib.appstore.index.pre_publish_cmd_desc', '发布到内测'),
-			builder: (args) => {
-				args.option('c', {
+			builder: (yargs) => {
+				yargs.option('c', {
 					alias: 'changelog',
 					describe: t('lzc_cli.lib.appstore.index.pre_publish_cmd_changelog_desc', '更改日志'),
 					type: 'string',
 				});
-				args.option('F', {
+				yargs.option('F', {
 					alias: 'file',
 					describe: t('lzc_cli.lib.appstore.index.pre_publish_cmd_changelog_file_desc', '更改日志文件'),
 					type: 'string',
 				});
-				args.option('G', {
+				yargs.option('G', {
 					alias: 'gid',
 					describe: t('lzc_cli.lib.appstore.index.pre_publish_cmd_gid_desc', '内测组ID'),
 					type: 'string',
@@ -47,30 +49,68 @@ export function appstoreCommand(program) {
 		{
 			command: 'publish <pkgPath>',
 			desc: t('lzc_cli.lib.appstore.index.publish_cmd_desc', '发布到商店'),
-			builder: (args) => {
-				args.option('c', {
+			builder: (yargs) => {
+				yargs.option('c', {
 					alias: 'changelog',
 					describe: t('lzc_cli.lib.appstore.index.publish_cmd_changelog_desc', '更新日志'),
 					type: 'string',
 				});
-				args.option('clang', {
+				yargs.option('clang', {
 					alias: 'changelog-locale',
 					describe: t('lzc_cli.lib.appstore.index.publish_cmd_changelog_lang_desc', '更新日志语言标识，默认通过当前 shell 语言环境识别'),
 					type: 'string',
 				});
-				args.option('F', {
+				yargs.option('clangs', {
+					alias: 'changelog-files',
+					type: 'string',
+					array: true,
+					describe: t('lzc_cli.lib.appstore.index.publish_cmd_changelog_files_desc', '更新日志本地化语言文件 lang:path 例如 en:changelog.en.md'),
+				});
+				yargs.option('F', {
 					alias: 'file',
+					deprecate: 'use --clangs=en:clog_en.txt',
 					describe: t('lzc_cli.lib.appstore.index.publish_cmd_changelog_file_desc', '更新日志文件'),
 					type: 'string',
 				});
 			},
-			handler: async ({ pkgPath, changelog, changelogLocale, file }) => {
-				const locale = changelogLocale ?? program.locale();
+			handler: async ({ pkgPath, changelog, changelogLocale, file, changelogFiles }) => {
+				const currentLocale = changelogLocale ?? program.locale();
 				const p = new Publish();
+
+				async function readChangelogFiles(files, changelogs = {}) {
+					const result = {}
+					if (!files || !Array.isArray(files) || files.length < 1) {
+						return { ...result, ...changelogs }
+					}
+					for (const item of files) {
+						const [lang, path] = item.split(':');
+						if (!lang || !path) {
+							throw new Error('changelog files resolution error')
+						}
+						if (!fs.existsSync(path)) {
+							throw new Error(`changelog ${lang} file ${path} does not exist`)
+						}
+						const content = fs.readFileSync(path, 'utf8');
+						if (!content) {
+							throw new Error(`changelog ${lang} file ${path} content is empty`)
+						}
+						result[lang] = content.trim()
+					}
+					return { ...result, ...changelogs }
+				}
+
+				// deprecate: 移除 `--file` 参数时删除该逻辑
 				if (!changelog && file) {
 					changelog = fs.readFileSync(file, 'utf8');
 				}
-				await p.publish(pkgPath, changelog, locale);
+
+				const changelogInitial = {}
+				if (changelog) {
+					changelogInitial[currentLocale] = changelog
+				}
+				const changelogs = await readChangelogFiles(changelogFiles, changelogInitial)
+
+				await p.publish(pkgPath, changelogs, currentLocale);
 			},
 		},
 		{
@@ -138,7 +178,7 @@ export function appstoreCommand(program) {
 						process.stdout.write('\x1B[?25h'); // 恢复光标显示
 					};
 
-					for (;;) {
+					for (; ;) {
 						const pgsResp = await request(progressUrl);
 						if (pgsResp.ok) {
 							const pgs = JSON.parse(await pgsResp.text());

package/lib/appstore/publish.js

@@ -14,7 +14,7 @@ async function askChangeLog(locale) {
 		{
 			name: 'changelog',
 			type: 'editor',
-			message: t('lzc_cli.lib.publish.ask_changelog_prompt', `填写 changelog 内容 ({{locale}})`, { locale }),
+			message: t('lzc_cli.lib.publish.ask_changelog_prompt', `填写 changelog 内容 ({{ locale }})`, { locale }),
 			validate: noEmpty,
 		},
 	]);
@@ -128,7 +128,7 @@ async function askWhetherCreateLPK(baseUrl, manifest, locale) {
 			}),
 		});
 		logger.debug('create app res: ', await crateAppRes.text());
-		logger.info(t('lzc_cli.lib.publish.ask_whether_create_lpk_success_tips', `创建 {{package}} 应用成功!`, { package: manifest['package'] }));
+		logger.info(t('lzc_cli.lib.publish.ask_whether_create_lpk_success_tips', `创建 {{ package }} 应用成功!`, { package: manifest['package'], interpolation: { escapeValue: false } }));
 	} else {
 		logger.info(
 			t(
@@ -205,9 +205,9 @@ export class Publish {
 	/**
 	 * @param {string} pkgPath
 	 * @param {string} changelog
-	 * @param {string} locale
+	 * @param {string} currentLocale
 	 */
-	async publish(pkgPath, changelog, locale = 'zh') {
+	async publish(pkgPath, changelogs, currentLocale = 'zh') {
 		if (!Publish.preCheck(pkgPath)) return;
 
 		const { manifest, appIdExisted } = await this.checkAppIdExist(pkgPath);
@@ -237,19 +237,25 @@ export class Publish {
 		logger.debug('upload lpk response', lpkInfo);
 		if (res.status >= 400) {
 			logger.error(
-				t('lzc_cli.lib.publish.publish_lpk_fail_tips', `LPK 文件上传失败，err: {{message}}`, {
+				t('lzc_cli.lib.publish.publish_lpk_fail_tips', `LPK 文件上传失败，err: {{ message }}`, {
 					message: lpkInfo?.message ?? lpkInfo,
+					interpolation: { escapeValue: false }
 				}),
 			);
 			throw new Error(lpkInfo?.message ?? lpkInfo);
 		}
 
 		// 填写更新日志
-		if (!changelog) {
-			const answer = await askChangeLog(locale);
-			changelog = answer.changelog;
+		if (!changelogs || Object.keys(changelogs).length < 1) {
+			const answer = await askChangeLog(currentLocale);
+			let changelog = answer.changelog;
+			changelog = changelog.trim(); // clean space ^:)
+
+			// changelogs 本地化
+			const langKey = getLanguageForLocale(currentLocale);
+			changelogs[langKey] = changelog
 		}
-		changelog = changelog.trim(); // clean space ^:)
+		logger.debug('publish changelogs is', changelogs);
 
 		const sendURL = this.baseUrl + `/app/${lpkInfo.package}/review/create`;
 		logger.debug('publish url is', sendURL);
@@ -264,12 +270,9 @@ export class Publish {
 				pkg_path: lpkInfo.url,
 				unsupported_platforms: lpkInfo.unsupportedPlatforms,
 				min_os_version: lpkInfo.minOsVersion,
-				changelogs: {},
+				changelogs,
 			},
 		};
-		// changelogs 本地化
-		const langKey = getLanguageForLocale(locale);
-		formData.version.changelogs[langKey] = changelog;
 
 		logger.debug('form data is', formData);