@lazycatcloud/lzc-cli 1.3.7 → 1.3.9

package/changelog.md

@@ -1,3 +1,11 @@
+# 1.3.9
+
+1. copy-image 支持 `arch` 参数
+
+# 1.3.8
+
+1. 修复hellowrold路由路径不对
+
 # 1.3.7
 
 1. 修复错误的 lzc-manifest 字段读取匹配

package/lib/appstore/index.js

@@ -68,13 +68,13 @@ export function appstoreCommand(program) {
       }
     },
     {
-      command: "copy-image <imageName>",
-      desc: "复制镜像至懒猫微服官方源",
-      handler: async ({ imageName }) => {
-        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}`
+      command: "copy-image <img> <arch>",
+      desc: `复制镜像至懒猫微服官方源\n  - <img> NAME[:TAG]\n  - <arch>: 'amd64', 'arm64' [字符串] [默认值: "amd64"]`,
+      handler: async ({ img: imageName, arch: platform }) => {
+        const uploadUrl = `${appStoreServerUrl}/api/v3/developer/app/docker/image/push/v3/copy?image=${imageName}&platform=${platform}`
+        const progressUrl = `${appStoreServerUrl}/api/v3/developer/app/docker/image/push/v3/progress?image=${imageName}&platform=${platform}`
         logger.info(
-          `Waiting ... ( copy ${imageName} to lazycat offical registry)`
+          `Waiting ... ( copy ${imageName} (${platform})  to lazycat offical registry)`
         )
         try {
           const resp = await request(uploadUrl)
@@ -85,61 +85,69 @@ export function appstoreCommand(program) {
             return
           }
           sleep(1000)
-          let prevLineCount = 0; // 新增：记录上次输出行数
+          let prevLineCount = 0 // 新增：记录上次输出行数
           let layers = []
 
           let refreshProgress = (lys) => {
             // 关键修改：动态回退多行
-            process.stdout.write('\x1B[?25l'); // 隐藏光标
+            process.stdout.write("\x1B[?25l") // 隐藏光标
             if (prevLineCount > 0) {
-              process.stdout.write(`\x1B[${prevLineCount}A`); // 移动光标到之前输出的起始行
+              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}%`);
-            });
+            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'); // 恢复光标显示
+            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);
+          for (;;) {
+            const pgsResp = await request(progressUrl)
             if (pgsResp.ok) {
-              const pgs = JSON.parse(await pgsResp.text());
+              const pgs = JSON.parse(await pgsResp.text())
               if (pgs.finished) {
-                (layers ? layers : [])?.forEach(v => {
+                ;(layers ? layers : [])?.forEach((v) => {
                   v.progress = 100
-                });
+                })
                 refreshProgress(layers)
-                process.stdout.write("\n");
+                process.stdout.write("\n")
                 if (pgs.errmsg) {
-                  logger.error("failed to copyimage ", imageName, " err:", pgs.errmsg);
-                  break;
+                  logger.error(
+                    "failed to copyimage ",
+                    imageName,
+                    " err:",
+                    pgs.errmsg
+                  )
+                  break
                 }
-                logger.info("uploaded: ", pgs.lzc_image);
-                break;
+                logger.info("uploaded: ", pgs.lzc_image)
+                break
               }
               layers = pgs?.layers
               refreshProgress(layers)
-              await sleep(1000);
+              await sleep(1000)
             } else {
-              logger.error("error: ", await resp.text());
-              break;
+              logger.error("error: ", await resp.text())
+              break
             }
           }
         } catch (err) {
           console.error(err)
         }
-      },
+      }
     },
     {
       command: "my-images",
@@ -151,17 +159,20 @@ export function appstoreCommand(program) {
           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()
+              return (
+                new Date(b.UpdatedAt).getTime() -
+                new Date(a.UpdatedAt).getTime()
+              )
             })
             const tableItems = []
-            ilist?.forEach(v => {
+            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(),
+                "Updated At": new Date(v.UpdatedAt).toLocaleString()
               })
             })
             console.table(tableItems)
@@ -171,8 +182,8 @@ export function appstoreCommand(program) {
         } catch (err) {
           console.error(err)
         }
-      },
-    },
+      }
+    }
   ]
 
   program.command({

package/lib/utils.js

@@ -178,16 +178,23 @@ export function fakeLoadManifestYml(file) {
       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]
+    let line = v.trim()
+    const arr = line.split(":")
+    if (arr.length != 2) {
+      return
+    }
+    let [key, value] = arr
+    value = value.trim()
+    if (!obj.package && key == "package") {
+      obj.package = value
     }
-    if (!obj.application.subdomain && line.includes("subdomain:") && line.split(":").length == 2) {
-      obj.application.subdomain = line.split(":")[1]
+    if (!obj.application.subdomain && key == "subdomain") {
+      obj.application.subdomain = value
     }
-    if (!obj.version && line.includes("version:") && line.split(":").length == 2) {
-      obj.version = line.split(":")[1]
+    if (!obj.version && key == "version") {
+      obj.version = value
     }
   })
   return obj

package/package.json

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

package/scripts/cli.js

@@ -51,6 +51,7 @@ const program = yargs(hideBin(process.argv))
     default: false
   })
   .completion("completion", false)
+  .wrap(null) // https://yargs.js.org/docs/#api-reference-wrapcolumns
 
 configCommand(program)
 boxCommand(program)

package/template/_lpk/manifest.yml.in

@@ -11,4 +11,4 @@ author: # app author
 application:
   subdomain: ${subdomain} #期望的app域名
   routes:
-    - /=file:///lzcapp/pkg/content
+    - /=file:///lzcapp/pkg/content/dist