@lazycatcloud/lzc-cli 1.1.13 → 1.2.0

package/template/lite/lzc-build.yml

@@ -17,7 +17,6 @@ pkgout: ./
 # icon 指定 lpk 包 icon 的路径路径，如果不指定将会警告
 # icon 仅仅允许 png 后缀的文件
 icon: ./lazycat.png
-
 # devshell 自定义应用的开发容器环境
 # - routers 指定应用容器的访问路由
 
@@ -31,30 +30,3 @@ icon: ./lazycat.png
 #   routes:
 #     - /=http://127.0.0.1:3000
 #   image: registry.lazycat.cloud/lzc-cli/devshell:0.0.4
-
-# devshell 指定构建Dockerfile
-# image 字段如果没有定义，将默认使用 ${package}-devshell:${version}
-# devshell:
-#   routes:
-#     - /=http://127.0.0.1:3000
-#   image: ${package}-devshell:${version}
-#   pull_policy: build
-#   build: .
-
-# dvshell 指定开发依赖的情况
-# 这种情况下，选用 apline:3.16 作为基础镜像，在 dependencies 中添加所需要的开发依赖即可
-# 如果 dependencies 和 build 同时存在，将会优先使用 dependencies
-# devshell:
-#   routes:
-#     - /=http://127.0.0.1:3000
-#   dependencies:
-#     - go
-#     - vim
-#   # setupscript 每次进入到app container后都会执行的配置脚本
-#   # - 可以为脚本的路径地址
-#   # - 如果构建命令简单，也可以直接写 sh 的命令
-#   # setupscript: export GOPROXY=https://goproxy.cn
-#   # setupscript: ./setupscript.sh
-#   setupscript: |
-#     export GOPROXY=https://goproxy.cn
-#     export npm_config_registry=https://registry.npmmirror.com

package/lib/api.js

@@ -1,155 +0,0 @@
-import ora from "ora";
-import chalk from "chalk";
-import fs from "fs";
-import logger from "loglevel";
-import fetch from "./fetch.js";
-
-//
-// sdk 提供的API
-export default class API {
-  constructor(appId, host, uid = "") {
-    this.appId = appId;
-    this.host = host;
-    this.uid = uid;
-  }
-  async install(zipPath, isDevshell = false) {
-    if (!fs.existsSync(zipPath)) {
-      throw `${zipPath} 不存在`;
-    }
-    const resp = await fetch(
-      `${this.host}/api/v1/app/install?id=${this.appId}&devshell=${isDevshell}`,
-      {
-        method: "POST",
-        body: fs.createReadStream(zipPath),
-      }
-    );
-    if (resp.status != 200) {
-      throw chalk.red(await resp.text());
-    }
-  }
-
-  async uninstall() {
-    return await fetch(`${this.host}/api/v1/app/uninstall?id=${this.appId}`, {
-      method: "DELETE",
-    });
-  }
-
-  async resume() {
-    const resp = await fetch(
-      `${this.host}/api/v1/app/resume?id=${this.appId}&userId=${this.uid}`,
-      {
-        method: "POST",
-      }
-    );
-    if (resp.status != 200) {
-      const text = await resp.text();
-      throw text;
-    }
-  }
-
-  async isDevshell() {
-    const resp = await fetch(
-      `${this.host}/api/v1/app/isDevshell?id=${this.appId}`,
-      {
-        method: "GET",
-      }
-    );
-    if (resp.status == 200) {
-      return true;
-    } else {
-      const text = await resp.text();
-      if (text) {
-        logger.debug("isDevshell request failed", text);
-      }
-      return false;
-    }
-  }
-
-  async status() {
-    const resp = await fetch(
-      `${this.host}/api/v1/app/status?id=${this.appId}&userId=${this.uid}`
-    );
-    if (resp.status == 200) {
-      const status = await resp.json();
-      return status;
-    } else {
-      let text = await resp.text();
-      // console.error(chalk.red(`Status Code: ${resp.status} ${text}`));
-      throw text;
-    }
-  }
-
-  async postPublicKey(key) {
-    const resp = await fetch(`${this.host}/api/v1/register`, {
-      method: "POST",
-      body: key,
-    });
-    if (resp.status != 200) {
-      throw new Error(await resp.text());
-    }
-  }
-
-  async checkStatus(resume = false) {
-    const spinner = ora().start();
-    let { status, info } = await this.status();
-    spinner.text = "部署进度 " + status;
-
-    switch (status) {
-      case "running":
-        console.log(chalk.yellow("应用正在运行中"));
-        break;
-      case "error":
-        spinner.stop();
-        logger.error("应用状态错误，请在盒子中查看对应的错误信息");
-        throw info?.msg;
-      default:
-        try {
-          await desireStatusTimer(async (result) => {
-            spinner.text = "部署进度 " + result.status;
-
-            if (result.status == "paused" && resume) {
-              await this.resume();
-            }
-
-            return result.status === "running";
-          }, this.status.bind(this));
-        } catch (error) {
-          throw error;
-        } finally {
-          spinner.stop();
-        }
-        break;
-    }
-    spinner.stop();
-  }
-}
-
-export function desireStatusTimer(desireCheckFn, getStatusFn) {
-  let errorCount = 0;
-  return new Promise((resolve, reject) => {
-    function schedule(timeout) {
-      setTimeout(async () => {
-        const answer = await getStatusFn();
-        try {
-          if (answer) {
-            if (answer.status == "error") {
-              throw new Error(answer.error);
-            } else if (await desireCheckFn(answer)) {
-              resolve(answer);
-            } else {
-              schedule(1000);
-            }
-          }
-        } catch (e) {
-          errorCount += 1;
-          if (errorCount >= 3) {
-            reject(e);
-            return;
-          }
-          schedule(1000);
-        }
-      }, timeout);
-    }
-    schedule(1000);
-  });
-}

package/lib/app/lpk_devshell_docker.js

@@ -1,211 +0,0 @@
-// build strategies based on lzc-build.yml devshell field
-import path from "node:path";
-import fs from "node:fs";
-import logger from "loglevel";
-
-import { DockerClient, SSHClient, connectOptions } from "../sdk.js";
-import { DockerfileParser } from "dockerfile-ast";
-import glob from "fast-glob";
-import ignore from "@balena/dockerignore";
-import { createLogUpdate } from "log-update";
-import { sdkEnv } from "../env.js";
-
-export class SdkDocker {
-  constructor() {}
-
-  // builder 需要在app 的场景下使用, 不过有两个路径要注意
-  // 一个是 docker build 时的context. 这个一般是运行cli时候的路径
-  async buildImage(tag, buildDir, contextDir) {
-    const dockerfilePath = path.join(buildDir, "Dockerfile");
-    await this.dockerRemoteBuildV2(contextDir, dockerfilePath, tag);
-  }
-
-  async collectContextFromDockerFile(contextDir, dockerfilePath) {
-    if (!fs.existsSync(dockerfilePath)) {
-      throw "未发现 Dockerfile";
-    }
-
-    let src = [path.relative(contextDir, dockerfilePath)];
-
-    // 通过 COPY 和 ADD 获取所有context中的文件
-    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;
-  }
-
-  /**
-   * v2 版本会收集所有需要的context 文件,将其传入buildImage 方法中
-   * @param contextDir
-   * @param dockerfile
-   * @param tag
-   */
-  async dockerRemoteBuildV2(contextDir, dockerfile, tag) {
-    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 {
-      return new Promise(async (resolve, reject) => {
-        let refresher = new StatusRefresher();
-
-        logger.info("开始在设备中构建镜像");
-        const stream = await docker.buildImage(
-          {
-            context: contextDir,
-            src: src,
-          },
-          {
-            dockerfile: src[0],
-            t: tag,
-            networkmode: "home-cloud",
-          }
-        );
-        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;
-    }
-  }
-
-  async interactiveShell(appId, shell, uid = "") {
-    const host = new URL(sdkEnv.sdkUrl).hostname;
-    const opts = await connectOptions(host);
-    const client = new SSHClient(opts);
-    await client.connect();
-    try {
-      const replacedAppId = appId.replaceAll(".", "_").replaceAll("-", "__");
-      const containerName = `lzc-${uid}-${replacedAppId}-app-1`;
-      const stream = await client.exec(
-        `docker exec -e SHELL=${shell} -e PKGID=${appId} -ti ${containerName} /lzcapp/pkg/content/devshell/exec.sh`,
-        {
-          pty: true,
-        }
-      );
-
-      stream.setWindow(process.stdout.rows, process.stdout.columns, 0, 0);
-      process.stdin.setRawMode(true);
-      process.stdin.pipe(stream);
-
-      stream.stdout.pipe(process.stdout);
-      stream.stderr.pipe(process.stderr);
-      process.stdout.on("resize", () => {
-        // Let the remote end know when the local terminal has been resized
-        stream.setWindow(process.stdout.rows, process.stdout.columns, 0, 0);
-      });
-
-      await new Promise((resolve, reject) => {
-        stream.on("close", () => {
-          client.close();
-          resolve();
-        });
-        stream.on("error", (e) => {
-          logger.error("interactiveShell error", e);
-          reject(e);
-        });
-      });
-    } catch (e) {
-      logger.error(e);
-    } finally {
-      process.stdin.setRawMode(false);
-      client.close();
-    }
-  }
-}
-
-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();
-  }
-}

package/lib/app/lpk_log.js

@@ -1,68 +0,0 @@
-import { readFileSync } from "fs";
-import { Client } from "ssh2";
-import os from "os";
-import path from "path";
-import process from "process";
-import { sdkEnv } from "../env.js";
-import { SSHClient, connectOptions } from "../sdk.js";
-import logger from "loglevel";
-
-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 class LpkLogger {
-  constructor() {}
-
-  async init() {
-    await sdkEnv.ensure();
-  }
-
-  async start(project, follow = false) {
-    const host = new URL(sdkEnv.sdkUrl).hostname;
-    const opts = await connectOptions(host);
-    const client = new SSHClient(opts);
-    await client.connect();
-    try {
-      const replacedAppId = project.replaceAll(".", "_").replaceAll("-", "__");
-      const findStream = await client.exec(
-        `docker-compose ls | grep ${replacedAppId} | head -n 1`
-      );
-      const result = await StreamPromise(findStream);
-      if (result == "") {
-        throw `${project} 服务没有找到`;
-      }
-
-      const name = result.split(" ")[0];
-      const _f = follow ? "-f " : " ";
-      const stream = await client.exec(`docker-compose -p ${name} logs ${_f}`, {
-        pty: true,
-      });
-      await new Promise((resolve, reject) => {
-        stream.stdout.pipe(process.stdout);
-        stream.stderr.pipe(process.stdout);
-        stream.on("close", () => {
-          client.close();
-          resolve();
-        });
-        stream.on("error", (e) => reject(e));
-      });
-    } catch (e) {
-      logger.error(e);
-    } finally {
-      client.close();
-    }
-  }
-}

package/lib/app/lpk_status.js

@@ -1,18 +0,0 @@
-import BoxAPI from "../api.js";
-import { sdkEnv } from "../env.js";
-import logger from "loglevel";
-
-export class LpkStatuser {
-  constructor() {}
-
-  async init() {
-    // 1. 确保 sdk 已经安装
-    await sdkEnv.ensure();
-  }
-
-  async status(pkgId) {
-    let api = new BoxAPI(pkgId, sdkEnv.sdkUrl);
-    let { status } = await api.status();
-    logger.info(status);
-  }
-}

package/lib/app/lpk_uninstall.js

@@ -1,19 +0,0 @@
-import BoxAPI from "../api.js";
-import { sdkEnv } from "../env.js";
-import logger from "loglevel";
-
-export class LpkUninstaller {
-  constructor() {}
-
-  async init() {
-    // 1. 确保 sdk 已经安装
-    await sdkEnv.ensure();
-  }
-
-  async uninstall(pkgId) {
-    logger.info(`开始卸载${pkgId}`);
-    let api = new BoxAPI(pkgId, sdkEnv.sdkUrl);
-    await api.uninstall();
-    logger.info(`卸载成功！`);
-  }
-}