@lazycatcloud/lzc-cli 1.2.58 → 1.2.59

package/changelog.md

@@ -1,3 +1,9 @@
+# 1.2.59
+
+1. 修复 copy-image 网关超时
+2. 当解析 manifest 失败的时候，继续安装
+3. 修复盒子 ingress 错误的时候，获取不到本地的默认盒子
+
 # 1.2.58
 
 1. 使用 127.0.0.1 替代 localhost 避免解析错误

package/lib/app/lpk_installer.js

@@ -113,6 +113,8 @@ export class LpkInstaller {
         })
       }
       logger.debug("lpk manifest", manifest)
+    } catch (err) {
+      logger.debug("parse manifest ", err)
     } finally {
       fs.rmSync(tempDir, { recursive: true })
     }
@@ -120,12 +122,14 @@ export class LpkInstaller {
     const bridge = new DebugBridge()
     await bridge.init()
     logger.info("开始安装应用")
-    await bridge.install(pkgPath, manifest["package"])
+    await bridge.install(pkgPath, manifest ? manifest["package"] : "")
     logger.info("\n")
     logger.info(`安装成功！`)
-    logger.info(
-      `👉 请在浏览器中访问 https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`
-    )
-    logger.info(`👉 并使用微服的用户名和密码登录`)
+    if (manifest) {
+      logger.info(
+        `👉 请在浏览器中访问 https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`
+      )
+      logger.info(`👉 并使用微服的用户名和密码登录`)
+    }
   }
 }

package/lib/appstore/index.js

@@ -3,6 +3,7 @@ import logger from "loglevel"
 import { PrePublish } from "./prePublish.js"
 import { reLogin, request } from "./login.js"
 import fs from "node:fs"
+import { sleep } from "../utils.js"
 
 export function appstoreCommand(program) {
   let subCommands = [
@@ -72,13 +73,21 @@ export function appstoreCommand(program) {
         logger.info(
           `Waiting ... ( copy ${imageName} to lazycat offical registry)`
         )
-
         try {
-          const resp = await request(`${baseUrl}/push-image?image=${imageName}`)
-          if (resp.ok) {
-            logger.info("lazycat-registry:", await resp.text())
-          } else {
-            logger.error("error: ", await resp.text())
+          for (; ;) {
+            const resp = await request(`${baseUrl}/push-image?image=${imageName}&v=2`)
+            if (resp.ok) {
+              const tag = await resp.text()
+              if (tag.length == 0) {
+                await sleep(2500)
+                continue
+              }
+              logger.info("lazycat-registry:", tag)
+            } else {
+              logger.error("error: ", await resp.text())
+            }
+
+            break;
           }
         } catch (err) {
           console.error(err)

package/lib/debug_bridge.js

@@ -15,6 +15,9 @@ import {
 import logger from "loglevel"
 import commandExists from "command-exists"
 import path from "node:path"
+import fetch from "node-fetch"
+
+const bannerfileContent = `˄=ᆽ=ᐟ \\`
 
 export function sshBinary() {
   if (isWindows) {
@@ -42,12 +45,40 @@ export class DebugBridge {
   }
 
   async init() {
+    await this.checkDevTools()
     if (!(await this.canPublicKey())) {
       // 如果不能 ssh public key 登录则提示授权申请，否则后面可能会出现 rsync 询问密码的问题
       await this.sshApplyGrant()
     }
   }
 
+  async checkDevTools() {
+    const url = `https://dev.${this.boxname}.heiyu.space/bannerfile`
+    return new Promise((resolve, reject) => {
+      fetch(url, { redirect: "error" })
+        .then(async (res) => {
+          const content = await res.text()
+          if (res.status == 200 && content == bannerfileContent) {
+            resolve()
+            return
+          }
+          logger.warn(
+            `检测到你还没有安装 '懒猫开发者工具'，请先到商店中搜索安装
+点击直接跳转 https://appstore.${this.boxname}.heiyu.space/#/shop/detail/cloud.lazycat.developer.tools
+点击打开应用 https://dev.${this.boxname}.heiyu.space 查看应用状态
+`
+          )
+          reject()
+        })
+        .catch(() => {
+          logger.error(
+            `检测懒猫开发者工具失败，请检测您当前的网络或者懒猫微服客户端是否正常启动。`
+          )
+          reject()
+        })
+    })
+  }
+
   async common(cmd, args) {
     const resolvedIp = await resolveDomain(this.domain)
     args = args.map((arg) => arg.replace(this.domain, resolvedIp))
@@ -73,7 +104,8 @@ export class DebugBridge {
       sshBinary(),
       [
         ...sshCmdArgs(`box@${resolvedIp}`),
-        `install --uid ${this.uid} --pkgId ${pkgId}`
+        `install --uid ${this.uid}`,
+        pkgId ? `--pkgId ${pkgId}` : ""
       ],
       {
         shell: true,

package/lib/shellapi.js

@@ -11,9 +11,6 @@ import path from "node:path"
 import fs from "node:fs"
 import os from "node:os"
 import logger from "loglevel"
-import fetch from "node-fetch"
-
-const bannerfileContent = `˄=ᆽ=ᐟ \\`
 
 /**
  * @link {https://www.npmjs.com/package/appdirs}
@@ -77,7 +74,6 @@ NOTE：在指定环境变量的模式下，有些接口依旧不能访问，为
       this.metadata = md
       this.info = await this.initBoxInfo()
     }
-    await this.checkDevTools()
   }
 
   get boxname() {
@@ -140,33 +136,6 @@ NOTE：在指定环境变量的模式下，有些接口依旧不能访问，为
     throw "没有默认盒子信息, 请先使用 lzc-cli box switch 设置默认的盒子信息"
   }
 
-  async checkDevTools() {
-    const url = `https://dev.${this.info.boxname}.heiyu.space/bannerfile`
-    return new Promise((resolve, reject) => {
-      fetch(url, { redirect: "error" })
-        .then(async (res) => {
-          const content = await res.text()
-          if (res.status == 200 && content == bannerfileContent) {
-            resolve()
-            return
-          }
-          logger.warn(
-            `检测到你还没有安装 '懒猫开发者工具'，请先到商店中搜索安装
-点击直接跳转 https://appstore.${this.info.boxname}.heiyu.space/#/shop/detail/cloud.lazycat.developer.tools
-点击打开应用 https://dev.${this.info.boxname}.heiyu.space 查看应用状态
-`
-          )
-          reject()
-        })
-        .catch(() => {
-          logger.error(
-            `检测懒猫开发者工具失败，请检测您当前的网络或者懒猫微服客户端是否正常启动。`
-          )
-          reject()
-        })
-    })
-  }
-
   checkEnvProxy() {
     if (
       process.env.HTTPS_PROXY ||

package/package.json

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