unplugin-https-reverse-proxy 1.0.0-beta.17 → 1.0.0-beta.18

package/README.md

@@ -220,7 +220,17 @@ export default defineNuxtConfig({
 })
 ```
 
-> This module works for both Nuxt 2 and [Nuxt Vite](https://github.com/nuxt/vite)
+**!important:** You need to update the `nuxt dev` script by adding `--fork=false` to enable host restoration.
+
+```json
+// package.json
+
+{
+  "scripts": {
+    "dev": "nuxt dev --fork=false"
+  }
+}
+```
 
 <br></details>
 

package/dist/{chunk-WCFY7NJQ.js → chunk-ZDL3GBDQ.js}

@@ -379,6 +379,8 @@ var CaddyInstant = class {
       showCaddyLog = false,
       https = false
     } = options || {};
+    this._source = source;
+    this._target = target;
     if (!this.inited)
       await this.init();
     if (!await addHost(source.split(":")[0], target.split(":")[0]))
@@ -407,17 +409,11 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       var _a, _b;
       const setupCleanup = () => {
         process3.on("SIGINT", async () => {
-          if (!restore || this.stoped)
+          if (this.stoped)
             return;
-          await this.baseCleanup();
+          process3.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup(restore);
           } finally {
             this.stoped = true;
             process3.nextTick(() => {
@@ -433,24 +429,21 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
           const pwd = process3.cwd();
           const viteCacheDir = `${pwd}/node_modules/.vite`;
           if (existsSync(viteCacheDir))
-            chmodRecursive(viteCacheDir, 511);
+            await chmodRecursive(viteCacheDir, 511).catch(() => {
+            });
           const nuxtCacheDir = `${pwd}/.nuxt`;
           if (existsSync(nuxtCacheDir))
-            await chmodRecursive(nuxtCacheDir, 511);
+            await chmodRecursive(nuxtCacheDir, 511).catch(() => {
+            });
           const webpackCacheDir = `${pwd}/node_modules/.cache`;
           if (existsSync(webpackCacheDir))
-            chmodRecursive(webpackCacheDir, 511);
-          if (!restore || this.stoped)
+            await chmodRecursive(webpackCacheDir, 511).catch(() => {
+            });
+          if (this.stoped)
             return originalExit(code);
-          await this.baseCleanup();
+          process3.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup();
           } finally {
             this.stoped = true;
             process3.nextTick(() => {
@@ -460,12 +453,12 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         };
       };
       if (!this.locked) {
-        this.caddyChild = process3.platform !== "win32" ? spawn("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : spawn(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
+        this._caddyChild = process3.platform !== "win32" ? spawn("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : spawn(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
         lockfile.lockSync(caddyLockFilePath);
-        this.caddyChild.on("error", (err) => {
+        this._caddyChild.on("error", (err) => {
           return reject(err);
         });
-        (_a = this.caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
+        (_a = this._caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
           const lines = data.toString().split("\n").map((line) => line.trim());
           for (const line of lines) {
             showCaddyLog && line && console.info(line);
@@ -480,7 +473,7 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
               return resolve();
           }
         });
-        (_b = this.caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
+        (_b = this._caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
           consola.info(_data.toString());
           resolve();
         });
@@ -492,15 +485,30 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       }
     });
   }
-  async baseCleanup() {
+  async baseCleanup(restore = true) {
     var _a;
-    if (!this.locked) {
-      (_a = this.caddyChild) == null ? void 0 : _a.kill();
+    try {
+      if (restore && this._source && this._target) {
+        if (await removeHost(this._source.split(":")[0], this._target.split(":")[0]))
+          consola.success("Restore host success.\n");
+        else
+          consola.fail("Restore host failed.\n");
+      }
+    } catch (e) {
+      consola.error(e);
+      consola.fail("Restore host failed.\n");
+    }
+    if (!this.locked && !this.stoped) {
+      (_a = this._caddyChild) == null ? void 0 : _a.kill();
       try {
-        await lockfile.unlock(caddyLockFilePath);
-        await unlink(caddyFilePath);
-        await unlink(caddyLockFilePath);
+        await lockfile.unlock(caddyLockFilePath).catch(() => {
+        });
+        await unlink(caddyFilePath).catch(() => {
+        });
+        await unlink(caddyLockFilePath).catch(() => {
+        });
       } catch (e) {
+        consola.error(e);
       }
     }
   }

package/dist/esbuild.cjs

@@ -448,6 +448,8 @@ var CaddyInstant = class {
       showCaddyLog = false,
       https = false
     } = options || {};
+    this._source = source;
+    this._target = target;
     if (!this.inited)
       await this.init();
     if (!await addHost(source.split(":")[0], target.split(":")[0]))
@@ -476,17 +478,11 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       var _a, _b;
       const setupCleanup = () => {
         import_node_process4.default.on("SIGINT", async () => {
-          if (!restore || this.stoped)
+          if (this.stoped)
             return;
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup(restore);
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -502,24 +498,21 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
           const pwd = import_node_process4.default.cwd();
           const viteCacheDir = `${pwd}/node_modules/.vite`;
           if ((0, import_node_fs2.existsSync)(viteCacheDir))
-            chmodRecursive(viteCacheDir, 511);
+            await chmodRecursive(viteCacheDir, 511).catch(() => {
+            });
           const nuxtCacheDir = `${pwd}/.nuxt`;
           if ((0, import_node_fs2.existsSync)(nuxtCacheDir))
-            await chmodRecursive(nuxtCacheDir, 511);
+            await chmodRecursive(nuxtCacheDir, 511).catch(() => {
+            });
           const webpackCacheDir = `${pwd}/node_modules/.cache`;
           if ((0, import_node_fs2.existsSync)(webpackCacheDir))
-            chmodRecursive(webpackCacheDir, 511);
-          if (!restore || this.stoped)
+            await chmodRecursive(webpackCacheDir, 511).catch(() => {
+            });
+          if (this.stoped)
             return originalExit(code);
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup();
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -529,12 +522,12 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         };
       };
       if (!this.locked) {
-        this.caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
+        this._caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
         lockfile.lockSync(caddyLockFilePath);
-        this.caddyChild.on("error", (err) => {
+        this._caddyChild.on("error", (err) => {
           return reject(err);
         });
-        (_a = this.caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
+        (_a = this._caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
           const lines = data.toString().split("\n").map((line) => line.trim());
           for (const line of lines) {
             showCaddyLog && line && console.info(line);
@@ -549,7 +542,7 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
               return resolve();
           }
         });
-        (_b = this.caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
+        (_b = this._caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
           consola.info(_data.toString());
           resolve();
         });
@@ -561,15 +554,30 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       }
     });
   }
-  async baseCleanup() {
+  async baseCleanup(restore = true) {
     var _a;
-    if (!this.locked) {
-      (_a = this.caddyChild) == null ? void 0 : _a.kill();
+    try {
+      if (restore && this._source && this._target) {
+        if (await removeHost(this._source.split(":")[0], this._target.split(":")[0]))
+          consola.success("Restore host success.\n");
+        else
+          consola.fail("Restore host failed.\n");
+      }
+    } catch (e) {
+      consola.error(e);
+      consola.fail("Restore host failed.\n");
+    }
+    if (!this.locked && !this.stoped) {
+      (_a = this._caddyChild) == null ? void 0 : _a.kill();
       try {
-        await lockfile.unlock(caddyLockFilePath);
-        await (0, import_promises2.unlink)(caddyFilePath);
-        await (0, import_promises2.unlink)(caddyLockFilePath);
+        await lockfile.unlock(caddyLockFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyLockFilePath).catch(() => {
+        });
       } catch (e) {
+        consola.error(e);
       }
     }
   }

package/dist/esbuild.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-WCFY7NJQ.js";
+} from "./chunk-ZDL3GBDQ.js";
 import "./chunk-2VGRJ3QS.js";
 
 // src/esbuild.ts

package/dist/index.cjs

@@ -448,6 +448,8 @@ var CaddyInstant = class {
       showCaddyLog = false,
       https = false
     } = options || {};
+    this._source = source;
+    this._target = target;
     if (!this.inited)
       await this.init();
     if (!await addHost(source.split(":")[0], target.split(":")[0]))
@@ -476,17 +478,11 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       var _a, _b;
       const setupCleanup = () => {
         import_node_process4.default.on("SIGINT", async () => {
-          if (!restore || this.stoped)
+          if (this.stoped)
             return;
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup(restore);
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -502,24 +498,21 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
           const pwd = import_node_process4.default.cwd();
           const viteCacheDir = `${pwd}/node_modules/.vite`;
           if ((0, import_node_fs2.existsSync)(viteCacheDir))
-            chmodRecursive(viteCacheDir, 511);
+            await chmodRecursive(viteCacheDir, 511).catch(() => {
+            });
           const nuxtCacheDir = `${pwd}/.nuxt`;
           if ((0, import_node_fs2.existsSync)(nuxtCacheDir))
-            await chmodRecursive(nuxtCacheDir, 511);
+            await chmodRecursive(nuxtCacheDir, 511).catch(() => {
+            });
           const webpackCacheDir = `${pwd}/node_modules/.cache`;
           if ((0, import_node_fs2.existsSync)(webpackCacheDir))
-            chmodRecursive(webpackCacheDir, 511);
-          if (!restore || this.stoped)
+            await chmodRecursive(webpackCacheDir, 511).catch(() => {
+            });
+          if (this.stoped)
             return originalExit(code);
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup();
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -529,12 +522,12 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         };
       };
       if (!this.locked) {
-        this.caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
+        this._caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
         lockfile.lockSync(caddyLockFilePath);
-        this.caddyChild.on("error", (err) => {
+        this._caddyChild.on("error", (err) => {
           return reject(err);
         });
-        (_a = this.caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
+        (_a = this._caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
           const lines = data.toString().split("\n").map((line) => line.trim());
           for (const line of lines) {
             showCaddyLog && line && console.info(line);
@@ -549,7 +542,7 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
               return resolve();
           }
         });
-        (_b = this.caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
+        (_b = this._caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
           consola.info(_data.toString());
           resolve();
         });
@@ -561,15 +554,30 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       }
     });
   }
-  async baseCleanup() {
+  async baseCleanup(restore = true) {
     var _a;
-    if (!this.locked) {
-      (_a = this.caddyChild) == null ? void 0 : _a.kill();
+    try {
+      if (restore && this._source && this._target) {
+        if (await removeHost(this._source.split(":")[0], this._target.split(":")[0]))
+          consola.success("Restore host success.\n");
+        else
+          consola.fail("Restore host failed.\n");
+      }
+    } catch (e) {
+      consola.error(e);
+      consola.fail("Restore host failed.\n");
+    }
+    if (!this.locked && !this.stoped) {
+      (_a = this._caddyChild) == null ? void 0 : _a.kill();
       try {
-        await lockfile.unlock(caddyLockFilePath);
-        await (0, import_promises2.unlink)(caddyFilePath);
-        await (0, import_promises2.unlink)(caddyLockFilePath);
+        await lockfile.unlock(caddyLockFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyLockFilePath).catch(() => {
+        });
       } catch (e) {
+        consola.error(e);
       }
     }
   }

package/dist/index.js

@@ -3,7 +3,7 @@ import {
   unplugin,
   unpluginFactory,
   vitePrintUrls
-} from "./chunk-WCFY7NJQ.js";
+} from "./chunk-ZDL3GBDQ.js";
 import "./chunk-2VGRJ3QS.js";
 export {
   src_default as default,

package/dist/nuxt.cjs

@@ -450,6 +450,8 @@ var CaddyInstant = class {
       showCaddyLog = false,
       https = false
     } = options || {};
+    this._source = source;
+    this._target = target;
     if (!this.inited)
       await this.init();
     if (!await addHost(source.split(":")[0], target.split(":")[0]))
@@ -478,17 +480,11 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       var _a, _b;
       const setupCleanup = () => {
         import_node_process4.default.on("SIGINT", async () => {
-          if (!restore || this.stoped)
+          if (this.stoped)
             return;
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup(restore);
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -504,24 +500,21 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
           const pwd = import_node_process4.default.cwd();
           const viteCacheDir = `${pwd}/node_modules/.vite`;
           if ((0, import_node_fs2.existsSync)(viteCacheDir))
-            chmodRecursive(viteCacheDir, 511);
+            await chmodRecursive(viteCacheDir, 511).catch(() => {
+            });
           const nuxtCacheDir = `${pwd}/.nuxt`;
           if ((0, import_node_fs2.existsSync)(nuxtCacheDir))
-            await chmodRecursive(nuxtCacheDir, 511);
+            await chmodRecursive(nuxtCacheDir, 511).catch(() => {
+            });
           const webpackCacheDir = `${pwd}/node_modules/.cache`;
           if ((0, import_node_fs2.existsSync)(webpackCacheDir))
-            chmodRecursive(webpackCacheDir, 511);
-          if (!restore || this.stoped)
+            await chmodRecursive(webpackCacheDir, 511).catch(() => {
+            });
+          if (this.stoped)
             return originalExit(code);
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup();
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -531,12 +524,12 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         };
       };
       if (!this.locked) {
-        this.caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
+        this._caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
         lockfile.lockSync(caddyLockFilePath);
-        this.caddyChild.on("error", (err) => {
+        this._caddyChild.on("error", (err) => {
           return reject(err);
         });
-        (_a = this.caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
+        (_a = this._caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
           const lines = data.toString().split("\n").map((line) => line.trim());
           for (const line of lines) {
             showCaddyLog && line && console.info(line);
@@ -551,7 +544,7 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
               return resolve();
           }
         });
-        (_b = this.caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
+        (_b = this._caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
           consola.info(_data.toString());
           resolve();
         });
@@ -563,15 +556,30 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       }
     });
   }
-  async baseCleanup() {
+  async baseCleanup(restore = true) {
     var _a;
-    if (!this.locked) {
-      (_a = this.caddyChild) == null ? void 0 : _a.kill();
+    try {
+      if (restore && this._source && this._target) {
+        if (await removeHost(this._source.split(":")[0], this._target.split(":")[0]))
+          consola.success("Restore host success.\n");
+        else
+          consola.fail("Restore host failed.\n");
+      }
+    } catch (e) {
+      consola.error(e);
+      consola.fail("Restore host failed.\n");
+    }
+    if (!this.locked && !this.stoped) {
+      (_a = this._caddyChild) == null ? void 0 : _a.kill();
       try {
-        await lockfile.unlock(caddyLockFilePath);
-        await (0, import_promises2.unlink)(caddyFilePath);
-        await (0, import_promises2.unlink)(caddyLockFilePath);
+        await lockfile.unlock(caddyLockFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyLockFilePath).catch(() => {
+        });
       } catch (e) {
+        consola.error(e);
       }
     }
   }

package/dist/nuxt.js

@@ -1,6 +1,6 @@
 import {
   vitePrintUrls
-} from "./chunk-WCFY7NJQ.js";
+} from "./chunk-ZDL3GBDQ.js";
 import {
   consola,
   isAdmin

package/dist/rollup.cjs

@@ -448,6 +448,8 @@ var CaddyInstant = class {
       showCaddyLog = false,
       https = false
     } = options || {};
+    this._source = source;
+    this._target = target;
     if (!this.inited)
       await this.init();
     if (!await addHost(source.split(":")[0], target.split(":")[0]))
@@ -476,17 +478,11 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       var _a, _b;
       const setupCleanup = () => {
         import_node_process4.default.on("SIGINT", async () => {
-          if (!restore || this.stoped)
+          if (this.stoped)
             return;
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup(restore);
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -502,24 +498,21 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
           const pwd = import_node_process4.default.cwd();
           const viteCacheDir = `${pwd}/node_modules/.vite`;
           if ((0, import_node_fs2.existsSync)(viteCacheDir))
-            chmodRecursive(viteCacheDir, 511);
+            await chmodRecursive(viteCacheDir, 511).catch(() => {
+            });
           const nuxtCacheDir = `${pwd}/.nuxt`;
           if ((0, import_node_fs2.existsSync)(nuxtCacheDir))
-            await chmodRecursive(nuxtCacheDir, 511);
+            await chmodRecursive(nuxtCacheDir, 511).catch(() => {
+            });
           const webpackCacheDir = `${pwd}/node_modules/.cache`;
           if ((0, import_node_fs2.existsSync)(webpackCacheDir))
-            chmodRecursive(webpackCacheDir, 511);
-          if (!restore || this.stoped)
+            await chmodRecursive(webpackCacheDir, 511).catch(() => {
+            });
+          if (this.stoped)
             return originalExit(code);
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup();
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -529,12 +522,12 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         };
       };
       if (!this.locked) {
-        this.caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
+        this._caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
         lockfile.lockSync(caddyLockFilePath);
-        this.caddyChild.on("error", (err) => {
+        this._caddyChild.on("error", (err) => {
           return reject(err);
         });
-        (_a = this.caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
+        (_a = this._caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
           const lines = data.toString().split("\n").map((line) => line.trim());
           for (const line of lines) {
             showCaddyLog && line && console.info(line);
@@ -549,7 +542,7 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
               return resolve();
           }
         });
-        (_b = this.caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
+        (_b = this._caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
           consola.info(_data.toString());
           resolve();
         });
@@ -561,15 +554,30 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       }
     });
   }
-  async baseCleanup() {
+  async baseCleanup(restore = true) {
     var _a;
-    if (!this.locked) {
-      (_a = this.caddyChild) == null ? void 0 : _a.kill();
+    try {
+      if (restore && this._source && this._target) {
+        if (await removeHost(this._source.split(":")[0], this._target.split(":")[0]))
+          consola.success("Restore host success.\n");
+        else
+          consola.fail("Restore host failed.\n");
+      }
+    } catch (e) {
+      consola.error(e);
+      consola.fail("Restore host failed.\n");
+    }
+    if (!this.locked && !this.stoped) {
+      (_a = this._caddyChild) == null ? void 0 : _a.kill();
       try {
-        await lockfile.unlock(caddyLockFilePath);
-        await (0, import_promises2.unlink)(caddyFilePath);
-        await (0, import_promises2.unlink)(caddyLockFilePath);
+        await lockfile.unlock(caddyLockFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyLockFilePath).catch(() => {
+        });
       } catch (e) {
+        consola.error(e);
       }
     }
   }

package/dist/rollup.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-WCFY7NJQ.js";
+} from "./chunk-ZDL3GBDQ.js";
 import "./chunk-2VGRJ3QS.js";
 
 // src/rollup.ts

package/dist/rspack.cjs

@@ -447,6 +447,8 @@ var CaddyInstant = class {
       showCaddyLog = false,
       https = false
     } = options || {};
+    this._source = source;
+    this._target = target;
     if (!this.inited)
       await this.init();
     if (!await addHost(source.split(":")[0], target.split(":")[0]))
@@ -475,17 +477,11 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       var _a, _b;
       const setupCleanup = () => {
         import_node_process4.default.on("SIGINT", async () => {
-          if (!restore || this.stoped)
+          if (this.stoped)
             return;
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup(restore);
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -501,24 +497,21 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
           const pwd = import_node_process4.default.cwd();
           const viteCacheDir = `${pwd}/node_modules/.vite`;
           if ((0, import_node_fs2.existsSync)(viteCacheDir))
-            chmodRecursive(viteCacheDir, 511);
+            await chmodRecursive(viteCacheDir, 511).catch(() => {
+            });
           const nuxtCacheDir = `${pwd}/.nuxt`;
           if ((0, import_node_fs2.existsSync)(nuxtCacheDir))
-            await chmodRecursive(nuxtCacheDir, 511);
+            await chmodRecursive(nuxtCacheDir, 511).catch(() => {
+            });
           const webpackCacheDir = `${pwd}/node_modules/.cache`;
           if ((0, import_node_fs2.existsSync)(webpackCacheDir))
-            chmodRecursive(webpackCacheDir, 511);
-          if (!restore || this.stoped)
+            await chmodRecursive(webpackCacheDir, 511).catch(() => {
+            });
+          if (this.stoped)
             return originalExit(code);
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup();
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -528,12 +521,12 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         };
       };
       if (!this.locked) {
-        this.caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
+        this._caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
         lockfile.lockSync(caddyLockFilePath);
-        this.caddyChild.on("error", (err) => {
+        this._caddyChild.on("error", (err) => {
           return reject(err);
         });
-        (_a = this.caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
+        (_a = this._caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
           const lines = data.toString().split("\n").map((line) => line.trim());
           for (const line of lines) {
             showCaddyLog && line && console.info(line);
@@ -548,7 +541,7 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
               return resolve();
           }
         });
-        (_b = this.caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
+        (_b = this._caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
           consola.info(_data.toString());
           resolve();
         });
@@ -560,15 +553,30 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       }
     });
   }
-  async baseCleanup() {
+  async baseCleanup(restore = true) {
     var _a;
-    if (!this.locked) {
-      (_a = this.caddyChild) == null ? void 0 : _a.kill();
+    try {
+      if (restore && this._source && this._target) {
+        if (await removeHost(this._source.split(":")[0], this._target.split(":")[0]))
+          consola.success("Restore host success.\n");
+        else
+          consola.fail("Restore host failed.\n");
+      }
+    } catch (e) {
+      consola.error(e);
+      consola.fail("Restore host failed.\n");
+    }
+    if (!this.locked && !this.stoped) {
+      (_a = this._caddyChild) == null ? void 0 : _a.kill();
       try {
-        await lockfile.unlock(caddyLockFilePath);
-        await (0, import_promises2.unlink)(caddyFilePath);
-        await (0, import_promises2.unlink)(caddyLockFilePath);
+        await lockfile.unlock(caddyLockFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyLockFilePath).catch(() => {
+        });
       } catch (e) {
+        consola.error(e);
       }
     }
   }

package/dist/rspack.js

@@ -1,6 +1,6 @@
 import {
   src_default
-} from "./chunk-WCFY7NJQ.js";
+} from "./chunk-ZDL3GBDQ.js";
 import "./chunk-2VGRJ3QS.js";
 
 // src/rspack.ts

package/dist/vite.cjs

@@ -448,6 +448,8 @@ var CaddyInstant = class {
       showCaddyLog = false,
       https = false
     } = options || {};
+    this._source = source;
+    this._target = target;
     if (!this.inited)
       await this.init();
     if (!await addHost(source.split(":")[0], target.split(":")[0]))
@@ -476,17 +478,11 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       var _a, _b;
       const setupCleanup = () => {
         import_node_process4.default.on("SIGINT", async () => {
-          if (!restore || this.stoped)
+          if (this.stoped)
             return;
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup(restore);
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -502,24 +498,21 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
           const pwd = import_node_process4.default.cwd();
           const viteCacheDir = `${pwd}/node_modules/.vite`;
           if ((0, import_node_fs2.existsSync)(viteCacheDir))
-            chmodRecursive(viteCacheDir, 511);
+            await chmodRecursive(viteCacheDir, 511).catch(() => {
+            });
           const nuxtCacheDir = `${pwd}/.nuxt`;
           if ((0, import_node_fs2.existsSync)(nuxtCacheDir))
-            await chmodRecursive(nuxtCacheDir, 511);
+            await chmodRecursive(nuxtCacheDir, 511).catch(() => {
+            });
           const webpackCacheDir = `${pwd}/node_modules/.cache`;
           if ((0, import_node_fs2.existsSync)(webpackCacheDir))
-            chmodRecursive(webpackCacheDir, 511);
-          if (!restore || this.stoped)
+            await chmodRecursive(webpackCacheDir, 511).catch(() => {
+            });
+          if (this.stoped)
             return originalExit(code);
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup();
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -529,12 +522,12 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         };
       };
       if (!this.locked) {
-        this.caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
+        this._caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
         lockfile.lockSync(caddyLockFilePath);
-        this.caddyChild.on("error", (err) => {
+        this._caddyChild.on("error", (err) => {
           return reject(err);
         });
-        (_a = this.caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
+        (_a = this._caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
           const lines = data.toString().split("\n").map((line) => line.trim());
           for (const line of lines) {
             showCaddyLog && line && console.info(line);
@@ -549,7 +542,7 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
               return resolve();
           }
         });
-        (_b = this.caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
+        (_b = this._caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
           consola.info(_data.toString());
           resolve();
         });
@@ -561,15 +554,30 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       }
     });
   }
-  async baseCleanup() {
+  async baseCleanup(restore = true) {
     var _a;
-    if (!this.locked) {
-      (_a = this.caddyChild) == null ? void 0 : _a.kill();
+    try {
+      if (restore && this._source && this._target) {
+        if (await removeHost(this._source.split(":")[0], this._target.split(":")[0]))
+          consola.success("Restore host success.\n");
+        else
+          consola.fail("Restore host failed.\n");
+      }
+    } catch (e) {
+      consola.error(e);
+      consola.fail("Restore host failed.\n");
+    }
+    if (!this.locked && !this.stoped) {
+      (_a = this._caddyChild) == null ? void 0 : _a.kill();
       try {
-        await lockfile.unlock(caddyLockFilePath);
-        await (0, import_promises2.unlink)(caddyFilePath);
-        await (0, import_promises2.unlink)(caddyLockFilePath);
+        await lockfile.unlock(caddyLockFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyLockFilePath).catch(() => {
+        });
       } catch (e) {
+        consola.error(e);
       }
     }
   }

package/dist/vite.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-WCFY7NJQ.js";
+} from "./chunk-ZDL3GBDQ.js";
 import "./chunk-2VGRJ3QS.js";
 
 // src/vite.ts

package/dist/webpack.cjs

@@ -448,6 +448,8 @@ var CaddyInstant = class {
       showCaddyLog = false,
       https = false
     } = options || {};
+    this._source = source;
+    this._target = target;
     if (!this.inited)
       await this.init();
     if (!await addHost(source.split(":")[0], target.split(":")[0]))
@@ -476,17 +478,11 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       var _a, _b;
       const setupCleanup = () => {
         import_node_process4.default.on("SIGINT", async () => {
-          if (!restore || this.stoped)
+          if (this.stoped)
             return;
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup(restore);
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -502,24 +498,21 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
           const pwd = import_node_process4.default.cwd();
           const viteCacheDir = `${pwd}/node_modules/.vite`;
           if ((0, import_node_fs2.existsSync)(viteCacheDir))
-            chmodRecursive(viteCacheDir, 511);
+            await chmodRecursive(viteCacheDir, 511).catch(() => {
+            });
           const nuxtCacheDir = `${pwd}/.nuxt`;
           if ((0, import_node_fs2.existsSync)(nuxtCacheDir))
-            await chmodRecursive(nuxtCacheDir, 511);
+            await chmodRecursive(nuxtCacheDir, 511).catch(() => {
+            });
           const webpackCacheDir = `${pwd}/node_modules/.cache`;
           if ((0, import_node_fs2.existsSync)(webpackCacheDir))
-            chmodRecursive(webpackCacheDir, 511);
-          if (!restore || this.stoped)
+            await chmodRecursive(webpackCacheDir, 511).catch(() => {
+            });
+          if (this.stoped)
             return originalExit(code);
-          await this.baseCleanup();
+          import_node_process4.default.stdin.resume();
           try {
-            if (await removeHost(source.split(":")[0], target.split(":")[0]))
-              consola.success("Restore host success.\n");
-            else
-              consola.fail("Restore host failed.\n");
-          } catch (e) {
-            consola.error(e);
-            consola.fail("Restore host failed.\n");
+            await this.baseCleanup();
           } finally {
             this.stoped = true;
             import_node_process4.default.nextTick(() => {
@@ -529,12 +522,12 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         };
       };
       if (!this.locked) {
-        this.caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
+        this._caddyChild = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process4.spawn)(caddyPath, ["run", "--config", caddyFilePath, "--watch"]);
         lockfile.lockSync(caddyLockFilePath);
-        this.caddyChild.on("error", (err) => {
+        this._caddyChild.on("error", (err) => {
           return reject(err);
         });
-        (_a = this.caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
+        (_a = this._caddyChild.stderr) == null ? void 0 : _a.on("data", (data) => {
           const lines = data.toString().split("\n").map((line) => line.trim());
           for (const line of lines) {
             showCaddyLog && line && console.info(line);
@@ -549,7 +542,7 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
               return resolve();
           }
         });
-        (_b = this.caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
+        (_b = this._caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
           consola.info(_data.toString());
           resolve();
         });
@@ -561,15 +554,30 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       }
     });
   }
-  async baseCleanup() {
+  async baseCleanup(restore = true) {
     var _a;
-    if (!this.locked) {
-      (_a = this.caddyChild) == null ? void 0 : _a.kill();
+    try {
+      if (restore && this._source && this._target) {
+        if (await removeHost(this._source.split(":")[0], this._target.split(":")[0]))
+          consola.success("Restore host success.\n");
+        else
+          consola.fail("Restore host failed.\n");
+      }
+    } catch (e) {
+      consola.error(e);
+      consola.fail("Restore host failed.\n");
+    }
+    if (!this.locked && !this.stoped) {
+      (_a = this._caddyChild) == null ? void 0 : _a.kill();
       try {
-        await lockfile.unlock(caddyLockFilePath);
-        await (0, import_promises2.unlink)(caddyFilePath);
-        await (0, import_promises2.unlink)(caddyLockFilePath);
+        await lockfile.unlock(caddyLockFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyLockFilePath).catch(() => {
+        });
       } catch (e) {
+        consola.error(e);
       }
     }
   }

package/dist/webpack.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-WCFY7NJQ.js";
+} from "./chunk-ZDL3GBDQ.js";
 import "./chunk-2VGRJ3QS.js";
 
 // src/webpack.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unplugin-https-reverse-proxy",
   "type": "module",
-  "version": "1.0.0-beta.17",
+  "version": "1.0.0-beta.18",
   "description": "",
   "license": "MIT",
   "homepage": "https://github.com/zcf0508/unplugin-https-reverse-proxy#readme",

package/src/caddy/index.ts

@@ -108,7 +108,10 @@ export class CaddyInstant {
   private locked = false
   private caddyfile: string | undefined
 
-  private caddyChild: ReturnType<typeof spawn> | undefined
+  private _caddyChild: ReturnType<typeof spawn> | undefined
+
+  private _source: string | undefined
+  private _target: string | undefined
 
   constructor() {
     testCaddy().then(async () => {
@@ -173,6 +176,9 @@ export class CaddyInstant {
       https = false,
     } = options || {}
 
+    this._source = source
+    this._target = target
+
     if (!this.inited)
       await this.init()
 
@@ -206,21 +212,13 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
     return new Promise<void>((resolve, reject) => {
       const setupCleanup = () => {
         process.on('SIGINT', async () => {
-          if (!restore || this.stoped)
+          if (this.stoped)
             return
 
-          await this.baseCleanup()
+          process.stdin.resume()
 
           try {
-            if (await removeHost(source.split(':')[0], target.split(':')[0]))
-              consola.success('Restore host success.\n')
-
-            else
-              consola.fail('Restore host failed.\n')
-          }
-          catch (e) {
-            consola.error(e)
-            consola.fail('Restore host failed.\n')
+            await this.baseCleanup(restore)
           }
           finally {
             this.stoped = true
@@ -242,30 +240,23 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
           const pwd = process.cwd()
           const viteCacheDir = `${pwd}/node_modules/.vite`
           if (existsSync(viteCacheDir))
-            chmodRecursive(viteCacheDir, 0o777)
+            await chmodRecursive(viteCacheDir, 0o777).catch(() => { })
           const nuxtCacheDir = `${pwd}/.nuxt`
           if (existsSync(nuxtCacheDir))
-            await chmodRecursive(nuxtCacheDir, 0o777)
+            await chmodRecursive(nuxtCacheDir, 0o777).catch(() => { })
           const webpackCacheDir = `${pwd}/node_modules/.cache`
           if (existsSync(webpackCacheDir))
-            chmodRecursive(webpackCacheDir, 0o777)
+            await chmodRecursive(webpackCacheDir, 0o777).catch(() => { })
 
-          if (!restore || this.stoped)
+          if (this.stoped)
             return originalExit(code)
 
-          await this.baseCleanup()
+          process.stdin.resume()
 
           try {
-            if (await removeHost(source.split(':')[0], target.split(':')[0]))
-              consola.success('Restore host success.\n')
-
-            else
-              consola.fail('Restore host failed.\n')
-          }
-          catch (e) {
-            consola.error(e)
-            consola.fail('Restore host failed.\n')
+            await this.baseCleanup()
           }
+
           finally {
             this.stoped = true
             process.nextTick(() => {
@@ -276,17 +267,17 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
       }
 
       if (!this.locked) {
-        this.caddyChild = process.platform !== 'win32'
+        this._caddyChild = process.platform !== 'win32'
           ? spawn('sudo', ['-E', caddyPath, 'run', '--config', caddyFilePath, '--watch'])
           : spawn(caddyPath, ['run', '--config', caddyFilePath, '--watch'])
 
         lockfile.lockSync(caddyLockFilePath)
 
-        this.caddyChild!.on('error', (err) => {
+        this._caddyChild!.on('error', (err) => {
           return reject(err)
         })
 
-        this.caddyChild!.stderr?.on('data', (data) => {
+        this._caddyChild!.stderr?.on('data', (data) => {
           const lines = (data.toString() as string).split('\n').map(line => line.trim())
           for (const line of lines) {
             // caddy log
@@ -305,7 +296,7 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
           }
         })
 
-        this.caddyChild!.stdout?.on('data', (_data) => {
+        this._caddyChild!.stdout?.on('data', (_data) => {
           consola.info(_data.toString())
           resolve()
         })
@@ -322,16 +313,29 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
     })
   }
 
-  async baseCleanup() {
-    if (!this.locked) {
-      this.caddyChild?.kill()
+  async baseCleanup(restore: boolean = true) {
+    try {
+      if (restore && this._source && this._target) {
+        if (await removeHost(this._source.split(':')[0], this._target.split(':')[0]))
+          consola.success('Restore host success.\n')
+
+        else
+          consola.fail('Restore host failed.\n')
+      }
+    }
+    catch (e) {
+      consola.error(e)
+      consola.fail('Restore host failed.\n')
+    }
+    if (!this.locked && !this.stoped) {
+      this._caddyChild?.kill()
       try {
-        await lockfile.unlock(caddyLockFilePath)
-        await unlink(caddyFilePath)
-        await unlink(caddyLockFilePath)
+        await lockfile.unlock(caddyLockFilePath).catch(() => { })
+        await unlink(caddyFilePath).catch(() => { })
+        await unlink(caddyLockFilePath).catch(() => { })
       }
       catch (e) {
-        // consola.error(e)
+        consola.error(e)
       }
     }
   }