node-opcua-client 2.102.0 → 2.104.0

package/source/private/opcua_client_impl.ts

@@ -9,7 +9,7 @@ import * as crypto from "crypto";
 import { createPublicKey } from "crypto";
 import { callbackify } from "util";
 import * as async from "async";
-import * as chalk from "chalk";
+import chalk from "chalk";
 
 import { assert } from "node-opcua-assert";
 import { createFastUninitializedBuffer } from "node-opcua-buffer-utils";
@@ -19,7 +19,6 @@ import {
     extractPublicKeyFromCertificateSync,
     Nonce,
     PrivateKey,
-    PrivateKeyPEM,
     toPem
 } from "node-opcua-crypto";
 
@@ -1049,7 +1048,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
                     session.serverNonce = response.serverNonce;
                     session.lastResponseReceivedTime = new Date();
                     if (this.keepSessionAlive) {
-                        session.startKeepAliveManager();
+                        session.startKeepAliveManager(this.keepAliveInterval);
                     }
                     session.userIdentityInfo = userIdentityInfo;
                     return callback(null, session);

package/source/reconnection.ts

@@ -4,7 +4,7 @@
 
 // tslint:disable:only-arrow-functions
 import * as async from "async";
-import * as chalk from "chalk";
+import chalk from "chalk";
 import { assert } from "node-opcua-assert";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { TransferSubscriptionsRequest, TransferSubscriptionsResponse } from "node-opcua-service-subscription";

package/source/tools/read_history_server_capabilities.ts

@@ -55,18 +55,24 @@ export function readHistoryServerCapabilities(
         const properties = [
             "AccessHistoryDataCapability",
             "AccessHistoryEventsCapability",
+          
             "DeleteAtTimeCapability",
             "DeleteRawCapability",
             "DeleteEventCapability",
+          
             "InsertAnnotationCapability",
             "InsertDataCapability",
             "InsertEventCapability",
+          
             "ReplaceDataCapability",
             "ReplaceEventCapability",
+          
             "UpdateDataCapability",
             "UpdateEventCapability",
+          
             "MaxReturnDataValues",
             "MaxReturnEventValues",
+          
             "AggregateFunctions/AnnotationCount",
             "AggregateFunctions/Average",
             "AggregateFunctions/Count",

package/source/verify.ts

@@ -86,6 +86,7 @@ export function verifyIsOPCUAValidCertificate(
                     `see https://reference.opcfoundation.org/v104/Core/docs/Part6/6.2.2/\n` +
                     `certificateFile = ${certificateFile}`
             );
+            warningLog(`keyUsage = ${JSON.stringify(keyUsage, null, " ")}`);
         }
     }
     const extKeyUsage = certificateInfo.tbsCertificate.extensions?.extKeyUsage;
@@ -120,21 +121,21 @@ export function verifyIsOPCUAValidCertificate(
 }
 
 export async function performCertificateSanityCheck(
-    this: OPCUASecureObject,
+    secureObject: OPCUASecureObject,
     serverOrClient: "server" | "client",
     certificateManager: OPCUACertificateManager,
     applicationUri: string
 ): Promise<void> {
-    // verify that certificate is matching private key, and inform the developper if not
-    const certificate = this.getCertificate();
-    const privateKey = this.getPrivateKey();
+    // verify that certificate is matching private key, and inform the developer if not
+    const certificate = secureObject.getCertificate();
+    const privateKey = secureObject.getPrivateKey();
     //
     if (!publicKeyAndPrivateKeyMatches(certificate, privateKey)) {
         errorLog("[NODE-OPCUA-E01] Configuration error : the certificate and the private key do not match !");
         errorLog("                  please check the configuration of the OPCUA Server");
-        errorLog("                    privateKey= ", this.privateKeyFile);
+        errorLog("                    privateKey= ", secureObject.privateKeyFile);
         errorLog(" certificateManager.privateKey= ", certificateManager.privateKey);
-        errorLog("               certificateFile= ", this.certificateFile);
+        errorLog("               certificateFile= ", secureObject.certificateFile);
         throw new Error(
             "[NODE-OPCUA-E01] Configuration error : the certificate and the private key do not match ! please fix your configuration"
         );
@@ -154,8 +155,8 @@ export async function performCertificateSanityCheck(
     const status = await certificateManager.verifyCertificateAsync(certificate);
 
     if (status !== "Good") {
-        warningLog("[NODE-OPCUA-W04] Warning: the certificate status is = ", status, " file = ", this.certificateFile);
+        warningLog("[NODE-OPCUA-W04] Warning: the certificate status is = ", status, " file = ", secureObject.certificateFile);
     }
 
-    verifyIsOPCUAValidCertificate(certificate, this.certificateFile, serverOrClient, applicationUri);
+    verifyIsOPCUAValidCertificate(certificate, secureObject.certificateFile, serverOrClient, applicationUri);
 }