@lazycatcloud/lzc-cli 1.2.27 → 1.2.29

package/lib/app/lpk_devshell.js

@@ -1,10 +1,10 @@
 // lzc-cli app devshell
-import path from "node:path";
-import fs from "node:fs";
-import logger from "loglevel";
-import { execSync } from "node:child_process";
-import { LpkInstaller } from "./lpk_installer.js";
-import debounce from "lodash.debounce";
+import path from "node:path"
+import fs from "node:fs"
+import logger from "loglevel"
+import { execSync } from "node:child_process"
+import { LpkInstaller } from "./lpk_installer.js"
+import debounce from "lodash.debounce"
 import {
   mergeYamlInMemory,
   contextDirname,
@@ -18,15 +18,16 @@ import {
   isUserApp,
   createTemplateFileCommon,
   isDebugMode,
-  resolveDomain
-} from "../utils.js";
-import os from "node:os";
-import commandExists from "command-exists";
-import chokidar from "chokidar";
-import _ from "lodash";
-import { DebugBridge } from "./lpk_debug_bridge.js";
-import shellApi from "../shellapi.js";
-import { collectContextFromDockerFile } from "./lpk_devshell_docker.js";
+  resolveDomain,
+  sleep
+} from "../utils.js"
+import os from "node:os"
+import commandExists from "command-exists"
+import chokidar from "chokidar"
+import _ from "lodash"
+import { DebugBridge } from "./lpk_debug_bridge.js"
+import shellApi from "../shellapi.js"
+import { collectContextFromDockerFile } from "./lpk_devshell_docker.js"
 
 // 判断是否需要重新构建
 // - 先判断 lzc-build.yml 是否发生改变
@@ -36,39 +37,39 @@ import { collectContextFromDockerFile } from "./lpk_devshell_docker.js";
 // - 根据在 backend api 中判断同步的目录下是否存在文件 判断当前运行的 app 是否已经有一个挂载的实例，避免重复挂载
 class AppDevShellMonitor {
   constructor(cwd, pkgId, buildConfigFile) {
-    this.pwd = cwd ? path.resolve(cwd) : process.cwd();
-    this.pkgId = pkgId;
+    this.pwd = cwd ? path.resolve(cwd) : process.cwd()
+    this.pkgId = pkgId
 
-    this.optionsFilePath = path.join(this.pwd, buildConfigFile);
-    this.options = loadFromYaml(this.optionsFilePath);
+    this.optionsFilePath = path.join(this.pwd, buildConfigFile)
+    this.options = loadFromYaml(this.optionsFilePath)
 
     this.manifestFilePath = this.options["manifest"]
       ? path.join(this.pwd, this.options["manifest"])
-      : path.join(this.pwd, "lzc-manifest.yml");
+      : path.join(this.pwd, "lzc-manifest.yml")
 
     this.hashObject = {
       build: "",
-      manifest: "",
-    };
-    this.cacheFilePath = undefined;
-    this.oldHash = undefined;
-    this.newHash = undefined;
-    this.bridge = new DebugBridge();
+      manifest: ""
+    }
+    this.cacheFilePath = undefined
+    this.oldHash = undefined
+    this.newHash = undefined
+    this.bridge = new DebugBridge()
   }
 
   async init() {
-    const pathId = await md5String(this.pwd);
+    const pathId = await md5String(this.pwd)
     this.cacheFilePath = path.resolve(
       os.tmpdir(),
       "lzc-cli-devshell",
       pathId,
       "hash"
-    );
-    ensureDir(this.cacheFilePath);
+    )
+    ensureDir(this.cacheFilePath)
 
-    await this.updateHash();
+    await this.updateHash()
 
-    return this;
+    return this
   }
 
   async shouldBuild() {
@@ -76,373 +77,376 @@ class AppDevShellMonitor {
       this.change() ||
       (await this.bridge.status(this.pkgId)) === "NotInstalled" ||
       !(await this.bridge.isDevshell(this.pkgId))
-    );
+    )
   }
 
   change() {
-    logger.debug("oldHash", this.oldHash);
-    logger.debug("newHash", this.newHash);
-    return !_.isEqual(this.oldHash, this.newHash);
+    logger.debug("oldHash", this.oldHash)
+    logger.debug("newHash", this.newHash)
+    return !_.isEqual(this.oldHash, this.newHash)
   }
 
   async updateHash() {
     this.oldHash = isFileExist(this.cacheFilePath)
       ? JSON.parse(fs.readFileSync(this.cacheFilePath))
-      : {};
+      : {}
     const buildHash = isFileExist(this.optionsFilePath)
       ? await md5File(this.optionsFilePath)
-      : "";
+      : ""
     const manifestHash = isFileExist(this.manifestFilePath)
       ? await md5File(this.manifestFilePath)
-      : "";
+      : ""
     this.newHash = {
       build: buildHash,
-      manifest: manifestHash,
-    };
+      manifest: manifestHash
+    }
     if (!_.isEqual(this.oldHash, this.newHash)) {
-      fs.writeFileSync(this.cacheFilePath, JSON.stringify(this.newHash));
+      fs.writeFileSync(this.cacheFilePath, JSON.stringify(this.newHash))
     }
   }
 }
 
 export class AppDevShell {
   constructor(cwd, lpkBuild, forceBuild, buildConfigFile) {
-    this.cwd = cwd;
-    this.lpkBuild = lpkBuild;
-    this.forceBuild = forceBuild;
-    this.buildConfigFile = buildConfigFile;
-    this.isUserApp = false;
-    this.monitor = undefined;
+    this.cwd = cwd
+    this.lpkBuild = lpkBuild
+    this.forceBuild = forceBuild
+    this.buildConfigFile = buildConfigFile
+    this.isUserApp = false
+    this.monitor = undefined
   }
 
   async init() {
-    const manifest = await this.lpkBuild.getManifest();
+    const manifest = await this.lpkBuild.getManifest()
     this.monitor = await new AppDevShellMonitor(
       this.cwd,
       manifest["package"],
       this.buildConfigFile
-    ).init();
-    this.isUserApp = isUserApp(manifest);
+    ).init()
+    this.isUserApp = isUserApp(manifest)
   }
 
   async build() {
     // 先判断是否需要重新构建
     if (this.forceBuild || (await this.monitor.shouldBuild())) {
-      logger.debug("build...");
-      await this.devshellBuild();
+      logger.debug("build...")
+      await this.devshellBuild()
     }
   }
 
   async devshellBuild() {
     this.lpkBuild.onBeforeBuildPackage(async (options) => {
-      const devshell = options["devshell"];
+      const devshell = options["devshell"]
       if (!devshell) {
-        throw "devshell 模式下，devshell 字段必须要指定";
+        throw "devshell 模式下，devshell 字段必须要指定"
       }
 
-      const routes = devshell["routes"];
+      const routes = devshell["routes"]
       if (!routes || routes.length == 0) {
-        throw "devshell 模式下，必须要指定 routes 内容";
+        throw "devshell 模式下，必须要指定 routes 内容"
       }
 
-      return options;
-    });
+      return options
+    })
 
     // 复制 busybox 到 devshell 中去
     this.lpkBuild.onBeforeTarContent(async (contentdir) => {
       const busyboxPath = path.join(
         contextDirname(import.meta.url),
         "../../template/_lpk/busybox-1.35.0"
-      );
-      let dest = path.join(contentdir, "devshell", "busybox");
-      ensureDir(dest);
-      fs.copyFileSync(busyboxPath, dest);
-      fs.chmodSync(dest, 0o775);
-    });
+      )
+      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"
-      );
-      let dest = path.join(contentdir, "devshell", "init_debug_bridge.sh");
-      ensureDir(dest);
-      fs.copyFileSync(initPath, dest);
-      fs.chmodSync(dest, 0o775);
-    });
+      )
+      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"
-      );
-      let dest = path.join(contentdir, "devshell", "exec.sh");
-      ensureDir(dest);
-      fs.copyFileSync(execScriptPath, dest);
-      fs.chmodSync(dest, 0o775);
-    });
+      )
+      let dest = path.join(contentdir, "devshell", "exec.sh")
+      ensureDir(dest)
+      fs.copyFileSync(execScriptPath, dest)
+      fs.chmodSync(dest, 0o775)
+    })
 
     // 复制 setupscript 脚本
     this.lpkBuild.onBeforeTarContent(async (contentdir, options) => {
-      const devshell = options["devshell"];
+      const devshell = options["devshell"]
       if (!devshell["setupscript"]) {
-        return;
+        return
       }
 
-      logger.debug("处理 setupscript ");
-      const dest = path.join(contentdir, "devshell", "setupscript");
-      ensureDir(dest);
+      logger.debug("处理 setupscript ")
+      const dest = path.join(contentdir, "devshell", "setupscript")
+      ensureDir(dest)
 
       // 先判断是否文件
-      const filePath = path.resolve(devshell["setupscript"]);
+      const filePath = path.resolve(devshell["setupscript"])
       if (isFileExist(filePath)) {
-        fs.copyFileSync(filePath, dest);
+        fs.copyFileSync(filePath, dest)
       } else {
-        fs.writeFileSync(
-          dest,
-          `#!/bin/sh\nset -ex\n${devshell["setupscript"]}`
-        );
+        fs.writeFileSync(dest, `#!/bin/sh\nset -ex\n${devshell["setupscript"]}`)
       }
-      fs.chmodSync(dest, 0o775);
-    });
+      fs.chmodSync(dest, 0o775)
+    })
 
     // 在生成 manifest.yml 之前合并 devshell manifest 模板字段
     this.lpkBuild.onBeforeDumpYaml(async (manifest, options) => {
-      logger.debug("merge lzc-build.yml devshell routes field");
-      const devshell = options["devshell"];
+      logger.debug("merge lzc-build.yml devshell routes field")
+      const devshell = options["devshell"]
 
-      const routes = devshell["routes"];
-      logger.debug("options devshell delete 'routes' field");
-      delete options["devshell"]["routes"];
+      const routes = devshell["routes"]
+      logger.debug("options devshell delete 'routes' field")
+      delete options["devshell"]["routes"]
 
       // 添加 devshell 必要路由
       routes.push(
         "/__debug.bridge=exec://80,/lzcapp/pkg/content/devshell/init_debug_bridge.sh"
-      );
-      routes.push("/__isdevshell=file:///lzcapp/pkg/devshell");
+      )
+      routes.push("/__isdevshell=file:///lzcapp/pkg/devshell")
 
       // 如果 devshell 中的 router 和 manifest 中的 prefix 出现冲突
       // 优先使用 devshell 中的。
       routes.forEach((r) => {
         if (!r) {
-          return;
+          return
         }
 
-        let prefix = r.split("=")[0];
+        let prefix = r.split("=")[0]
         let index = manifest["application"]["routes"].findIndex((mr) => {
           if (!mr) {
-            return false;
+            return false
           }
-          return mr.split("=")[0] == prefix;
-        });
+          return mr.split("=")[0] == prefix
+        })
         if (index > -1) {
-          manifest["application"]["routes"].splice(index, 1);
+          manifest["application"]["routes"].splice(index, 1)
         }
-      });
-      const application = { routes };
-      return mergeYamlInMemory([manifest, { application }]);
-    });
+      })
+      const application = { routes }
+      return mergeYamlInMemory([manifest, { application }])
+    })
 
     // 在生成 manifest.yml 之前合并 lzc-build.yml devshell 字段的值
     // 并加上 health_check 字段, 当处于 devshell 的情况时，禁用 health_check
     // 避免应用永远处于 unhealth 导致状态卡在 starting
     this.lpkBuild.onBeforeDumpYaml(async (manifest, options) => {
-      logger.debug("merge lzc-build.yml devshell services\n", options);
-      const userapp = this.isUserApp ? shellApi.uid + "." : "";
+      logger.debug("merge lzc-build.yml devshell services\n", options)
+      const userapp = this.isUserApp ? shellApi.uid + "." : ""
       const devshell = {
         application: {
           devshell: options["devshell"],
           health_check: {
             test_url: `http://${userapp}app.${manifest["package"]}.lzcapp/__isdevshell`,
-            disable: true,
-          },
-        },
-      };
-      return mergeYamlInMemory([manifest, devshell]);
-    });
+            disable: true
+          }
+        }
+      }
+      return mergeYamlInMemory([manifest, devshell])
+    })
 
     // 如果 services/devshell 中有 dependencies 字段，优先使用
     this.lpkBuild.onBeforeDumpYaml(async (manifest) => {
-      const config = manifest["application"]["devshell"];
+      const config = manifest["application"]["devshell"]
       if (!config || !config["dependencies"]) {
-        return manifest;
+        return manifest
       }
 
-      const deps = config["dependencies"];
+      const deps = config["dependencies"]
       if (deps.length == 0) {
-        logger.warn("dependencies 内容为空，跳过 dependencies");
-        delete manifest["application"]["devshell"]["dependencies"];
-        return manifest;
+        logger.warn("dependencies 内容为空，跳过 dependencies")
+        delete manifest["application"]["devshell"]["dependencies"]
+        return manifest
       }
 
-      const depsStr = deps.sort().join(" ");
-      logger.debug("开始创建 Dockerfile 文件");
+      const depsStr = deps.sort().join(" ")
+      logger.debug("开始创建 Dockerfile 文件")
 
-      const tempDir = fs.mkdtempSync(".lzc-cli-build-dependencies");
+      const tempDir = fs.mkdtempSync(".lzc-cli-build-dependencies")
       try {
         const dockerfilePath = path.join(
           contextDirname(import.meta.url),
           "../../template/_lpk/Dockerfile.in"
-        );
+        )
         await createTemplateFileCommon(
           dockerfilePath,
           path.join(tempDir, "Dockerfile"),
           { dependencies: depsStr }
-        );
+        )
 
-        const label = `${await md5String(depsStr)}:latest`;
-        logger.debug(`开始在盒子中构建 ${label} 镜像 from ${tempDir}`);
+        const label = `${await md5String(depsStr)}:latest`
+        logger.debug(`开始在盒子中构建 ${label} 镜像 from ${tempDir}`)
 
         const contextTar = await collectContextFromDockerFile(
           tempDir,
           path.resolve(tempDir, "Dockerfile")
-        );
-        const bridge = new DebugBridge();
-        const tag = await bridge.buildImage(label, contextTar);
-        delete manifest["application"]["devshell"];
-        manifest["application"]["image"] = tag;
+        )
+        const bridge = new DebugBridge()
+        const tag = await bridge.buildImage(label, contextTar)
+        delete manifest["application"]["devshell"]
+        manifest["application"]["image"] = tag
       } finally {
-        fs.rmSync(tempDir, { recursive: true });
+        fs.rmSync(tempDir, { recursive: true })
       }
-      return manifest;
-    });
+      return manifest
+    })
 
     // 如果 services 中有 devshell 的字段，需要检测是否需要提前构建
     this.lpkBuild.onBeforeDumpYaml(async (manifest) => {
-      const application = manifest["application"];
+      const application = manifest["application"]
       if (!application || !application["devshell"]) {
-        return manifest;
+        return manifest
       }
 
-      const config = manifest["application"]["devshell"];
+      const config = manifest["application"]["devshell"]
       if (!config || !config["build"]) {
-        return manifest;
+        return manifest
       }
 
-      const label = `${manifest["package"]}-devshell:${manifest["version"]}`;
-      logger.debug(`开始在盒子中构建 ${label} 镜像`);
+      const label = `${manifest["package"]}-devshell:${manifest["version"]}`
+      logger.debug(`开始在盒子中构建 ${label} 镜像`)
 
       const contextTar = await collectContextFromDockerFile(
         process.cwd(),
         path.resolve(process.cwd(), config["build"], "Dockerfile")
-      );
+      )
 
-      const bridge = new DebugBridge();
-      const tag = await bridge.buildImage(label, contextTar);
-      delete manifest["application"]["devshell"];
-      manifest["application"]["image"] = tag;
-      return manifest;
-    });
+      const bridge = new DebugBridge()
+      const tag = await bridge.buildImage(label, contextTar)
+      delete manifest["application"]["devshell"]
+      manifest["application"]["image"] = tag
+      return manifest
+    })
 
     // 如果 devshell 中指定了 image 字段将使用 image 字段
     this.lpkBuild.onBeforeDumpYaml(async (manifest) => {
-      const config = manifest["application"];
+      const config = manifest["application"]
       if (config["devshell"] && config["devshell"]["image"]) {
-        manifest["application"]["image"] = config["devshell"]["image"];
-        delete manifest["application"]["devshell"];
+        manifest["application"]["image"] = config["devshell"]["image"]
+        delete manifest["application"]["devshell"]
       }
-      return manifest;
-    });
+      return manifest
+    })
 
     // 如果没有找到 devshell 中没有指定 image 不存在，将默认使用的 lzc-cli/devshell 容器
     this.lpkBuild.onBeforeDumpYaml(async (manifest) => {
-      delete manifest["application"]["devshell"];
+      delete manifest["application"]["devshell"]
 
-      const config = manifest["application"];
+      const config = manifest["application"]
       if (config["image"]) {
-        return manifest;
+        return manifest
       }
 
-      logger.debug("use default lzc-cli/devshell image");
-      manifest["application"][
-        "image"
-      ] = `registry.lazycat.cloud/lzc-cli/devshell:v0.0.5`;
-      return manifest;
-    });
+      logger.debug("use default lzc-cli/devshell image")
+      manifest["application"]["image"] =
+        `registry.lazycat.cloud/lzc-cli/devshell:v0.0.5`
+      return manifest
+    })
 
     // 添加一个 devshell 的标记在 lpk 中，标记当前 lpk 为一个 debug 版本
     this.lpkBuild.onBeforeDumpLpk(async (options, cwd, destDir) => {
-      fs.writeFileSync(path.resolve(destDir, "devshell"), "");
-    });
+      fs.writeFileSync(path.resolve(destDir, "devshell"), "")
+    })
 
     // 在构建生成 lpk 包后，调用 deploy 进行部署
-    let installer = new LpkInstaller();
-    await installer.init();
-    await installer.deploy(this.lpkBuild, true);
+    let installer = new LpkInstaller()
+    await installer.init()
+    await installer.deploy(this.lpkBuild, true)
   }
 
   async rsyncShell() {
-    const manifest = await this.lpkBuild.getManifest();
-    const pkgId = manifest["package"];
+    const manifest = await this.lpkBuild.getManifest()
+    const pkgId = manifest["package"]
 
-    let isSync = false;
+    let isSync = false
     try {
-      const locker = new FileLocker(pkgId);
-      locker.lock();
+      const locker = new FileLocker(pkgId)
+      locker.lock()
       process.on("exit", () => {
-        logger.debug("filelock unlock");
-        locker.unlock();
-      });
-      isSync = true;
+        logger.debug("filelock unlock")
+        locker.unlock()
+      })
+      isSync = true
     } catch (err) {
-      logger.debug("filelock catch");
-      logger.debug(err);
+      logger.debug("filelock catch")
+      logger.debug(err)
     }
 
-    const devshell = new DevShell(pkgId, this.isUserApp);
+    const devshell = new DevShell(pkgId, this.isUserApp)
     if (isSync) {
-      await devshell.shell();
+      await devshell.shell()
     } else {
-      await devshell.connectShell();
+      await devshell.connectShell()
     }
-    logger.debug("exit shell");
+    logger.debug("exit shell")
     // TODO: shell 在正常情况下，按 Ctrl-D 就会退出，回到原来的本地的 shell ，但
     // 现在会一直卡在退出状态后，必须要另外手动的指定 pkill node
-    process.exit(0);
+    process.exit(0)
   }
 }
 
 class DevShell {
   constructor(appId, isUserApp) {
-    this.appId = appId;
-    this.isUserApp = isUserApp;
+    this.appId = appId
+    this.isUserApp = isUserApp
   }
 
   async syncProject(appId) {
     // prettier-ignore
-    const resolvedIp = await resolveDomain(this.domain);
+    const resolvedIp = await resolveDomain(`dev.${shellApi.boxname}.heiyu.space`);
     let rsh = [
       "ssh",
-      "-J", `box@${resolvedIp}:22222`,
-      "-p", `22222`,
-      "-o", `"StrictHostKeyChecking=no"`,
-      "-o", `"UserKnownHostsFile=/dev/null"`,
-      "-o", `"ConnectionAttempts=3"`,
-      "-o", `"ConnectTimeout=30"`,
-      "-o", `${isDebugMode() ? '"LogLevel=DEBUG"' :'"LogLevel=ERROR"'}`,
-    ].join(" ");
+      "-J",
+      `box@[${resolvedIp}]:22222`,
+      "-p",
+      `22222`,
+      "-o",
+      `"StrictHostKeyChecking=no"`,
+      "-o",
+      `"UserKnownHostsFile=/dev/null"`,
+      "-o",
+      `"ConnectionAttempts=3"`,
+      "-o",
+      `"ConnectTimeout=30"`,
+      "-o",
+      `${isDebugMode() ? '"LogLevel=DEBUG"' : '"LogLevel=ERROR"'}`
+    ].join(" ")
     // 检查rsync工具是否存在:提示用户
-    const rsyncExisted = commandExists.sync("rsync");
+    const rsyncExisted = commandExists.sync("rsync")
     if (!rsyncExisted) {
-      logger.error("请检查 rsync 是否安装，路径是否正确!");
-      process.exit(1);
+      logger.error("请检查 rsync 是否安装，路径是否正确!")
+      process.exit(1)
     }
 
-    const rsyncDebug = isDebugMode() ? "-P" : "";
+    const rsyncDebug = isDebugMode() ? "-P" : ""
     const host = this.isUserApp
       ? `${shellApi.uid}.app.${appId}.lzcapp`
-      : `app.${appId}.lzcapp`;
-    const dest = `root@${host}:/lzcapp/cache/devshell`;
+      : `app.${appId}.lzcapp`
+    const dest = `root@${host}:/lzcapp/cache/devshell`
     try {
       execSync(
         `rsync ${rsyncDebug} --rsh='${rsh}' --recursive --relative --perms --update -F --filter=':- .gitignore' --ignore-errors . ${dest}`,
         { stdio: ["ignore", "inherit", "inherit"] }
-      );
+      )
     } catch (err) {
-      logger.error("rsync 同步失败");
-      logger.debug(err);
+      logger.error("rsync 同步失败")
+      logger.debug(err)
     }
   }
 
@@ -452,77 +456,74 @@ class DevShell {
   //  fs.watch 虽然不支持递归，但可以直接监听整个文件夹的变动
   async fallbackWatch(filepath, gitignore, callback) {
     if (gitignore.contain(filepath)) {
-      return Promise.resolve();
+      return Promise.resolve()
     }
 
     if (filepath.endsWith(".git") || filepath.endsWith(".lazycat")) {
-      return Promise.resolve();
+      return Promise.resolve()
     }
 
-    fs.watch(filepath, callback(filepath));
+    fs.watch(filepath, callback(filepath))
 
     // 如果为一个文件夹，则扫描当中是否含有子文件夹
     if (isDirSync(filepath)) {
       return gitignore.readdir(filepath, (err, files) => {
         if (err) {
-          throw err;
+          throw err
         }
 
         if (files.length <= 0) {
-          return;
+          return
         }
 
         files.forEach((f) => {
           if (f.isDirectory()) {
-            this.fallbackWatch(
-              path.join(filepath, f.name),
-              gitignore,
-              callback
-            );
+            this.fallbackWatch(path.join(filepath, f.name), gitignore, callback)
           }
-        });
-      });
+        })
+      })
     }
   }
 
   // 监听非.gitignore文件
   // TODO： 目前仅仅监听process.cwd()以下的文件
   async watchFile(appId) {
-    const ignore = new GitIgnore(process.cwd());
-    await ignore.collect();
+    const ignore = new GitIgnore(process.cwd())
+    await ignore.collect()
     chokidar
       .watch(".", {
         ignored: (path) => {
-          if ([".git", ".lazycat"].some((p) => path.startsWith(p))) return true;
+          if ([".git", ".lazycat"].some((p) => path.startsWith(p))) return true
 
-          return ignore.contain(path);
+          return ignore.contain(path)
         },
-        ignoreInitial: true,
+        ignoreInitial: true
       })
       .on(
         "all",
         debounce(() => {
-          this.syncProject(appId);
+          this.syncProject(appId)
         }, 1000)
-      );
+      )
   }
 
   async shell() {
     try {
       // 监听文件
-      await this.watchFile(this.appId);
+      await this.watchFile(this.appId)
       await this.connectShell(async () => {
         // 在连接成功的时候，同步一次文件
-        await this.syncProject(this.appId);
-      });
+        await sleep(300)
+        await this.syncProject(this.appId)
+      })
     } catch (e) {
-      console.log(e);
-      return Promise.reject(e);
+      console.log(e)
+      return Promise.reject(e)
     }
   }
 
   async connectShell(onconnect = null) {
-    const bridge = new DebugBridge();
-    await bridge.devshell(this.appId, this.isUserApp, onconnect);
+    const bridge = new DebugBridge()
+    await bridge.devshell(this.appId, this.isUserApp, onconnect)
   }
 }