@lazycatcloud/lzc-cli 2.0.0-pre.7 → 2.0.0-pre.8

package/changelog.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [2.0.0-pre.8](https://gitee.com/linakesi/lzc-cli/compare/v2.0.0-pre.7...v2.0.0-pre.8) (2026-03-27)
+
+### Bug Fixes
+
+- keep waiting for dev id sync until app reaches a terminal state
+- use app name map for apk trigger
+- include pkg hash in appstore publish payload
+- use debug bridge version for ssh probe
+- fix backend/frontend build
+
 ## [2.0.0-pre.7](https://gitee.com/linakesi/lzc-cli/compare/v2.0.0-pre.6...v2.0.0-pre.7) (2026-03-26)
 
 ### Features

package/lib/app/lpk_installer.js

@@ -109,7 +109,7 @@ export class LpkInstaller {
 
 			logger.debug(t('lzc_cli.lib.app.lpk_installer.install_from_file_gen_apk_tips', '是否生成APK:'), installConfig.apk);
 			if (installConfig.apk) {
-				triggerApk(manifest['package'], manifest['name'], path.resolve(path.join(tempDir, 'icon.png'))).catch((err) => {
+				triggerApk(manifest['package'], manifest, path.resolve(path.join(tempDir, 'icon.png'))).catch((err) => {
 					logger.debug(t('lzc_cli.lib.app.lpk_installer.install_from_file_gen_apk_error', '生成 APK 失败: '), err);
 					logger.debug(t('lzc_cli.lib.app.lpk_installer.install_from_file_gen_apk_error_tips', '生成 APK 失败，使用 lzc-cli project devshell --apk n 忽略该错误'));
 				});

package/lib/app/project_deploy.js

@@ -33,15 +33,18 @@ export function buildProjectStartupFailureMessage(deploy = {}, errmsg = '') {
 	return `Project app entered error state before dev.id sync. Instance status: ${instanceStatus}.${suffix}`;
 }
 
+export function isProjectStartupTerminalState(deploy = {}) {
+	const appStatus = String(deploy?.appStatus ?? '').trim().toLowerCase();
+	const instanceStatus = String(deploy?.instanceStatus ?? '').trim().toLowerCase();
+	if (appStatus === 'failed' || appStatus === 'paused') {
+		return true;
+	}
+	return instanceStatus.includes('error') || instanceStatus.includes('paused');
+}
+
 async function detectProjectStartupFailure(runtime) {
 	const deploy = await getProjectDeployInfo(runtime);
-	const appStatus = String(deploy?.appStatus ?? '').trim();
-	const instanceStatus = String(deploy?.instanceStatus ?? '').trim();
-	const instanceStatusLower = instanceStatus.toLowerCase();
-	if (appStatus === 'NotInstalled') {
-		throw new Error('Project package is not installed after deploy. Please retry and run "lzc-cli project info" for details.');
-	}
-	if (!instanceStatusLower.includes('error')) {
+	if (!isProjectStartupTerminalState(deploy)) {
 		return null;
 	}
 	const errmsg = await getProjectErrmsgByDeployId(runtime, deploy.deployId);
@@ -51,8 +54,8 @@ async function detectProjectStartupFailure(runtime) {
 async function syncProjectDevID(runtime, { waitForContainer = false } = {}) {
 	const devId = await runtime.bridge.resolveDevId();
 	logger.info(`Sync dev.id: ${devId || '<empty>'}`);
-	const maxAttempts = waitForContainer ? 30 : 1;
-	for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+	let attempt = 1;
+	for (;;) {
 		try {
 			await runtime.bridge.syncDevID(runtime.pkgId, devId, runtime.userApp);
 			logger.info('dev id synced successfully.');
@@ -62,13 +65,11 @@ async function syncProjectDevID(runtime, { waitForContainer = false } = {}) {
 				throw error;
 			}
 			await detectProjectStartupFailure(runtime);
-			if (attempt === maxAttempts) {
-				throw error;
-			}
 			if (attempt === 1) {
 				logger.info('Waiting for app container before syncing dev.id...');
 			}
 			await new Promise((resolve) => setTimeout(resolve, 1000));
+			attempt += 1;
 		}
 	}
 }

package/lib/appstore/apkshell.js

@@ -7,16 +7,53 @@ 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) {
+function buildAppNameMap(appInfo) {
+	if (typeof appInfo === 'string') {
+		const name = appInfo.trim();
+		return name ? { zh: name } : {};
+	}
+
+	if (!appInfo || typeof appInfo !== 'object' || Array.isArray(appInfo)) {
+		return {};
+	}
+
+	if (appInfo.name && typeof appInfo.name === 'object' && !Array.isArray(appInfo.name)) {
+		const directNameMap = Object.fromEntries(
+			Object.entries(appInfo.name).filter(([, value]) => typeof value === 'string' && value.trim() !== ''),
+		);
+		if (Object.keys(directNameMap).length > 0) {
+			return directNameMap;
+		}
+	}
+
+	if (appInfo.locales && typeof appInfo.locales === 'object' && !Array.isArray(appInfo.locales)) {
+		const localizedNameMap = Object.fromEntries(
+			Object.entries(appInfo.locales)
+				.map(([locale, value]) => [locale, typeof value?.name === 'string' ? value.name.trim() : ''])
+				.filter(([, value]) => value !== ''),
+		);
+		if (Object.keys(localizedNameMap).length > 0) {
+			return localizedNameMap;
+		}
+	}
+
+	const name = typeof appInfo.name === 'string' ? appInfo.name.trim() : '';
+	return name ? { zh: name } : {};
+}
+
+export async function triggerApk(id, appInfo, 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 requestUrl = `${appStoreServerUrl}/api/trigger_latest_for_app`;
 	const form = new FormData();
 	form.append('app_id', id);
-	form.append('app_name', appName);
+	const appNameMap = buildAppNameMap(appInfo);
+	if (Object.keys(appNameMap).length > 0) {
+		form.append('app_name_map', JSON.stringify(appNameMap));
+	}
 
 	if (iconPath && fs.existsSync(iconPath)) {
 		const iconBuffer = fs.readFileSync(iconPath);
@@ -27,13 +64,28 @@ export async function triggerApk(id, name, iconPath) {
 	const timer = setTimeout(() => controller.abort(), 5000);
 
 	try {
-		const resp = await fetch(`${appStoreServerUrl}/api/trigger_latest_for_app`, {
+		logger.debug('triggerApk request:', {
+			url: requestUrl,
+			appId: id,
+			hasAppNameMap: Object.keys(appNameMap).length > 0,
+			appNameMapKeys: Object.keys(appNameMap),
+			hasAppIcon: Boolean(iconPath && fs.existsSync(iconPath)),
+			appIconPath: iconPath || '',
+		});
+
+		const resp = await fetch(requestUrl, {
 			method: 'POST',
 			body: form,
 			signal: controller.signal,
 		});
 
-		logger.debug('triggerApk resp:', resp);
+		logger.debug('triggerApk response:', {
+			url: requestUrl,
+			appId: id,
+			status: resp.status,
+			statusText: resp.statusText,
+			ok: resp.ok,
+		});
 		if (resp.status == 304) {
 			logger.debug(t('lzc_cli.lib.appstore.apkshell.trigger_apk_build_tips', `APK构建任务已创建成功,如需使用安卓端,请耐心等待1分钟左右`));
 		} else if (resp.status <= 201) {
@@ -43,8 +95,16 @@ export async function triggerApk(id, name, iconPath) {
 			throw t('lzc_cli.lib.appstore.apkshell.trigger_apk_build_failed_tips', `请求生成应用出错! 使用 --apk=n 停止生成APK`);
 		}
 	} catch (error) {
-		logger.debug(error);
+		logger.debug('triggerApk error:', {
+			url: requestUrl,
+			appId: id,
+			error,
+		});
 	} finally {
 		clearTimeout(timer);
 	}
 }
+
+export const __test__ = {
+	buildAppNameMap,
+};

package/lib/appstore/publish.js

@@ -360,6 +360,7 @@ export class Publish {
 				name: lpkInfo.version,
 				icon_path: lpkInfo.iconPath,
 				pkg_path: lpkInfo.url,
+				pkg_hash: lpkInfo.sha256,
 				unsupported_platforms: lpkInfo.unsupportedPlatforms,
 				min_os_version: lpkInfo.minOsVersion,
 				lpk_size: lpkInfo.lpkSize,

package/lib/debug_bridge.js

@@ -1,15 +1,12 @@
 import fs from 'node:fs';
 import spawn from 'cross-spawn';
 import logger from 'loglevel';
-import fetch from 'node-fetch';
 
 import shellApi from './shellapi.js';
-import { _SYSTEM_ENV_PREFIX } from './config/env.js';
 import { isTraceMode, resolveDomain, sleep, findSshPublicKey, selectSshPublicKey, isWindows, compareVersions } from './utils.js';
 import { t } from './i18n/index.js';
 import { resolveBuildRemoteFromFile } from './build_remote.js';
 
-const bannerfileContent = `˄=ᆽ=ᐟ \\`;
 const DEBUG_BRIDGE_CONTAINER = 'cloudlazycatdevelopertools-app-1';
 const DEBUG_BRIDGE_BINARY = '/lzcapp/pkg/content/debug.bridge';
 const DEBUG_BRIDGE_APP_ID = 'cloud.lazycat.developer.tools';
@@ -52,6 +49,15 @@ export function buildLegacySSHArgs(target, commandArgs = [], { tty = false } = {
 	return args;
 }
 
+export function buildLegacySSHProbeArgs(target) {
+	const args = ['-o', 'StrictHostKeyChecking=no', '-o', 'UserKnownHostsFile=/dev/null', '-o', 'ControlMaster=no', '-o', 'BatchMode=yes', '-o', 'PreferredAuthentications=publickey', '-o', 'PasswordAuthentication=no', '-o', 'KbdInteractiveAuthentication=no', '-p', '22222'];
+	if (isTraceMode()) {
+		args.push('-v');
+	}
+	args.push(target, 'version');
+	return args;
+}
+
 function stripAnsi(text = '') {
 	return String(text).replace(/\x1b\[[0-9;]*[A-Za-z]/g, '');
 }
@@ -131,6 +137,38 @@ function normalizeErrorMessage(error) {
 	return String(error).trim();
 }
 
+function extractLegacySSHProbeDetail(result = {}) {
+	const parts = [];
+	const errorMessage = normalizeErrorMessage(result?.error);
+	if (errorMessage) {
+		parts.push(errorMessage);
+	}
+	const stderr = String(result?.stderr ?? '').trim();
+	if (stderr) {
+		parts.push(stderr);
+	}
+	const stdout = String(result?.stdout ?? '').trim();
+	if (stdout) {
+		parts.push(stdout);
+	}
+	return stripAnsi(parts.join('\n')).trim();
+}
+
+export function classifyLegacySSHProbeResult(result = {}) {
+	if (result?.status === 0) {
+		return 'ok';
+	}
+	const detail = extractLegacySSHProbeDetail(result).toLowerCase();
+	if (
+		detail.includes('permission denied') ||
+		detail.includes('publickey') ||
+		detail.includes('too many authentication failures')
+	) {
+		return 'unauthorized';
+	}
+	return 'unavailable';
+}
+
 export function shellEscapeArg(value) {
 	const text = String(value ?? '');
 	if (text === '') {
@@ -157,7 +195,6 @@ export class DebugBridge {
 			this.boxname = shellApi.boxname;
 		}
 		this.domain = `dev.${this.boxname}.heiyu.space`;
-		this.checkUseResolve = !!process.env[`${_SYSTEM_ENV_PREFIX}_CHECK_DNS_RESOLVE`];
 	}
 
 	isBuildRemoteMode() {
@@ -320,6 +357,19 @@ export class DebugBridge {
 		return shellApi.resolveClientId();
 	}
 
+	async probeLegacySSHAccess() {
+		const resolvedIp = await resolveDomain(this.domain);
+		const ssh = spawn.sync(sshBinary(), buildLegacySSHProbeArgs(`box@${resolvedIp}`), {
+			shell: false,
+			encoding: 'utf-8',
+			stdio: ['pipe', 'pipe', 'pipe'],
+		});
+		return {
+			kind: classifyLegacySSHProbeResult(ssh),
+			detail: extractLegacySSHProbeDetail(ssh),
+		};
+	}
+
 	async init() {
 		await this.checkDevTools();
 		if (!(await this.canPublicKey())) {
@@ -348,39 +398,26 @@ export class DebugBridge {
 			}
 		}
 
-		let domain = this.domain;
-		if (this.checkUseResolve) {
-			try {
-				const _ipv6 = await resolveDomain(this.domain, true);
-				domain = `[${_ipv6}]`;
-			} catch {}
-		}
-		const url = `https://${domain}/bannerfile`;
-		return new Promise((resolve, reject) => {
-			fetch(url, { redirect: 'error' })
-				.then(async (res) => {
-					const content = await res.text();
-					if (res.status == 200 && content == bannerfileContent) {
-						resolve();
-						return;
-					}
-					logger.warn(
-						t(
-							'lzc_cli.lib.debug_bridge.check_dev_tools_not_exist_tips',
-							`检测到你还没有安装 '懒猫开发者工具'，请先到商店中搜索安装
+		try {
+			const probe = await this.probeLegacySSHAccess();
+			if (probe.kind !== 'unavailable') {
+				return;
+			}
+			logger.warn(
+				t(
+					'lzc_cli.lib.debug_bridge.check_dev_tools_not_exist_tips',
+					`检测到你还没有安装 '懒猫开发者工具'，请先到商店中搜索安装
 点击直接跳转 https://appstore.{{ boxname }}.heiyu.space/#/shop/detail/cloud.lazycat.developer.tools
 点击打开应用 https://dev.{{ boxname }}.heiyu.space 查看应用状态
 `,
-							{ boxname: this.boxname, interpolation: { escapeValue: false } },
-						),
-					);
-					reject();
-				})
-				.catch((err) => {
-					logger.error(t('lzc_cli.lib.debug_bridge.check_dev_tools_fail_tips', `检测懒猫开发者工具失败，请检测您当前的网络或者懒猫微服客户端是否正常启动。`), err);
-					reject();
-				});
-		});
+					{ boxname: this.boxname, interpolation: { escapeValue: false } },
+				),
+			);
+			throw new Error(probe.detail || t('lzc_cli.lib.debug_bridge.check_dev_tools_fail_tips', `检测懒猫开发者工具失败，请检测您当前的网络或者懒猫微服客户端是否正常启动。`));
+		} catch (err) {
+			logger.error(t('lzc_cli.lib.debug_bridge.check_dev_tools_fail_tips', `检测懒猫开发者工具失败，请检测您当前的网络或者懒猫微服客户端是否正常启动。`), err);
+			throw err;
+		}
 	}
 
 	async common(cmd, args) {
@@ -471,8 +508,8 @@ export class DebugBridge {
 			return ssh.status === 0;
 		}
 		try {
-			await this.common(sshBinary(), buildLegacySSHArgs(`box@${this.domain}`));
-			return true;
+			const probe = await this.probeLegacySSHAccess();
+			return probe.kind === 'ok';
 		} catch (err) {
 			logger.debug('canPublicKey error: ', err);
 			if (err?.code == 'ETIMEOUT') {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lazycatcloud/lzc-cli",
-	"version": "2.0.0-pre.7",
+	"version": "2.0.0-pre.8",
 	"description": "lazycat cloud developer kit",
 	"scripts": {
 		"release": "release-it patch",