node-opcua-pki 6.7.1 → 6.7.3

package/dist/bin/pki.mjs

@@ -345,7 +345,7 @@ var init_simple_config_template_cnf = __esm({
 import { EventEmitter } from "events";
 import fs4 from "fs";
 import path2 from "path";
-import { withLock } from "@ster5/global-mutex";
+import { drainPendingLocks, withLock } from "@ster5/global-mutex";
 import chalk3 from "chalk";
 import chokidar from "chokidar";
 import {
@@ -908,6 +908,7 @@ var init_certificate_manager = __esm({
         }
         try {
           this.state = 3 /* Disposing */;
+          await drainPendingLocks();
           for (const unreff of this.#pendingUnrefs) {
             unreff();
           }
@@ -1446,22 +1447,31 @@ var init_certificate_manager = __esm({
           ...usePolling ? { interval: pollingInterval } : {},
           persistent: false
         };
-        const createUnreffedWatcher = (folder) => {
-          const capturedHandles = [];
-          const origWatch = fs4.watch;
-          fs4.watch = ((...args) => {
-            const handle = origWatch.apply(fs4, args);
-            capturedHandles.push(handle);
-            return handle;
+        const allCapturedHandles = [];
+        const origWatch = fs4.watch;
+        let watcherReadyCount = 0;
+        const totalWatchers = 5;
+        fs4.watch = ((...args) => {
+          const handle = origWatch.apply(fs4, args);
+          handle.setMaxListeners(handle.getMaxListeners() + 1);
+          handle.on("error", () => {
           });
+          allCapturedHandles.push(handle);
+          return handle;
+        });
+        const createUnreffedWatcher = (folder) => {
+          const startIdx = allCapturedHandles.length;
           const w = chokidar.watch(folder, chokidarOptions);
           const unreffAll = () => {
-            fs4.watch = origWatch;
-            for (const h of capturedHandles) {
-              h.unref();
+            for (let i = startIdx; i < allCapturedHandles.length; i++) {
+              allCapturedHandles[i].unref();
+            }
+            watcherReadyCount++;
+            if (watcherReadyCount >= totalWatchers) {
+              fs4.watch = origWatch;
             }
           };
-          return { w, capturedHandles, unreffAll };
+          return { w, capturedHandles: allCapturedHandles.slice(startIdx), unreffAll };
         };
         await Promise.all([
           this.#scanCertFolder(this.trustedFolder, this.#thumbs.trusted),
@@ -1523,6 +1533,9 @@ var init_certificate_manager = __esm({
        */
       #startCrlWatcher(folder, index, createUnreffedWatcher, store) {
         const { w, unreffAll } = createUnreffedWatcher(folder);
+        w.on("error", (err) => {
+          debugLog(`chokidar CRL watcher error on ${folder}:`, err);
+        });
         let ready = false;
         w.on("unlink", (filename) => {
           for (const [key, data] of index.entries()) {
@@ -1558,6 +1571,9 @@ var init_certificate_manager = __esm({
        */
       #startWatcher(folder, index, createUnreffedWatcher, store) {
         const { w, unreffAll } = createUnreffedWatcher(folder);
+        w.on("error", (err) => {
+          debugLog(`chokidar cert watcher error on ${folder}:`, err);
+        });
         let ready = false;
         w.on("unlink", (filename) => {
           debugLog(chalk3.cyan(`unlink in folder ${folder}`), filename);