@lazycatcloud/lzc-cli 1.2.55 → 1.2.57

package/changelog.md

@@ -1,3 +1,14 @@
+# 1.2.57
+
+1. 支持独立添加公钥到开发者工具中去 `lzc-cli box add-public-key`
+2. 支持选择使用公钥类型，不再优先使用 id_ed25519
+3. 添加 nodejs 版本检测, 要求最低版本 >=18
+4. 添加 dns 解析错误提示
+
+# 1.2.56
+
+1. 修复没有写权限的lpk文件，不能通过 lzc-cli app install 安装
+
 # 1.2.55
 
 1. 添加 lzc-docker 命令

package/lib/app/apkshell.js

@@ -1,6 +1,20 @@
 import fs from "node:fs"
 import logger from "loglevel"
-import { api } from "../utils.js"
+import axios from "axios"
+
+// 创建 Axios 实例
+const api = axios.create()
+
+// 添加响应拦截器
+api.interceptors.response.use(
+  (response) => response, // 直接返回响应
+  (error) => {
+    if (error.response && error.response.status === 304) {
+      return Promise.resolve(error.response) // 返回响应以便后续处理
+    }
+    return Promise.reject(error) // 其他错误继续抛出
+  }
+)
 
 export async function triggerApk(id, name, iconPath) {
   if (!id) {

package/lib/app/lpk_build.js

@@ -293,8 +293,17 @@ export class LpkBuild {
           return await curr(await prev, this.options)
         }, manifest)
       }
-      logger.debug("manifest\n", manifest)
-      dumpToYaml(manifest, path.join(tempDir, "manifest.yml"))
+
+      if (process.env.LZC_MANIFEST_TEMPLATE) {
+        logger.debug("copy origin manifest\n", this.manifestFilePath)
+        fs.copyFileSync(
+          this.manifestFilePath,
+          path.join(tempDir, "manifest.yml")
+        )
+      } else {
+        logger.debug("manifest\n", manifest)
+        dumpToYaml(manifest, path.join(tempDir, "manifest.yml"))
+      }
 
       // 打包 lpk
       if (this.beforeDumpLpkFn.length > 0) {

package/lib/box/index.js

@@ -1,4 +1,6 @@
+import logger from "loglevel"
 import shellapi from "../shellapi.js"
+import { findSshPublicKey, selectSshPublicKey } from "../utils.js"
 
 export function boxCommand(box) {
   let subCommands = [
@@ -51,6 +53,22 @@ export function boxCommand(box) {
         })
         console.table(list)
       }
+    },
+    {
+      command: "add-public-key",
+      desc: "添加public-key到开发者工具中",
+      handler: async () => {
+        await shellapi.init()
+        const keys = await findSshPublicKey()
+        const sshInfo = await selectSshPublicKey(keys)
+        logger.debug("ssh public key info", sshInfo)
+        const pk = Buffer.from(sshInfo.content.trimLeft()).toString("base64")
+        logger.warn(
+          `请点击下面的连接，或者复制到浏览器中打开，点击申请完成添加
+-> https://dev.${shellapi.boxname}.heiyu.space/auth?key=${pk}
+`
+        )
+      }
     }
   ]
   box.command({

package/lib/debug_bridge.js

@@ -7,6 +7,7 @@ import {
   resolveDomain,
   sleep,
   findSshPublicKey,
+  selectSshPublicKey,
   isWindows,
   contextDirname,
   compareVersions
@@ -91,13 +92,18 @@ export class DebugBridge {
     try {
       await this.common(sshBinary(), [...sshCmdArgs(`box@${this.domain}`)])
       return true
-    } catch {
+    } catch (err) {
+      logger.debug("canPublicKey error: ", err)
       return false
     }
   }
 
   async sshApplyGrant() {
-    const sshInfo = await findSshPublicKey()
+    const keys = await findSshPublicKey()
+    logger.info(
+      "检测到您当前的环境还没有添加 ssh 公钥到 ‘懒猫开发者工具’ 中，请选择您需要添加的公钥类型"
+    )
+    const sshInfo = await selectSshPublicKey(keys)
     logger.debug("ssh public key info", sshInfo)
 
     const pk = Buffer.from(sshInfo.content.trimLeft()).toString("base64")

package/lib/utils.js

@@ -15,11 +15,12 @@ import process from "node:process"
 import spawn from "cross-spawn"
 import logger from "loglevel"
 import * as tar from "tar"
-import dns from "node:dns/promises"
-import axios from "axios"
+import dns from "node:dns"
 import AdmZip from "adm-zip"
 import commandExists from "command-exists"
 import fetch from "node-fetch"
+import semver from "semver"
+import inquirer from "inquirer"
 
 // lzc-cli 包的 pkgInfo 信息
 export const pkgInfo = JSON.parse(
@@ -28,6 +29,24 @@ export const pkgInfo = JSON.parse(
   )
 )
 
+export function checkNodejsVersion() {
+  const requiredVersion = pkgInfo.engines.node
+  if (!semver.satisfies(process.version, requiredVersion)) {
+    logger.error(
+      `检测到您当前的 nodejs 版本 ${process.version} 不匹配，lzc-cli 最低要求 nodejs 版本为 ${requiredVersion}, 请升级`
+    )
+    process.exit(1)
+  }
+
+  // 如果版本小于 21.0.0 且大于等于 16.15.0，禁用 Fetch API 实验性警告
+  if (
+    semver.lt(process.version, "21.0.0") &&
+    semver.gte(process.version, "16.15.0")
+  ) {
+    process.removeAllListeners("warning")
+  }
+}
+
 export async function getLatestVersion(controller, pkgName = pkgInfo.name) {
   const url = `https://data.jsdelivr.com/v1/package/npm/${pkgName}`
   try {
@@ -49,20 +68,6 @@ export async function getLatestVersion(controller, pkgName = pkgInfo.name) {
   }
 }
 
-// 创建 Axios 实例
-export const api = axios.create()
-
-// 添加响应拦截器
-api.interceptors.response.use(
-  (response) => response, // 直接返回响应
-  (error) => {
-    if (error.response && error.response.status === 304) {
-      return Promise.resolve(error.response) // 返回响应以便后续处理
-    }
-    return Promise.reject(error) // 其他错误继续抛出
-  }
-)
-
 export const isMacOs = process.platform == "darwin"
 export const isLinux = process.platform == "linux"
 export const isWindows = process.platform == "win32"
@@ -282,12 +287,10 @@ export function isDirExist(path) {
 
 export function isFileExist(path) {
   try {
-    fs.accessSync(
-      path,
-      fs.constants.W_OK | fs.constants.R_OK | fs.constants.F_OK
-    )
+    fs.accessSync(path, fs.constants.R_OK | fs.constants.F_OK)
     return true
-  } catch {
+  } catch (err) {
+    logger.debug(`access ${path} error: ${err}`)
     return false
   }
 }
@@ -458,31 +461,45 @@ export function isTraceMode() {
   return logger.getLevel() <= logger.levels.TRACE
 }
 
+// 没有直接使用 dns/promise，因为这个 dns/promise 是在 15.0.0 后加入，如果低版本
+// 会直接报错，连版本检测都到不了(包导入的太前面了)
+async function __resolveDomain(domain, ipv6 = false) {
+  return new Promise((resolve, reject) => {
+    const callback = function (err, addresses) {
+      if (addresses && addresses.length > 0) {
+        resolve(addresses[0])
+      } else {
+        logger.trace("dns resolve error: ", err)
+        reject(err)
+      }
+    }
+    if (ipv6) {
+      dns.resolve6(domain, callback)
+    } else {
+      dns.resolve4(domain, callback)
+    }
+  })
+}
+
 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([
-      dns.resolve6(domain),
-      dns.resolve4(domain)
+      __resolveDomain(domain, true),
+      __resolveDomain(domain, false)
     ])
-    let resolvedAddress
-    if (
-      ipv6Addresses.status === "fulfilled" &&
-      ipv6Addresses.value.length > 0
-    ) {
-      resolvedAddress = ipv6Addresses.value[0]
-    } else if (
-      ipv4Addresses.status === "fulfilled" &&
-      ipv4Addresses.value.length > 0
-    ) {
-      resolvedAddress = ipv4Addresses.value[0]
+    if (ipv6Addresses.status == "fulfilled") {
+      return ipv6Addresses.value
+    } else if (ipv4Addresses.status != "fulfilled") {
+      return ipv4Addresses.value
     } else {
-      throw new Error(`无法解析域名 ${domain}`)
+      throw `无法解析域名 ${domain}`
     }
-    return resolvedAddress
   } catch (error) {
-    throw new Error(`无法解析域名 ${domain}: ${error.message}`)
+    logger.error("resolve domain: ", error)
+    throw `无法解析域名 ${domain}: ${error}`
   }
 }
 
@@ -510,6 +527,24 @@ export function unzipSync(zipPath, destPath, entries = []) {
   }
 }
 
+export async function selectSshPublicKey(avaiableKeys) {
+  const keyNames = avaiableKeys.map((k) => k.path)
+  const selected = (
+    await inquirer.prompt([
+      {
+        name: "type",
+        message: "选择使用的公钥",
+        type: "list",
+        choices: keyNames
+      }
+    ])
+  )["type"]
+  return {
+    path: selected,
+    content: fs.readFileSync(selected, "utf8")
+  }
+}
+
 export function findSshPublicKey() {
   // 获取用户 HOME 目录
   let homeDir
@@ -554,6 +589,7 @@ export function findSshPublicKey() {
     "id_dsa.pub"
   ]
 
+  let avaiableKeys = []
   try {
     // 获取 .ssh 目录下所有文件
     const files = fs.readdirSync(sshDir)
@@ -565,10 +601,10 @@ export function findSshPublicKey() {
         // 验证文件是否可读
         try {
           fs.accessSync(keyPath, fs.constants.R_OK)
-          return {
-            path: keyPath,
-            content: fs.readFileSync(keyPath, "utf8")
-          }
+          avaiableKeys.push({
+            keyName,
+            path: keyPath
+          })
         } catch (error) {
           console.warn(`Found ${keyName} but cannot read it:`, error.message)
           continue
@@ -576,23 +612,13 @@ export function findSshPublicKey() {
       }
     }
 
-    // 如果没找到优先级列表中的公钥，查找任何 .pub 结尾的文件
-    const pubKey = files.find((file) => file.endsWith(".pub"))
-    if (pubKey) {
-      const keyPath = path.join(sshDir, pubKey)
-      try {
-        fs.accessSync(keyPath, fs.constants.R_OK)
-        return {
-          path: keyPath,
-          content: fs.readFileSync(keyPath, "utf8")
-        }
-      } catch (error) {
-        throw new Error(`Found ${pubKey} but cannot read it: ${error.message}`)
-      }
+    if (avaiableKeys.length == 0) {
+      throw new Error(
+        ".ssh 目录没有没有找到任何 .pub 公钥. 请使用 ssh-keygen 生成"
+      )
+    } else {
+      return avaiableKeys
     }
-    throw new Error(
-      ".ssh 目录没有没有找到任何 .pub 公钥. 请使用 ssh-keygen 生成"
-    )
   } catch (error) {
     if (error.code === "ENOENT") {
       throw new Error("不能查询 .ssh 目录")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.55",
+  "version": "1.2.57",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "prepublishOnly": "node check-changelog.js"
@@ -11,6 +11,9 @@
     "lib",
     "changelog.md"
   ],
+  "engines": {
+    "node": ">=18"
+  },
   "bin": {
     "lzc-cli": "scripts/cli.js",
     "lzc-docker": "scripts/lzc-docker.js",
@@ -47,6 +50,7 @@
     "lodash.mergewith": "^4.6.2",
     "loglevel": "^1.9.1",
     "node-fetch": "^3.3.2",
+    "semver": "^7.6.3",
     "tar": "^7.4.3",
     "yargs": "^17.7.2"
   },

package/scripts/cli.js

@@ -7,7 +7,12 @@ import yargs from "yargs"
 import { hideBin } from "yargs/helpers"
 import "../lib/log.js" // init logger
 
-import { contextDirname, pkgInfo, getLatestVersion } from "../lib/utils.js"
+import {
+  contextDirname,
+  pkgInfo,
+  getLatestVersion,
+  checkNodejsVersion
+} from "../lib/utils.js"
 import { boxCommand } from "../lib/box/index.js"
 import { appstoreCommand } from "../lib/appstore/index.js"
 import { lpkAppCommand, lpkProjectCommand } from "../lib/app/index.js"
@@ -56,8 +61,9 @@ lzcDockerCommand(program)
 
 // 当没有参数的时候，默认显示帮助。
 ;(async () => {
-  const controller = new AbortController()
+  checkNodejsVersion()
 
+  const controller = new AbortController()
   const parser = program
     .strict()
     .showHelpOnFail(false, "使用 lzc-cli help 查看更多帮助")