@lazycatcloud/lzc-cli 1.3.2 → 1.3.4

package/changelog.md

@@ -1,3 +1,12 @@
+# 1.3.4
+
+1. 添加算力舱和浏览器插件打包
+
+# 1.3.3
+
+1. 拷贝镜像过程中显示进度
+2. 支持查看已经拷贝的镜像记录
+
 # 1.3.2
 
 1. 增加用户友好的上传 LPK 错误提示

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/appstore/index.js

@@ -71,33 +71,108 @@ export function appstoreCommand(program) {
       command: "copy-image <imageName>",
       desc: "复制镜像至懒猫微服官方源",
       handler: async ({ imageName }) => {
-        const baseUrl = `${appStoreServerUrl}/api/v3/developer`
+        const uploadUrl = `${appStoreServerUrl}/api/v3/developer/app/docker/image/push/v3/copy?image=${imageName}`
+        const progressUrl = `${appStoreServerUrl}/api/v3/developer/app/docker/image/push/v3/progress?image=${imageName}`
         logger.info(
           `Waiting ... ( copy ${imageName} to lazycat offical registry)`
         )
         try {
-          for (;;) {
-            const resp = await request(
-              `${baseUrl}/app/docker/image/push?image=${imageName}&v=2`
-            )
-            if (resp.ok) {
-              const tag = await resp.text()
-              if (tag.length == 0) {
-                await sleep(2500)
-                continue
+          const resp = await request(uploadUrl)
+          if (resp.ok) {
+            logger.info("uploading")
+          } else {
+            logger.error("error: ", resp, await resp.text())
+            return
+          }
+          sleep(1000)
+          let prevLineCount = 0; // 新增：记录上次输出行数
+          let layers = []
+
+          let refreshProgress = (lys) => {
+            // 关键修改：动态回退多行
+            process.stdout.write('\x1B[?25l'); // 隐藏光标
+            if (prevLineCount > 0) {
+              process.stdout.write(`\x1B[${prevLineCount}A`); // 移动光标到之前输出的起始行
+            }
+
+            // 构建多行进度字符串
+            let output = [];
+            (lys || []).forEach(v => {
+              const progressBar = '#'.repeat(v.progress) + ' '.repeat(100 - v.progress);
+              output.push(`${v.hash.substring(0, 8)}: [${progressBar}] ${v.progress}%`);
+            });
+
+            // 清除旧行并写入新内容
+            output.forEach(line => {
+              process.stdout.write('\x1B[2K'); // 清除当前行
+              process.stdout.write(line + '\n');
+            });
+            prevLineCount = output.length; // 记录本次输出行数
+            process.stdout.write('\x1B[?25h'); // 恢复光标显示
+          }
+
+          for (; ;) {
+            const pgsResp = await request(progressUrl);
+            if (pgsResp.ok) {
+              const pgs = JSON.parse(await pgsResp.text());
+              if (pgs.finished) {
+                (layers ? layers : [])?.forEach(v => {
+                  v.progress = 100
+                });
+                refreshProgress(layers)
+                process.stdout.write("\n");
+                if (pgs.errmsg) {
+                  logger.error("failed to copyimage ", imageName, " err:", pgs.errmsg);
+                  break;
+                }
+                logger.info("uploaded: ", pgs.lzc_image);
+                break;
               }
-              logger.info("lazycat-registry:", tag)
+              layers = pgs?.layers
+              refreshProgress(layers)
+              await sleep(1000);
             } else {
-              logger.error("error: ", await resp.text())
+              logger.error("error: ", await resp.text());
+              break;
             }
-
-            break
           }
         } catch (err) {
           console.error(err)
         }
-      }
-    }
+      },
+    },
+    {
+      command: "my-images",
+      desc: "查看已上传镜像列表",
+      handler: async () => {
+        const url = `${appStoreServerUrl}/api/v3/developer/app/docker/image/push/v3/myimages`
+        try {
+          const resp = await request(url)
+          if (resp.ok) {
+            const ilist = JSON.parse(await resp.text())
+            ilist.sort((a, b) => {
+              return new Date(b.UpdatedAt).getTime() - new Date(a.UpdatedAt).getTime()
+            })
+            const tableItems = []
+            ilist?.forEach(v => {
+              if (v.errmsg) {
+                return
+              }
+              tableItems.push({
+                "Source Image": v.source_image,
+                "Lazycat Image": v.lzc_image,
+                "Updated At": new Date(v.UpdatedAt).toLocaleString(),
+              })
+            })
+            console.table(tableItems)
+          } else {
+            logger.error("error: ", await resp.text())
+          }
+        } catch (err) {
+          console.error(err)
+        }
+      },
+    },
   ]
 
   program.command({

package/package.json

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