unplugin-https-reverse-proxy 0.0.9 → 0.0.11

package/README.md

@@ -17,6 +17,7 @@ UHRP_AUTO_INSTALL_CADDY=true npm i unplugin-https-reverse-proxy --save-dev
 ```ts
 interface Options {
   target: string // <- https target hostname
+  showCaddyLog?: boolean // <- default: false
 }
 ```
 
@@ -115,4 +116,10 @@ sudo -E npm run dev # your dev script
 # windows
 # use powershell as administrator
 npm run dev # your dev script
-```
+```
+
+If your broswer shows a not trusted certificate warning, please check the keychain.
+
+![keychain](https://github.com/zcf0508/unplugin-https-reverse-proxy/blob/main/images/Snipaste_2023-11-16_16-59-55.png)
+
+More info, you can check [caddy about CA Root](https://caddyserver.com/docs/automatic-https#ca-root).

package/dist/{chunk-H5P77DDT.js → chunk-5K6D2TTS.js}

@@ -197,7 +197,7 @@ function testCaddy() {
     chmodSync(caddyPath, 493);
     const child = process2.platform === "win32" ? spawn(caddyPath, []) : spawn("sudo", [caddyPath]);
     child.on("close", () => {
-      return resolve(true);
+      return resolve(false);
     });
     child.on("error", (err) => {
       return reject(err);
@@ -275,7 +275,8 @@ var CaddyInstant = class {
     source = source.replace("0.0.0.0", "127.0.0.1").replace("localhost", "127.0.0.1");
     const {
       restore = true,
-      base = "/"
+      base = "/",
+      showCaddyLog = false
     } = options || {};
     if (!this.inited)
       await this.init();
@@ -291,9 +292,13 @@ var CaddyInstant = class {
         return reject(err);
       });
       child.stderr.on("data", (data) => {
-        if (data.toString().includes("Error")) {
-          child.kill();
-          return reject(data.toString());
+        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") {
+            consola.error(line);
+            return reject(line);
+          }
         }
       });
       child.stdout.on("data", (_data) => {
@@ -344,7 +349,8 @@ var unpluginFactory = (options) => ({
         try {
           const caddy2 = new CaddyInstant();
           caddy2.run(source, target, {
-            base
+            base,
+            showCaddyLog: options.showCaddyLog
           }).then((stop) => {
             const colorUrl = (url2) => c.green(url2.replace(/:(\d+)\//, (_, port) => `:${c.bold(port)}/`));
             consola.success(`  ${c.green("\u279C")}  ${c.bold("run caddy reverse proxy success")}: ${colorUrl(`https://${target}${base}`)}`);
@@ -374,7 +380,9 @@ var unpluginFactory = (options) => ({
       if (caddy)
         return;
       caddy = new CaddyInstant();
-      caddy.run(source, target).then((stop) => {
+      caddy.run(source, target, {
+        showCaddyLog: options.showCaddyLog
+      }).then((stop) => {
         const colorUrl = (url) => c.green(url.replace(/:(\d+)\//, (_, port) => `:${c.bold(port)}/`));
         compiler.hooks.done.tap("unplugin-https-reverse-proxy", (stats) => {
           if (stats.hasErrors())

package/dist/{chunk-JN5C2QIT.js → chunk-BFAT7WWW.js}

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-H5P77DDT.js";
+} from "./chunk-5K6D2TTS.js";
 
 // src/webpack.ts
 import { createWebpackPlugin } from "unplugin";

package/dist/{chunk-HSJJYR6E.js → chunk-UGVWTB7L.js}

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-H5P77DDT.js";
+} from "./chunk-5K6D2TTS.js";
 
 // src/vite.ts
 import { createVitePlugin } from "unplugin";

package/dist/esbuild.cjs

@@ -236,7 +236,7 @@ function testCaddy() {
     (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]);
     child.on("close", () => {
-      return resolve(true);
+      return resolve(false);
     });
     child.on("error", (err) => {
       return reject(err);
@@ -314,7 +314,8 @@ var CaddyInstant = class {
     source = source.replace("0.0.0.0", "127.0.0.1").replace("localhost", "127.0.0.1");
     const {
       restore = true,
-      base = "/"
+      base = "/",
+      showCaddyLog = false
     } = options || {};
     if (!this.inited)
       await this.init();
@@ -330,9 +331,13 @@ var CaddyInstant = class {
         return reject(err);
       });
       child.stderr.on("data", (data) => {
-        if (data.toString().includes("Error")) {
-          child.kill();
-          return reject(data.toString());
+        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") {
+            consola.error(line);
+            return reject(line);
+          }
         }
       });
       child.stdout.on("data", (_data) => {
@@ -383,7 +388,8 @@ var unpluginFactory = (options) => ({
         try {
           const caddy2 = new CaddyInstant();
           caddy2.run(source, target, {
-            base
+            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}`)}`);
@@ -413,7 +419,9 @@ var unpluginFactory = (options) => ({
       if (caddy)
         return;
       caddy = new CaddyInstant();
-      caddy.run(source, target).then((stop) => {
+      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())

package/dist/esbuild.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-H5P77DDT.js";
+} from "./chunk-5K6D2TTS.js";
 import "./chunk-3HKPYCSE.js";
 
 // src/esbuild.ts

package/dist/index.cjs

@@ -235,7 +235,7 @@ function testCaddy() {
     (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]);
     child.on("close", () => {
-      return resolve(true);
+      return resolve(false);
     });
     child.on("error", (err) => {
       return reject(err);
@@ -313,7 +313,8 @@ var CaddyInstant = class {
     source = source.replace("0.0.0.0", "127.0.0.1").replace("localhost", "127.0.0.1");
     const {
       restore = true,
-      base = "/"
+      base = "/",
+      showCaddyLog = false
     } = options || {};
     if (!this.inited)
       await this.init();
@@ -329,9 +330,13 @@ var CaddyInstant = class {
         return reject(err);
       });
       child.stderr.on("data", (data) => {
-        if (data.toString().includes("Error")) {
-          child.kill();
-          return reject(data.toString());
+        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") {
+            consola.error(line);
+            return reject(line);
+          }
         }
       });
       child.stdout.on("data", (_data) => {
@@ -382,7 +387,8 @@ var unpluginFactory = (options) => ({
         try {
           const caddy2 = new CaddyInstant();
           caddy2.run(source, target, {
-            base
+            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}`)}`);
@@ -412,7 +418,9 @@ var unpluginFactory = (options) => ({
       if (caddy)
         return;
       caddy = new CaddyInstant();
-      caddy.run(source, target).then((stop) => {
+      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())

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   src_default,
   unplugin,
   unpluginFactory
-} from "./chunk-H5P77DDT.js";
+} from "./chunk-5K6D2TTS.js";
 import "./chunk-3HKPYCSE.js";
 export {
   src_default as default,

package/dist/nuxt.cjs

@@ -239,7 +239,7 @@ function testCaddy() {
     (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]);
     child.on("close", () => {
-      return resolve(true);
+      return resolve(false);
     });
     child.on("error", (err) => {
       return reject(err);
@@ -317,7 +317,8 @@ var CaddyInstant = class {
     source = source.replace("0.0.0.0", "127.0.0.1").replace("localhost", "127.0.0.1");
     const {
       restore = true,
-      base = "/"
+      base = "/",
+      showCaddyLog = false
     } = options || {};
     if (!this.inited)
       await this.init();
@@ -333,9 +334,13 @@ var CaddyInstant = class {
         return reject(err);
       });
       child.stderr.on("data", (data) => {
-        if (data.toString().includes("Error")) {
-          child.kill();
-          return reject(data.toString());
+        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") {
+            consola.error(line);
+            return reject(line);
+          }
         }
       });
       child.stdout.on("data", (_data) => {
@@ -386,7 +391,8 @@ var unpluginFactory = (options) => ({
         try {
           const caddy2 = new CaddyInstant();
           caddy2.run(source, target, {
-            base
+            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}`)}`);
@@ -416,7 +422,9 @@ var unpluginFactory = (options) => ({
       if (caddy)
         return;
       caddy = new CaddyInstant();
-      caddy.run(source, target).then((stop) => {
+      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())

package/dist/nuxt.js

@@ -1,10 +1,10 @@
 import {
   vite_default
-} from "./chunk-HSJJYR6E.js";
+} from "./chunk-UGVWTB7L.js";
 import {
   webpack_default
-} from "./chunk-JN5C2QIT.js";
-import "./chunk-H5P77DDT.js";
+} from "./chunk-BFAT7WWW.js";
+import "./chunk-5K6D2TTS.js";
 import "./chunk-3HKPYCSE.js";
 
 // src/nuxt.ts

package/dist/rollup.cjs

@@ -236,7 +236,7 @@ function testCaddy() {
     (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]);
     child.on("close", () => {
-      return resolve(true);
+      return resolve(false);
     });
     child.on("error", (err) => {
       return reject(err);
@@ -314,7 +314,8 @@ var CaddyInstant = class {
     source = source.replace("0.0.0.0", "127.0.0.1").replace("localhost", "127.0.0.1");
     const {
       restore = true,
-      base = "/"
+      base = "/",
+      showCaddyLog = false
     } = options || {};
     if (!this.inited)
       await this.init();
@@ -330,9 +331,13 @@ var CaddyInstant = class {
         return reject(err);
       });
       child.stderr.on("data", (data) => {
-        if (data.toString().includes("Error")) {
-          child.kill();
-          return reject(data.toString());
+        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") {
+            consola.error(line);
+            return reject(line);
+          }
         }
       });
       child.stdout.on("data", (_data) => {
@@ -383,7 +388,8 @@ var unpluginFactory = (options) => ({
         try {
           const caddy2 = new CaddyInstant();
           caddy2.run(source, target, {
-            base
+            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}`)}`);
@@ -413,7 +419,9 @@ var unpluginFactory = (options) => ({
       if (caddy)
         return;
       caddy = new CaddyInstant();
-      caddy.run(source, target).then((stop) => {
+      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())

package/dist/rollup.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-H5P77DDT.js";
+} from "./chunk-5K6D2TTS.js";
 import "./chunk-3HKPYCSE.js";
 
 // src/rollup.ts

package/dist/types.d.cts

@@ -1,5 +1,6 @@
 interface Options {
     target: string;
+    showCaddyLog?: boolean;
 }
 
 export { Options };

package/dist/types.d.ts

@@ -1,5 +1,6 @@
 interface Options {
     target: string;
+    showCaddyLog?: boolean;
 }
 
 export { Options };

package/dist/vite.cjs

@@ -236,7 +236,7 @@ function testCaddy() {
     (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]);
     child.on("close", () => {
-      return resolve(true);
+      return resolve(false);
     });
     child.on("error", (err) => {
       return reject(err);
@@ -314,7 +314,8 @@ var CaddyInstant = class {
     source = source.replace("0.0.0.0", "127.0.0.1").replace("localhost", "127.0.0.1");
     const {
       restore = true,
-      base = "/"
+      base = "/",
+      showCaddyLog = false
     } = options || {};
     if (!this.inited)
       await this.init();
@@ -330,9 +331,13 @@ var CaddyInstant = class {
         return reject(err);
       });
       child.stderr.on("data", (data) => {
-        if (data.toString().includes("Error")) {
-          child.kill();
-          return reject(data.toString());
+        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") {
+            consola.error(line);
+            return reject(line);
+          }
         }
       });
       child.stdout.on("data", (_data) => {
@@ -383,7 +388,8 @@ var unpluginFactory = (options) => ({
         try {
           const caddy2 = new CaddyInstant();
           caddy2.run(source, target, {
-            base
+            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}`)}`);
@@ -413,7 +419,9 @@ var unpluginFactory = (options) => ({
       if (caddy)
         return;
       caddy = new CaddyInstant();
-      caddy.run(source, target).then((stop) => {
+      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())

package/dist/vite.js

@@ -1,7 +1,7 @@
 import {
   vite_default
-} from "./chunk-HSJJYR6E.js";
-import "./chunk-H5P77DDT.js";
+} from "./chunk-UGVWTB7L.js";
+import "./chunk-5K6D2TTS.js";
 import "./chunk-3HKPYCSE.js";
 export {
   vite_default as default

package/dist/webpack.cjs

@@ -236,7 +236,7 @@ function testCaddy() {
     (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]);
     child.on("close", () => {
-      return resolve(true);
+      return resolve(false);
     });
     child.on("error", (err) => {
       return reject(err);
@@ -314,7 +314,8 @@ var CaddyInstant = class {
     source = source.replace("0.0.0.0", "127.0.0.1").replace("localhost", "127.0.0.1");
     const {
       restore = true,
-      base = "/"
+      base = "/",
+      showCaddyLog = false
     } = options || {};
     if (!this.inited)
       await this.init();
@@ -330,9 +331,13 @@ var CaddyInstant = class {
         return reject(err);
       });
       child.stderr.on("data", (data) => {
-        if (data.toString().includes("Error")) {
-          child.kill();
-          return reject(data.toString());
+        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") {
+            consola.error(line);
+            return reject(line);
+          }
         }
       });
       child.stdout.on("data", (_data) => {
@@ -383,7 +388,8 @@ var unpluginFactory = (options) => ({
         try {
           const caddy2 = new CaddyInstant();
           caddy2.run(source, target, {
-            base
+            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}`)}`);
@@ -413,7 +419,9 @@ var unpluginFactory = (options) => ({
       if (caddy)
         return;
       caddy = new CaddyInstant();
-      caddy.run(source, target).then((stop) => {
+      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())

package/dist/webpack.js

@@ -1,7 +1,7 @@
 import {
   webpack_default
-} from "./chunk-JN5C2QIT.js";
-import "./chunk-H5P77DDT.js";
+} from "./chunk-BFAT7WWW.js";
+import "./chunk-5K6D2TTS.js";
 import "./chunk-3HKPYCSE.js";
 export {
   webpack_default as default

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unplugin-https-reverse-proxy",
   "type": "module",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "packageManager": "pnpm@8.6.12",
   "description": "",
   "license": "MIT",

package/src/caddy/index.ts

@@ -67,7 +67,7 @@ function testCaddy() {
     chmodSync(caddyPath, 0o755)
     const child = process.platform === 'win32' ? spawn(caddyPath, []) : spawn('sudo', [caddyPath])
     child.on('close', () => {
-      return resolve(true)
+      return resolve(false)
     })
     child.on('error', (err) => {
       return reject(err)
@@ -81,6 +81,7 @@ function testCaddy() {
 interface RunOptions {
   restore: boolean
   base: string
+  showCaddyLog: boolean
 }
 
 export class CaddyInstant {
@@ -161,6 +162,7 @@ export class CaddyInstant {
     const {
       restore = true,
       base = '/',
+      showCaddyLog = false,
     } = options || {}
 
     if (!this.inited)
@@ -185,9 +187,16 @@ export class CaddyInstant {
       })
 
       child.stderr.on('data', (data) => {
-        if ((data.toString() as string).includes('Error')) {
-          child.kill()
-          return reject(data.toString())
+        const lines = (data.toString() as string).split('\n').map(line => line.trim())
+        for (const line of lines) {
+          // caddy log
+          // eslint-disable-next-line no-console
+          showCaddyLog && line && console.info(line)
+          if (line && JSON.parse(line).level === 'error') {
+            consola.error(line)
+            // child.kill()
+            return reject(line)
+          }
         }
       })
 

package/src/index.ts

@@ -40,6 +40,7 @@ export const unpluginFactory: UnpluginFactory<Options> = options => ({
           const caddy = new CaddyInstant()
           caddy.run(source, target, {
             base,
+            showCaddyLog: options.showCaddyLog,
           }).then((stop) => {
             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(`https://${target}${base}`)}`)
@@ -75,7 +76,9 @@ export const unpluginFactory: UnpluginFactory<Options> = options => ({
 
       caddy = new CaddyInstant()
 
-      caddy.run(source, target).then((stop) => {
+      caddy.run(source, target, {
+        showCaddyLog: options.showCaddyLog,
+      }).then((stop) => {
         const colorUrl = (url: string) => c.green(url.replace(/:(\d+)\//, (_, port) => `:${c.bold(port)}/`))
 
         compiler.hooks.done.tap('unplugin-https-reverse-proxy', (stats) => {

package/src/types.ts

@@ -1,4 +1,5 @@
 export interface Options {
   // define your plugin options here
   target: string
+  showCaddyLog?: boolean
 }