@lazycatcloud/lzc-cli 1.2.7 → 1.2.10

package/lib/app/index.js

@@ -36,8 +36,6 @@ export function lpkProjectCommand(program) {
         });
       },
       handler: async ({ context, output, file }) => {
-        await shellApi.init();
-
         const lpk = await new LpkBuild(context, file).init();
         // 正常的打包逻辑不需要 devshell
         lpk.onBeforeBuildPackage(async (options) => {

package/lib/app/lpk_devshell.js

@@ -244,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]);
@@ -427,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/shellapi.js

@@ -4,6 +4,7 @@ import { contextDirname } from "./utils.js";
 import path from "node:path";
 import fs from "node:fs";
 import os from "node:os";
+import logger from "loglevel";
 
 /**
  * @link {https://www.npmjs.com/package/appdirs}
@@ -84,10 +85,15 @@ class ShellApi {
   }
 
   async initBoxInfo() {
-    const boxes = await this.boxList();
-    const box = boxes.find((b) => b.is_default_box);
-    if (box) {
-      return { uid: box.login_user, boxname: box.box_name };
+    try {
+      const boxes = await this.boxList();
+      const box = boxes.find((b) => b.is_default_box);
+      if (box) {
+        return { uid: box.login_user, boxname: box.box_name };
+      }
+    } catch (e) {
+      logger.debug("Error: ", e);
+      throw "获取盒子信息失败，请检查客户端是否已经连接!";
     }
     throw "没有默认盒子信息, 请先使用 lzc-cli box switch 设置默认的盒子信息";
   }

package/package.json

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

package/template/_lpk/exec.sh

@@ -1,5 +1,13 @@
 #!/bin/sh
 
+# 设置 lzcapp 环境变量
+# 从1号进程读取环境变量
+cat > /tmp/lzcapp_env.sh << EOF
+#!/bin/sh
+$(/lzcapp/pkg/content/devshell/busybox tr '\0' '\n' < /proc/1/environ | /lzcapp/pkg/content/devshell/busybox xargs -I{} echo export {})
+EOF
+. /tmp/lzcapp_env.sh
+
 # 执行 setupscript 脚本
 SETUPSCRIPT=/lzcapp/pkg/content/devshell/setupscript
 if [ -f $SETUPSCRIPT ];then