@lazycatcloud/lzc-cli 1.1.5 → 1.1.8

package/lib/sdk.js

@@ -4,8 +4,8 @@ import Docker from "dockerode";
 import process from "process";
 import fs from "fs";
 import { Client } from "ssh2";
-import chalk from "chalk";
 import Key from "./key.js";
+import logger from "loglevel";
 
 export async function connectOptions(host) {
   const pairs = await new Key().getKeyPair();
@@ -38,7 +38,7 @@ export class DockerClient {
   async init() {
     this.docker = !!this.host
       ? new Docker({
-          protocal: "http",
+          protocal: "ssh",
           agent: ssh(await connectOptions(this.host)),
         })
       : new Docker();
@@ -47,9 +47,7 @@ export class DockerClient {
 
     async function onUncaughtException(e) {
       if (e.code == "ECONNREFUSED") {
-        console.log(
-          chalk.red(`无法连接 sdk 服务, 请确保 ${chalk.yellow(host)} 可以访问`)
-        );
+        logger.error(`无法连接 sdk 服务, 请确保 ${host} 可以访问`);
         process.exit(1);
       } else {
         throw e;
@@ -78,6 +76,7 @@ export class SSHClient {
       this.con
         .on("ready", () => resolve(this.con))
         .on("error", (err) => {
+          logger.error("ssh client ", err);
           reject(err);
         })
         .on("close", () => resolve(null))
@@ -126,7 +125,7 @@ export class SSHClient {
 }
 
 export async function dockerPullLzcAppsImage(host) {
-  console.log(chalk.yellow("* 更新lzcapp镜像, 未来可能会移除此操作"));
+  logger.warn("* 更新lzcapp镜像, 未来可能会移除此操作");
   const opts = await connectOptions(host);
   const client = new SSHClient(opts);
   await client.connect();

package/lib/utils.js

@@ -8,13 +8,14 @@ import glob from "fast-glob";
 import yaml from "js-yaml";
 import mergeWith from "lodash.mergewith";
 import isArray from "lodash.isarray";
-import fetch from "node-fetch";
+import { request } from "./autologin.js";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
 import ignore from "ignore";
 import ora from "ora";
 import { desireStatusTimer } from "../lib/api.js";
 import { warn } from "console";
+import { createHash } from "node:crypto";
 
 const META_MARK = "x-lazycat-app";
 const APP_FOLDER = ".lazycat";
@@ -26,103 +27,6 @@ export const envsubstr = async (templateContents, args) => {
   const parse = await importDefault("envsub/js/envsub-parser.js");
   return parse(templateContents, args);
 };
-/**
- * 为盒子安装SDK应用
- * @param box_url 盒子入口地址
- **/
-async function InstallSDK(box_url) {
-  try {
-    let url = `${box_url}/api/app/apply?id=sdk`;
-    const resp = await fetch(url, { method: "post" });
-    if (resp.status != 200) {
-      throw new Error(
-        chalk.red(
-          `无法安装, 请确保 ${chalk.yellow(
-            new URL(url).origin
-          )} 可以访问或者在应用商店安装 sdk`
-        )
-      );
-    }
-  } catch (err) {
-    throw err;
-  }
-}
-/**
- * 检查SDK安装部署的状态
- * @param box_url 盒子入口地址
- **/
-async function checkSDKInstallStatus(box_url) {
-  const checkSDKstatus = async function (box_url) {
-    let url = `${box_url}/api/app/status?id=sdk`;
-    const resp = await fetch(url);
-    if (resp.status == 200) {
-      const status = await resp.json();
-      return status;
-    } else {
-      let text = await resp.text();
-      throw text;
-    }
-  };
-  const spinner = ora().start();
-  let { status, info } = await checkSDKstatus(box_url);
-  spinner.text = "部署进度";
-  switch (status) {
-    case "running":
-      console.log(chalk.yellow("应用正在运行中"));
-      break;
-    case "error":
-      spinner.stop();
-      console.log(status, info);
-      throw info.msg;
-    default:
-      try {
-        await desireStatusTimer(
-          (result) => {
-            spinner.text = "部署进度 " + result.status;
-            return result.status === "running";
-          },
-          () => {
-            return checkSDKstatus(box_url);
-          }
-        );
-      } catch (error) {
-        throw error;
-      } finally {
-        spinner.stop();
-      }
-      break;
-  }
-  spinner.stop();
-}
-
-/**
- * 获取所有已安装的app
- * @param box_url 盒子入口地址
- **/
-async function getInstalledApps(box_url) {
-  try {
-    let url = `${box_url}/api/app/dump`;
-    const resp = await fetch(url);
-    if (resp.status != 200) throw new Error(chalk.red("获取所有已安装App失败"));
-    return await resp.json();
-  } catch (e) {
-    console.log(e);
-  }
-}
-/**
- * 查找某个app是否已安装]
- * @param box_url 盒子入口地址
- * @param app_id app名
- * */
-async function findAppIsInstalled(box_url, app_id) {
-  const apps = await getInstalledApps(box_url);
-  for (let app in apps) {
-    if (app == app_id) {
-      return true;
-    }
-  }
-  return false;
-}
 
 /**
  * 确保文件夹存在
@@ -191,9 +95,10 @@ function findAppRootPath(aPath) {
 
 function toPair(object) {
   return Object.keys(object).map((key) => {
+    let value = object[key] ? object[key].toString() : "";
     return {
       name: key,
-      value: object[key].toString(),
+      value,
     };
   });
 }
@@ -203,43 +108,14 @@ function getMetaInfo(composeFile) {
   return doc[META_MARK];
 }
 
-async function createTemplateFile(templateFile, outputFile, env) {
+async function envTemplateFile(templateFile, env) {
   const template = yaml.load(fs.readFileSync(templateFile, "utf8"));
-  //   const meta = template[META_MARK];
-  //   if (
-  //     meta &&
-  //     Array.isArray(meta["permissions"]) &&
-  //     meta["permissions"].includes("lzcapis")
-  //   ) {
-  //     template[META_MARK]["ingress"].push({
-  //       service: "lazycat-apis-sidecar",
-  //       port: 8888,
-  //       subdomain: "${APP_NAME}",
-  //       path: "/lzcapis/",
-  //       auth: "oidc",
-  //       authcallback: "/lzcapis/oidc-callback",
-  //     });
-  //     template["services"]["lazycat-apis-sidecar"] = {
-  //       image: "registry.lazycat.cloud/lazycat-apis-sidecar",
-  //       // volumes_from: ["${APP_NAME}:rw"],
-  //       volumes: ["lzcapis-lzcapp:/lzcapp"],
-  //       command: [
-  //         "--client-id=${LAZYCAT_AUTH_OIDC_CLIENT_ID}",
-  //         "--client-secret=${LAZYCAT_AUTH_OIDC_CLIENT_SECRET}",
-  //         "--client-url=https://${LAZYCAT_APP_ORIGIN}/lzcapis/",
-  //         "--issuer=${LAZYCAT_AUTH_OIDC_ISSUER_URL}",
-  //         "--prefix=lzcapis",
-  //         "--fs-root=/lzcapp/documents",
-  //       ],
-  //     };
-  //   }
-  //
   const options = {
     envs: toPair(env),
     syntax: "default",
     protect: false,
   };
-  const output = await envsubstr(
+  return await envsubstr(
     yaml.dump(template, {
       styles: {
         "!!null": "empty", // dump null as ""
@@ -247,7 +123,23 @@ async function createTemplateFile(templateFile, outputFile, env) {
     }),
     { options }
   );
+}
 
+async function createTemplateFile(templateFile, outputFile, env) {
+  let output = await envTemplateFile(templateFile, env);
+  fs.writeFileSync(outputFile, output);
+}
+
+async function createTemplateFileCommon(templateFile, outputFile, env) {
+  const template = yaml.load(fs.readFileSync(templateFile, "utf8"));
+  const options = {
+    envs: toPair(env),
+    syntax: "default",
+    protect: false,
+  };
+  const output = await envsubstr(fs.readFileSync(templateFile, "utf-8"), {
+    options,
+  });
   fs.writeFileSync(outputFile, output);
 }
 
@@ -262,7 +154,7 @@ async function copyDotAppDir(from, to, opts = {}) {
     if (fs.existsSync(to)) {
       fs.rmSync(to, { recursive: true });
     }
-    const _files = await glob(["*"].concat(include), {
+    const _files = await glob(["**"].concat(include), {
       cwd: from,
       dot: true,
       ignore: ignore,
@@ -289,6 +181,22 @@ async function copyDotAppDir(from, to, opts = {}) {
   }
 }
 
+function mergeYamlInMemory(args) {
+  if (args.length == 0) {
+    return {};
+  } else if (args.length == 1) {
+    return args[0];
+  }
+  return args.reduce((prev, curr) => {
+    let result = mergeWith(prev, curr, (objValue, srcValue) => {
+      if (isArray(objValue)) {
+        return objValue.concat(srcValue);
+      }
+    });
+    return result;
+  }, {});
+}
+
 // override yaml, notice this will change target file
 function mergeYaml(target, source) {
   const targetContent = yaml.load(fs.readFileSync(target, "utf8"));
@@ -302,15 +210,7 @@ function mergeYaml(target, source) {
       }
     }
   );
-
-  fs.writeFileSync(
-    target,
-    yaml.dump(merged, {
-      styles: {
-        "!!null": "empty", // dump null as ""
-      },
-    })
-  );
+  dumpToYaml(merged, target);
 }
 
 function archiveFolder(appDir, format = "zip") {
@@ -393,6 +293,14 @@ function isDirSync(path) {
   return stat.isDirectory();
 }
 
+function isDirExist(path) {
+  try {
+    return isDirSync(path);
+  } catch {
+    return false;
+  }
+}
+
 function isFileExist(path) {
   try {
     fs.accessSync(
@@ -416,6 +324,18 @@ function parse2CorrectName(name) {
   return name.replaceAll(" ", "-").toLowerCase();
 }
 
+async function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
+async function md5String(str) {
+  const hash = createHash("md5");
+  hash.update(str);
+  return hash.digest("hex");
+}
+
 export {
   ensureDir,
   copyDotAppDir,
@@ -424,6 +344,7 @@ export {
   findAppRootPath,
   archiveFolder,
   mergeYaml,
+  mergeYamlInMemory,
   loadFromYaml,
   dumpToYaml,
   importDefault,
@@ -434,13 +355,14 @@ export {
   toPair,
   contextDirname,
   isDirSync,
+  isDirExist,
   GitIgnore,
   isFileExist,
   urlHostname,
-  InstallSDK,
-  findAppIsInstalled,
-  getInstalledApps,
-  checkSDKInstallStatus,
+  envTemplateFile,
   createTemplateFile,
   parse2CorrectName,
+  sleep,
+  md5String,
+  createTemplateFileCommon
 };

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.1.5",
+  "version": "1.1.8",
   "description": "lazycat cloud developer kit",
   "scripts": {
-    "test": "mocha",
-    "publish": "npm publish --access public"
+    "test": "mocha"
   },
   "mocha": {
     "recursive": true,
@@ -48,6 +47,7 @@
     "lodash.merge": "^4.6.2",
     "lodash.mergewith": "^4.6.2",
     "log-update": "^5.0.0",
+    "loglevel": "^1.8.0",
     "minimist": "^1.2.5",
     "node-fetch": "^2.6.6",
     "node-stream-zip": "^1.15.0",
@@ -55,6 +55,7 @@
     "semver": "^7.3.5",
     "ssh2": "^1.5.0",
     "ssh2-promise": "^1.0.2",
+    "tar": "^6.1.11",
     "yargs": "^17.5.1"
   },
   "devDependencies": {
@@ -62,5 +63,9 @@
     "chai": "^4.3.6",
     "mocha": "^9.2.2",
     "prettier": "^2.5.0"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org",
+    "access": "public"
   }
 }

package/scripts/cli.js

@@ -2,25 +2,82 @@
 import process from "process";
 import path from "path";
 import fs from "fs";
-import { contextDirname, importDefault } from "../lib/utils.js";
+import logger from "loglevel";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
+import chalk from "chalk";
 
+import { contextDirname, importDefault } from "../lib/utils.js";
 import Env from "../lib/env.js";
 import { boxCommand } from "../lib/box/index.js";
+import { lpkAppCommand, lpkProjectCommand } from "../lib/app/index.js";
 const pkgInfo = JSON.parse(
   fs.readFileSync(path.join(contextDirname(import.meta.url), "../package.json"))
 );
 
+// logger level middleware
+const logLevelOriginalFactory = logger.methodFactory;
+logger.methodFactory = function (methodName, logLevel, loggerName) {
+  let rawMethod = logLevelOriginalFactory(methodName, logLevel, loggerName);
+  return function (...args) {
+    let color = (msg) => chalk.gray;
+    switch (methodName) {
+      case "trace":
+        color = chalk.dim.cyan;
+        break;
+      case "debug":
+        color = chalk.blue;
+        break;
+      case "info":
+        color = chalk.green;
+        break;
+      case "warn":
+        color = chalk.magenta;
+        break;
+      case "error":
+        color = chalk.bold.red;
+        break;
+    }
+    rawMethod(
+      `[${methodName}] ` +
+        args
+          .map((a) => {
+            let res = a;
+            if (typeof a == "object") {
+              res = JSON.stringify(a, undefined, 4);
+            }
+            return color(res);
+          })
+          .join(" ")
+    );
+  };
+};
+logger.setDefaultLevel("info");
+function setLoggerLevel({ log }) {
+  logger.setLevel(log, false);
+}
+
 const program = yargs(hideBin(process.argv))
   .scriptName("lzc-cli")
   .usage("<command> [options]")
   .version(`lzc-cli ${pkgInfo.version}`)
-  .completion("completion", "生成bash/zsh补全脚本");
+  .option("log", {
+    type: "string",
+    default: "info",
+    describe: "log level 'trace', 'debug', 'info', 'warn', 'error'",
+  })
+  .option("help", {
+    alias: "h",
+    type: "boolean",
+    default: false,
+  })
+  .completion("completion", false);
 
+// Set desc to false to create a hidden command. Hidden commands don’t show up
+// in the help output and aren’t available for completion.
 program.command({
   command: "create <name>",
-  desc: "创建懒猫云应用",
+  desc: false,
   aliases: ["c"],
   handler: async ({ name }) => {
     let create = await importDefault("../cmds/create.js");
@@ -30,7 +87,7 @@ program.command({
 
 program.command({
   command: "init",
-  desc: "初始化懒猫云应用配置",
+  desc: false,
   handler: async () => {
     const { Init } = await import("../cmds/init.js");
     new Init({ cwd: process.cwd() }).create();
@@ -39,7 +96,7 @@ program.command({
 
 program.command({
   command: "uninstall",
-  desc: "卸载应用",
+  desc: false,
   handler: async () => {
     const { uninstall } = await importDefault("../cmds/app.js");
     await uninstall();
@@ -48,7 +105,7 @@ program.command({
 
 program.command({
   command: "publish",
-  desc: "发布应用",
+  desc: false,
   handler: async () => {
     // 第一步 打包镜像
     const Publisher = await importDefault("../cmds/publish.js");
@@ -64,7 +121,7 @@ program.command({
 
 program.command({
   command: "deploy",
-  desc: "部署应用至设备",
+  desc: false,
   handler: async () => {
     const { deploy } = await importDefault("../cmds/app.js");
     await deploy();
@@ -73,7 +130,7 @@ program.command({
 
 program.command({
   command: "build [context]",
-  desc: "构建",
+  desc: false,
   builder: (args) => {
     args.option("f", {
       alias: "file",
@@ -116,7 +173,7 @@ let devSubCommands = [
 ];
 program.command({
   command: "dev",
-  desc: "dev [forward [addr] | shell]",
+  desc: false,
   builder: (args) => {
     args.command(devSubCommands);
   },
@@ -124,7 +181,7 @@ program.command({
 
 program.command({
   command: "log [project]",
-  desc: "查看应用日志",
+  desc: false,
   builder: (args) => {
     args.option("u", {
       alias: "user",
@@ -141,7 +198,7 @@ program.command({
 
 program.command({
   command: "config [key] [value]",
-  desc: "应用配置项",
+  desc: false,
   builder: (args) => {
     args.implies("key", "value");
     args.option("g", {
@@ -158,5 +215,27 @@ program.command({
 });
 
 boxCommand(program);
+lpkAppCommand(program);
+lpkProjectCommand(program);
+
+const parser = program
+  .strict()
+  .showHelpOnFail(false, "使用 lzc-cli help 查看更多帮助")
+  .middleware([setLoggerLevel])
+  .parse();
 
-program.showHelpOnFail(false, "使用 lzc-cli help 查看更多帮助").parse();
+// 当没有参数的时候，默认显示帮助。
+(async () => {
+  const argv = await parser;
+  if (argv._.length == 1) {
+    switch (argv._[0]) {
+      case "box":
+      case "app":
+      case "project":
+        program.showHelp();
+        return;
+    }
+  } else if (argv._.length == 0) {
+    program.showHelp();
+  }
+})();

package/template/_lazycat/debug/shell/Dockerfile

@@ -1,8 +1,10 @@
-FROM node:16-alpine3.12
+FROM registry.lazycat.cloud/lzc/lzcapp:0.1
 
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
 
-RUN apk add --no-cache openssh rsync \
+COPY --from=golang:1.18-alpine /usr/local/go/ /usr/local/go/
+
+RUN apk add --no-cache openssh rsync musl-dev curl openssl curl nodejs npm \
   && echo "root:root" | chpasswd
 
 EXPOSE 22
@@ -13,4 +15,4 @@ COPY entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ./entrypoint.sh

package/template/_lazycat/debug/shell/docker-compose.override.yml.in

@@ -1,20 +1,10 @@
 services:
   ${APP_ID}:
-    image: nginx:1.21.4-alpine
-    volumes:
-      - ./nginx.conf.template:/etc/nginx/templates/nginx.conf.template
-      - ./50x.html:/etc/nginx/50x.html
-    environment:
-      - NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
-      - APP_DEBUG_PORT=${HTTP_SERVICE_PORT}
-      - APP_DEBUG_SHELL=debug-shell.${APP_ID}.lzcapp
-    command: [nginx, '-g', 'daemon off;']
-    depends_on:
-      - debug-shell
-  debug-shell:
     image: ${APP_IMAGE_NAME}
     pull_policy: build
     build: .
+    environment:
+      - HTTP_SERVICE_PORT=${HTTP_SERVICE_PORT}
     volumes:
       - ./debug/ssh:/root/.ssh
       - project-data:/root/

package/template/_lazycat/debug/shell/entrypoint.sh

@@ -7,4 +7,6 @@ ssh-keygen -A
 rsync --daemon
 
 # do not detach (-D), log to stderr (-e), passthrough other arguments
-exec /usr/sbin/sshd -D -e "$@"
+/usr/sbin/sshd -e "$@"
+
+exec /usr/bin/lzcinit -listen :$HTTP_SERVICE_PORT -up /="http://127.0.0.1:3000"

package/template/_lpk/Dockerfile.in

@@ -0,0 +1,8 @@
+FROM alpine:3.16
+
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+
+RUN apk add --no-cache bash ${dependencies} \
+  && echo "root:root" | chpasswd
+
+CMD ["sleep", "infinity"]

package/template/_lpk/devshell/Dockerfile

@@ -0,0 +1,18 @@
+FROM alpine
+
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+
+COPY --from=golang:1.18-alpine /usr/local/go/ /usr/local/go/
+
+RUN apk add --no-cache openssh musl-dev curl openssl curl nodejs npm sshfs rsync \
+  && echo "root:root" | chpasswd
+
+EXPOSE 22
+
+COPY sshd_config /etc/ssh/sshd_config
+
+COPY entrypoint.sh /entrypoint.sh
+
+RUN chmod +x /entrypoint.sh
+
+CMD ["./entrypoint.sh"]

package/template/_lpk/devshell/build.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/sh
+
+VERSION=0.0.4
+docker build -f Dockerfile . -t registry.lazycat.cloud/lzc-cli/devshell:$VERSION
+docker push registry.lazycat.cloud/lzc-cli/devshell:$VERSION

package/template/_lpk/devshell/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -ex
+
+# generate host keys if not present
+ssh-keygen -A
+
+# do not detach (-D), log to stderr (-e), passthrough other arguments
+exec /usr/sbin/sshd -D -e "$@"