unplugin-https-reverse-proxy 0.0.23 → 0.0.24

package/dist/{chunk-NNO3ZUSU.js → chunk-3RTK3FSZ.js}

@@ -22,15 +22,6 @@ import { createConsola } from "consola";
 var 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 (process.platform === "win32") {
     try {
@@ -47,6 +38,5 @@ function isAdmin() {
 export {
   __spreadValues,
   consola,
-  once,
   isAdmin
 };

package/dist/{chunk-O43OD7QE.js → chunk-Q7WB6WMX.js}

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-S4DC5XL4.js";
+} from "./chunk-TVCN6ESH.js";
 
 // src/vite.ts
 import { createVitePlugin } from "unplugin";

package/dist/{chunk-S4DC5XL4.js → chunk-TVCN6ESH.js}

@@ -1,32 +1,75 @@
 import {
   __spreadValues,
   consola,
-  isAdmin,
-  once
-} from "./chunk-NNO3ZUSU.js";
+  isAdmin
+} from "./chunk-3RTK3FSZ.js";
 
 // src/index.ts
-import process3 from "process";
-import { chmodSync as chmodSync2, existsSync as existsSync2 } from "fs";
+import process4 from "process";
+import { chmodSync as chmodSync3, existsSync as existsSync2 } from "fs";
 import { createUnplugin } from "unplugin";
 import c from "picocolors";
 
 // src/caddy/index.ts
 import { platform } from "os";
-import process2 from "process";
-import { chmodSync, createWriteStream, existsSync, unlinkSync } from "fs";
+import process3 from "process";
+import { chmodSync as chmodSync2, createWriteStream, existsSync, unlinkSync } from "fs";
 import { spawn } from "child_process";
 import { got } from "got-cjs";
 import { HttpProxyAgent } from "http-proxy-agent";
 import { HttpsProxyAgent } from "https-proxy-agent";
-import _Hosts from "hosts-so-easy";
 import kill from "kill-port";
 
+// src/host/index.ts
+import process from "process";
+import { exec } from "child_process";
+import { chmodSync } from "fs";
+import _Hosts from "hosts-so-easy";
+var Hosts = _Hosts.default || _Hosts;
+var hostInstance = new Hosts({
+  debounceTime: 50,
+  hostsFile: getPathOfSystemHostsPath()
+});
+function getPathOfSystemHostsPath() {
+  return process.platform === "win32" ? `${process.env.windir || "C:\\WINDOWS"}\\system32\\drivers\\etc\\hosts` : "/etc/hosts";
+}
+async function syncHost() {
+  return new Promise((resolve, reject) => {
+    exec(
+      process.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 (process.platform !== "win32")
+    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 (process.platform !== "win32")
+    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
 import { join } from "path";
-import process from "process";
-var TEMP_DIR = process.env.TEMP || process.env.TMPDIR || "/tmp";
-var caddyPath = join(TEMP_DIR, `caddy${process.platform === "win32" ? ".exe" : ""}`);
+import process2 from "process";
+var TEMP_DIR = process2.env.TEMP || process2.env.TMPDIR || "/tmp";
+var caddyPath = join(TEMP_DIR, `caddy${process2.platform === "win32" ? ".exe" : ""}`);
 var caddyFilePath = join(TEMP_DIR, "CADDYFILE");
 var supportList = [
   {
@@ -195,7 +238,6 @@ function logProgressOver() {
 }
 
 // src/caddy/index.ts
-var Hosts = _Hosts.default || _Hosts;
 async function download() {
   if (await testCaddy())
     return caddyPath;
@@ -203,15 +245,15 @@ async function download() {
     const file = createWriteStream(caddyPath);
     let _platform = platform().toString();
     _platform === "win32" && (_platform = "windows");
-    let _arch = process2.arch.toString();
+    let _arch = process3.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}`;
     existsSync(caddyPath) && unlinkSync(caddyPath);
-    const httpProxy = process2.env.HTTP_PROXY || process2.env.http_proxy;
-    const httpsProxy = process2.env.HTTPS_PROXY || process2.env.https_proxy;
+    const httpProxy = process3.env.HTTP_PROXY || process3.env.http_proxy;
+    const httpsProxy = process3.env.HTTPS_PROXY || process3.env.https_proxy;
     const httpAgent = httpProxy ? new HttpProxyAgent(httpProxy) : void 0;
     const httpsAgent = httpsProxy ? new HttpsProxyAgent(httpsProxy) : void 0;
     got.stream(dowmloadLink, {
@@ -223,9 +265,9 @@ async function download() {
       logProgress(progress.percent);
     }).pipe(file).on("finish", () => {
       logProgressOver();
-      if (process2.platform === "win32")
+      if (process3.platform === "win32")
         return resolve(caddyPath);
-      chmodSync(caddyPath, 493);
+      chmodSync2(caddyPath, 493);
       resolve(caddyPath);
     }).on("error", (err) => {
       reject(err);
@@ -236,8 +278,8 @@ function testCaddy() {
   return new Promise((resolve, reject) => {
     if (!existsSync(caddyPath))
       return resolve(false);
-    chmodSync(caddyPath, 493);
-    const child = process2.platform === "win32" ? spawn(caddyPath, []) : spawn("sudo", ["-E", caddyPath]);
+    chmodSync2(caddyPath, 493);
+    const child = process3.platform === "win32" ? spawn(caddyPath, []) : spawn("sudo", ["-E", caddyPath]);
     child.on("close", () => {
       return resolve(false);
     });
@@ -253,7 +295,6 @@ var CaddyInstant = class {
   constructor() {
     this.inited = false;
     this.stoped = false;
-    this.host = new Hosts();
     testCaddy().then(() => {
       this.inited = true;
     });
@@ -262,51 +303,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 (process2.platform === "win32") {
-        spawn("ipconfig", ["/flushdns"]).on("error", (err) => {
-          consola.error(err);
-          return resolve(false);
-        }).on("close", () => {
-          resolve(true);
-        });
-      } else {
-        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 (process2.platform === "win32") {
-        spawn("ipconfig", ["/flushdns"]).on("error", (err) => {
-          consola.error(err);
-          return resolve(false);
-        }).on("close", () => {
-          resolve(true);
-        });
-      } else {
-        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.
@@ -324,16 +320,53 @@ var CaddyInstant = class {
       await this.init();
     if (https && await tryPort(443))
       await kill(443, "tcp");
-    if ((process2.platform === "win32" || !https) && await tryPort(80))
+    if ((process3.platform === "win32" || !https) && await tryPort(80))
       await kill(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 = process2.platform !== "win32" ? spawn("sudo", ["-E", caddyPath, "reverse-proxy", "--from", `${target.split(":")[0]}${https ? "" : ":80"}`, "--to", `${source}`, "--internal-certs", "--insecure", "--disable-redirects"]) : spawn(caddyPath, ["reverse-proxy", "--from", `${target.split(":")[0]}`, "--to", `${source}`, "--internal-certs"]);
+      const child = process3.platform !== "win32" ? spawn("sudo", ["-E", caddyPath, "reverse-proxy", "--from", `${target.split(":")[0]}${https ? "" : ":80"}`, "--to", `${source}`, "--internal-certs", "--insecure", "--disable-redirects"]) : spawn(caddyPath, ["reverse-proxy", "--from", `${target.split(":")[0]}`, "--to", `${source}`, "--internal-certs"]);
       child.on("error", (err) => {
         return reject(err);
       });
+      process3.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;
+          process3.nextTick(() => {
+            process3.exit();
+          });
+        }
+      });
+      const originalExit = process3.exit;
+      process3.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;
+          process3.nextTick(() => {
+            originalExit(code);
+          });
+        }
+      };
       child.stderr.on("data", (data) => {
         const lines = data.toString().split("\n").map((line) => line.trim());
         for (const line of lines) {
@@ -346,22 +379,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();
       });
     });
   }
@@ -370,55 +388,13 @@ var CaddyInstant = class {
 // src/index.ts
 var config;
 var caddy;
-var _stop;
 var _servce;
-function registerExit(clear) {
-  process3.on("beforeExit", async (_code) => {
-    await clear();
-  });
-  process3.on("uncaughtException", async (err) => {
-    console.error("An uncaught error occurred!", err.stack);
-    await clear();
-    process3.nextTick(() => {
-      process3.exit(1);
-    });
-  });
-  process3.on("unhandledRejection", async (reason, promise) => {
-    console.error("Unhandled Rejection at:", promise, "reason:", reason);
-    await clear();
-    process3.nextTick(() => {
-      process3.exit(1);
-    });
-  });
-  process3.once("SIGINT", async () => {
-    await clear();
-    process3.exit(0);
-  });
-  process3.once("SIGTERM", async () => {
-    await clear();
-    process3.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()) {
@@ -442,10 +418,10 @@ var unpluginFactory = (options) => ({
       server.printUrls = () => {
         var _a;
         _printUrls();
-        const pwd = process3.cwd();
+        const pwd = process4.cwd();
         const vireCacheDir = `${pwd}/node_modules/.vite`;
         if (existsSync2(vireCacheDir))
-          chmodSync2(vireCacheDir, 511);
+          chmodSync3(vireCacheDir, 511);
         let source = `localhost:${config.server.port}`;
         const url = (_a = server.resolvedUrls) == null ? void 0 : _a.local[0];
         if (url) {
@@ -459,10 +435,9 @@ var unpluginFactory = (options) => ({
           caddy = new CaddyInstant();
           caddy.run(source, target, __spreadValues({
             base
-          }, options)).then((stop) => {
+          }, options)).then(() => {
             const colorUrl = (url2) => c.green(url2.replace(/:(\d+)\//, (_, port) => `:${c.bold(port)}/`));
             consola.success(`  ${c.green("\u279C")}  ${c.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}${base}`)}`);
-            !_stop && (_stop = once(stop));
           }).catch((e) => {
             throw e;
           });
@@ -478,7 +453,7 @@ var unpluginFactory = (options) => ({
       consola.warn("please run as administrator");
       return;
     }
-    if (process3.env.NODE_ENV !== "development")
+    if (process4.env.NODE_ENV !== "development")
       return;
     const {
       enable = true,
@@ -494,38 +469,25 @@ var unpluginFactory = (options) => ({
       const devServer = __spreadValues(__spreadValues({
         host: "localhost",
         port: 8080
-      }, compiler.options.devServer), process3.VUE_CLI_SERVICE.projectOptions.devServer);
+      }, compiler.options.devServer), process4.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);
-            process3.exit(1);
-          }
+          process4.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) => c.green(url.replace(/:(\d+)\//, (_, port) => `:${c.bold(port)}/`));
         compiler.hooks.done.tap("unplugin-https-reverse-proxy", () => {
           consola.success(`  ${c.green("\u279C")}  ${c.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}`)}`);
-          !_stop && (_stop = once(stop));
         });
       }).catch((e) => {
         throw e;

package/dist/{chunk-J4ZJTATR.js → chunk-W4RHTMNZ.js}

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-S4DC5XL4.js";
+} from "./chunk-TVCN6ESH.js";
 
 // src/webpack.ts
 import { createWebpackPlugin } from "unplugin";