@lazycatcloud/lzc-cli 1.1.8 → 1.1.10

package/lib/box/api/empty.js

@@ -0,0 +1,35 @@
+/* eslint-disable */
+import _m0 from "protobufjs/minimal.js";
+function createBaseEmpty() {
+  return {};
+}
+export const Empty = {
+  encode(_, writer = _m0.Writer.create()) {
+    return writer;
+  },
+  decode(input, length) {
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseEmpty();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        default:
+          reader.skipType(tag & 7);
+          break;
+      }
+    }
+    return message;
+  },
+  fromJSON(_) {
+    return {};
+  },
+  toJSON(_) {
+    const obj = {};
+    return obj;
+  },
+  fromPartial(_) {
+    const message = createBaseEmpty();
+    return message;
+  },
+};

package/lib/box/check_qemu.js

@@ -46,5 +46,6 @@ ${pkgTips}
         throw tips;
       }
     }
+    return this;
   }
 }

package/lib/box/index.js

@@ -3,137 +3,84 @@
 import fs from "node:fs";
 import path from "node:path";
 import { QemuVM, QemuResource } from "./qemu_vm_mgr.js";
-import { contextDirname } from "../utils.js";
+import { contextDirname, envsubstrDefault, randomString } 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(
-    contextDirname(),
-    "box",
-    "schemes",
-    "vm_box_system_debian.json"
-  );
-  let scheme = JSON.parse(fs.readFileSync(defaultSchemeFile));
-  if (scheme.path.search(/\$HOME/) >= 0) {
-    let home = process.env["HOME"];
-    scheme.path = scheme.path.replace("$HOME", home);
-  }
-
-  if (scheme.path && !scheme.path.startsWith("/")) {
-    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);
-    await resource.init();
-  }
-
-  let m = new QemuVM(scheme);
-  return m;
-}
-
-async function initHportal() {
-  let apiHost = "http://127.0.0.1:30553/api";
-  let m = new HportalManager(apiHost);
-  return m;
-}
-
 export function boxCommand(box) {
   let subCommands = [
     {
       command: "create",
       desc: "创建一个虚拟盒子，并注册运行",
       handler: async () => {
-        let cq = new CheckQemu();
-        await cq.init();
+        const cq = await new CheckQemu().init();
+        const m = await new QemuVM().init();
 
-        let boxId;
-        let m = await initQemuVM(true);
-        let answer = await m.askBoxInfo();
+        const scheme = m.scheme;
+        const resource = await new QemuResource(scheme.path).init();
 
+        const name = randomString();
+
+        let boxId;
         try {
           // 创建盒子阶段，如果出错，将直接删除所有的资源。
-          boxId = await m.createVM(answer);
+          boxId = await m.createVM(resource, name);
         } catch (error) {
           logger.error(error);
-          await m.cleanVM(answer.boxName);
+          await m.cleanVM(name);
           return;
         }
-
-        // 如果没有指定默认的盒子名称将会将第一个盒子作为默认的盒子
-        let defaultBoxName = env.get("DEFAULT_BOXNAME");
-        if (!defaultBoxName) {
-          // 新创建的盒子在初始化的时候，盒子里面需要安装hc的组件，需要一点时间，
-          // 所以这里并不对sdk url进行校验是否有效
-          await sdkEnv.setDefaultBoxName(answer.boxName);
-        }
-
-        let h = await initHportal();
-        logger.debug("添加盒子到 Hportal ......");
-        await h.addBox(answer.boxName);
-        logger.debug("正在使用管理员帐号密码登录中......");
-        await h.loginBox(boxId, answer.adminName, answer.adminPass);
-        logger.debug("登录成功！");
+        console.log(
+          `\n盒子初始化成功
+请在浏览器中打开 http://127.0.0.1:30554/add?boxId=${boxId} 完成盒子注册`
+        );
       },
     },
     {
-      command: "start <boxName>",
+      command: "start <boxNameOrBoxId>",
       desc: "启动一个虚拟盒子",
-      handler: async ({ boxName }) => {
-        let m = await initQemuVM();
-        let boxid = await m.runVM(boxName);
+      handler: async ({ boxNameOrBoxId }) => {
+        const m = await new QemuVM().init();
+        let boxid = await m.runVM(boxNameOrBoxId);
         if (boxid) {
           logger.info("盒子ID: ", boxid);
         }
       },
     },
     {
-      command: "stop <boxName>",
+      command: "stop <boxNameOrBoxId>",
       desc: "停止一个虚拟盒子",
-      handler: async ({ boxName }) => {
-        let m = await initQemuVM();
-        await m.stopVM(boxName);
+      handler: async ({ boxNameOrBoxId }) => {
+        const m = await new QemuVM().init();
+        await m.stopVM(boxNameOrBoxId);
       },
     },
     {
-      command: "delete <boxName>",
-      desc: "删除一个盒子，并取消接管。如果盒子为虚拟盒子，将会删除其所具有的数据",
-      handler: async ({ boxName }) => {
-        let h = await initHportal();
-        let boxId = await h.getBoxId(boxName);
-        if (boxId) {
-          await h.deleteBox(boxId);
-        }
-        let m = await initQemuVM();
-        await m.deleteVM(boxName);
+      command: "delete <boxNameOrBoxId>",
+      desc: "删除一个盒子，将会删除其所具有的数据",
+      handler: async ({ boxNameOrBoxId }) => {
+        const m = await new QemuVM().init();
+        await m.deleteVM(boxNameOrBoxId);
       },
     },
     {
-      command: "info [boxName]",
+      command: "list [boxNameOrBoxId]",
       desc: "获取一个虚拟盒子的信息",
-      handler: async ({ boxName }) => {
-        let m = await initQemuVM();
-        let defaultBoxName = env.get("DEFAULT_BOXNAME");
-
-        let rm = await initHportal();
-
-        let vmInfos = await m.infoVM(boxName, defaultBoxName);
-        let rmInfos = await rm.boxs(boxName, defaultBoxName);
+      handler: async ({ boxNameOrBoxId }) => {
+        const m = await new QemuVM().init();
 
-        // 过滤条件不满足
-        if (vmInfos.length == 0 && rmInfos == 0 && boxName) {
-          logger.info(`${boxName} 盒子不存在`);
-          let allVmInfos = await m.infoVM("", defaultBoxName);
-          let allRmInfos = await rm.boxs("", defaultBoxName);
-          showBoxInfo(allVmInfos, allRmInfos);
-        } else {
-          showBoxInfo(vmInfos, rmInfos);
+        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 进行注册`
+          );
         }
       },
     },