@lazycatcloud/lzc-cli 1.2.63 → 1.2.64

package/changelog.md

@@ -1,3 +1,7 @@
+# 1.2.64
+1. 升级 dozzle，支持查看所有容器日志
+2. 修复 devshell ssh 多路复用错误
+
 # 1.2.63
 
 1. 处理开发者账号无法登陆问题

package/lib/app/index.js

@@ -149,6 +149,7 @@ export function lpkAppCommand(program) {
         const bridge = new DebugBridge()
         await bridge.init()
         await bridge.uninstall(pkgId)
+        console.log(`默认微服设备: ${bridge.boxname} ，卸载应用 ${pkgId} 完成`)
       }
     },
     {

package/lib/app/lpk_installer.js

@@ -25,9 +25,9 @@ function findOnceLpkByDir(dir = process.cwd()) {
 }
 
 export class LpkInstaller {
-  constructor() {}
+  constructor() { }
 
-  async init() {}
+  async init() { }
 
   // deploy 构建和安装
   async deploy(builder) {
@@ -119,17 +119,23 @@ export class LpkInstaller {
       fs.rmSync(tempDir, { recursive: true })
     }
 
-    const bridge = new DebugBridge()
-    await bridge.init()
-    logger.info("开始安装应用")
-    await bridge.install(pkgPath, manifest ? manifest["package"] : "")
-    logger.info("\n")
-    logger.info(`安装成功！`)
-    if (manifest) {
-      logger.info(
-        `👉 请在浏览器中访问 https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`
+    try {
+      const bridge = new DebugBridge()
+      await bridge.init()
+      logger.info("开始安装应用")
+      await bridge.install(pkgPath, manifest ? manifest["package"] : "")
+      logger.info("\n")
+      logger.info(`安装成功！`)
+      if (manifest) {
+        logger.info(
+          `👉 请在浏览器中访问 https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`
+        )
+        logger.info(`👉 并使用微服的用户名和密码登录`)
+      }
+    } catch(error) {
+      logger.error(
+        `安装失败: ${error}`
       )
-      logger.info(`👉 并使用微服的用户名和密码登录`)
     }
   }
 }

package/lib/debug_bridge.js

@@ -30,6 +30,7 @@ export function sshCmdArgs(...args) {
   const defaultOptions = [
     `-o "StrictHostKeyChecking=no"`,
     `-o "UserKnownHostsFile=/dev/null"`,
+    `-o "ControlMaster=no"`,
     "-q",
     "-p 22222",
     `${isTraceMode() ? "-v" : ""}`
@@ -126,7 +127,11 @@ export class DebugBridge {
       return true
     } catch (err) {
       logger.debug("canPublicKey error: ", err)
-      return false
+      if (err?.code == "ETIMEOUT") {
+        throw `域名解析失败，请检查代理软件是否对*.heiyu.space拦截`
+      } else {
+        return false
+      }
     }
   }
 

package/lib/utils.js

@@ -484,21 +484,20 @@ export async function resolveDomain(domain) {
   try {
     // Set machine's dns server as defalut dns server
     dns.setServers(["[fc03:1136:3800::1]"])
-
     const [ipv6Addresses, ipv4Addresses] = await Promise.allSettled([
       __resolveDomain(domain, true),
       __resolveDomain(domain, false)
     ])
     if (ipv6Addresses.status == "fulfilled") {
       return ipv6Addresses.value
-    } else if (ipv4Addresses.status != "fulfilled") {
+    } else if (ipv4Addresses.status == "fulfilled") {
       return ipv4Addresses.value
     } else {
-      throw `无法解析域名 ${domain}`
+      throw ipv6Addresses.reason
     }
   } catch (error) {
-    logger.error("resolve domain: ", error)
-    throw `无法解析域名 ${domain}: ${error}`
+    logger.error(`无法解析域名 ${domain}: `, error)
+    throw error
   }
 }
 

package/package.json

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