@lazycatcloud/lzc-cli 1.2.45 → 1.2.47

package/changelog.md

@@ -1,3 +1,11 @@
+# 1.2.46
+
+1. 修复拉取构建的镜像dns错误
+
+# 1.2.45
+
+1. 修复 helloworld 404 错误
+
 # 1.2.44
 
 1. 修复查询状态等接口没有使用ipv6地址

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_debug_bridge.js

@@ -8,7 +8,8 @@ import {
   sleep,
   findSshPublicKey,
   isWindows,
-  contextDirname
+  contextDirname,
+  compareVersions
 } from "../utils.js"
 import logger from "loglevel"
 import commandExists from "command-exists"
@@ -142,6 +143,20 @@ export class DebugBridge {
     ])
   }
 
+  async version() {
+    const output = await this.common(sshBinary(), [
+      ...sshCmdArgs(`box@${this.domain}`),
+      `version`
+    ])
+    logger.debug(`backend version:\n${output}`)
+    try {
+      const data = JSON.parse(output)
+      return data.version
+    } catch {
+      return "0.0.0"
+    }
+  }
+
   async uninstall(appId) {
     return this.common(sshBinary(), [
       ...sshCmdArgs(`box@${this.domain}`),
@@ -193,6 +208,8 @@ export class DebugBridge {
   }
 
   async buildImage(label, contextTar) {
+    const backendVersion = await this.version()
+
     const tag = `debug.bridge/${label}`
     const resolvedIp = await resolveDomain(this.domain)
     const stream = fs.createReadStream(contextTar)
@@ -209,8 +226,12 @@ export class DebugBridge {
     return new Promise((resolve, reject) => {
       buildStream.on("close", (code) => {
         code == 0
-          ? resolve(`dev.${this.boxname}.heiyu.space/${tag}`)
-          : reject("在盒子中构建 image 失败")
+          ? resolve(
+              compareVersions("0.1.12", backendVersion) >= 0
+                ? `localhost:5000/${tag}`
+                : `dev.${this.boxname}.heiyu.space/${tag}`
+            )
+          : reject(`在盒子中构建 image 失败`)
       })
     }).finally(() => {
       fs.rmSync(contextTar)

package/lib/app/lpk_devshell.js

@@ -24,7 +24,6 @@ import {
   isLinux
 } from "../utils.js"
 import os from "node:os"
-import commandExists from "command-exists"
 import chokidar from "chokidar"
 import _ from "lodash"
 import { DebugBridge } from "./lpk_debug_bridge.js"
@@ -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,15 +447,6 @@ class DevShell {
   }
 
   async syncProject(appId) {
-    if (isLinux || isMacOs) {
-      // 检查rsync工具是否存在:提示用户
-      const rsyncExisted = commandExists.sync("rsync")
-      if (!rsyncExisted) {
-        logger.error("请检查 rsync 是否安装，路径是否正确!")
-        process.exit(1)
-      }
-    }
-
     const resolvedIp = await resolveDomain(
       `dev.${shellApi.boxname}.heiyu.space`
     )
@@ -562,7 +556,6 @@ class DevShell {
         await this.syncProject(this.appId)
       })
     } catch (e) {
-      console.log(e)
       return Promise.reject(e)
     }
   }

package/lib/utils.js

@@ -18,6 +18,14 @@ import * as tar from "tar"
 import dns from "node:dns/promises"
 import axios from "axios"
 import AdmZip from "adm-zip"
+import commandExists from "command-exists"
+
+// lzc-cli 包的 pkgInfo 信息
+export const pkgInfo = JSON.parse(
+  fs.readFileSync(
+    path.join(contextDirname(import.meta.url), "..", "package.json")
+  )
+)
 
 // 创建 Axios 实例
 export const api = axios.create()
@@ -42,6 +50,27 @@ export const envsubstr = async (templateContents, args) => {
   return parse(templateContents, args)
 }
 
+// 比较当前的版本和want的大小，如果
+//  - 当前版本大于指定的版本 => 1
+//  - 当前版本等于指定的版本 => 0
+//  - 当前版本小于指定的版本 => -1
+export function compareVersions(want, current = pkgInfo.version) {
+  const wantArrs = want.split(".")
+  const currArrs = current.split(".")
+
+  // Compare each part
+  for (let i = 0; i < Math.max(wantArrs.length, currArrs.length); i++) {
+    // Convert to integers, default to 0 if part doesn't exist
+    const w = parseInt(wantArrs[i] || 0)
+    const c = parseInt(currArrs[i] || 0)
+
+    if (c > w) return 1
+    if (c < w) return -1
+  }
+
+  return 0 // Versions are equal
+}
+
 /**
  * 确保文件夹存在
  * @param filePath {string} 如果为文件路径 确保其文件夹存在; 如果为文件夹, 则确保该文件夹存在
@@ -588,3 +617,34 @@ export function findSshPublicKey() {
     throw error
   }
 }
+
+export function checkRsync() {
+  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) {
+          reject(`当前rsync版本为:${versionMatch[1]}, 要求rsync版本为: 3.2.0+`)
+        }
+        logger.debug(`当前rsync版本为:${versionMatch[1]}`)
+      } else {
+        reject("请检查 rsync 安装是否正确，指定 rsync --version 错误")
+      }
+    }
+    resolve()
+  })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.45",
+  "version": "1.2.47",
   "description": "lazycat cloud developer kit",
   "files": [
     "template",

package/scripts/cli.js

@@ -7,13 +7,10 @@ import yargs from "yargs"
 import { hideBin } from "yargs/helpers"
 import chalk from "chalk"
 
-import { contextDirname } from "../lib/utils.js"
+import { contextDirname, pkgInfo } 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"
-const pkgInfo = JSON.parse(
-  fs.readFileSync(path.join(contextDirname(import.meta.url), "../package.json"))
-)
 import env from "../lib/env.js"
 
 // logger level middleware

package/template/_lpk/init_debug_bridge.sh

@@ -33,6 +33,10 @@ if ${LZCBUSYBOX} netstat -tln | grep ':22222' >/dev/null; then
 else
     echo "启动 rsync daemon."
     rsync --daemon --no-detach --config=/lzcapp/pkg/content/devshell/rsyncd.conf &
+    while ! nc -z localhost 873; do
+        sleep 1
+    done
+    echo "rsync daemon 已成功监听 873 端口"
 
     mkdir -p /etc/dropbear
     exec dropbearmulti dropbear -R -F -E -B -p 22222