@lazycatcloud/lzc-cli 1.2.16 → 1.2.18

package/lib/app/lpk_build.js

@@ -9,6 +9,7 @@ import {
   envTemplateFile,
   isValidPackageName,
   tarContentDir,
+  isPngWithFile,
 } from "../utils.js";
 import { spawnSync } from "child_process";
 import { LpkManifest } from "./lpk_create.js";
@@ -63,6 +64,13 @@ async function fetchIconTo(options, cwd, destDir) {
     return;
   }
 
+  if (!isPngWithFile(iconPath)) {
+    logger.warn(`图标icon ${iconPath} 验证失败(不是一个png格式)`);
+    return;
+  } else {
+    logger.debug(`图标icon ${iconPath} 验证成功(png格式)`);
+  }
+
   fs.copyFileSync(iconPath, path.join(destDir, "icon.png"));
   return;
 }
@@ -70,27 +78,29 @@ 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/;
+
+  let output = "";
   if (isMacos) {
-    const result = spawnSync("sh", [
-      "-c",
-      "ifconfig | awk '/inet /&&!/127.0.0.1/{print $2;exit}'",
-    ]);
-    if (result.error) {
+    const result = spawnSync("sh", ["-c", "ifconfig", "heiyu-0"], {
+      encoding: "utf-8",
+    });
+    if (result.status != 0 || result.error) {
       logger.debug("macos get current ip is error", result.error);
       return "";
-    } else {
-      const ip = result.stdout.toString().trim();
-      return ip;
     }
+    output = result.stdout;
+  } else {
+    const result = spawnSync("ip", ["addr", "show", "heiyu-0"], {
+      encoding: "utf-8",
+    });
+    if (result.status !== 0 || result.error) {
+      logger.debug("run ip addr show heiyu-0 failed", result.error);
+      return "";
+    }
+    output = result.stdout;
   }
-  const output = spawnSync("ip", ["route", "get", "1.1.1.1"], {
-    encoding: "utf-8",
-  });
-  if (output.status !== 0) {
-    logger.debug("run ip route error", output.status, output.stderr);
-    return "";
-  }
-  const match = output.stdout.match(/src\ (.+)\ uid/i);
+  const match = output.match(regex);
   if (match) {
     return match[1];
   } else {

package/lib/app/lpk_debug_bridge.js

@@ -90,7 +90,7 @@ export class DebugBridge {
     return this.common(this.sshCmd, [`uninstall --uid ${this.uid}`, appId]);
   }
 
-  async devshell(appId, isUserApp) {
+  async devshell(appId, isUserApp, onconnect = null) {
     const stream = spawn(
       this.sshCmd,
       [
@@ -110,6 +110,9 @@ export class DebugBridge {
       stream.on("close", (code) => {
         code == 0 ? resolve() : reject();
       });
+      if (onconnect) {
+        stream.on("spawn", onconnect);
+      }
     });
   }
 

package/lib/app/lpk_devshell.js

@@ -217,7 +217,7 @@ export class AppDevShell {
 
       // 添加 devshell 必要路由
       routes.push(
-        "/__debug.bridge=exec://22222,/lzcapp/pkg/content/devshell/init_debug_bridge.sh"
+        "/__debug.bridge=exec://80,/lzcapp/pkg/content/devshell/init_debug_bridge.sh"
       );
       routes.push("/__isdevshell=file:///lzcapp/pkg/devshell");
 
@@ -244,14 +244,17 @@ export class AppDevShell {
     });
 
     // 在生成 manifest.yml 之前合并 lzc-build.yml devshell 字段的值
-    // 并加上 health_check 字段
+    // 并加上 health_check 字段, 当处于 devshell 的情况时，禁用 health_check
+    // 避免应用永远处于 unhealth 导致状态卡在 starting
     this.lpkBuild.onBeforeDumpYaml(async (manifest, options) => {
       logger.debug("merge lzc-build.yml devshell services\n", options);
+      const userapp = this.isUserApp ? shellApi.uid + "." : "";
       const devshell = {
         application: {
           devshell: options["devshell"],
           health_check: {
-            test_url: `http://app.${manifest["package"]}.lzcapp/__isdevshell`,
+            test_url: `http://${userapp}app.${manifest["package"]}.lzcapp/__isdevshell`,
+            disable: true,
           },
         },
       };
@@ -497,26 +500,26 @@ class DevShell {
         "all",
         debounce(() => {
           this.syncProject(appId);
-        }),
-        1000
+        }, 1000)
       );
   }
+
   async shell() {
     try {
-      // 当进入shell的时候，都同步一次
-      await this.syncProject(this.appId);
-      // 注册watch函数
+      // 监听文件
       await this.watchFile(this.appId);
-
-      await this.connectShell();
+      await this.connectShell(async () => {
+        // 在连接成功的时候，同步一次文件
+        await this.syncProject(this.appId);
+      });
     } catch (e) {
       console.log(e);
       return Promise.reject(e);
     }
   }
 
-  async connectShell() {
+  async connectShell(onconnect = null) {
     const bridge = new DebugBridge();
-    await bridge.devshell(this.appId, this.isUserApp);
+    await bridge.devshell(this.appId, this.isUserApp, onconnect);
   }
 }

package/lib/appstore/publish.js

@@ -5,7 +5,7 @@ import fs from "node:fs";
 import inquirer from "inquirer";
 import { spawnSync } from "node:child_process";
 import path from "node:path";
-import { isFileExist } from "../utils.js";
+import { isFileExist, isPngWithFile } from "../utils.js";
 
 async function askChangeLog() {
   const noEmpty = (value) => value != "";
@@ -24,16 +24,40 @@ export class Publish {
     this.baseUrl = baseUrl;
   }
 
-  async publish(pkgPath, changelog) {
+  /**
+   * @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"))) {
-        throw "不能发布一个devshell的版本，请重新使用 `lzc-cli project build` 构建";
+        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 });
     }
+  }
+
+  /**
+   * @param {string} pkgPath 
+   * @param {string} changelog 
+   */
+  async publish(pkgPath, changelog) {
+    if (!this.preCheck(pkgPath)) return
 
     await autoLogin();
 
@@ -41,27 +65,43 @@ export class Publish {
       const answer = await askChangeLog();
       changelog = answer.changelog;
     }
+    changelog = changelog.trim() // clean space ^:)
 
     logger.info("正在提交审核...");
     const form = new FormData();
     form.append("file", fs.createReadStream(pkgPath));
 
-    const res = await request(this.baseUrl + "/upload_lpk", {
+    const uploadURL = this.baseUrl + "/upload_lpk"
+    logger.debug("upload url is", uploadURL)
+
+    const res = await request(uploadURL, {
       method: "POST",
       body: form,
     });
-    const lpkInfo = await res.json();
+    const text = (await res.text()).trim()
+    if (!this.isJSON(text)) {
+      logger.info("upload lpk fail", text);
+      return
+    }
+    const lpkInfo = await JSON.parse(text)
     logger.debug("upload lpk response", lpkInfo);
 
-    return request(this.baseUrl + `/apps/${lpkInfo.package}/reviews`, {
+    const sendURL = this.baseUrl + `/apps/${lpkInfo.package}/reviews`
+    logger.debug("publish url is", sendURL)
+
+    const formData = {
+      changelog,
+      iconPath: lpkInfo.iconPath,
+      pkgPath: lpkInfo.url,
+      supportPC: lpkInfo.supportPC,
+      supportMobile: lpkInfo.supportMobile,
+    }
+
+    logger.debug("form data is", formData)
+
+    return request(sendURL, {
       method: "POST",
-      body: JSON.stringify({
-        changelog,
-        iconPath: lpkInfo.iconPath,
-        pkgPath: lpkInfo.url,
-        supportPC: lpkInfo.supportPC,
-        supportMobile: lpkInfo.supportMobile,
-      }),
+      body: JSON.stringify(formData),
     }).then(async (res) => {
       if (res.status >= 400) {
         logger.error("发布应用出错，错误状态码为: ", res.status);

package/lib/shellapi.js

@@ -5,6 +5,9 @@ import path from "node:path";
 import fs from "node:fs";
 import os from "node:os";
 import logger from "loglevel";
+import fetch from "node-fetch";
+
+const bannerfileContent = `˄=ᆽ=ᐟ \\`;
 
 /**
  * @link {https://www.npmjs.com/package/appdirs}
@@ -35,6 +38,7 @@ class ShellApi {
     md.add("lzc-shellapi-cred", cred);
     this.metadata = md;
     this.info = await this.initBoxInfo();
+    this.checkDevTools();
   }
 
   get boxname() {
@@ -97,6 +101,22 @@ class ShellApi {
     throw "没有默认盒子信息, 请先使用 lzc-cli box switch 设置默认的盒子信息";
   }
 
+  async checkDevTools() {
+    const url = `https://dev.${this.info.boxname}.heiyu.space/bannerfile`;
+    fetch(url, { redirect: "error" })
+      .then(async (res) => {
+        const content = await res.text();
+        if (res.status != 200 || content != bannerfileContent) {
+          logger.warn(
+            `检测到你还没有安装懒猫微服开发者工具，请先到商店中搜索安装`
+          );
+        }
+      })
+      .catch(() => {
+        logger.warn(`你的懒猫微服开发者工具版本较低，请从商店中更新`);
+      });
+  }
+
   async setDefaultBox(boxname) {
     const boxes = await this.boxList();
     const box = boxes.find((b) => b.box_name === boxname);

package/lib/utils.js

@@ -341,3 +341,29 @@ 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 
+ * @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;
+}
+
+export function isPngWithFile(filepath) {
+  if (!isFileExist(filepath)) return false
+  const buf = fs.readFileSync(filepath)
+  return isPngWithBuffer(buf)
+}

package/package.json

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