unplugin-https-reverse-proxy 1.0.0-beta.16 → 1.0.0-beta.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unplugin-https-reverse-proxy",
   "type": "module",
-  "version": "1.0.0-beta.16",
+  "version": "1.0.0-beta.17",
   "description": "",
   "license": "MIT",
   "homepage": "https://github.com/zcf0508/unplugin-https-reverse-proxy#readme",
@@ -119,10 +119,9 @@
     "consola": "^3.2.3",
     "dotenv-flow": "^4.1.0",
     "got-cjs": "^12.5.4",
-    "hosts-so-easy": "^1.2.9",
+    "hostile": "^1.4.0",
     "http-proxy-agent": "^7.0.2",
     "https-proxy-agent": "^7.0.4",
-    "kill-port": "^2.0.1",
     "ora": "5",
     "picocolors": "^1.0.0",
     "tsx": "^4.7.1",
@@ -134,12 +133,14 @@
     "@nuxt/schema": "^3.10.2",
     "@rsbuild/core": "^0.4.3",
     "@rspack/core": "^0.5.4",
+    "@types/hostile": "^1.3.5",
     "@types/kill-port": "^2.0.3",
     "@types/node": "^20.11.19",
     "@types/proper-lockfile": "^4.1.4",
     "@vue/cli": "^5.0.8",
     "bumpp": "^9.3.0",
     "chalk": "^5.3.0",
+    "cross-env": "^7.0.3",
     "eslint": "^8.56.0",
     "fast-glob": "^3.3.2",
     "nodemon": "^3.0.3",
@@ -165,6 +166,6 @@
     "play:vuecli4": "npm -C examples/vuecli4 run serve",
     "release": "bumpp",
     "start": "tsx src/index.ts",
-    "test": "UHRP_CADDY_PATH='./test/.uhrp' vitest"
+    "test": "cross-env UHRP_CADDY_PATH='./test/.uhrp' vitest"
   }
 }

package/scripts/postinstall.cjs

@@ -49,27 +49,21 @@ function once(fn) {
 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");
+var import_node_child_process4 = require("child_process");
 var import_promises2 = require("fs/promises");
 var import_got_cjs = require("got-cjs");
 var import_http_proxy_agent = require("http-proxy-agent");
 var import_https_proxy_agent = require("https-proxy-agent");
-var import_kill_port = __toESM(require("kill-port"), 1);
 var lockfile = __toESM(require("proper-lockfile"), 1);
 
 // src/host/index.ts
 var import_node_process2 = __toESM(require("process"), 1);
 var import_node_child_process2 = require("child_process");
 var import_node_fs = require("fs");
-var import_hosts_so_easy = __toESM(require("hosts-so-easy"), 1);
-var Hosts = import_hosts_so_easy.default.default || import_hosts_so_easy.default;
-var hostInstance = new Hosts({
-  debounceTime: 50,
-  hostsFile: getPathOfSystemHostsPath()
-});
-function getPathOfSystemHostsPath() {
-  return import_node_process2.default.platform === "win32" ? `${import_node_process2.default.env.windir || "C:\\WINDOWS"}\\system32\\drivers\\etc\\hosts` : "/etc/hosts";
-}
+var import_node_util = require("util");
+var import_hostile = __toESM(require("hostile"), 1);
+var _setHost = (0, import_node_util.promisify)(import_hostile.default.set);
+var _removeHost = (0, import_node_util.promisify)(import_hostile.default.remove);
 
 // src/caddy/constants.ts
 var import_node_path2 = require("path");
@@ -201,6 +195,7 @@ var supportList = [
 
 // src/caddy/utils.ts
 var import_node_net = require("net");
+var import_node_child_process3 = require("child_process");
 var import_ora = __toESM(require("ora"), 1);
 var spinner;
 function getNumber(number) {
@@ -286,7 +281,7 @@ function testCaddy() {
     if (!(0, import_node_fs2.existsSync)(caddyPath))
       return resolve(false);
     (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]);
+    const child = import_node_process4.default.platform === "win32" ? (0, import_node_child_process4.spawn)(caddyPath, []) : (0, import_node_child_process4.spawn)("sudo", ["-E", caddyPath]);
     child.on("close", () => {
       return resolve(false);
     });

package/src/caddy/index.ts

@@ -6,12 +6,11 @@ import { readFile, unlink, writeFile } from 'node:fs/promises'
 import { got } from 'got-cjs'
 import { HttpProxyAgent } from 'http-proxy-agent'
 import { HttpsProxyAgent } from 'https-proxy-agent'
-import kill from 'kill-port'
 import * as lockfile from 'proper-lockfile'
 import { chmodRecursive, consola, once } from '../utils'
 import { addHost, removeHost } from '../host'
 import { TEMP_DIR, caddyFilePath, caddyLockFilePath, caddyPath, supportList } from './constants'
-import { logProgress, logProgressOver, tryPort } from './utils'
+import { kill, logProgress, logProgressOver, tryPort } from './utils'
 
 export async function download() {
   if (await testCaddy())
@@ -109,6 +108,8 @@ export class CaddyInstant {
   private locked = false
   private caddyfile: string | undefined
 
+  private caddyChild: ReturnType<typeof spawn> | undefined
+
   constructor() {
     testCaddy().then(async () => {
       await this.getCaddyfile()
@@ -197,9 +198,9 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
 
     if (!this.locked) {
       if (await tryPort(443))
-        await kill(443, 'tcp')
+        await kill(443)
       if ((process.platform === 'win32' || !https) && await tryPort(80))
-        await kill(80, 'tcp')
+        await kill(80)
     }
 
     return new Promise<void>((resolve, reject) => {
@@ -235,7 +236,7 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
         process.exit = async (code?: number) => {
           const port = Number(source.split(':')[1])
           if (!Number.isNaN(port) && await tryPort(port))
-            await kill(port, 'tcp')
+            await kill(port)
 
           // fix `Error: EPERM: operation not permitted`
           const pwd = process.cwd()
@@ -275,17 +276,17 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
       }
 
       if (!this.locked) {
-        const child = process.platform !== 'win32'
+        this.caddyChild = process.platform !== 'win32'
           ? spawn('sudo', ['-E', caddyPath, 'run', '--config', caddyFilePath, '--watch'])
           : spawn(caddyPath, ['run', '--config', caddyFilePath, '--watch'])
 
         lockfile.lockSync(caddyLockFilePath)
 
-        child.on('error', (err) => {
+        this.caddyChild!.on('error', (err) => {
           return reject(err)
         })
 
-        child.stderr.on('data', (data) => {
+        this.caddyChild!.stderr?.on('data', (data) => {
           const lines = (data.toString() as string).split('\n').map(line => line.trim())
           for (const line of lines) {
             // caddy log
@@ -304,7 +305,7 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
           }
         })
 
-        child.stdout.on('data', (_data) => {
+        this.caddyChild!.stdout?.on('data', (_data) => {
           consola.info(_data.toString())
           resolve()
         })
@@ -323,6 +324,7 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
 
   async baseCleanup() {
     if (!this.locked) {
+      this.caddyChild?.kill()
       try {
         await lockfile.unlock(caddyLockFilePath)
         await unlink(caddyFilePath)

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()
 }