unplugin-https-reverse-proxy 0.0.11 → 0.0.13

package/dist/webpack.cjs

@@ -3,8 +3,22 @@ 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 });
@@ -45,6 +59,15 @@ 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);
+  };
+}
 
 // src/caddy/index.ts
 var import_node_os = require("os");
@@ -54,7 +77,7 @@ var import_node_child_process = 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 hostile = __toESM(require("hostile"), 1);
+var import_hosts_so_easy = __toESM(require("hosts-so-easy"), 1);
 var import_kill_port = __toESM(require("kill-port"), 1);
 
 // src/caddy/constants.ts
@@ -176,6 +199,8 @@ var supportList = [
 
 // src/caddy/utils.ts
 var import_node_net = require("net");
+var import_ora = __toESM(require("ora"), 1);
+var spinner;
 function tryPort(port) {
   return new Promise((resolve, reject) => {
     try {
@@ -194,8 +219,41 @@ function tryPort(port) {
     }
   });
 }
+function getNumber(number) {
+  if (number <= 0)
+    return "0%";
+  else if (number < 100)
+    return `${number.toFixed(2)}%`;
+  else
+    return "100%";
+}
+function logProgress(percent) {
+  if (!spinner) {
+    consola.log("");
+    spinner = (0, import_ora.default)({
+      text: "Start Download Caddy: 0%",
+      indent: 2
+    });
+    spinner.start();
+  } else {
+    spinner.text = `Download Caddy: ${getNumber(Number(percent) * 100)}`;
+  }
+}
+function logProgressOver() {
+  if (!spinner) {
+    spinner = (0, import_ora.default)({
+      text: "Start Download Caddy: 100%",
+      indent: 2
+    });
+    spinner.start();
+  } else {
+    spinner.succeed();
+    consola.log("");
+  }
+}
 
 // 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;
@@ -219,7 +277,10 @@ async function download() {
         http: httpAgent,
         https: httpsAgent
       }
+    }).on("downloadProgress", (progress) => {
+      logProgress(progress.percent);
     }).pipe(file).on("finish", () => {
+      logProgressOver();
       if (import_node_process2.default.platform === "win32")
         return resolve(caddyPath);
       (0, import_node_fs.chmodSync)(caddyPath, 493);
@@ -234,7 +295,7 @@ function testCaddy() {
     if (!(0, import_node_fs.existsSync)(caddyPath))
       return resolve(false);
     (0, import_node_fs.chmodSync)(caddyPath, 493);
-    const child = import_node_process2.default.platform === "win32" ? (0, import_node_child_process.spawn)(caddyPath, []) : (0, import_node_child_process.spawn)("sudo", [caddyPath]);
+    const child = import_node_process2.default.platform === "win32" ? (0, import_node_child_process.spawn)(caddyPath, []) : (0, import_node_child_process.spawn)("sudo", ["-E", caddyPath]);
     child.on("close", () => {
       return resolve(false);
     });
@@ -249,6 +310,8 @@ function testCaddy() {
 var CaddyInstant = class {
   constructor() {
     this.inited = false;
+    this.stoped = false;
+    this.host = new Hosts();
     testCaddy().then(() => {
       this.inited = true;
     });
@@ -257,52 +320,46 @@ var CaddyInstant = class {
     await download();
     this.inited = true;
   }
-  async updateHost(ip, host) {
+  updateHost(ip, host) {
     ["localhost", "0.0.0.0"].includes(ip) && (ip = "127.0.0.1");
+    this.host.add(ip, host);
     return new Promise((resolve, reject) => {
-      hostile.set(ip, host, (err) => {
-        if (err) {
-          return reject(err);
-        } else {
-          if (import_node_process2.default.platform === "win32") {
-            (0, import_node_child_process.spawn)("ipconfig", ["/flushdns"]).on("error", (err2) => {
-              return reject(err2);
-            }).on("close", () => {
-              resolve(true);
-            });
-          } else {
-            (0, import_node_child_process.spawn)("sudo", ["killall", "-HUP", "mDNSResponder"]).on("error", (err2) => {
-              return reject(err2);
-            }).on("close", () => {
-              resolve(true);
-            });
-          }
-        }
-      });
+      if (import_node_process2.default.platform === "win32") {
+        (0, import_node_child_process.spawn)("ipconfig", ["/flushdns"]).on("error", (err) => {
+          consola.error(err);
+          return resolve(false);
+        }).on("close", () => {
+          resolve(true);
+        });
+      } else {
+        (0, import_node_child_process.spawn)("sudo", ["-E", "killall", "-HUP", "mDNSResponder"]).on("error", (err) => {
+          consola.error(err);
+          return resolve(false);
+        }).on("close", () => {
+          resolve(true);
+        });
+      }
     });
   }
-  async restoreHost(ip, host) {
+  restoreHost(ip, host) {
     ["localhost", "0.0.0.0"].includes(ip) && (ip = "127.0.0.1");
+    this.host.remove(ip, host);
     return new Promise((resolve, reject) => {
-      hostile.remove(ip, host, (err) => {
-        if (err) {
-          return reject(err);
-        } else {
-          if (import_node_process2.default.platform === "win32") {
-            (0, import_node_child_process.spawn)("ipconfig", ["/flushdns"]).on("error", (err2) => {
-              return reject(err2);
-            }).on("close", () => {
-              resolve(true);
-            });
-          } else {
-            (0, import_node_child_process.spawn)("sudo", ["killall", "-HUP", "mDNSResponder"]).on("error", (err2) => {
-              return reject(err2);
-            }).on("close", () => {
-              resolve(true);
-            });
-          }
-        }
-      });
+      if (import_node_process2.default.platform === "win32") {
+        (0, import_node_child_process.spawn)("ipconfig", ["/flushdns"]).on("error", (err) => {
+          consola.error(err);
+          return resolve(false);
+        }).on("close", () => {
+          resolve(true);
+        });
+      } else {
+        (0, import_node_child_process.spawn)("sudo", ["-E", "killall", "-HUP", "mDNSResponder"]).on("error", (err) => {
+          consola.error(err);
+          return resolve(false);
+        }).on("close", () => {
+          resolve(true);
+        });
+      }
     });
   }
   /**
@@ -319,14 +376,15 @@ var CaddyInstant = class {
     } = options || {};
     if (!this.inited)
       await this.init();
-    if (!await this.updateHost(source.split(":")[0], target.split(":")[0]))
-      throw new Error("update host failed");
     if (await tryPort(443))
       await (0, import_kill_port.default)(443, "tcp");
     if (import_node_process2.default.platform === "win32" && await tryPort(80))
       await (0, import_kill_port.default)(80, "tcp");
+    if (!await this.updateHost(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_process2.default.platform !== "win32" ? (0, import_node_child_process.spawn)("sudo", [caddyPath, "reverse-proxy", "--from", `${target.split(":")[0]}`, "--to", `${source}`, "--internal-certs"]) : (0, import_node_child_process.spawn)(caddyPath, ["reverse-proxy", "--from", `${target.split(":")[0]}`, "--to", `${source}`, "--internal-certs"]);
+      const child = import_node_process2.default.platform !== "win32" ? (0, import_node_child_process.spawn)("sudo", ["-E", caddyPath, "reverse-proxy", "--from", `${target.split(":")[0]}`, "--to", `${source}`, "--internal-certs"]) : (0, import_node_child_process.spawn)(caddyPath, ["reverse-proxy", "--from", `${target.split(":")[0]}`, "--to", `${source}`, "--internal-certs"]);
       child.on("error", (err) => {
         return reject(err);
       });
@@ -334,7 +392,7 @@ var CaddyInstant = class {
         const lines = data.toString().split("\n").map((line) => line.trim());
         for (const line of lines) {
           showCaddyLog && line && console.info(line);
-          if (line && JSON.parse(line).level === "error") {
+          if (line.includes("Error:") || line && JSON.parse(line).level === "error") {
             consola.error(line);
             return reject(line);
           }
@@ -342,14 +400,21 @@ var CaddyInstant = class {
       });
       child.stdout.on("data", (_data) => {
         consola.info(_data.toString());
-        resolve(async () => {
-          if (!restore)
+        resolve(async (callback) => {
+          if (!restore || this.stoped)
             return;
-          if (await this.restoreHost(source.split(":")[0], target.split(":")[0]))
-            consola.success("restore host success\n");
-          else
+          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();
         });
       });
     });
@@ -359,21 +424,66 @@ var CaddyInstant = class {
 // src/index.ts
 var config;
 var caddy;
+var _stop;
+var _servce;
+function registerExit(clear) {
+  import_node_process3.default.on("beforeExit", async (_code) => {
+    await clear();
+  });
+  import_node_process3.default.on("uncaughtException", async (err) => {
+    console.error("An uncaught error occurred!", err.stack);
+    await clear();
+    import_node_process3.default.nextTick(() => {
+      import_node_process3.default.exit(1);
+    });
+  });
+  import_node_process3.default.on("unhandledRejection", async (reason, promise) => {
+    console.error("Unhandled Rejection at:", promise, "reason:", reason);
+    await clear();
+    import_node_process3.default.nextTick(() => {
+      import_node_process3.default.exit(1);
+    });
+  });
+  import_node_process3.default.once("SIGINT", async () => {
+    await clear();
+    import_node_process3.default.emit("SIGINT");
+  });
+  import_node_process3.default.once("SIGTERM", async () => {
+    await clear();
+    import_node_process3.default.emit("SIGTERM");
+  });
+}
 var unpluginFactory = (options) => ({
   name: "unplugin-https-reverse-proxy",
-  enforce: "post",
+  enforce: "pre",
   vite: {
     configResolved(_config) {
       config = _config;
+      registerExit(async () => {
+        var _a;
+        try {
+          _servce && _servce.close();
+          (_a = _servce.httpServer) == null ? void 0 : _a.close(async () => {
+            _stop && await _stop();
+          });
+          _stop && await _stop();
+        } catch (e) {
+          consola.error(e);
+        }
+      });
     },
     configureServer(server) {
       const {
+        enable = true,
         target = ""
       } = options;
+      if (!enable)
+        return;
       if (!target) {
         consola.fail("please provide target");
         return;
       }
+      _servce = server;
       const _printUrls = server.printUrls;
       server.printUrls = () => {
         var _a;
@@ -386,51 +496,73 @@ var unpluginFactory = (options) => ({
         }
         const base = server.config.base || "/";
         try {
-          const caddy2 = new CaddyInstant();
-          caddy2.run(source, target, {
+          if (caddy)
+            return;
+          caddy = new CaddyInstant();
+          caddy.run(source, target, {
             base,
             showCaddyLog: options.showCaddyLog
           }).then((stop) => {
             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(`https://${target}${base}`)}`);
-            import_node_process3.default.on("SIGINT", async () => {
-              await stop();
-              server.close();
-              import_node_process3.default.exit();
-            });
+            !_stop && (_stop = once(stop));
+          }).catch((e) => {
+            throw e;
           });
         } catch (e) {
           consola.error(e);
         }
       };
+    },
+    async buildEnd() {
+      _stop && await _stop();
     }
   },
   webpack(compiler) {
     const {
+      enable = true,
       target = ""
     } = options;
+    if (!enable)
+      return;
     if (!target) {
       consola.fail("please provide target");
       return;
     }
     try {
-      const devServer = compiler.options.devServer || import_node_process3.default.VUE_CLI_SERVICE.projectOptions.devServer;
-      const source = `${(devServer == null ? void 0 : devServer.host) || "127.0.0.1"}:${(devServer == null ? void 0 : devServer.port) || "8080"}`;
+      registerExit(async () => {
+        try {
+          _stop && await _stop();
+        } catch (e) {
+          consola.error(e);
+        }
+      });
+      const devServer = __spreadValues(__spreadValues({
+        host: "127.0.0.1",
+        port: 8080
+      }, compiler.options.devServer), import_node_process3.default.VUE_CLI_SERVICE.projectOptions.devServer);
+      const source = `${devServer.host}:${devServer.port}`;
       if (caddy)
         return;
+      const _close = compiler.close.bind(compiler);
+      compiler.close = async (callback) => {
+        try {
+          _stop && await _stop(() => {
+            _close && _close(callback);
+          });
+        } catch (e) {
+          consola.error(e);
+          import_node_process3.default.exit(1);
+        }
+      };
       caddy = new CaddyInstant();
       caddy.run(source, target, {
         showCaddyLog: options.showCaddyLog
       }).then((stop) => {
         const colorUrl = (url) => import_picocolors.default.green(url.replace(/:(\d+)\//, (_, port) => `:${import_picocolors.default.bold(port)}/`));
-        compiler.hooks.done.tap("unplugin-https-reverse-proxy", (stats) => {
-          if (stats.hasErrors())
-            return;
+        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(`https://${target}`)}`);
-        });
-        import_node_process3.default.on("SIGINT", async () => {
-          await stop();
-          import_node_process3.default.exit();
+          !_stop && (_stop = once(stop));
         });
       }).catch((e) => {
         throw e;

package/dist/webpack.js

@@ -1,8 +1,8 @@
 import {
   webpack_default
-} from "./chunk-BFAT7WWW.js";
-import "./chunk-5K6D2TTS.js";
-import "./chunk-3HKPYCSE.js";
+} from "./chunk-RTEXFW4L.js";
+import "./chunk-DH6VMKTP.js";
+import "./chunk-CQC5SSJR.js";
 export {
   webpack_default as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unplugin-https-reverse-proxy",
   "type": "module",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "packageManager": "pnpm@8.6.12",
   "description": "",
   "license": "MIT",
@@ -106,10 +106,11 @@
     "consola": "^3.2.3",
     "esno": "^0.17.0",
     "got-cjs": "^12.5.4",
-    "hostile": "^1.3.3",
+    "hosts-so-easy": "^1.2.9",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
     "kill-port": "^2.0.1",
+    "ora": "5",
     "picocolors": "^1.0.0",
     "unplugin": "^1.4.0"
   },
@@ -117,7 +118,6 @@
     "@antfu/eslint-config": "^0.40.2",
     "@nuxt/kit": "^3.6.5",
     "@nuxt/schema": "^3.6.5",
-    "@types/hostile": "^1.3.3",
     "@types/kill-port": "^2.0.3",
     "@types/node": "^20.5.2",
     "bumpp": "^9.2.0",

package/src/caddy/index.ts

@@ -5,11 +5,15 @@ import { spawn } from 'node:child_process'
 import { got } from 'got-cjs'
 import { HttpProxyAgent } from 'http-proxy-agent'
 import { HttpsProxyAgent } from 'https-proxy-agent'
-import * as hostile from 'hostile'
+
+// @ts-expect-error no type
+import _Hosts from 'hosts-so-easy'
 import kill from 'kill-port'
 import { consola } from '../utils'
 import { caddyPath, supportList } from './constants'
-import { tryPort } from './utils'
+import { logProgress, logProgressOver, tryPort } from './utils'
+
+const Hosts = _Hosts.default || _Hosts
 
 export async function download() {
   if (await testCaddy())
@@ -47,7 +51,10 @@ export async function download() {
         http: httpAgent,
         https: httpsAgent,
       },
+    }).on('downloadProgress', (progress) => {
+      logProgress(progress.percent)
     }).pipe(file).on('finish', () => {
+      logProgressOver()
       if (process.platform === 'win32')
         return resolve(caddyPath)
       // chmod +x
@@ -65,7 +72,7 @@ function testCaddy() {
     if (!existsSync(caddyPath))
       return resolve(false)
     chmodSync(caddyPath, 0o755)
-    const child = process.platform === 'win32' ? spawn(caddyPath, []) : spawn('sudo', [caddyPath])
+    const child = process.platform === 'win32' ? spawn(caddyPath, []) : spawn('sudo', ['-E', caddyPath])
     child.on('close', () => {
       return resolve(false)
     })
@@ -86,8 +93,11 @@ interface RunOptions {
 
 export class CaddyInstant {
   private inited = false
+  private stoped = false
+  private host: typeof Hosts
 
   constructor() {
+    this.host = new Hosts()
     testCaddy().then(() => {
       this.inited = true
     })
@@ -98,57 +108,49 @@ export class CaddyInstant {
     this.inited = true
   }
 
-  private async updateHost(ip: string, host: string) {
+  private updateHost(ip: string, host: string) {
     ['localhost', '0.0.0.0'].includes(ip) && (ip = '127.0.0.1')
+    this.host.add(ip, host)
     return new Promise<boolean>((resolve, reject) => {
-      hostile.set(ip, host, (err) => {
-        if (err) {
-          return reject(err)
-        }
-        else {
-          if (process.platform === 'win32') {
-            spawn('ipconfig', ['/flushdns']).on('error', (err) => {
-              return reject(err)
-            }).on('close', () => {
-              resolve(true)
-            })
-          }
-          else {
-            spawn('sudo', ['killall', '-HUP', 'mDNSResponder']).on('error', (err) => {
-              return reject(err)
-            }).on('close', () => {
-              resolve(true)
-            })
-          }
-        }
-      })
+      if (process.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)
+        })
+      }
     })
   }
 
-  private async restoreHost(ip: string, host: string) {
+  private restoreHost(ip: string, host: string) {
     ['localhost', '0.0.0.0'].includes(ip) && (ip = '127.0.0.1')
+    this.host.remove(ip, host)
     return new Promise<boolean>((resolve, reject) => {
-      hostile.remove(ip, host, (err) => {
-        if (err) {
-          return reject(err)
-        }
-        else {
-          if (process.platform === 'win32') {
-            spawn('ipconfig', ['/flushdns']).on('error', (err) => {
-              return reject(err)
-            }).on('close', () => {
-              resolve(true)
-            })
-          }
-          else {
-            spawn('sudo', ['killall', '-HUP', 'mDNSResponder']).on('error', (err) => {
-              return reject(err)
-            }).on('close', () => {
-              resolve(true)
-            })
-          }
-        }
-      })
+      if (process.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)
+        })
+      }
     })
   }
 
@@ -168,18 +170,19 @@ export class CaddyInstant {
     if (!this.inited)
       await this.init()
 
-    if (!await this.updateHost(source.split(':')[0], target.split(':')[0]))
-      throw new Error('update host failed')
-
     if (await tryPort(443))
       await kill(443, 'tcp')
     if (process.platform === 'win32' && await tryPort(80))
       await kill(80, 'tcp')
 
-    return new Promise<() => Promise<void>>((resolve, reject) => {
+    if (!await this.updateHost(source.split(':')[0], target.split(':')[0]))
+      throw new Error('update host failed')
+    consola.success('update host success\n')
+
+    return new Promise<(callback?: () => any) => Promise<void>>((resolve, reject) => {
       // caddy reverse-proxy --from target --to source --internal-certs
       const child = process.platform !== 'win32'
-        ? spawn('sudo', [caddyPath, 'reverse-proxy', '--from', `${target.split(':')[0]}`, '--to', `${source}`, '--internal-certs'])
+        ? spawn('sudo', ['-E', caddyPath, 'reverse-proxy', '--from', `${target.split(':')[0]}`, '--to', `${source}`, '--internal-certs'])
         : spawn(caddyPath, ['reverse-proxy', '--from', `${target.split(':')[0]}`, '--to', `${source}`, '--internal-certs'])
 
       child.on('error', (err) => {
@@ -192,7 +195,7 @@ export class CaddyInstant {
           // caddy log
           // eslint-disable-next-line no-console
           showCaddyLog && line && console.info(line)
-          if (line && JSON.parse(line).level === 'error') {
+          if (line.includes('Error:') || (line && JSON.parse(line).level === 'error')) {
             consola.error(line)
             // child.kill()
             return reject(line)
@@ -202,17 +205,25 @@ export class CaddyInstant {
 
       child.stdout.on('data', (_data) => {
         consola.info(_data.toString())
-        resolve(async () => {
-          if (!restore)
+        resolve(async (callback?: () => any) => {
+          if (!restore || this.stoped)
             return
 
-          if (await this.restoreHost(source.split(':')[0], target.split(':')[0]))
-            consola.success('restore host success\n')
+          try {
+            if (await this.restoreHost(source.split(':')[0], target.split(':')[0]))
+              consola.success('restore host success\n')
 
-          else
+            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()
         })
       })
     })