@lazycatcloud/lzc-cli 1.3.5 → 1.3.7

package/changelog.md

@@ -1,3 +1,13 @@
+# 1.3.7
+
+1. 修复错误的 lzc-manifest 字段读取匹配
+
+# 1.3.6
+
+1. 处理创建的应用模板 `routes` 字段命名错误问题
+2. 支持 lzc-manifest 模板语法解析
+3. 调整开发者 ssh key 授权用户提示文案
+
 # 1.3.5
 
 1. 支持自定义的公钥

package/lib/app/lpk_build.js

@@ -211,6 +211,9 @@ export class LpkBuild {
     let lpkM = new LpkManifest()
     await lpkM.init(this.manifestFilePath)
     this.manifest = lpkM.manifest
+    // manifest使用 text/template模板时，标记为异常manifest
+    // 创建lpk时，直接将源文件拷入 lpk
+    this.excpManifest = lpkM.excpManifest
 
     if (!isValidPackageName(this.manifest["package"])) {
       throw `${this.manifest["package"]} 含有非法字符，请使用正确的包名格式(java的包名格式)，如：cloud.lazycat.apps.video`
@@ -331,7 +334,12 @@ export class LpkBuild {
         )
       } else {
         logger.debug("manifest\n", manifest)
-        dumpToYaml(manifest, path.join(tempDir, "manifest.yml"))
+        // 异常的manifest，就将源文件给转到lpk内
+        if (this.excpManifest) {
+          fs.writeFileSync(path.join(tempDir, "manifest.yml"), fs.readFileSync(this.manifestFilePath, "utf8"))
+        } else {
+          dumpToYaml(manifest, path.join(tempDir, "manifest.yml"))
+        }
       }
 
       // compose.override.yml

package/lib/app/lpk_create.js

@@ -8,7 +8,8 @@ import {
   ensureDirectoryExists,
   dumpToYaml,
   isFileExist,
-  isValidAppId
+  isValidAppId,
+  fakeLoadManifestYml
 } from "../utils.js"
 import path from "node:path"
 import { TemplateConfig } from "./lpk_create_generator.js"
@@ -40,7 +41,12 @@ export class LpkManifest {
       let answer = await this.askLpkInfo()
       this.manifest = yaml.load(await envTemplateFile(manifestFilePath, answer))
     } else {
-      this.manifest = loadFromYaml(manifestFilePath)
+      try {
+        this.manifest = loadFromYaml(manifestFilePath)
+      } catch (err) {
+        this.manifest = fakeLoadManifestYml(manifestFilePath)
+        this.excpManifest = true
+      }
     }
   }
 

package/lib/debug_bridge.js

@@ -93,8 +93,8 @@ export class DebugBridge {
       ssh.status == 0
         ? resolve(ssh.stdout)
         : reject(
-            `执行命令 ${cmd} ${args.join(" ")} 出错\n${ssh.stdout ?? ""}\n${ssh.stderr ?? ""}`
-          )
+          `执行命令 ${cmd} ${args.join(" ")} 出错\n${ssh.stdout ?? ""}\n${ssh.stderr ?? ""}`
+        )
     })
   }
 
@@ -146,11 +146,11 @@ export class DebugBridge {
     const pk = Buffer.from(sshInfo.content.trimLeft()).toString("base64")
 
     logger.warn(
-      `检测到您当前没有授权，请点击下面的连接在浏览器中完成授权，才能使用当前的机器的 ssh public key 访问开发者工具.
--> https://${this.domain}/auth?key=${pk}
+      `您当前机器的公钥未添加到微服(${this.boxname})的信任列表中，请使用微服管理员账号在浏览器中访问以下地址，将您选择的公钥自动添加到信任列表中。(所有操作均只在您微服中进行，包括本开发机在内的任何数据不会泄漏到您的微服之外)
 
-如果您的 '懒猫开发者工具' 不是 0.2.0 及以上版本，请先到应用商店进行升级.
+-> https://${this.domain}/auth?key=${pk}
 `
+
     )
     throw "请在授权完成后重试!"
   }
@@ -267,10 +267,10 @@ export class DebugBridge {
       buildStream.on("close", (code) => {
         code == 0
           ? resolve(
-              compareVersions("0.1.12", backendVersion) >= 0
-                ? `127.0.0.1:5000/${tag}`
-                : `dev.${this.boxname}.heiyu.space/${tag}`
-            )
+            compareVersions("0.1.12", backendVersion) >= 0
+              ? `127.0.0.1:5000/${tag}`
+              : `dev.${this.boxname}.heiyu.space/${tag}`
+          )
           : reject(`在盒子中构建 image 失败`)
       })
     }).finally(() => {

package/lib/utils.js

@@ -170,6 +170,29 @@ export function loadFromYaml(file) {
   return yaml.load(fs.readFileSync(file, "utf8"))
 }
 
+// lzc-manifest.yml 要支持模板，目前无法直接用yaml库解释，手动读出必要字段
+export function fakeLoadManifestYml(file) {
+  const res = fs.readFileSync(file, "utf8")
+  let obj = {
+    application: {
+      subdomain: undefined,
+    },
+  }
+  res.split("\n").forEach(v => {
+    let line = v.trim().replace(" ", "")
+    if (!obj.package && line.includes("package:") && line.split(":").length == 2) {
+      obj.package = line.split(":")[1]
+    }
+    if (!obj.application.subdomain && line.includes("subdomain:") && line.split(":").length == 2) {
+      obj.application.subdomain = line.split(":")[1]
+    }
+    if (!obj.version && line.includes("version:") && line.split(":").length == 2) {
+      obj.version = line.split(":")[1]
+    }
+  })
+  return obj
+}
+
 export function dumpToYaml(template, target) {
   fs.writeFileSync(
     target,
@@ -323,18 +346,18 @@ export async function md5File(filepath) {
 }
 
 export class Downloader {
-  constructor() {}
+  constructor() { }
 
   showDownloadingProgress(received, total) {
     let percentage = ((received * 100) / total).toFixed(2)
     process.stdout.write("\r")
     process.stdout.write(
       percentage +
-        "% | " +
-        received +
-        " bytes downloaded out of " +
-        total +
-        " bytes."
+      "% | " +
+      received +
+      " bytes downloaded out of " +
+      total +
+      " bytes."
     )
   }
 
@@ -464,7 +487,7 @@ export function isTraceMode() {
 // 会直接报错，连版本检测都到不了(包导入的太前面了)
 async function __resolveDomain(domain, ipv6 = false) {
   return new Promise((resolve, reject) => {
-    const callback = function (err, addresses) {
+    const callback = function(err, addresses) {
       if (addresses && addresses.length > 0) {
         resolve(addresses[0])
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "prepublishOnly": "node check-changelog.js"

package/template/_lpk/vue.lzc-build.yml.in

@@ -22,11 +22,11 @@ icon: ./lazycat.png
 # deploy_params: ./lzc-deploy-params.yml
 
 # devshell 自定义应用的开发容器环境
-# - routers 指定应用容器的访问路由
+# - routes 指定应用容器的访问路由
 
 # devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:v0.0.5
 # devshell:
-#   routers:
+#   routes:
 #     - /=http://127.0.0.1:8080
 
 # devshell 指定 image 的情况

package/template/blank/lzc-build.yml

@@ -18,11 +18,11 @@ pkgout: ./
 # icon 仅仅允许 png 后缀的文件
 icon: ./lzc-icon.png
 # devshell 自定义应用的开发容器环境
-# - routers 指定应用容器的访问路由
+# - routes 指定应用容器的访问路由
 
 # devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:v0.0.5
 # devshell:
-#   routers:
+#   routes:
 #     - /=http://127.0.0.1:8080
 
 # devshell 指定 image 的情况

package/template/vue/lzc-build.yml

@@ -19,11 +19,11 @@ pkgout: ./
 icon: ./lzc-icon.png
 
 # devshell 自定义应用的开发容器环境
-# - routers 指定应用容器的访问路由
+# - routes 指定应用容器的访问路由
 
 # devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:v0.0.5
 # devshell:
-#   routers:
+#   routes:
 #     - /=http://127.0.0.1:8080
 
 # devshell 指定 image 的情况