node-opcua-pki 4.0.2 → 4.1.0

package/dist/lib/misc/applicationurn.js

@@ -24,7 +24,7 @@ exports.makeApplicationUrn = void 0;
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // ---------------------------------------------------------------------------------------------------------------------
 const assert = require("assert");
-const crypto = require("crypto");
+const crypto_1 = require("crypto");
 function makeApplicationUrn(hostname, suffix) {
     // beware : Openssl doesn't support urn with length greater than 64 !!
     //          sometimes hostname length could be too long ...
@@ -34,10 +34,7 @@ function makeApplicationUrn(hostname, suffix) {
     if (hostnameHash.length + 7 + suffix.length >= 64) {
         // we need to reduce the applicationUrn side => let's take
         // a portion of the hostname hash.
-        hostnameHash = crypto.createHash("md5")
-            .update(hostname)
-            .digest("hex")
-            .substr(0, 16);
+        hostnameHash = (0, crypto_1.createHash)("md5").update(hostname).digest("hex").substr(0, 16);
     }
     const applicationUrn = "urn:" + hostnameHash + ":" + suffix;
     assert(applicationUrn.length <= 64);

package/dist/lib/pki/certificate_manager.js

@@ -481,35 +481,42 @@ class CertificateManager {
         (0, common2_1.mkdir)(path.join(pkiDir, "issuers"));
         (0, common2_1.mkdir)(path.join(pkiDir, "issuers/certs")); // contains Trusted CA certificates
         (0, common2_1.mkdir)(path.join(pkiDir, "issuers/crl")); // contains CRL of revoked CA certificates
-        this.withLock((callback) => {
-            assert(this.state !== CertificateManagerState.Disposing);
-            if (this.state === CertificateManagerState.Disposed) {
-                return callback();
-            }
-            assert(this.state === CertificateManagerState.Initializing);
-            fs.writeFileSync(this.configFile, configurationFileSimpleTemplate);
-            // note : openssl 1.1.1 has a bug that causes a failure if
-            // random file cannot be found. (should be fixed in 1.1.1.a)
-            // if this issue become important we may have to consider checking that rndFile exists and recreate
-            // it if not . this could be achieved with the command :
-            //      "openssl rand -writerand ${this.randomFile}"
-            //
-            // cf: https://github.com/node-opcua/node-opcua/issues/554
-            if (!fs.existsSync(this.privateKey)) {
-                (0, debug_1.debugLog)("generating private key ...");
-                //   setEnv("RANDFILE", this.randomFile);
-                (0, without_openssl_1.createPrivateKey)(this.privateKey, this.keySize, (err) => {
-                    if (err) {
-                        return callback(err);
-                    }
+        if (!fs.existsSync(this.configFile) || !fs.existsSync(this.privateKey)) {
+            this.withLock((callback) => {
+                assert(this.state !== CertificateManagerState.Disposing);
+                if (this.state === CertificateManagerState.Disposed) {
+                    return callback();
+                }
+                assert(this.state === CertificateManagerState.Initializing);
+                if (!fs.existsSync(this.configFile)) {
+                    fs.writeFileSync(this.configFile, configurationFileSimpleTemplate);
+                }
+                // note : openssl 1.1.1 has a bug that causes a failure if
+                // random file cannot be found. (should be fixed in 1.1.1.a)
+                // if this issue become important we may have to consider checking that rndFile exists and recreate
+                // it if not . this could be achieved with the command :
+                //      "openssl rand -writerand ${this.randomFile}"
+                //
+                // cf: https://github.com/node-opcua/node-opcua/issues/554
+                if (!fs.existsSync(this.privateKey)) {
+                    (0, debug_1.debugLog)("generating private key ...");
+                    //   setEnv("RANDFILE", this.randomFile);
+                    (0, without_openssl_1.createPrivateKey)(this.privateKey, this.keySize, (err) => {
+                        if (err) {
+                            return callback(err);
+                        }
+                        this._readCertificates(() => callback());
+                    });
+                }
+                else {
+                    // debugLog("   initialize :  private key already exists ... skipping");
                     this._readCertificates(() => callback());
-                });
-            }
-            else {
-                // debugLog("   initialize :  private key already exists ... skipping");
-                this._readCertificates(() => callback());
-            }
-        }, callback);
+                }
+            }, callback);
+        }
+        else {
+            this._readCertificates(() => callback());
+        }
     }
     dispose() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -545,7 +552,7 @@ class CertificateManager {
     withLock2(action) {
         return __awaiter(this, void 0, void 0, function* () {
             const lockFileName = path.join(this.rootDir, "mutex.lock");
-            return (0, global_mutex_1.withLock)({ lockfile: lockFileName }, () => __awaiter(this, void 0, void 0, function* () {
+            return (0, global_mutex_1.withLock)({ fileToLock: lockFileName }, () => __awaiter(this, void 0, void 0, function* () {
                 return yield action();
             }));
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-opcua-pki",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "description": "PKI management for node-opcua",
   "main": "./dist/lib/index.js",
   "types": "./dist/lib/index.d.ts",
@@ -42,7 +42,7 @@
   "author": "Etienne Rossignon",
   "license": "MIT",
   "dependencies": {
-    "@ster5/global-mutex": "^1.3.0",
+    "@ster5/global-mutex": "^2.0.0",
     "async": "^3.2.4",
     "byline": "^5.0.0",
     "chalk": "4.1.2",