@lazycatcloud/lzc-cli 1.1.5 → 1.1.6

package/lib/archiver.js

@@ -94,54 +94,12 @@ class Archiver {
   }
 
   async finalize(zip = true) {
-    // await this._changeContent();
     if (zip) {
       return await archiveFolder(this.tmpDir);
     } else {
       return this.tmpDir;
     }
   }
-  //
-  //     permissions:
-  //     - lzcapis
-  // need REMOVE deprecated
-  async _changeContent() {
-    let base = new DockerCompose(path.join(this.tmpDir, "docker-compose.yml"));
-    base
-      .pipe((template) => {
-        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: env.get("APP_ID"),
-            path: "/lzcapis/",
-            auth: "oidc",
-            authcallback: "/lzcapis/oidc-callback",
-          });
-          template["services"]["lazycat-apis-sidecar"] = {
-            image: "registry.lazycat.cloud/lazycat-apis-sidecar",
-            pull_policy: "always",
-            // 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",
-            ],
-          };
-          template["volumes"]["lzcapis-lzcapp"] = null;
-        }
-      })
-      .save();
-  }
 }
 
 export default Archiver;

package/lib/autologin.js

@@ -0,0 +1,84 @@
+import fetch from "node-fetch";
+
+// autologin.js 提供一个封装好的 fetch request 请求方法，通过这个中间件，可以不用考虑
+// auth:auto 所做的授权验证。
+let AutoLoginToken = "";
+let AutoLoginFailed = false;
+
+function fetchTokenAction(url) {
+  return fetch(url).then(async (res) => {
+    const body = await res.text();
+    const token = body.match(/name=\"token\" value=\"(.*?)\"/i)[1];
+    const action = body.match(/action=\"(.*?)\"/i)[1];
+
+    return { token, action };
+  });
+}
+
+function fetchTokenActionAndRedirect(dataToken, dataAction) {
+  return fetch(dataAction, {
+    method: "POST",
+    body: `token=${dataToken}`,
+    redirect: "follow",
+    headers: {
+      accept:
+        "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
+      "accept-language": "en-US,en;q=0.9,zh-CN;q=0.8,zh;q=0.7",
+      "content-type": "application/x-www-form-urlencoded",
+    },
+  }).then(async (res) => {
+    let body = await res.text();
+    const token = body.match(/name=\"token\" value=\"(.*?)\"/i)[1];
+    const action = body.match(/action=\"(.*?)\"/i)[1];
+    const redirect = body.match(/name=\"redirect\" value=\"(.*?)\"/i)[1];
+
+    return { token, action, redirect };
+  });
+}
+
+export async function request(url, options = {}) {
+  if (AutoLoginFailed) {
+    return fetch(url, options);
+  }
+
+  await tryAuthLogin(url);
+
+  if (!AutoLoginToken) {
+    return fetch(url, options);
+  }
+
+  let headers = { cookie: `HC-Auth-Token=${AutoLoginToken}` };
+  if (options.headers) {
+    headers = Object.assign({}, options.headers, headers);
+  }
+
+  options = Object.assign({}, options, { headers });
+  return fetch(url, options);
+}
+
+export async function tryAuthLogin(url) {
+  if (!url.startsWith("http")) {
+    url = "https://" + url;
+  }
+
+  try {
+    if (!AutoLoginToken) {
+      let _url = new URL(url);
+      let u = _url.host.split(".").reverse().slice(0, 3).reverse().join(".");
+
+      console.log(`${u} 尝试自动登录...`);
+
+      let data = await fetchTokenAction(`${_url.protocol}//${u}`);
+      let data2 = await fetchTokenActionAndRedirect(data.token, data.action);
+
+      AutoLoginToken = data2.token;
+      console.log(`自动登录成功！`);
+      return AutoLoginToken;
+    }
+  } catch (e) {
+    console.error(e);
+    console.log(`尝试自动登录失败，正在使用默认的登录方式...`);
+    AutoLoginFailed = true;
+    return "";
+  }
+}

package/lib/box/check_qemu.js

@@ -1,27 +1,50 @@
 // 检测当前系统是否安装 qemu 软件
 import commandExist from "command-exists";
 import chalk from "chalk";
+import os from "node:os";
+
+function linuxPlatform(pkg) {
+  let r = os.release();
+  if (r.search(/arch/gi) > -1) {
+    return `sudo pacman -S ${pkg}`;
+  } else if (r.search(/debian/gi) > -1) {
+    return `sudo apt install ${pkg}`;
+  } else {
+    return ``;
+  }
+}
+
+function platformPackage(pkg) {
+  let cmd = "";
+  switch (os.platform()) {
+    case "darwin":
+      cmd = `brew install ${pkg}`;
+      break;
+    case "linux":
+      cmd = linuxPlatform(pkg);
+      break;
+  }
+  return `${pkg}包没有发现，请先通过系统包管理器安装。\n${cmd}`;
+}
 
 export class CheckQemu {
   constructor() {
-    this.commands = ["qemu-img", "qemu-system-x86_64", "pgrep"];
+    this.commands = ["qemu-img", "qemu-system-x86_64"];
   }
 
   async init() {
-    let ps = [];
-    this.commands.forEach((cmd) => {
-      let p = new Promise((resolve, reject) => {
-        commandExist(cmd)
-          .then(resolve)
-          .catch(() => {
-            console.error(
-              chalk.red(`${cmd} 命令没有发现，请通过系统包管理器安装对应的包`)
-            );
-            reject();
-          });
-      });
-      ps.push(p);
-    });
-    return Promise.all(ps);
+    for (let cmd of this.commands) {
+      if (!commandExist.sync(cmd)) {
+        let cmdErr = chalk.red(`${cmd} 命令没有发现`);
+        let pkgTips = chalk.blue(platformPackage("qemu"));
+        let tips = `${cmdErr}
+
+${pkgTips}
+
+查看更多信息 https://www.qemu.org/download/
+`;
+        throw tips;
+      }
+    }
   }
 }

package/lib/box/hportal.js

@@ -1,4 +1,5 @@
 import fetch from "node-fetch";
+import logger from "loglevel";
 
 export class HportalManager {
   constructor(apiHost) {
@@ -58,11 +59,16 @@ export class HportalManager {
   async boxs(boxName, defaultBoxName = "") {
     let url = this.apiHost + "/admin/boxes";
 
-    let origin;
+    let origin = [];
     try {
       const resp = await fetch(url);
       if (resp.status == 200) {
         origin = await resp.json();
+      } else {
+        logger.debug(
+          `status: ${resp.status}, url: ${resp.url}, text: ${resp.statusText}`
+        );
+        return [];
       }
     } catch {
       return [];

package/lib/box/index.js

@@ -7,6 +7,7 @@ import { contextDirname } from "../utils.js";
 import env, { sdkEnv } from "../env.js";
 import { HportalManager, showBoxInfo } from "./hportal.js";
 import { CheckQemu } from "./check_qemu.js";
+import logger from "loglevel";
 
 async function initQemuVM(ensureResources = false) {
   let defaultSchemeFile = path.join(
@@ -60,7 +61,7 @@ export function boxCommand(box) {
           // 创建盒子阶段，如果出错，将直接删除所有的资源。
           boxId = await m.createVM(answer);
         } catch (error) {
-          console.error(error);
+          logger.error(error);
           await m.cleanVM(answer.boxName);
           return;
         }
@@ -74,11 +75,11 @@ export function boxCommand(box) {
         }
 
         let h = await initHportal();
-        console.log("添加盒子到 Hportal ......");
+        logger.debug("添加盒子到 Hportal ......");
         await h.addBox(answer.boxName);
-        console.log("正在使用管理员帐号密码登录中......");
+        logger.debug("正在使用管理员帐号密码登录中......");
         await h.loginBox(boxId, answer.adminName, answer.adminPass);
-        console.log("登录成功！");
+        logger.debug("登录成功！");
       },
     },
     {
@@ -88,7 +89,7 @@ export function boxCommand(box) {
         let m = await initQemuVM();
         let boxid = await m.runVM(boxName);
         if (boxid) {
-          console.log("盒子ID: ", boxid);
+          logger.info("盒子ID: ", boxid);
         }
       },
     },
@@ -127,7 +128,7 @@ export function boxCommand(box) {
 
         // 过滤条件不满足
         if (vmInfos.length == 0 && rmInfos == 0 && boxName) {
-          console.log(`${boxName} 盒子不存在`);
+          logger.info(`${boxName} 盒子不存在`);
           let allVmInfos = await m.infoVM("", defaultBoxName);
           let allRmInfos = await rm.boxs("", defaultBoxName);
           showBoxInfo(allVmInfos, allRmInfos);

package/lib/box/qemu_vm_mgr.js

@@ -10,6 +10,7 @@ import net from "node:net";
 import fetch from "node-fetch";
 import zlib from "node:zlib";
 import os from "node:os";
+import logger from "loglevel";
 
 async function getFreePort() {
   return new Promise((resolve, reject) => {
@@ -215,7 +216,7 @@ export class QemuVM {
     p.on("error", (e) => {
       throw e;
     });
-    console.log("启动中...");
+    logger.debug("启动中...");
 
     // 需要等待 boxid 的出现
     return new Promise((resolve, reject) => {
@@ -239,7 +240,7 @@ export class QemuVM {
           clearInterval(id);
           p.unref();
           resolve(boxId);
-          console.log("启动成功!");
+          logger.debug("启动成功!");
         }
       }, 1000);
 
@@ -260,17 +261,17 @@ export class QemuVM {
   async runVM(name) {
     let boxid = this.readBoxid(name);
     if (!boxid) {
-      console.log(`${name} 盒子不存在，请通过 lzc-cli box create 创建`);
+      logger.info(`${name} 盒子不存在，请通过 lzc-cli box create 创建`);
       return;
     }
     let vmDir = path.join(this.scheme.path, `vm-${name}`);
     let pid = parseVmPID(vmDir);
     if (pid) {
-      console.log(`${name} 盒子已经启动`);
+      logger.info(`${name} 盒子已经启动`);
       return boxid;
     }
     await this.startVM(name, vmDir);
-    console.log(`${name} 盒子启动成功！`);
+    logger.info(`${name} 盒子启动成功！`);
   }
 
   /**
@@ -281,7 +282,7 @@ export class QemuVM {
     this.ensureVolumeDir(vmDir);
     await this.buildDisks(vmDir);
     let boxId = await this.startVM(boxName, vmDir);
-    console.log("盒子ID: ", boxId);
+    logger.info("盒子ID: ", boxId);
 
     await this.registerVM(boxId, {
       boxName,
@@ -372,7 +373,7 @@ export class QemuVM {
   }
 
   async buildSystemDisk(name, diskPath, diskInfo) {
-    console.log(`构建系统盘快照：${diskPath}`);
+    logger.debug(`构建系统盘快照：${diskPath}`);
     let baseImage = path.join(this.scheme.path, name);
     return spawnSync(
       "qemu-img",
@@ -382,7 +383,7 @@ export class QemuVM {
   }
 
   async buildDataDisk(name, diskPath, diskInfo) {
-    console.log(`构建数据盘：${diskPath}`);
+    logger.debug(`构建数据盘：${diskPath}`);
     return spawnSync(
       "qemu-img",
       ["create", "-f", "qcow2", diskPath, diskInfo.size],
@@ -459,7 +460,7 @@ export class QemuVM {
     if (pid) {
       process.kill(pid);
     }
-    console.log(`${name} 盒子已停止`);
+    logger.info(`${name} 盒子已停止`);
   }
 
   /**
@@ -487,7 +488,7 @@ export class QemuVM {
       fs.accessSync(vmDir);
     } catch {
       if (!silence) {
-        console.log(`${name} 盒子不存在或者该盒子为一个真实盒子`);
+        logger.warn(`${name} 盒子不存在或者该盒子为一个真实盒子`);
       }
       return;
     }
@@ -508,7 +509,7 @@ export class QemuVM {
             return;
           }
           process.kill(pid);
-          console.log(`${name} 盒子已停止`);
+          logger.info(`${name} 盒子已停止`);
         });
     }
 

package/lib/dev.js

@@ -13,7 +13,6 @@ import path from "path";
 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";
 
@@ -262,9 +261,6 @@ class DevModule {
     let appAddr;
 
     try {
-      // 确保 sdk 能通过公钥正常访问
-      await new Key().ensure(sdkEnv.sdkUrl);
-
       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 {

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/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();