@lazycatcloud/lzc-cli 1.2.31 → 1.2.33

package/lib/app/lpk_debug_bridge.js

@@ -1,8 +1,7 @@
 import { spawn, spawnSync } from "child_process"
 import fs from "node:fs"
 import shellApi from "../shellapi.js"
-import inquirer from "inquirer"
-import { isDebugMode, resolveDomain, sleep } from "../utils.js"
+import { isDebugMode, resolveDomain, sleep, sshCmd } from "../utils.js"
 import logger from "loglevel"
 
 export class DebugBridge {
@@ -10,13 +9,17 @@ export class DebugBridge {
     this.uid = shellApi.uid
     this.boxname = shellApi.boxname
     this.domain = `dev.${this.boxname}.heiyu.space`
-    this.sshCmd = `ssh ${isDebugMode() ? "-vv" : ""} -p 22222 box@${this.domain}`
+    this.sshCmd = sshCmd(
+      `${isDebugMode() ? "-vv" : ""}`,
+      "-p 22222",
+      `box@${this.domain}`
+    )
   }
 
   async common(cmd, args) {
     const resolvedIp = await resolveDomain(this.domain)
-    const sshCmd = cmd.replace(this.domain, resolvedIp)
-    const ssh = spawnSync(sshCmd, args, {
+    const resolvedCmd = cmd.replace(this.domain, resolvedIp)
+    const ssh = spawnSync(resolvedCmd, args, {
       shell: true,
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
@@ -25,7 +28,7 @@ export class DebugBridge {
       ssh.status == 0
         ? resolve(ssh.stdout)
         : reject(
-            `执行命令 ${sshCmd} ${args.join(" ")} 出错\n${ssh.stderr ?? ""}`
+            `执行命令 ${resolvedCmd} ${args.join(" ")} 出错\n${ssh.stderr ?? ""}`
           )
     })
   }
@@ -39,7 +42,7 @@ export class DebugBridge {
     const stream = fs.createReadStream(lpkPath)
     const resolvedIp = await resolveDomain(this.domain)
     const ssh = spawn(
-      `ssh -p 22222 box@${resolvedIp}`,
+      sshCmd("-p 22222", `box@${resolvedIp}`),
       [`install --uid ${this.uid} --pkgId ${pkgId}`],
       {
         shell: true,
@@ -61,7 +64,9 @@ export class DebugBridge {
 
   async sshCopyId() {
     const resolvedIp = await resolveDomain(this.domain)
-    return this.common(`ssh-copy-id`, [`-f -p 22222 box@${resolvedIp}`])
+    return this.common(`ssh-copy-id`, [
+      `-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -f -p 22222 box@${resolvedIp}`
+    ])
   }
 
   async status(appId) {
@@ -85,7 +90,6 @@ export class DebugBridge {
   }
 
   async devshell(appId, isUserApp, onconnect = null) {
-    const resolvedIp = await resolveDomain(this.domain)
     let waiting = true
     while (waiting) {
       if (await this.isDevshell(appId)) {
@@ -96,8 +100,10 @@ export class DebugBridge {
       await sleep(100)
     }
 
+    const resolvedIp = await resolveDomain(this.domain)
+
     const stream = spawn(
-      `ssh -p 22222 box@${resolvedIp}`,
+      sshCmd("-p 22222", `box@${resolvedIp}`),
       [
         "-t",
         "devshell",
@@ -117,7 +123,9 @@ export class DebugBridge {
       })
       // spawn 事件只是进程启动成功的事件，并不是ssh成功连接上的事件。所以这里使
       // 用前面的一个 isDevshell 判断是否已经启动这个容器，再使用 spawn
-      stream.on("spawn", onconnect)
+      stream.on("spawn", () => {
+        onconnect && onconnect()
+      })
     })
   }
 
@@ -125,8 +133,9 @@ export class DebugBridge {
     const tag = `debug.bridge/${label}`
     const resolvedIp = await resolveDomain(this.domain)
     const stream = fs.createReadStream(contextTar)
+
     const ssh = spawn(
-      `ssh -p 22222 box@${resolvedIp}`,
+      sshCmd("-p 22222", `box@${resolvedIp}`),
       [`build --tag ${tag}`],
       {
         shell: true,

package/lib/app/lpk_devshell.js

@@ -18,8 +18,7 @@ import {
   isUserApp,
   createTemplateFileCommon,
   isDebugMode,
-  resolveDomain,
-  sleep
+  resolveDomain
 } from "../utils.js"
 import os from "node:os"
 import commandExists from "command-exists"
@@ -412,8 +411,8 @@ class DevShell {
     const resolvedIp = await resolveDomain(`dev.${shellApi.boxname}.heiyu.space`);
     let rsh = [
       "ssh",
-      "-J",
-      `box@[${resolvedIp}]:22222`,
+      "-o",
+      `"ProxyCommand ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -q -W %h:%p -p 22222 box@${resolvedIp}"`,
       "-p",
       `22222`,
       "-o",

package/lib/utils.js

@@ -464,3 +464,14 @@ export async function resolveDomain(domain) {
     throw new Error(`无法解析域名 ${domain}: ${error.message}`)
   }
 }
+
+export function sshCmd(...args) {
+  const baseCommand = "ssh"
+  const defaultOptions = [
+    "-o StrictHostKeyChecking=no",
+    "-o UserKnownHostsFile=/dev/null",
+    "-q"
+  ]
+  const options = [...defaultOptions, ...args].join(" ")
+  return `${baseCommand} ${options}`
+}

package/package.json

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

package/template/_lpk/Dockerfile.in

@@ -1,4 +1,4 @@
-FROM registry.cn-hangzhou.aliyuncs.com/lazycatcloud/devshell:v0.0.5
+FROM registry.lazycat.cloud/lzc-cli/devshell:v0.0.5
 
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
 

package/template/_lpk/devshell/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.cn-hangzhou.aliyuncs.com/lazycatcloud/devshell:v0.0.5
+FROM registry.lazycat.cloud/lzc-cli/devshell:v0.0.5
 
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories