@lazycatcloud/lzc-cli 1.2.46 → 1.2.48

package/changelog.md

@@ -1,3 +1,8 @@
+# 1.2.48
+
+1. 添加 rsync 版本限制
+2. 修复触发生成 apk-shell api 变更
+
 # 1.2.46
 
 1. 修复拉取构建的镜像dns错误

package/lib/app/apkshell.js

@@ -16,7 +16,7 @@ export async function triggerApk(id, name, iconPath) {
       form.append("app_icon", new Blob([fs.readFileSync(iconPath)]))
     }
     const resp = await api.post(
-      "https://appstore.lazycat.cloud/api/trigger_latest_for_app",
+      "https://appstore.api.lazycat.cloud/api/trigger_latest_for_app",
       form,
       { timeout: 5000 }
     )

package/lib/app/index.js

@@ -4,7 +4,7 @@ import { LpkBuild } from "./lpk_build.js"
 import { AppDevShell } from "./lpk_devshell.js"
 import { LpkInstaller, installConfig } from "./lpk_installer.js"
 import logger from "loglevel"
-import { sleep } from "../utils.js"
+import { sleep, checkRsync } from "../utils.js"
 import { DebugBridge } from "./lpk_debug_bridge.js"
 import shellApi from "../shellapi.js"
 import { generate } from "./lpk_create_generator.js"
@@ -84,6 +84,9 @@ export function lpkProjectCommand(program) {
       },
       handler: async ({ context, force, config, contentdir, apk }) => {
         await shellApi.init()
+        // 检测 rsync 满足
+        await checkRsync()
+
         installConfig.apk = apk == "y"
         const cwd = context ? path.resolve(context) : process.cwd()
         const lpkBuild = await new LpkBuild(cwd, config).init()

package/lib/app/lpk_devshell.js

@@ -21,8 +21,7 @@ import {
   resolveDomain,
   isWindows,
   isMacOs,
-  isLinux,
-  checkRsync
+  isLinux
 } from "../utils.js"
 import os from "node:os"
 import chokidar from "chokidar"
@@ -425,10 +424,14 @@ export class AppDevShell {
     }
 
     const devshell = new DevShell(pkgId, this.isUserApp)
-    if (isSync) {
-      await devshell.shell()
-    } else {
-      await devshell.connectShell()
+    try {
+      if (isSync) {
+        await devshell.shell()
+      } else {
+        await devshell.connectShell()
+      }
+    } catch (e) {
+      logger.error(`devshell 错误: ${e}`)
     }
     logger.debug("exit shell")
     // TODO: shell 在正常情况下，按 Ctrl-D 就会退出，回到原来的本地的 shell ，但
@@ -444,8 +447,6 @@ class DevShell {
   }
 
   async syncProject(appId) {
-    checkRsync()
-
     const resolvedIp = await resolveDomain(
       `dev.${shellApi.boxname}.heiyu.space`
     )
@@ -555,7 +556,6 @@ class DevShell {
         await this.syncProject(this.appId)
       })
     } catch (e) {
-      console.log(e)
       return Promise.reject(e)
     }
   }

package/lib/utils.js

@@ -619,34 +619,32 @@ export function findSshPublicKey() {
 }
 
 export function checkRsync() {
-  if (isLinux || isMacOs) {
-    // 检查rsync工具是否存在:提示用户
-    const rsyncExisted = commandExists.sync("rsync")
-    if (!rsyncExisted) {
-      logger.error("请检查 rsync 是否安装，路径是否正确!")
-      process.exit(1)
-    }
+  return new Promise((resolve, reject) => {
+    if (isLinux || isMacOs) {
+      // 检查rsync工具是否存在:提示用户
+      const rsyncExisted = commandExists.sync("rsync")
+      if (!rsyncExisted) {
+        reject("请检查 rsync 是否安装，路径是否正确!")
+      }
 
-    const check = spawn.sync("rsync", ["--version"], {
-      shell: true,
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"]
-    })
-    logger.debug(`执行命令 rsync --version`)
-    if (check.status == 0) {
-      const versionMatch = check.stdout.match(
-        /rsync\s+version\s+(\d+\.\d+\.\d+)/i
-      )
-      if (!versionMatch || compareVersions("3.2.0", versionMatch[1]) < 0) {
-        logger.error(
-          `当前rsync版本为:${versionMatch[1]}, 要求rsync版本为: 3.2.0+`
+      const check = spawn.sync("rsync", ["--version"], {
+        shell: true,
+        encoding: "utf-8",
+        stdio: ["pipe", "pipe", "pipe"]
+      })
+      logger.debug(`执行命令 rsync --version`)
+      if (check.status == 0) {
+        const versionMatch = check.stdout.match(
+          /rsync\s+version\s+(\d+\.\d+\.\d+)/i
         )
-        process.exit(1)
+        if (!versionMatch || compareVersions("3.2.0", versionMatch[1]) < 0) {
+          reject(`当前rsync版本为:${versionMatch[1]}, 要求rsync版本为: 3.2.0+`)
+        }
+        logger.debug(`当前rsync版本为:${versionMatch[1]}`)
+      } else {
+        reject("请检查 rsync 安装是否正确，指定 rsync --version 错误")
       }
-      logger.debug(`当前rsync版本为:${versionMatch[1]}`)
-    } else {
-      logger.error("请检查 rsync 安装是否正确，指定 rsync --version 错误")
-      process.exit(1)
     }
-  }
+    resolve()
+  })
 }

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.46",
+  "version": "1.2.48",
   "description": "lazycat cloud developer kit",
+  "scripts": {
+    "prepublishOnly": "node check-changelog.js"
+  },
   "files": [
     "template",
     "scripts",