@lazycatcloud/lzc-cli 1.2.41 → 1.2.43

package/changelog.md

@@ -0,0 +1,42 @@
+# 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_build.js

@@ -187,6 +187,11 @@ export class LpkBuild {
     if (!isValidPackageName(this.manifest["package"])) {
       throw `${this.manifest["package"]} 含有非法字符，请使用正确的包名格式(java的包名格式)，如：cloud.lazycat.apps.video`
     }
+
+    if (!this.manifest["application"]["subdomain"]) {
+      throw `application 模块下的 subdomain 字段不能为空`
+    }
+
     return this.manifest
   }
 

package/lib/app/lpk_create.js

@@ -28,7 +28,11 @@ export class LpkManifest {
     if (!manifestFilePath) {
       manifestFilePath = path.join(
         this.pwd,
-        "../../template/_lpk/manifest.yml.in"
+        "..",
+        "..",
+        "template",
+        "_lpk",
+        "manifest.yml.in"
       )
     }
 
@@ -88,7 +92,11 @@ export class TemplateInit {
     // 优先使用模板项目自定义的模板文件
     const typeTemplatePath = path.join(
       contextDirname(import.meta.url),
-      `../../template/_lpk/${this.type}.manifest.yml.in`
+      "..",
+      "..",
+      "template",
+      "_lpk",
+      `${this.type}.manifest.yml.in`
     )
     const templatePath = isFileExist(typeTemplatePath) ? typeTemplatePath : ""
     await this.lpkManifest.init(templatePath, true)

package/lib/app/lpk_create_generator.js

@@ -10,10 +10,10 @@ import logger from "loglevel"
 const __dirname = contextDirname(import.meta.url)
 
 async function loadFiles(dirPath, prefix = "") {
-  const templateRoot = path.join(__dirname, "../../template/")
+  const templateRoot = path.join(__dirname, "..", "..", "template")
   const templateDir = path.join(templateRoot, dirPath)
 
-  const _files = await glob(["**/*"], { cwd: templateDir })
+  const _files = await glob(["**/*", "**/.*", ".*"], { cwd: templateDir })
   let content
   let files = {}
   for (let p of _files) {
@@ -59,7 +59,11 @@ function appendREADME(dir) {
   const readme = path.resolve(dir, "README.md")
   const readmeTemplate = path.resolve(
     __dirname,
-    "../../template/_lpk/README.md"
+    "..",
+    "..",
+    "template",
+    "_lpk",
+    "README.md"
   )
   if (!isFileExist(readme)) {
     fs.copyFileSync(readmeTemplate, readme)
@@ -85,14 +89,22 @@ function vueTemplate(type) {
 
       const lzcBuildTemplatePath = path.resolve(
         __dirname,
-        `../../template/_lpk/vue.lzc-build.yml.in`
+        "..",
+        "..",
+        "template",
+        "_lpk",
+        "vue.lzc-build.yml.in"
       )
       logger.debug("复制", lzcBuildTemplatePath)
       fs.copyFileSync(lzcBuildTemplatePath, path.resolve(name, "lzc-build.yml"))
 
       const iconPngPath = path.resolve(
         __dirname,
-        "../../template/_lpk/lazycat.png"
+        "..",
+        "..",
+        "template",
+        "_lpk",
+        "lazycat.png"
       )
       fs.copyFileSync(iconPngPath, path.resolve(name, "lazycat.png"))
 

package/lib/app/lpk_installer.js

@@ -93,8 +93,12 @@ export class LpkInstaller {
     const tempDir = fs.mkdtempSync(".lzc-cli-install")
     let manifest
     try {
-      unzipSync(pkgPath, tempDir)
+      unzipSync(pkgPath, tempDir, ["manifest.yml", "icon.png"])
       manifest = loadFromYaml(path.join(tempDir, "manifest.yml"))
+      if (!manifest["application"]["subdomain"]) {
+        throw "manifest.yml 中的 `application.subdomain` 字段不能为空"
+      }
+
       logger.debug("是否生成APK:", installConfig.apk)
       if (installConfig.apk) {
         await triggerApk(

package/lib/appstore/prePublish.js

@@ -6,6 +6,7 @@ import inquirer from "inquirer"
 import path from "node:path"
 import { isFileExist, isPngWithFile, unzipSync } from "../utils.js"
 import env from "../env.js"
+import { Publish } from "./publish.js"
 
 async function askChangeLog() {
   const noEmpty = (value) => value != ""
@@ -37,36 +38,6 @@ export class PrePublish {
     this.baseUrl = baseUrl
   }
 
-  /**
-   * @param {string} raw
-   */
-  isJSON(raw) {
-    const ml = raw.length
-    if (ml <= 1) return false
-    return raw[0] == "{" && raw[ml - 1] == "}"
-  }
-
-  preCheck(pkgPath) {
-    const tempDir = fs.mkdtempSync(".lzc-cli-publish")
-    try {
-      unzipSync(pkgPath, tempDir)
-      if (isFileExist(path.join(tempDir, "devshell"))) {
-        logger.error(
-          "不能发布一个devshell的版本，请重新使用 `lzc-cli project build` 构建"
-        )
-        return false
-      }
-      const tempIcon = path.join(tempDir, "icon.png")
-      if (!isFileExist(tempIcon) || !isPngWithFile(tempIcon)) {
-        logger.error("icon 必须是 png 格式")
-        return false
-      }
-      return true
-    } finally {
-      fs.rmSync(tempDir, { recursive: true })
-    }
-  }
-
   async getDict() {
     const url = this.baseUrl + "/groups/dict"
     const token = env.get("token")
@@ -77,7 +48,7 @@ export class PrePublish {
       }
     })
     const text = (await res.text()).trim()
-    if (!this.isJSON(text)) {
+    if (!Publish.isJSON(text)) {
       logger.error(`parse error: dict resp text not is json`)
       return
     }
@@ -101,7 +72,7 @@ export class PrePublish {
       }
     })
     const text = (await res.text()).trim()
-    if (!this.isJSON(text)) {
+    if (!Publish.isJSON(text)) {
       logger.error(`parse error: upload resp text not is json`)
       return
     }
@@ -115,7 +86,7 @@ export class PrePublish {
    * @param {string} changelog
    */
   async publish(pkgPath, changelog, gid) {
-    if (!this.preCheck(pkgPath)) return
+    if (!Publish.preCheck(pkgPath)) return
 
     await autoLogin()
 

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
@@ -26,16 +138,16 @@ export class Publish {
   /**
    * @param {string} raw
    */
-  isJSON(raw) {
+  static isJSON(raw) {
     const ml = raw.length
     if (ml <= 1) return false
     return raw[0] == "{" && raw[ml - 1] == "}"
   }
 
-  preCheck(pkgPath) {
+  static preCheck(pkgPath) {
     const tempDir = fs.mkdtempSync(".lzc-cli-publish")
     try {
-      unzipSync(pkgPath, tempDir)
+      unzipSync(pkgPath, tempDir, ["devshell", "icon.png"])
       if (isFileExist(path.join(tempDir, "devshell"))) {
         logger.error(
           "不能发布一个devshell的版本，请重新使用 `lzc-cli project build` 构建"
@@ -44,7 +156,7 @@ export class Publish {
       }
       const tempIcon = path.join(tempDir, "icon.png")
       if (!isFileExist(tempIcon) || !isPngWithFile(tempIcon)) {
-        logger.error("icon 必须是 png 格式")
+        logger.error("icon 必须存在且要求是 png 格式")
         return false
       }
       return true
@@ -53,12 +165,38 @@ 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
    */
   async publish(pkgPath, changelog) {
-    if (!this.preCheck(pkgPath)) return
+    if (!Publish.preCheck(pkgPath)) return
+
+    const { manifest, appIdExisted } = await this.checkAppIdExist(pkgPath)
+    if (!appIdExisted) {
+      await askWhetherCreateLPK(this.baseUrl, manifest)
+    }
 
     await autoLogin()
 
@@ -80,7 +218,7 @@ export class Publish {
       body: form
     })
     const text = (await res.text()).trim()
-    if (!this.isJSON(text)) {
+    if (!Publish.isJSON(text)) {
       logger.info("upload lpk fail", text)
       return
     }

package/lib/utils.js

@@ -474,14 +474,28 @@ export async function resolveDomain(domain) {
   }
 }
 
-export function unzipSync(zipPath, destPath) {
+export function unzipSync(zipPath, destPath, entries = []) {
+  if (!isFileExist(zipPath)) {
+    throw `${zipPath} 找不到该文件`
+  }
+
   // 确保目标目录存在
   fs.mkdirSync(destPath, { recursive: true })
   // 创建 zip 实例
   const zip = new AdmZip(zipPath)
 
-  // 同步解压所有文件
-  zip.extractAllTo(destPath, true)
+  if (entries.length > 0) {
+    entries.forEach((entry) => {
+      try {
+        zip.extractEntryTo(entry, destPath, false, true)
+      } catch {
+        logger.debug(`压缩包中没有找到 ${entry} 文件`)
+      }
+    })
+  } else {
+    // 同步解压所有文件
+    zip.extractAllTo(destPath, true)
+  }
 }
 
 export function findSshPublicKey() {

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.41",
+  "version": "1.2.43",
   "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

package/template/lite/_gitignore

@@ -0,0 +1,4 @@
+**/*.lpk
+**/*.tar.gz
+**/*.md5
+/.pushed.timestamp

package/template/vue/_gitignore

@@ -0,0 +1,25 @@
+.DS_Store
+node_modules
+dist
+*.lpk
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+.temp
+.cache