unplugin-https-reverse-proxy 1.0.0-beta.16 → 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-QMYDD3HL.js → chunk-ZDL3GBDQ.js}

@@ -19,19 +19,16 @@ import { readFile, unlink, writeFile } from "node:fs/promises";
 import { got } from "got-cjs";
 import { HttpProxyAgent } from "http-proxy-agent";
 import { HttpsProxyAgent } from "https-proxy-agent";
-import kill from "kill-port";
 import * as lockfile from "proper-lockfile";
 
 // src/host/index.ts
 import process from "node:process";
 import { exec } from "node:child_process";
 import { chmodSync } from "node:fs";
-import _Hosts from "hosts-so-easy";
-var Hosts = _Hosts.default || _Hosts;
-var hostInstance = new Hosts({
-  debounceTime: 50,
-  hostsFile: getPathOfSystemHostsPath()
-});
+import { promisify } from "node:util";
+import hostile from "hostile";
+var _setHost = promisify(hostile.set);
+var _removeHost = promisify(hostile.remove);
 function getPathOfSystemHostsPath() {
   return process.platform === "win32" ? `${process.env.windir || "C:\\WINDOWS"}\\system32\\drivers\\etc\\hosts` : "/etc/hosts";
 }
@@ -52,20 +49,18 @@ async function syncHost() {
 async function addHost(ip, host) {
   if (process.platform !== "win32")
     chmodSync(getPathOfSystemHostsPath(), 511);
-  hostInstance.add("127.0.0.1", "localhost");
-  hostInstance.add(ip, host);
+  await _setHost("127.0.0.1", "localhost");
+  await _setHost(ip, host);
   if (ip === "localhost")
-    hostInstance.add("127.0.0.1", host);
-  await hostInstance.updateFinish();
+    await _setHost("127.0.0.1", host);
   return await syncHost();
 }
 async function removeHost(ip, host) {
   if (process.platform !== "win32")
     chmodSync(getPathOfSystemHostsPath(), 511);
-  hostInstance.remove(ip, host);
+  await _removeHost(ip, host);
   if (ip === "localhost")
-    hostInstance.remove("127.0.0.1", host);
-  await hostInstance.updateFinish();
+    await _removeHost("127.0.0.1", host);
   return await syncHost();
 }
 
@@ -199,6 +194,7 @@ var supportList = [
 
 // src/caddy/utils.ts
 import { createServer } from "node:net";
+import { exec as exec2 } from "node:child_process";
 import ora from "ora";
 var spinner;
 function tryPort(port) {
@@ -219,6 +215,18 @@ function tryPort(port) {
     }
   });
 }
+async function kill(port) {
+  return new Promise((resolve, reject) => {
+    exec2(`npx @maxbo/free-port ${port} -s`, (err, stdout, stderr) => {
+      if (err) {
+        reject(err);
+      } else {
+        consola.log(stdout);
+        resolve();
+      }
+    });
+  });
+}
 function getNumber(number) {
   if (number <= 0)
     return "0%";
@@ -371,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]))
@@ -391,24 +401,19 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       writeFileSync(caddyLockFilePath, "");
     if (!this.locked) {
       if (await tryPort(443))
-        await kill(443, "tcp");
+        await kill(443);
       if ((process3.platform === "win32" || !https) && await tryPort(80))
-        await kill(80, "tcp");
+        await kill(80);
     }
     return new Promise((resolve, reject) => {
+      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(() => {
@@ -420,28 +425,25 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         process3.exit = async (code) => {
           const port = Number(source.split(":")[1]);
           if (!Number.isNaN(port) && await tryPort(port))
-            await kill(port, "tcp");
+            await kill(port);
           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(() => {
@@ -451,12 +453,12 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         };
       };
       if (!this.locked) {
-        const child = 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);
-        child.on("error", (err) => {
+        this._caddyChild.on("error", (err) => {
           return reject(err);
         });
-        child.stderr.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);
@@ -471,7 +473,7 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
               return resolve();
           }
         });
-        child.stdout.on("data", (_data) => {
+        (_b = this._caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
           consola.info(_data.toString());
           resolve();
         });
@@ -483,13 +485,30 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       }
     });
   }
-  async baseCleanup() {
-    if (!this.locked) {
+  async baseCleanup(restore = true) {
+    var _a;
+    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

@@ -83,24 +83,21 @@ function isAdmin() {
 var import_node_os2 = require("os");
 var import_node_process4 = __toESM(require("process"), 1);
 var import_node_fs2 = require("fs");
-var import_node_child_process3 = require("child_process");
+var import_node_child_process4 = require("child_process");
 var import_promises2 = require("fs/promises");
 var import_got_cjs = require("got-cjs");
 var import_http_proxy_agent = require("http-proxy-agent");
 var import_https_proxy_agent = require("https-proxy-agent");
-var import_kill_port = __toESM(require("kill-port"), 1);
 var lockfile = __toESM(require("proper-lockfile"), 1);
 
 // src/host/index.ts
 var import_node_process2 = __toESM(require("process"), 1);
 var import_node_child_process2 = require("child_process");
 var import_node_fs = require("fs");
-var import_hosts_so_easy = __toESM(require("hosts-so-easy"), 1);
-var Hosts = import_hosts_so_easy.default.default || import_hosts_so_easy.default;
-var hostInstance = new Hosts({
-  debounceTime: 50,
-  hostsFile: getPathOfSystemHostsPath()
-});
+var import_node_util = require("util");
+var import_hostile = __toESM(require("hostile"), 1);
+var _setHost = (0, import_node_util.promisify)(import_hostile.default.set);
+var _removeHost = (0, import_node_util.promisify)(import_hostile.default.remove);
 function getPathOfSystemHostsPath() {
   return import_node_process2.default.platform === "win32" ? `${import_node_process2.default.env.windir || "C:\\WINDOWS"}\\system32\\drivers\\etc\\hosts` : "/etc/hosts";
 }
@@ -121,20 +118,18 @@ async function syncHost() {
 async function addHost(ip, host) {
   if (import_node_process2.default.platform !== "win32")
     (0, import_node_fs.chmodSync)(getPathOfSystemHostsPath(), 511);
-  hostInstance.add("127.0.0.1", "localhost");
-  hostInstance.add(ip, host);
+  await _setHost("127.0.0.1", "localhost");
+  await _setHost(ip, host);
   if (ip === "localhost")
-    hostInstance.add("127.0.0.1", host);
-  await hostInstance.updateFinish();
+    await _setHost("127.0.0.1", host);
   return await syncHost();
 }
 async function removeHost(ip, host) {
   if (import_node_process2.default.platform !== "win32")
     (0, import_node_fs.chmodSync)(getPathOfSystemHostsPath(), 511);
-  hostInstance.remove(ip, host);
+  await _removeHost(ip, host);
   if (ip === "localhost")
-    hostInstance.remove("127.0.0.1", host);
-  await hostInstance.updateFinish();
+    await _removeHost("127.0.0.1", host);
   return await syncHost();
 }
 
@@ -268,6 +263,7 @@ var supportList = [
 
 // src/caddy/utils.ts
 var import_node_net = require("net");
+var import_node_child_process3 = require("child_process");
 var import_ora = __toESM(require("ora"), 1);
 var spinner;
 function tryPort(port) {
@@ -288,6 +284,18 @@ function tryPort(port) {
     }
   });
 }
+async function kill(port) {
+  return new Promise((resolve, reject) => {
+    (0, import_node_child_process3.exec)(`npx @maxbo/free-port ${port} -s`, (err, stdout, stderr) => {
+      if (err) {
+        reject(err);
+      } else {
+        consola.log(stdout);
+        resolve();
+      }
+    });
+  });
+}
 function getNumber(number) {
   if (number <= 0)
     return "0%";
@@ -371,7 +379,7 @@ function testCaddy() {
     if (!(0, import_node_fs2.existsSync)(caddyPath))
       return resolve(false);
     (0, import_node_fs2.chmodSync)(caddyPath, 511);
-    const child = import_node_process4.default.platform === "win32" ? (0, import_node_child_process3.spawn)(caddyPath, []) : (0, import_node_child_process3.spawn)("sudo", ["-E", caddyPath]);
+    const child = import_node_process4.default.platform === "win32" ? (0, import_node_child_process4.spawn)(caddyPath, []) : (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath]);
     child.on("close", () => {
       return resolve(false);
     });
@@ -440,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]))
@@ -460,24 +470,19 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       (0, import_node_fs2.writeFileSync)(caddyLockFilePath, "");
     if (!this.locked) {
       if (await tryPort(443))
-        await (0, import_kill_port.default)(443, "tcp");
+        await kill(443);
       if ((import_node_process4.default.platform === "win32" || !https) && await tryPort(80))
-        await (0, import_kill_port.default)(80, "tcp");
+        await kill(80);
     }
     return new Promise((resolve, reject) => {
+      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(() => {
@@ -489,28 +494,25 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         import_node_process4.default.exit = async (code) => {
           const port = Number(source.split(":")[1]);
           if (!Number.isNaN(port) && await tryPort(port))
-            await (0, import_kill_port.default)(port, "tcp");
+            await kill(port);
           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(() => {
@@ -520,12 +522,12 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
         };
       };
       if (!this.locked) {
-        const child = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process3.spawn)("sudo", ["-E", caddyPath, "run", "--config", caddyFilePath, "--watch"]) : (0, import_node_child_process3.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);
-        child.on("error", (err) => {
+        this._caddyChild.on("error", (err) => {
           return reject(err);
         });
-        child.stderr.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);
@@ -540,7 +542,7 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
               return resolve();
           }
         });
-        child.stdout.on("data", (_data) => {
+        (_b = this._caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
           consola.info(_data.toString());
           resolve();
         });
@@ -552,13 +554,30 @@ ${target.split(":")[0]}${https ? "" : ":80"} {
       }
     });
   }
-  async baseCleanup() {
-    if (!this.locked) {
+  async baseCleanup(restore = true) {
+    var _a;
+    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-QMYDD3HL.js";
+} from "./chunk-ZDL3GBDQ.js";
 import "./chunk-2VGRJ3QS.js";
 
 // src/esbuild.ts