@lazycatcloud/lzc-cli 1.1.12 → 1.2.0

package/lib/app/index.js

@@ -3,9 +3,10 @@ import lpkCreate from "./lpk_create.js";
 import { LpkBuild } from "./lpk_build.js";
 import { AppDevShell } from "./lpk_devshell.js";
 import { LpkInstaller } from "./lpk_installer.js";
-import { LpkUninstaller } from "./lpk_uninstall.js";
-import { LpkStatuser } from "./lpk_status.js";
-import { LpkLogger } from "./lpk_log.js";
+import logger from "loglevel";
+import { sleep } from "../utils.js";
+import { DebugBridge } from "./lpk_debug_bridge.js";
+import shellApi from "../shellapi.js";
 
 export function lpkProjectCommand(program) {
   let subCommands = [
@@ -13,6 +14,8 @@ export function lpkProjectCommand(program) {
       command: "create <name>",
       desc: "创建懒猫云应用",
       handler: async ({ name }) => {
+        await shellApi.init();
+
         await lpkCreate(name);
       },
     },
@@ -32,6 +35,8 @@ 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) => {
@@ -49,18 +54,6 @@ export function lpkProjectCommand(program) {
       command: "devshell [context]",
       desc: "进入盒子的开发环境",
       builder: (args) => {
-        args.option("r", {
-          alias: "rsync",
-          deprecate: true,
-          type: "boolean",
-          default: true,
-        });
-        args.option("s", {
-          alias: "shell",
-          describe: "指定你最喜欢的shell",
-          type: "string",
-          default: "bash",
-        });
         args.option("f", {
           alias: "force",
           describe: "强制重新构建",
@@ -72,12 +65,32 @@ export function lpkProjectCommand(program) {
           type: "string",
           default: "lzc-build.yml",
         });
+        args.option("contentdir", {
+          describe: "同时打包 lzc-build.yml 中指定的 contentdir 目录",
+          type: "boolean",
+        });
       },
-      handler: async ({ context, shell, force, config }) => {
-        const app = new AppDevShell(context, config, force);
+      handler: async ({ context, force, config, contentdir }) => {
+        await shellApi.init();
+
+        const cwd = context ? path.resolve(context) : process.cwd();
+        const lpkBuild = await new LpkBuild(cwd, config).init();
+        lpkBuild.onBeforeBuildPackage(async (options) => {
+          // devshell 正常情况下，不需要执行 buildscript 和 contentdir 字段
+          logger.debug("devshell delete 'buildscript' field");
+          delete options["buildscript"];
+
+          if (!contentdir) {
+            logger.debug("devshell delete 'contentdir' field");
+            delete options["contentdir"];
+          }
+          return options;
+        });
+        const app = new AppDevShell(cwd, lpkBuild, force);
         await app.init();
         await app.build();
-        await app.rsyncShell(shell);
+        await sleep(2000);
+        await app.rsyncShell();
       },
     },
   ];
@@ -93,30 +106,36 @@ export function lpkProjectCommand(program) {
 export function lpkAppCommand(program) {
   let subCommands = [
     {
-      command: "install <pkgUrl>",
-      desc: "部署应用至设备, pkgUrl 可以为路径，或者https://,http://请求地址",
-      handler: async ({ pkgUrl }) => {
+      command: "install [pkgPath]",
+      desc: "部署应用至设备, pkgPath 可以为路径，或者https://,http://请求地址, 如果不填写，将默认为当前目录下的lpk",
+      handler: async ({ pkgPath }) => {
+        await shellApi.init();
+
+        pkgPath = pkgPath ?? process.cwd();
         const installer = new LpkInstaller();
         await installer.init();
-        await installer.install(pkgUrl);
+        await installer.install(pkgPath);
       },
     },
     {
       command: "uninstall <pkgId>",
       desc: "从设备中卸载某一个应用",
       handler: async ({ pkgId }) => {
-        const uninstaller = new LpkUninstaller();
-        await uninstaller.init();
-        await uninstaller.uninstall(pkgId);
+        await shellApi.init();
+
+        const bridge = new DebugBridge();
+        await bridge.uninstall(pkgId);
       },
     },
     {
       command: "status <pkgId>",
       desc: "获取某一个应用的状态",
       handler: async ({ pkgId }) => {
-        const statuser = new LpkStatuser();
-        await statuser.init();
-        await statuser.status(pkgId);
+        await shellApi.init();
+
+        const bridge = new DebugBridge();
+        const status = await bridge.status(pkgId);
+        console.log(status);
       },
     },
     {
@@ -130,17 +149,17 @@ export function lpkAppCommand(program) {
           default: false,
         });
       },
-      handler: async ({ pkgId, follow }) => {
-        const log = new LpkLogger();
-        await log.init();
-        await log.start(pkgId, follow);
+      handler: async () => {
+        await shellApi.init();
+
+        throw "还没有实现";
       },
     },
   ];
   program.command({
     command: "app",
     desc: "应用管理",
-    builder: (args) => {
+    builder: async (args) => {
       args.command(subCommands);
     },
   });

package/lib/app/lpk_build.js

@@ -8,6 +8,7 @@ import {
   isFileExist,
   dumpToYaml,
   envTemplateFile,
+  isValidPackageName,
 } from "../utils.js";
 import { spawnSync } from "child_process";
 import { LpkManifest } from "./lpk_create.js";
@@ -130,11 +131,6 @@ function convenientEnv() {
   );
 }
 
-function isValidPackageName(packageName) {
-  const regex = /^([a-zA-Z_][a-zA-Z0-9_]*\.)*[a-zA-Z_][a-zA-Z0-9_]*$/;
-  return regex.test(packageName);
-}
-
 export class LpkBuild {
   constructor(cwd, lzcBuild = "lzc-build.yml") {
     this.pwd = cwd ?? process.cwd();

package/lib/app/lpk_create.js

@@ -7,6 +7,7 @@ import {
   ensureDir,
   dumpToYaml,
   isFileExist,
+  isValidPackageName,
 } from "../utils.js";
 import path from "node:path";
 import { TemplateConfig } from "./lpk_create_generator.js";
@@ -74,9 +75,14 @@ export class LpkManifest {
       {
         type: "input",
         name: "package",
-        message: "请输入应用ID",
-        default: this.defaultAppID,
-        validate: noEmpty,
+        message: "请输入应用ID, 如 cloud.lazycat.app.video",
+        validate: (input) => {
+          if (isValidPackageName(input)) {
+            return true;
+          } else {
+            return "应用ID错误，请输入正确的格式, 如 cloud.lazycat.app.video";
+          }
+        },
       },
       {
         type: "input",

package/lib/app/lpk_debug_bridge.js

@@ -0,0 +1,101 @@
+import { spawn, spawnSync } from "child_process";
+import fs from "node:fs";
+import shellApi from "../shellapi.js";
+import inquirer from "inquirer";
+
+export class DebugBridge {
+  constructor() {
+    this.uid = shellApi.uid;
+    this.boxname = shellApi.boxname;
+    this.sshCmd = `ssh -p 22222 box@dev.${this.boxname}.heiyu.space`;
+  }
+
+  common(cmd, args) {
+    const ssh = spawnSync(cmd, args, {
+      shell: true,
+      encoding: "utf-8",
+      stdio: "pipe",
+    });
+    return new Promise((resolve, reject) => {
+      ssh.status == 0 ? resolve(ssh.stdout) : reject(ssh.stderr);
+    });
+  }
+
+  async install(lpkPath) {
+    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"],
+    });
+    stream.pipe(ssh.stdin);
+    return new Promise((resolve, reject) => {
+      ssh.on("close", (code) => {
+        code == 0 ? resolve() : reject("install 失败");
+      });
+    });
+  }
+
+  async canPublicKey() {
+    try {
+      await this.common(this.sshCmd, [`-o PasswordAuthentication=no`]);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  async sshCopyId() {
+    const questions = [
+      {
+        name: "upload",
+        type: "input",
+        default: "y",
+        message:
+          "检测到你目前使用的密码帐号登录，是否使用 ssh-copy-id 上传密钥 (y/n): ",
+      },
+    ];
+    const answers = await inquirer.prompt(questions);
+    if (answers.upload.toLowerCase() == "y") {
+      return this.common(`ssh-copy-id`, [
+        `-f -p 22222 box@dev.${this.boxname}.heiyu.space`,
+      ]);
+    }
+  }
+
+  async status(appId) {
+    return this.common(this.sshCmd, [`status --uid ${this.uid}`, appId]);
+  }
+
+  async isDevshell(appId) {
+    const stdout = await this.common(this.sshCmd, [`isDevshell`, appId]);
+    return stdout == "true";
+  }
+
+  async resume(appId) {
+    return this.common(this.sshCmd, [`resume --uid ${this.uid}`, appId]);
+  }
+
+  async uninstall(appId) {
+    return this.common(this.sshCmd, [`uninstall --uid ${this.uid}`, appId]);
+  }
+
+  async devshell(appId) {
+    const stream = spawn(
+      this.sshCmd,
+      ["-t", "devshell", appId, "/lzcapp/pkg/content/devshell/exec.sh"],
+      {
+        shell: true,
+        stdio: "inherit",
+      }
+    );
+    return new Promise((resolve, reject) => {
+      stream.on("close", (code) => {
+        code == 0 ? resolve() : reject();
+      });
+    });
+  }
+}

package/lib/app/lpk_devshell.js

@@ -3,7 +3,6 @@ import path from "node:path";
 import fs from "node:fs";
 import logger from "loglevel";
 import { execSync } from "node:child_process";
-import { LpkBuild } from "./lpk_build.js";
 import { LpkInstaller } from "./lpk_installer.js";
 import debounce from "lodash.debounce";
 import {
@@ -12,32 +11,18 @@ import {
   ensureDir,
   isFileExist,
   GitIgnore,
-  sleep,
   md5String,
   md5File,
-  createTemplateFileCommon,
   loadFromYaml,
   FileLocker,
 } from "../utils.js";
-import Key from "../key.js";
 import os from "node:os";
-import { sdkEnv } from "../env.js";
 import commandExists from "command-exists";
 import chokidar from "chokidar";
 import _ from "lodash";
-import BoxAPI from "../api.js";
-import { SdkDocker } from "./lpk_devshell_docker.js";
 import { getUidByManifest } from "../lzc_sdk.js";
-
-function sdkSSHHost() {
-  const sdkUrl = sdkEnv.sdkUrl;
-  let url = new URL(sdkUrl);
-  return `box@${url.hostname}`;
-}
-
-function sdkSSHPort() {
-  return 2222;
-}
+import { DebugBridge } from "./lpk_debug_bridge.js";
+import shellApi from "../shellapi.js";
 
 // 判断是否需要重新构建
 // - 先判断 lzc-build.yml 是否发生改变
@@ -46,11 +31,9 @@ function sdkSSHPort() {
 // - 根据 backend api 判断一个 appid 是否属于 running
 // - 根据在 backend api 中判断同步的目录下是否存在文件 判断当前运行的 app 是否已经有一个挂载的实例，避免重复挂载
 class AppDevShellMonitor {
-  constructor(cwd, pkgId, uid = "") {
+  constructor(cwd, pkgId) {
     this.pwd = cwd ? path.resolve(cwd) : process.cwd();
-
     this.pkgId = pkgId;
-    this.boxapi = new BoxAPI(pkgId, sdkEnv.sdkUrl, uid);
 
     this.optionsFilePath = path.join(this.pwd, "lzc-build.yml");
     this.options = loadFromYaml(this.optionsFilePath);
@@ -66,6 +49,7 @@ class AppDevShellMonitor {
     this.cacheFilePath = undefined;
     this.oldHash = undefined;
     this.newHash = undefined;
+    this.bridge = new DebugBridge();
   }
 
   async init() {
@@ -85,7 +69,9 @@ class AppDevShellMonitor {
 
   async shouldBuild() {
     return (
-      this.change() || (await this.notRunning()) || (await this.noDevshell())
+      this.change() ||
+      (await this.bridge.status(this.pkgId)) === "NotInstalled" ||
+      !(await this.bridge.isDevshell(this.pkgId))
     );
   }
 
@@ -113,35 +99,17 @@ class AppDevShellMonitor {
       fs.writeFileSync(this.cacheFilePath, JSON.stringify(this.newHash));
     }
   }
-
-  async notRunning() {
-    try {
-      const { status } = await this.boxapi.status();
-      return status !== "running";
-    } catch {
-      return true;
-    }
-  }
-
-  async noDevshell() {
-    return !(await this.boxapi.isDevshell());
-  }
 }
 
 export class AppDevShell {
-  constructor(cwd, config, forceBuild = false) {
-    this.cwd = cwd ? path.resolve(cwd) : process.cwd();
-    this.lpkBuild = undefined;
+  constructor(cwd, lpkBuild, forceBuild = false) {
+    this.cwd = cwd;
+    this.lpkBuild = lpkBuild;
     this.monitor = undefined;
     this.forceBuild = forceBuild;
-    this.lpkBuildConfig = config;
   }
 
   async init() {
-    if (!this.lpkBuild) {
-      this.lpkBuild = new LpkBuild(this.cwd, this.lpkBuildConfig);
-      await this.lpkBuild.init();
-    }
     const manifest = await this.lpkBuild.getManifest();
     const uid = await getUidByManifest(manifest);
     this.monitor = await new AppDevShellMonitor(
@@ -160,18 +128,7 @@ export class AppDevShell {
   }
 
   async devshellBuild() {
-    // 确保 sdk key ，并上传到 sdk
-    const k = new Key();
-    await k.ensure(sdkEnv.sdkUrl);
-    const pairs = await k.getKeyPair();
-
-    // devshell 不需要执行 buildscript 和 contentdir 也不需要
     this.lpkBuild.onBeforeBuildPackage(async (options) => {
-      logger.debug("devshell delete 'buildscript' field");
-      logger.debug("devshell delete 'contentdir' field");
-      delete options["buildscript"];
-      delete options["contentdir"];
-
       const devshell = options["devshell"];
       if (!devshell) {
         throw "devshell 模式下，devshell 字段必须要指定";
@@ -185,6 +142,30 @@ export class AppDevShell {
       return options;
     });
 
+    // 复制 busybox 到 devshell 中去
+    this.lpkBuild.onBeforeTarContent(async (contentdir) => {
+      const busyboxPath = path.join(
+        contextDirname(import.meta.url),
+        "../../template/_lpk/busybox-1.35.0"
+      );
+      let dest = path.join(contentdir, "devshell", "busybox");
+      ensureDir(dest);
+      fs.copyFileSync(busyboxPath, dest);
+      fs.chmodSync(dest, 0o775);
+    });
+
+    // 复制 init_debug_bridge.sh 到 devshell 中去
+    this.lpkBuild.onBeforeTarContent(async (contentdir) => {
+      const initPath = path.join(
+        contextDirname(import.meta.url),
+        "../../template/_lpk/init_debug_bridge.sh"
+      );
+      let dest = path.join(contentdir, "devshell", "init_debug_bridge.sh");
+      ensureDir(dest);
+      fs.copyFileSync(initPath, dest);
+      fs.chmodSync(dest, 0o775);
+    });
+
     // 复制 exec.sh 到 devshell 中去
     this.lpkBuild.onBeforeTarContent(async (contentdir) => {
       const execScriptPath = path.join(
@@ -197,15 +178,6 @@ export class AppDevShell {
       fs.chmodSync(dest, 0o775);
     });
 
-    // 用 sdk ssh key 并复制到 contentdir 目录
-    // docker 中 sshd 的配置中已改成 /lzcapp/pkg/content/devshell/authorized_keys
-    this.lpkBuild.onBeforeTarContent(async (contentdir) => {
-      let publicKey = pairs["public"];
-      let dest = path.join(contentdir, "devshell", "authorized_keys");
-      ensureDir(dest);
-      fs.copyFileSync(publicKey, dest);
-    });
-
     // 复制 setupscript 脚本
     this.lpkBuild.onBeforeTarContent(async (contentdir, options) => {
       const devshell = options["devshell"];
@@ -238,6 +210,13 @@ export class AppDevShell {
       const routes = devshell["routes"];
       logger.debug("options devshell delete 'routes' field");
       delete options["devshell"]["routes"];
+
+      // 添加 devshell 必要路由
+      routes.push(
+        "/__debug.bridge=exec://22222,/lzcapp/pkg/content/devshell/init_debug_bridge.sh"
+      );
+      routes.push("/__isdevshell=file:///lzcapp/pkg/devshell");
+
       // 如果 devshell 中的 router 和 manifest 中的 prefix 出现冲突
       // 优先使用 devshell 中的。
       routes.forEach((r) => {
@@ -285,32 +264,7 @@ export class AppDevShell {
         return manifest;
       }
 
-      const depsStr = deps.sort().join(" ");
-      logger.debug("开始创建 Dockerfile 文件");
-      const tag = `${await md5String(depsStr)}:latest`;
-
-      const tempDir = fs.mkdtempSync(".lzc-cli-build-dependencies");
-      try {
-        const dockerfilePath = path.join(
-          contextDirname(import.meta.url),
-          "../../template/_lpk/Dockerfile.in"
-        );
-        await createTemplateFileCommon(
-          dockerfilePath,
-          path.join(tempDir, "Dockerfile"),
-          { dependencies: depsStr }
-        );
-
-        logger.debug(`开始在盒子中构建 ${tag} 镜像 from ${tempDir}`);
-        const sdk = new SdkDocker();
-        await sdk.buildImage(tag, tempDir, tempDir);
-      } finally {
-        fs.rmSync(tempDir, { recursive: true });
-      }
-
-      delete manifest["application"]["devshell"];
-      manifest["application"]["image"] = tag;
-      return manifest;
+      throw "lzc-cli 不支持在盒子中构建 docker 镜像，请从其他地方构建，然后指定image字段";
     });
 
     // 如果 services 中有 devshell 的字段，需要检测是否需要提前构建
@@ -325,16 +279,7 @@ export class AppDevShell {
         return manifest;
       }
 
-      const tag = `${manifest["package"]}-devshell:${manifest["version"]}`;
-
-      logger.debug(`开始在盒子中构建 ${tag} 镜像`);
-
-      const sdk = new SdkDocker();
-      await sdk.buildImage(tag, config["build"], process.cwd());
-
-      delete manifest["application"]["devshell"];
-      manifest["application"]["image"] = tag;
-      return manifest;
+      throw "lzc-cli 不支持在盒子中构建 docker 镜像，请从其他地方构建，然后指定image字段";
     });
 
     // 如果 devshell 中指定了 image 字段将使用 image 字段
@@ -371,14 +316,10 @@ export class AppDevShell {
     // 在构建生成 lpk 包后，调用 deploy 进行部署
     let installer = new LpkInstaller();
     await installer.init();
-    await installer.deploy(this.lpkBuild);
-
-    await sleep(2000);
+    await installer.deploy(this.lpkBuild, true);
   }
 
-  async rsyncShell(runShell) {
-    const k = new Key();
-    const pairs = await k.getKeyPair();
+  async rsyncShell() {
     const manifest = await this.lpkBuild.getManifest();
     const pkgId = manifest["package"];
 
@@ -397,7 +338,7 @@ export class AppDevShell {
     }
 
     const uid = await getUidByManifest(manifest);
-    const devshell = new DevShell(pairs["private"], pkgId, runShell, uid);
+    const devshell = new DevShell(pkgId, uid);
     if (isSync) {
       await devshell.shell();
     } else {
@@ -411,29 +352,22 @@ export class AppDevShell {
 }
 
 class DevShell {
-  constructor(keyFile, appId, runShell = "sh", uid = "") {
-    logger.debug("keyFile", keyFile);
-    logger.debug("appid", appId);
-
-    this.keyFile = keyFile;
+  constructor(appId, uid = "") {
     this.appId = appId;
     this.uid = uid;
-    this.runShell = runShell;
   }
 
-  async syncProject(keyFile, appId) {
-    const host = sdkSSHHost();
-    const port = sdkSSHPort();
+  async syncProject(appId) {
     // prettier-ignore
     let rsh = [
       "ssh",
-      "-p", `${port}`,
+      "-J", `box@dev.${shellApi.boxname}.heiyu.space:22222`,
+      "-p", `22222`,
       "-o", `"StrictHostKeyChecking=no"`,
       "-o", `"UserKnownHostsFile=/dev/null"`,
       "-o", `"ConnectionAttempts=3"`,
       "-o", `"ConnectTimeout=30"`,
       "-o", `"LogLevel=ERROR"`,
-      "-i", keyFile,
     ].join(" ");
     // 检查rsync工具是否存在:提示用户
     const rsyncExisted = commandExists.sync("rsync");
@@ -442,13 +376,11 @@ class DevShell {
       process.exit(1);
     }
 
-    let rsyncDebug = process.env.RSYNCDEBUG ? "-P" : "";
-    const userId = this.uid ? `/${this.uid}` : "";
-    let storePath = `/run/lzc_boot/data/cache/${appId}${userId}/devshell`;
-    // FIXME: 下方执行命令不确定是否有兼容性问题
+    const rsyncDebug = process.env.RSYNCDEBUG ? "-P" : "";
+    const dest = `root@app.${appId}.lzcapp:/lzcapp/cache/devshell`;
     try {
       execSync(
-        `rsync ${rsyncDebug} --rsh='${rsh}' --recursive --relative --perms --update . ${host}:${storePath} --filter=':- .gitignore' --exclude='node_modules' --exclude='.git' --ignore-errors --usermap=:nobody --groupmap=*:nobody`,
+        `rsync ${rsyncDebug} --rsh='${rsh}' --recursive --relative --perms --update --filter=':- .gitignore' --ignore-errors --usermap=:nobody --groupmap=*:nobody . ${dest}`,
         { stdio: ["ignore", "inherit", "inherit"] }
       );
     } catch (err) {
@@ -498,7 +430,7 @@ class DevShell {
 
   // 监听非.gitignore文件
   // TODO： 目前仅仅监听process.cwd()以下的文件
-  async watchFile(keyFile, appId) {
+  async watchFile(appId) {
     const ignore = new GitIgnore(process.cwd());
     await ignore.collect();
     chokidar
@@ -513,29 +445,27 @@ class DevShell {
       .on(
         "all",
         debounce(() => {
-          this.syncProject(keyFile, appId);
+          this.syncProject(appId);
         }),
         1000
       );
   }
   async shell() {
-    let keyFile = this.keyFile;
     try {
       // 当进入shell的时候，都同步一次
-      await this.syncProject(keyFile, this.appId);
+      await this.syncProject(this.appId);
       // 注册watch函数
-      await this.watchFile(keyFile, this.appId);
+      await this.watchFile(this.appId);
 
       await this.connectShell();
     } catch (e) {
       console.log(e);
-      // this.reset();
       return Promise.reject(e);
     }
   }
 
   async connectShell() {
-    const sdk = new SdkDocker();
-    await sdk.interactiveShell(this.appId, this.runShell, this.uid);
+    const bridge = new DebugBridge();
+    await bridge.devshell(this.appId);
   }
 }