@lazycatcloud/lzc-cli 1.3.12 → 1.3.14

package/lib/app/lpk_devshell_docker.js

@@ -1,54 +1,55 @@
-import path from "node:path"
-import fs from "node:fs"
-import { DockerfileParser } from "dockerfile-ast"
-import glob from "fast-glob"
-import ignore from "@balena/dockerignore"
-import { tarContentDir } from "../utils.js"
+import path from 'node:path';
+import fs from 'node:fs';
+import { DockerfileParser } from 'dockerfile-ast';
+import glob from 'fast-glob';
+import ignore from '@balena/dockerignore';
+import { tarContentDir } from '../utils.js';
+import { t } from '../i18n/index.js';
 
 export async function collectContextFromDockerFile(contextDir, dockerfilePath) {
-  if (!fs.existsSync(dockerfilePath)) {
-    throw "未发现 Dockerfile"
-  }
+	if (!fs.existsSync(dockerfilePath)) {
+		throw t('lzc_cli.lib.app.lpk_devshell_docker.not_exists_dockerfile_fail', '未发现 Dockerfile');
+	}
 
-  let src = []
+	let src = [];
 
-  // 通过 COPY 和 ADD 获取所有context中的文件
-  const ast = DockerfileParser.parse(fs.readFileSync(dockerfilePath, "utf8"))
-  for (let a of ast.getInstructions()) {
-    if (["COPY", "ADD"].includes(a.getInstruction())) {
-      const from = a.getArguments()[0].getValue().replace(/^\//, "")
-      const fromFullPath = path.resolve(contextDir, from)
+	// 通过 COPY 和 ADD 获取所有context中的文件
+	const ast = DockerfileParser.parse(fs.readFileSync(dockerfilePath, 'utf8'));
+	for (let a of ast.getInstructions()) {
+		if (['COPY', 'ADD'].includes(a.getInstruction())) {
+			const from = a.getArguments()[0].getValue().replace(/^\//, '');
+			const fromFullPath = path.resolve(contextDir, from);
 
-      if (fs.existsSync(fromFullPath)) {
-        const stat = fs.statSync(fromFullPath)
-        if (stat.isDirectory()) {
-          let files = await glob(path.join(from, "**"), {
-            cwd: contextDir
-          })
-          src = src.concat(files)
-        } else if (stat.isFile()) {
-          src.push(from)
-        }
-      } else {
-        // try use glob
-        let files = await glob(from, {
-          cwd: contextDir
-        })
-        src = src.concat(files)
-      }
-    }
-  }
-  // filter by dockerignore
-  const dockerIgnoreFile = path.join(contextDir, ".dockerignore")
-  if (fs.existsSync(dockerIgnoreFile)) {
-    let ig = ignore()
-    let data = fs.readFileSync(dockerIgnoreFile, "utf8")
-    ig.add(data.split("\n"))
-    src = ig.filter(src)
-  }
+			if (fs.existsSync(fromFullPath)) {
+				const stat = fs.statSync(fromFullPath);
+				if (stat.isDirectory()) {
+					let files = await glob(path.join(from, '**'), {
+						cwd: contextDir,
+					});
+					src = src.concat(files);
+				} else if (stat.isFile()) {
+					src.push(from);
+				}
+			} else {
+				// try use glob
+				let files = await glob(from, {
+					cwd: contextDir,
+				});
+				src = src.concat(files);
+			}
+		}
+	}
+	// filter by dockerignore
+	const dockerIgnoreFile = path.join(contextDir, '.dockerignore');
+	if (fs.existsSync(dockerIgnoreFile)) {
+		let ig = ignore();
+		let data = fs.readFileSync(dockerIgnoreFile, 'utf8');
+		ig.add(data.split('\n'));
+		src = ig.filter(src);
+	}
 
-  const dockerfile = path.relative(contextDir, dockerfilePath)
-  src.push(dockerfile) // DON'T IGNORE DOCKERFILE
-  const output = path.join(contextDir, "lzc-build-image-context.tar")
-  return await tarContentDir(src, output, contextDir)
+	const dockerfile = path.relative(contextDir, dockerfilePath);
+	src.push(dockerfile); // DON'T IGNORE DOCKERFILE
+	const output = path.join(contextDir, 'lzc-build-image-context.tar');
+	return await tarContentDir(src, output, contextDir);
 }

package/lib/app/lpk_installer.js

@@ -1,141 +1,138 @@
-import logger from "loglevel"
-import fs from "node:fs"
-import path from "node:path"
-import { loadFromYaml, Downloader, unzipSync } from "../utils.js"
-import { DebugBridge } from "../debug_bridge.js"
-import shellapi from "../shellapi.js"
-import { triggerApk } from "./apkshell.js"
+import logger from 'loglevel';
+import fs from 'node:fs';
+import path from 'node:path';
+import { loadFromYaml, Downloader, unzipSync } from '../utils.js';
+import { DebugBridge } from '../debug_bridge.js';
+import shellapi from '../shellapi.js';
+import { t } from '../i18n/index.js';
+import { triggerApk } from './apkshell.js';
 
-export const installConfig = { apk: true }
+export const installConfig = { apk: true };
 // 从一个目录中找出修改时间最新的包
 function findOnceLpkByDir(dir = process.cwd()) {
-  const pkg = fs
-    .readdirSync(dir)
-    .map((filename) => {
-      const stat = fs.statSync(path.resolve(dir, filename))
-      return { filename, mtime: stat.mtime }
-    })
-    .sort((a, b) => {
-      return b.mtime - a.mtime
-    })
-    .find((entry) => {
-      return entry.filename.endsWith(".lpk")
-    })
-  return pkg?.filename ? path.resolve(dir, pkg.filename) : ""
+	const pkg = fs
+		.readdirSync(dir)
+		.map((filename) => {
+			const stat = fs.statSync(path.resolve(dir, filename));
+			return { filename, mtime: stat.mtime };
+		})
+		.sort((a, b) => {
+			return b.mtime - a.mtime;
+		})
+		.find((entry) => {
+			return entry.filename.endsWith('.lpk');
+		});
+	return pkg?.filename ? path.resolve(dir, pkg.filename) : '';
 }
 
 export class LpkInstaller {
-  constructor() { }
+	constructor() { }
 
-  async init() { }
+	async init() { }
 
-  // deploy 构建和安装
-  async deploy(builder) {
-    if (!builder) {
-      throw "deploy 必须传递一个 builder"
-    }
+	// deploy 构建和安装
+	async deploy(builder) {
+		if (!builder) {
+			throw t('lzc_cli.lib.app.lpk_installer.deploy_not_exists_builder_fail', 'deploy 必须传递一个 builder');
+		}
 
-    let pkgPath = await builder.exec()
-    logger.info("开始部署应用")
-    // FIXME: 这里是前面exec输出的pkgPath还有异步的地方没有await到,临时setTimeout处理一下,后期让@llh看一下
-    await new Promise((resolve, reject) => {
-      setTimeout(async () => {
-        await this.installFromFile(pkgPath)
-          .then(() => resolve(true))
-          .catch(reject)
-      }, 50)
-    })
-  }
+		let pkgPath = await builder.exec();
+		logger.info(t('lzc_cli.lib.app.lpk_installer.deploy_start_tips', '开始部署应用'));
+		// FIXME: 这里是前面exec输出的pkgPath还有异步的地方没有await到,临时setTimeout处理一下,后期让@llh看一下
+		await new Promise((resolve, reject) => {
+			setTimeout(async () => {
+				await this.installFromFile(pkgPath)
+					.then(() => resolve(true))
+					.catch(reject);
+			}, 50);
+		});
+	}
 
-  async install(pkgPath) {
-    if (pkgPath.startsWith("http")) {
-      return this.installFromUrl(pkgPath)
-    } else if (fs.statSync(pkgPath).isDirectory()) {
-      return this.installFromDirectory(pkgPath)
-    } else {
-      return this.installFromFile(pkgPath)
-    }
-  }
+	async install(pkgPath) {
+		if (pkgPath.startsWith('http')) {
+			return this.installFromUrl(pkgPath);
+		} else if (fs.statSync(pkgPath).isDirectory()) {
+			return this.installFromDirectory(pkgPath);
+		} else {
+			return this.installFromFile(pkgPath);
+		}
+	}
 
-  async installFromDirectory(dir) {
-    const lpk = findOnceLpkByDir(dir)
-    if (lpk) {
-      logger.info(`正在安装自动扫描出来的lpk包(${lpk})`)
-    }
-    return this.installFromFile(lpk)
-  }
+	async installFromDirectory(dir) {
+		const lpk = findOnceLpkByDir(dir);
+		if (lpk) {
+			logger.info(t('lzc_cli.lib.app.lpk_installer.install_from_dir_scan_tips', `正在安装自动扫描出来的lpk包({{ lpk }})`, { lpk, interpolation: { escapeValue: false } }));
+		}
+		return this.installFromFile(lpk);
+	}
 
-  async installFromUrl(url) {
-    let downloader = new Downloader()
-    const tempDir = fs.mkdtempSync(".lzc-cli-install")
-    try {
-      let pkgPath = path.join(tempDir, "a.lpk")
-      logger.debug("开始下载lpk")
-      await downloader.download(url, pkgPath)
-      logger.debug("下载完成", pkgPath)
-      await this.installFromFile(pkgPath)
-    } catch (e) {
-      throw e
-    } finally {
-      fs.rmSync(tempDir, { recursive: true })
-    }
-  }
+	async installFromUrl(url) {
+		let downloader = new Downloader();
+		const tempDir = fs.mkdtempSync('.lzc-cli-install');
+		try {
+			let pkgPath = path.join(tempDir, 'a.lpk');
+			logger.debug(t('lzc_cli.lib.app.lpk_installer.install_form_url_download_lpk_tips', '开始下载lpk'));
+			await downloader.download(url, pkgPath);
+			logger.debug(t('lzc_cli.lib.app.lpk_installer.install_form_url_download_lpk_done_tips', '下载完成'), pkgPath);
+			await this.installFromFile(pkgPath);
+		} catch (e) {
+			throw e;
+		} finally {
+			fs.rmSync(tempDir, { recursive: true });
+		}
+	}
 
-  async installFromFile(pkgPath) {
-    if (!pkgPath) {
-      throw "install 必须指定一个 pkg 路径"
-    }
+	async installFromFile(pkgPath) {
+		if (!pkgPath) {
+			throw t('lzc_cli.lib.app.lpk_installer.install_from_file_lpk_path_fail', 'install 必须指定一个 pkg 路径');
+		}
 
-    if (!fs.existsSync(pkgPath)) {
-      throw `${pkgPath} 不存在`
-    }
+		if (!fs.existsSync(pkgPath)) {
+			throw t('lzc_cli.lib.app.lpk_installer.install_from_file_lpk_path_not_exists_fail', `{{ pkgPath }} 不存在`, { pkgPath, interpolation: { escapeValue: false } });
+		}
 
-    const tempDir = fs.mkdtempSync(".lzc-cli-install")
-    let manifest
-    try {
-      unzipSync(pkgPath, tempDir, ["manifest.yml", "icon.png"])
-      manifest = loadFromYaml(path.join(tempDir, "manifest.yml"))
-      if (!manifest["application"]["subdomain"]) {
-        throw "manifest.yml 中的 `application.subdomain` 字段不能为空"
-      }
+		const tempDir = fs.mkdtempSync('.lzc-cli-install');
+		let manifest;
+		try {
+			unzipSync(pkgPath, tempDir, ['manifest.yml', 'icon.png']);
+			manifest = loadFromYaml(path.join(tempDir, 'manifest.yml'));
+			if (!manifest['application']['subdomain']) {
+				throw t('lzc_cli.lib.app.lpk_installer.install_from_file_manifest_not_exists_app_subdomain_fail', 'manifest.yml 中的 `application.subdomain` 字段不能为空');
+			}
 
-      logger.debug("是否生成APK:", installConfig.apk)
-      if (installConfig.apk) {
-        triggerApk(
-          manifest["package"],
-          manifest["name"],
-          path.resolve(path.join(tempDir, "icon.png"))
-        ).catch((err) => {
-          logger.debug("生成 APK 失败: ", err)
-          logger.debug(
-            "生成 APK 失败，使用 lzc-cli project devshell --apk n 忽略该错误"
-          )
-        })
-      }
-      logger.debug("lpk manifest", manifest)
-    } catch (err) {
-      logger.debug("parse manifest ", err)
-    } finally {
-      fs.rmSync(tempDir, { recursive: true })
-    }
+			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) => {
+					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 忽略该错误'));
+				});
+			}
+			logger.debug('lpk manifest', manifest);
+		} catch (err) {
+			logger.debug('parse manifest ', err);
+		} finally {
+			fs.rmSync(tempDir, { recursive: true });
+		}
 
-    try {
-      const bridge = new DebugBridge()
-      await bridge.init()
-      logger.info("开始安装应用")
-      await bridge.install(pkgPath, manifest ? manifest["package"] : "")
-      logger.info("\n")
-      logger.info(`安装成功！`)
-      if (manifest) {
-        logger.info(
-          `👉 请在浏览器中访问 https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`
-        )
-        logger.info(`👉 并使用微服的用户名和密码登录`)
-      }
-    } catch(error) {
-      logger.error(
-        `安装失败: ${error}`
-      )
-    }
-  }
+		try {
+			const bridge = new DebugBridge();
+			await bridge.init();
+			logger.info(t('lzc_cli.lib.app.lpk_installer.install_from_file_start_tips', '开始安装应用'));
+			await bridge.install(pkgPath, manifest ? manifest['package'] : '');
+			logger.info('\n');
+			logger.info(t('lzc_cli.lib.app.lpk_installer.install_from_file_success_tips', `安装成功！`));
+			if (manifest) {
+				logger.info(
+					t('lzc_cli.lib.app.lpk_installer.install_from_file_done_tips', `👉 请在浏览器中访问 https://{{ subdomain }}.{{ boxname }}.heiyu.space`, {
+						subdomain: manifest['application']['subdomain'],
+						boxname: shellapi.boxname,
+						interpolation: { escapeValue: false }
+					}),
+				);
+				logger.info(t('lzc_cli.lib.app.lpk_installer.install_from_file_login_tips', `👉 并使用微服的用户名和密码登录`));
+			}
+		} catch (error) {
+			logger.error(t('lzc_cli.lib.app.lpk_installer.install_from_file_fail_tips', `安装失败: {{ error }}`, { error, interpolation: { escapeValue: false } }));
+		}
+	}
 }