@lazycatcloud/lzc-cli 1.2.5 → 1.2.7

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_debug_bridge.js

@@ -21,16 +21,20 @@ export class DebugBridge {
     });
   }
 
-  async install(lpkPath) {
+  async install(lpkPath, pkgId) {
     if (!(await this.canPublicKey())) {
       await this.sshCopyId();
     }
 
     const stream = fs.createReadStream(lpkPath);
-    const ssh = spawn(this.sshCmd, [`install --uid ${this.uid}`], {
-      shell: true,
-      stdio: ["pipe", "inherit", "inherit"],
-    });
+    const ssh = spawn(
+      this.sshCmd,
+      [`install --uid ${this.uid} --pkgId ${pkgId}`],
+      {
+        shell: true,
+        stdio: ["pipe", "inherit", "inherit"],
+      }
+    );
     stream.pipe(ssh.stdin);
     return new Promise((resolve, reject) => {
       ssh.on("close", (code) => {

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);
   }

package/lib/app/lpk_installer.js

@@ -38,7 +38,7 @@ export class LpkInstaller {
     let pkgPath = await builder.exec();
     logger.info("开始部署应用");
     const bridge = new DebugBridge();
-    await bridge.install(pkgPath);
+    await bridge.install(pkgPath, manifest["package"]);
     const appUrl = `https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`;
     logger.info(`👉 请在浏览器中访问 ${appUrl}`);
   }
@@ -98,7 +98,7 @@ export class LpkInstaller {
 
     const bridge = new DebugBridge();
     logger.info("开始安装应用");
-    await bridge.install(pkgPath);
+    await bridge.install(pkgPath, manifest["package"]);
     logger.info(`安装成功！`);
     logger.info(
       `👉 请在浏览器中访问 https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`

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.5",
+  "version": "1.2.7",
   "description": "lazycat cloud developer kit",
   "files": [
     "template",