@lazycatcloud/lzc-cli 1.2.42 → 1.2.44

package/README.md

@@ -31,3 +31,5 @@ lzc-cli project devshell
 # 经过测试后，将包发布到懒猫云商店中去
 lzc-cli appstore publish
 ```
+
+[changelog](./changelog.md)

package/changelog.md

@@ -0,0 +1,47 @@
+# 1.2.44
+
+1. 修复查询状态等接口没有使用ipv6地址
+2. 修复 rsync 进程没有系统环境变量
+
+# 1.2.43
+
+1. 支持通过命令行注册应用，新上架的应用不再需要通过界面配置
+
+# 1.2.42
+
+1. 限制 subdomain 为空时，构建和安装失败
+2. 修复创建的模板中没有带上 .gitingore 文件
+
+# 1.2.41
+
+1. 使用 rsync daemon 修复 Windows 系统下 rsync 无法使用本机原生 ssh 传输
+
+# 1.2.39
+
+1. 修复 Windows 系统下，无法构建和安装问题
+
+# 1.2.38
+
+1. 修复 Windows 系统下，buildscript 脚本执行错误，导致无法构建
+
+# 1.2.37
+
+1. 修复 Windows 系统下，构建包时获取 LocalIP 错误
+
+# 1.2.34
+
+1. devshell 模式下，默认打开后台常驻
+
+# 1.2.29
+
+1. 修复开发者第一次devshelll需要填写密码,需要安装最新开发者工具(0.1.6)
+2. 调整文案,移除不必要的日志
+
+# 1.2.28
+
+1. 简化创建项目流程
+2. 支持自动请求生成安卓所需要apk包
+
+# 1.2.27
+
+1. 修复第一次使用开发者 `dns` 生效慢的问题

package/lib/app/lpk_debug_bridge.js

@@ -41,17 +41,18 @@ export class DebugBridge {
 
   async common(cmd, args) {
     const resolvedIp = await resolveDomain(this.domain)
-    const resolvedCmd = cmd.replace(this.domain, resolvedIp)
-    const ssh = spawn.sync(resolvedCmd, args, {
+    args = args.map((arg) => arg.replace(this.domain, resolvedIp))
+    const ssh = spawn.sync(cmd, args, {
       shell: true,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     })
+    logger.debug(`执行命令 ${cmd} ${args.join(" ")}`)
     return new Promise((resolve, reject) => {
       ssh.status == 0
         ? resolve(ssh.stdout)
         : reject(
-            `执行命令 ${resolvedCmd} ${args.join(" ")} 出错\n${ssh.stderr ?? ""}`
+            `执行命令 ${cmd} ${args.join(" ")} 出错\n${ssh.stdout ?? ""}\n${ssh.stderr ?? ""}`
           )
     })
   }

package/lib/app/lpk_devshell.js

@@ -486,7 +486,7 @@ class DevShell {
       ]
       logger.debug("同步代码: ", rsyncCmd, rsyncArgs.join(" "))
       const rsyncStream = spawn.sync(rsyncCmd, rsyncArgs, {
-        env: { RSYNC_PASSWORD: "fakefakefake" },
+        env: { ...process.env, RSYNC_PASSWORD: "fakefakefake" },
         shell: true,
         stdio: ["ignore", isDebugMode() ? "inherit" : "ignore", "inherit"]
       })

package/lib/appstore/publish.js

@@ -4,7 +4,13 @@ import FormData from "form-data"
 import fs from "node:fs"
 import inquirer from "inquirer"
 import path from "node:path"
-import { isFileExist, isPngWithFile, unzipSync } from "../utils.js"
+import {
+  isFileExist,
+  isPngWithFile,
+  unzipSync,
+  loadFromYaml,
+  isValidPackageName
+} from "../utils.js"
 
 async function askChangeLog() {
   const noEmpty = (value) => value != ""
@@ -18,6 +24,112 @@ async function askChangeLog() {
   ])
 }
 
+async function getCategories(baseUrl) {
+  const response = await request(`${baseUrl}/categories`, { method: "GET" })
+  const data = await response.json()
+  return data
+    .sort((a, b) => a.index - b.index)
+    .map((cat) => ({
+      name: cat.name,
+      value: cat.name
+    }))
+}
+
+async function askPublishAppInfo(baseUrl, manifest) {
+  // 获取分类列表
+  const categories = await getCategories(baseUrl)
+
+  const questions = [
+    {
+      type: "input",
+      name: "name",
+      message: "请输入应用名称:",
+      default: manifest["name"],
+      validate: (input) => (input.trim() !== "" ? true : "应用名称不能为空")
+    },
+    {
+      type: "input",
+      name: "appId",
+      message: "请输入应用ID:",
+      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: ""
+    },
+    {
+      type: "input",
+      name: "source",
+      message: "请输入应用来源:",
+      default: manifest["homepage"] || ""
+    },
+    {
+      type: "input",
+      name: "author",
+      message: "请输入作者名称:",
+      default: manifest["author"] || ""
+    }
+  ]
+
+  const answers = await inquirer.prompt(questions)
+  return answers
+}
+
+async function askWhetherCreateLPK(baseUrl, manifest) {
+  const answers = await inquirer.prompt([
+    {
+      name: "continue",
+      type: "input",
+      message:
+        "检测到您当前的应用，还没有在懒猫微服中创建，是否使用当前的安装包中的信息进行创建？ [y/n]",
+      default: "y"
+    }
+  ])
+  if (answers.continue.toLowerCase() === "y") {
+    const appInfo = await askPublishAppInfo(baseUrl, manifest)
+    const crateAppRes = await request(`${baseUrl}/apps`, {
+      method: "POST",
+      body: JSON.stringify(appInfo)
+    })
+    logger.debug("create app res: ", await crateAppRes.text())
+    logger.info(`创建 ${manifest["package"]} 应用成功!`)
+  } else {
+    logger.info(`当前想发布的应用没有在 '懒猫微服的开发者中心' 创建，请按照以下步骤创建:
+
+1. 浏览器打开 https://developer.lazycat.cloud/manage
+2. 登录您的开发者帐号
+3. 登录成功后，您可以查看到您帐号中的应用，同时您也可以对您的应用进行管理
+4. 点击 '新增'，根据您的应用信息进行填写
+5. 填写完成后，点击创建即可
+6. 创建成功后，您可以通过 'lzc-cli appstore publish' 来发布应用了
+`)
+    process.exit(1)
+  }
+}
+
 export class Publish {
   constructor(baseUrl = "https://developer.lazycat.cloud/api/v2/developer") {
     this.baseUrl = baseUrl
@@ -53,6 +165,27 @@ export class Publish {
     }
   }
 
+  async checkAppIdExist(pkgPath) {
+    const tempDir = fs.mkdtempSync(".lzc-cli-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 res = await request(checkUrl, { method: "GET" })
+      if (res.status >= 400) {
+        logger.error("检测应用是否存在出错, 错误状态码为: ", res.status)
+        logger.error(await res.text())
+        return { manifest, appIdExisted: true } // 默认认为已经存在
+      } else {
+        const text = (await res.text()).trim()
+        logger.debug(`check appId[${manifest["package"]}] exist: ${text}`)
+        return { manifest, appIdExisted: text == "true" }
+      }
+    } finally {
+      fs.rmSync(tempDir, { recursive: true })
+    }
+  }
+
   /**
    * @param {string} pkgPath
    * @param {string} changelog
@@ -60,6 +193,11 @@ export class Publish {
   async publish(pkgPath, changelog) {
     if (!Publish.preCheck(pkgPath)) return
 
+    const { manifest, appIdExisted } = await this.checkAppIdExist(pkgPath)
+    if (!appIdExisted) {
+      await askWhetherCreateLPK(this.baseUrl, manifest)
+    }
+
     await autoLogin()
 
     if (!changelog) {

package/lib/utils.js

@@ -475,6 +475,10 @@ export async function resolveDomain(domain) {
 }
 
 export function unzipSync(zipPath, destPath, entries = []) {
+  if (!isFileExist(zipPath)) {
+    throw `${zipPath} 找不到该文件`
+  }
+
   // 确保目标目录存在
   fs.mkdirSync(destPath, { recursive: true })
   // 创建 zip 实例

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.42",
+  "version": "1.2.44",
   "description": "lazycat cloud developer kit",
   "files": [
     "template",
     "scripts",
-    "lib"
+    "lib",
+    "changelog.md"
   ],
   "bin": {
     "lzc-cli": "./scripts/cli.js"

package/scripts/cli.js

@@ -19,6 +19,7 @@ import env from "../lib/env.js"
 // logger level middleware
 const logLevelOriginalFactory = logger.methodFactory
 logger.methodFactory = function (methodName, logLevel, loggerName) {
+  let debug = logLevel <= logger.levels.DEBUG
   let rawMethod = logLevelOriginalFactory(methodName, logLevel, loggerName)
   return function (...args) {
     let color = (msg) => chalk.gray
@@ -41,7 +42,7 @@ logger.methodFactory = function (methodName, logLevel, loggerName) {
     }
     const prefix = loggerName ?? methodName
     rawMethod(
-      `[${prefix}] ` +
+      (debug ? `[${prefix}] ` : "") +
         args
           .map((a) => {
             let res = a