@lazycatcloud/lzc-cli 1.1.0 → 1.1.3

package/lib/builder.js

@@ -9,15 +9,17 @@ 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 Dockerode from "dockerode";
 
 export const PRE_BUILD_FILE = "build.sh";
 
-export async function execPreBuild(targetDir, env = {}) {
+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: targetDir,
+    cwd: context,
     env: env,
     stdio: ["ignore", "inherit", "inherit"],
   });
@@ -97,48 +99,135 @@ export default class Builder {
     return src;
   }
 
-  // v2 版本会收集所有需要的context 文件,将其传入buildImage 方法中
-  async dockerRemoteBuildV2(contextDir, dockerfile) {
-    const env = this.env;
+  async dockerLocalBuild(contextDir, dockerfile, tag = env.get("APP_ID")) {
     const src = await this.collectContextFromDockerFile(contextDir, dockerfile);
-    const host = new URL(env["SDK_URL"]).host;
-    const docker = await new DockerClient(host).init();
+
+    const docker = await new DockerClient().init();
     try {
       console.log(chalk.green("开始在设备中构建镜像"));
-      let stream = await docker.buildImage(
+
+      const stream = await docker.buildImage(
         {
           context: contextDir,
           src: src,
         },
         {
-          buildargs: env,
+          buildargs: env.all,
           dockerfile: src[0],
-          t: env["APP_ID"],
+          t: tag,
         }
       );
-      await new Promise((resolve, reject) => {
-        let pulls = [];
-        let logUpdate;
+      const finished = await new Promise((resolve, reject) => {
+        let refresher = new StatusRefresher();
 
-        function refresh() {
-          logUpdate(pulls.map((p) => `${p.id}: ${p.content}`).join("\n"));
-        }
+        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");
+              }
+            }
 
-        function updatePull({ id, content }) {
-          let index = pulls.findIndex((p) => p.id == id);
-          if (index > -1) {
-            pulls[index] = {
-              id: id,
-              content: content,
-            };
-          } else {
-            pulls.push({
-              id: id,
-              content: content,
-            });
+            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(env.get("SDK_URL")).host;
+    console.log(host);
+    const docker = await new DockerClient(host).init();
+    try {
+      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) => {
@@ -148,15 +237,16 @@ export default class Builder {
             if (res.status) {
               if (res.id) {
                 if (["Downloading", "Extracting"].includes(res.status)) {
-                  updatePull({
+                  refresher.updateStatus({
                     id: res.id,
                     content: `${res.status} ${res.progress}`,
                   });
                 } else {
-                  updatePull({ id: res.id, content: res.status });
+                  refresher.updateStatus({
+                    id: res.id,
+                    content: res.status,
+                  });
                 }
-
-                refresh();
               } else {
                 process.stdout.write(res.status);
                 process.stdout.write("\n");
@@ -165,8 +255,7 @@ export default class Builder {
 
             if (res.stream) {
               if (res.stream.startsWith("Step")) {
-                pulls = [];
-                logUpdate = createLogUpdate(process.stdout);
+                refresher.reset();
               }
               process.stdout.write(res.stream);
             }
@@ -181,3 +270,33 @@ export default class Builder {
     }
   }
 }
+
+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/dev.js

@@ -9,10 +9,11 @@ import {
   APP_SDK_HOSTNAME,
 } from "./utils.js";
 import path from "path";
-import os from "os";
-import Env from "./env.js";
+import env from "./env.js";
 import _get from "lodash.get";
 import { execPreBuild } from "./builder.js";
+import Key from "./key.js";
+import chokidar from "chokidar";
 
 import Archiver from "../lib/archiver.js";
 
@@ -30,7 +31,7 @@ class DevModule {
     this.appId = appId;
     this.tempDir = path.join(cwd, "output/debug");
     this.cwd = cwd;
-    this.env = Env(cwd);
+    // this.env = Env(cwd);
   }
 
   reset() {
@@ -44,12 +45,12 @@ class DevModule {
     const buildDir = path.join(this.cwd, `debug/${command}`);
     try {
       const allEnv = {
-        ...this.env.all,
-        APP_IMAGE_NAME: this.env.get("APP_ID"),
+        ...env.all,
+        APP_IMAGE_NAME: env.get("APP_ID"),
       };
-      await execPreBuild(buildDir, allEnv);
+      await execPreBuild(buildDir, buildDir, allEnv);
       let arch = new Archiver(this.tempDir);
-      await arch.load(this.cwd);
+      await arch.load(this.cwd, allEnv);
       await arch.add(buildDir);
       return await arch.finalize();
     } catch (e) {
@@ -67,17 +68,17 @@ class DevModule {
 
     try {
       if (!localaddr) {
-        let port = this.env.get("DEV_PORT");
+        let port = env.get("DEV_PORT");
         localaddr = `0.0.0.0:${port}`;
       }
 
-      localServer = execa.command(this.env.get("DEV_CMD"), {
+      localServer = execa.command(env.get("DEV_CMD"), {
         stdio: "inherit",
       });
 
       const appAddr = this.getAddress();
 
-      let jump = await sdkSSHAddr(this.env);
+      let jump = await sdkSSHAddr(env);
       const subproces = execa(
         "ssh",
         [
@@ -117,7 +118,7 @@ class DevModule {
   }
 
   async syncProject(keyFile, appAddr) {
-    let jump = await sdkSSHAddr(this.env);
+    let jump = await sdkSSHAddr(env);
     let rsh = [
       "ssh",
       "-J",
@@ -144,13 +145,17 @@ class DevModule {
   // fallback fs.watch on not darwin and windows platform
   // FILEPATH directory or file path
   // CALLBACK => function(eventType, filename)
-  //  fs.watch 虽然不支持递归，当可以直接监听整个文件夹的变动
+  //  fs.watch 虽然不支持递归，但可以直接监听整个文件夹的变动
   async fallbackWatch(filepath, gitignore, callback) {
     if (gitignore.contain(filepath)) {
       return Promise.resolve();
     }
 
-    fs.watch(filepath, callback);
+    if (filepath.endsWith(".git") || filepath.endsWith(".lazycat")) {
+      return Promise.resolve();
+    }
+
+    fs.watch(filepath, callback(filepath));
 
     // 如果为一个文件夹，则扫描当中是否含有子文件夹
     if (isDirSync(filepath)) {
@@ -179,22 +184,20 @@ class DevModule {
   // 监听非.gitignore文件
   // TODO： 目前仅仅监听process.cwd()以下的文件
   async watchFile(keyFile, appAddr) {
-    let callback = (eventType, filename) => {
-      this.syncProject(keyFile, appAddr);
-    };
-
-    try {
-      if (["darwin", "win32"].includes(os.platform())) {
-        // onle macos and window platform support recursive options
-        fs.watch(process.cwd(), { recursive: true }, callback);
-      } else {
-        // fallback to other platform
-        let gitignore = new GitIgnore();
-        this.fallbackWatch(process.cwd(), gitignore, callback);
-      }
-    } catch (e) {
-      return Promise.reject(e);
-    }
+    const ignore = new GitIgnore(process.cwd());
+    await ignore.collect();
+    chokidar
+      .watch(".", {
+        ignored: (path) => {
+          if ([".git", ".lazycat"].some((p) => path.startsWith(p))) return true;
+
+          return ignore.contain(path);
+        },
+        ignoreInitial: true,
+      })
+      .on("all", (event, path) => {
+        this.syncProject(keyFile, appAddr);
+      });
   }
 
   // 保存一个dev shell状态的文件,如果重复执行dev shell
@@ -249,6 +252,9 @@ 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();
 
@@ -271,7 +277,7 @@ class DevModule {
   }
 
   async connectShell(keyFile, appAddr) {
-    let jump = await sdkSSHAddr(this.env);
+    let jump = await sdkSSHAddr(env);
     const subproces = execa(
       "ssh",
       [
@@ -290,8 +296,10 @@ class DevModule {
         "root@" + appAddr,
         "-i",
         keyFile,
+        "-t",
+        `"cd ~/${env.get("APP_ID")}; exec \\$SHELL -l"`,
       ],
-      { stdio: "inherit" }
+      { stdio: "inherit", shell: true }
     );
     await subproces;
   }