@lazycatcloud/lzc-cli 1.1.3 → 1.1.4

package/cmds/app.js

@@ -0,0 +1,137 @@
+import process from "process";
+import path from "path";
+import {
+  archiveFolder,
+  isValidApp,
+  getMetaInfo,
+  ensureDir,
+} from "../lib/utils.js";
+import fs from "fs";
+import chalk from "chalk";
+import Builder, { execPreBuild } from "../lib/builder.js";
+import env, { sdkEnv } from "../lib/env.js";
+import BoxAPI from "../lib/api.js";
+import Archiver from "../lib/archiver.js";
+import Key from "../lib/key.js";
+
+import { debuglog } from "util";
+
+const debug = debuglog("cmd/app");
+
+// this set of api target box
+class App {
+  constructor(context) {
+    this.context = context;
+
+    const { appDir, isTemplate } = isValidApp(process.cwd());
+    if (!appDir) {
+      console.log(chalk.red("未识别懒猫云应用"));
+      process.exit(1);
+    }
+    this.appPath = appDir;
+    this.isTemplate = isTemplate;
+    env.load(process.cwd());
+  }
+
+  async deploy() {
+    try {
+      if (this.isTemplate) {
+        const outDir = await this.prepare();
+
+        await this.archiveAndInstall(outDir);
+      } else {
+        await sdkEnv.ensure();
+
+        await this.archiveAndInstall(this.appPath);
+      }
+    } catch (e) {
+      throw e;
+    }
+  }
+
+  async uninstall() {
+    let api;
+    const sdkUrl = sdkEnv.sdkUrl;
+    if (this.isTemplate) {
+      api = new BoxAPI(env.get("APP_ID"), sdkUrl);
+    } else {
+      const metaInfo = getMetaInfo(
+        path.join(this.appPath, "docker-compose.yml")
+      );
+      api = new BoxAPI(metaInfo.id, sdkUrl);
+    }
+
+    try {
+      await api.uninstall();
+    } catch (e) {
+      throw e;
+    }
+  }
+
+  async prepare() {
+    await this.prepareBuildEnv();
+
+    const outputDir = path.join(this.appPath, "output/release/");
+    const buildDir = path.join(process.cwd(), env.get("BUILD_CONTEXT"));
+
+    ensureDir(outputDir);
+
+    await new Key().ensure(sdkEnv.sdkUrl);
+
+    const envAll = {
+      ...env.all,
+      APP_IMAGE_NAME: env.get("APP_ID"),
+    };
+
+    // exec pre build
+    await execPreBuild(buildDir, process.cwd(), envAll);
+
+    // do image build
+    await new Builder(envAll).buildImage(process.cwd(), buildDir);
+
+    // do archive
+    const archiver = new Archiver(outputDir);
+    console.log("appPath", this.appPath);
+    await archiver.load(this.appPath);
+    await archiver.add(buildDir);
+
+    await archiver.finalize();
+
+    return outputDir;
+  }
+
+  async prepareBuildEnv() {
+    await sdkEnv.ensure();
+    await env.ensure([{ name: "HTTP_SERVICE_PORT" }]);
+  }
+
+  // archive current dir and install
+  async archiveAndInstall(dir) {
+    const metaInfo = getMetaInfo(path.join(dir, "docker-compose.yml"));
+    const api = new BoxAPI(metaInfo.id, sdkEnv.sdkUrl);
+    let out;
+    try {
+      const out = await archiveFolder(dir);
+      console.log(chalk.green("开始部署应用"));
+      await api.install(out.path);
+      await api.checkStatus();
+
+      console.log(
+        `请在浏览器中访问 ${chalk.green(
+          sdkEnv.sdkUrl.replace(/sdk/, metaInfo.id)
+        )}`
+      );
+    } catch (e) {
+      throw e;
+    } finally {
+      if (out) fs.rmSync(out.path, { recursive: true });
+    }
+  }
+}
+
+const app = new App();
+
+export default {
+  deploy: () => app.deploy(),
+  uninstall: () => app.uninstall(),
+};

package/cmds/config.js

@@ -0,0 +1,55 @@
+import process from "process";
+import { isValidApp } from "../lib/utils.js";
+import env, { sdkEnv } from "../lib/env.js";
+import { debuglog } from "util";
+
+const debug = debuglog("cmd/config");
+
+class Config {
+  constructor(context) {
+    this.context = context;
+  }
+  async exec() {
+    const [key, value, options] = this.context;
+
+    isValidApp(process.cwd());
+    env.load(process.cwd());
+
+    // // lzc-cli config
+    if (!key && !value) {
+      console.log(env.stringify());
+      return;
+    }
+
+    // lzc-cli config SDK_URL
+    if (key && !value) {
+      if (env.get(key)) {
+        console.log(env.get(key));
+      }
+      return;
+    }
+
+    if (key && value) {
+      const pair = Object.fromEntries([[key, value]]);
+      // if (pair["SDK_URL"]) {
+      //   pair["SDK_URL"] = pair["SDK_URL"].replace(/\/$/, "");
+      //
+      //   try {
+      //     // 这里只需要测试sdk的合法性即可, 不需要处理安装的逻辑
+      //     await sdkEnv.checkConnection(pair["SDK_URL"]);
+      //   } catch (e) {
+      //     console.log(e.message);
+      //     debug("got error when check connection %s", e);
+      //     process.exit();
+      //   }
+      // }
+      env.set(pair, options.global);
+    }
+  }
+}
+
+export default {
+  config: async (context) => {
+    return await new Config(context).exec();
+  },
+};

package/cmds/create.js

@@ -0,0 +1,55 @@
+import chalk from "chalk";
+import { Init, chooseTemplate } from "./init.js";
+import path from "path";
+import Generator, { TemplateConfig } from "../lib/generator.js";
+import fs from "fs";
+import inquirer from "inquirer";
+import { parse2CorrectName } from "../lib/utils.js";
+const fsPromises = fs.promises;
+class Create {
+  constructor({ name }) {
+    this.name = name;
+  }
+
+  async exec() {
+    const type = await chooseTemplate();
+    this.init = new Init({
+      cwd: path.join(process.cwd(), this.name),
+      type: type,
+    });
+    if (TemplateConfig[type]) {
+      const config = TemplateConfig[type];
+      const init = this.init;
+      const answers = await init.askQuestions();
+      console.log(chalk.green(`初始化项目 ${this.name}`));
+      await Generator().generate(type, this.name);
+      console.log(chalk.green("设置懒猫云应用"));
+      await init.createTemplates(answers);
+      await init.createReleaseFolder();
+      await config.after(this.name);
+    }
+  }
+}
+
+export default async (context) => {
+  context.name = parse2CorrectName(context.name);
+  await fsPromises.access(process.cwd() + "/" + context.name).then(
+    async () => {
+      const questions = [
+        {
+          name: "override",
+          type: "input",
+          default: "n",
+          message: "项目已存在，是否覆盖(y/n): ",
+        },
+      ];
+      const answers = await inquirer.prompt(questions);
+      if (answers.override.toLowerCase() === "y") {
+        return new Create(context).exec();
+      }
+    },
+    () => {
+      return new Create(context).exec();
+    }
+  );
+};

package/cmds/dev.js

@@ -0,0 +1,122 @@
+import process from "process";
+import { isValidApp } from "../lib/utils.js";
+import chalk from "chalk";
+import Dev from "../lib/dev.js";
+import env, { sdkEnv } from "../lib/env.js";
+import BoxAPI from "../lib/api.js";
+
+// this set of api target box
+class Develop {
+  constructor(context) {
+    this.context = context;
+
+    const { appDir, isTemplate } = isValidApp(process.cwd());
+    if (!appDir) {
+      console.log(chalk.red("未识别懒猫云应用"));
+      process.exit(1);
+    }
+
+    this.appPath = appDir;
+    this.isTemplate = isTemplate;
+    env.load(process.cwd());
+  }
+
+  async devShell({ build }) {
+    let appdev = new Dev(env.get("APP_ID"), this.appPath);
+
+    if (build) {
+      appdev.reset();
+    }
+
+    // 当如果已经连接。直接连接ssh
+    if (appdev.hasShellStatus()) {
+      try {
+        await appdev.directShell();
+        return;
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+
+    // 重新部署dev app container
+    try {
+      await sdkEnv.ensure();
+      const { APP_ID: appId } = await env.ensure([{ name: "APP_ID" }]);
+
+      console.debug(sdkEnv.sdkUrl);
+      const api = new BoxAPI(appId, sdkEnv.sdkUrl);
+
+      let out = await appdev.fakeApp("shell");
+
+      console.debug("设置端口转发");
+      await api.install(out.path, { build: true });
+      await api.checkStatus();
+
+      await appdev.shell();
+      return;
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }
+
+  async devPortForward(localaddr) {
+    console.log("逻辑需要重新梳理");
+    process.exit();
+    // try {
+    //   await this.ensureEnv([
+    //     {
+    //       name: "DEV_PORT",
+    //       type: "input",
+    //       message: "开发暴露端口",
+    //       default: "8080",
+    //     },
+    //     {
+    //       name: "DEV_CMD",
+    //       type: "input",
+    //       default: "npm run serve",
+    //       message: "开发运行命令",
+    //     },
+    //   ]);
+    //
+    //   await this.ensureSDK();
+    //
+    //   console.debug(env.get("SDK_URL"));
+    //   const api = new BoxAPI(env.get("APP_ID"), env.get("SDK_URL"));
+    //
+    //   let appdev = new Dev(env.get("APP_ID"), this.appPath);
+    //
+    //   let out = await appdev.fakeApp("devforward");
+    //
+    //   console.debug("设置端口转发");
+    //   await api.install(out.path, { build: true });
+    //   await api.checkStatus();
+    //
+    //   console.log(
+    //     `请在浏览器中访问 ${chalk.green(
+    //       env.get("SDK_URL").replace(/sdk/, env.get("APP_ID"))
+    //     )}`
+    //   );
+    //
+    //   await appdev.portForward(localaddr);
+    // } catch (e) {
+    //   throw e;
+    // }
+  }
+}
+
+const dev = new Develop();
+
+export default {
+  dev: (addr) => dev.devPortForward(addr),
+  devShell: async (options) => {
+    try {
+      await dev.devShell(options);
+    } catch (e) {
+      console.log(chalk.red(e));
+      process.exit(1);
+    }
+
+    // 需要显示的退出，因为当shell退出后，rsync和watch的进程还在执行
+    // process.exit();
+  },
+};

package/cmds/init.js

@@ -0,0 +1,125 @@
+import path from "path";
+import inquirer from "inquirer";
+import generator, { TemplateConfig } from "../lib/generator.js";
+import { APP_FOLDER } from "../lib/utils.js";
+import env from "../lib/env.js";
+import fs from "fs";
+let fsPromises = fs.promises;
+import { debuglog } from "util";
+
+const debug = debuglog("cmd/init");
+
+export class Init {
+  constructor(context) {
+    this.context = context;
+    this.type = context.type;
+  }
+
+  async askQuestions() {
+    const questions = [
+      {
+        name: "APP_ID",
+        type: "input",
+        default: () => {
+          const name = path.basename(this.context.cwd);
+          return name;
+        },
+        message: "应用名称",
+        validate: (input) => {
+          if (!/^([a-z]|[0-9]|[\-])+$/.test(input)) {
+            return "应用名称只能包含(减号，小写字母，数字)，请重新输入";
+          }
+          return true;
+        },
+      },
+      {
+        name: "APP_DESCRIPTION",
+        type: "input",
+        default: (answers) => {
+          return answers["APP_ID"];
+        },
+        message: "应用描述",
+      },
+    ];
+    return inquirer.prompt(questions);
+  }
+
+  async createTemplates(answers) {
+    answers["APP_VERSION"] = "0.0.1";
+    env.load(path.join(this.context.cwd));
+    await generator(answers).generate(
+      APP_FOLDER.replace(".", "_"),
+      this.context.cwd,
+      {
+        prefix: APP_FOLDER,
+      }
+    );
+    debug(answers);
+    env.set(answers);
+    this.setDefaultEnvs(env);
+  }
+
+  async createReleaseFolder() {
+    await generator({}).generate(
+      "release/" + this.type,
+      path.join(this.context.cwd, APP_FOLDER),
+      {
+        prefix: "release",
+      }
+    );
+  }
+
+  async setDefaultEnvs(env) {
+    debug(TemplateConfig[this.type].defaultEnvs);
+    env.set(TemplateConfig[this.type].defaultEnvs);
+  }
+
+  async create() {
+    if (!this.type) {
+      this.type = await chooseTemplate();
+    }
+    const createConfig = async () => {
+      const answers = await this.askQuestions();
+      await this.createTemplates(answers);
+      await this.createReleaseFolder();
+    };
+    // .lazycat文件已存在时提示用户是否需要覆盖
+    await fsPromises
+      .access(
+        this.context.cwd + "/.lazycat/",
+        fs.constants.F_OK | fs.constants.W_OK
+      )
+      .then(
+        async () => {
+          const questions = [
+            {
+              name: "override",
+              type: "input",
+              default: "n",
+              message: "懒猫云已配置，是否覆盖(y/n): ",
+            },
+          ];
+          const answers = await inquirer.prompt(questions);
+          if (answers.override.toLowerCase() === "y") {
+            createConfig();
+          }
+        },
+        async () => {
+          createConfig();
+        }
+      );
+  }
+}
+
+export async function chooseTemplate() {
+  return (
+    await inquirer.prompt([
+      {
+        name: "type",
+        message: "选择项目构建模板",
+        type: "list",
+        choices: ["vue", "golang", "ionic_vue3"],
+      },
+    ])
+  )["type"];
+}

package/cmds/log.js

@@ -0,0 +1,103 @@
+import { readFileSync } from "fs";
+import { Client } from "ssh2";
+import os from "os";
+import path from "path";
+import process from "process";
+import { isValidApp, META_MARK } from "../lib/utils.js";
+import yaml from "js-yaml";
+import env, { sdkEnv } from "../lib/env.js";
+import chalk from "chalk";
+import { SSHClient, connectOptions } from "../lib/sdk.js";
+
+function StreamPromise(stream) {
+  let data = "";
+  return new Promise((resolve, reject) => {
+    stream
+      .on("data", (d) => {
+        data = d;
+      })
+      .on("close", (code, signal) => {
+        resolve(String(data));
+      })
+      .stderr.on("data", (data) => {
+        reject(String(data));
+      });
+  });
+}
+
+export async function monitor(projectName, options = {}) {
+  env.load(process.cwd());
+
+  await sdkEnv.ensure();
+
+  const sdk_url = sdkEnv.sdkUrl;
+
+  if (!sdk_url) {
+    console.log(chalk.red("无法连接SDK, 请确保已设置 DEFAULT_BOXNAME"));
+    process.exit(1);
+  }
+
+  const host = new URL(sdk_url).hostname;
+  if (projectName) {
+    await new Log(host, projectName).start();
+  } else {
+    const name = tryGuessProject(options.user);
+    // console.log(chalk.green("guess project name " + name));
+    await new Log(host, name).start();
+  }
+}
+
+function tryGuessProject(user) {
+  const { appDir, isTemplate } = isValidApp(process.cwd());
+  if (!appDir) {
+    console.log(chalk.red("无法识别为懒猫云应用"));
+    process.exit(1);
+  }
+
+  let info;
+  let appId;
+  if (isTemplate) {
+    info = yaml.load(readFileSync(path.join(appDir, "docker-compose.yml.in")));
+    appId = env.get("APP_ID");
+  } else {
+    info = yaml.load(readFileSync(path.join(appDir, "docker-compose.yml")));
+    appId = info[META_MARK]["id"];
+  }
+  return `lzc-${user || ""}-${appId}`;
+}
+
+class Log {
+  constructor(host, project) {
+    this.project = project;
+    this.host = host;
+  }
+
+  async start() {
+    const opts = await connectOptions(this.host);
+    const client = new SSHClient(opts);
+    try {
+      await client.connect();
+      let stream = await client.exec(
+        `docker-compose ls | grep -wE '^${this.project}'`
+      );
+
+      const result = await StreamPromise(stream);
+      if (result != "") {
+        stream = await client.exec(
+          `docker-compose -p ${this.project} logs -f`,
+          { pty: true }
+        );
+        stream.stdout.pipe(process.stdout);
+        stream.stderr.pipe(process.stdout);
+      } else {
+        client.close();
+      }
+    } catch (e) {
+      client.close();
+    }
+  }
+}
+
+export default {
+  monitor,
+};

package/cmds/publish.js

@@ -0,0 +1,116 @@
+import env from "../lib/env.js";
+import Builder from "../lib/builder.js";
+import path from "path";
+import Semver from "semver";
+import inquirer from "inquirer";
+import Archiver from "../lib/archiver.js";
+import { isValidApp, contextDirname as getLibDir } from "../lib/utils.js";
+import fs from "fs";
+import execa from "execa";
+import { GLOBAL_CONFIG_DIR } from "../lib/utils.js";
+
+const REGISTRY_REPO = "registry.lazycat.cloud";
+const APPDB_DIR = path.join(GLOBAL_CONFIG_DIR, "appdb");
+
+export default class Publisher {
+  constructor() {
+    env.load(process.cwd());
+  }
+  async run() {
+    const { appDir, _ } = isValidApp(process.cwd());
+    const builder = new Builder();
+    const contextDir = process.cwd();
+
+    console.log(getLibDir());
+    //
+    const { tag, newVersion } = await this.generateTag();
+
+    const dockerfile = path.join(env.get("BUILD_CONTEXT"), "Dockerfile");
+    await builder.dockerLocalBuild(contextDir, dockerfile, tag);
+
+    // 该操作确保了 appdb 的存在
+    execa.sync(path.join(getLibDir(), "git/git-reset.sh"), {
+      cwd: appDir,
+      env: {
+        APPDB_DIR,
+      },
+      stdio: "inherit",
+    });
+
+    // 生成新的应用
+    const outputDir = path.join(APPDB_DIR, env.get("APP_ID"));
+
+    if (!fs.existsSync(outputDir)) {
+      fs.mkdirSync(outputDir, { recursive: true });
+    }
+    const buildDir = path.join(process.cwd(), env.get("BUILD_CONTEXT"));
+
+    const archiver = new Archiver(outputDir);
+    await archiver.load(appDir);
+    await archiver.add(buildDir);
+    archiver.replace(
+      `
+x-lazycat-app:
+  version: ${newVersion}
+services:
+  ${env.get("APP_ID")}:
+    image: ${tag}
+      `.trim()
+    );
+
+    execa.sync(path.join(getLibDir(), "git/git-commit.sh"), {
+      cwd: APPDB_DIR,
+      env: {
+        APP_ID: env.get("APP_ID"),
+        APP_VERSION: newVersion,
+      },
+      stdio: "inherit",
+    });
+
+    // confirm git push
+    const { push } = await inquirer.prompt([
+      {
+        name: "push",
+        message: `确定发布版本 ${newVersion}`,
+        type: "confirm",
+      },
+    ]);
+
+    if (push) {
+      execa.sync("git", ["push"], {
+        cwd: APPDB_DIR,
+      });
+      // 更新版本
+      env.set({ APP_VERSION: newVersion });
+    }
+  }
+
+  async generateTag() {
+    const currentVersion = Semver.parse(env.get("APP_VERSION"));
+    if (currentVersion == null) throw new Error("无法获取当前版本号");
+
+    const newVersion = Semver.inc(currentVersion, "patch");
+    const answer = await inquirer.prompt({
+      name: "version",
+      message: "请填写新的版本号",
+      type: "input",
+      default: () => newVersion,
+      validate: (input) => {
+        let v = Semver.parse(input);
+        if (v) {
+          if (Semver.lte(v, currentVersion)) {
+            return "该版本号小于当前版本";
+          }
+          return true;
+        } else {
+          return "请输入正确的版本号";
+        }
+      },
+    });
+
+    return {
+      tag: `${REGISTRY_REPO}/${env.get("APP_ID")}:${answer.version}`,
+      newVersion: answer.version,
+    };
+  }
+}

package/lib/box/check_qemu.js

@@ -0,0 +1,27 @@
+// 检测当前系统是否安装 qemu 软件
+import commandExist from "command-exists";
+import chalk from "chalk";
+
+export class CheckQemu {
+  constructor() {
+    this.commands = ["qemu-img", "qemu-system-x86_64", "pgrep"];
+  }
+
+  async init() {
+    let ps = [];
+    this.commands.forEach((cmd) => {
+      let p = new Promise((resolve, reject) => {
+        commandExist(cmd)
+          .then(resolve)
+          .catch(() => {
+            console.error(
+              chalk.red(`${cmd} 命令没有发现，请通过系统包管理器安装对应的包`)
+            );
+            reject();
+          });
+      });
+      ps.push(p);
+    });
+    return Promise.all(ps);
+  }
+}

package/lib/box/hportal.js

@@ -101,6 +101,7 @@ export function showBoxInfo(vmInfos, rmInfos) {
 
   if (boxIds.length == 0) {
     console.log("没有找到任何盒子，创建一个吧!");
+    return;
   }
 
   let result = [];

package/lib/box/index.js

@@ -6,8 +6,9 @@ import { QemuVM, QemuResource } from "./qemu_vm_mgr.js";
 import { contextDirname } from "../utils.js";
 import env, { sdkEnv } from "../env.js";
 import { HportalManager, showBoxInfo } from "./hportal.js";
+import { CheckQemu } from "./check_qemu.js";
 
-async function initQemuVM() {
+async function initQemuVM(ensureResources = false) {
   let defaultSchemeFile = path.join(
     contextDirname(),
     "box",
@@ -24,9 +25,11 @@ async function initQemuVM() {
     scheme.path = path.join(contextDirname(), "box-emulator", scheme.path);
   }
 
-  // 使用本地网络 api 调试 new QemuResource(scheme.path, "http://127.0.0.1");
-  let resource = new QemuResource(scheme.path);
-  await resource.init();
+  if (ensureResources) {
+    // 使用本地网络 api 调试 new QemuResource(scheme.path, "http://127.0.0.1");
+    let resource = new QemuResource(scheme.path);
+    await resource.init();
+  }
 
   let m = new QemuVM(scheme);
   return m;
@@ -44,21 +47,35 @@ export function boxCommand(box) {
       command: "create",
       desc: "创建一个虚拟盒子，并注册运行",
       handler: async () => {
-        let m = await initQemuVM();
-        let { boxName, boxId, user, password } = await m.createVM();
+        let cq = new CheckQemu();
+        await cq.init();
+
+        let boxId;
+        let m = await initQemuVM(true);
+        let answer = await m.askBoxInfo();
+
+        try {
+          // 创建盒子阶段，如果出错，将直接删除所有的资源。
+          boxId = await m.createVM(answer);
+        } catch (error) {
+          console.error(error);
+          await m.cleanVM(answer.boxName);
+          return;
+        }
+
         // 如果没有指定默认的盒子名称将会将第一个盒子作为默认的盒子
         let defaultBoxName = env.get("DEFAULT_BOXNAME");
         if (!defaultBoxName) {
           // 新创建的盒子在初始化的时候，盒子里面需要安装hc的组件，需要一点时间，
           // 所以这里并不对sdk url进行校验是否有效
-          await sdkEnv.setDefaultBoxName(boxName, false);
+          await sdkEnv.setDefaultBoxName(answer.boxName, false);
         }
 
         let h = await initHportal();
         console.log("添加盒子到 Hportal ......");
-        await h.addBox(boxName);
+        await h.addBox(answer.boxName);
         console.log("正在使用管理员帐号密码登录中......");
-        await h.loginBox(boxId, user, password);
+        await h.loginBox(boxId, answer.adminName, answer.adminPass);
         console.log("登录成功！");
       },
     },
@@ -107,7 +124,7 @@ export function boxCommand(box) {
         let rmInfos = await rm.boxs(boxName, defaultBoxName);
 
         // 过滤条件不满足
-        if (vmInfos.length == 0 && rmInfos == 0 && boxName != "") {
+        if (vmInfos.length == 0 && rmInfos == 0 && boxName) {
           console.log(`${boxName} 盒子不存在`);
           let allVmInfos = await m.infoVM("", defaultBoxName);
           let allRmInfos = await rm.boxs("", defaultBoxName);

package/lib/box/qemu_vm_mgr.js

@@ -8,6 +8,7 @@ import http from "node:http";
 import lz4 from "lz4";
 import process from "node:process";
 import net from "node:net";
+import fetch from "node-fetch";
 
 async function getFreePort() {
   return new Promise((resolve, reject) => {
@@ -37,7 +38,7 @@ export class QemuResource {
    * downloadUrl system-disk 下载路径
    */
   constructor(
-    diskDir = "~/.local/share/lazycat/box-emulator",
+    diskDir = "~/.cache/box-emulator",
     downloadUrl = "https://dl.lazycat.cloud/sdk/vm"
   ) {
     this.diskDir = diskDir;
@@ -46,21 +47,77 @@ export class QemuResource {
 
   async init() {
     fs.mkdirSync(this.diskDir, { recursive: true });
-    await this.ensureSystemDisk();
+    let shouldUpdate = await this.shouldUpdate();
+    if (shouldUpdate) {
+      let answer = await inquirer.prompt([
+        {
+          type: "confirm",
+          name: "yesorno",
+          message: `检测到盒子系统具有更新，是否需要重新下载盒子系统镜像？`,
+          default: true,
+        },
+      ]);
+      if (!answer.yesorno) {
+        shouldUpdate = false;
+      }
+    }
+    await this.ensureSystemDisk(shouldUpdate);
+  }
+
+  /**
+   * 根据下载到的 md5 和本地缓存的 md5 进行比较，如果不一样，则代表具有更新，
+   * 然后提示用户是否更新。
+   * 如果在获取 md5 的过程中，发生网络错误，则跳过更新检查。
+   * 目前的更新，只是使用 md5 来判断是否需要重新下载 md5, 并不会使用 md5 来判断所下载的数据是否正确。
+   */
+  async shouldUpdate() {
+    let oldMd5Path = path.join(this.diskDir, "disk-system.qcow2.lz4.md5");
+
+    // 如果不存在 md5 文件，直接返回需要更新
+    try {
+      fs.accessSync(oldMd5Path);
+    } catch {
+      return true;
+    }
+
+    // 拉取最新的 md5
+    let newMd5;
+    try {
+      let url = `${this.downloadUrl}/disk-system.qcow2.lz4.md5`;
+      let res = await fetch(url);
+      if (res.status !== 200) {
+        return false;
+      }
+      newMd5 = await res.text();
+    } catch {
+      return false;
+    }
+
+    let oldMd5 = fs.readFileSync(oldMd5Path, { encoding: "utf-8" });
+    return oldMd5 !== newMd5;
   }
 
   /**
    * 确保 qemu 系统盘的镜像存在，如果不存在，将会从 downloadUrl 中下载
    */
-  async ensureSystemDisk() {
+  async ensureSystemDisk(update = false) {
     let systemDiskFile = path.join(this.diskDir, "disk-system.qcow2");
-    try {
-      fs.accessSync(systemDiskFile);
-      return;
-    } catch {}
+    if (!update) {
+      try {
+        fs.accessSync(systemDiskFile);
+        return;
+      } catch {}
+    }
 
     await this.downloadSystemDisk();
     await this.downloadPrivateKey();
+    await this.downloadSystemDiskMd5();
+  }
+
+  async downloadSystemDiskMd5() {
+    let savePath = path.join(this.diskDir, "disk-system.qcow2.lz4.md5");
+    let url = `${this.downloadUrl}/disk-system.qcow2.lz4.md5`;
+    await this.download(url, savePath);
   }
 
   async downloadSystemDisk() {
@@ -144,7 +201,10 @@ export class QemuVM {
     let args = await this.buildQemuArgs(name, vmDir);
     let p = spawn("qemu-system-x86_64", args, {
       detached: true,
-      stdio: ["ignore", "ignore", "inherit"],
+      stdio: ["pipe", "ignore", "inherit"],
+    });
+    p.on("error", (e) => {
+      throw e;
     });
     console.log("启动中...");
 
@@ -165,14 +225,21 @@ export class QemuVM {
           return;
         }
 
-        let boxid = this.readBoxid(name);
-        if (boxid) {
-          p.unref();
-          resolve(boxid);
+        let boxId = this.readBoxid(name);
+        if (boxId) {
           clearInterval(id);
+          p.unref();
+          resolve(boxId);
           console.log("启动成功!");
         }
       }, 1000);
+
+      // 当在等待期间，ctrl-c 退出
+      process.on("SIGINT", () => {
+        p.kill();
+        clearInterval(id);
+        reject("exit");
+      });
     });
   }
 
@@ -200,22 +267,19 @@ export class QemuVM {
   /**
    * 创建一个指定的虚拟机，并启动等待注册成功。
    **/
-  async createVM() {
-    let answer = await this.askBoxInfo();
-
-    let vmDir = this.ensureVmDir(answer.boxName);
+  async createVM({ boxName, adminName, adminPass }) {
+    let vmDir = this.ensureVmDir(boxName);
     this.ensureVolumeDir(vmDir);
     await this.buildDisks(vmDir);
-    let boxId = await this.startVM(answer.boxName, vmDir);
+    let boxId = await this.startVM(boxName, vmDir);
     console.log("盒子ID: ", boxId);
 
-    let boxName = await this.registerVM(boxId, answer);
-    return {
+    await this.registerVM(boxId, {
       boxName,
-      boxId,
-      user: answer.adminName,
-      password: answer.adminPass,
-    };
+      adminName,
+      adminPass,
+    });
+    return boxId;
   }
 
   /**
@@ -244,29 +308,20 @@ export class QemuVM {
         mask: "*",
         validate: noEmpty,
       },
-      {
-        type: "input",
-        name: "origin",
-        message: "注册服务器地址",
-        default: "origin.lazycat.cloud",
-      },
     ]);
   }
 
   /**
    * 调用 hportal client 进行注册
    **/
-  async registerVM(boxid, { boxName, adminName, adminPass, origin }) {
+  async registerVM(boxid, { boxName, adminName, adminPass }) {
     // prettier-ignore
-    spawnSync("sudo",[
-      "-S",
-      "home-portal-client",
+    spawnSync("home-portal-client",[
       "-setup", "-boxid", boxid,
       "-boxname", boxName,
       "-user", adminName,
       "-password", adminPass,
-      "-origin", origin,
-    ], {stdio: ["inherit", "inherit", "inherit"]})
+    ], {stdio: "inherit"})
     return boxName;
   }
 
@@ -350,7 +405,7 @@ export class QemuVM {
     // prettier-ignore
     let args = [
       "-name", `${this.scheme.name}-${this.scheme.uuid}-vm-${name}`,
-      "-machine", "pc,accel=kvm",
+      "-machine", "pc,accel=kvm,accel=kvf,accel=xen,accel=hax,accel=nvmm,accel=whpx,accel=tcg",
       "-m", `${this.scheme.memory}`,
       "-smp", "4,sockets=4,cores=1,threads=1",
       "-bios", bios,
@@ -394,16 +449,33 @@ export class QemuVM {
     console.log(`${name} 盒子已停止`);
   }
 
+  /**
+   * 清理盒子，用于注册失败或者在注册过程中用户手动中止的情况
+   */
+  async cleanVM(name) {
+    let vmDir = path.join(this.scheme.path, `vm-${name}`);
+
+    try {
+      fs.accessSync(vmDir);
+    } catch {
+      return;
+    }
+    fs.rmSync(vmDir, { recursive: true, force: true });
+  }
+
   /**
    * 删除虚拟盒子
+   * @param {boolean} silence - 是否提示错误，如果被删除的盒子不存在
    */
-  async deleteVM(name) {
+  async deleteVM(name, silence = false) {
     let vmDir = path.join(this.scheme.path, `vm-${name}`);
 
     try {
       fs.accessSync(vmDir);
     } catch {
-      console.log(`${name} 盒子不存在或者该盒子为一个真实盒子`);
+      if (!silence) {
+        console.log(`${name} 盒子不存在或者该盒子为一个真实盒子`);
+      }
       return;
     }
 

package/lib/builder.js

@@ -9,7 +9,7 @@ import { DockerfileParser } from "dockerfile-ast";
 import glob from "fast-glob";
 import ignore from "@balena/dockerignore";
 import { createLogUpdate } from "log-update";
-import env from "./env.js";
+import env, { sdkEnv } from "./env.js";
 import Dockerode from "dockerode";
 
 export const PRE_BUILD_FILE = "build.sh";
@@ -209,7 +209,7 @@ export default class Builder {
    */
   async dockerRemoteBuildV2(contextDir, dockerfile, tag = env.get("APP_ID")) {
     const src = await this.collectContextFromDockerFile(contextDir, dockerfile);
-    const host = new URL(env.get("SDK_URL")).host;
+    const host = new URL(sdkEnv.sdkUrl).host;
     console.log(host);
     const docker = await new DockerClient(host).init();
     try {

package/lib/dev.js

@@ -1,6 +1,7 @@
 import execa from "execa";
 import { execSync } from "child_process";
 import fs from "fs";
+import chalk from "chalk";
 import {
   GitIgnore,
   isDirSync,
@@ -9,7 +10,7 @@ import {
   APP_SDK_HOSTNAME,
 } from "./utils.js";
 import path from "path";
-import env from "./env.js";
+import env, { sdkEnv } from "./env.js";
 import _get from "lodash.get";
 import { execPreBuild } from "./builder.js";
 import Key from "./key.js";
@@ -18,7 +19,7 @@ import chokidar from "chokidar";
 import Archiver from "../lib/archiver.js";
 
 async function sdkSSHAddr(env) {
-  let url = await env.get("SDK_URL");
+  let url = sdkEnv.sdkUrl;
   return `${APP_SDK_HOSTNAME}@${urlHostname(url)}:2222`;
 }
 
@@ -136,6 +137,15 @@ class DevModule {
       "-i",
       keyFile,
     ].join(" ");
+    // 检查rsync工具是否存在:提示用户
+    try {
+      execSync("rsync -V", {
+        stdio: "ignore",
+      });
+    } catch {
+      console.log(chalk.red("请检查 rsync 是否安装，路径是否正确!"));
+      process.exit();
+    }
     execSync(
       `rsync --rsh='${rsh}' -czrPR . root@${appAddr}:/root/${this.appId} --filter=':- .gitignore' --exclude='node_modules' --exclude='.git' --delete`,
       { stdio: ["ignore", "ignore", "inherit"] }
@@ -196,6 +206,7 @@ class DevModule {
         ignoreInitial: true,
       })
       .on("all", (event, path) => {
+        // console.log(event, path);
         this.syncProject(keyFile, appAddr);
       });
   }
@@ -253,7 +264,7 @@ class DevModule {
 
     try {
       // 确保 sdk 能通过公钥正常访问
-      await new Key().ensure(env.get("SDK_URL"));
+      await new Key().ensure(sdkEnv.sdkUrl);
 
       keyFile = path.join(this.tempDir, "debug/ssh/id_ed25519");
       appAddr = this.getAddress();

package/lib/env.js

@@ -270,7 +270,7 @@ class SDKEnv {
       await this.installSDK(url);
     }
 
-    env.set({ DEFAULT_BOXNAME: boxname, SDK_URL: url }, true);
+    env.set({ DEFAULT_BOXNAME: boxname }, true);
   }
 
   buildSdkUrl(boxname) {

package/lib/git/git-commit.sh

@@ -1,7 +1,7 @@
 # executed under appdb
 
-git fetch origin
-git reset --hard
-
+# git fetch origin
+# git reset --hard
+#
 git add ${APP_ID}
 git commit -m "[lzc-cli publish] bump ${APP_ID} version to ${APP_VERSION}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "test": "mocha",
@@ -14,7 +14,8 @@
   "files": [
     "template",
     "scripts",
-    "lib"
+    "lib",
+    "cmds"
   ],
   "bin": {
     "lzc-cli": "./scripts/cli.js"
@@ -30,8 +31,7 @@
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
-    "commander": "^8.3.0",
-    "commander-completion": "^1.0.1",
+    "command-exists": "^1.2.9",
     "dockerfile-ast": "^0.4.1",
     "dockerode": "^3.3.1",
     "ejs": "^3.1.6",
@@ -55,7 +55,8 @@
     "ora": "^6.0.1",
     "semver": "^7.3.5",
     "ssh2": "^1.5.0",
-    "ssh2-promise": "^1.0.2"
+    "ssh2-promise": "^1.0.2",
+    "yargs": "^17.5.1"
   },
   "devDependencies": {
     "chai": "^4.3.6",

package/scripts/cli.js

@@ -129,7 +129,7 @@ program.command({
     args.option("u", {
       alias: "user",
       describe: "多实例对应的用户",
-      demandOption: true,
+      demandOption: false,
       type: "string",
     });
   },
@@ -159,4 +159,4 @@ program.command({
 
 boxCommand(program);
 
-program.parse();
+program.showHelpOnFail(false, "使用 lzc-cli help 查看更多帮助").parse();

package/scripts/auto-completion.sh

@@ -1,46 +0,0 @@
-# Forked from https://github.com/isaacs/npm/blob/v1.3.17/lib/utils/completion.sh
-# Forked from https://github.com/twolfson/foundry/blob/4.3.3/bin/completion/foundry
-#!/bin/bash
-###-begin-lzc-cli-completion-###
-#
-# foundry command completion script
-#
-# Installation: lzc-cli completion >> ~/.bashrc  (or ~/.zshrc)
-# Or, maybe: lzc-cli completion > /usr/local/etc/bash_completion.d/lzc-cli
-#
-
-COMP_WORDBREAKS=${COMP_WORDBREAKS/=/}
-COMP_WORDBREAKS=${COMP_WORDBREAKS/@/}
-export COMP_WORDBREAKS
-
-if type complete &>/dev/null; then
-  _lzc_cli_completion () {
-    local si="$IFS"
-    IFS=$'\n' COMPREPLY=($(COMP_CWORD="$COMP_CWORD" \
-                           COMP_LINE="$COMP_LINE" \
-                           COMP_POINT="$COMP_POINT" \
-                           lzc-cli completion -- "${COMP_WORDS[@]}" \
-                           2>/dev/null)) || return $?
-    IFS="$si"
-  }
-  complete -F _lzc_cli_completion lzc-cli
-# DEV: We removed `compdef` due to issues with `zsh` (zsh 5.0.0 (x86_64-unknown-linux-gnu))
-elif type compctl &>/dev/null; then
-  _lzc_cli_completion () {
-    local cword line point words si
-    read -Ac words
-    read -cn cword
-    let cword-=1
-    read -l line
-    read -ln point
-    si="$IFS"
-    IFS=$'\n' reply=($(COMP_CWORD="$cword" \
-                       COMP_LINE="$line" \
-                       COMP_POINT="$point" \
-                       lzc-cli completion -- "${words[@]}" \
-                       2>/dev/null)) || return $?
-    IFS="$si"
-  }
-  compctl -K _lzc_cli_completion lzc-cli
-fi
-###-end-lzc-cli-completion-###