node-opcua-pki 6.7.1 → 6.7.3

package/dist/index.mjs

@@ -1073,7 +1073,7 @@ var CertificateAuthority = class {
 import { EventEmitter } from "events";
 import fs9 from "fs";
 import path6 from "path";
-import { withLock } from "@ster5/global-mutex";
+import { drainPendingLocks, withLock } from "@ster5/global-mutex";
 import chalk6 from "chalk";
 import chokidar from "chokidar";
 import {
@@ -1735,6 +1735,7 @@ var CertificateManager = class _CertificateManager extends EventEmitter {
     }
     try {
       this.state = 3 /* Disposing */;
+      await drainPendingLocks();
       for (const unreff of this.#pendingUnrefs) {
         unreff();
       }
@@ -2273,22 +2274,31 @@ var CertificateManager = class _CertificateManager extends EventEmitter {
       ...usePolling ? { interval: pollingInterval } : {},
       persistent: false
     };
-    const createUnreffedWatcher = (folder) => {
-      const capturedHandles = [];
-      const origWatch = fs9.watch;
-      fs9.watch = ((...args) => {
-        const handle = origWatch.apply(fs9, args);
-        capturedHandles.push(handle);
-        return handle;
+    const allCapturedHandles = [];
+    const origWatch = fs9.watch;
+    let watcherReadyCount = 0;
+    const totalWatchers = 5;
+    fs9.watch = ((...args) => {
+      const handle = origWatch.apply(fs9, 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 = () => {
-        fs9.watch = origWatch;
-        for (const h of capturedHandles) {
-          h.unref();
+        for (let i = startIdx; i < allCapturedHandles.length; i++) {
+          allCapturedHandles[i].unref();
+        }
+        watcherReadyCount++;
+        if (watcherReadyCount >= totalWatchers) {
+          fs9.watch = origWatch;
         }
       };
-      return { w, capturedHandles, unreffAll };
+      return { w, capturedHandles: allCapturedHandles.slice(startIdx), unreffAll };
     };
     await Promise.all([
       this.#scanCertFolder(this.trustedFolder, this.#thumbs.trusted),
@@ -2350,6 +2360,9 @@ var CertificateManager = class _CertificateManager extends EventEmitter {
    */
   #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()) {
@@ -2385,6 +2398,9 @@ var CertificateManager = class _CertificateManager extends EventEmitter {
    */
   #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(chalk6.cyan(`unlink in folder ${folder}`), filename);