unplugin-https-reverse-proxy 1.0.0-beta.9 → 1.0.0

package/dist/rspack.cjs

@@ -3,22 +3,8 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -84,7 +70,7 @@ function isAdmin() {
     try {
       (0, import_node_child_process.execSync)("net session", { stdio: "ignore" });
       return true;
-    } catch (e) {
+    } catch {
       return false;
     }
   } else {
@@ -96,22 +82,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";
 }
@@ -132,20 +117,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();
 }
 
@@ -165,6 +148,7 @@ function resolvePath(path2) {
 var TEMP_DIR = resolvePath(import_node_process3.default.env.UHRP_CADDY_PATH || import_node_process3.default.env.TEMP || import_node_process3.default.env.TMPDIR || "/tmp");
 var caddyPath = (0, import_node_path2.join)(TEMP_DIR, `caddy${import_node_process3.default.platform === "win32" ? ".exe" : ""}`);
 var caddyFilePath = (0, import_node_path2.join)(TEMP_DIR, "CADDYFILE");
+var caddyLockFilePath = (0, import_node_path2.join)(TEMP_DIR, "caddylock");
 var supportList = [
   {
     platform: "dragonfly",
@@ -278,6 +262,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) {
@@ -298,6 +283,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%";
@@ -381,7 +378,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);
     });
@@ -397,9 +394,41 @@ var CaddyInstant = class {
   constructor() {
     this.inited = false;
     this.stoped = false;
-    testCaddy().then(() => {
+    /** has locked */
+    this.locked = false;
+    testCaddy().then(async () => {
+      await this.getCaddyfile();
       this.inited = true;
     });
+    this.locked = this.checkLock();
+  }
+  checkLock() {
+    if (!(0, import_node_fs2.existsSync)(caddyLockFilePath))
+      (0, import_node_fs2.writeFileSync)(caddyLockFilePath, "");
+    return lockfile.checkSync(caddyLockFilePath);
+  }
+  async getCaddyfile() {
+    if (!(0, import_node_fs2.existsSync)(caddyFilePath))
+      await this.initCaddyfile();
+    this.caddyfile = await (0, import_promises2.readFile)(caddyFilePath, "utf-8");
+    return this.caddyfile;
+  }
+  async initCaddyfile() {
+    const contet = `
+{
+  debug
+  auto_https disable_redirects
+}
+    
+`;
+    await (0, import_promises2.writeFile)(caddyFilePath, contet);
+    this.caddyfile = contet;
+  }
+  async writeCaddyfile() {
+    return await (0, import_promises2.writeFile)(caddyFilePath, this.caddyfile || "");
+  }
+  async deleteCaddyfile() {
+    return await (0, import_promises2.unlink)(caddyFilePath);
   }
   async init() {
     await download();
@@ -418,86 +447,169 @@ var CaddyInstant = class {
       showCaddyLog = false,
       https = false
     } = options || {};
+    this._source = source;
+    this._target = target;
     if (!this.inited)
       await this.init();
-    if (https && await tryPort(443))
-      await (0, import_kill_port.default)(443, "tcp");
-    if ((import_node_process4.default.platform === "win32" || !https) && await tryPort(80))
-      await (0, import_kill_port.default)(80, "tcp");
     if (!await addHost(source.split(":")[0], target.split(":")[0]))
       throw new Error("update host failed");
     consola.success("update host success\n");
+    await this.getCaddyfile();
+    if (!(this.caddyfile || "").includes(`${target.split(":")[0]}${https ? "" : ":80"}`)) {
+      this.caddyfile = `${this.caddyfile}
+${target.split(":")[0]}${https ? "" : ":80"} {
+  ${https ? "tls internal" : ""}
+  reverse_proxy http://${source} {
+    health_uri ${base}
+    health_interval 2s
+    health_timeout 5s
+    fail_duration 2s
+    unhealthy_status 502 503 504 404
+    lb_try_duration 3s
+    lb_try_interval 300ms
+    health_headers {
+      Accept text/html
+      Accept-Encoding gzip, deflate, br
+      User-Agent Caddy-Health-Check
+    }
+
+    @error status 502 503 504 404
+    handle_response @error {
+      respond * 503 {
+        body "Service Unavailable"
+        close
+      }
+    }
+  }
+}
+
+`;
+      await this.writeCaddyfile();
+    }
+    if (!(0, import_node_fs2.existsSync)(caddyLockFilePath))
+      (0, import_node_fs2.writeFileSync)(caddyLockFilePath, "");
+    if (!this.locked) {
+      if (await tryPort(443))
+        await kill(443);
+      if ((import_node_process4.default.platform === "win32" || !https) && await tryPort(80))
+        await kill(80);
+    }
     return new Promise((resolve, reject) => {
-      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.bind(import_node_process4.default);
-      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");
-        const pwd = import_node_process4.default.cwd();
-        const viteCacheDir = `${pwd}/node_modules/.vite`;
-        if ((0, import_node_fs2.existsSync)(viteCacheDir))
-          chmodRecursive(viteCacheDir, 511);
-        const nuxtCacheDir = `${pwd}/.nuxt`;
-        if ((0, import_node_fs2.existsSync)(nuxtCacheDir))
-          await chmodRecursive(nuxtCacheDir, 511);
-        const webpackCacheDir = `${pwd}/node_modules/.cache`;
-        if ((0, import_node_fs2.existsSync)(webpackCacheDir))
-          chmodRecursive(webpackCacheDir, 511);
-        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);
-          });
-        }
+      var _a, _b;
+      const setupCleanup = () => {
+        import_node_process4.default.on("SIGINT", async () => {
+          if (this.stoped)
+            return;
+          import_node_process4.default.stdin.resume();
+          try {
+            await this.baseCleanup(restore);
+          } finally {
+            this.stoped = true;
+            import_node_process4.default.nextTick(() => {
+              import_node_process4.default.exit();
+            });
+          }
+        });
+        const originalExit = import_node_process4.default.exit.bind(import_node_process4.default);
+        import_node_process4.default.exit = async (code) => {
+          const port = Number(source.split(":")[1]);
+          if (!Number.isNaN(port) && await tryPort(port))
+            await kill(port);
+          const pwd = import_node_process4.default.cwd();
+          const viteCacheDir = `${pwd}/node_modules/.vite`;
+          if ((0, import_node_fs2.existsSync)(viteCacheDir))
+            await chmodRecursive(viteCacheDir, 511).catch(() => {
+            });
+          const nuxtCacheDir = `${pwd}/.nuxt`;
+          if ((0, import_node_fs2.existsSync)(nuxtCacheDir))
+            await chmodRecursive(nuxtCacheDir, 511).catch(() => {
+            });
+          const webpackCacheDir = `${pwd}/node_modules/.cache`;
+          if ((0, import_node_fs2.existsSync)(webpackCacheDir))
+            await chmodRecursive(webpackCacheDir, 511).catch(() => {
+            });
+          if (this.stoped)
+            return originalExit(code);
+          import_node_process4.default.stdin.resume();
+          try {
+            await this.baseCleanup();
+          } 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) {
-          showCaddyLog && line && console.info(line);
-          if (line.includes("Error:") || line && JSON.parse(line).level === "error") {
-            consola.error(line);
-            return reject(line);
+      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"]);
+        lockfile.lockSync(caddyLockFilePath);
+        this._caddyChild.on("error", (err) => {
+          return reject(err);
+        });
+        (_a = this._caddyChild.stderr) == null ? void 0 : _a.on("data", async (data) => {
+          const lines = data.toString().split("\n").map((line) => line.trim());
+          for (const line of lines) {
+            showCaddyLog && line && console.info(line);
+            if (line.includes("Error:") || line && JSON.parse(line).level === "error") {
+              if (line.includes("parsing caddyfile tokens")) {
+                consola.error("Caddyfile syntax error, please contact the author:\n", `${this.caddyfile}
+
+${line}
+`);
+                await this.baseCleanup();
+                import_node_process4.default.exit();
+              } else {
+                consola.error(`${line}
+`);
+                return reject(line);
+              }
+            }
+            if (line.includes("config file changed"))
+              consola.success("Detect added a new reverse proxy config, restarted.\n");
+            if (line.includes("caddy proxying") || line.includes("serving initial"))
+              return resolve();
           }
-        }
-      });
-      child.stdout.on("data", (_data) => {
-        consola.info(_data.toString());
-        resolve();
-      });
+        });
+        (_b = this._caddyChild.stdout) == null ? void 0 : _b.on("data", (_data) => {
+          consola.info(_data.toString());
+          resolve();
+        });
+        setupCleanup();
+      } else {
+        consola.info("Caddy is running in another process.");
+        setupCleanup();
+        return resolve();
+      }
     });
   }
+  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).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyFilePath).catch(() => {
+        });
+        await (0, import_promises2.unlink)(caddyLockFilePath).catch(() => {
+        });
+      } catch (e) {
+        consola.error(e);
+      }
+    }
+  }
 };
 
 // src/index.ts
@@ -509,9 +621,10 @@ var vitePrintUrls = once((options, source, target, base = "/", _printUrls) => {
   if (caddy)
     return;
   caddy = new CaddyInstant();
-  caddy.run(source, target, __spreadValues({
-    base
-  }, options)).then(() => {
+  caddy.run(source, target, {
+    base,
+    ...options
+  }).then(() => {
     const colorUrl = (url) => import_picocolors.default.green(url.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}`)}`);
   }).catch((e) => {
@@ -529,16 +642,16 @@ var unpluginFactory = (options) => ({
       var _a;
       if (config.command !== "serve")
         return;
-      if (!isAdmin()) {
-        consola.warn("please run as administrator");
-        return;
-      }
       const {
         enable = true,
         target = ""
       } = options;
       if (!enable)
         return;
+      if (!isAdmin()) {
+        consola.warn("please run as administrator");
+        return;
+      }
       if (!target) {
         consola.fail("please provide target");
         return;
@@ -558,24 +671,27 @@ var unpluginFactory = (options) => ({
     var _a, _b;
     if (import_node_process5.default.env.NODE_ENV !== "development")
       return;
-    if (!isAdmin()) {
-      consola.warn("please run as administrator");
-      return;
-    }
     const {
       enable = true,
       target = ""
     } = options;
     if (!enable)
       return;
+    if (!isAdmin()) {
+      consola.warn("please run as administrator");
+      return;
+    }
     if (!target) {
       consola.fail("please provide target");
       return;
     }
-    const devServer = __spreadValues(__spreadValues({
+    const devServer = {
       host: "localhost",
-      port: 8080
-    }, compiler.options.devServer), (_a = import_node_process5.default.VUE_CLI_SERVICE) == null ? void 0 : _a.projectOptions.devServer);
+      port: 8080,
+      ...compiler.options.devServer,
+      // @ts-expect-error vuecli
+      ...(_a = import_node_process5.default.VUE_CLI_SERVICE) == null ? void 0 : _a.projectOptions.devServer
+    };
     const source = `${devServer.host}:${devServer.port}`;
     if (caddy)
       return;
@@ -590,7 +706,9 @@ var unpluginFactory = (options) => ({
       options.https = false;
     }
     caddy = new CaddyInstant();
-    caddy.run(source, target, __spreadValues({}, options)).then(() => {
+    caddy.run(source, target, {
+      ...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}`)}`);
@@ -603,31 +721,35 @@ var unpluginFactory = (options) => ({
     var _a, _b, _c;
     if (import_node_process5.default.env.NODE_ENV !== "development")
       return;
-    if (!isAdmin()) {
-      consola.warn("please run as administrator");
-      return;
-    }
     const {
       enable = true,
       target = ""
     } = options;
     if (!enable)
       return;
+    if (!isAdmin()) {
+      consola.warn("please run as administrator");
+      return;
+    }
     if (!target) {
       consola.fail("please provide target");
       return;
     }
-    const devServer = __spreadValues(__spreadValues({
+    const devServer = {
       host: "localhost",
-      port: 8080
-    }, compiler.options.devServer), (_c = (_b = await ((_a = await import("@rsbuild/core")) == null ? void 0 : _a.loadConfig({
-      cwd
-    }))) == null ? void 0 : _b.content) == null ? void 0 : _c.server);
+      port: 8080,
+      ...compiler.options.devServer,
+      ...(_c = (_b = await ((_a = await import("@rsbuild/core")) == null ? void 0 : _a.loadConfig({
+        cwd
+      }))) == null ? void 0 : _b.content) == null ? void 0 : _c.server
+    };
     const source = `${devServer.host}:${devServer.port}`;
     if (caddy)
       return;
     caddy = new CaddyInstant();
-    caddy.run(source, target, __spreadValues({}, options)).then(() => {
+    caddy.run(source, target, {
+      ...options
+    }).then(() => {
       const colorUrl = (url) => import_picocolors.default.green(url.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}`)}`);
     }).catch((e) => {
@@ -640,4 +762,4 @@ var src_default = unplugin;
 
 // src/rspack.ts
 var rspack_default = src_default.rspack;
-exports.default = module.exports;
+module.exports = module.exports;exports.default = module.exports;

package/dist/rspack.js

@@ -1,7 +1,7 @@
 import {
   src_default
-} from "./chunk-ZSHTX2B6.js";
-import "./chunk-RUJE3YFB.js";
+} from "./chunk-KVE7AVSI.js";
+import "./chunk-2VGRJ3QS.js";
 
 // src/rspack.ts
 var rspack_default = src_default.rspack;

package/dist/types.cjs

@@ -16,4 +16,4 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/types.ts
 var types_exports = {};
 module.exports = __toCommonJS(types_exports);
-exports.default = module.exports;
+module.exports = module.exports;exports.default = module.exports;

package/dist/utils.cjs

@@ -66,7 +66,7 @@ function isAdmin() {
     try {
       (0, import_node_child_process.execSync)("net session", { stdio: "ignore" });
       return true;
-    } catch (e) {
+    } catch {
       return false;
     }
   } else {
@@ -80,4 +80,4 @@ function isAdmin() {
   isAdmin,
   once
 });
-exports.default = module.exports;
+module.exports = module.exports;exports.default = module.exports;

package/dist/utils.js

@@ -3,7 +3,7 @@ import {
   consola,
   isAdmin,
   once
-} from "./chunk-RUJE3YFB.js";
+} from "./chunk-2VGRJ3QS.js";
 export {
   chmodRecursive,
   consola,