@lazycatcloud/lzc-cli 1.3.1 → 1.3.3

package/changelog.md

@@ -1,3 +1,12 @@
+# 1.3.3
+
+1. 拷贝镜像过程中显示进度
+2. 支持查看已经拷贝的镜像记录
+
+# 1.3.2
+
+1. 增加用户友好的上传 LPK 错误提示
+
 # 1.3.1
 
 1. 升级 lzc-cli 1.3.1 版本

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

@@ -31,11 +31,17 @@ async function login(username, password) {
   })
     .then(async (res) => {
       let bodyText = await res.text()
-      let body = JSON.parse(bodyText)
-      if (body.success) {
-        return Promise.resolve(body.data)
+      try {
+        let body = JSON.parse(bodyText)
+        if (body.success) {
+          return Promise.resolve(body.data)
+        }
+        throw body
+      } catch (error) {
+        error.responseStatus = res.status
+        error.responseBody = bodyText
+        return Promise.reject(error)
       }
-      return Promise.reject(body.message)
     })
     .then((data) => {
       env.set({ token: data.token }, true)
@@ -94,7 +100,11 @@ async function interactiveLogin() {
     await login(info.username, info.password)
   } catch (e) {
     logger.debug("login error: ", e)
-    logger.error("帐号或者密码错误，请重新输入!")
+    if (e?.errorCode == 0 || e?.message == "密码错误") {
+      logger.error("帐号或者密码错误，请重新输入!")
+    } else {
+      logger.error(`登录失败，${e?.message ?? e}`)
+    }
     return interactiveLogin()
   }
 }

package/lib/appstore/publish.js

@@ -224,12 +224,6 @@ export class Publish {
 
     await autoLogin()
 
-    if (!changelog) {
-      const answer = await askChangeLog(locale)
-      changelog = answer.changelog
-    }
-    changelog = changelog.trim() // clean space ^:)
-
     logger.info("正在提交审核...")
     const form = new FormData()
     form.append("file", fs.createReadStream(pkgPath))
@@ -248,6 +242,17 @@ export class Publish {
     }
     const lpkInfo = await JSON.parse(text)
     logger.debug("upload lpk response", lpkInfo)
+    if (res.status >= 400) {
+      logger.error(`LPK 文件上传失败，err: ${lpkInfo?.message ?? lpkInfo}`)
+      return
+    }
+
+    // 填写更新日志
+    if (!changelog) {
+      const answer = await askChangeLog(locale)
+      changelog = answer.changelog
+    }
+    changelog = changelog.trim() // clean space ^:)
 
     const sendURL = this.baseUrl + `/app/${lpkInfo.package}/review/create`
     logger.debug("publish url is", sendURL)

package/package.json

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