@lazycatcloud/lzc-cli 1.1.8 → 1.1.9

package/cmds/publish.js

@@ -1,116 +0,0 @@
-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/archiver.js

@@ -1,105 +0,0 @@
-import {
-  archiveFolder,
-  copyDotAppDir,
-  ensureDir,
-  toPair,
-  META_MARK,
-  envsubstr,
-} from "./utils.js";
-
-import glob from "fast-glob";
-import path from "path";
-import fs from "fs";
-import env from "./env.js";
-import DockerCompose from "./docker-compose.js";
-
-class Archiver {
-  constructor(tmpDir) {
-    this.tmpDir = tmpDir;
-  }
-
-  async load(baseDir, e) {
-    const allEnv = e ? e : env.all;
-    // 1 拷贝 dotApp 路径至 temp
-    this.dotAppDir = baseDir;
-    await copyDotAppDir(this.dotAppDir, this.tmpDir, {
-      env: allEnv,
-    });
-  }
-
-  // 用于替换一些docker-compose 内容
-  replace(dockerComposeContent) {
-    let base = new DockerCompose(path.join(this.tmpDir, "docker-compose.yml"));
-    base.merge({ content: dockerComposeContent });
-    base.save();
-  }
-
-  async add(cwd, e) {
-    const allEnv = e ? e : env.all;
-    Object.assign(allEnv, { APP_IMAGE_NAME: env.get("APP_ID") });
-    const target = this.tmpDir;
-    try {
-      let base = new DockerCompose(path.join(target, "docker-compose.yml"));
-      // 2 遍历当前路径, 拷贝至 temp, 同时对 docker-compose 做合并操作
-      const _files = await glob(["**"], {
-        cwd: cwd,
-        dot: true,
-      });
-
-      for (let file of _files) {
-        let absFile = path.join(cwd, file);
-        if (path.basename(file).startsWith("docker-compose")) {
-          if (file.endsWith(".in")) {
-            base.merge({ content: await this._doEnvSubStr(absFile, allEnv) });
-          } else {
-            base.merge({ path: absFile });
-          }
-        } else {
-          // 对其他模板做转换操作, 然后直接写入目标文件
-          let targetAbsFile;
-          if (file.endsWith(".in")) {
-            targetAbsFile = path.join(target, file.replace(/\.in$/, ""));
-            ensureDir(targetAbsFile);
-            fs.writeFileSync(
-              targetAbsFile,
-              await this._doEnvSubStr(absFile, allEnv)
-            );
-          } else {
-            targetAbsFile = path.join(target, file);
-            ensureDir(targetAbsFile);
-            fs.copyFileSync(absFile, targetAbsFile);
-          }
-        }
-      }
-
-      base.save();
-
-      // if (opts.build || false) {
-      //   // new Builder()
-      // }
-    } catch (e) {
-      throw e;
-    }
-  }
-
-  async _doEnvSubStr(filepath, env = {}) {
-    const options = {
-      envs: toPair(env),
-      syntax: "default",
-      protect: false,
-    };
-    return await envsubstr(fs.readFileSync(filepath, "utf8"), {
-      options,
-    });
-  }
-
-  async finalize(zip = true) {
-    if (zip) {
-      return await archiveFolder(this.tmpDir);
-    } else {
-      return this.tmpDir;
-    }
-  }
-}
-
-export default Archiver;

package/lib/box/hportal.js

@@ -1,120 +0,0 @@
-import fetch from "node-fetch";
-import logger from "loglevel";
-
-export class HportalManager {
-  constructor(apiHost) {
-    this.apiHost = apiHost;
-  }
-
-  async deleteBox(boxId) {
-    let url = `${this.apiHost}/admin/boxes/${boxId}`;
-    const resp = await fetch(url, { method: "DELETE" });
-    if (resp.status != 200) {
-      let text = await resp.text();
-      console.log("从 Hportal 删除盒子失败", text);
-    }
-  }
-
-  async addBox(boxName) {
-    let url = `${this.apiHost}/admin/boxes/${boxName}`;
-    const resp = await fetch(url, {
-      method: "POST",
-      body: JSON.stringify({
-        box_name: boxName,
-      }),
-    });
-    if (resp.status != 200) {
-      let text = await resp.text();
-      console.log(`添加 ${boxName} 到 Hportal 失败`);
-      throw text;
-    }
-  }
-
-  async loginBox(boxId, user, password) {
-    let url = `${this.apiHost}/admin/loginBox`;
-    const resp = await fetch(url, {
-      method: "POST",
-      body: JSON.stringify({
-        box_id: boxId,
-        password,
-        user,
-      }),
-    });
-    if (resp.status != 200) {
-      let text = await resp.text();
-      console.log(`登录失败`, text);
-      throw text;
-    }
-  }
-
-  async getBoxId(boxName) {
-    let boxs = await this.boxs(boxName);
-    if (boxs.length == 0) {
-      return "";
-    } else {
-      return boxs[0].boxId;
-    }
-  }
-
-  async boxs(boxName, defaultBoxName = "") {
-    let url = this.apiHost + "/admin/boxes";
-
-    let origin = [];
-    try {
-      const resp = await fetch(url);
-      if (resp.status == 200) {
-        origin = await resp.json();
-      } else {
-        logger.debug(
-          `status: ${resp.status}, url: ${resp.url}, text: ${resp.statusText}`
-        );
-        return [];
-      }
-    } catch {
-      return [];
-    }
-
-    let all = origin.map((info) => {
-      let yesorno = info.box_name == defaultBoxName ? "yes" : "no";
-      let connect = info.status >= 200 ? "connect" : "disconnect";
-      return {
-        default: yesorno,
-        boxName: info.box_name,
-        boxId: info.box_id,
-        connect,
-      };
-    });
-
-    if (!boxName) {
-      return all;
-    }
-
-    let box = all.find((a) => a.boxName == boxName);
-    if (box) {
-      return [box];
-    } else {
-      return [];
-    }
-  }
-}
-
-// showBox 将 qemu 虚拟盒子 和 真实盒子 的信息合并起来展示
-export function showBoxInfo(vmInfos, rmInfos) {
-  let boxIds = vmInfos
-    .concat(rmInfos)
-    .map((info) => info.boxId)
-    .filter((value, index, self) => self.indexOf(value) == index);
-
-  if (boxIds.length == 0) {
-    console.log("没有找到任何盒子，创建一个吧!");
-    return;
-  }
-
-  let result = [];
-  boxIds.forEach((boxId) => {
-    let vInfo = vmInfos.find((r) => r.boxId == boxId) || {};
-    let rInfo = rmInfos.find((r) => r.boxId == boxId) || {};
-    result.push(Object.assign({}, vInfo, rInfo));
-  });
-  console.table(result);
-}

package/lib/builder.js

@@ -1,313 +0,0 @@
-// build strategies based on build.yml
-import fs from "fs";
-import path from "path";
-import chalk from "chalk";
-import execa from "execa";
-// import { archiveFolder } from "./utils.js";
-import { dockerPullLzcAppsImage, DockerClient } from "./sdk.js";
-import { DockerfileParser } from "dockerfile-ast";
-import glob from "fast-glob";
-import ignore from "@balena/dockerignore";
-import { createLogUpdate } from "log-update";
-import env, { sdkEnv } from "./env.js";
-import Dockerode from "dockerode";
-
-export const PRE_BUILD_FILE = "build.sh";
-
-export async function execPreBuild(targetDir, context, env = {}) {
-  const buildFile = path.join(targetDir, PRE_BUILD_FILE);
-  if (!fs.existsSync(buildFile)) return;
-
-  const subproces = execa(buildFile, {
-    cwd: context,
-    env: env,
-    stdio: ["ignore", "inherit", "inherit"],
-  });
-  return await subproces;
-}
-
-// builder 需要在app 的场景下使用, 不过有两个路径要注意
-// 一个是 docker build 时的context. 这个一般是运行cli时候的路径
-// 一个是 .lazycat 的路径
-export default class Builder {
-  constructor(env) {
-    this.env = env;
-  }
-
-  async local() {}
-
-  async buildImage(contextDir, buildDir) {
-    try {
-      await this.dockerRemoteBuildV2(
-        contextDir,
-        path.join(buildDir, "Dockerfile")
-      );
-    } catch (e) {
-      throw e;
-    }
-  }
-
-  // private functions
-
-  async collectContextFromDockerFile(contextDir, dockerfilePath) {
-    // const contextDir = path.join(process.cwd(), context);
-    // const dockerfilePath = path.join(process.cwd(), dockerfile);
-
-    if (!fs.existsSync(dockerfilePath)) {
-      throw "未发现 Dockerfile";
-    }
-
-    let src = [path.relative(contextDir, dockerfilePath)];
-
-    // 通过 COPY 和 ADD 获取所有context中的文件
-    // TODO 未处理 dockerignore 情况
-    const ast = DockerfileParser.parse(fs.readFileSync(dockerfilePath, "utf8"));
-    for (let a of ast.getInstructions()) {
-      if (["COPY", "ADD"].includes(a.getInstruction())) {
-        const from = a.getArguments()[0].getValue().replace(/^\//, "");
-
-        const fromFullPath = path.join(contextDir, from);
-
-        if (fs.existsSync(fromFullPath)) {
-          const stat = fs.statSync(path.join(contextDir, from));
-          if (stat.isDirectory()) {
-            let files = await glob(path.join(from, "**"), {
-              cwd: contextDir,
-            });
-            src = src.concat(files);
-          } else if (stat.isFile()) {
-            src.push(from);
-          }
-        } else {
-          // try use glob
-          let files = await glob(from, {
-            cwd: contextDir,
-          });
-          src = src.concat(files);
-        }
-      }
-    }
-    // filter by dockerignore
-    const dockerIgnoreFile = path.join(contextDir, ".dockerignore");
-    //
-    if (fs.existsSync(dockerIgnoreFile)) {
-      let ig = ignore();
-      let data = fs.readFileSync(dockerIgnoreFile, "utf8");
-      ig.add(data.split("\n"));
-      src = ig.filter(src);
-    }
-    return src;
-  }
-
-  async dockerLocalBuild(contextDir, dockerfile, tag = env.get("APP_ID")) {
-    const src = await this.collectContextFromDockerFile(contextDir, dockerfile);
-
-    const docker = await new DockerClient().init();
-    try {
-      console.log(chalk.green("开始在设备中构建镜像"));
-
-      const stream = await docker.buildImage(
-        {
-          context: contextDir,
-          src: src,
-        },
-        {
-          buildargs: env.all,
-          dockerfile: src[0],
-          t: tag,
-        }
-      );
-      const finished = await new Promise((resolve, reject) => {
-        let refresher = new StatusRefresher();
-
-        docker.modem.followProgress(
-          stream,
-          (err, res) => {
-            err ? reject(err) : resolve(res);
-          },
-          (res) => {
-            if (res.status) {
-              if (res.id) {
-                if (["Downloading", "Extracting"].includes(res.status)) {
-                  refresher.updateStatus({
-                    id: res.id,
-                    content: `${res.status} ${res.progress}`,
-                  });
-                } else {
-                  refresher.updateStatus({ id: res.id, content: res.status });
-                }
-              } else {
-                process.stdout.write(res.status);
-                process.stdout.write("\n");
-              }
-            }
-
-            if (res.stream) {
-              if (res.stream.startsWith("Step")) {
-                refresher.reset();
-              }
-              process.stdout.write(res.stream);
-            }
-            if (res.error) {
-              reject(res.error);
-            }
-          }
-        );
-      });
-      await this.pushImage(tag);
-    } catch (err) {
-      throw err;
-    }
-  }
-
-  async pushImage(tag) {
-    console.log(chalk.green(`开始推送镜像`));
-    const docker = await new DockerClient().init();
-
-    const image = new Dockerode.Image(docker.modem, tag);
-
-    // TODO hardcode 未来开发者需要获取推送至 lazycat 的token
-    return new Promise((resolve, reject) => {
-      image
-        .push({
-          authconfig: { auth: "bG5rczpsbmtzMjAyMA==" },
-        })
-        .then((stream) => {
-          let refresher = new StatusRefresher();
-          docker.modem.followProgress(
-            stream,
-            (err, res) => {
-              err ? reject(err) : resolve(res);
-            },
-            (res) => {
-              if (res.status) {
-                if (res.id) {
-                  refresher.updateStatus({ id: res.id, content: res.status });
-                } else {
-                  process.stdout.write(res.status);
-                  process.stdout.write("\n");
-                }
-              }
-
-              if (res.stream) {
-                process.stdout.write(res.stream);
-              }
-              if (res.error) {
-                reject(res.error);
-              }
-            }
-          );
-        });
-    });
-  }
-
-  /**
-   * v2 版本会收集所有需要的context 文件,将其传入buildImage 方法中
-   * @param contextDir
-   * @param dockerfile
-   * @param tag
-   */
-  async dockerRemoteBuildV2(contextDir, dockerfile, tag = env.get("APP_ID")) {
-    const src = await this.collectContextFromDockerFile(contextDir, dockerfile);
-    const host = new URL(sdkEnv.sdkUrl).host;
-    console.log(host);
-    const docker = await new DockerClient(host).init();
-    try {
-      // TODO, 使用 docker.pull 方法会失败, 原因未知, 使用 workaround 方案
-      // docker.pull(
-      //   "hello-world",
-      //   // "registry.lazycat.cloud/lzc/lzcapp:0.1",
-      //   // { authconfig: { auth: "bG5rczpsbmtzMjAyMA==" } },
-      //   (err, stream) => {
-      //     console.log("====", err, stream);
-      //   }
-      // );
-      await dockerPullLzcAppsImage(host);
-
-      return new Promise(async (resolve, reject) => {
-        let refresher = new StatusRefresher();
-
-        console.log(chalk.green("开始在设备中构建镜像"));
-        const stream = await docker.buildImage(
-          {
-            context: contextDir,
-            src: src,
-          },
-          {
-            buildargs: this.env,
-            dockerfile: src[0],
-            t: tag,
-          }
-        );
-        docker.modem.followProgress(
-          stream,
-          (err, res) => {
-            err ? reject(err) : resolve(res);
-          },
-          (res) => {
-            if (res.status) {
-              if (res.id) {
-                if (["Downloading", "Extracting"].includes(res.status)) {
-                  refresher.updateStatus({
-                    id: res.id,
-                    content: `${res.status} ${res.progress}`,
-                  });
-                } else {
-                  refresher.updateStatus({
-                    id: res.id,
-                    content: res.status,
-                  });
-                }
-              } else {
-                process.stdout.write(res.status);
-                process.stdout.write("\n");
-              }
-            }
-
-            if (res.stream) {
-              if (res.stream.startsWith("Step")) {
-                refresher.reset();
-              }
-              process.stdout.write(res.stream);
-            }
-            if (res.error) {
-              reject(res.error);
-            }
-          }
-        );
-      });
-    } catch (err) {
-      throw err;
-    }
-  }
-}
-
-class StatusRefresher {
-  constructor() {
-    this.reset();
-  }
-  refresh() {
-    this.logUpdate(this.pulls.map((p) => `${p.id}: ${p.content}`).join("\n"));
-  }
-
-  reset() {
-    this.pulls = [];
-    this.logUpdate = createLogUpdate(process.stdout);
-  }
-
-  updateStatus({ id, content }) {
-    let index = this.pulls.findIndex((p) => p.id == id);
-    if (index > -1) {
-      this.pulls[index] = {
-        id: id,
-        content: content,
-      };
-    } else {
-      this.pulls.push({
-        id: id,
-        content: content,
-      });
-    }
-    this.refresh();
-  }
-}