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

package/README.md

@@ -17,19 +17,44 @@ lzc-cli completion >> ~/.zshrc
 下面开始使用 `lzc-cli` 去创建一个项目吧!
 
 ```bash
+# 在新目录创建项目（交互选择模板）
 lzc-cli project create you_project
 
-# 构建懒猫云平台lpk包
-lzc-cli project build
+# 在当前目录初始化空白项目
+lzc-cli project create --in-place
+
+# 构建 release lpk 包（优先 lzc-build.release.yml，不存在则回退 lzc-build.yml）
+lzc-cli project release
 
 # 将lpk包安装到盒子中去
-lzc-cli app install
+lzc-cli lpk install
+
+# 部署后默认自动启动
+lzc-cli project deploy
 
-# 使用 devshell 可以让你在盒子中开发调试
-lzc-cli project devshell
+# 进入运行容器调试
+lzc-cli project exec /bin/sh
 
 # 经过测试后，将包发布到懒猫云商店中去
 lzc-cli appstore publish
 ```
 
 [changelog](./changelog.md)
+
+#### box add-by-ssh 远端直连模式
+
+当运行环境无法使用 `hclient` 时，可通过 `box add-by-ssh` 配置远端 ssh 目标，由 `lzc-cli` 直连 `lzcos ssh` 并在远端执行 debug bridge 命令。
+
+示例：
+
+```bash
+lzc-cli box add-by-ssh root 192.168.31.13
+```
+
+说明：
+
+1. 参数格式为 `loginUser address`，地址支持 `host` 或 `host:port`
+2. 配置后会自动设为默认盒子，可通过 `box list/switch/default` 管理
+3. `project release/deploy/start/exec/cp/log/info`、`lpk install/uninstall`、`docker/docker-compose` 都会优先使用该远端
+4. `lzc-build.yml` 不再支持 `remote` 字段
+5. 可选基础配置文件为 `lzc-build.base.yml`（与构建配置同目录）

package/changelog.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 2.0.0-pre.0
+
+1. Add lpkv2 features for internal testing
+
+## [1.3.14](https://gitee.com/linakesi/lzc-cli/compare/v1.3.13...v1.3.14) (2025-12-17)
+
+
+### Bug Fixes
+
+* dealing with the i18n difference escape problem ([2b98cdf](https://gitee.com/linakesi/lzc-cli/commits/2b98cdf0573a1537bee409079d6160da1b7cd80b))
+
+
+### Features
+
+* cmd publish add `changelog-files` option ([17d95c6](https://gitee.com/linakesi/lzc-cli/commits/17d95c6fa761f25af234946dedd3d6a0503ba962))
+
 ## [1.3.13](https://gitee.com/linakesi/lzc-cli/compare/v1.3.12...v1.3.13) (2025-12-10)
 
 

package/lib/app/index.js

@@ -1,7 +1,13 @@
 import path from 'node:path';
-import lpkCreate from './lpk_create.js';
+import lpkCreate, { listProjectTemplateValues, normalizeTemplateType } from './lpk_create.js';
 import { LpkBuild } from './lpk_build.js';
 import { AppDevShell } from './lpk_devshell.js';
+import { projectExecCommand } from './project_exec.js';
+import { projectCpCommand } from './project_cp.js';
+import { projectLogCommand } from './project_log.js';
+import { projectInfoCommand } from './project_info.js';
+import { projectStartCommand } from './project_start.js';
+import { projectDeployCommand } from './project_deploy.js';
 import { LpkInstaller, installConfig } from './lpk_installer.js';
 import logger from 'loglevel';
 import { sleep, checkRsync } from '../utils.js';
@@ -9,28 +15,110 @@ import { DebugBridge } from '../debug_bridge.js';
 import shellApi from '../shellapi.js';
 import { generate } from './lpk_create_generator.js';
 import { t } from '../i18n/index.js';
+import { resolveBuildRemoteFromFile } from '../build_remote.js';
+import { resolveProjectReleaseConfigPath } from './project_runtime.js';
+
+async function installLpk(pkgPath, apk) {
+	if (!resolveBuildRemoteFromFile(process.cwd())) {
+		await shellApi.init();
+	}
+	installConfig.apk = apk == 'y';
+
+	const installPath = pkgPath ?? process.cwd();
+	const installer = new LpkInstaller();
+	await installer.init();
+	await installer.install(installPath);
+}
+
+async function uninstallLpk(pkgId, deleteData) {
+	const buildRemote = resolveBuildRemoteFromFile(process.cwd());
+	if (!buildRemote) {
+		await shellApi.init();
+	}
+
+	const bridge = new DebugBridge(process.cwd(), buildRemote);
+	await bridge.init();
+	await bridge.uninstall(pkgId, deleteData);
+	logger.debug(`default lcmd device: ${bridge.boxname} , uninstall the app ${pkgId} finish`);
+}
+
+function lpkInstallSubCommand({ desc }) {
+	return {
+		command: 'install [pkgPath]',
+		desc,
+		builder: (args) => {
+			args.option('apk', {
+				describe: t('lzc_cli.lib.app.index.lpk_cmd_index_rags_apk_desc', '是否生成APK(y/n)'),
+				type: 'string',
+				default: 'y',
+			});
+		},
+		handler: async ({ pkgPath, apk }) => {
+			await installLpk(pkgPath, apk);
+		},
+	};
+}
+
+function lpkUninstallSubCommand({ desc }) {
+	return {
+		command: 'uninstall <pkgId>',
+		desc,
+		builder: (args) => {
+			args.option('delete-data', {
+				describe: t('lzc_cli.lib.app.index.lpk_cmd_uninstall_rags_delete_data_desc', '删除应用数据 ⚠️ 警告: 应用数据删除后无法恢复'),
+				type: 'boolean',
+				default: false,
+			});
+		},
+		handler: async ({ pkgId, deleteData }) => {
+			await uninstallLpk(pkgId, deleteData);
+		},
+	};
+}
 
 export function lpkProjectCommand(program) {
 	let subCommands = [
 		{
-			command: 'init',
-			desc: t('lzc_cli.lib.app.index.lpk_cmd_init_desc', '初始化懒猫云应用(提供最基础的模板)'),
-			handler: async () => {
-				generate('blank', './');
-				logger.info(t('lzc_cli.lib.app.index.lpk_cmd_init_success', '应用初始化完成'));
-			},
-		},
-		{
-			command: 'create <name>',
+			command: 'create [name]',
 			desc: t('lzc_cli.lib.app.index.lpk_cmd_create_desc', '创建懒猫云应用'),
-			handler: async ({ name }) => {
-				name = String(name);
-				await lpkCreate(name);
+			builder: (args) => {
+				args.option('in-place', {
+					describe: 'Initialize current directory with blank template',
+					type: 'boolean',
+					default: false,
+				});
+				args.option('t', {
+					alias: 'template',
+					describe: `Template name (${listProjectTemplateValues().join(', ')})`,
+					type: 'string',
+				});
+			},
+			handler: async ({ name, inPlace, template }) => {
+				if (name && inPlace) {
+					throw new Error('--in-place cannot be used with <name>.');
+				}
+				const normalizedTemplate = normalizeTemplateType(template);
+				if (name) {
+					name = String(name);
+					await lpkCreate(name, process.cwd(), normalizedTemplate);
+					return;
+				}
+
+				if (inPlace) {
+					if (normalizedTemplate) {
+						throw new Error('--template cannot be used with --in-place.');
+					}
+					generate('blank', './');
+					logger.info(t('lzc_cli.lib.app.index.lpk_cmd_init_success', '应用初始化完成'));
+					return;
+				}
+
+				throw new Error('Project name is required unless --in-place is used.');
 			},
 		},
 		{
 			command: 'build [context]',
-			desc: t('lzc_cli.lib.app.index.lpk_cmd_build_desc', '构建'),
+			desc: false,
 			builder: (args) => {
 				args.option('o', {
 					alias: 'output',
@@ -58,9 +146,41 @@ export function lpkProjectCommand(program) {
 				await lpk.exec();
 			},
 		},
+		{
+			command: 'release [context]',
+			desc: 'Build release package',
+			builder: (args) => {
+				args.option('o', {
+					alias: 'output',
+					describe: t('lzc_cli.lib.app.index.lpk_cmd_build_args_output_desc', '输出文件'),
+					type: 'string',
+				});
+				args.option('f', {
+					alias: 'file',
+					describe: t('lzc_cli.lib.app.index.lpk_cmd_build_args_file_desc', '指定构建的lzc-build.yml文件'),
+					type: 'string',
+				});
+			},
+			handler: async ({ context, output, file }) => {
+				const cwd = context ? path.resolve(context) : process.cwd();
+				const configPath = resolveProjectReleaseConfigPath(cwd, file);
+				const projectCwd = path.dirname(configPath);
+				const configName = path.basename(configPath);
+				const lpk = await new LpkBuild(projectCwd, configName).init();
+				lpk.onBeforeBuildPackage(async (options) => {
+					delete options['devshell'];
+
+					if (output) {
+						options['lpkPath'] = output;
+					}
+					return options;
+				});
+				await lpk.exec();
+			},
+		},
 		{
 			command: 'devshell [context]',
-			desc: t('lzc_cli.lib.app.index.lpk_cmd_devshell_desc', '进入盒子的开发环境'),
+			desc: false,
 			builder: (args) => {
 				args.option('f', {
 					alias: 'force',
@@ -84,12 +204,16 @@ export function lpkProjectCommand(program) {
 				});
 			},
 			handler: async ({ context, force, config, contentdir, apk }) => {
-				await shellApi.init();
+				logger.warn('project devshell is deprecated. Use "project deploy", "project start", "project exec", "project cp", and "project log" instead.');
+				const cwd = context ? path.resolve(context) : process.cwd();
+				const buildRemote = resolveBuildRemoteFromFile(cwd, config);
+				if (!buildRemote) {
+					await shellApi.init();
+				}
 				// 检测 rsync 满足
 				await checkRsync();
 
 				installConfig.apk = apk == 'y';
-				const cwd = context ? path.resolve(context) : process.cwd();
 				const lpkBuild = await new LpkBuild(cwd, config).init();
 				lpkBuild.onBeforeBuildPackage(async (options) => {
 					// devshell 正常情况下，不需要执行 buildscript 和 contentdir 字段
@@ -109,6 +233,26 @@ export function lpkProjectCommand(program) {
 				await app.rsyncShell();
 			},
 		},
+		{
+			command: 'app',
+			desc: false,
+			builder: (args) => {
+				args.command([
+					lpkInstallSubCommand({
+						desc: false,
+					}),
+					lpkUninstallSubCommand({
+						desc: false,
+					}),
+				]);
+			},
+		},
+		projectExecCommand(),
+		projectCpCommand(),
+		projectLogCommand(),
+		projectInfoCommand(),
+		projectStartCommand(),
+		projectDeployCommand(),
 	];
 	program.command({
 		command: 'project',
@@ -121,52 +265,22 @@ export function lpkProjectCommand(program) {
 
 export function lpkAppCommand(program) {
 	let subCommands = [
-		{
-			command: 'install [pkgPath]',
+		lpkInstallSubCommand({
 			desc: t('lzc_cli.lib.app.index.lpk_cmd_install_desc', '部署应用至设备, pkgPath 可以为路径，或者https://,http://请求地址, 如果不填写，将默认为当前目录下的lpk'),
-			builder: (args) => {
-				args.option('apk', {
-					describe: t('lzc_cli.lib.app.index.lpk_cmd_index_rags_apk_desc', '是否生成APK(y/n)'),
-					type: 'string',
-					default: 'y',
-				});
-			},
-			handler: async ({ pkgPath, apk }) => {
-				await shellApi.init();
-				installConfig.apk = apk == 'y';
-
-				pkgPath = pkgPath ?? process.cwd();
-				const installer = new LpkInstaller();
-				await installer.init();
-				await installer.install(pkgPath);
-			},
-		},
-		{
-			command: 'uninstall <pkgId>',
+		}),
+		lpkUninstallSubCommand({
 			desc: t('lzc_cli.lib.app.index.lpk_cmd_uninstall_desc', '从设备中卸载某一个应用'),
-			builder: (args) => {
-				args.option('delete-data', {
-					describe: t('lzc_cli.lib.app.index.lpk_cmd_uninstall_rags_delete_data_desc', '删除应用数据 ⚠️ 警告: 应用数据删除后无法恢复'),
-					type: 'boolean',
-					default: false,
-				});
-			},
-			handler: async ({ pkgId, deleteData }) => {
-				await shellApi.init();
-
-				const bridge = new DebugBridge();
-				await bridge.init();
-				await bridge.uninstall(pkgId, deleteData);
-				logger.debug(`default lcmd device: ${bridge.boxname} , uninstall the app ${pkgId} finish`);
-			},
-		},
+		}),
 		{
 			command: 'status <pkgId>',
 			desc: t('lzc_cli.lib.app.index.lpk_cmd_status_desc', '获取某一个应用的状态'),
 			handler: async ({ pkgId }) => {
-				await shellApi.init();
+				const buildRemote = resolveBuildRemoteFromFile(process.cwd());
+				if (!buildRemote) {
+					await shellApi.init();
+				}
 
-				const bridge = new DebugBridge();
+				const bridge = new DebugBridge(process.cwd(), buildRemote);
 				await bridge.init();
 				const status = await bridge.status(pkgId);
 				console.log(status);
@@ -184,7 +298,9 @@ export function lpkAppCommand(program) {
 				});
 			},
 			handler: async () => {
-				await shellApi.init();
+				if (!resolveBuildRemoteFromFile(process.cwd())) {
+					await shellApi.init();
+				}
 
 				throw 'not yet realized';
 			},
@@ -192,7 +308,7 @@ export function lpkAppCommand(program) {
 	];
 	program.command({
 		command: 'app',
-		desc: t('lzc_cli.lib.app.index.lpk_cmd_app_desc', '应用管理'),
+		desc: false,
 		builder: async (args) => {
 			args.command(subCommands);
 		},