@lazycatcloud/lzc-cli 1.2.63 → 1.2.65

package/changelog.md

@@ -1,3 +1,12 @@
+# 1.2.65
+
+1. 适配新版本开发者平台接口
+
+# 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/appstore/env.js

@@ -0,0 +1,10 @@
+/*
+ * @Author: Bin
+ * @Date: 2025-04-14
+ * @FilePath: /lzc-cli/lib/appstore/env.js
+ */
+
+const accountServerUrl = "https://account.lazycat.cloud"
+const appStoreServerUrl = "https://appstore.api.lazycat.cloud"
+
+export { accountServerUrl, appStoreServerUrl }

package/lib/appstore/index.js

@@ -4,6 +4,7 @@ import { PrePublish } from "./prePublish.js"
 import { reLogin, request } from "./login.js"
 import fs from "node:fs"
 import { sleep } from "../utils.js"
+import { appStoreServerUrl } from "./env.js"
 
 export function appstoreCommand(program) {
   let subCommands = [
@@ -58,24 +59,27 @@ export function appstoreCommand(program) {
         })
       },
       handler: async ({ pkgPath, changelog, file }) => {
+        const locale = program.locale()
         const p = new Publish()
         if (!changelog && file) {
           changelog = fs.readFileSync(file, "utf8")
         }
-        await p.publish(pkgPath, changelog)
+        await p.publish(pkgPath, changelog, locale)
       }
     },
     {
       command: "copy-image <imageName>",
       desc: "复制镜像至懒猫微服官方源",
       handler: async ({ imageName }) => {
-        const baseUrl = "https://appstore.api.lazycat.cloud/api/v2/developer"
+        const baseUrl = `${appStoreServerUrl}/api/v3/developer`
         logger.info(
           `Waiting ... ( copy ${imageName} to lazycat offical registry)`
         )
         try {
-          for (; ;) {
-            const resp = await request(`${baseUrl}/push-image?image=${imageName}&v=2`)
+          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) {
@@ -87,7 +91,7 @@ export function appstoreCommand(program) {
               logger.error("error: ", await resp.text())
             }
 
-            break;
+            break
           }
         } catch (err) {
           console.error(err)

package/lib/appstore/login.js

@@ -4,160 +4,163 @@ import url from "url"
 import logger from "loglevel"
 import env from "../config/env.js"
 import inquirer from "inquirer"
-
-const accountServerUrl = "https://account.lazycat.cloud"
+import { accountServerUrl } from "./env.js"
 
 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)
-	}
+  // logger.debug("token", token)
 
-	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/appstore/publish.js

@@ -9,35 +9,45 @@ import {
   isPngWithFile,
   unzipSync,
   loadFromYaml,
-  isValidPackageName
+  isValidPackageName,
+  getLanguageForLocale
 } from "../utils.js"
+import { appStoreServerUrl } from "./env.js"
 
-async function askChangeLog() {
+async function askChangeLog(locale) {
   const noEmpty = (value) => value != ""
   return await inquirer.prompt([
     {
       name: "changelog",
       type: "editor",
-      message: "填写 changelog 内容",
+      message: `填写 changelog 内容 (${locale})`,
       validate: noEmpty
     }
   ])
 }
 
-async function getCategories(baseUrl) {
-  const response = await request(`${baseUrl}/categories`, { method: "GET" })
-  const data = await response.json()
+async function getCategories(baseUrl, locale = "zh") {
+  const response = await request(`${baseUrl}/app/category?size=100`, {
+    method: "GET"
+  })
+  const langKey = getLanguageForLocale(locale)
+  const { items: data } = await response.json()
+  console.log("data", data)
   return data
     .sort((a, b) => a.index - b.index)
-    .map((cat) => ({
-      name: cat.name,
-      value: cat.name
-    }))
+    .map((cat) => {
+      let localize_name = (cat?.localize_name ?? {})[langKey] ?? undefined
+      return {
+        name: localize_name ?? cat.name,
+        value: cat.id
+      }
+    })
 }
 
-async function askPublishAppInfo(baseUrl, manifest) {
+async function askPublishAppInfo(baseUrl, manifest, locale) {
   // 获取分类列表
-  const categories = await getCategories(baseUrl)
+  // const categories = await getCategories(baseUrl, locale)
+  const langKey = getLanguageForLocale(locale)
 
   const questions = [
     {
@@ -49,56 +59,62 @@ async function askPublishAppInfo(baseUrl, manifest) {
     },
     {
       type: "input",
-      name: "appId",
-      message: "请输入应用ID:",
+      name: "package",
+      message: "请输入应用包标识符:",
       default: manifest["package"],
       validate: (input) =>
-        isValidPackageName(input) ? true : "应用ID不符合规范"
-    },
-    {
-      type: "input",
-      name: "description",
-      message: "请输入应用描述:",
-      default: manifest["description"] || ""
-    },
-    {
-      type: "input",
-      name: "brief",
-      message: "请输入应用简介(简单的概述):",
-      default: ""
-    },
-    {
-      type: "checkbox",
-      name: "category",
-      message: "请选择应用分类:",
-      choices: categories,
-      validate: (input) => (input.length > 0 ? true : "请至少选择一个分类")
-    },
-    {
-      type: "input",
-      name: "keywords",
-      message: "请输入关键词(用逗号分隔):",
-      default: ""
+        isValidPackageName(input)
+          ? true
+          : "应用包标识符不符合规范，建议使用反向域名表示法"
     },
+    // {
+    //   type: "input",
+    //   name: "description",
+    //   message: "请输入应用描述:",
+    //   default: manifest["description"] || ""
+    // },
+    // {
+    //   type: "input",
+    //   name: "brief",
+    //   message: "请输入应用简介(简单的概述):",
+    //   default: ""
+    // },
+    // 开发者暂时不能配置应用分类
+    // {
+    //   type: "checkbox",
+    //   name: "category",
+    //   message: "请选择应用分类:",
+    //   choices: categories,
+    //   validate: (input) => (input.length > 0 ? true : "请至少选择一个分类")
+    // },
+    // {
+    //   type: "input",
+    //   name: "keywords",
+    //   message: "请输入关键词(用逗号分隔):",
+    //   default: ""
+    // },
     {
       type: "input",
       name: "source",
-      message: "请输入应用来源:",
+      message: "请输入应用来源(原创应用可不填):",
       default: manifest["homepage"] || ""
     },
     {
       type: "input",
       name: "author",
-      message: "请输入作者名称:",
+      message: "请输入作者名称(原创应用可不填):",
       default: manifest["author"] || ""
     }
   ]
 
   const answers = await inquirer.prompt(questions)
-  return answers
+  return {
+    language: langKey, // 应用主要语言（后续需要做成可以让用户选择）
+    ...answers
+  }
 }
 
-async function askWhetherCreateLPK(baseUrl, manifest) {
+async function askWhetherCreateLPK(baseUrl, manifest, locale) {
   const answers = await inquirer.prompt([
     {
       name: "continue",
@@ -109,10 +125,16 @@ async function askWhetherCreateLPK(baseUrl, manifest) {
     }
   ])
   if (answers.continue.toLowerCase() === "y") {
-    const appInfo = await askPublishAppInfo(baseUrl, manifest)
-    const crateAppRes = await request(`${baseUrl}/apps`, {
+    const appInfo = await askPublishAppInfo(baseUrl, manifest, locale)
+    const crateAppRes = await request(`${baseUrl}/app/create`, {
       method: "POST",
-      body: JSON.stringify(appInfo)
+      body: JSON.stringify({
+        package: appInfo.package,
+        language: appInfo.language,
+        name: appInfo.name,
+        source: appInfo.source,
+        source_author: appInfo.author
+      })
     })
     logger.debug("create app res: ", await crateAppRes.text())
     logger.info(`创建 ${manifest["package"]} 应用成功!`)
@@ -131,7 +153,7 @@ async function askWhetherCreateLPK(baseUrl, manifest) {
 }
 
 export class Publish {
-  constructor(baseUrl = "https://appstore.api.lazycat.cloud/api/v2/developer") {
+  constructor(baseUrl = `${appStoreServerUrl}/api/v3/developer`) {
     this.baseUrl = baseUrl
   }
 
@@ -170,16 +192,17 @@ export class Publish {
     try {
       unzipSync(pkgPath, tempDir, ["manifest.yml"])
       const manifest = loadFromYaml(path.join(tempDir, "manifest.yml"))
-      const checkUrl = this.baseUrl + `/apps/${manifest["package"]}/check_exist`
+      const checkUrl =
+        this.baseUrl + `/app/check/exist?package=${manifest["package"]}`
       const res = await request(checkUrl, { method: "GET" })
       if (res.status >= 400) {
         logger.error("检测应用是否存在出错, 错误状态码为: ", res.status)
-        logger.error(await res.text())
+        logger.error(await res.json())
         return { manifest, appIdExisted: true } // 默认认为已经存在
       } else {
-        const text = (await res.text()).trim()
-        logger.debug(`check appId[${manifest["package"]}] exist: ${text}`)
-        return { manifest, appIdExisted: text == "true" }
+        const { exist = false } = await res.json()
+        logger.debug(`check appId[${manifest["package"]}] exist: ${exist}`)
+        return { manifest, appIdExisted: exist }
       }
     } finally {
       fs.rmSync(tempDir, { recursive: true })
@@ -189,19 +212,20 @@ export class Publish {
   /**
    * @param {string} pkgPath
    * @param {string} changelog
+   * @param {string} locale
    */
-  async publish(pkgPath, changelog) {
+  async publish(pkgPath, changelog, locale = "zh") {
     if (!Publish.preCheck(pkgPath)) return
 
     const { manifest, appIdExisted } = await this.checkAppIdExist(pkgPath)
     if (!appIdExisted) {
-      await askWhetherCreateLPK(this.baseUrl, manifest)
+      await askWhetherCreateLPK(this.baseUrl, manifest, locale)
     }
 
     await autoLogin()
 
     if (!changelog) {
-      const answer = await askChangeLog()
+      const answer = await askChangeLog(locale)
       changelog = answer.changelog
     }
     changelog = changelog.trim() // clean space ^:)
@@ -210,7 +234,7 @@ export class Publish {
     const form = new FormData()
     form.append("file", fs.createReadStream(pkgPath))
 
-    const uploadURL = this.baseUrl + "/upload_lpk"
+    const uploadURL = this.baseUrl + "/app/lpk/upload"
     logger.debug("upload url is", uploadURL)
 
     const res = await request(uploadURL, {
@@ -225,17 +249,25 @@ export class Publish {
     const lpkInfo = await JSON.parse(text)
     logger.debug("upload lpk response", lpkInfo)
 
-    const sendURL = this.baseUrl + `/apps/${lpkInfo.package}/reviews`
+    const sendURL = this.baseUrl + `/app/${lpkInfo.package}/review/create`
     logger.debug("publish url is", sendURL)
 
     const formData = {
-      changelog,
-      name: lpkInfo.name,
-      iconPath: lpkInfo.iconPath,
-      pkgPath: lpkInfo.url,
-      supportPC: lpkInfo.supportPC,
-      supportMobile: lpkInfo.supportMobile
+      version: {
+        // supportPC: lpkInfo.supportPC,
+        // supportMobile: lpkInfo.supportMobile,
+        package: lpkInfo.package,
+        name: lpkInfo.version,
+        icon_path: lpkInfo.iconPath,
+        pkg_path: lpkInfo.url,
+        unsupported_platforms: lpkInfo.unsupportedPlatforms,
+        min_os_version: lpkInfo.minOsVersion,
+        changelogs: {}
+      }
     }
+    // changelogs 本地化
+    const langKey = getLanguageForLocale(locale)
+    formData.version.changelogs[langKey] = changelog
 
     logger.debug("form data is", formData)
 

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
   }
 }
 
@@ -656,3 +655,13 @@ export function checkRsync() {
     resolve()
   })
 }
+
+export function getLanguageForLocale(locale) {
+  locale = locale.replace("_", "-")
+  try {
+    let l = new Intl.Locale(locale)
+    return l.language
+  } catch (error) {
+    return locale
+  }
+}

package/package.json

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