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

package/dist/webpack.js

@@ -1,7 +1,7 @@
 import {
   unpluginFactory
-} from "./chunk-SD5AGUG6.js";
-import "./chunk-UGWFCSQS.js";
+} from "./chunk-QMYDD3HL.js";
+import "./chunk-2VGRJ3QS.js";
 
 // src/webpack.ts
 import { createWebpackPlugin } from "unplugin";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unplugin-https-reverse-proxy",
   "type": "module",
-  "version": "1.0.0-beta.14",
+  "version": "1.0.0-beta.16",
   "description": "",
   "license": "MIT",
   "homepage": "https://github.com/zcf0508/unplugin-https-reverse-proxy#readme",
@@ -84,6 +84,7 @@
     "@rsbuild/core": "^0.4.3",
     "@rspack/core": "^0.5.4",
     "esbuild": "*",
+    "proper-lockfile": "^4.1.2",
     "rollup": "^3",
     "vite": ">=3",
     "webpack": "^4 || ^5"
@@ -148,7 +149,7 @@
     "tsup": "^7.3.0",
     "typescript": "^5.3.3",
     "vite": "^4.5.2",
-    "vitest": "^0.34.6",
+    "vitest": "^2.0.5",
     "webpack": "^5.90.3"
   },
   "scripts": {
@@ -164,6 +165,6 @@
     "play:vuecli4": "npm -C examples/vuecli4 run serve",
     "release": "bumpp",
     "start": "tsx src/index.ts",
-    "test": "vitest"
+    "test": "UHRP_CADDY_PATH='./test/.uhrp' vitest"
   }
 }

package/scripts/postinstall.cjs

@@ -55,6 +55,7 @@ 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);

package/src/caddy/index.ts

@@ -7,6 +7,7 @@ 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'
@@ -108,8 +109,6 @@ export class CaddyInstant {
   private locked = false
   private caddyfile: string | undefined
 
-  private lockfile: typeof import('proper-lockfile')
-
   constructor() {
     testCaddy().then(async () => {
       await this.getCaddyfile()
@@ -117,16 +116,13 @@ export class CaddyInstant {
       this.inited = true
     })
 
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    this.lockfile = require('proper-lockfile')
-
     this.locked = this.checkLock()
   }
 
   checkLock() {
     if (!existsSync(caddyLockFilePath))
       writeFileSync(caddyLockFilePath, '')
-    return this.lockfile.checkSync(caddyLockFilePath)
+    return lockfile.checkSync(caddyLockFilePath)
   }
 
   async getCaddyfile() {
@@ -134,6 +130,7 @@ export class CaddyInstant {
       await this.initCaddyfile()
 
     this.caddyfile = await readFile(caddyFilePath, 'utf-8')
+    return this.caddyfile
   }
 
   async initCaddyfile() {
@@ -199,7 +196,7 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
       writeFileSync(caddyLockFilePath, '')
 
     if (!this.locked) {
-      if (https && await tryPort(443))
+      if (await tryPort(443))
         await kill(443, 'tcp')
       if ((process.platform === 'win32' || !https) && await tryPort(80))
         await kill(80, 'tcp')
@@ -211,16 +208,7 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
           if (!restore || this.stoped)
             return
 
-          if (!this.locked) {
-            try {
-              await this.lockfile.unlock(caddyLockFilePath)
-              await unlink(caddyFilePath)
-              await unlink(caddyLockFilePath)
-            }
-            catch (e) {
-              // consola.error(e)
-            }
-          }
+          await this.baseCleanup()
 
           try {
             if (await removeHost(source.split(':')[0], target.split(':')[0]))
@@ -264,16 +252,7 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
           if (!restore || this.stoped)
             return originalExit(code)
 
-          if (!this.locked) {
-            try {
-              await this.lockfile.unlock(caddyLockFilePath)
-              await unlink(caddyFilePath)
-              await unlink(caddyLockFilePath)
-            }
-            catch (e) {
-              // consola.error(e)
-            }
-          }
+          await this.baseCleanup()
 
           try {
             if (await removeHost(source.split(':')[0], target.split(':')[0]))
@@ -300,7 +279,7 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
           ? spawn('sudo', ['-E', caddyPath, 'run', '--config', caddyFilePath, '--watch'])
           : spawn(caddyPath, ['run', '--config', caddyFilePath, '--watch'])
 
-        this.lockfile.lockSync(caddyLockFilePath)
+        lockfile.lockSync(caddyLockFilePath)
 
         child.on('error', (err) => {
           return reject(err)
@@ -341,4 +320,17 @@ ${target.split(':')[0]}${https ? '' : ':80'} {
       }
     })
   }
+
+  async baseCleanup() {
+    if (!this.locked) {
+      try {
+        await lockfile.unlock(caddyLockFilePath)
+        await unlink(caddyFilePath)
+        await unlink(caddyLockFilePath)
+      }
+      catch (e) {
+        // consola.error(e)
+      }
+    }
+  }
 }