@lazycatcloud/lzc-cli 1.1.3 → 1.1.6

package/lib/builder.js

@@ -4,12 +4,12 @@ import path from "path";
 import chalk from "chalk";
 import execa from "execa";
 // import { archiveFolder } from "./utils.js";
-import { DockerClient } from "./sdk.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 from "./env.js";
+import env, { sdkEnv } from "./env.js";
 import Dockerode from "dockerode";
 
 export const PRE_BUILD_FILE = "build.sh";
@@ -209,10 +209,21 @@ 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 {
+      // 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();
 

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,16 +10,16 @@ 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";
 import chokidar from "chokidar";
+import commandExists from "command-exists";
 
 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,13 @@ class DevModule {
       "-i",
       keyFile,
     ].join(" ");
+    // 检查rsync工具是否存在:提示用户
+    const rsyncExisted = commandExists.sync('rsync')
+    if (!rsyncExisted) {
+      console.log(chalk.red("请检查 rsync 是否安装，路径是否正确!"));
+      process.exit();
+    }
+    // FIXME: 下方执行命令不确定是否有兼容性问题
     execSync(
       `rsync --rsh='${rsh}' -czrPR . root@${appAddr}:/root/${this.appId} --filter=':- .gitignore' --exclude='node_modules' --exclude='.git' --delete`,
       { stdio: ["ignore", "ignore", "inherit"] }
@@ -196,6 +204,7 @@ class DevModule {
         ignoreInitial: true,
       })
       .on("all", (event, path) => {
+        // console.log(event, path);
         this.syncProject(keyFile, appAddr);
       });
   }
@@ -252,9 +261,6 @@ class DevModule {
     let appAddr;
 
     try {
-      // 确保 sdk 能通过公钥正常访问
-      await new Key().ensure(env.get("SDK_URL"));
-
       keyFile = path.join(this.tempDir, "debug/ssh/id_ed25519");
       appAddr = this.getAddress();
 

package/lib/env.js

@@ -12,7 +12,7 @@ import {
 import { debuglog } from "util";
 import inquirer from "inquirer";
 import chalk from "chalk";
-import fetch from "node-fetch";
+import { request } from "./autologin.js";
 const debug = debuglog("lib/env");
 
 const GLOBAL_CONFIG_NAME = "box-config.json";
@@ -83,7 +83,7 @@ async function checkURL(url, suffix = "") {
   }, 5000);
 
   try {
-    const resp = await fetch(url + suffix, { signal: controller.signal });
+    const resp = await request(url + suffix, { signal: controller.signal });
     if (resp.status != 200) {
       // 设备可以访问 (client 有正常连接), 但是sdk 这个服务无法访问
       throw new Error(
@@ -99,9 +99,6 @@ async function checkURL(url, suffix = "") {
       case "FetchError":
         console.log(chalk.red("盒子入口地址有误，请核对后再试"));
         process.exit();
-      case "AbortError":
-        console.log(chalk.red(`请求 ${url} 超时, 请确保懒猫云客户端已连接`));
-        process.exit();
       default:
         throw error;
     }
@@ -246,6 +243,13 @@ class SDKEnv {
     return "";
   }
 
+  get sdkHostName() {
+    if (env.has("DEFAULT_BOXNAME")) {
+      return `sdk.${env.get("DEFAULT_BOXNAME")}.heiyu.space`;
+    }
+    return "";
+  }
+
   async ensure() {
     if (this.sdkUrl) {
       try {
@@ -270,7 +274,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/generator.js

@@ -12,7 +12,7 @@ export const TemplateConfig = {
   ionic_vue3: {
     template: "ionic_vue3",
     defaultEnvs: {
-      HTTP_SERVICE_PORT: "8080",
+      HTTP_SERVICE_PORT: "80",
       BUILD_CONTEXT: ".lazycat/release",
     },
     after: async function (name) {
@@ -43,7 +43,7 @@ export const TemplateConfig = {
   vue: {
     template: "vue",
     defaultEnvs: {
-      HTTP_SERVICE_PORT: "8080",
+      HTTP_SERVICE_PORT: "80",
       BUILD_CONTEXT: ".lazycat/release",
     },
     after: async function (name) {

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/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))
@@ -124,3 +123,28 @@ export class SSHClient {
     );
   }
 }
+
+export async function dockerPullLzcAppsImage(host) {
+  logger.warn("* 更新lzcapp镜像, 未来可能会移除此操作");
+  const opts = await connectOptions(host);
+  const client = new SSHClient(opts);
+  await client.connect();
+  try {
+    const stream = await client.exec(
+      "docker pull registry.lazycat.cloud/lzc/lzcapp:0.1"
+    );
+
+    return 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) {
+    client.close();
+    throw e;
+  }
+}

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";
@@ -33,7 +34,7 @@ export const envsubstr = async (templateContents, args) => {
 async function InstallSDK(box_url) {
   try {
     let url = `${box_url}/api/app/apply?id=sdk`;
-    const resp = await fetch(url, { method: "post" });
+    const resp = await request(url, { method: "post" });
     if (resp.status != 200) {
       throw new Error(
         chalk.red(
@@ -54,7 +55,7 @@ async function InstallSDK(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);
+    const resp = await request(url);
     if (resp.status == 200) {
       const status = await resp.json();
       return status;
@@ -102,7 +103,7 @@ async function checkSDKInstallStatus(box_url) {
 async function getInstalledApps(box_url) {
   try {
     let url = `${box_url}/api/app/dump`;
-    const resp = await fetch(url);
+    const resp = await request(url);
     if (resp.status != 200) throw new Error(chalk.red("获取所有已安装App失败"));
     return await resp.json();
   } catch (e) {
@@ -191,9 +192,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 +205,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 +220,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 +251,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 +278,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 +307,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 +390,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 +421,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 +441,7 @@ export {
   findAppRootPath,
   archiveFolder,
   mergeYaml,
+  mergeYamlInMemory,
   loadFromYaml,
   dumpToYaml,
   importDefault,
@@ -434,6 +452,7 @@ export {
   toPair,
   contextDirname,
   isDirSync,
+  isDirExist,
   GitIgnore,
   isFileExist,
   urlHostname,
@@ -441,6 +460,10 @@ export {
   findAppIsInstalled,
   getInstalledApps,
   checkSDKInstallStatus,
+  envTemplateFile,
   createTemplateFile,
   parse2CorrectName,
+  sleep,
+  md5String,
+  createTemplateFileCommon
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "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",
@@ -48,18 +48,25 @@
     "lodash.merge": "^4.6.2",
     "lodash.mergewith": "^4.6.2",
     "log-update": "^5.0.0",
-    "lz4": "^0.6.5",
+    "loglevel": "^1.8.0",
     "minimist": "^1.2.5",
     "node-fetch": "^2.6.6",
     "node-stream-zip": "^1.15.0",
     "ora": "^6.0.1",
     "semver": "^7.3.5",
     "ssh2": "^1.5.0",
-    "ssh2-promise": "^1.0.2"
+    "ssh2-promise": "^1.0.2",
+    "tar": "^6.1.11",
+    "yargs": "^17.5.1"
   },
   "devDependencies": {
+    "@types/command-exists": "^1.2.0",
     "chai": "^4.3.6",
     "mocha": "^9.2.2",
     "prettier": "^2.5.0"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org",
+    "access": "public"
   }
 }