@lazycatcloud/lzc-cli 1.2.20 → 1.2.22

package/lib/app/lpk_build.js

@@ -78,7 +78,7 @@ async function fetchIconTo(options, cwd, destDir) {
 // 提供一些方便的环境变量，可以在 lzc-build.yml 中直接使用
 // - LocalIP 本地局域网ip
 function localIp() {
-  const regex = /inet6 (fc03:1136:[0-9a-fA-F:]+)\/\d+ scope global/;
+  const regex = /inet6 (fc03:1136:[0-9a-fA-F:]+)[?:\/ ]/;
 
   let output = "";
   if (isMacos) {

package/lib/app/lpk_debug_bridge.js

@@ -2,22 +2,27 @@ import { spawn, spawnSync } from "child_process";
 import fs from "node:fs";
 import shellApi from "../shellapi.js";
 import inquirer from "inquirer";
+import { isDebugMode } from "../utils.js";
 
 export class DebugBridge {
   constructor() {
     this.uid = shellApi.uid;
     this.boxname = shellApi.boxname;
-    this.sshCmd = `ssh -p 22222 box@dev.${this.boxname}.heiyu.space`;
+    this.sshCmd = `ssh ${isDebugMode() ? "-vv" : ""} -p 22222 box@dev.${
+      this.boxname
+    }.heiyu.space`;
   }
 
   common(cmd, args) {
     const ssh = spawnSync(cmd, args, {
       shell: true,
       encoding: "utf-8",
-      stdio: "pipe",
+      stdio: ["pipe", "pipe", "inherit"],
     });
     return new Promise((resolve, reject) => {
-      ssh.status == 0 ? resolve(ssh.stdout) : reject(ssh.stderr);
+      ssh.status == 0
+        ? resolve(ssh.stdout)
+        : reject(`执行命令 ${cmd} ${args.join(" ")} 出错\n${ssh.stderr ?? ""}`);
     });
   }
 

package/lib/app/lpk_devshell.js

@@ -17,6 +17,7 @@ import {
   FileLocker,
   isUserApp,
   createTemplateFileCommon,
+  isDebugMode,
 } from "../utils.js";
 import os from "node:os";
 import commandExists from "command-exists";
@@ -418,7 +419,7 @@ class DevShell {
       "-o", `"UserKnownHostsFile=/dev/null"`,
       "-o", `"ConnectionAttempts=3"`,
       "-o", `"ConnectTimeout=30"`,
-      "-o", `"LogLevel=ERROR"`,
+      "-o", `${isDebugMode() ? '"LogLevel=DEBUG"' :'"LogLevel=ERROR"'}`,
     ].join(" ");
     // 检查rsync工具是否存在:提示用户
     const rsyncExisted = commandExists.sync("rsync");
@@ -427,14 +428,14 @@ class DevShell {
       process.exit(1);
     }
 
-    const rsyncDebug = process.env.RSYNCDEBUG ? "-P" : "";
+    const rsyncDebug = isDebugMode() ? "-P" : "";
     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 . ${dest}`,
+        `rsync ${rsyncDebug} --rsh='${rsh}' --recursive --relative --perms --update -F --filter=':- .gitignore' --ignore-errors . ${dest}`,
         { stdio: ["ignore", "inherit", "inherit"] }
       );
     } catch (err) {

package/lib/app/lpk_devshell_docker.js

@@ -10,7 +10,7 @@ export async function collectContextFromDockerFile(contextDir, dockerfilePath) {
     throw "未发现 Dockerfile";
   }
 
-  let src = [path.relative(contextDir, dockerfilePath)];
+  let src = [];
 
   // 通过 COPY 和 ADD 获取所有context中的文件
   const ast = DockerfileParser.parse(fs.readFileSync(dockerfilePath, "utf8"));
@@ -47,9 +47,8 @@ export async function collectContextFromDockerFile(contextDir, dockerfilePath) {
     src = ig.filter(src);
   }
 
-  return await tarContentDir(
-    src,
-    path.join(contextDir, "lzc-build-image-context.tar"),
-    contextDir
-  );
+  const dockerfile = path.relative(contextDir, dockerfilePath);
+  src.push(dockerfile); // DON'T IGNORE DOCKERFILE
+  const output = path.join(contextDir, "lzc-build-image-context.tar");
+  return await tarContentDir(src, output, contextDir);
 }

package/lib/appstore/index.js

@@ -1,4 +1,5 @@
 import { Publish } from "./publish.js";
+import { PrePublish } from "./prePublish.js";
 import { reLogin } from "./login.js";
 import fs from "node:fs";
 
@@ -11,6 +12,34 @@ export function appstoreCommand(program) {
         await reLogin();
       },
     },
+    {
+      command: "pre-publish <pkgPath>",
+      desc: "发布到内测",
+      builder: (args) => {
+        args.option("c", {
+          alias: "changelog",
+          describe: "更改日志",
+          type: "string",
+        });
+        args.option("F", {
+          alias: "file",
+          describe: "更改日志文件",
+          type: "string",
+        });
+        args.option("G", {
+          alias: "gid",
+          describe: "内测组ID",
+          type: "string",
+        });
+      },
+      handler: async ({ pkgPath, changelog, file, gid }) => {
+        const p = new PrePublish();
+        if (!changelog && file) {
+          changelog = fs.readFileSync(file, "utf8");
+        }
+        await p.publish(pkgPath, changelog, gid);
+      },
+    },
     {
       command: "publish <pkgPath>",
       desc: "发布到商店",

package/lib/appstore/prePublish.js

@@ -0,0 +1,145 @@
+import { request, autoLogin } from "./login.js";
+import logger from "loglevel";
+import FormData from "form-data";
+import fs from "node:fs";
+import inquirer from "inquirer";
+import { spawnSync } from "node:child_process";
+import path from "node:path";
+import { isFileExist, isPngWithFile } from "../utils.js";
+import env from "../env.js";
+
+async function askChangeLog() {
+  const noEmpty = (value) => value != "";
+  return await inquirer.prompt([
+    {
+      name: "changelog",
+      type: "editor",
+      message: "填写 changelog 内容",
+      validate: noEmpty,
+    },
+  ]);
+}
+
+async function askGroup(choices) {
+  return (
+    await inquirer.prompt([
+      {
+        name: "type",
+        message: "选择内测组",
+        type: "list",
+        choices,
+      },
+    ])
+  )["type"];
+}
+
+export class PrePublish {
+  constructor(baseUrl = "https://testflight.lazycat.cloud/api") {
+    this.baseUrl = baseUrl;
+  }
+
+  /**
+   * @param {string} raw
+   */
+  isJSON(raw) {
+    const ml = raw.length;
+    if (ml <= 1) return false;
+    return raw[0] == "{" && raw[ml - 1] == "}";
+  }
+
+  preCheck(pkgPath) {
+    const tempDir = fs.mkdtempSync(".lzc-cli-publish");
+    try {
+      spawnSync("unzip", ["-d", tempDir, pkgPath]);
+      if (isFileExist(path.join(tempDir, "devshell"))) {
+        logger.error(
+          "不能发布一个devshell的版本，请重新使用 `lzc-cli project build` 构建"
+        );
+        return false;
+      }
+      const tempIcon = path.join(tempDir, "icon.png");
+      if (!isFileExist(tempIcon) || !isPngWithFile(tempIcon)) {
+        logger.error("icon 必须是 png 格式");
+        return false;
+      }
+      return true;
+    } finally {
+      fs.rmSync(tempDir, { recursive: true });
+    }
+  }
+
+  async getDict() {
+    const url = this.baseUrl + "/groups/dict";
+    const token = env.get("token");
+    const res = await request(url, {
+      method: "GET",
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+    });
+    const text = (await res.text()).trim();
+    if (!this.isJSON(text)) {
+      logger.error(`parse error: dict resp text not is json`);
+      return;
+    }
+    const respJson = await JSON.parse(text);
+    return respJson.data || [];
+  }
+
+  async upload(groupId, changelog, pkgPath) {
+    const form = new FormData();
+    form.append("type", "Lpk");
+    form.append("changelog", changelog);
+    form.append("file", fs.createReadStream(pkgPath));
+
+    const url = this.baseUrl + `/group/${groupId}/upload`;
+    const token = env.get("token");
+    const res = await request(url, {
+      method: "POST",
+      body: form,
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+    });
+    const text = (await res.text()).trim();
+    if (!this.isJSON(text)) {
+      logger.error(`parse error: upload resp text not is json`);
+      return;
+    }
+    const respJson = await JSON.parse(text);
+    logger.debug("upload lpk response", respJson);
+    return respJson;
+  }
+
+  /**
+   * @param {string} pkgPath
+   * @param {string} changelog
+   */
+  async publish(pkgPath, changelog, gid) {
+    if (!this.preCheck(pkgPath)) return;
+
+    await autoLogin();
+
+    if (!gid) {
+      const groups = await this.getDict();
+      const groupName = await askGroup(groups.map((it) => it.name));
+      gid = groups.find((it) => it.name == groupName)?.id;
+    }
+    if (!gid) {
+      logger.error("请选择内测组");
+      return;
+    }
+    if (!changelog) {
+      const answer = await askChangeLog();
+      changelog = answer.changelog;
+    }
+    changelog = changelog.trim(); // clean space ^:)
+    logger.info("正在提交内测...");
+    const resp = await this.upload(gid, changelog, pkgPath);
+    if (resp.success) {
+      logger.info("应用提交成功! 请在内测工具中查看");
+    } else {
+      logger.error(`应用提交失败: ${resp.msg}`);
+    }
+  }
+}

package/lib/appstore/publish.js

@@ -25,12 +25,12 @@ export class Publish {
   }
 
   /**
-   * @param {string} raw 
+   * @param {string} raw
    */
   isJSON(raw) {
-    const ml = raw.length
-    if (ml <= 1) return false
-    return raw[0] == '{' && raw[ml - 1] == '}'
+    const ml = raw.length;
+    if (ml <= 1) return false;
+    return raw[0] == "{" && raw[ml - 1] == "}";
   }
 
   preCheck(pkgPath) {
@@ -38,26 +38,28 @@ export class Publish {
     try {
       spawnSync("unzip", ["-d", tempDir, pkgPath]);
       if (isFileExist(path.join(tempDir, "devshell"))) {
-        logger.error("不能发布一个devshell的版本，请重新使用 `lzc-cli project build` 构建")
-        return false
+        logger.error(
+          "不能发布一个devshell的版本，请重新使用 `lzc-cli project build` 构建"
+        );
+        return false;
       }
-      const tempIcon = path.join(tempDir, "icon.png")
+      const tempIcon = path.join(tempDir, "icon.png");
       if (!isFileExist(tempIcon) || !isPngWithFile(tempIcon)) {
-        logger.error("icon 必须是 png 格式")
-        return false
+        logger.error("icon 必须是 png 格式");
+        return false;
       }
-      return true
+      return true;
     } finally {
       fs.rmSync(tempDir, { recursive: true });
     }
   }
 
   /**
-   * @param {string} pkgPath 
-   * @param {string} changelog 
+   * @param {string} pkgPath
+   * @param {string} changelog
    */
   async publish(pkgPath, changelog) {
-    if (!this.preCheck(pkgPath)) return
+    if (!this.preCheck(pkgPath)) return;
 
     await autoLogin();
 
@@ -65,39 +67,40 @@ export class Publish {
       const answer = await askChangeLog();
       changelog = answer.changelog;
     }
-    changelog = changelog.trim() // clean space ^:)
+    changelog = changelog.trim(); // clean space ^:)
 
     logger.info("正在提交审核...");
     const form = new FormData();
     form.append("file", fs.createReadStream(pkgPath));
 
-    const uploadURL = this.baseUrl + "/upload_lpk"
-    logger.debug("upload url is", uploadURL)
+    const uploadURL = this.baseUrl + "/upload_lpk";
+    logger.debug("upload url is", uploadURL);
 
     const res = await request(uploadURL, {
       method: "POST",
       body: form,
     });
-    const text = (await res.text()).trim()
+    const text = (await res.text()).trim();
     if (!this.isJSON(text)) {
       logger.info("upload lpk fail", text);
-      return
+      return;
     }
-    const lpkInfo = await JSON.parse(text)
+    const lpkInfo = await JSON.parse(text);
     logger.debug("upload lpk response", lpkInfo);
 
-    const sendURL = this.baseUrl + `/apps/${lpkInfo.package}/reviews`
-    logger.debug("publish url is", sendURL)
+    const sendURL = this.baseUrl + `/apps/${lpkInfo.package}/reviews`;
+    logger.debug("publish url is", sendURL);
 
     const formData = {
       changelog,
+      name: lpkInfo.name,
       iconPath: lpkInfo.iconPath,
       pkgPath: lpkInfo.url,
       supportPC: lpkInfo.supportPC,
       supportMobile: lpkInfo.supportMobile,
-    }
+    };
 
-    logger.debug("form data is", formData)
+    logger.debug("form data is", formData);
 
     return request(sendURL, {
       method: "POST",

package/lib/shellapi.js

@@ -113,7 +113,7 @@ class ShellApi {
         }
       })
       .catch(() => {
-        logger.warn(`你的懒猫微服开发者工具版本较低，请从商店中更新`);
+        logger.debug(`你的懒猫微服开发者工具版本较低，请从商店中更新`);
       });
   }
 

package/lib/utils.js

@@ -345,25 +345,31 @@ export async function tarContentDir(from, to, cwd = "./") {
 /**
  * check buffer is png(magic header)
  * refer: https://github.com/sindresorhus/is-png/blob/main/index.js
- * @param {Buffer} buffer 
+ * @param {Buffer} buffer
  * @returns {boolean}
  */
 function isPngWithBuffer(buffer) {
-	if (!buffer || buffer.length < 8) {
-		return false;
-	}
-	return buffer[0] === 0x89
-		&& buffer[1] === 0x50
-		&& buffer[2] === 0x4E
-		&& buffer[3] === 0x47
-		&& buffer[4] === 0x0D
-		&& buffer[5] === 0x0A
-		&& buffer[6] === 0x1A
-		&& buffer[7] === 0x0A;
+  if (!buffer || buffer.length < 8) {
+    return false;
+  }
+  return (
+    buffer[0] === 0x89 &&
+    buffer[1] === 0x50 &&
+    buffer[2] === 0x4e &&
+    buffer[3] === 0x47 &&
+    buffer[4] === 0x0d &&
+    buffer[5] === 0x0a &&
+    buffer[6] === 0x1a &&
+    buffer[7] === 0x0a
+  );
 }
 
 export function isPngWithFile(filepath) {
-  if (!isFileExist(filepath)) return false
-  const buf = fs.readFileSync(filepath)
-  return isPngWithBuffer(buf)
-}
+  if (!isFileExist(filepath)) return false;
+  const buf = fs.readFileSync(filepath);
+  return isPngWithBuffer(buf);
+}
+
+export function isDebugMode() {
+  return logger.getLevel() <= logger.levels.DEBUG;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.20",
+  "version": "1.2.22",
   "description": "lazycat cloud developer kit",
   "files": [
     "template",