@lazycatcloud/lzc-cli 1.2.25 → 1.2.27

package/lib/app/lpk_debug_bridge.js

@@ -2,19 +2,21 @@ 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 { 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.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"],
@@ -22,7 +24,7 @@ export class DebugBridge {
     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 ?? ""}`);
     });
   }
 
@@ -32,8 +34,9 @@ export class DebugBridge {
     }
 
     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,
@@ -69,8 +72,9 @@ export class DebugBridge {
     ];
     const answers = await inquirer.prompt(questions);
     if (answers.upload.toLowerCase() == "y") {
+      const resolvedIp = await resolveDomain(this.domain);
       return this.common(`ssh-copy-id`, [
-        `-f -p 22222 box@dev.${this.boxname}.heiyu.space`,
+        `-f -p 22222 box@${resolvedIp}`,
       ]);
     }
   }
@@ -96,8 +100,9 @@ export class DebugBridge {
   }
 
   async devshell(appId, isUserApp, onconnect = null) {
+    const resolvedIp = await resolveDomain(this.domain);
     const stream = spawn(
-      this.sshCmd,
+      `ssh -p 22222 box@${resolvedIp}`,
       [
         "-t",
         "devshell",
@@ -123,8 +128,9 @@ export class DebugBridge {
 
   async buildImage(label, contextTar) {
     const tag = `debug.bridge/${label}`;
+    const resolvedIp = await resolveDomain(this.domain);
     const stream = fs.createReadStream(contextTar);
-    const ssh = spawn(this.sshCmd, [`build --tag ${tag}`], {
+    const ssh = spawn(`ssh -p 22222 box@${resolvedIp}`, [`build --tag ${tag}`], {
       shell: true,
       stdio: ["pipe", "inherit", "inherit"],
     });

package/lib/app/lpk_devshell.js

@@ -18,6 +18,7 @@ import {
   isUserApp,
   createTemplateFileCommon,
   isDebugMode,
+  resolveDomain
 } from "../utils.js";
 import os from "node:os";
 import commandExists from "command-exists";
@@ -411,9 +412,10 @@ class DevShell {
 
   async syncProject(appId) {
     // prettier-ignore
+    const resolvedIp = await resolveDomain(this.domain);
     let rsh = [
       "ssh",
-      "-J", `box@dev.${shellApi.boxname}.heiyu.space:22222`,
+      "-J", `box@${resolvedIp}:22222`,
       "-p", `22222`,
       "-o", `"StrictHostKeyChecking=no"`,
       "-o", `"UserKnownHostsFile=/dev/null"`,

package/lib/utils.js

@@ -15,6 +15,7 @@ import process from "node:process";
 import { spawnSync } from "node:child_process";
 import logger from "loglevel";
 import * as tar from "tar";
+import dns from "node:dns/promises";
 
 export const envsubstr = async (templateContents, args) => {
   const parse = await importDefault("envsub/js/envsub-parser.js");
@@ -373,3 +374,26 @@ export function isPngWithFile(filepath) {
 export function isDebugMode() {
   return logger.getLevel() <= logger.levels.DEBUG;
 }
+
+export async function resolveDomain(domain) {
+  try {
+    // Set machine's dns server as defalut dns server
+    dns.setServers(["[fc03:1136:3800::1]"]);
+    const [ipv6Addresses, ipv4Addresses] = await Promise.allSettled([
+      dns.resolve6(domain),
+      dns.resolve4(domain)
+    ]);
+    let resolvedAddress;
+    if (ipv6Addresses.status === 'fulfilled' && ipv6Addresses.value.length > 0) {
+      resolvedAddress = ipv6Addresses.value[0];
+    } 
+    else if (ipv4Addresses.status === 'fulfilled' && ipv4Addresses.value.length > 0) {
+      resolvedAddress = ipv4Addresses.value[0];
+    } else {
+      throw new Error(`无法解析域名 ${domain}`);
+    }
+    return resolvedAddress;
+  } catch (error) {
+    throw new Error(`无法解析域名 ${domain}: ${error.message}`);
+  }
+}

package/package.json

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

package/template/_lpk/Dockerfile.in

@@ -1,4 +1,4 @@
-FROM registry.lazycat.cloud/alpine:3.18
+FROM registry.cn-hangzhou.aliyuncs.com/lazycatcloud/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.lazycat.cloud/alpine:3.18
+FROM registry.cn-hangzhou.aliyuncs.com/lazycatcloud/devshell:v0.0.5
 
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories