@lazycatcloud/lzc-cli 1.1.12 → 1.1.13

package/lib/api.js

@@ -2,7 +2,7 @@ import ora from "ora";
 import chalk from "chalk";
 import fs from "fs";
 import logger from "loglevel";
-import fetch from "node-fetch";
+import fetch from "./fetch.js";
 
 //
 // sdk 提供的API
@@ -12,12 +12,12 @@ export default class API {
     this.host = host;
     this.uid = uid;
   }
-  async install(zipPath) {
+  async install(zipPath, isDevshell = false) {
     if (!fs.existsSync(zipPath)) {
       throw `${zipPath} 不存在`;
     }
     const resp = await fetch(
-      `${this.host}/api/v1/app/install?id=${this.appId}`,
+      `${this.host}/api/v1/app/install?id=${this.appId}&devshell=${isDevshell}`,
       {
         method: "POST",
         body: fs.createReadStream(zipPath),

package/lib/app/index.js

@@ -6,6 +6,9 @@ import { LpkInstaller } from "./lpk_installer.js";
 import { LpkUninstaller } from "./lpk_uninstall.js";
 import { LpkStatuser } from "./lpk_status.js";
 import { LpkLogger } from "./lpk_log.js";
+import logger from "loglevel";
+import fetch from "../fetch.js";
+import { sdkEnv } from "../env.js";
 
 export function lpkProjectCommand(program) {
   let subCommands = [
@@ -72,9 +75,27 @@ export function lpkProjectCommand(program) {
           type: "string",
           default: "lzc-build.yml",
         });
+        args.option("contentdir", {
+          describe: "同时打包 lzc-build.yml 中指定的 contentdir 目录",
+          type: "boolean",
+        });
       },
-      handler: async ({ context, shell, force, config }) => {
-        const app = new AppDevShell(context, config, force);
+      handler: async ({ context, shell, force, config, contentdir }) => {
+        const cwd = context ? path.resolve(context) : process.cwd();
+        const lpkBuild = await new LpkBuild(cwd, config).init();
+        lpkBuild.onBeforeBuildPackage(async (options) => {
+          // devshell 正常情况下，不需要执行 buildscript 和 contentdir 字段
+          logger.debug("devshell delete 'buildscript' field");
+          delete options["buildscript"];
+
+          if (!contentdir) {
+            logger.debug("devshell delete 'contentdir' field");
+            delete options["contentdir"];
+          }
+          return options;
+        });
+        await fetch(`${sdkEnv.sdkUrl}/api/v1/ping`);
+        const app = new AppDevShell(cwd, lpkBuild, force);
         await app.init();
         await app.build();
         await app.rsyncShell(shell);

package/lib/app/lpk_build.js

@@ -8,6 +8,7 @@ import {
   isFileExist,
   dumpToYaml,
   envTemplateFile,
+  isValidPackageName,
 } from "../utils.js";
 import { spawnSync } from "child_process";
 import { LpkManifest } from "./lpk_create.js";
@@ -130,11 +131,6 @@ function convenientEnv() {
   );
 }
 
-function isValidPackageName(packageName) {
-  const regex = /^([a-zA-Z_][a-zA-Z0-9_]*\.)*[a-zA-Z_][a-zA-Z0-9_]*$/;
-  return regex.test(packageName);
-}
-
 export class LpkBuild {
   constructor(cwd, lzcBuild = "lzc-build.yml") {
     this.pwd = cwd ?? process.cwd();

package/lib/app/lpk_create.js

@@ -7,6 +7,7 @@ import {
   ensureDir,
   dumpToYaml,
   isFileExist,
+  isValidPackageName,
 } from "../utils.js";
 import path from "node:path";
 import { TemplateConfig } from "./lpk_create_generator.js";
@@ -74,9 +75,14 @@ export class LpkManifest {
       {
         type: "input",
         name: "package",
-        message: "请输入应用ID",
-        default: this.defaultAppID,
-        validate: noEmpty,
+        message: "请输入应用ID, 如 cloud.lazycat.app.video",
+        validate: (input) => {
+          if (isValidPackageName(input)) {
+            return true;
+          } else {
+            return "应用ID错误，请输入正确的格式, 如 cloud.lazycat.app.video";
+          }
+        },
       },
       {
         type: "input",

package/lib/app/lpk_devshell.js

@@ -129,19 +129,14 @@ class AppDevShellMonitor {
 }
 
 export class AppDevShell {
-  constructor(cwd, config, forceBuild = false) {
-    this.cwd = cwd ? path.resolve(cwd) : process.cwd();
-    this.lpkBuild = undefined;
+  constructor(cwd, lpkBuild, forceBuild = false) {
+    this.cwd = cwd;
+    this.lpkBuild = lpkBuild;
     this.monitor = undefined;
     this.forceBuild = forceBuild;
-    this.lpkBuildConfig = config;
   }
 
   async init() {
-    if (!this.lpkBuild) {
-      this.lpkBuild = new LpkBuild(this.cwd, this.lpkBuildConfig);
-      await this.lpkBuild.init();
-    }
     const manifest = await this.lpkBuild.getManifest();
     const uid = await getUidByManifest(manifest);
     this.monitor = await new AppDevShellMonitor(
@@ -165,13 +160,7 @@ export class AppDevShell {
     await k.ensure(sdkEnv.sdkUrl);
     const pairs = await k.getKeyPair();
 
-    // devshell 不需要执行 buildscript 和 contentdir 也不需要
     this.lpkBuild.onBeforeBuildPackage(async (options) => {
-      logger.debug("devshell delete 'buildscript' field");
-      logger.debug("devshell delete 'contentdir' field");
-      delete options["buildscript"];
-      delete options["contentdir"];
-
       const devshell = options["devshell"];
       if (!devshell) {
         throw "devshell 模式下，devshell 字段必须要指定";
@@ -371,7 +360,7 @@ export class AppDevShell {
     // 在构建生成 lpk 包后，调用 deploy 进行部署
     let installer = new LpkInstaller();
     await installer.init();
-    await installer.deploy(this.lpkBuild);
+    await installer.deploy(this.lpkBuild, true);
 
     await sleep(2000);
   }
@@ -444,11 +433,11 @@ class DevShell {
 
     let rsyncDebug = process.env.RSYNCDEBUG ? "-P" : "";
     const userId = this.uid ? `/${this.uid}` : "";
-    let storePath = `/run/lzc_boot/data/cache/${appId}${userId}/devshell`;
+    let storePath = `/lzcsys/run/data/app/cache/${appId}${userId}/devshell`;
     // FIXME: 下方执行命令不确定是否有兼容性问题
     try {
       execSync(
-        `rsync ${rsyncDebug} --rsh='${rsh}' --recursive --relative --perms --update . ${host}:${storePath} --filter=':- .gitignore' --exclude='node_modules' --exclude='.git' --ignore-errors --usermap=:nobody --groupmap=*:nobody`,
+        `rsync ${rsyncDebug} --rsh='${rsh}' --recursive --relative --perms --update . ${host}:${storePath} --filter=':- .gitignore' --ignore-errors --usermap=:nobody --groupmap=*:nobody`,
         { stdio: ["ignore", "inherit", "inherit"] }
       );
     } catch (err) {

package/lib/app/lpk_installer.js

@@ -4,10 +4,9 @@ import logger from "loglevel";
 import fs from "node:fs";
 import path from "node:path";
 import Key from "../key.js";
-import { loadFromYaml, Downloader, sleep } from "../utils.js";
+import { loadFromYaml, Downloader } from "../utils.js";
 import { spawnSync } from "node:child_process";
 import { getUidByManifest } from "../lzc_sdk.js";
-import fetch from "node-fetch";
 
 export class LpkInstaller {
   constructor() {}
@@ -21,7 +20,8 @@ export class LpkInstaller {
     await k.ensure(sdkEnv.sdkUrl);
   }
 
-  async deploy(builder) {
+  // TODO: 将 devshell 的判断逻辑放在 builder 中判断
+  async deploy(builder, isDevshell = false) {
     if (!builder) {
       throw "deploy 必须传递一个 builder";
     }
@@ -32,24 +32,14 @@ export class LpkInstaller {
 
     let pkgPath = await builder.exec("");
     logger.info("开始部署应用");
-    await api.install(pkgPath);
+    await api.install(pkgPath, isDevshell);
 
     const appUrl = sdkEnv.sdkUrl.replace(
       /sdk/,
       manifest["application"]["subdomain"]
     );
-    // 如果是多实例的应用，需要先访问下，才会创建对应的容器
-    if (manifest["application"]["user_app"]) {
-      const res = await fetch(appUrl);
-      if (res.status >= 400) {
-        throw `访问 ${appUrl} 失败`;
-      }
-    }
-
     // 新安装的应用默认为休眠的状态，需要先等容器创建成功，等成为 paused 后 resume 下
     await api.checkStatus(true);
-
-    await sleep(2000);
     logger.info(`👉 请在浏览器中访问 ${appUrl}`);
   }
 

package/lib/appstore/login.js

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

package/lib/box/qemu_vm_mgr.js

@@ -5,7 +5,7 @@ import path from "node:path";
 import inquirer from "inquirer";
 import process from "node:process";
 import net from "node:net";
-import fetch from "node-fetch";
+import fetch from "../fetch.js";
 import os from "node:os";
 import logger from "loglevel";
 import glob from "fast-glob";

package/lib/core.proto

@@ -0,0 +1,118 @@
+syntax = "proto3";
+
+package space.heiyu.hportal.shell;
+
+import "google/protobuf/empty.proto";
+
+// 此接口为hclient&hserver曝露给管理界面、命令行客户端等使用的API
+service ShellCore {
+  // 查询当前盒子列表的状态
+  rpc QueryBoxList(google.protobuf.Empty) returns(BoxList) {}
+  // 添加、修改盒子的登陆信息、开启、关闭盒子等
+  rpc ModifyBox(BoxSetting) returns (google.protobuf.Empty);
+}
+
+// 盒子只会处于以下四种状态之一
+enum BoxStatus {
+  // 此盒子当前未激活
+  DISABLED = 0;
+
+  // 正在连接中，此过程持续时间无法评估，
+  // 可能瞬间结束也可能持续一两分钟(在确实可以连接上的前提下)
+  CONNECTING = 1;
+
+  // 成功连接上了
+  CONNECTED = 2;
+
+  // 确定无法连接，此时不会继续重试，需要客户端
+  // 修正环境后，重新调用ModifyBox后继续尝试。
+  FAILED = 3;
+}
+
+enum ConnectingStatus {
+  AWAIT_NEW_DEVICE_AUTH = 0;
+}
+
+enum FailedStatus {
+  // 未知原因失败
+  FAILED_UNKNOWN = 0;
+
+  // 当前盒子无管理员帐号，需要调用CreateUser创建管理员帐号
+  FAILED_NO_ADMINUSER = 1;
+
+  // 当前盒子未注册盒子名称，需要调用SetupNewBox向horigin申请盒子名称以及配套资源
+  FAILED_NO_BOXNAME = 2;
+
+  // 当前登陆信息不正确，需要调用ModifyBox设置新的auth信息
+  FAILED_INVALID_PASSWORD = 3;
+
+  // 当前客户端与服务器版本不匹配，无法连接，需要升级盒子系统或客户端软件
+  FAILED_MISMATCH_BOX_VERSION = 4;
+
+  // 当前设备被拒绝登录
+  FAILED_DEVICE_AUTH_REJECT = 5;
+
+
+  //------ 100+的失败状态一般为本机特有错误状态
+
+  //调用LoginBox的过程中，此盒子的状态被其他API请求转换为disabled了
+  FAILED_LOCAL_DISABLED_BOX = 100;
+
+  //调用LoginBox时使用了一个不存在的盒子名称。(若只是本地不盒子列表不存在此盒子，会自动添加到盒子列表)
+  FAILED_LOCAL_NO_SUCH_BOX_IN_THE_WORLD = 101;
+
+  //使用LoginBox时，登陆超时
+  FAILED_LOCAL_CONNECTING_TIMEOUT = 102;
+}
+
+enum ExceptionStatus {
+  OK = 0;
+  Error = 1;
+  Booting = 2;
+}
+
+message BoxInfo {
+  string box_id = 1;
+  string box_name = 2;
+  string box_home_url = 3 [deprecated = true];
+  string box_domain = 14;
+  string box_virtual_ip = 10;
+
+  BoxStatus status = 4;
+  string status_reason = 5;
+  optional FailedStatus failed_status = 6;
+  optional ConnectingStatus connecting_status = 12; // deprecated
+  ExceptionStatus exception_status = 11;
+
+  bool is_relay_connection = 13;
+
+  string login_user = 7;
+  bool is_admin_login = 8;
+  string auth_token = 9;
+
+  bool is_default_box = 15;
+}
+
+message BoxList {
+  repeated BoxInfo boxes = 1;
+}
+
+message BoxSetting {
+  string id = 1;
+
+  optional string name = 2;
+
+  // 若不设置则使用当前值
+  optional bool enabled = 3;
+
+  message AuthInfo {
+    string user = 3;
+    string password = 4;
+    optional string verification_code = 5;
+  }
+  optional AuthInfo auth = 4;
+
+  //设置此盒子为默认盒子，会覆盖其他(如果有)默认盒子的配置
+  //第一个添加的盒子会自动成为默认盒子
+  optional bool set_as_default_box = 5;
+}

package/lib/env.js

@@ -9,7 +9,7 @@ import {
 import inquirer from "inquirer";
 import chalk from "chalk";
 import logger from "loglevel";
-import fetch from "node-fetch";
+import fetch from "./fetch.js";
 
 const GLOBAL_CONFIG_NAME = "box-config.json";
 const allPermitEnv = [
@@ -188,7 +188,7 @@ class SDKEnv {
   }
 
   buildSdkUrl(boxname) {
-    return `http://sdk.${boxname}.heiyu.space`;
+    return `https://sdk.${boxname}.heiyu.space`;
   }
 
   /**

package/lib/fetch.js

@@ -0,0 +1,50 @@
+import nodeFetch from "node-fetch";
+import makeFetchCookie from "fetch-cookie";
+import { FileCookieStore } from "tough-cookie-file-store";
+import inquirer from "inquirer";
+import env from "./env.js";
+import path from "node:path";
+import { GLOBAL_CONFIG_DIR } from "./utils.js";
+
+const cookieFetch = makeFetchCookie(
+  nodeFetch,
+  new makeFetchCookie.toughCookie.CookieJar(
+    new FileCookieStore(path.resolve(GLOBAL_CONFIG_DIR, "cookie.json"))
+  )
+);
+const fetch = async (url, options) => {
+  const resp = await cookieFetch(url, options);
+  if (resp.status == 401) {
+    await login();
+  }
+  return resp;
+};
+
+export async function login() {
+  const boxname = env.get("DEFAULT_BOXNAME");
+  const boxUrl = `https://${boxname}.heiyu.space`;
+
+  const questions = [
+    {
+      name: "username",
+      type: "input",
+      message: "请输入帐号名",
+    },
+    {
+      type: "password",
+      mask: "*",
+      name: "password",
+      message: "请输入登录密码",
+    },
+  ];
+  const answers = await inquirer.prompt(questions);
+  await fetch(`${boxUrl}/sys/login?type=plain`, {
+    headers: {
+      "content-type": "application/x-www-form-urlencoded",
+    },
+    body: `username=${answers.username}&password=${answers.password}`,
+    method: "POST",
+  });
+}
+
+export default fetch;

package/lib/lzc_sdk.js

@@ -1,25 +1,69 @@
-import os from "node:os";
+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 env from "./env.js";
 import logger from "loglevel";
+import os from "node:os";
+import fs from "node:fs";
 
-const lzcConfigFile = path.resolve(
-  os.homedir(),
-  ".config",
-  "lzc-client-desktop",
-  "defaultBox.json"
+const SHELLAPI_CONFIG_DIR = path.join(os.homedir(), "/.config/hportal-client");
+const coreDefinition = protoLoader.loadSync(
+  path.join(contextDirname(), "./core.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 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 };
+}
 
-let lzcConfig = undefined;
 export async function getUidByManifest(manifest) {
-  if (manifest["application"]["user_app"]) {
-    if (!lzcConfig) {
-      lzcConfig = JSON.parse(
-        fs.readFileSync(lzcConfigFile, { encoding: "utf8" })
-      );
-      logger.debug("loginUser: ", lzcConfig["loginUser"]);
-    }
-    return lzcConfig["loginUser"];
+  if (!manifest["application"]["user_app"]) {
+    return "";
+  }
+
+  const { addr, cred } = readShellApiInfo();
+
+  if (!client) {
+    client = new core.ShellCore(addr, grpc.credentials.createInsecure());
   }
-  return "";
+
+  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("没有默认盒子信息");
+    });
+  });
 }

package/lib/utils.js

@@ -390,3 +390,8 @@ export class FileLocker {
     }
   }
 }
+
+export function isValidPackageName(packageName) {
+  const regex = new RegExp("^(?:[a-z][a-z0-9_]*\\.)+[a-z][a-z0-9_]*$");
+  return regex.test(packageName);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.1.12",
+  "version": "1.1.13",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "test": "tap",
@@ -29,9 +29,10 @@
   "license": "ISC",
   "dependencies": {
     "@balena/dockerignore": "^1.0.2",
+    "@grpc/grpc-js": "^1.8.12",
+    "@grpc/proto-loader": "^0.7.6",
     "@improbable-eng/grpc-web": "^0.15.0",
     "@improbable-eng/grpc-web-node-http-transport": "^0.15.0",
-    "@lazycatcloud/sdk": "^0.1.120",
     "archiver": "^5.3.0",
     "browser-headers": "^0.4.1",
     "chalk": "^4.1.2",
@@ -43,6 +44,7 @@
     "envsub": "^4.0.7",
     "execa": "^5.1.1",
     "fast-glob": "^3.2.7",
+    "fetch-cookie": "^2.1.0",
     "form-data": "^4.0.0",
     "ignore": "^5.2.0",
     "inquirer": "^8.2.0",
@@ -64,6 +66,7 @@
     "ssh2": "^1.5.0",
     "ssh2-promise": "^1.0.2",
     "tar": "^6.1.11",
+    "tough-cookie-file-store": "^2.0.3",
     "urllib": "^3.1.0",
     "yargs": "^17.5.1"
   },

package/scripts/cli.js

@@ -96,14 +96,14 @@ lpkAppCommand(program);
 lpkProjectCommand(program);
 appstoreCommand(program);
 
-const parser = program
-  .strict()
-  .showHelpOnFail(false, "使用 lzc-cli help 查看更多帮助")
-  .middleware([setLoggerLevel])
-  .parse();
-
 // 当没有参数的时候，默认显示帮助。
 (async () => {
+  const parser = program
+    .strict()
+    .showHelpOnFail(false, "使用 lzc-cli help 查看更多帮助")
+    .middleware([setLoggerLevel])
+    .parse();
+
   const argv = await parser;
   if (argv._.length == 1) {
     switch (argv._[0]) {