@lazycatcloud/lzc-cli 1.2.2 → 1.2.3

package/lib/box/index.js

@@ -1,10 +1,47 @@
+import shellapi from "../shellapi.js";
+
 export function boxCommand(box) {
   let subCommands = [
     {
-      command: "switch <boxName>",
+      command: "switch <boxname>",
       desc: "设置默认的盒子",
-      handler: async () => {
-        throw "暂时不支持设置默认盒子，请通过在客户端上点击默认的盒子进行设置。";
+      handler: async ({ boxname }) => {
+        await shellapi.init();
+        await shellapi.setDefaultBox(boxname);
+      },
+    },
+    {
+      command: "list",
+      desc: "查看盒子列表",
+      builder: (args) => {
+        args.option("v", {
+          alias: "verbose",
+          describe: "查看详细输出",
+          type: "boolean",
+        });
+      },
+      handler: async ({ verbose }) => {
+        await shellapi.init();
+        const boxes = await shellapi.boxList();
+        if (boxes.length === 0) {
+          console.log("没有找到任何盒子，赶紧添加一个吧！");
+          return;
+        }
+        if (verbose) {
+          console.log(JSON.stringify(boxes, undefined, "\t"));
+          return;
+        }
+
+        const list = boxes.map((b) => {
+          return {
+            名称: b.box_name,
+            状态: b.status,
+            登录用户: b.login_user,
+            是否管理员: b.is_admin_login ? "✔" : "✖",
+            是否默认盒子: b.is_default_box ? "✔" : "✖",
+          };
+        });
+        console.table(list);
       },
     },
   ];

package/lib/shellapi.js

@@ -71,25 +71,43 @@ class ShellApi {
     return grpc.loadPackageDefinition(coreDefinition).space.heiyu.hportal.shell;
   }
 
-  async initBoxInfo() {
+  async boxList() {
     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 设置默认的盒子信息"
-        );
+        resolve(response.boxes);
       });
     });
   }
+
+  async initBoxInfo() {
+    const boxes = await this.boxList();
+    const box = boxes.find((b) => b.is_default_box);
+    if (box) {
+      return { uid: box.login_user, boxname: box.box_name };
+    }
+    throw "没有默认盒子信息, 请先使用 lzc-cli box switch 设置默认的盒子信息";
+  }
+
+  async setDefaultBox(boxname) {
+    const boxes = await this.boxList();
+    const box = boxes.find((b) => b.box_name === boxname);
+    if (!box) {
+      throw `${boxname} 盒子不存在`;
+    }
+    return new Promise((resolve, reject) => {
+      this.client.modifyBoxConfig(
+        { id: box.id, name: box.box_name, set_as_default_box: true },
+        this.metadata,
+        function (err) {
+          err ? reject(err) : resolve();
+        }
+      );
+    });
+  }
 }
 
 export default new ShellApi();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "test": "tap",

package/template/_lpk/init_debug_bridge.sh

@@ -7,18 +7,25 @@ BUSYBOX=/lzcapp/pkg/content/devshell/busybox
 mkdir -p /root/.ssh
 mkdir -p /etc/debug.bridge
 
-${BUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/dropbearmulti -O /usr/bin/dropbearmulti
-chmod +x /usr/bin/dropbearmulti
+if ! [ -f /usr/bin/dropbearmulti ]; then
+    ${BUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/dropbearmulti -O /usr/bin/dropbearmulti
+    chmod +x /usr/bin/dropbearmulti
+fi
 
-${BUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/rsync -O /usr/bin/rsync
-chmod +x /usr/bin/rsync
+if ! [ -f /usr/bin/rsync ]; then
+    ${BUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/rsync -O /usr/bin/rsync
+    chmod +x /usr/bin/rsync
+fi
 
 ${BUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/authorized_keys -O /root/.ssh/authorized_keys
 chmod 0644 /root/.ssh/authorized_keys
 
 ${BUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/bannerfile -O /etc/debug.bridge/bannerfile
 
-
-mkdir -p /etc/dropbear
-
-exec dropbearmulti dropbear -R -F -E -B -p 22222
+if ${BUSYBOX} netstat -tln | grep ':22222' >/dev/null; then
+    echo "端口22222正在监听"
+    ${BUSYBOX} sleep infinity
+else
+    mkdir -p /etc/dropbear
+    exec dropbearmulti dropbear -R -F -E -B -p 22222
+fi