@lazycatcloud/lzc-cli 1.3.3 → 1.3.5

package/changelog.md

@@ -1,3 +1,11 @@
+# 1.3.5
+
+1. 支持自定义的公钥
+
+# 1.3.4
+
+1. 添加算力舱和浏览器插件打包
+
 # 1.3.3
 
 1. 拷贝镜像过程中显示进度

package/lib/app/lpk_build.js

@@ -4,6 +4,7 @@ import logger from "loglevel"
 import {
   loadFromYaml,
   isDirExist,
+  isDirSync,
   isFileExist,
   dumpToYaml,
   envTemplateFile,
@@ -255,6 +256,8 @@ export class LpkBuild {
 
     const tempDir = fs.mkdtempSync(".lzc-cli-build")
     let contentdir = this.options["contentdir"]
+    let browserExtension = this.options["browser-extension"]
+    let aiPodService = this.options["ai-pod-service"]
     try {
       if (contentdir) {
         contentdir = path.resolve(this.pwd, contentdir)
@@ -283,6 +286,32 @@ export class LpkBuild {
         fs.rmSync(contentdir, { recursive: true })
       }
 
+      if (browserExtension) {
+        browserExtension = path.resolve(this.pwd, browserExtension)
+
+        if (isDirSync(browserExtension)) {
+          // 开始打包 browserExtensionDir，这里打包成 zip 包
+          await archiveFolderTo(
+            browserExtension,
+            path.join(tempDir, "extension.zip")
+          )
+        } else if (isFileExist(browserExtension)) {
+          fs.copyFileSync(browserExtension, path.join(tempDir, "extension.zip"))
+        } else {
+          throw `${browserExtension} 不存在`
+        }
+      }
+
+      if (aiPodService) {
+        aiPodService = path.resolve(this.pwd, aiPodService)
+        if (!isDirExist(aiPodService)) {
+          throw `${aiPodService} 不存在`
+        }
+        fs.cpSync(aiPodService, path.join(tempDir, "ai-pod-service"), {
+          recursive: true
+        })
+      }
+
       // 开始生成 manifest.yml
       let manifest = await this.getManifest()
       if (process.env.LZC_VERSION) {
@@ -306,8 +335,11 @@ export class LpkBuild {
       }
 
       // compose.override.yml
-      if (this.options['compose_override']) {
-        dumpToYaml(this.options['compose_override'], path.join(tempDir, "compose.override.yml"))
+      if (this.options["compose_override"]) {
+        dumpToYaml(
+          this.options["compose_override"],
+          path.join(tempDir, "compose.override.yml")
+        )
       }
 
       // 打包 lpk

package/lib/utils.js

@@ -579,22 +579,12 @@ export function findSshPublicKey() {
     throw error
   }
 
-  // 定义公钥优先级列表
-  const priorityKeys = [
-    "id_ed25519.pub",
-    "id_rsa.pub",
-    "id_ecdsa.pub",
-    "id_dsa.pub"
-  ]
-
   let avaiableKeys = []
   try {
     // 获取 .ssh 目录下所有文件
     const files = fs.readdirSync(sshDir)
-
-    // 首先检查优先级列表中的公钥
-    for (const keyName of priorityKeys) {
-      if (files.includes(keyName)) {
+    files.forEach((keyName) => {
+      if (keyName.endsWith(".pub")) {
         const keyPath = path.join(sshDir, keyName)
         // 验证文件是否可读
         try {
@@ -605,10 +595,9 @@ export function findSshPublicKey() {
           })
         } catch (error) {
           console.warn(`Found ${keyName} but cannot read it:`, error.message)
-          continue
         }
       }
-    }
+    })
 
     if (avaiableKeys.length == 0) {
       throw new Error(

package/package.json

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

package/template/_lpk/manifest.yml.in

@@ -1,5 +1,3 @@
-lzc-sdk-version: 0.1
-
 name: ${name} # app名称
 package: ${package} # app的唯一标识符
 version: 0.0.1 # app的版本

package/template/blank/lzc-manifest.yml

@@ -1,4 +1,3 @@
-lzc-sdk-version: 0.1
 name: helloworld
 package: cloud.lazycat.app.helloworld
 version: 0.0.1