@lazycatcloud/lzc-cli 1.2.53 → 1.2.54

package/changelog.md

@@ -1,3 +1,9 @@
+# 1.2.54
+
+1. 添加 lzc-cli docker 命令
+2. 添加 lzc-cli docker-compose 命令
+3. 修复其他同步卡顿问题
+
 # 1.2.53
 
 1. 修复 devshell 模型下，环境变量中有空格导致export错误

package/lib/app/index.js

@@ -5,7 +5,7 @@ import { AppDevShell } from "./lpk_devshell.js"
 import { LpkInstaller, installConfig } from "./lpk_installer.js"
 import logger from "loglevel"
 import { sleep, checkRsync } from "../utils.js"
-import { DebugBridge } from "./lpk_debug_bridge.js"
+import { DebugBridge } from "../debug_bridge.js"
 import shellApi from "../shellapi.js"
 import { generate } from "./lpk_create_generator.js"
 
@@ -147,6 +147,7 @@ export function lpkAppCommand(program) {
         await shellApi.init()
 
         const bridge = new DebugBridge()
+        await bridge.init()
         await bridge.uninstall(pkgId)
       }
     },
@@ -157,6 +158,7 @@ export function lpkAppCommand(program) {
         await shellApi.init()
 
         const bridge = new DebugBridge()
+        await bridge.init()
         const status = await bridge.status(pkgId)
         console.log(status)
       }

package/lib/app/lpk_devshell.js

@@ -14,7 +14,6 @@ import {
   md5String,
   md5File,
   loadFromYaml,
-  FileLocker,
   isUserApp,
   createTemplateFileCommon,
   isDebugMode,
@@ -27,7 +26,7 @@ import {
 import os from "node:os"
 import chokidar from "chokidar"
 import _ from "lodash"
-import { DebugBridge } from "./lpk_debug_bridge.js"
+import { DebugBridge } from "../debug_bridge.js"
 import shellApi from "../shellapi.js"
 import { collectContextFromDockerFile } from "./lpk_devshell_docker.js"
 
@@ -70,6 +69,7 @@ class AppDevShellMonitor {
     ensureDir(this.cacheFilePath)
 
     await this.updateHash()
+    await this.bridge.init()
 
     return this
   }
@@ -280,7 +280,6 @@ export class AppDevShell {
         application: {
           devshell: options["devshell"],
           health_check: {
-            test_url: `http://${userapp}app.${manifest["package"]}.lzcapp/__isdevshell`,
             disable: true
           }
         }
@@ -329,6 +328,7 @@ export class AppDevShell {
           path.resolve(tempDir, "Dockerfile")
         )
         const bridge = new DebugBridge()
+        await bridge.init()
         const tag = await bridge.buildImage(label, contextTar)
         delete manifest["application"]["devshell"]
         manifest["application"]["image"] = tag
@@ -359,6 +359,7 @@ export class AppDevShell {
       )
 
       const bridge = new DebugBridge()
+      await bridge.init()
       const tag = await bridge.buildImage(label, contextTar)
       delete manifest["application"]["devshell"]
       manifest["application"]["image"] = tag
@@ -410,28 +411,9 @@ export class AppDevShell {
   async rsyncShell() {
     const manifest = await this.lpkBuild.getManifest()
     const pkgId = manifest["package"]
-
-    let isSync = false
-    try {
-      const locker = new FileLocker(pkgId)
-      locker.lock()
-      process.on("exit", () => {
-        logger.debug("filelock unlock")
-        locker.unlock()
-      })
-      isSync = true
-    } catch (err) {
-      logger.debug("filelock catch")
-      logger.debug(err)
-    }
-
     const devshell = new DevShell(pkgId, this.isUserApp)
     try {
-      if (isSync) {
-        await devshell.shell()
-      } else {
-        await devshell.connectShell()
-      }
+      await devshell.shell()
     } catch (e) {
       logger.error(`devshell 错误: ${e}`)
     }
@@ -453,10 +435,8 @@ class DevShell {
       `dev.${shellApi.boxname}.heiyu.space`
     )
     const rsyncDebug = isDebugMode() ? "-P" : ""
-    const host = this.isUserApp
-      ? `${shellApi.uid}.app.${appId}.lzcapp`
-      : `app.${appId}.lzcapp`
-    const dest = `rsync://${host}@[${resolvedIp}]:873/lzcapp/cache/devshell`
+    const destDir = `${appId}${this.isUserApp ? "/" + shellApi.uid : ""}`
+    const dest = `rsync://${shellApi.uid}@[${resolvedIp}]:874/lzcapp_cache/${destDir}/devshell`
     const rsyncCmd = isWindows
       ? path.join(
           contextDirname(import.meta.url),
@@ -564,6 +544,7 @@ class DevShell {
 
   async connectShell(onconnect = null) {
     const bridge = new DebugBridge()
+    await bridge.init()
     await bridge.devshell(this.appId, this.isUserApp, onconnect)
   }
 }

package/lib/app/lpk_installer.js

@@ -2,7 +2,7 @@ import logger from "loglevel"
 import fs from "node:fs"
 import path from "node:path"
 import { loadFromYaml, Downloader, unzipSync } from "../utils.js"
-import { DebugBridge } from "./lpk_debug_bridge.js"
+import { DebugBridge } from "../debug_bridge.js"
 import shellapi from "../shellapi.js"
 import { triggerApk } from "./apkshell.js"
 
@@ -118,6 +118,7 @@ export class LpkInstaller {
     }
 
     const bridge = new DebugBridge()
+    await bridge.init()
     logger.info("开始安装应用")
     await bridge.install(pkgPath, manifest["package"])
     logger.info("\n")

package/lib/{app/lpk_debug_bridge.js → debug_bridge.js}

@@ -1,6 +1,6 @@
 import spawn from "cross-spawn"
 import fs from "node:fs"
-import shellApi from "../shellapi.js"
+import shellApi from "./shellapi.js"
 import {
   isDebugMode,
   isTraceMode,
@@ -10,7 +10,7 @@ import {
   isWindows,
   contextDirname,
   compareVersions
-} from "../utils.js"
+} from "./utils.js"
 import logger from "loglevel"
 import commandExists from "command-exists"
 import path from "node:path"
@@ -40,6 +40,13 @@ export class DebugBridge {
     this.domain = `dev.${this.boxname}.heiyu.space`
   }
 
+  async init() {
+    if (!(await this.canPublicKey())) {
+      // 如果不能 ssh public key 登录则提示授权申请，否则后面可能会出现 rsync 询问密码的问题
+      await this.sshApplyGrant()
+    }
+  }
+
   async common(cmd, args) {
     const resolvedIp = await resolveDomain(this.domain)
     args = args.map((arg) => arg.replace(this.domain, resolvedIp))
@@ -59,11 +66,6 @@ export class DebugBridge {
   }
 
   async install(lpkPath, pkgId) {
-    if (!(await this.canPublicKey())) {
-      // 如果不能 ssh public key 登录则直接调用 ssh-copy-id 复制，否则后面可能会出现 rsync 询问密码的问题
-      await this.sshCopyId()
-    }
-
     const stream = fs.createReadStream(lpkPath)
     const resolvedIp = await resolveDomain(this.domain)
     const ssh = spawn(
@@ -86,36 +88,28 @@ export class DebugBridge {
   }
 
   async canPublicKey() {
-    // FIXME: 目前没有找到在允许空密码的情况下，检测是否只能通过 publickey 登录的方法。
-    return false
+    try {
+      await this.common(sshBinary(), [...sshCmdArgs(`box@${this.domain}`)])
+      return true
+    } catch {
+      return false
+    }
   }
 
-  async sshCopyId() {
+  async sshApplyGrant() {
     const sshInfo = await findSshPublicKey()
     logger.debug("ssh public key info", sshInfo)
 
-    const resolvedIp = await resolveDomain(this.domain)
-    logger.debug("ip", resolvedIp)
+    const pk = Buffer.from(sshInfo.content.trimLeft()).toString("base64")
 
-    // 将当前机器上的ssh public key 写到开发者工具中去，并过滤到重复的，管道在执行前会被清空，需要使用一个中间文件
-    const stream = spawn.sync(
-      sshBinary(),
-      [...sshCmdArgs(`box@${resolvedIp}`), `add-ssh-public-key`],
-      {
-        input: sshInfo.content.trimLeft(),
-        shell: true,
-        encoding: "utf-8",
-        stdio: "pipe"
-      }
+    logger.warn(
+      `检测到您当前没有授权，请点击下面的连接在浏览器中完成授权，才能使用当前的机器的 ssh public key 访问开发者工具.
+-> https://${this.domain}/auth?key=${pk}
+
+如果您的 '懒猫开发者工具' 不是 0.2.0 及以上版本，请先到应用商店进行升级.
+`
     )
-    if (stream.status != 0) {
-      const stderr = stream.stderr.toString("utf-8")
-      const stdout = stream.stdout.toString("utf-8")
-      throw stdout + stderr
-    }
-    if (stream.error) {
-      throw stream.error
-    }
+    throw "请在授权完成后重试!"
   }
 
   async status(appId) {
@@ -127,9 +121,10 @@ export class DebugBridge {
   }
 
   async isDevshell(appId) {
+    await this.backendVersion020()
     const stdout = await this.common(sshBinary(), [
       ...sshCmdArgs(`box@${this.domain}`),
-      `isDevshell --uid ${this.uid}`,
+      `isDevshellV2 --uid ${this.uid}`,
       appId
     ])
     return stdout == "true"
@@ -166,6 +161,8 @@ export class DebugBridge {
   }
 
   async devshell(appId, isUserApp, onconnect = null) {
+    await this.backendVersion020()
+
     let waiting = true
     while (waiting) {
       if (await this.isDevshell(appId)) {
@@ -237,4 +234,55 @@ export class DebugBridge {
       fs.rmSync(contextTar)
     })
   }
+
+  async lzcDocker(argv) {
+    await this.backendVersion020()
+
+    const resolvedIp = await resolveDomain(this.domain)
+    const stream = spawn(
+      sshBinary(),
+      [...sshCmdArgs(`box@${resolvedIp}`), "-t", "lzc-docker", ...argv],
+      {
+        shell: true,
+        stdio: "inherit"
+      }
+    )
+    return new Promise((resolve, reject) => {
+      stream.on("close", (code) => {
+        code == 0 ? resolve() : reject()
+      })
+    })
+  }
+
+  async lzcDockerCompose(argv) {
+    await this.backendVersion020()
+
+    const resolvedIp = await resolveDomain(this.domain)
+    const stream = spawn(
+      sshBinary(),
+      [...sshCmdArgs(`box@${resolvedIp}`), "-t", "lzc-docker-compose", ...argv],
+      {
+        shell: true,
+        stdio: "inherit"
+      }
+    )
+    return new Promise((resolve, reject) => {
+      stream.on("close", (code) => {
+        code == 0 ? resolve() : reject()
+      })
+    })
+  }
+
+  async backendVersion020() {
+    const backendVersion = await this.version()
+    if (compareVersions("0.2.0", backendVersion) < 0) {
+      logger.warn(`
+检测到您当前的 lzc-cli 版本较新，而 '懒猫开发者工具' 比较旧，请先到微服的商店升级 '懒猫开发者工具'，点击下面的连接跳转:
+
+-> https://appstore.${this.boxname}.heiyu.space/#/shop/detail/cloud.lazycat.developer.tools
+`)
+      process.exit(1)
+      return
+    }
+  }
 }

package/lib/docker/index.js

@@ -0,0 +1,90 @@
+import { DebugBridge } from "../debug_bridge.js"
+import shellApi from "../shellapi.js"
+import { isFileExist, isUserApp, loadFromYaml } from "../utils.js"
+import logger from "loglevel"
+import path from "node:path"
+
+export function lzcDockerCommand(program) {
+  program
+    .parserConfiguration({
+      "unknown-options-as-args": true
+    })
+    .middleware((argv, yargs) => {
+      argv.dockerArgs = []
+      // 找到 'docker-compose' 或者 ’docker’ 在参数中的位置
+      let index = argv._.indexOf("docker-compose")
+      if (index === -1) {
+        index = argv._.indexOf("docker")
+      }
+
+      if (index !== -1 && index < argv._.length - 1) {
+        // 获取原始的命令行参数
+        const originalArgs = argv._
+
+        // 将 'docker-compose' 或者 ’docker’ 之后的所有参数（包括选项）移到 dockerArgs 数组中
+        argv.dockerArgs = originalArgs.slice(index + 1)
+
+        // 从原始参数中移除这些参数
+        argv._ = argv._.slice(0, index + 1)
+
+        // 移除已经被处理的参数
+        for (const arg of argv.dockerArgs) {
+          delete argv[arg]
+        }
+      }
+      return argv
+    })
+
+  program.command({
+    command: "docker",
+    desc: "微服应用 docker 管理",
+    builder: (args) => {
+      return args.strict(false) // 禁用严格模式，允许未知参数
+    },
+    handler: async (args) => {
+      logger.debug("args: ", args)
+      await shellApi.init()
+      const bridge = new DebugBridge()
+      await bridge.init()
+      logger.debug("docker", args.dockerArgs)
+      await bridge.lzcDocker(args.dockerArgs)
+    }
+  })
+  program.command({
+    command: "docker-compose",
+    desc: "微服应用 docker-compose 管理",
+    builder: (args) => {
+      return args.strict(false) // 禁用严格模式，允许未知参数
+    },
+    handler: async (args) => {
+      logger.debug("args: ", args)
+      await shellApi.init()
+      let manifest = null
+      try {
+        for (let name of ["lzc-manifest.yml", "manifest.yml"]) {
+          const mpath = path.join(process.cwd(), name)
+          if (isFileExist(mpath)) {
+            manifest = loadFromYaml(mpath)
+            break
+          }
+        }
+      } catch (e) {
+        logger.debug("load manifest: ", e)
+      }
+      const pkgId = manifest ? manifest["package"] : ""
+      const userApp = manifest ? isUserApp(manifest) : false
+
+      const bridge = new DebugBridge()
+      await bridge.init()
+      const options = args.dockerArgs
+      if (pkgId != "" && !options.some((o) => o == "--project-directory")) {
+        options.unshift(
+          "--project-directory",
+          `/lzcapp/run/lzc-docker/compose/${pkgId}${userApp ? "/" + shellapi.uid : ""}`
+        )
+      }
+      logger.debug("docker-compose", options.join(" "))
+      await bridge.lzcDockerCompose(options)
+    }
+  })
+}

package/lib/utils.js

@@ -353,45 +353,6 @@ export class Downloader {
   }
 }
 
-export class FileLocker {
-  constructor(id) {
-    this.filename = undefined
-    this.fd = undefined
-    this.id = id
-  }
-  lock() {
-    this.filename = path.resolve(os.tmpdir(), "lzc-cli-file-lock", this.id)
-    ensureDir(this.filename)
-
-    try {
-      this.fd = fs.openSync(this.filename, "wx+")
-    } catch (e) {
-      if (e.code == "EEXIST" && !this.withOpen(this.filename)) {
-        logger.debug("filelock exist open with w+")
-        this.fd = fs.openSync(this.filename, "w+")
-      } else {
-        throw e
-      }
-    }
-  }
-  unlock() {
-    if (this.fd) {
-      fs.closeSync(this.fd)
-      fs.rmSync(this.filename)
-      this.fd = undefined
-      this.filename = undefined
-    }
-  }
-  withOpen(filename) {
-    const p = spawn.sync("lsof", ["-w", "-t", filename])
-    if (p.status === 0) {
-      return true
-    } else {
-      return false
-    }
-  }
-}
-
 export function isValidAppId(appId) {
   const regex = new RegExp("^(?!-)(?!.*--)[a-z][a-z0-9]*([-][a-z0-9]+)*$")
   return regex.test(appId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.53",
+  "version": "1.2.54",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "prepublishOnly": "node check-changelog.js"

package/scripts/cli.js

@@ -12,6 +12,7 @@ import { boxCommand } from "../lib/box/index.js"
 import { appstoreCommand } from "../lib/appstore/index.js"
 import { lpkAppCommand, lpkProjectCommand } from "../lib/app/index.js"
 import { configCommand } from "../lib/config/index.js"
+import { lzcDockerCommand } from "../lib/docker/index.js"
 
 // logger level middleware
 const logLevelOriginalFactory = logger.methodFactory
@@ -78,6 +79,7 @@ boxCommand(program)
 lpkAppCommand(program)
 lpkProjectCommand(program)
 appstoreCommand(program)
+lzcDockerCommand(program)
 
 // 当没有参数的时候，默认显示帮助。
 ;(async () => {

package/template/_lpk/exec.sh

@@ -1,13 +1,5 @@
 #!/bin/sh
 
-# 设置 lzcapp 环境变量
-# 从1号进程读取环境变量
-cat > /tmp/lzcapp_env.sh << EOF
-#!/bin/sh
-$(/usr/lib/debug.bridge/busybox tr '\0' '\n' < /proc/1/environ | /usr/lib/debug.bridge/busybox xargs -I{} echo 'export "{}"')
-EOF
-. /tmp/lzcapp_env.sh
-
 # 执行 setupscript 脚本
 SETUPSCRIPT=/lzcapp/pkg/content/devshell/setupscript
 if [ -f $SETUPSCRIPT ];then

package/template/_lpk/init_debug_bridge.sh

@@ -1,43 +1,4 @@
 #!/bin/sh
 set -e
 
-DEBUG_BRIDGE_LZCAPP=http://app.cloud.lazycat.developer.tools.lzcapp
-
-mkdir -p /usr/lib/debug.bridge/
-# 不能直接对 pkg content 中的 busybox chmod(Read-Only权限)
-LZCBUSYBOX=/usr/lib/debug.bridge/busybox
-cp /lzcapp/pkg/content/devshell/busybox ${LZCBUSYBOX}
-chmod +x ${LZCBUSYBOX}
-
-mkdir -p /root/.ssh
-mkdir -p /etc/debug.bridge
-
-if ! [ -f /usr/bin/dropbearmulti ]; then
-    ${LZCBUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/dropbearmulti -O /usr/bin/dropbearmulti
-    chmod +x /usr/bin/dropbearmulti
-fi
-
-if ! [ -f /usr/bin/rsync ]; then
-    ${LZCBUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/rsync -O /usr/bin/rsync
-    chmod +x /usr/bin/rsync
-fi
-
-${LZCBUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/authorized_keys -O /root/.ssh/authorized_keys
-chmod 0644 /root/.ssh/authorized_keys
-
-${LZCBUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/bannerfile -O /etc/debug.bridge/bannerfile
-
-if ${LZCBUSYBOX} netstat -tln | grep ':22222' >/dev/null; then
-    echo "端口22222正在监听"
-    ${LZCBUSYBOX} sleep infinity
-else
-    echo "启动 rsync daemon."
-    rsync --daemon --no-detach --config=/lzcapp/pkg/content/devshell/rsyncd.conf &
-    while ! ${LZCBUSYBOX} 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
-fi
+echo "init don't nothing..."