@lazycatcloud/lzc-cli 1.2.1 → 1.2.3

package/lib/app/lpk_debug_bridge.js

@@ -71,7 +71,10 @@ export class DebugBridge {
   }
 
   async isDevshell(appId) {
-    const stdout = await this.common(this.sshCmd, [`isDevshell`, appId]);
+    const stdout = await this.common(this.sshCmd, [
+      `isDevshell --uid ${this.uid}`,
+      appId,
+    ]);
     return stdout == "true";
   }
 
@@ -83,10 +86,17 @@ export class DebugBridge {
     return this.common(this.sshCmd, [`uninstall --uid ${this.uid}`, appId]);
   }
 
-  async devshell(appId) {
+  async devshell(appId, isUserApp) {
     const stream = spawn(
       this.sshCmd,
-      ["-t", "devshell", appId, "/lzcapp/pkg/content/devshell/exec.sh"],
+      [
+        "-t",
+        "devshell",
+        `--uid ${this.uid}`,
+        isUserApp ? "--userapp" : "",
+        appId,
+        "/lzcapp/pkg/content/devshell/exec.sh",
+      ],
       {
         shell: true,
         stdio: "inherit",

package/lib/app/lpk_devshell.js

@@ -15,12 +15,12 @@ import {
   md5File,
   loadFromYaml,
   FileLocker,
+  isUserApp,
 } from "../utils.js";
 import os from "node:os";
 import commandExists from "command-exists";
 import chokidar from "chokidar";
 import _ from "lodash";
-import { getUidByManifest } from "../lzc_sdk.js";
 import { DebugBridge } from "./lpk_debug_bridge.js";
 import shellApi from "../shellapi.js";
 
@@ -107,16 +107,16 @@ export class AppDevShell {
     this.lpkBuild = lpkBuild;
     this.monitor = undefined;
     this.forceBuild = forceBuild;
+    this.isUserApp = false;
   }
 
   async init() {
     const manifest = await this.lpkBuild.getManifest();
-    const uid = await getUidByManifest(manifest);
     this.monitor = await new AppDevShellMonitor(
       this.cwd,
-      manifest["package"],
-      uid
+      manifest["package"]
     ).init();
+    this.isUserApp = isUserApp(manifest);
   }
 
   async build() {
@@ -337,8 +337,7 @@ export class AppDevShell {
       logger.debug(err);
     }
 
-    const uid = await getUidByManifest(manifest);
-    const devshell = new DevShell(pkgId, uid);
+    const devshell = new DevShell(pkgId, this.isUserApp);
     if (isSync) {
       await devshell.shell();
     } else {
@@ -352,9 +351,9 @@ export class AppDevShell {
 }
 
 class DevShell {
-  constructor(appId, uid = "") {
+  constructor(appId, isUserApp) {
     this.appId = appId;
-    this.uid = uid;
+    this.isUserApp = isUserApp;
   }
 
   async syncProject(appId) {
@@ -377,7 +376,10 @@ class DevShell {
     }
 
     const rsyncDebug = process.env.RSYNCDEBUG ? "-P" : "";
-    const dest = `root@app.${appId}.lzcapp:/lzcapp/cache/devshell`;
+    const host = this.isUserApp
+      ? `${shellApi.uid}.app.${appId}.lzcapp`
+      : `app.${appId}.lzcapp`;
+    const dest = `root@${host}:/lzcapp/cache/devshell`;
     try {
       execSync(
         `rsync ${rsyncDebug} --rsh='${rsh}' --recursive --relative --perms --update --filter=':- .gitignore' --ignore-errors --usermap=:nobody --groupmap=*:nobody . ${dest}`,
@@ -466,6 +468,6 @@ class DevShell {
 
   async connectShell() {
     const bridge = new DebugBridge();
-    await bridge.devshell(this.appId);
+    await bridge.devshell(this.appId, this.isUserApp);
   }
 }

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/lib/utils.js

@@ -294,3 +294,7 @@ export function isValidPackageName(packageName) {
   const regex = new RegExp("^(?:[a-z][a-z0-9_]*\\.)+[a-z][a-z0-9_]*$");
   return regex.test(packageName);
 }
+
+export function isUserApp(manifest) {
+  return !!manifest["application"]["user_app"];
+}

package/package.json

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

package/template/_lpk/exec.sh

@@ -9,5 +9,6 @@ fi
 set -e
 
 # 切换目录
+mkdir -p /lzcapp/cache/devshell
 cd /lzcapp/cache/devshell
 exec /bin/sh

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

package/lib/lzc_sdk.js

@@ -1,83 +0,0 @@
-import grpc from "@grpc/grpc-js";
-import protoLoader from "@grpc/proto-loader";
-import { contextDirname } from "./utils.js";
-import path from "node:path";
-import env from "./env.js";
-import logger from "loglevel";
-import os from "node:os";
-import fs from "node:fs";
-
-/**
- * @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(), "./shellapi.proto"),
-  {
-    keepCase: true,
-    longs: String,
-    enums: String,
-    defaults: true,
-    oneofs: true,
-  }
-);
-const core =
-  grpc.loadPackageDefinition(coreDefinition).space.heiyu.hportal.shell;
-
-let client;
-
-function 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 };
-}
-
-export async function getUidByManifest(manifest) {
-  if (!manifest["application"]["user_app"]) {
-    return "";
-  }
-
-  const { addr, cred } = readShellApiInfo();
-
-  if (!client) {
-    client = new core.ShellCore(addr, grpc.credentials.createInsecure());
-  }
-
-  const metadata = new grpc.Metadata();
-  metadata.add("lzc-shellapi-cred", cred);
-
-  const boxName = env.get("DEFAULT_BOXNAME");
-  return new Promise((resolve, reject) => {
-    client.queryBoxList({}, metadata, function (err, response) {
-      if (err) {
-        reject(err);
-        return;
-      }
-      for (let box of response.boxes) {
-        if (box.box_name == boxName) {
-          logger.debug("当前登录用户: ", box.login_user);
-          resolve(box.login_user);
-          return;
-        }
-      }
-      reject("没有默认盒子信息");
-    });
-  });
-}