unplugin-https-reverse-proxy 1.0.0-beta.9 → 1.0.0

package/src/caddy/utils.ts

@@ -1,4 +1,5 @@
 import { createServer } from 'node:net'
+import { exec } from 'node:child_process'
 import ora from 'ora'
 import { consola } from '../utils'
 
@@ -28,6 +29,23 @@ export function tryPort(port: number) {
   })
 }
 
+/**
+ * npx free-port :port
+ */
+export async function kill(port: number) {
+  return new Promise<void>((resolve, reject) => {
+    exec(`npx @maxbo/free-port ${port} -s`, (err, stdout, stderr) => {
+      if (err) {
+        reject(err)
+      }
+      else {
+        consola.log(stdout)
+        resolve()
+      }
+    })
+  })
+}
+
 function getNumber(number: number) {
   if (number <= 0)
     return '0%'

package/src/host/index.ts

@@ -1,17 +1,13 @@
 import process from 'node:process'
 import { exec } from 'node:child_process'
 import { chmodSync } from 'node:fs'
+import { promisify } from 'node:util'
 
-// @ts-expect-error no type
-import _Hosts from 'hosts-so-easy'
+import hostile from 'hostile'
 import { consola } from '../utils'
 
-const Hosts = _Hosts.default || _Hosts
-
-const hostInstance = new Hosts({
-  debounceTime: 50,
-  hostsFile: getPathOfSystemHostsPath(),
-})
+const _setHost = promisify(hostile.set)
+const _removeHost = promisify(hostile.remove)
 
 function getPathOfSystemHostsPath() {
   return process.platform === 'win32'
@@ -38,20 +34,18 @@ async function syncHost() {
 export async function addHost(ip: string, host: string) {
   if (process.platform !== 'win32')
     chmodSync(getPathOfSystemHostsPath(), 0o777)
-  hostInstance.add('127.0.0.1', 'localhost')
-  hostInstance.add(ip, host)
+  await _setHost('127.0.0.1', 'localhost')
+  await _setHost(ip, host)
   if (ip === 'localhost')
-    hostInstance.add('127.0.0.1', host)
-  await hostInstance.updateFinish()
+    await _setHost('127.0.0.1', host)
   return await syncHost()
 }
 
 export async function removeHost(ip: string, host: string) {
   if (process.platform !== 'win32')
     chmodSync(getPathOfSystemHostsPath(), 0o777)
-  hostInstance.remove(ip, host)
+  await _removeHost(ip, host)
   if (ip === 'localhost')
-    hostInstance.remove('127.0.0.1', host)
-  await hostInstance.updateFinish()
+    await _removeHost('127.0.0.1', host)
   return await syncHost()
 }

package/src/index.ts

@@ -47,17 +47,18 @@ export const unpluginFactory: UnpluginFactory<Options> = options => ({
       if (config.command !== 'serve')
         return
 
-      if (!isAdmin()) {
-        consola.warn('please run as administrator')
-        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
@@ -81,17 +82,19 @@ export const unpluginFactory: UnpluginFactory<Options> = options => ({
     if (process.env.NODE_ENV !== 'development')
       return
 
-    if (!isAdmin()) {
-      consola.warn('please run as administrator')
-      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
@@ -141,17 +144,19 @@ export const unpluginFactory: UnpluginFactory<Options> = options => ({
     if (process.env.NODE_ENV !== 'development')
       return
 
-    if (!isAdmin()) {
-      consola.warn('please run as administrator')
-      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

package/src/nuxt.ts

@@ -18,17 +18,19 @@ export default defineNuxtModule<ModuleOptions>({
     if (process.env.NODE_ENV !== 'development')
       return
 
-    if (!isAdmin()) {
-      consola.warn('please run as administrator')
-      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

package/dist/chunk-RUJE3YFB.js

@@ -1,63 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-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;
-};
-
-// src/utils.ts
-import process from "process";
-import path from "path";
-import { chmod, readdir, stat } from "fs/promises";
-import { execSync } from "child_process";
-import { createConsola } from "consola";
-var consola = createConsola({
-  level: 3
-}).withTag("reverse-proxy");
-async function chmodRecursive(_path, mode) {
-  await chmod(_path, mode);
-  if ((await stat(_path)).isDirectory()) {
-    const children = await readdir(_path);
-    for (const child of children)
-      await chmodRecursive(path.join(_path, child), mode);
-  }
-}
-function once(fn) {
-  let called = false;
-  return (...args) => {
-    if (called)
-      return;
-    called = true;
-    return fn(...args);
-  };
-}
-function isAdmin() {
-  if (process.platform === "win32") {
-    try {
-      execSync("net session", { stdio: "ignore" });
-      return true;
-    } catch (e) {
-      return false;
-    }
-  } else {
-    return process.getuid && process.getuid() === 0;
-  }
-}
-
-export {
-  __spreadValues,
-  consola,
-  chmodRecursive,
-  once,
-  isAdmin
-};

package/scripts/postinstall.ts

@@ -1,19 +0,0 @@
-import { existsSync, unlinkSync } from 'node:fs'
-import process from 'node:process'
-import { consola } from '../src/utils'
-import { download } from '../src/caddy'
-import { caddyPath } from '../src/caddy/constants'
-
-async function run() {
-  try {
-    if (process.env.UHRP_AUTO_INSTALL_CADDY) {
-      existsSync(caddyPath) && unlinkSync(caddyPath)
-      await download()
-    }
-  }
-  catch (e: any) {
-    consola.error(e.code)
-  }
-}
-
-run()