@lazycatcloud/lzc-cli 1.2.39 → 1.2.41

package/lib/app/lpk_debug_bridge.js

@@ -6,12 +6,22 @@ import {
   isTraceMode,
   resolveDomain,
   sleep,
-  findSshPublicKey
+  findSshPublicKey,
+  isWindows,
+  contextDirname
 } from "../utils.js"
 import logger from "loglevel"
 import commandExists from "command-exists"
+import path from "node:path"
 
-function sshCmdArgs(...args) {
+export function sshBinary() {
+  if (isWindows) {
+    return "ssh"
+  }
+  return "ssh"
+}
+
+export function sshCmdArgs(...args) {
   const defaultOptions = [
     `-o "StrictHostKeyChecking=no"`,
     `-o "UserKnownHostsFile=/dev/null"`,
@@ -19,7 +29,7 @@ function sshCmdArgs(...args) {
     "-p 22222",
     `${isTraceMode() ? "-v" : ""}`
   ]
-  return [...defaultOptions, ...args].join(" ")
+  return [...defaultOptions, ...args]
 }
 
 export class DebugBridge {
@@ -55,9 +65,9 @@ export class DebugBridge {
     const stream = fs.createReadStream(lpkPath)
     const resolvedIp = await resolveDomain(this.domain)
     const ssh = spawn(
-      "ssh",
+      sshBinary(),
       [
-        sshCmdArgs(`box@${resolvedIp}`),
+        ...sshCmdArgs(`box@${resolvedIp}`),
         `install --uid ${this.uid} --pkgId ${pkgId}`
       ],
       {
@@ -87,8 +97,8 @@ export class DebugBridge {
 
     // 将当前机器上的ssh public key 写到开发者工具中去，并过滤到重复的，管道在执行前会被清空，需要使用一个中间文件
     const stream = spawn.sync(
-      "ssh",
-      [sshCmdArgs(`box@${resolvedIp}`), `add-ssh-public-key`],
+      sshBinary(),
+      [...sshCmdArgs(`box@${resolvedIp}`), `add-ssh-public-key`],
       {
         input: sshInfo.content.trimLeft(),
         shell: true,
@@ -107,16 +117,16 @@ export class DebugBridge {
   }
 
   async status(appId) {
-    return this.common("ssh", [
-      sshCmdArgs(`box@${this.domain}`),
+    return this.common(sshBinary(), [
+      ...sshCmdArgs(`box@${this.domain}`),
       `status --uid ${this.uid}`,
       appId
     ])
   }
 
   async isDevshell(appId) {
-    const stdout = await this.common("ssh", [
-      sshCmdArgs(`box@${this.domain}`),
+    const stdout = await this.common(sshBinary(), [
+      ...sshCmdArgs(`box@${this.domain}`),
       `isDevshell --uid ${this.uid}`,
       appId
     ])
@@ -124,16 +134,16 @@ export class DebugBridge {
   }
 
   async resume(appId) {
-    return this.common("ssh", [
-      sshCmdArgs(`box@${this.domain}`),
+    return this.common(sshBinary(), [
+      ...sshCmdArgs(`box@${this.domain}`),
       `resume --uid ${this.uid}`,
       appId
     ])
   }
 
   async uninstall(appId) {
-    return this.common("ssh", [
-      sshCmdArgs(`box@${this.domain}`),
+    return this.common(sshBinary(), [
+      ...sshCmdArgs(`box@${this.domain}`),
       `uninstall --uid ${this.uid}`,
       appId
     ])
@@ -153,14 +163,15 @@ export class DebugBridge {
     const resolvedIp = await resolveDomain(this.domain)
 
     const stream = spawn(
-      "ssh",
+      sshBinary(),
       [
-        sshCmdArgs(`box@${resolvedIp}`),
+        ...sshCmdArgs(`box@${resolvedIp}`),
         "-t",
         "devshell",
         `--uid ${this.uid}`,
         isUserApp ? "--userapp" : "",
         appId,
+        "/bin/sh",
         "/lzcapp/pkg/content/devshell/exec.sh"
       ],
       {
@@ -185,17 +196,17 @@ export class DebugBridge {
     const resolvedIp = await resolveDomain(this.domain)
     const stream = fs.createReadStream(contextTar)
 
-    const ssh = spawn(
-      "ssh",
-      [sshCmdArgs(`box@${resolvedIp}`), `build --tag ${tag}`],
+    const buildStream = spawn(
+      sshBinary(),
+      [...sshCmdArgs(`box@${resolvedIp}`), `build --tag ${tag}`],
       {
         shell: true,
         stdio: ["pipe", "inherit", "inherit"]
       }
     )
-    stream.pipe(ssh.stdin)
+    stream.pipe(buildStream.stdin)
     return new Promise((resolve, reject) => {
-      ssh.on("close", (code) => {
+      buildStream.on("close", (code) => {
         code == 0
           ? resolve(`dev.${this.boxname}.heiyu.space/${tag}`)
           : reject("在盒子中构建 image 失败")

package/lib/app/lpk_devshell.js

@@ -2,7 +2,6 @@
 import path from "node:path"
 import fs from "node:fs"
 import logger from "loglevel"
-// import { execSync } from "node:child_process"
 import spawn from "cross-spawn"
 import { LpkInstaller } from "./lpk_installer.js"
 import debounce from "lodash.debounce"
@@ -19,7 +18,6 @@ import {
   isUserApp,
   createTemplateFileCommon,
   isDebugMode,
-  isTraceMode,
   resolveDomain,
   isWindows,
   isMacOs,
@@ -157,36 +155,60 @@ export class AppDevShell {
     this.lpkBuild.onBeforeTarContent(async (contentdir) => {
       const busyboxPath = path.join(
         contextDirname(import.meta.url),
-        "../../template/_lpk/busybox-1.35.0"
+        "..",
+        "..",
+        "template",
+        "_lpk",
+        "busybox-1.35.0"
       )
       let dest = path.join(contentdir, "devshell", "busybox")
       ensureDir(dest)
       fs.copyFileSync(busyboxPath, dest)
-      fs.chmodSync(dest, 0o775)
     })
 
     // 复制 init_debug_bridge.sh 到 devshell 中去
     this.lpkBuild.onBeforeTarContent(async (contentdir) => {
       const initPath = path.join(
         contextDirname(import.meta.url),
-        "../../template/_lpk/init_debug_bridge.sh"
+        "..",
+        "..",
+        "template",
+        "_lpk",
+        "init_debug_bridge.sh"
       )
       let dest = path.join(contentdir, "devshell", "init_debug_bridge.sh")
       ensureDir(dest)
       fs.copyFileSync(initPath, dest)
-      fs.chmodSync(dest, 0o775)
     })
 
     // 复制 exec.sh 到 devshell 中去
     this.lpkBuild.onBeforeTarContent(async (contentdir) => {
       const execScriptPath = path.join(
         contextDirname(import.meta.url),
-        "../../template/_lpk/exec.sh"
+        "..",
+        "..",
+        "template",
+        "_lpk",
+        "exec.sh"
       )
       let dest = path.join(contentdir, "devshell", "exec.sh")
       ensureDir(dest)
       fs.copyFileSync(execScriptPath, dest)
-      fs.chmodSync(dest, 0o775)
+    })
+
+    // 复制 rsyncd.conf 到 devshell 中去
+    this.lpkBuild.onBeforeTarContent(async (contentdir) => {
+      const execScriptPath = path.join(
+        contextDirname(import.meta.url),
+        "..",
+        "..",
+        "template",
+        "_lpk",
+        "rsyncd.conf"
+      )
+      let dest = path.join(contentdir, "devshell", "rsyncd.conf")
+      ensureDir(dest)
+      fs.copyFileSync(execScriptPath, dest)
     })
 
     // 复制 setupscript 脚本
@@ -207,7 +229,6 @@ export class AppDevShell {
       } else {
         fs.writeFileSync(dest, `#!/bin/sh\nset -ex\n${devshell["setupscript"]}`)
       }
-      fs.chmodSync(dest, 0o775)
     })
 
     // 在生成 manifest.yml 之前合并 devshell manifest 模板字段
@@ -219,9 +240,10 @@ export class AppDevShell {
       logger.debug("options devshell delete 'routes' field")
       delete options["devshell"]["routes"]
 
-      // 添加 devshell 必要路由
+      // 添加 devshell 必要路由，这里需要使用 /bin/sh 启动后面的脚本，因为在
+      // Windows 上打包的文件将会丢失可执行权限
       routes.push(
-        "/__debug.bridge=exec://80,/lzcapp/pkg/content/devshell/init_debug_bridge.sh"
+        "/__debug.bridge=exec://80,/bin/sh /lzcapp/pkg/content/devshell/init_debug_bridge.sh"
       )
       routes.push("/__isdevshell=file:///lzcapp/pkg/devshell")
 
@@ -286,7 +308,11 @@ export class AppDevShell {
       try {
         const dockerfilePath = path.join(
           contextDirname(import.meta.url),
-          "../../template/_lpk/Dockerfile.in"
+          "..",
+          "..",
+          "template",
+          "_lpk",
+          "Dockerfile.in"
         )
         await createTemplateFileCommon(
           dockerfilePath,
@@ -418,25 +444,6 @@ class DevShell {
   }
 
   async syncProject(appId) {
-    // prettier-ignore
-    const resolvedIp = await resolveDomain(`dev.${shellApi.boxname}.heiyu.space`);
-    let rsh = [
-      "ssh",
-      "-o",
-      `"ProxyCommand ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -q -W %h:%p -p 22222 box@${resolvedIp}"`,
-      "-p",
-      `22222`,
-      "-o",
-      `"StrictHostKeyChecking=no"`,
-      "-o",
-      `"UserKnownHostsFile=/dev/null"`,
-      "-o",
-      `"ConnectionAttempts=3"`,
-      "-o",
-      `"ConnectTimeout=30"`,
-      "-o",
-      `${isTraceMode() ? '"LogLevel=DEBUG"' : '"LogLevel=ERROR"'}`
-    ].join(" ")
     if (isLinux || isMacOs) {
       // 检查rsync工具是否存在:提示用户
       const rsyncExisted = commandExists.sync("rsync")
@@ -446,22 +453,29 @@ class DevShell {
       }
     }
 
+    const resolvedIp = await resolveDomain(
+      `dev.${shellApi.boxname}.heiyu.space`
+    )
     const rsyncDebug = isDebugMode() ? "-P" : ""
     const host = this.isUserApp
       ? `${shellApi.uid}.app.${appId}.lzcapp`
       : `app.${appId}.lzcapp`
-    const dest = `root@${host}:/lzcapp/cache/devshell`
+    const dest = `rsync://${host}@[${resolvedIp}]:873/lzcapp/cache/devshell`
     const rsyncCmd = isWindows
       ? path.join(
           contextDirname(import.meta.url),
-          "../../template/_lpk/win-rsync/rsync.exe"
+          "..",
+          "..",
+          "template",
+          "_lpk",
+          "win-rsync",
+          "rsync.exe"
         )
       : `rsync`
 
     try {
       const rsyncArgs = [
         `${rsyncDebug}`,
-        `--rsh='${rsh}'`,
         `--recursive`,
         `--relative`,
         `--perms`,
@@ -472,6 +486,7 @@ class DevShell {
       ]
       logger.debug("同步代码: ", rsyncCmd, rsyncArgs.join(" "))
       const rsyncStream = spawn.sync(rsyncCmd, rsyncArgs, {
+        env: { RSYNC_PASSWORD: "fakefakefake" },
         shell: true,
         stdio: ["ignore", isDebugMode() ? "inherit" : "ignore", "inherit"]
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.39",
+  "version": "1.2.41",
   "description": "lazycat cloud developer kit",
   "files": [
     "template",
@@ -20,6 +20,7 @@
     "@balena/dockerignore": "^1.0.2",
     "@grpc/grpc-js": "^1.11.1",
     "@grpc/proto-loader": "^0.7.13",
+    "@lazycatcloud/sdk": "^0.1.423",
     "adm-zip": "^0.5.16",
     "archiver": "^7.0.1",
     "axios": "^1.7.7",

package/template/_lpk/exec.sh

@@ -4,7 +4,7 @@
 # 从1号进程读取环境变量
 cat > /tmp/lzcapp_env.sh << EOF
 #!/bin/sh
-$(/lzcapp/pkg/content/devshell/busybox tr '\0' '\n' < /proc/1/environ | /lzcapp/pkg/content/devshell/busybox xargs -I{} echo export {})
+$(/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
 

package/template/_lpk/init_debug_bridge.sh

@@ -2,30 +2,38 @@
 set -e
 
 DEBUG_BRIDGE_LZCAPP=http://app.cloud.lazycat.developer.tools.lzcapp
-BUSYBOX=/lzcapp/pkg/content/devshell/busybox
+
+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
-    ${BUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/dropbearmulti -O /usr/bin/dropbearmulti
+    ${LZCBUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/dropbearmulti -O /usr/bin/dropbearmulti
     chmod +x /usr/bin/dropbearmulti
 fi
 
 if ! [ -f /usr/bin/rsync ]; then
-    ${BUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/rsync -O /usr/bin/rsync
+    ${LZCBUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/rsync -O /usr/bin/rsync
     chmod +x /usr/bin/rsync
 fi
 
-${BUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/authorized_keys -O /root/.ssh/authorized_keys
+${LZCBUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/resources/authorized_keys -O /root/.ssh/authorized_keys
 chmod 0644 /root/.ssh/authorized_keys
 
-${BUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/bannerfile -O /etc/debug.bridge/bannerfile
+${LZCBUSYBOX} wget ${DEBUG_BRIDGE_LZCAPP}/bannerfile -O /etc/debug.bridge/bannerfile
 
-if ${BUSYBOX} netstat -tln | grep ':22222' >/dev/null; then
+if ${LZCBUSYBOX} netstat -tln | grep ':22222' >/dev/null; then
     echo "端口22222正在监听"
-    ${BUSYBOX} sleep infinity
+    ${LZCBUSYBOX} sleep infinity
 else
+    echo "启动 rsync daemon."
+    rsync --daemon --no-detach --config=/lzcapp/pkg/content/devshell/rsyncd.conf &
+
     mkdir -p /etc/dropbear
     exec dropbearmulti dropbear -R -F -E -B -p 22222
 fi

package/template/_lpk/rsyncd.conf

@@ -0,0 +1,28 @@
+# 全局参数
+uid = root
+gid = root
+use chroot = no
+max connections = 4
+timeout = 300
+pid file = /var/run/rsyncd.pid
+lock file = /var/run/rsync.lock
+
+# 实时输出设置
+log file = /dev/stdout
+transfer logging = yes
+log format = %t rsync [%p] %o %h [%a] %m %f %l
+
+[lzcapp]
+path = /lzcapp
+read only = no
+dont compress = *.gz *.bz2 *.zip
+
+[root]
+path = /root/
+read only = no
+dont compress = *.gz *.bz2 *.zip
+
+[tmp]
+path = /tmp/
+read only = no
+dont compress = *.gz *.bz2 *.zip