@lazycatcloud/lzc-cli 1.1.4 → 1.1.5

package/cmds/dev.js

@@ -4,6 +4,7 @@ import chalk from "chalk";
 import Dev from "../lib/dev.js";
 import env, { sdkEnv } from "../lib/env.js";
 import BoxAPI from "../lib/api.js";
+import { dockerPullLzcAppsImage } from "../lib/sdk.js";
 
 // this set of api target box
 class Develop {
@@ -26,6 +27,7 @@ class Develop {
 
     if (build) {
       appdev.reset();
+      await dockerPullLzcAppsImage(sdkEnv.sdkUrl);
     }
 
     // 当如果已经连接。直接连接ssh

package/lib/box/index.js

@@ -25,6 +25,8 @@ async function initQemuVM(ensureResources = false) {
     scheme.path = path.join(contextDirname(), "box-emulator", scheme.path);
   }
 
+  fs.mkdirSync(scheme.path, { recursive: true });
+
   if (ensureResources) {
     // 使用本地网络 api 调试 new QemuResource(scheme.path, "http://127.0.0.1");
     let resource = new QemuResource(scheme.path);

package/lib/box/qemu_vm_mgr.js

@@ -5,10 +5,11 @@ import path from "node:path";
 import inquirer from "inquirer";
 import https from "node:https";
 import http from "node:http";
-import lz4 from "lz4";
 import process from "node:process";
 import net from "node:net";
 import fetch from "node-fetch";
+import zlib from "node:zlib";
+import os from "node:os";
 
 async function getFreePort() {
   return new Promise((resolve, reject) => {
@@ -39,7 +40,7 @@ export class QemuResource {
    */
   constructor(
     diskDir = "~/.cache/box-emulator",
-    downloadUrl = "https://dl.lazycat.cloud/sdk/vm"
+    downloadUrl = "https://dl.lazycat.cloud/sdk"
   ) {
     this.diskDir = diskDir;
     this.downloadUrl = downloadUrl;
@@ -71,7 +72,7 @@ export class QemuResource {
    * 目前的更新，只是使用 md5 来判断是否需要重新下载 md5, 并不会使用 md5 来判断所下载的数据是否正确。
    */
   async shouldUpdate() {
-    let oldMd5Path = path.join(this.diskDir, "disk-system.qcow2.lz4.md5");
+    let oldMd5Path = path.join(this.diskDir, "disk-system.qcow2.md5");
 
     // 如果不存在 md5 文件，直接返回需要更新
     try {
@@ -83,7 +84,7 @@ export class QemuResource {
     // 拉取最新的 md5
     let newMd5;
     try {
-      let url = `${this.downloadUrl}/disk-system.qcow2.lz4.md5`;
+      let url = `${this.downloadUrl}/vm/disk-system.qcow2.md5`;
       let res = await fetch(url);
       if (res.status !== 200) {
         return false;
@@ -109,26 +110,34 @@ export class QemuResource {
       } catch {}
     }
 
+    await this.downloadOVMF();
     await this.downloadSystemDisk();
     await this.downloadPrivateKey();
     await this.downloadSystemDiskMd5();
   }
 
+  async downloadOVMF() {
+    let name = `${os.arch()}.OVMF.fd`;
+    let savePath = path.join(this.diskDir, name);
+    let url = `${this.downloadUrl}/${name}`;
+    await this.download(url, savePath);
+  }
+
   async downloadSystemDiskMd5() {
-    let savePath = path.join(this.diskDir, "disk-system.qcow2.lz4.md5");
-    let url = `${this.downloadUrl}/disk-system.qcow2.lz4.md5`;
+    let savePath = path.join(this.diskDir, "disk-system.qcow2.md5");
+    let url = `${this.downloadUrl}/vm/disk-system.qcow2.md5`;
     await this.download(url, savePath);
   }
 
   async downloadSystemDisk() {
     let savePath = path.join(this.diskDir, "disk-system.qcow2");
-    let url = `${this.downloadUrl}/disk-system.qcow2.lz4`;
+    let url = `${this.downloadUrl}/vm/disk-system.qcow2.gz`;
     await this.download(url, savePath, true);
   }
 
   async downloadPrivateKey() {
     let savePath = path.join(this.diskDir, "id_rsa");
-    let url = `${this.downloadUrl}/id_rsa`;
+    let url = `${this.downloadUrl}/vm/id_rsa`;
     await this.download(url, savePath);
     fs.chmodSync(savePath, 0o400);
     return;
@@ -147,7 +156,7 @@ export class QemuResource {
     );
   }
 
-  download(url, savePath, enableLz4 = false) {
+  download(url, savePath, enableGzip = false) {
     let tmpPath = savePath + ".tmp";
     const options = new URL(url);
     let request = url.startsWith("https") ? https.request : http.request;
@@ -167,8 +176,8 @@ export class QemuResource {
         });
 
         let outputFile = fs.createWriteStream(tmpPath, { flags: "w+" });
-        if (enableLz4) {
-          let decoder = lz4.createDecoderStream();
+        if (enableGzip) {
+          let decoder = zlib.createUnzip();
           res.pipe(decoder).pipe(outputFile);
         } else {
           res.pipe(outputFile);
@@ -385,7 +394,11 @@ export class QemuVM {
    * 寻找默认可用的 bios 文件
    */
   findBIOS() {
-    let includes = ["/usr/share/ovmf/x64/OVMF.fd", "/usr/share/ovmf/OVMF.fd"];
+    let includes = [
+      "/usr/share/ovmf/x64/OVMF.fd",
+      "/usr/share/ovmf/OVMF.fd",
+      path.join(this.scheme.path, `${os.arch()}.OVMF.fd`),
+    ];
     for (let file of includes) {
       try {
         fs.accessSync(file, fs.constants.F_OK);

package/lib/builder.js

@@ -4,7 +4,7 @@ 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";
@@ -213,6 +213,17 @@ export default class Builder {
     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

@@ -15,6 +15,7 @@ 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";
 
@@ -138,14 +139,12 @@ class DevModule {
       keyFile,
     ].join(" ");
     // 检查rsync工具是否存在:提示用户
-    try {
-      execSync("rsync -V", {
-        stdio: "ignore",
-      });
-    } catch {
+    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"] }

package/lib/sdk.js

@@ -124,3 +124,28 @@ export class SSHClient {
     );
   }
 }
+
+export async function dockerPullLzcAppsImage(host) {
+  console.log(chalk.yellow("* 更新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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "test": "mocha",
@@ -48,7 +48,6 @@
     "lodash.merge": "^4.6.2",
     "lodash.mergewith": "^4.6.2",
     "log-update": "^5.0.0",
-    "lz4": "^0.6.5",
     "minimist": "^1.2.5",
     "node-fetch": "^2.6.6",
     "node-stream-zip": "^1.15.0",
@@ -59,6 +58,7 @@
     "yargs": "^17.5.1"
   },
   "devDependencies": {
+    "@types/command-exists": "^1.2.0",
     "chai": "^4.3.6",
     "mocha": "^9.2.2",
     "prettier": "^2.5.0"

package/template/vue/vue.config.js

@@ -1,3 +1,18 @@
+const nodeVersions = process.versions.node.split(".");
+if (
+  nodeVersions[0] >= 17 &&
+  process.env["NODE_OPTIONS"].search(/--openssl-legacy-provider/) == -1
+) {
+  console.warn(`
+当前 nodejs 版本为 ${process.version}
+
+nodejs 17.0.0 后的版本由于使用的 openssl 3.0 的原因。需要使用设置
+    export NODE_OPTIONS=--openssl-legacy-provider
+
+推荐使用 vue3 进行开发。
+`);
+}
+
 module.exports = {
   devServer: {
     historyApiFallback: true,