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

package/lib/appstore/apkshell.js

@@ -0,0 +1,50 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { Blob } from 'node:buffer';
+import logger from 'loglevel';
+import fetch, { FormData } from 'node-fetch';
+import { t } from '../i18n/index.js';
+import { appStoreServerUrl } from './env.js';
+
+// axios@1.7.7 依赖的 form-data 使用了 util.isArray 导致 node 会输出弃用警告 (所以将逻辑迁移避免依赖)
+export async function triggerApk(id, name, iconPath) {
+	if (!id) {
+		logger.error(t('lzc_cli.lib.appstore.apkshell.trigger_apk_empty_appid', 'Appid 为必填项!'));
+		return;
+	}
+
+	const appName = name || t('lzc_cli.lib.appstore.apkshell.trigger_apk_default_app_name', '懒猫应用');
+	const form = new FormData();
+	form.append('app_id', id);
+	form.append('app_name', appName);
+
+	if (iconPath && fs.existsSync(iconPath)) {
+		const iconBuffer = fs.readFileSync(iconPath);
+		form.append('app_icon', new Blob([iconBuffer]), path.basename(iconPath));
+	}
+
+	const controller = new AbortController();
+	const timer = setTimeout(() => controller.abort(), 5000);
+
+	try {
+		const resp = await fetch(`${appStoreServerUrl}/api/trigger_latest_for_app`, {
+			method: 'POST',
+			body: form,
+			signal: controller.signal,
+		});
+
+		logger.debug('triggerApk resp:', resp);
+		if (resp.status == 304) {
+			logger.debug(t('lzc_cli.lib.appstore.apkshell.trigger_apk_build_tips', `APK构建任务已创建成功,如需使用安卓端,请耐心等待1分钟左右`));
+		} else if (resp.status <= 201) {
+			logger.info(t('lzc_cli.lib.appstore.apkshell.trigger_apk_build_ok_tips', `APK构建任务已创建成功,如需使用安卓端,请耐心等待1分钟左右`));
+		} else if (resp.status >= 400) {
+			logger.debug(t('lzc_cli.lib.appstore.apkshell.trigger_apk_build_failed', '请求按钮应用出错:'), await resp.text());
+			throw t('lzc_cli.lib.appstore.apkshell.trigger_apk_build_failed_tips', `请求生成应用出错! 使用 --apk=n 停止生成APK`);
+		}
+	} catch (error) {
+		logger.debug(error);
+	} finally {
+		clearTimeout(timer);
+	}
+}

package/lib/appstore/publish.js

@@ -107,15 +107,33 @@ async function askPublishAppInfo(baseUrl, manifest, locale) {
 }
 
 async function askWhetherCreateLPK(baseUrl, manifest, locale) {
-	const answers = await inquirer.prompt([
-		{
-			name: 'continue',
-			type: 'input',
-			message: t('lzc_cli.lib.publish.ask_whether_create_lpk_continue_prompt', '检测到您当前的应用，还没有在懒猫微服中创建，是否使用当前的安装包中的信息进行创建？ [y/n]'),
-			default: 'y',
-		},
-	]);
-	if (answers.continue.toLowerCase() === 'y') {
+	try {
+		// 是否允许创建应用预检请求
+		const _options = await request(`${baseUrl}/app/create`, {
+			method: 'OPTIONS',
+		});
+		logger.debug('create app preflight:', { url: _options.url, ok: _options.ok, status: _options.status });
+		if (!_options.ok || _options.status < 199 || _options.status > 299) {
+			throw undefined;
+		}
+
+		// 要求输入应用信息
+		const answers = await inquirer.prompt([
+			{
+				name: 'continue',
+				type: 'input',
+				message: t(
+					'lzc_cli.lib.publish.ask_whether_create_lpk_continue_prompt',
+					'检测到您当前的应用，还没有在懒猫微服中创建，是否使用当前的安装包中的信息进行创建？ [y/n]',
+				),
+				default: 'y',
+			},
+		]);
+		if (answers.continue.toLowerCase() != 'y') {
+			throw undefined;
+		}
+
+		// 发送创建应用请求
 		const appInfo = await askPublishAppInfo(baseUrl, manifest, locale);
 		const crateAppRes = await request(`${baseUrl}/app/create`, {
 			method: 'POST',
@@ -127,9 +145,28 @@ async function askWhetherCreateLPK(baseUrl, manifest, locale) {
 				source_author: appInfo.author,
 			}),
 		});
-		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'], interpolation: { escapeValue: false } }));
-	} else {
+		logger.debug('create app res:', await crateAppRes.text());
+		if (!crateAppRes.ok) {
+			const data = await crateAppRes.json();
+			throw new Error(data?.message || `status:${crateAppRes.status} statusText:${crateAppRes.statusText}`);
+		}
+		logger.info(
+			t('lzc_cli.lib.publish.ask_whether_create_lpk_success_tips', `创建 {{ package }} 应用成功!`, {
+				package: manifest['package'],
+				interpolation: { escapeValue: false },
+			}),
+		);
+	} catch (error) {
+		if (error) {
+			logger.debug('create app failed: ', error.message ?? 'unknown');
+			logger.error(
+				t('lzc_cli.lib.publish.ask_whether_create_lpk_failed_tips', `创建 {{ package }} 应用失败!`, {
+					package: manifest['package'],
+					interpolation: { escapeValue: false },
+				}),
+				error.message || '',
+			);
+		}
 		logger.info(
 			t(
 				'lzc_cli.lib.publish.ask_whether_create_lpk_fail_tips',
@@ -212,7 +249,7 @@ export class Publish {
 
 		const { manifest, appIdExisted } = await this.checkAppIdExist(pkgPath);
 		if (!appIdExisted) {
-			await askWhetherCreateLPK(this.baseUrl, manifest, locale);
+			await askWhetherCreateLPK(this.baseUrl, manifest, currentLocale);
 		}
 
 		await autoLogin();
@@ -239,7 +276,7 @@ export class Publish {
 			logger.error(
 				t('lzc_cli.lib.publish.publish_lpk_fail_tips', `LPK 文件上传失败，err: {{ message }}`, {
 					message: lpkInfo?.message ?? lpkInfo,
-					interpolation: { escapeValue: false }
+					interpolation: { escapeValue: false },
 				}),
 			);
 			throw new Error(lpkInfo?.message ?? lpkInfo);
@@ -253,7 +290,7 @@ export class Publish {
 
 			// changelogs 本地化
 			const langKey = getLanguageForLocale(currentLocale);
-			changelogs[langKey] = changelog
+			changelogs[langKey] = changelog;
 		}
 		logger.debug('publish changelogs is', changelogs);
 
@@ -270,6 +307,8 @@ export class Publish {
 				pkg_path: lpkInfo.url,
 				unsupported_platforms: lpkInfo.unsupportedPlatforms,
 				min_os_version: lpkInfo.minOsVersion,
+				lpk_size: lpkInfo.lpkSize,
+				image_size: lpkInfo.imageSize,
 				changelogs,
 			},
 		};

package/lib/build_remote.js

@@ -1,7 +1,6 @@
 import { loadBuildRemoteFromConfig } from './box/ssh_remote.js';
 
 export const DEFAULT_BUILD_CONFIG_FILE = 'lzc-build.yml';
-export const DEFAULT_BUILD_BASE_FILE = 'lzc-build.base.yml';
 
 export function resolveBuildRemoteFromOptions(options, source = DEFAULT_BUILD_CONFIG_FILE) {
 	void options;

package/lib/config/index.js

@@ -51,7 +51,7 @@ export function configCommand(program) {
 	];
 	program.command({
 		command: 'config',
-		desc: false,
+		desc: t('lzc_cli.lib.config.index.config_cmd_desc', '配置管理'),
 		builder: (args) => {
 			args.command(subCommands);
 			args.example('$0 config get', t('lzc_cli.lib.config.index.config_cmd_list_tips', '列出所有配置'))

package/lib/debug_bridge.js

@@ -108,6 +108,21 @@ function normalizeErrorMessage(error) {
 	return String(error).trim();
 }
 
+export function shellEscapeArg(value) {
+	const text = String(value ?? '');
+	if (text === '') {
+		return "''";
+	}
+	if (/^[A-Za-z0-9_/.:=,@+-]+$/.test(text)) {
+		return text;
+	}
+	return "'" + text.replace(/'/g, "'\\''") + "'";
+}
+
+export function buildSSHRemoteCommand(args = []) {
+	return args.map((arg) => shellEscapeArg(arg)).join(' ');
+}
+
 export class DebugBridge {
 	constructor(baseDir = process.cwd(), buildRemote = undefined) {
 		this.buildRemote = buildRemote === undefined ? resolveBuildRemoteFromFile(baseDir) : buildRemote;
@@ -275,6 +290,13 @@ export class DebugBridge {
 		return args;
 	}
 
+	async resolveDevId() {
+		if (this.isBuildRemoteMode()) {
+			return '';
+		}
+		return shellApi.resolveClientId();
+	}
+
 	async init() {
 		await this.checkDevTools();
 		if (!(await this.canPublicKey())) {
@@ -484,6 +506,29 @@ export class DebugBridge {
 		}
 	}
 
+	async syncDevID(appId, devId = '', userApp = false) {
+		const normalizedDevId = String(devId ?? '').trim();
+		if (this.isBuildRemoteMode()) {
+			const commandArgs = await this.remoteCommandWithUID(['sync-dev-id']);
+			if (normalizedDevId) {
+				commandArgs.push('--dev-id', normalizedDevId);
+			}
+			if (userApp) {
+				commandArgs.push('--userapp');
+			}
+			commandArgs.push(appId);
+			return this.remoteCommon(commandArgs);
+		}
+		const rawArgs = ['sync-dev-id', `--uid ${this.uid}`];
+		if (normalizedDevId) {
+			rawArgs.push(`--dev-id ${normalizedDevId}`);
+		}
+		if (userApp) {
+			rawArgs.push('--userapp');
+		}
+		rawArgs.push(appId);
+		return this.common(sshBinary(), [...sshCmdArgs(`box@${this.domain}`), rawArgs.join(' ')]);
+	}
 	async isDevshell(appId) {
 		await this.backendVersion020();
 		if (this.isBuildRemoteMode()) {
@@ -698,15 +743,20 @@ export class DebugBridge {
 
 	async lzcDocker(argv) {
 		await this.backendVersion020();
-		const stream = this.isBuildRemoteMode()
-			? spawn(sshBinary(), this.remoteBridgeArgs(['lzc-docker', ...argv], { tty: true }), {
-					shell: false,
-					stdio: 'inherit',
-				})
-			: spawn(sshBinary(), [...sshCmdArgs(`box@${await resolveDomain(this.domain)}`), '-t', 'lzc-docker', ...argv], {
-					shell: true,
-					stdio: 'inherit',
-				});
+		let stream;
+		if (this.isBuildRemoteMode()) {
+			stream = spawn(sshBinary(), this.remoteBridgeArgs(['lzc-docker', ...argv], { tty: true }), {
+				shell: false,
+				stdio: 'inherit',
+			});
+		} else {
+			const resolvedIp = await resolveDomain(this.domain);
+			const remoteCommand = buildSSHRemoteCommand(['lzc-docker', ...argv]);
+			stream = spawn(sshBinary(), [...sshCmdArgsRaw(`box@${resolvedIp}`), '-t', remoteCommand], {
+				shell: false,
+				stdio: 'inherit',
+			});
+		}
 		return new Promise((resolve, reject) => {
 			stream.on('close', (code) => {
 				code == 0 ? resolve() : reject();
@@ -911,24 +961,29 @@ export class DebugBridge {
 		});
 	}
 
-	async lzcDockerCapture(argv) {
+	async lzcDockerCapture(argv, options = {}) {
 		await this.backendVersion020();
+		const stdinText = options && Object.prototype.hasOwnProperty.call(options, 'stdinText') ? String(options.stdinText ?? '') : '';
 		let stream;
 		if (this.isBuildRemoteMode()) {
 			stream = spawn(sshBinary(), this.remoteBridgeArgs(['lzc-docker', ...argv]), {
 				shell: false,
-				stdio: ['ignore', 'pipe', 'inherit'],
+				stdio: ['pipe', 'pipe', 'inherit'],
 			});
 		} else {
 			const resolvedIp = await resolveDomain(this.domain);
 			stream = spawn(sshBinary(), [...sshCmdArgsRaw(`box@${resolvedIp}`), 'lzc-docker', ...argv], {
 				shell: false,
-				stdio: ['ignore', 'pipe', 'inherit'],
+				stdio: ['pipe', 'pipe', 'inherit'],
 			});
 		}
 
 		return await new Promise((resolve, reject) => {
 			let output = '';
+			if (stdinText) {
+				stream.stdin.write(stdinText);
+			}
+			stream.stdin.end();
 			stream.stdout.on('data', (chunk) => {
 				output += chunk.toString();
 			});
@@ -1045,15 +1100,20 @@ export class DebugBridge {
 
 	async lzcDockerCompose(argv) {
 		await this.backendVersion020();
-		const stream = this.isBuildRemoteMode()
-			? spawn(sshBinary(), this.remoteBridgeArgs(['lzc-docker-compose', ...argv], { tty: true }), {
-					shell: false,
-					stdio: 'inherit',
-				})
-			: spawn(sshBinary(), [...sshCmdArgs(`box@${await resolveDomain(this.domain)}`), '-t', 'lzc-docker-compose', ...argv], {
-					shell: true,
-					stdio: 'inherit',
-				});
+		let stream;
+		if (this.isBuildRemoteMode()) {
+			stream = spawn(sshBinary(), this.remoteBridgeArgs(['lzc-docker-compose', ...argv], { tty: true }), {
+				shell: false,
+				stdio: 'inherit',
+			});
+		} else {
+			const resolvedIp = await resolveDomain(this.domain);
+			const remoteCommand = buildSSHRemoteCommand(['lzc-docker-compose', ...argv]);
+			stream = spawn(sshBinary(), [...sshCmdArgsRaw(`box@${resolvedIp}`), '-t', remoteCommand], {
+				shell: false,
+				stdio: 'inherit',
+			});
+		}
 		return new Promise((resolve, reject) => {
 			stream.on('close', (code) => {
 				code == 0 ? resolve() : reject();