unplugin-https-reverse-proxy 1.0.0-beta.3 → 1.0.0-beta.6

package/dist/webpack.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);
 
@@ -154,7 +153,7 @@ async function removeHost(ip, host) {
 // src/caddy/constants.ts
 var import_node_path2 = require("path");
 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 TEMP_DIR = 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,6 +327,10 @@ 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();
     _platform === "win32" && (_platform = "windows");
@@ -342,6 +345,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 +355,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);
@@ -436,6 +443,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 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 {
@@ -477,27 +497,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",
@@ -508,12 +518,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 = ""
@@ -537,12 +547,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 = ""
@@ -553,39 +563,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/webpack.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-ZAZWZOPZ.js";
+} from "./chunk-NBFRMP2Y.js";
 import "./chunk-RUJE3YFB.js";
 
 // src/webpack.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unplugin-https-reverse-proxy",
   "type": "module",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "packageManager": "pnpm@8.6.12",
   "description": "",
   "license": "MIT",

package/src/caddy/constants.ts

@@ -1,7 +1,7 @@
 import { join } from 'node:path'
 import process from 'node:process'
 
-const TEMP_DIR = process.env.TEMP || process.env.TMPDIR || '/tmp'
+export const TEMP_DIR = process.env.UHRP_CADDY_PATH || process.env.TEMP || process.env.TMPDIR || '/tmp'
 export const caddyPath = join(TEMP_DIR, `caddy${process.platform === 'win32' ? '.exe' : ''}`)
 export const caddyFilePath = join(TEMP_DIR, 'CADDYFILE')
 

package/src/caddy/index.ts

@@ -1,14 +1,14 @@
 import { platform } from 'node:os'
 import process from 'node:process'
-import { chmodSync, createWriteStream, existsSync, unlinkSync } from 'node:fs'
+import { chmodSync, createWriteStream, existsSync, mkdirSync, unlinkSync } from 'node:fs'
 import { spawn } from 'node:child_process'
 import { got } from 'got-cjs'
 import { HttpProxyAgent } from 'http-proxy-agent'
 import { HttpsProxyAgent } from 'https-proxy-agent'
 import kill from 'kill-port'
-import { consola } from '../utils'
+import { chmodRecursive, consola, once } from '../utils'
 import { addHost, removeHost } from '../host'
-import { caddyPath, supportList } from './constants'
+import { TEMP_DIR, caddyPath, supportList } from './constants'
 import { logProgress, logProgressOver, tryPort } from './utils'
 
 export async function download() {
@@ -18,6 +18,11 @@ export async function download() {
   return new Promise<string>((resolve, reject) => {
     // https://caddyserver.com/api/download?os=darwin&arch=amd64
 
+    if (!existsSync(TEMP_DIR)) {
+      mkdirSync(TEMP_DIR, { recursive: true })
+      chmodSync(TEMP_DIR, 0o777)
+    }
+
     const file = createWriteStream(caddyPath)
 
     let _platform = platform().toString()
@@ -42,6 +47,11 @@ export async function download() {
     const httpAgent = httpProxy ? new HttpProxyAgent(httpProxy) : undefined
     const httpsAgent = httpsProxy ? new HttpsProxyAgent(httpsProxy) : undefined
 
+    const chmodCaddyOnce = once(() => {
+      // chmod +x
+      chmodSync(caddyPath, 0o777)
+    })
+
     got.stream(dowmloadLink, {
       agent: {
         http: httpAgent,
@@ -49,12 +59,13 @@ export async function download() {
       },
     }).on('downloadProgress', (progress) => {
       logProgress(progress.percent)
+      chmodCaddyOnce()
     }).pipe(file).on('finish', () => {
       logProgressOver()
       if (process.platform === 'win32')
         return resolve(caddyPath)
       // chmod +x
-      chmodSync(caddyPath, 0o755)
+      chmodSync(caddyPath, 0o777)
       resolve(caddyPath)
     }).on('error', (err) => {
       // consola.error(err)
@@ -166,6 +177,22 @@ export class CaddyInstant {
 
       // @ts-expect-error override
       process.exit = async (code?: number) => {
+        const port = Number(source.split(':')[1])
+        if (!Number.isNaN(port) && await tryPort(port))
+          await kill(port, 'tcp')
+
+        // fix `Error: EPERM: operation not permitted`
+        const pwd = process.cwd()
+        const viteCacheDir = `${pwd}/node_modules/.vite`
+        if (existsSync(viteCacheDir))
+          chmodRecursive(viteCacheDir, 0o777)
+        const nuxtCacheDir = `${pwd}/.nuxt`
+        if (existsSync(nuxtCacheDir))
+          await chmodRecursive(nuxtCacheDir, 0o777)
+        const webpackCacheDir = `${pwd}/node_modules/.cache`
+        if (existsSync(webpackCacheDir))
+          chmodRecursive(webpackCacheDir, 0o777)
+
         if (!restore || this.stoped)
           return originalExit(code)
 

package/src/index.ts

@@ -1,10 +1,9 @@
 import process from 'node:process'
-import { existsSync } from 'node:fs'
 import type { UnpluginFactory } from 'unplugin'
 import { createUnplugin } from 'unplugin'
 import type { ResolvedConfig } from 'vite'
 import c from 'picocolors'
-import { chmodRecursive, consola, isAdmin, once } from './utils'
+import { consola, isAdmin, once } from './utils'
 import type { Options } from './types'
 import { CaddyInstant } from './caddy'
 
@@ -23,31 +22,18 @@ export const vitePrintUrls = once((
 ) => {
   _printUrls?.()
 
-  // fix `Error: EPERM: operation not permitted`
-  const viteCacheDir = `${pwd}/node_modules/.vite`
-  if (existsSync(viteCacheDir))
-    chmodRecursive(viteCacheDir, 0o777)
-  const nuxtCacheDir = `${pwd}/.nuxt`
-  if (existsSync(nuxtCacheDir))
-    chmodRecursive(nuxtCacheDir, 0o777)
-
-  try {
-    if (caddy)
-      return
-    caddy = new CaddyInstant()
-    caddy.run(source, target, {
-      base,
-      ...options,
-    }).then(() => {
-      const colorUrl = (url: string) => c.green(url.replace(/:(\d+)\//, (_, port) => `:${c.bold(port)}/`))
-      consola.success(`  ${c.green('➜')}  ${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, {
+    base,
+    ...options,
+  }).then(() => {
+    const colorUrl = (url: string) => c.green(url.replace(/:(\d+)\//, (_, port) => `:${c.bold(port)}/`))
+    consola.success(`  ${c.green('➜')}  ${c.bold('run caddy reverse proxy success')}: ${colorUrl(`${options.https ? 'https' : 'http'}://${target}${base}`)}`)
+  }).catch((e) => {
+    throw e
+  })
 })
 
 export const unpluginFactory: UnpluginFactory<Options> = options => ({
@@ -58,14 +44,14 @@ export const unpluginFactory: UnpluginFactory<Options> = options => ({
       config = _config
     },
     configureServer(server) {
+      if (config.command !== 'serve')
+        return
+
       if (!isAdmin()) {
         consola.warn('please run as administrator')
         return
       }
 
-      if (config.command === 'build')
-        return
-
       const {
         enable = true,
         target = '',
@@ -92,14 +78,14 @@ export const unpluginFactory: UnpluginFactory<Options> = options => ({
     },
   },
   webpack(compiler) {
+    if (process.env.NODE_ENV !== 'development')
+      return
+
     if (!isAdmin()) {
       consola.warn('please run as administrator')
       return
     }
 
-    if (process.env.NODE_ENV !== 'development')
-      return
-
     const {
       enable = true,
       target = '',
@@ -111,54 +97,45 @@ export const unpluginFactory: UnpluginFactory<Options> = options => ({
       return
     }
 
-    const nuxtCacheDir = `${pwd}/node_modules/.cache`
-    if (existsSync(nuxtCacheDir))
-      chmodRecursive(nuxtCacheDir, 0o777)
-
-    try {
-      const devServer = {
-        host: 'localhost',
-        port: 8080,
-        ...compiler.options.devServer,
-        // @ts-expect-error vuecli
-        ...process.VUE_CLI_SERVICE.projectOptions.devServer,
-      }
-      const source = `${devServer.host}:${devServer.port}`
+    const devServer = {
+      host: 'localhost',
+      port: 8080,
+      ...compiler.options.devServer,
+      // @ts-expect-error vuecli
+      ...process.VUE_CLI_SERVICE.projectOptions.devServer,
+    }
+    const source = `${devServer.host}:${devServer.port}`
 
-      if (caddy)
-        return
+    if (caddy)
+      return
 
-      // https://github.com/webpack/webpack-dev-server/blob/master/lib/Server.js#L1913
-      const _close = compiler.close?.bind(compiler)
-      if (_close) {
-        compiler.close = async (callback: Parameters<typeof _close>[0]) => {
-          process.on('exit', () => {
-            _close && _close(callback)
-          })
-        }
-      }
-      else {
-        // webpack 4 not support yet
-        options.https = false
+    // https://github.com/webpack/webpack-dev-server/blob/master/lib/Server.js#L1913
+    const _close = compiler.close?.bind(compiler)
+    if (_close) {
+      compiler.close = async (callback: Parameters<typeof _close>[0]) => {
+        process.on('exit', () => {
+          _close && _close(callback)
+        })
       }
+    }
+    else {
+      // webpack 4 not support yet
+      options.https = false
+    }
 
-      caddy = new CaddyInstant()
+    caddy = new CaddyInstant()
 
-      caddy.run(source, target, {
-        ...options,
-      }).then(() => {
-        const colorUrl = (url: string) => c.green(url.replace(/:(\d+)\//, (_, port) => `:${c.bold(port)}/`))
+    caddy.run(source, target, {
+      ...options,
+    }).then(() => {
+      const colorUrl = (url: string) => c.green(url.replace(/:(\d+)\//, (_, port) => `:${c.bold(port)}/`))
 
-        compiler.hooks.done.tap('unplugin-https-reverse-proxy', () => {
-          consola.success(`  ${c.green('➜')}  ${c.bold('run caddy reverse proxy success')}: ${colorUrl(`${options.https ? 'https' : 'http'}://${target}`)}`)
-        })
-      }).catch((e) => {
-        throw e
+      compiler.hooks.done.tap('unplugin-https-reverse-proxy', () => {
+        consola.success(`  ${c.green('➜')}  ${c.bold('run caddy reverse proxy success')}: ${colorUrl(`${options.https ? 'https' : 'http'}://${target}`)}`)
       })
-    }
-    catch (e) {
-      consola.error(e)
-    }
+    }).catch((e) => {
+      throw e
+    })
   },
 })
 

package/src/nuxt.ts

@@ -15,14 +15,14 @@ export default defineNuxtModule<ModuleOptions>({
     configKey: 'unpluginHttpsReverseProxy',
   },
   setup(options, _nuxt) {
+    if (process.env.NODE_ENV !== 'development')
+      return
+
     if (!isAdmin()) {
       consola.warn('please run as administrator')
       return
     }
 
-    if (process.env.NODE_ENV !== 'development')
-      return
-
     const {
       enable = true,
       target = '',