@lazycatcloud/lzc-cli 1.2.62 → 1.2.64

package/changelog.md

@@ -1,10 +1,21 @@
+# 1.2.64
+1. 升级 dozzle，支持查看所有容器日志
+2. 修复 devshell ssh 多路复用错误
+
+# 1.2.63
+
+1. 处理开发者账号无法登陆问题
+
 # 1.2.62
+
 1. 修复部分 windows 机器无法登陆开发者账号问题
 
 # 1.2.61
+
 1. 修复 lzc-build 文件配置 `compose.override` 字段不生效问题
 
 # 1.2.60
+
 1. 添加用户登录友好提示
 2. 移除已弃用模版
 3. 支持 lzc-build 文件配置 `compose.override` 字段

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

@@ -1,5 +1,6 @@
 import fetch from "node-fetch"
 import path from "path"
+import url from "url"
 import logger from "loglevel"
 import env from "../config/env.js"
 import inquirer from "inquirer"
@@ -7,156 +8,156 @@ import inquirer from "inquirer"
 const accountServerUrl = "https://account.lazycat.cloud"
 
 function join(...params) {
-    let x = ""
-    try {
-        // fix: url path join failed for windows
-        const u = new url.URL(params[0])
-        params.splice(0, 1)
-        u.pathname = path.posix.join(u.pathname, ...params)
-        x = u.toString()
-    } catch (error) {
-        console.warn(error)
-        x = path.join(...params)
-    }
-    return x
+	let x = ""
+	try {
+		// fix: url path join failed for windows
+		const u = new url.URL(params[0])
+		params.splice(0, 1)
+		u.pathname = path.posix.join(u.pathname, ...params)
+		x = u.toString()
+	} catch (error) {
+		console.warn(error)
+		x = path.join(...params)
+	}
+	return x
 }
 
 async function login(username, password) {
-    return fetch(join(accountServerUrl, "/api/login/signin"), {
-        method: "POST",
-        body: new URLSearchParams({
-            username: username,
-            password: password
-        })
-    })
-        .then(async (res) => {
-            let bodyText = await res.text()
-            let body = JSON.parse(bodyText)
-            if (body.success) {
-                return Promise.resolve(body.data)
-            }
-            return Promise.reject(body.message)
-        })
-        .then((data) => {
-            env.set({ token: data.token }, true)
-            logger.info("登录成功!")
-        })
+	return fetch(join(accountServerUrl, "/api/login/signin"), {
+		method: "POST",
+		body: new URLSearchParams({
+			username: username,
+			password: password
+		})
+	})
+		.then(async (res) => {
+			let bodyText = await res.text()
+			let body = JSON.parse(bodyText)
+			if (body.success) {
+				return Promise.resolve(body.data)
+			}
+			return Promise.reject(body.message)
+		})
+		.then((data) => {
+			env.set({ token: data.token }, true)
+			logger.info("登录成功!")
+		})
 }
 
 async function isLogin() {
-    try {
-        let token = env.get("token")
-        if (!token) {
-            return false
-        }
-        return fetch(join(accountServerUrl, "/api/user/current"), {
-            method: "GET",
-            headers: {
-                "X-User-Token": token
-            }
-        }).then(async (res) => {
-            let bodyText = await res.text()
-            let body = JSON.parse(bodyText)
-            if (body.success) {
-                return token
-            }
-            logger.debug(body.message)
-            return false
-        })
-    } catch (e) {
-        logger.trace(e)
-        return false
-    }
+	try {
+		let token = env.get("token")
+		if (!token) {
+			return false
+		}
+		return fetch(join(accountServerUrl, "/api/user/current"), {
+			method: "GET",
+			headers: {
+				"X-User-Token": token
+			}
+		}).then(async (res) => {
+			let bodyText = await res.text()
+			let body = JSON.parse(bodyText)
+			if (body.success) {
+				return token
+			}
+			logger.debug(body.message)
+			return false
+		})
+	} catch (e) {
+		logger.trace(e)
+		return false
+	}
 }
 
 async function askUserInfo() {
-    const noEmpty = (value) => value != ""
-    return await inquirer.prompt([
-        {
-            type: "input",
-            name: "username",
-            message: "请输入登录用户名",
-            validate: noEmpty
-        },
-        {
-            type: "password",
-            mask: "*",
-            name: "password",
-            message: "请输入登录密码",
-            validate: noEmpty
-        }
-    ])
+	const noEmpty = (value) => value != ""
+	return await inquirer.prompt([
+		{
+			type: "input",
+			name: "username",
+			message: "请输入登录用户名",
+			validate: noEmpty
+		},
+		{
+			type: "password",
+			mask: "*",
+			name: "password",
+			message: "请输入登录密码",
+			validate: noEmpty
+		}
+	])
 }
 
 async function interactiveLogin() {
-    try {
-        let info = await askUserInfo()
-        await login(info.username, info.password)
-    } catch (e) {
-        logger.debug("login error: ", e)
-        logger.error("帐号或者密码错误，请重新输入!")
-        return interactiveLogin()
-    }
+	try {
+		let info = await askUserInfo()
+		await login(info.username, info.password)
+	} catch (e) {
+		logger.debug("login error: ", e)
+		logger.error("帐号或者密码错误，请重新输入!")
+		return interactiveLogin()
+	}
 }
 
 function tipsFirstLogin() {
-    let token = env.get("token")
-    if (!token) {
-        // 还没登录过的用户提示用户前往 https://developer.lazycat.cloud/manage 注册开发者账号
-        logger.info("请登录懒猫微服社区账号，账号注册以及开发者权限申请地址: https://developer.lazycat.cloud/manage")
-    }
+	let token = env.get("token")
+	if (!token) {
+		// 还没登录过的用户提示用户前往 https://developer.lazycat.cloud/manage 注册开发者账号
+		logger.info("请登录懒猫微服社区账号，账号注册以及开发者权限申请地址: https://developer.lazycat.cloud/manage")
+	}
 }
 
 export async function reLogin() {
-    let token = await isLogin()
-    if (token) {
-        const questions = [
-            {
-                name: "relogin",
-                type: "input",
-                default: "n",
-                message: "检测到已经登录，是否重新登录(y/n):"
-            }
-        ]
-        const answers = await inquirer.prompt(questions)
-        if (answers.relogin.toLowerCase() === "n") {
-            logger.info(`token: ${token}`)
-            return
-        }
-    } else {
-        tipsFirstLogin()
-    }
-    await interactiveLogin()
+	let token = await isLogin()
+	if (token) {
+		const questions = [
+			{
+				name: "relogin",
+				type: "input",
+				default: "n",
+				message: "检测到已经登录，是否重新登录(y/n):"
+			}
+		]
+		const answers = await inquirer.prompt(questions)
+		if (answers.relogin.toLowerCase() === "n") {
+			logger.info(`token: ${token}`)
+			return
+		}
+	} else {
+		tipsFirstLogin()
+	}
+	await interactiveLogin()
 }
 
 export async function autoLogin() {
-    let token = await isLogin()
-    if (token) {
-        logger.debug("appstore 已经登录")
-        return
-    } else {
-        tipsFirstLogin()
-    }
+	let token = await isLogin()
+	if (token) {
+		logger.debug("appstore 已经登录")
+		return
+	} else {
+		tipsFirstLogin()
+	}
 
-    logger.debug("token错误，尝试自动登录")
-    await interactiveLogin()
+	logger.debug("token错误，尝试自动登录")
+	await interactiveLogin()
 }
 
 export async function request(url, options = {}) {
-    await autoLogin()
+	await autoLogin()
 
-    const token = env.get("token")
+	const token = env.get("token")
 
-    let headers = {
-        "X-User-Token": token,
-        cookie: `userToken=${token}`
-    }
-    if (options.headers) {
-        headers = Object.assign({}, options.headers, headers)
-    }
+	let headers = {
+		"X-User-Token": token,
+		cookie: `userToken=${token}`
+	}
+	if (options.headers) {
+		headers = Object.assign({}, options.headers, headers)
+	}
 
-    options = Object.assign({}, options, { headers })
-    logger.trace(`fetch ${url}`, options)
+	options = Object.assign({}, options, { headers })
+	logger.trace(`fetch ${url}`, options)
 
-    return fetch(url, options)
+	return fetch(url, options)
 }

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.62",
+  "version": "1.2.64",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "prepublishOnly": "node check-changelog.js"