@lazycatcloud/lzc-cli 1.2.6 → 1.2.8

package/lib/app/index.js

@@ -31,6 +31,7 @@ export function lpkProjectCommand(program) {
         args.option("f", {
           alias: "file",
           describe: "指定构建的lzc-build.yml文件",
+          default: "lzc-build.yml",
           type: "string",
         });
       },
@@ -86,7 +87,7 @@ export function lpkProjectCommand(program) {
           }
           return options;
         });
-        const app = new AppDevShell(cwd, lpkBuild, force);
+        const app = new AppDevShell(cwd, lpkBuild, force, config);
         await app.init();
         await app.build();
         await sleep(2000);

package/lib/app/lpk_build.js

@@ -109,10 +109,10 @@ function convenientEnv() {
 }
 
 export class LpkBuild {
-  constructor(cwd, lzcBuild = "lzc-build.yml") {
+  constructor(cwd, buildConfigFile) {
     this.pwd = cwd ?? process.cwd();
 
-    this.optionsFilePath = path.join(this.pwd, lzcBuild);
+    this.optionsFilePath = path.join(this.pwd, buildConfigFile);
     this.options = loadFromYaml(this.optionsFilePath);
 
     this.manifestFilePath = this.options["manifest"]

package/lib/app/lpk_devshell.js

@@ -33,11 +33,11 @@ import { collectContextFromDockerFile } from "./lpk_devshell_docker.js";
 // - 根据 backend api 判断一个 appid 是否属于 running
 // - 根据在 backend api 中判断同步的目录下是否存在文件 判断当前运行的 app 是否已经有一个挂载的实例，避免重复挂载
 class AppDevShellMonitor {
-  constructor(cwd, pkgId) {
+  constructor(cwd, pkgId, buildConfigFile) {
     this.pwd = cwd ? path.resolve(cwd) : process.cwd();
     this.pkgId = pkgId;
 
-    this.optionsFilePath = path.join(this.pwd, "lzc-build.yml");
+    this.optionsFilePath = path.join(this.pwd, buildConfigFile);
     this.options = loadFromYaml(this.optionsFilePath);
 
     this.manifestFilePath = this.options["manifest"]
@@ -104,19 +104,21 @@ class AppDevShellMonitor {
 }
 
 export class AppDevShell {
-  constructor(cwd, lpkBuild, forceBuild = false) {
+  constructor(cwd, lpkBuild, forceBuild, buildConfigFile) {
     this.cwd = cwd;
     this.lpkBuild = lpkBuild;
-    this.monitor = undefined;
     this.forceBuild = forceBuild;
+    this.buildConfigFile = buildConfigFile;
     this.isUserApp = false;
+    this.monitor = undefined;
   }
 
   async init() {
     const manifest = await this.lpkBuild.getManifest();
     this.monitor = await new AppDevShellMonitor(
       this.cwd,
-      manifest["package"]
+      manifest["package"],
+      this.buildConfigFile
     ).init();
     this.isUserApp = isUserApp(manifest);
   }
@@ -242,11 +244,15 @@ export class AppDevShell {
     });
 
     // 在生成 manifest.yml 之前合并 lzc-build.yml devshell 字段的值
+    // 并加上 health_check 字段
     this.lpkBuild.onBeforeDumpYaml(async (manifest, options) => {
       logger.debug("merge lzc-build.yml devshell services\n", options);
       const devshell = {
         application: {
           devshell: options["devshell"],
+          health_check: {
+            test_url: `app.${manifest["package"]}.lzcapp/__isdevshell`,
+          },
         },
       };
       return mergeYamlInMemory([manifest, devshell]);
@@ -425,7 +431,7 @@ class DevShell {
     const dest = `root@${host}:/lzcapp/cache/devshell`;
     try {
       execSync(
-        `rsync ${rsyncDebug} --rsh='${rsh}' --recursive --relative --perms --update --filter=':- .gitignore' --ignore-errors --usermap=:nobody --groupmap=*:nobody . ${dest}`,
+        `rsync ${rsyncDebug} --rsh='${rsh}' --recursive --relative --perms --update --filter=':- .gitignore' --ignore-errors . ${dest}`,
         { stdio: ["ignore", "inherit", "inherit"] }
       );
     } catch (err) {

package/lib/box/index.js

@@ -10,6 +10,14 @@ export function boxCommand(box) {
         await shellapi.setDefaultBox(boxname);
       },
     },
+    {
+      command: "default",
+      desc: "输出当前默认的盒子名",
+      handler: async () => {
+        await shellapi.init();
+        console.log(shellapi.boxname);
+      },
+    },
     {
       command: "list",
       desc: "查看盒子列表",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "lazycat cloud developer kit",
   "files": [
     "template",