@lazycatcloud/lzc-cli 1.1.13 → 1.2.1

package/lib/app/lpk_installer.js

@@ -1,54 +1,64 @@
-import BoxAPI from "../api.js";
-import { sdkEnv } from "../env.js";
 import logger from "loglevel";
 import fs from "node:fs";
 import path from "node:path";
-import Key from "../key.js";
 import { loadFromYaml, Downloader } from "../utils.js";
 import { spawnSync } from "node:child_process";
-import { getUidByManifest } from "../lzc_sdk.js";
+import { DebugBridge } from "./lpk_debug_bridge.js";
+import shellapi from "../shellapi.js";
+
+// 从一个目录中找出修改时间最新的包
+function findOnceLpkByDir(dir = process.cwd()) {
+  const pkg = fs
+    .readdirSync(dir)
+    .map((filename) => {
+      const stat = fs.statSync(path.resolve(dir, filename));
+      return { filename, mtime: stat.mtime };
+    })
+    .sort((a, b) => {
+      return b.mtime - a.mtime;
+    })
+    .find((entry) => {
+      return entry.filename.endsWith(".lpk");
+    });
+  return pkg?.filename ? path.resolve(dir, pkg.filename) : "";
+}
 
 export class LpkInstaller {
   constructor() {}
 
-  async init() {
-    // 1. 确保 sdk 已经安装
-    await sdkEnv.ensure();
-
-    // 2. pull 镜像需要ssh key
-    const k = new Key();
-    await k.ensure(sdkEnv.sdkUrl);
-  }
+  async init() {}
 
-  // TODO: 将 devshell 的判断逻辑放在 builder 中判断
-  async deploy(builder, isDevshell = false) {
+  // deploy 构建和安装
+  async deploy(builder) {
     if (!builder) {
       throw "deploy 必须传递一个 builder";
     }
 
     let manifest = await builder.getManifest();
-    let uid = await getUidByManifest(manifest);
-    let api = new BoxAPI(manifest["package"], sdkEnv.sdkUrl, uid);
-
-    let pkgPath = await builder.exec("");
+    let pkgPath = await builder.exec();
     logger.info("开始部署应用");
-    await api.install(pkgPath, isDevshell);
-
-    const appUrl = sdkEnv.sdkUrl.replace(
-      /sdk/,
-      manifest["application"]["subdomain"]
-    );
-    // 新安装的应用默认为休眠的状态，需要先等容器创建成功，等成为 paused 后 resume 下
-    await api.checkStatus(true);
+    const bridge = new DebugBridge();
+    await bridge.install(pkgPath);
+    const appUrl = `https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`;
     logger.info(`👉 请在浏览器中访问 ${appUrl}`);
   }
 
-  async install(pkgUrl) {
-    if (pkgUrl.startsWith("http")) {
-      return this.installFromUrl(pkgUrl);
+  async install(pkgPath) {
+    if (pkgPath.startsWith("http")) {
+      return this.installFromUrl(pkgPath);
+    } else if (fs.statSync(pkgPath).isDirectory()) {
+      return this.installFromDirectory(pkgPath);
     } else {
-      return this.installFromFile(pkgUrl);
+      return this.installFromFile(pkgPath);
+    }
+  }
+
+  async installFromDirectory(dir) {
+    const lpk = findOnceLpkByDir(dir);
+    if (lpk) {
+      logger.info(`正在安装自动扫描出来的lpk包(${lpk})`);
     }
+    return this.installFromFile(lpk);
   }
 
   async installFromUrl(url) {
@@ -77,28 +87,21 @@ export class LpkInstaller {
     }
 
     const tempDir = fs.mkdtempSync(".lzc-cli-install");
-    let pkgName;
     let manifest;
     try {
       spawnSync("unzip", ["-d", tempDir, pkgPath]);
-
       manifest = loadFromYaml(path.join(tempDir, "manifest.yml"));
       logger.debug("lpk manifest", manifest);
-
-      pkgName = manifest.package;
     } finally {
       fs.rmSync(tempDir, { recursive: true });
     }
 
-    let api = new BoxAPI(pkgName, sdkEnv.sdkUrl);
+    const bridge = new DebugBridge();
     logger.info("开始安装应用");
-    await api.install(pkgPath);
+    await bridge.install(pkgPath);
     logger.info(`安装成功！`);
     logger.info(
-      `👉 请在浏览器中访问 ${sdkEnv.sdkUrl.replace(
-        /sdk/,
-        manifest["application"]["subdomain"]
-      )}`
+      `👉 请在浏览器中访问 https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`
     );
   }
 }

package/lib/appstore/login.js

@@ -1,4 +1,4 @@
-import fetch from "../fetch.js";
+import fetch from "node-fetch";
 import path from "path";
 import logger from "loglevel";
 import env from "../env.js";

package/lib/appstore/publish.js

@@ -20,7 +20,7 @@ async function askChangeLog() {
 }
 
 export class Publish {
-  constructor(baseUrl = "https://developer.lazycat.cloud/api/app") {
+  constructor(baseUrl = "https://developer.lazycat.cloud/api/v2/developer") {
     this.baseUrl = baseUrl;
   }
 
@@ -42,22 +42,32 @@ export class Publish {
       changelog = answer.changelog;
     }
 
-    logger.info("正在发布...");
+    logger.info("正在提交审核...");
     const form = new FormData();
-    form.append("files", fs.createReadStream(pkgPath));
-    form.append("changelog", changelog);
+    form.append("file", fs.createReadStream(pkgPath));
 
-    return request(this.baseUrl + "/update", {
+    const res = await request(this.baseUrl + "/upload_lpk", {
       method: "POST",
       body: form,
+    });
+    const lpkInfo = await res.json();
+    logger.debug("upload lpk response", lpkInfo);
+
+    return request(this.baseUrl + `/apps/${lpkInfo.package}/reviews`, {
+      method: "POST",
+      body: JSON.stringify({
+        changelog,
+        iconPath: lpkInfo.iconPath,
+        pkgPath: lpkInfo.url,
+      }),
     }).then(async (res) => {
-      if (res.status != 200) {
+      if (res.status != 201) {
         logger.error(await res.text());
         return;
       }
 
-      logger.info("发布成功!");
-      logger.debug("publish response", await res.json());
+      logger.info("应用提交成功! 请等待审核结果");
+      logger.debug("publish response", await res.text());
       return;
     });
   }

package/lib/box/index.js

@@ -1,94 +1,10 @@
-#!/bin/node
-
-import fs from "node:fs";
-import path from "node:path";
-import { QemuVM, QemuResource } from "./qemu_vm_mgr.js";
-import { contextDirname, envsubstrDefault, randomString } from "../utils.js";
-import env, { sdkEnv } from "../env.js";
-import { CheckQemu } from "./check_qemu.js";
-import logger from "loglevel";
-
 export function boxCommand(box) {
   let subCommands = [
-    {
-      command: "create",
-      desc: "创建一个虚拟盒子，并注册运行",
-      handler: async () => {
-        const cq = await new CheckQemu().init();
-        const m = await new QemuVM().init();
-
-        const scheme = m.scheme;
-        const resource = await new QemuResource(scheme.path).init();
-
-        const name = randomString();
-
-        let boxId;
-        try {
-          // 创建盒子阶段，如果出错，将直接删除所有的资源。
-          boxId = await m.createVM(resource, name);
-        } catch (error) {
-          logger.error(error);
-          await m.cleanVM(name);
-          return;
-        }
-        console.log(
-          `\n盒子初始化成功
-请在浏览器中打开 http://127.0.0.1:30554/add?boxId=${boxId} 完成盒子注册`
-        );
-      },
-    },
-    {
-      command: "start <boxNameOrBoxId>",
-      desc: "启动一个虚拟盒子",
-      handler: async ({ boxNameOrBoxId }) => {
-        const m = await new QemuVM().init();
-        let boxid = await m.runVM(boxNameOrBoxId);
-        if (boxid) {
-          logger.info("盒子ID: ", boxid);
-        }
-      },
-    },
-    {
-      command: "stop <boxNameOrBoxId>",
-      desc: "停止一个虚拟盒子",
-      handler: async ({ boxNameOrBoxId }) => {
-        const m = await new QemuVM().init();
-        await m.stopVM(boxNameOrBoxId);
-      },
-    },
-    {
-      command: "delete <boxNameOrBoxId>",
-      desc: "删除一个盒子，将会删除其所具有的数据",
-      handler: async ({ boxNameOrBoxId }) => {
-        const m = await new QemuVM().init();
-        await m.deleteVM(boxNameOrBoxId);
-      },
-    },
-    {
-      command: "list [boxNameOrBoxId]",
-      desc: "获取一个虚拟盒子的信息",
-      handler: async ({ boxNameOrBoxId }) => {
-        const m = await new QemuVM().init();
-
-        let vmInfos = await m.listVM(boxNameOrBoxId);
-        if (vmInfos.length == 0) {
-          logger.info("没有找到任何盒子，创建一个吧!");
-          return;
-        }
-        console.table(vmInfos);
-        const hasNoRegistry = vmInfos.some((vm) => !vm.name);
-        if (hasNoRegistry) {
-          logger.info(
-            `还没有注册的盒子，你可以复制 id 到 http://127.0.0.1:30554/add 进行注册`
-          );
-        }
-      },
-    },
     {
       command: "switch <boxName>",
       desc: "设置默认的盒子",
-      handler: async ({ boxName }) => {
-        await sdkEnv.setDefaultBoxName(boxName);
+      handler: async () => {
+        throw "暂时不支持设置默认盒子，请通过在客户端上点击默认的盒子进行设置。";
       },
     },
   ];

package/lib/env.js

@@ -1,109 +1,21 @@
 import path from "path";
 import fs from "fs";
-import {
-  ensureDir,
-  APP_CONFIG_FILE,
-  GLOBAL_CONFIG_DIR,
-  APP_FOLDER,
-} from "./utils.js";
-import inquirer from "inquirer";
-import chalk from "chalk";
+import { ensureDir } from "./utils.js";
 import logger from "loglevel";
-import fetch from "./fetch.js";
+import os from "node:os";
 
-const GLOBAL_CONFIG_NAME = "box-config.json";
-const allPermitEnv = [
-  {
-    name: "DEFAULT_BOXNAME",
-    type: "input",
-    message: "默认的懒猫云盒子名称",
-    validate: (input) => {
-      return input != "";
-    },
-  },
-];
+export const GLOBAL_CONFIG_DIR = path.join(
+  os.homedir(),
+  "/.config/lazycat/box-config.json"
+);
 
 class Env {
-  constructor(cwd) {
-    // 只加载
-    this.existance = {
-      global: false,
-      local: false,
-    };
+  constructor() {
     this.allEnv = {};
+    this.globalEnvPath = GLOBAL_CONFIG_DIR;
+    ensureDir(this.globalEnvPath);
 
     this._loadGlobalEnv();
-    this._updateAllEnv();
-  }
-
-  /**
-   * 加载应用环境变量.
-   * @param {string} cwd 当前路径
-   */
-  load(cwd) {
-    this.localEnvPath = path.join(cwd, APP_FOLDER, APP_CONFIG_FILE);
-    try {
-      this.localEnv = JSON.parse(fs.readFileSync(this.localEnvPath));
-      this.existance.local = true;
-    } catch (e) {
-      logger.debug("local env fail to fetch ", e.message);
-      this.localEnv = {};
-    }
-
-    this._updateAllEnv();
-  }
-
-  /**
-   * 确保字段存在, 如果不存在会要求用户输入
-   * @param pairs {array} 需要询问的环境变量, 同 inquirer.prompt 参数
-   * @param global {boolean} 是否设置为全局变量, 默认为 false
-   */
-  async ensure(pairs, global = false) {
-    let willAskPairs = [];
-
-    pairs.forEach((pair) => {
-      if (this.allEnv.hasOwnProperty(pair.name)) return;
-      let found = allPermits.find((p) => p.name == pair.name);
-      if (found) {
-        willAskPairs.push(Object.assign({}, found, pair));
-      }
-    });
-
-    const pair = await inquirer.prompt(willAskPairs);
-    let pairNames = pairs.map((a) => a.name);
-    this.set(pair, global);
-    return Object.fromEntries(
-      Object.entries(this.allEnv).filter(([name, _]) => {
-        return pairNames.includes(name);
-      })
-    );
-  }
-
-  stringify() {
-    let content = "";
-    Object.keys(this.allEnv).forEach((key) => {
-      content += `${key}="${this.allEnv[key]}"\n`;
-    });
-    return content.trimEnd();
-  }
-
-  get isEnvExist() {
-    return fs.existsSync(this.envPath);
-  }
-
-  get all() {
-    return Object.keys(this.allEnv).reduce((p, c) => {
-      if (allPermitEnv.includes(c)) p[c] = this.allEnv[c];
-      return p;
-    }, {});
-  }
-
-  get localEnvExist() {
-    return this.existance.local;
-  }
-
-  get globalEnvExist() {
-    return this.existance.global;
   }
 
   has(key) {
@@ -114,94 +26,22 @@ class Env {
     return this.allEnv[key];
   }
 
-  set(pairs, global = false) {
-    const configPath = global ? this.globalEnvPath : this.localEnvPath;
-    let envs = global ? this.globalEnv : this.localEnv;
-    ensureDir(configPath);
-
-    Object.assign(envs, pairs);
-    fs.writeFileSync(configPath, JSON.stringify(envs, null, "  "));
-    return this._updateAllEnv();
-  }
-
-  _updateAllEnv() {
-    return (this.allEnv = Object.assign({}, this.globalEnv, this.localEnv));
+  set(pairs) {
+    Object.assign(this.allEnv, pairs);
+    fs.writeFileSync(
+      this.globalEnvPath,
+      JSON.stringify(this.allEnv, null, "  ")
+    );
   }
 
   _loadGlobalEnv() {
-    this.globalEnvPath = path.join(GLOBAL_CONFIG_DIR, GLOBAL_CONFIG_NAME);
-
     try {
-      this.globalEnv = JSON.parse(fs.readFileSync(this.globalEnvPath));
-      this.existance.global = true;
+      this.allEnv = JSON.parse(fs.readFileSync(this.globalEnvPath));
     } catch (e) {
       logger.debug("global env fail to fetch ", e.message);
-      this.globalEnv = {};
-    }
-  }
-}
-
-const env = new Env();
-
-// 用于处理 SDK_URL 这个特殊的环境变量
-// SDK_URL 根据默认的盒子名称生成，如果没有指定默认的盒子名称将会
-// 询问用户输入对应的盒子名称。
-class SDKEnv {
-  get sdkUrl() {
-    if (env.has("DEFAULT_BOXNAME")) {
-      return this.buildSdkUrl(env.get("DEFAULT_BOXNAME"));
-    }
-    return "";
-  }
-
-  get sdkHostName() {
-    if (env.has("DEFAULT_BOXNAME")) {
-      return `sdk.${env.get("DEFAULT_BOXNAME")}.heiyu.space`;
+      this.allEnv = {};
     }
-    return "";
-  }
-
-  async ensure() {
-    try {
-      const resp = await fetch(`${this.sdkUrl}/api/v1/ping`);
-      if (resp.status != 200)
-        throw new Error(chalk.red("debug.bridge服务未正常运行"));
-    } catch (e) {
-      logger.error(e);
-      console.log(
-        chalk.yellow(
-          `检测到SDK尚未安装，请将盒子"${env.get(
-            "DEFAULT_BOXNAME"
-          )}"开启开发者模式`
-        )
-      );
-      process.exit(-1);
-    }
-  }
-
-  async setDefaultBoxName(boxname = "") {
-    if (!boxname) {
-      boxname = await this._promptAnswers();
-    }
-    let url = this.buildSdkUrl(boxname);
-    env.set({ DEFAULT_BOXNAME: boxname }, true);
-  }
-
-  buildSdkUrl(boxname) {
-    return `https://sdk.${boxname}.heiyu.space`;
-  }
-
-  /**
-   * 提示用户回答问题
-   *
-   */
-  async _promptAnswers() {
-    const answers = await inquirer.prompt(
-      allPermitEnv.filter((a) => a.name == "DEFAULT_BOXNAME")
-    );
-    return answers["DEFAULT_BOXNAME"];
   }
 }
 
-export const sdkEnv = new SDKEnv();
-export default env;
+export default new Env();

package/lib/lzc_sdk.js

@@ -7,9 +7,22 @@ import logger from "loglevel";
 import os from "node:os";
 import fs from "node:fs";
 
-const SHELLAPI_CONFIG_DIR = path.join(os.homedir(), "/.config/hportal-client");
+/**
+ * @link {https://www.npmjs.com/package/appdirs}
+ */
+function getShellAPIConfigDir() {
+  const home = os.homedir();
+  const isMacos = process.platform == "darwin";
+  let sufix = "/.config/hportal-client";
+  if (isMacos) {
+    sufix = "/Library/Application Support/hportal-client";
+  } // TODO: need reimpl fetch windows
+  const SHELLAPI_CONFIG_DIR = path.join(home, sufix);
+  return SHELLAPI_CONFIG_DIR;
+}
+
 const coreDefinition = protoLoader.loadSync(
-  path.join(contextDirname(), "./core.proto"),
+  path.join(contextDirname(), "./shellapi.proto"),
   {
     keepCase: true,
     longs: String,
@@ -24,6 +37,7 @@ const core =
 let client;
 
 function readShellApiInfo() {
+  const SHELLAPI_CONFIG_DIR = getShellAPIConfigDir();
   const addr = fs.readFileSync(
     path.resolve(SHELLAPI_CONFIG_DIR, "shellapi_addr"),
     { encoding: "utf-8" }

package/lib/shellapi.js

@@ -0,0 +1,95 @@
+import grpc from "@grpc/grpc-js";
+import protoLoader from "@grpc/proto-loader";
+import { contextDirname } from "./utils.js";
+import path from "node:path";
+import fs from "node:fs";
+import os from "node:os";
+
+/**
+ * @link {https://www.npmjs.com/package/appdirs}
+ */
+function getShellAPIConfigDir() {
+  const home = os.homedir();
+  const isMacos = process.platform == "darwin";
+  let sufix = "/.config/hportal-client";
+  if (isMacos) {
+    sufix = "/Library/Application Support/hportal-client";
+  } // TODO: need reimpl fetch windows
+  const SHELLAPI_CONFIG_DIR = path.join(home, sufix);
+  return SHELLAPI_CONFIG_DIR;
+}
+
+class ShellApi {
+  constructor() {
+    const pbShell = this.initShell();
+    const { addr, cred } = this.readShellApiInfo();
+    this.client = new pbShell.ShellCore(
+      addr,
+      grpc.credentials.createInsecure()
+    );
+
+    const md = new grpc.Metadata();
+    md.add("lzc-shellapi-cred", cred);
+    this.metadata = md;
+  }
+
+  async init() {
+    this.info = await this.initBoxInfo();
+  }
+
+  get boxname() {
+    return this.info.boxname;
+  }
+  get uid() {
+    return this.info.uid;
+  }
+
+  readShellApiInfo() {
+    const SHELLAPI_CONFIG_DIR = getShellAPIConfigDir();
+    const addr = fs.readFileSync(
+      path.resolve(SHELLAPI_CONFIG_DIR, "shellapi_addr"),
+      { encoding: "utf-8" }
+    );
+    const cred = fs.readFileSync(
+      path.resolve(SHELLAPI_CONFIG_DIR, "shellapi_cred"),
+      { encoding: "utf-8" }
+    );
+    return { addr, cred };
+  }
+
+  initShell() {
+    const coreDefinition = protoLoader.loadSync(
+      path.join(contextDirname(), "./shellapi.proto"),
+      {
+        keepCase: true,
+        longs: String,
+        enums: String,
+        defaults: true,
+        oneofs: true,
+      }
+    );
+    return grpc.loadPackageDefinition(coreDefinition).space.heiyu.hportal.shell;
+  }
+
+  async initBoxInfo() {
+    return new Promise((resolve, reject) => {
+      this.client.queryBoxList({}, this.metadata, function (err, response) {
+        if (err) {
+          reject(err);
+          return;
+        }
+        for (let box of response.boxes) {
+          if (box.is_default_box) {
+            resolve({ uid: box.login_user, boxname: box.box_name });
+            return;
+          }
+        }
+        reject(
+          "没有默认盒子信息, 请先使用 lzc-cli box switch 设置默认的盒子信息"
+        );
+      });
+    });
+  }
+}
+
+export default new ShellApi();