@lazycatcloud/lzc-cli 1.2.4 → 1.2.6

package/README.md

@@ -5,6 +5,7 @@
 1. `ssh`
 2. `ssh-copy-id`
 3. `rsync`
+4. 盒子中安装开发者工具应用
 
 #### 快速上手
 
@@ -37,11 +38,3 @@ lzc-cli appstore publish
 #### 1. 开发者工具 ssh 的帐号密码是多少？
 
 现在帐号密码设置为 box:box，后面会使用 pam 模块对接盒子帐号体系。
-
-#### 2. 如何切换默认的开发的盒子?
-
-目前不支持通过 lzc-cli 工具切换默认的盒子，所以你需要在 lzc-client-desktop 客户端上点击你要使用的盒子来切换。
-
-#### 3. 如果在盒子中构建镜像? 不想在本地构建
-
-现在已经把在盒子中构建镜像的功能去掉了，只能在本地或者其他地方构建好，然后指定 image 字段来选择你需要的开发环境。

package/lib/app/lpk_debug_bridge.js

@@ -21,16 +21,20 @@ export class DebugBridge {
     });
   }
 
-  async install(lpkPath) {
+  async install(lpkPath, pkgId) {
     if (!(await this.canPublicKey())) {
       await this.sshCopyId();
     }
 
     const stream = fs.createReadStream(lpkPath);
-    const ssh = spawn(this.sshCmd, [`install --uid ${this.uid}`], {
-      shell: true,
-      stdio: ["pipe", "inherit", "inherit"],
-    });
+    const ssh = spawn(
+      this.sshCmd,
+      [`install --uid ${this.uid} --pkgId ${pkgId}`],
+      {
+        shell: true,
+        stdio: ["pipe", "inherit", "inherit"],
+      }
+    );
     stream.pipe(ssh.stdin);
     return new Promise((resolve, reject) => {
       ssh.on("close", (code) => {
@@ -110,7 +114,7 @@ export class DebugBridge {
   }
 
   async buildImage(label, contextTar) {
-    const tag = `dev.${this.boxname}.heiyu.space:5000/debug.bridge/${label}`;
+    const tag = `debug.bridge/${label}`;
     const stream = fs.createReadStream(contextTar);
     const ssh = spawn(this.sshCmd, [`build --tag ${tag}`], {
       shell: true,
@@ -119,7 +123,9 @@ export class DebugBridge {
     stream.pipe(ssh.stdin);
     return new Promise((resolve, reject) => {
       ssh.on("close", (code) => {
-        code == 0 ? resolve(tag) : reject("在盒子中构建 image 失败");
+        code == 0
+          ? resolve(`dev.${this.boxname}.heiyu.space/${tag}`)
+          : reject("在盒子中构建 image 失败");
       });
     }).finally(() => {
       fs.rmSync(contextTar);

package/lib/app/lpk_devshell_docker.js

@@ -50,6 +50,6 @@ export async function collectContextFromDockerFile(contextDir, dockerfilePath) {
   return await tarContentDir(
     src,
     path.join(contextDir, "lzc-build-image-context.tar"),
-    process.cwd()
+    contextDir
   );
 }

package/lib/app/lpk_installer.js

@@ -38,7 +38,7 @@ export class LpkInstaller {
     let pkgPath = await builder.exec();
     logger.info("开始部署应用");
     const bridge = new DebugBridge();
-    await bridge.install(pkgPath);
+    await bridge.install(pkgPath, manifest["package"]);
     const appUrl = `https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`;
     logger.info(`👉 请在浏览器中访问 ${appUrl}`);
   }
@@ -98,7 +98,7 @@ export class LpkInstaller {
 
     const bridge = new DebugBridge();
     logger.info("开始安装应用");
-    await bridge.install(pkgPath);
+    await bridge.install(pkgPath, manifest["package"]);
     logger.info(`安装成功！`);
     logger.info(
       `👉 请在浏览器中访问 https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`

package/lib/appstore/index.js

@@ -1,5 +1,6 @@
 import { Publish } from "./publish.js";
 import { reLogin } from "./login.js";
+import fs from "node:fs";
 
 export function appstoreCommand(program) {
   let subCommands = [
@@ -19,9 +20,17 @@ export function appstoreCommand(program) {
           describe: "更改日志",
           type: "string",
         });
+        args.option("F", {
+          alias: "file",
+          describe: "更改日志文件",
+          type: "string",
+        });
       },
-      handler: async ({ pkgPath, changelog }) => {
+      handler: async ({ pkgPath, changelog, file }) => {
         const p = new Publish();
+        if (!changelog && file) {
+          changelog = fs.readFileSync(file, "utf8");
+        }
         await p.publish(pkgPath, changelog);
       },
     },

package/lib/appstore/publish.js

@@ -61,7 +61,8 @@ export class Publish {
         pkgPath: lpkInfo.url,
       }),
     }).then(async (res) => {
-      if (res.status != 201) {
+      if (res.status >= 400) {
+        logger.error("发布应用出错，错误状态码为: ", res.status);
         logger.error(await res.text());
         return;
       }

package/lib/shellapi.proto

@@ -143,9 +143,9 @@ message BoxSetting {
   optional bool enabled = 3;
 
   message AuthInfo {
-    string user = 3;
-    string password = 4;
-    optional string password_hash = 5;
+    string user = 1;
+    string password = 2;
+    optional string password_hash = 3;
   }
   optional AuthInfo auth = 4;
 
@@ -227,27 +227,31 @@ message BoxInfo {
 
   string box_home_url = 3;
 
-  string box_domain = 14;
+  string box_domain = 4;
 
-  string box_virtual_ip = 10;
+  string box_virtual_ip = 5;
 
-  BoxStatus status = 4;
+  BoxStatus status = 6;
 
-  string status_reason = 5;
-  optional FailedStatus failed_status = 6;
+  string status_reason = 7;
+  optional FailedStatus failed_status = 8;
 
-  string login_user = 7;
-  bool is_admin_login = 8;
-
-  string auth_token = 9;
+  string login_user = 9;
+  bool is_admin_login = 10;
 
   // 此盒子属于当前客户端的默认盒子
-  bool is_default_box = 15;
+  bool is_default_box = 11;
+
+  // 底层网络的连接类型，如果是Relay/BLE这类则客户端一般需要进行提示并且限制访问流量要求大的应用
+  LowNetworkConnType conn_type = 12;
+}
 
-  // 与此盒子的底层网络是否连通
-  bool low_network_connected = 16;
-  // 与此盒子的底层网络连通是通过中转的低速网络
-  bool is_relay_connection = 13;
+enum LowNetworkConnType {
+  NOT_CONNECTED = 0; //未建立连接
+  BLE = 100;  //通过蓝牙建立的慢速连接
+  RELAY = 200; //通过中继建立的慢速连接
+  NORMAL = 300; //正常连接，可能是通过多层或一层局域网也可能是互联网等方式建立的连接
+  DIRECT = 400; //通过局域网等高速通道建立的连接
 }
 
 message BoxList {
@@ -275,12 +279,6 @@ message ShellCoreInfo {
 
   string device_os = 9;
 
-  // // 设备 DNS 服务器地址
-  // string dns_ip = 10;
-
-  // // 内存占用
-  // int32 memory_usage = 11;
-
   // 额外的调试信息
   map<string, string> debug_extras = 101;
 }

package/package.json

@@ -1,17 +1,7 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "lazycat cloud developer kit",
-  "scripts": {
-    "test": "tap",
-    "snap": "tap"
-  },
-  "tap": {
-    "node-arg": [
-      "--loader=esmock",
-      "--experimental-vm-modules"
-    ]
-  },
   "files": [
     "template",
     "scripts",
@@ -52,9 +42,7 @@
   },
   "devDependencies": {
     "@types/command-exists": "^1.2.0",
-    "esmock": "^2.0.0",
-    "prettier": "^2.5.0",
-    "tap": "^16.3.0"
+    "prettier": "^2.5.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",