unplugin-https-reverse-proxy 0.0.23 → 0.0.24

package/dist/nuxt.cjs

@@ -53,8 +53,8 @@ var import_kit = require("@nuxt/kit");
 var import_unplugin2 = require("unplugin");
 
 // src/index.ts
-var import_node_process4 = __toESM(require("process"), 1);
-var import_node_fs2 = require("fs");
+var import_node_process5 = __toESM(require("process"), 1);
+var import_node_fs3 = require("fs");
 var import_unplugin = require("unplugin");
 var import_picocolors = __toESM(require("picocolors"), 1);
 
@@ -65,15 +65,6 @@ var import_consola = require("consola");
 var consola = (0, import_consola.createConsola)({
   level: 3
 }).withTag("reverse-proxy");
-function once(fn) {
-  let called = false;
-  return (...args) => {
-    if (called)
-      return;
-    called = true;
-    return fn(...args);
-  };
-}
 function isAdmin() {
   if (import_node_process.default.platform === "win32") {
     try {
@@ -89,20 +80,64 @@ function isAdmin() {
 
 // src/caddy/index.ts
 var import_node_os = require("os");
-var import_node_process3 = __toESM(require("process"), 1);
-var import_node_fs = require("fs");
-var import_node_child_process2 = require("child_process");
+var import_node_process4 = __toESM(require("process"), 1);
+var import_node_fs2 = require("fs");
+var import_node_child_process3 = require("child_process");
 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_hosts_so_easy = __toESM(require("hosts-so-easy"), 1);
 var import_kill_port = __toESM(require("kill-port"), 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()
+});
+function getPathOfSystemHostsPath() {
+  return import_node_process2.default.platform === "win32" ? `${import_node_process2.default.env.windir || "C:\\WINDOWS"}\\system32\\drivers\\etc\\hosts` : "/etc/hosts";
+}
+async function syncHost() {
+  return new Promise((resolve, reject) => {
+    (0, import_node_child_process2.exec)(
+      import_node_process2.default.platform === "win32" ? "ipconfig /flushdns" : "sudo -E killall -HUP mDNSResponder",
+      (error, stdout, stderr) => {
+        if (error) {
+          console.error(`exec error: ${error}`);
+          return resolve(false);
+        }
+        return resolve(true);
+      }
+    );
+  });
+}
+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 hostInstance.updateFinish();
+  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);
+  if (ip === "localhost")
+    hostInstance.remove("127.0.0.1", host);
+  await hostInstance.updateFinish();
+  return await syncHost();
+}
+
 // src/caddy/constants.ts
 var import_node_path = require("path");
-var import_node_process2 = __toESM(require("process"), 1);
-var TEMP_DIR = import_node_process2.default.env.TEMP || import_node_process2.default.env.TMPDIR || "/tmp";
-var caddyPath = (0, import_node_path.join)(TEMP_DIR, `caddy${import_node_process2.default.platform === "win32" ? ".exe" : ""}`);
+var import_node_process3 = __toESM(require("process"), 1);
+var TEMP_DIR = import_node_process3.default.env.TEMP || import_node_process3.default.env.TMPDIR || "/tmp";
+var caddyPath = (0, import_node_path.join)(TEMP_DIR, `caddy${import_node_process3.default.platform === "win32" ? ".exe" : ""}`);
 var caddyFilePath = (0, import_node_path.join)(TEMP_DIR, "CADDYFILE");
 var supportList = [
   {
@@ -271,23 +306,22 @@ function logProgressOver() {
 }
 
 // src/caddy/index.ts
-var Hosts = import_hosts_so_easy.default.default || import_hosts_so_easy.default;
 async function download() {
   if (await testCaddy())
     return caddyPath;
   return new Promise((resolve, reject) => {
-    const file = (0, import_node_fs.createWriteStream)(caddyPath);
+    const file = (0, import_node_fs2.createWriteStream)(caddyPath);
     let _platform = (0, import_node_os.platform)().toString();
     _platform === "win32" && (_platform = "windows");
-    let _arch = import_node_process3.default.arch.toString();
+    let _arch = import_node_process4.default.arch.toString();
     _arch === "x64" && (_arch = "amd64");
     const support = supportList.find((item) => item.platform === _platform && item.arch === _arch);
     if (!support)
       return reject(new Error("not support"));
     const dowmloadLink = `https://caddyserver.com/api/download?os=${support.platform}&arch=${support.arch}`;
-    (0, import_node_fs.existsSync)(caddyPath) && (0, import_node_fs.unlinkSync)(caddyPath);
-    const httpProxy = import_node_process3.default.env.HTTP_PROXY || import_node_process3.default.env.http_proxy;
-    const httpsProxy = import_node_process3.default.env.HTTPS_PROXY || import_node_process3.default.env.https_proxy;
+    (0, import_node_fs2.existsSync)(caddyPath) && (0, import_node_fs2.unlinkSync)(caddyPath);
+    const httpProxy = import_node_process4.default.env.HTTP_PROXY || import_node_process4.default.env.http_proxy;
+    const httpsProxy = import_node_process4.default.env.HTTPS_PROXY || import_node_process4.default.env.https_proxy;
     const httpAgent = httpProxy ? new import_http_proxy_agent.HttpProxyAgent(httpProxy) : void 0;
     const httpsAgent = httpsProxy ? new import_https_proxy_agent.HttpsProxyAgent(httpsProxy) : void 0;
     import_got_cjs.got.stream(dowmloadLink, {
@@ -299,9 +333,9 @@ async function download() {
       logProgress(progress.percent);
     }).pipe(file).on("finish", () => {
       logProgressOver();
-      if (import_node_process3.default.platform === "win32")
+      if (import_node_process4.default.platform === "win32")
         return resolve(caddyPath);
-      (0, import_node_fs.chmodSync)(caddyPath, 493);
+      (0, import_node_fs2.chmodSync)(caddyPath, 493);
       resolve(caddyPath);
     }).on("error", (err) => {
       reject(err);
@@ -310,10 +344,10 @@ async function download() {
 }
 function testCaddy() {
   return new Promise((resolve, reject) => {
-    if (!(0, import_node_fs.existsSync)(caddyPath))
+    if (!(0, import_node_fs2.existsSync)(caddyPath))
       return resolve(false);
-    (0, import_node_fs.chmodSync)(caddyPath, 493);
-    const child = import_node_process3.default.platform === "win32" ? (0, import_node_child_process2.spawn)(caddyPath, []) : (0, import_node_child_process2.spawn)("sudo", ["-E", caddyPath]);
+    (0, import_node_fs2.chmodSync)(caddyPath, 493);
+    const child = import_node_process4.default.platform === "win32" ? (0, import_node_child_process3.spawn)(caddyPath, []) : (0, import_node_child_process3.spawn)("sudo", ["-E", caddyPath]);
     child.on("close", () => {
       return resolve(false);
     });
@@ -329,7 +363,6 @@ var CaddyInstant = class {
   constructor() {
     this.inited = false;
     this.stoped = false;
-    this.host = new Hosts();
     testCaddy().then(() => {
       this.inited = true;
     });
@@ -338,51 +371,6 @@ var CaddyInstant = class {
     await download();
     this.inited = true;
   }
-  async updateHost(ip, host) {
-    ["localhost", "0.0.0.0"].includes(ip) && (ip = "127.0.0.1");
-    this.host.add("127.0.0.1", "localhost");
-    this.host.add(ip, host);
-    await this.host.updateFinish();
-    return new Promise((resolve, reject) => {
-      if (import_node_process3.default.platform === "win32") {
-        (0, import_node_child_process2.spawn)("ipconfig", ["/flushdns"]).on("error", (err) => {
-          consola.error(err);
-          return resolve(false);
-        }).on("close", () => {
-          resolve(true);
-        });
-      } else {
-        (0, import_node_child_process2.spawn)("sudo", ["-E", "killall", "-HUP", "mDNSResponder"]).on("error", (err) => {
-          consola.error(err);
-          return resolve(false);
-        }).on("close", () => {
-          resolve(true);
-        });
-      }
-    });
-  }
-  async restoreHost(ip, host) {
-    ["localhost", "0.0.0.0"].includes(ip) && (ip = "127.0.0.1");
-    this.host.remove(ip, host);
-    await this.host.updateFinish();
-    return new Promise((resolve, reject) => {
-      if (import_node_process3.default.platform === "win32") {
-        (0, import_node_child_process2.spawn)("ipconfig", ["/flushdns"]).on("error", (err) => {
-          consola.error(err);
-          return resolve(false);
-        }).on("close", () => {
-          resolve(true);
-        });
-      } else {
-        (0, import_node_child_process2.spawn)("sudo", ["-E", "killall", "-HUP", "mDNSResponder"]).on("error", (err) => {
-          consola.error(err);
-          return resolve(false);
-        }).on("close", () => {
-          resolve(true);
-        });
-      }
-    });
-  }
   /**
    * @param source like `127.0.0.1:8080`
    * @param target like `test.abc.com`. And if you provide a port ,it will be ignore.
@@ -400,16 +388,53 @@ var CaddyInstant = class {
       await this.init();
     if (https && await tryPort(443))
       await (0, import_kill_port.default)(443, "tcp");
-    if ((import_node_process3.default.platform === "win32" || !https) && await tryPort(80))
+    if ((import_node_process4.default.platform === "win32" || !https) && await tryPort(80))
       await (0, import_kill_port.default)(80, "tcp");
-    if (!await this.updateHost(source.split(":")[0], target.split(":")[0]))
+    if (!await addHost(source.split(":")[0], target.split(":")[0]))
       throw new Error("update host failed");
     consola.success("update host success\n");
     return new Promise((resolve, reject) => {
-      const child = import_node_process3.default.platform !== "win32" ? (0, import_node_child_process2.spawn)("sudo", ["-E", caddyPath, "reverse-proxy", "--from", `${target.split(":")[0]}${https ? "" : ":80"}`, "--to", `${source}`, "--internal-certs", "--insecure", "--disable-redirects"]) : (0, import_node_child_process2.spawn)(caddyPath, ["reverse-proxy", "--from", `${target.split(":")[0]}`, "--to", `${source}`, "--internal-certs"]);
+      const child = import_node_process4.default.platform !== "win32" ? (0, import_node_child_process3.spawn)("sudo", ["-E", caddyPath, "reverse-proxy", "--from", `${target.split(":")[0]}${https ? "" : ":80"}`, "--to", `${source}`, "--internal-certs", "--insecure", "--disable-redirects"]) : (0, import_node_child_process3.spawn)(caddyPath, ["reverse-proxy", "--from", `${target.split(":")[0]}`, "--to", `${source}`, "--internal-certs"]);
       child.on("error", (err) => {
         return reject(err);
       });
+      import_node_process4.default.on("SIGINT", async () => {
+        if (!restore || this.stoped)
+          return;
+        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");
+        } finally {
+          this.stoped = true;
+          import_node_process4.default.nextTick(() => {
+            import_node_process4.default.exit();
+          });
+        }
+      });
+      const originalExit = import_node_process4.default.exit;
+      import_node_process4.default.exit = async (code) => {
+        if (!restore || this.stoped)
+          return originalExit(code);
+        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");
+        } finally {
+          this.stoped = true;
+          import_node_process4.default.nextTick(() => {
+            originalExit(code);
+          });
+        }
+      };
       child.stderr.on("data", (data) => {
         const lines = data.toString().split("\n").map((line) => line.trim());
         for (const line of lines) {
@@ -422,22 +447,7 @@ var CaddyInstant = class {
       });
       child.stdout.on("data", (_data) => {
         consola.info(_data.toString());
-        resolve(async (callback) => {
-          if (!restore || this.stoped)
-            return;
-          try {
-            if (await this.restoreHost(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");
-          }
-          this.stoped = true;
-          child.kill();
-          callback && callback();
-        });
+        resolve();
       });
     });
   }
@@ -446,55 +456,13 @@ var CaddyInstant = class {
 // src/index.ts
 var config;
 var caddy;
-var _stop;
 var _servce;
-function registerExit(clear) {
-  import_node_process4.default.on("beforeExit", async (_code) => {
-    await clear();
-  });
-  import_node_process4.default.on("uncaughtException", async (err) => {
-    console.error("An uncaught error occurred!", err.stack);
-    await clear();
-    import_node_process4.default.nextTick(() => {
-      import_node_process4.default.exit(1);
-    });
-  });
-  import_node_process4.default.on("unhandledRejection", async (reason, promise) => {
-    console.error("Unhandled Rejection at:", promise, "reason:", reason);
-    await clear();
-    import_node_process4.default.nextTick(() => {
-      import_node_process4.default.exit(1);
-    });
-  });
-  import_node_process4.default.once("SIGINT", async () => {
-    await clear();
-    import_node_process4.default.exit(0);
-  });
-  import_node_process4.default.once("SIGTERM", async () => {
-    await clear();
-    import_node_process4.default.exit(0);
-  });
-}
 var unpluginFactory = (options) => ({
   name: "unplugin-https-reverse-proxy",
   enforce: "pre",
   vite: {
     configResolved(_config) {
       config = _config;
-      registerExit(async () => {
-        var _a;
-        try {
-          if (_servce) {
-            (_a = _servce.httpServer) == null ? void 0 : _a.close(async () => {
-              _stop && await _stop();
-            });
-            _servce.close();
-          }
-          _stop && await _stop();
-        } catch (e) {
-          consola.error(e);
-        }
-      });
     },
     configureServer(server) {
       if (!isAdmin()) {
@@ -518,10 +486,10 @@ var unpluginFactory = (options) => ({
       server.printUrls = () => {
         var _a;
         _printUrls();
-        const pwd = import_node_process4.default.cwd();
+        const pwd = import_node_process5.default.cwd();
         const vireCacheDir = `${pwd}/node_modules/.vite`;
-        if ((0, import_node_fs2.existsSync)(vireCacheDir))
-          (0, import_node_fs2.chmodSync)(vireCacheDir, 511);
+        if ((0, import_node_fs3.existsSync)(vireCacheDir))
+          (0, import_node_fs3.chmodSync)(vireCacheDir, 511);
         let source = `localhost:${config.server.port}`;
         const url = (_a = server.resolvedUrls) == null ? void 0 : _a.local[0];
         if (url) {
@@ -535,10 +503,9 @@ var unpluginFactory = (options) => ({
           caddy = new CaddyInstant();
           caddy.run(source, target, __spreadValues({
             base
-          }, options)).then((stop) => {
+          }, options)).then(() => {
             const colorUrl = (url2) => import_picocolors.default.green(url2.replace(/:(\d+)\//, (_, port) => `:${import_picocolors.default.bold(port)}/`));
             consola.success(`  ${import_picocolors.default.green("\u279C")}  ${import_picocolors.default.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}${base}`)}`);
-            !_stop && (_stop = once(stop));
           }).catch((e) => {
             throw e;
           });
@@ -554,7 +521,7 @@ var unpluginFactory = (options) => ({
       consola.warn("please run as administrator");
       return;
     }
-    if (import_node_process4.default.env.NODE_ENV !== "development")
+    if (import_node_process5.default.env.NODE_ENV !== "development")
       return;
     const {
       enable = true,
@@ -570,38 +537,25 @@ var unpluginFactory = (options) => ({
       const devServer = __spreadValues(__spreadValues({
         host: "localhost",
         port: 8080
-      }, compiler.options.devServer), import_node_process4.default.VUE_CLI_SERVICE.projectOptions.devServer);
+      }, compiler.options.devServer), import_node_process5.default.VUE_CLI_SERVICE.projectOptions.devServer);
       const source = `${devServer.host}:${devServer.port}`;
       if (caddy)
         return;
       const _close = (_a = compiler.close) == null ? void 0 : _a.bind(compiler);
       if (_close) {
         compiler.close = async (callback) => {
-          try {
-            _stop && await _stop(() => {
-              _close && _close(callback);
-            });
-          } catch (e) {
-            consola.error(e);
-            import_node_process4.default.exit(1);
-          }
+          import_node_process5.default.on("exit", () => {
+            _close && _close(callback);
+          });
         };
       } else {
         options.https = false;
-        registerExit(async () => {
-          try {
-            _stop && await _stop();
-          } catch (e) {
-            consola.error(e);
-          }
-        });
       }
       caddy = new CaddyInstant();
-      caddy.run(source, target, __spreadValues({}, options)).then((stop) => {
+      caddy.run(source, target, __spreadValues({}, options)).then(() => {
         const colorUrl = (url) => import_picocolors.default.green(url.replace(/:(\d+)\//, (_, port) => `:${import_picocolors.default.bold(port)}/`));
         compiler.hooks.done.tap("unplugin-https-reverse-proxy", () => {
           consola.success(`  ${import_picocolors.default.green("\u279C")}  ${import_picocolors.default.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}`)}`);
-          !_stop && (_stop = once(stop));
         });
       }).catch((e) => {
         throw e;

package/dist/nuxt.js

@@ -1,11 +1,11 @@
 import {
   vite_default
-} from "./chunk-O43OD7QE.js";
+} from "./chunk-Q7WB6WMX.js";
 import {
   webpack_default
-} from "./chunk-J4ZJTATR.js";
-import "./chunk-S4DC5XL4.js";
-import "./chunk-NNO3ZUSU.js";
+} from "./chunk-W4RHTMNZ.js";
+import "./chunk-TVCN6ESH.js";
+import "./chunk-3RTK3FSZ.js";
 
 // src/nuxt.ts
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";