unplugin-https-reverse-proxy 1.0.0-beta.4 → 1.0.0-beta.7

package/README.md

@@ -6,6 +6,15 @@ A plugin for https reverse proxy, support `vite` and `webpack`.
 
 ## Install
 
+
+Support set caddy file path by environment variable `UHRP_CADDY_PATH`, default is system cache folder.
+
+```env
+#.env.local
+UHRP_CADDY_PATH=~/tmp/.uhrp
+```
+
+
 ```bash
 # not auto install caddy when postinstall
 npm i unplugin-https-reverse-proxy --save-dev

package/dist/{chunk-GAKOA5LE.js → chunk-IUFVJYJ5.js}

@@ -8,14 +8,13 @@ import {
 
 // src/index.ts
 import process4 from "process";
-import { existsSync as existsSync2 } from "fs";
 import { createUnplugin } from "unplugin";
 import c from "picocolors";
 
 // src/caddy/index.ts
 import { platform } from "os";
 import process3 from "process";
-import { chmodSync as chmodSync2, createWriteStream, existsSync, unlinkSync } from "fs";
+import { chmodSync as chmodSync2, createWriteStream, existsSync, mkdirSync, unlinkSync } from "fs";
 import { spawn } from "child_process";
 import { got } from "got-cjs";
 import { HttpProxyAgent } from "http-proxy-agent";
@@ -71,8 +70,16 @@ async function removeHost(ip, host) {
 
 // src/caddy/constants.ts
 import { join } from "path";
+import os from "os";
 import process2 from "process";
-var TEMP_DIR = process2.env.TEMP || process2.env.TMPDIR || "/tmp";
+import dotenvFlow from "dotenv-flow";
+dotenvFlow.config();
+function resolvePath(path) {
+  if (path.startsWith("~"))
+    return join(os.homedir() || "", path.slice(1));
+  return path;
+}
+var TEMP_DIR = resolvePath(process2.env.UHRP_CADDY_PATH || 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 = [
@@ -246,6 +253,10 @@ async function download() {
   if (await testCaddy())
     return caddyPath;
   return new Promise((resolve, reject) => {
+    if (!existsSync(TEMP_DIR)) {
+      mkdirSync(TEMP_DIR, { recursive: true });
+      chmodSync2(TEMP_DIR, 511);
+    }
     const file = createWriteStream(caddyPath);
     let _platform = platform().toString();
     _platform === "win32" && (_platform = "windows");
@@ -260,6 +271,9 @@ async function download() {
     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;
+    const chmodCaddyOnce = once(() => {
+      chmodSync2(caddyPath, 511);
+    });
     got.stream(dowmloadLink, {
       agent: {
         http: httpAgent,
@@ -267,11 +281,12 @@ async function download() {
       }
     }).on("downloadProgress", (progress) => {
       logProgress(progress.percent);
+      chmodCaddyOnce();
     }).pipe(file).on("finish", () => {
       logProgressOver();
       if (process3.platform === "win32")
         return resolve(caddyPath);
-      chmodSync2(caddyPath, 493);
+      chmodSync2(caddyPath, 511);
       resolve(caddyPath);
     }).on("error", (err) => {
       reject(err);
@@ -282,7 +297,7 @@ function testCaddy() {
   return new Promise((resolve, reject) => {
     if (!existsSync(caddyPath))
       return resolve(false);
-    chmodSync2(caddyPath, 493);
+    chmodSync2(caddyPath, 511);
     const child = process3.platform === "win32" ? spawn(caddyPath, []) : spawn("sudo", ["-E", caddyPath]);
     child.on("close", () => {
       return resolve(false);
@@ -357,6 +372,16 @@ var CaddyInstant = class {
         const port = Number(source.split(":")[1]);
         if (!Number.isNaN(port) && await tryPort(port))
           await kill(port, "tcp");
+        const pwd2 = process3.cwd();
+        const viteCacheDir = `${pwd2}/node_modules/.vite`;
+        if (existsSync(viteCacheDir))
+          chmodRecursive(viteCacheDir, 511);
+        const nuxtCacheDir = `${pwd2}/.nuxt`;
+        if (existsSync(nuxtCacheDir))
+          await chmodRecursive(nuxtCacheDir, 511);
+        const webpackCacheDir = `${pwd2}/node_modules/.cache`;
+        if (existsSync(webpackCacheDir))
+          chmodRecursive(webpackCacheDir, 511);
         if (!restore || this.stoped)
           return originalExit(code);
         try {
@@ -398,27 +423,17 @@ var caddy;
 var pwd = process4.cwd();
 var vitePrintUrls = once((options, source, target, base = "/", _printUrls) => {
   _printUrls == null ? void 0 : _printUrls();
-  const viteCacheDir = `${pwd}/node_modules/.vite`;
-  if (existsSync2(viteCacheDir))
-    chmodRecursive(viteCacheDir, 511);
-  const nuxtCacheDir = `${pwd}/.nuxt`;
-  if (existsSync2(nuxtCacheDir))
-    chmodRecursive(nuxtCacheDir, 511);
-  try {
-    if (caddy)
-      return;
-    caddy = new CaddyInstant();
-    caddy.run(source, target, __spreadValues({
-      base
-    }, options)).then(() => {
-      const colorUrl = (url) => c.green(url.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}`)}`);
-    }).catch((e) => {
-      throw e;
-    });
-  } catch (e) {
-    consola.error(e);
-  }
+  if (caddy)
+    return;
+  caddy = new CaddyInstant();
+  caddy.run(source, target, __spreadValues({
+    base
+  }, options)).then(() => {
+    const colorUrl = (url) => c.green(url.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}`)}`);
+  }).catch((e) => {
+    throw e;
+  });
 });
 var unpluginFactory = (options) => ({
   name: "unplugin-https-reverse-proxy",
@@ -429,12 +444,12 @@ var unpluginFactory = (options) => ({
     },
     configureServer(server) {
       var _a;
+      if (config.command !== "serve")
+        return;
       if (!isAdmin()) {
         consola.warn("please run as administrator");
         return;
       }
-      if (config.command === "build")
-        return;
       const {
         enable = true,
         target = ""
@@ -458,12 +473,12 @@ var unpluginFactory = (options) => ({
   },
   webpack(compiler) {
     var _a;
+    if (process4.env.NODE_ENV !== "development")
+      return;
     if (!isAdmin()) {
       consola.warn("please run as administrator");
       return;
     }
-    if (process4.env.NODE_ENV !== "development")
-      return;
     const {
       enable = true,
       target = ""
@@ -474,39 +489,32 @@ var unpluginFactory = (options) => ({
       consola.fail("please provide target");
       return;
     }
-    const nuxtCacheDir = `${pwd}/node_modules/.cache`;
-    if (existsSync2(nuxtCacheDir))
-      chmodRecursive(nuxtCacheDir, 511);
-    try {
-      const devServer = __spreadValues(__spreadValues({
-        host: "localhost",
-        port: 8080
-      }, 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) => {
-          process4.on("exit", () => {
-            _close && _close(callback);
-          });
-        };
-      } else {
-        options.https = false;
-      }
-      caddy = new CaddyInstant();
-      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}`)}`);
+    const devServer = __spreadValues(__spreadValues({
+      host: "localhost",
+      port: 8080
+    }, 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) => {
+        process4.on("exit", () => {
+          _close && _close(callback);
         });
-      }).catch((e) => {
-        throw e;
-      });
-    } catch (e) {
-      consola.error(e);
+      };
+    } else {
+      options.https = false;
     }
+    caddy = new CaddyInstant();
+    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}`)}`);
+      });
+    }).catch((e) => {
+      throw e;
+    });
   }
 });
 var unplugin = /* @__PURE__ */ createUnplugin(unpluginFactory);

package/dist/esbuild.cjs

@@ -51,7 +51,6 @@ var import_unplugin2 = require("unplugin");
 
 // src/index.ts
 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);
 
@@ -95,7 +94,7 @@ function isAdmin() {
 }
 
 // src/caddy/index.ts
-var import_node_os = require("os");
+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");
@@ -153,8 +152,16 @@ async function removeHost(ip, host) {
 
 // src/caddy/constants.ts
 var import_node_path2 = require("path");
+var import_node_os = __toESM(require("os"), 1);
 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 import_dotenv_flow = __toESM(require("dotenv-flow"), 1);
+import_dotenv_flow.default.config();
+function resolvePath(path2) {
+  if (path2.startsWith("~"))
+    return (0, import_node_path2.join)(import_node_os.default.homedir() || "", path2.slice(1));
+  return 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 supportList = [
@@ -328,8 +335,12 @@ async function download() {
   if (await testCaddy())
     return caddyPath;
   return new Promise((resolve, reject) => {
+    if (!(0, import_node_fs2.existsSync)(TEMP_DIR)) {
+      (0, import_node_fs2.mkdirSync)(TEMP_DIR, { recursive: true });
+      (0, import_node_fs2.chmodSync)(TEMP_DIR, 511);
+    }
     const file = (0, import_node_fs2.createWriteStream)(caddyPath);
-    let _platform = (0, import_node_os.platform)().toString();
+    let _platform = (0, import_node_os2.platform)().toString();
     _platform === "win32" && (_platform = "windows");
     let _arch = import_node_process4.default.arch.toString();
     _arch === "x64" && (_arch = "amd64");
@@ -342,6 +353,9 @@ async function download() {
     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;
+    const chmodCaddyOnce = once(() => {
+      (0, import_node_fs2.chmodSync)(caddyPath, 511);
+    });
     import_got_cjs.got.stream(dowmloadLink, {
       agent: {
         http: httpAgent,
@@ -349,11 +363,12 @@ async function download() {
       }
     }).on("downloadProgress", (progress) => {
       logProgress(progress.percent);
+      chmodCaddyOnce();
     }).pipe(file).on("finish", () => {
       logProgressOver();
       if (import_node_process4.default.platform === "win32")
         return resolve(caddyPath);
-      (0, import_node_fs2.chmodSync)(caddyPath, 493);
+      (0, import_node_fs2.chmodSync)(caddyPath, 511);
       resolve(caddyPath);
     }).on("error", (err) => {
       reject(err);
@@ -364,7 +379,7 @@ function testCaddy() {
   return new Promise((resolve, reject) => {
     if (!(0, import_node_fs2.existsSync)(caddyPath))
       return resolve(false);
-    (0, import_node_fs2.chmodSync)(caddyPath, 493);
+    (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]);
     child.on("close", () => {
       return resolve(false);
@@ -439,6 +454,16 @@ var CaddyInstant = class {
         const port = Number(source.split(":")[1]);
         if (!Number.isNaN(port) && await tryPort(port))
           await (0, import_kill_port.default)(port, "tcp");
+        const pwd2 = import_node_process4.default.cwd();
+        const viteCacheDir = `${pwd2}/node_modules/.vite`;
+        if ((0, import_node_fs2.existsSync)(viteCacheDir))
+          chmodRecursive(viteCacheDir, 511);
+        const nuxtCacheDir = `${pwd2}/.nuxt`;
+        if ((0, import_node_fs2.existsSync)(nuxtCacheDir))
+          await chmodRecursive(nuxtCacheDir, 511);
+        const webpackCacheDir = `${pwd2}/node_modules/.cache`;
+        if ((0, import_node_fs2.existsSync)(webpackCacheDir))
+          chmodRecursive(webpackCacheDir, 511);
         if (!restore || this.stoped)
           return originalExit(code);
         try {
@@ -480,27 +505,17 @@ var caddy;
 var pwd = import_node_process5.default.cwd();
 var vitePrintUrls = once((options, source, target, base = "/", _printUrls) => {
   _printUrls == null ? void 0 : _printUrls();
-  const viteCacheDir = `${pwd}/node_modules/.vite`;
-  if ((0, import_node_fs3.existsSync)(viteCacheDir))
-    chmodRecursive(viteCacheDir, 511);
-  const nuxtCacheDir = `${pwd}/.nuxt`;
-  if ((0, import_node_fs3.existsSync)(nuxtCacheDir))
-    chmodRecursive(nuxtCacheDir, 511);
-  try {
-    if (caddy)
-      return;
-    caddy = new CaddyInstant();
-    caddy.run(source, target, __spreadValues({
-      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) => {
-      throw e;
-    });
-  } catch (e) {
-    consola.error(e);
-  }
+  if (caddy)
+    return;
+  caddy = new CaddyInstant();
+  caddy.run(source, target, __spreadValues({
+    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) => {
+    throw e;
+  });
 });
 var unpluginFactory = (options) => ({
   name: "unplugin-https-reverse-proxy",
@@ -511,12 +526,12 @@ var unpluginFactory = (options) => ({
     },
     configureServer(server) {
       var _a;
+      if (config.command !== "serve")
+        return;
       if (!isAdmin()) {
         consola.warn("please run as administrator");
         return;
       }
-      if (config.command === "build")
-        return;
       const {
         enable = true,
         target = ""
@@ -540,12 +555,12 @@ var unpluginFactory = (options) => ({
   },
   webpack(compiler) {
     var _a;
+    if (import_node_process5.default.env.NODE_ENV !== "development")
+      return;
     if (!isAdmin()) {
       consola.warn("please run as administrator");
       return;
     }
-    if (import_node_process5.default.env.NODE_ENV !== "development")
-      return;
     const {
       enable = true,
       target = ""
@@ -556,39 +571,32 @@ var unpluginFactory = (options) => ({
       consola.fail("please provide target");
       return;
     }
-    const nuxtCacheDir = `${pwd}/node_modules/.cache`;
-    if ((0, import_node_fs3.existsSync)(nuxtCacheDir))
-      chmodRecursive(nuxtCacheDir, 511);
-    try {
-      const devServer = __spreadValues(__spreadValues({
-        host: "localhost",
-        port: 8080
-      }, 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) => {
-          import_node_process5.default.on("exit", () => {
-            _close && _close(callback);
-          });
-        };
-      } else {
-        options.https = false;
-      }
-      caddy = new CaddyInstant();
-      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}`)}`);
+    const devServer = __spreadValues(__spreadValues({
+      host: "localhost",
+      port: 8080
+    }, 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) => {
+        import_node_process5.default.on("exit", () => {
+          _close && _close(callback);
         });
-      }).catch((e) => {
-        throw e;
-      });
-    } catch (e) {
-      consola.error(e);
+      };
+    } else {
+      options.https = false;
     }
+    caddy = new CaddyInstant();
+    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}`)}`);
+      });
+    }).catch((e) => {
+      throw e;
+    });
   }
 });
 

package/dist/esbuild.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-GAKOA5LE.js";
+} from "./chunk-IUFVJYJ5.js";
 import "./chunk-RUJE3YFB.js";
 
 // src/esbuild.ts