unplugin-https-reverse-proxy 1.0.0-beta.1 → 1.0.0-beta.12

package/dist/index.d.cts

@@ -1,9 +1,8 @@
 import * as _unplugin from 'unplugin';
 import { UnpluginFactory } from 'unplugin';
-import { ViteDevServer } from 'vite';
 import { Options } from './types.cjs';
 
-declare function vitePrintUrls(server: ViteDevServer, options: Options, source: string, target: string, base?: string, _printUrls?: () => void): void;
+declare const vitePrintUrls: (options: Options, source: string, target: string, base?: string | undefined, _printUrls?: (() => void) | undefined) => void;
 declare const unpluginFactory: UnpluginFactory<Options>;
 declare const unplugin: _unplugin.UnpluginInstance<Options, boolean>;
 

package/dist/index.d.ts

@@ -1,9 +1,8 @@
 import * as _unplugin from 'unplugin';
 import { UnpluginFactory } from 'unplugin';
-import { ViteDevServer } from 'vite';
 import { Options } from './types.js';
 
-declare function vitePrintUrls(server: ViteDevServer, options: Options, source: string, target: string, base?: string, _printUrls?: () => void): void;
+declare const vitePrintUrls: (options: Options, source: string, target: string, base?: string | undefined, _printUrls?: (() => void) | undefined) => void;
 declare const unpluginFactory: UnpluginFactory<Options>;
 declare const unplugin: _unplugin.UnpluginInstance<Options, boolean>;
 

package/dist/index.js

@@ -3,8 +3,8 @@ import {
   unplugin,
   unpluginFactory,
   vitePrintUrls
-} from "./chunk-DUCXH7CX.js";
-import "./chunk-NNO3ZUSU.js";
+} from "./chunk-XLSIGDFU.js";
+import "./chunk-RUJE3YFB.js";
 export {
   src_default as default,
   unplugin,

package/dist/nuxt.cjs

@@ -47,24 +47,27 @@ __export(nuxt_exports, {
   default: () => nuxt_default
 });
 module.exports = __toCommonJS(nuxt_exports);
+var import_node_process6 = __toESM(require("process"), 1);
 var import_kit = require("@nuxt/kit");
-
-// src/vite.ts
-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);
+var import_schema = require("@nuxt/schema");
 
 // src/utils.ts
 var import_node_process = __toESM(require("process"), 1);
+var import_node_path = __toESM(require("path"), 1);
+var import_promises = require("fs/promises");
 var import_node_child_process = require("child_process");
 var import_consola = require("consola");
 var consola = (0, import_consola.createConsola)({
   level: 3
 }).withTag("reverse-proxy");
+async function chmodRecursive(_path, mode) {
+  await (0, import_promises.chmod)(_path, mode);
+  if ((await (0, import_promises.stat)(_path)).isDirectory()) {
+    const children = await (0, import_promises.readdir)(_path);
+    for (const child of children)
+      await chmodRecursive(import_node_path.default.join(_path, child), mode);
+  }
+}
 function once(fn) {
   let called = false;
   return (...args) => {
@@ -87,8 +90,13 @@ function isAdmin() {
   }
 }
 
+// src/index.ts
+var import_node_process5 = __toESM(require("process"), 1);
+var import_unplugin = require("unplugin");
+var import_picocolors = __toESM(require("picocolors"), 1);
+
 // 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");
@@ -145,11 +153,21 @@ async function removeHost(ip, host) {
 }
 
 // src/caddy/constants.ts
-var import_node_path = require("path");
+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 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 import_dotenv_flow = __toESM(require("dotenv-flow"), 1);
+import_dotenv_flow.default.config({
+  silent: true
+});
+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 = [
   {
     platform: "dragonfly",
@@ -321,8 +339,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");
@@ -335,6 +357,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,
@@ -342,11 +367,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);
@@ -357,7 +383,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);
@@ -429,6 +455,19 @@ var CaddyInstant = class {
       });
       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 {
@@ -465,76 +504,31 @@ var CaddyInstant = class {
 };
 
 // src/index.ts
-var config;
 var caddy;
-function vitePrintUrls(server, options, source, target, base = "/", _printUrls) {
+var cwd = import_node_process5.default.cwd();
+var vitePrintUrls = once((options, source, target, base = "/", _printUrls) => {
   _printUrls == null ? void 0 : _printUrls();
-  const pwd = import_node_process5.default.cwd();
-  const viteCacheDir = `${pwd}/node_modules/.vite`;
-  if ((0, import_node_fs3.existsSync)(viteCacheDir))
-    (0, import_node_fs3.chmodSync)(viteCacheDir, 511);
-  const nuxtCacheDir = `${pwd}/.nuxt`;
-  if ((0, import_node_fs3.existsSync)(nuxtCacheDir))
-    (0, import_node_fs3.chmodSync)(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);
-  }
-}
-var unpluginFactory = (options) => ({
-  name: "unplugin-https-reverse-proxy",
-  enforce: "pre",
-  vite: {
-    configResolved(_config) {
-      config = _config;
-    },
-    configureServer(server) {
-      var _a;
-      if (!isAdmin()) {
-        consola.warn("please run as administrator");
-        return;
-      }
-      if (config.command === "build")
-        return;
-      const {
-        enable = true,
-        target = ""
-      } = options;
-      if (!enable)
-        return;
-      if (!target) {
-        consola.fail("please provide target");
-        return;
-      }
-      const _printUrls = server.printUrls.bind(server);
-      let source = `localhost:${config.server.port || 5173}`;
-      const url = (_a = server.resolvedUrls) == null ? void 0 : _a.local[0];
-      if (url) {
-        const u = new URL(url);
-        source = u.host;
-      }
-      const base = server.config.base || "/";
-      server.printUrls = () => vitePrintUrls(server, options, source, target, base, _printUrls);
-    }
+  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;
+  });
+});
+
+// src/nuxt.ts
+var nuxt_default = (0, import_kit.defineNuxtModule)({
+  meta: {
+    name: "nuxt-unplugin-https-reverse-proxy",
+    configKey: "unpluginHttpsReverseProxy"
   },
-  webpack(compiler) {
-    var _a;
-    if (!isAdmin()) {
-      consola.warn("please run as administrator");
-      return;
-    }
-    if (import_node_process5.default.env.NODE_ENV !== "development")
+  setup(options, _nuxt) {
+    if (import_node_process6.default.env.NODE_ENV !== "development")
       return;
     const {
       enable = true,
@@ -542,73 +536,20 @@ var unpluginFactory = (options) => ({
     } = options;
     if (!enable)
       return;
+    if (!isAdmin()) {
+      consola.warn("please run as administrator");
+      return;
+    }
     if (!target) {
       consola.fail("please provide target");
       return;
     }
-    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}`)}`);
-        });
-      }).catch((e) => {
-        throw e;
-      });
-    } catch (e) {
-      consola.error(e);
-    }
-  }
-});
-
-// src/vite.ts
-var vite_default = (0, import_unplugin2.createVitePlugin)(unpluginFactory);
-
-// src/webpack.ts
-var import_unplugin3 = require("unplugin");
-var webpack_default = (0, import_unplugin3.createWebpackPlugin)(unpluginFactory);
-
-// src/nuxt.ts
-var import_schema = require("@nuxt/schema");
-var nuxt_default = (0, import_kit.defineNuxtModule)({
-  meta: {
-    name: "nuxt-unplugin-https-reverse-proxy",
-    configKey: "unpluginHttpsReverseProxy"
-  },
-  setup(options, _nuxt) {
-    (0, import_kit.addVitePlugin)(() => vite_default(options));
-    (0, import_kit.addWebpackPlugin)(() => webpack_default(options));
-    let url = "";
     _nuxt.hook("listen", (_, listener) => {
-      url = listener.url;
-    });
-    _nuxt.hook("vite:serverCreated", once((server) => {
+      const url = listener.url;
       const source = new URL(url).host;
-      if (!options.target) {
-        consola.fail("please provide target");
-        return;
-      }
       const base = _nuxt.options.app.baseURL || "/";
-      vitePrintUrls(server, options, source, options.target, base);
-    }));
+      vitePrintUrls(options, source, options.target, base);
+    });
   }
 });
-exports.default = module.exports;
+module.exports = module.exports;exports.default = module.exports;

package/dist/nuxt.js

@@ -1,19 +1,14 @@
-import {
-  vite_default
-} from "./chunk-Y5ZVZOMP.js";
-import {
-  webpack_default
-} from "./chunk-QIKJQBZH.js";
 import {
   vitePrintUrls
-} from "./chunk-DUCXH7CX.js";
+} from "./chunk-XLSIGDFU.js";
 import {
   consola,
-  once
-} from "./chunk-NNO3ZUSU.js";
+  isAdmin
+} from "./chunk-RUJE3YFB.js";
 
 // src/nuxt.ts
-import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
+import process from "process";
+import { defineNuxtModule } from "@nuxt/kit";
 import "@nuxt/schema";
 var nuxt_default = defineNuxtModule({
   meta: {
@@ -21,21 +16,28 @@ var nuxt_default = defineNuxtModule({
     configKey: "unpluginHttpsReverseProxy"
   },
   setup(options, _nuxt) {
-    addVitePlugin(() => vite_default(options));
-    addWebpackPlugin(() => webpack_default(options));
-    let url = "";
+    if (process.env.NODE_ENV !== "development")
+      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;
+    }
     _nuxt.hook("listen", (_, listener) => {
-      url = listener.url;
-    });
-    _nuxt.hook("vite:serverCreated", once((server) => {
+      const url = listener.url;
       const source = new URL(url).host;
-      if (!options.target) {
-        consola.fail("please provide target");
-        return;
-      }
       const base = _nuxt.options.app.baseURL || "/";
-      vitePrintUrls(server, options, source, options.target, base);
-    }));
+      vitePrintUrls(options, source, options.target, base);
+    });
   }
 });
 export {