@lazycatcloud/lzc-cli 1.2.26 → 1.2.28

package/lib/app/lpk_debug_bridge.js

@@ -1,59 +1,63 @@
-import { spawn, spawnSync } from "child_process";
-import fs from "node:fs";
-import shellApi from "../shellapi.js";
-import inquirer from "inquirer";
-import { isDebugMode } from "../utils.js";
+import { spawn, spawnSync } from "child_process"
+import fs from "node:fs"
+import shellApi from "../shellapi.js"
+import inquirer from "inquirer"
+import { isDebugMode, resolveDomain } from "../utils.js"
 
 export class DebugBridge {
   constructor() {
-    this.uid = shellApi.uid;
-    this.boxname = shellApi.boxname;
-    this.sshCmd = `ssh ${isDebugMode() ? "-vv" : ""} -p 22222 box@dev.${
-      this.boxname
-    }.heiyu.space`;
+    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}`
   }
 
-  common(cmd, args) {
-    const ssh = spawnSync(cmd, args, {
+  async common(cmd, args) {
+    const resolvedIp = await resolveDomain(this.domain)
+    const sshCmd = cmd.replace(this.domain, resolvedIp)
+    const ssh = spawnSync(sshCmd, args, {
       shell: true,
       encoding: "utf-8",
-      stdio: ["pipe", "pipe", "inherit"],
-    });
+      stdio: ["pipe", "pipe", "inherit"]
+    })
     return new Promise((resolve, reject) => {
       ssh.status == 0
         ? resolve(ssh.stdout)
-        : reject(`执行命令 ${cmd} ${args.join(" ")} 出错\n${ssh.stderr ?? ""}`);
-    });
+        : reject(
+            `执行命令 ${sshCmd} ${args.join(" ")} 出错\n${ssh.stderr ?? ""}`
+          )
+    })
   }
 
   async install(lpkPath, pkgId) {
     if (!(await this.canPublicKey())) {
-      await this.sshCopyId();
+      await this.sshCopyId()
     }
 
-    const stream = fs.createReadStream(lpkPath);
+    const stream = fs.createReadStream(lpkPath)
+    const resolvedIp = await resolveDomain(this.domain)
     const ssh = spawn(
-      this.sshCmd,
+      `ssh -p 22222 box@${resolvedIp}`,
       [`install --uid ${this.uid} --pkgId ${pkgId}`],
       {
         shell: true,
-        stdio: ["pipe", "inherit", "inherit"],
+        stdio: ["pipe", "inherit", "inherit"]
       }
-    );
-    stream.pipe(ssh.stdin);
+    )
+    stream.pipe(ssh.stdin)
     return new Promise((resolve, reject) => {
       ssh.on("close", (code) => {
-        code == 0 ? resolve() : reject("install 失败");
-      });
-    });
+        code == 0 ? resolve() : reject("install 失败")
+      })
+    })
   }
 
   async canPublicKey() {
     try {
-      await this.common(this.sshCmd, [`-o PasswordAuthentication=no`]);
-      return true;
+      await this.common(this.sshCmd, [`-o PasswordAuthentication=no`])
+      return true
     } catch {
-      return false;
+      return false
     }
   }
 
@@ -64,79 +68,84 @@ export class DebugBridge {
         type: "input",
         default: "y",
         message:
-          "检测到你目前使用的密码帐号登录，是否使用 ssh-copy-id 上传密钥 (y/n): ",
-      },
-    ];
-    const answers = await inquirer.prompt(questions);
+          "检测到你目前使用的密码帐号登录，是否使用 ssh-copy-id 上传密钥 (y/n): "
+      }
+    ]
+    const answers = await inquirer.prompt(questions)
     if (answers.upload.toLowerCase() == "y") {
-      return this.common(`ssh-copy-id`, [
-        `-f -p 22222 box@dev.${this.boxname}.heiyu.space`,
-      ]);
+      const resolvedIp = await resolveDomain(this.domain)
+      return this.common(`ssh-copy-id`, [`-f -p 22222 box@${resolvedIp}`])
     }
   }
 
   async status(appId) {
-    return this.common(this.sshCmd, [`status --uid ${this.uid}`, appId]);
+    return this.common(this.sshCmd, [`status --uid ${this.uid}`, appId])
   }
 
   async isDevshell(appId) {
     const stdout = await this.common(this.sshCmd, [
       `isDevshell --uid ${this.uid}`,
-      appId,
-    ]);
-    return stdout == "true";
+      appId
+    ])
+    return stdout == "true"
   }
 
   async resume(appId) {
-    return this.common(this.sshCmd, [`resume --uid ${this.uid}`, appId]);
+    return this.common(this.sshCmd, [`resume --uid ${this.uid}`, appId])
   }
 
   async uninstall(appId) {
-    return this.common(this.sshCmd, [`uninstall --uid ${this.uid}`, appId]);
+    return this.common(this.sshCmd, [`uninstall --uid ${this.uid}`, appId])
   }
 
   async devshell(appId, isUserApp, onconnect = null) {
+    const resolvedIp = await resolveDomain(this.domain)
     const stream = spawn(
-      this.sshCmd,
+      `ssh -p 22222 box@${resolvedIp}`,
       [
         "-t",
         "devshell",
         `--uid ${this.uid}`,
         isUserApp ? "--userapp" : "",
         appId,
-        "/lzcapp/pkg/content/devshell/exec.sh",
+        "/lzcapp/pkg/content/devshell/exec.sh"
       ],
       {
         shell: true,
-        stdio: "inherit",
+        stdio: "inherit"
       }
-    );
+    )
     return new Promise((resolve, reject) => {
       stream.on("close", (code) => {
-        code == 0 ? resolve() : reject();
-      });
+        code == 0 ? resolve() : reject()
+      })
       if (onconnect) {
-        stream.on("spawn", onconnect);
+        stream.on("spawn", onconnect)
       }
-    });
+    })
   }
 
   async buildImage(label, contextTar) {
-    const tag = `debug.bridge/${label}`;
-    const stream = fs.createReadStream(contextTar);
-    const ssh = spawn(this.sshCmd, [`build --tag ${tag}`], {
-      shell: true,
-      stdio: ["pipe", "inherit", "inherit"],
-    });
-    stream.pipe(ssh.stdin);
+    const tag = `debug.bridge/${label}`
+    const resolvedIp = await resolveDomain(this.domain)
+    const stream = fs.createReadStream(contextTar)
+    const ssh = spawn(
+      `ssh -p 22222 box@${resolvedIp}`,
+      [`build --tag ${tag}`],
+      {
+        shell: true,
+        stdio: ["pipe", "inherit", "inherit"]
+      }
+    )
+    stream.pipe(ssh.stdin)
     return new Promise((resolve, reject) => {
       ssh.on("close", (code) => {
         code == 0
           ? resolve(`dev.${this.boxname}.heiyu.space/${tag}`)
-          : reject("在盒子中构建 image 失败");
-      });
+          : reject("在盒子中构建 image 失败")
+      })
     }).finally(() => {
-      fs.rmSync(contextTar);
-    });
+      fs.rmSync(contextTar)
+    })
   }
 }