fix: mkcert initialization error

close liuweiGL#62
skymoonya · Feb 20, 2023 · b8e6e96 · b8e6e96
1 parent 80caf35
commit b8e6e96
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/dist/mkcert.js b/dist/mkcert.js
diff --git a/dist/mkcert.js.map b/dist/mkcert.js.map
diff --git a/dist/mkcert.mjs b/dist/mkcert.mjs
@@ -37,7 +37,8 @@ var mkdir = async (dirname) => {
   }
 };
 var ensureDirExist = async (filePath) => {
-  const dirname = path2.dirname(filePath);
+  const ext = path2.extname(filePath);
+  const dirname = ext ? path2.dirname(filePath) : filePath;
   await mkdir(dirname);
 };
 var readFile = async (filePath) => {
@@ -466,13 +467,16 @@ var Mkcert = class {
     } else if (await exists(this.savedMkcert)) {
       binnary = this.savedMkcert;
     }
-    return binnary || escape(binnary);
+    return binnary ? escape(binnary) : void 0;
   }
   async checkCAExists() {
     const files = await readDir(this.savePath);
     return files.some((file) => file.includes("rootCA"));
   }
   async retainExistedCA() {
+    if (await this.checkCAExists()) {
+      return;
+    }
     const mkcertBinnary = await this.getMkcertBinnary();
     const commandStatement = `${mkcertBinnary} -CAROOT`;
     debug(`Exec ${commandStatement}`);
@@ -535,6 +539,7 @@ ${this.certFilePath}`
     record.update({ hosts, hash });
   }
   async init() {
+    await ensureDirExist(this.savePath);
     await this.config.init();
     const mkcertBinnary = await this.getMkcertBinnary();
     if (!mkcertBinnary) {

diff --git a/dist/mkcert.mjs.map b/dist/mkcert.mjs.map
diff --git a/plugin/lib/util.ts b/plugin/lib/util.ts
@@ -31,7 +31,8 @@ export const mkdir = async (dirname: string) => {
 }
 
 export const ensureDirExist = async (filePath: string) => {
-  const dirname = path.dirname(filePath)
+  const ext = path.extname(filePath)
+  const dirname = ext ? path.dirname(filePath) : filePath
   await mkdir(dirname)
 }
 

diff --git a/plugin/mkcert/index.ts b/plugin/mkcert/index.ts
@@ -145,8 +145,7 @@ class Mkcert {
     } else if (await exists(this.savedMkcert)) {
       binnary = this.savedMkcert
     }
-
-    return escape(binnary)
+    return binnary ? escape(binnary) : undefined
   }
 
   private async checkCAExists() {
@@ -238,6 +237,7 @@ class Mkcert {
   }
 
   public async init() {
+    await ensureDirExist(this.savePath)
     await this.config.init()
 
     const mkcertBinnary = await this.getMkcertBinnary()