node-opcua-client 2.85.0 → 2.86.1

package/dist/tools/read_history_server_capabilities.js

@@ -9,7 +9,6 @@ const node_opcua_constants_1 = require("node-opcua-constants");
 const node_opcua_data_model_1 = require("node-opcua-data-model");
 const node_opcua_nodeid_1 = require("node-opcua-nodeid");
 const node_opcua_service_translate_browse_path_1 = require("node-opcua-service-translate-browse-path");
-const node_opcua_status_code_1 = require("node-opcua-status-code");
 const node_opcua_utils_1 = require("node-opcua-utils");
 function readHistoryServerCapabilities(session, callback) {
     if (!callback) {
@@ -25,7 +24,7 @@ function readHistoryServerCapabilities(session, callback) {
         if (!result) {
             return callback(new Error("Internal Error"));
         }
-        if (result.statusCode !== node_opcua_status_code_1.StatusCodes.Good) {
+        if (result.statusCode.isNotGood()) {
             return callback(new Error("StatusCode = " + result.statusCode.toString()));
         }
         result.targets = result.targets || [];
@@ -67,7 +66,7 @@ function readHistoryServerCapabilities(session, callback) {
             if (!results) {
                 return callback(new Error("Internal Error"));
             }
-            const nodeIds = results.map((innerResult) => innerResult.statusCode === node_opcua_status_code_1.StatusCodes.Good && innerResult.targets
+            const nodeIds = results.map((innerResult) => innerResult.statusCode.isGood() && innerResult.targets
                 ? innerResult.targets[0].targetId
                 : new node_opcua_nodeid_1.NodeId());
             const nodesToRead = nodeIds.map((nodeId) => ({

package/dist/tools/read_history_server_capabilities.js.map

@@ -1 +1 @@
-{"version":3,"file":"read_history_server_capabilities.js","sourceRoot":"","sources":["../../source/tools/read_history_server_capabilities.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"read_history_server_capabilities.js","sourceRoot":"","sources":["../../source/tools/read_history_server_capabilities.ts"],"names":[],"mappings":"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"}

package/dist/verify.js

@@ -104,7 +104,7 @@ function performCertificateSanityCheck(serverOrClient, certificateManager, appli
     return __awaiter(this, void 0, void 0, function* () {
         // verify that certificate is matching private key, and inform the developper if not
         const certificate = this.getCertificate();
-        const privateKey = (0, node_opcua_crypto_1.convertPEMtoDER)(this.getPrivateKey());
+        const privateKey = this.getPrivateKey();
         //
         if (!(0, node_opcua_crypto_1.publicKeyAndPrivateKeyMatches)(certificate, privateKey)) {
             errorLog("[NODE-OPCUA-E01] Configuration error : the certificate and the private key do not match !");

package/dist/verify.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify.js","sourceRoot":"","sources":["../source/verify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verify.js","sourceRoot":"","sources":["../source/verify.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-client",
-    "version": "2.85.0",
+    "version": "2.86.1",
     "description": "pure nodejs OPCUA SDK - module -client",
     "scripts": {
         "clean": "npx rimraf node_modules dist *.tsbuildinfo certificates",
@@ -20,43 +20,43 @@
         "callbackify": "^1.1.0",
         "chalk": "4.1.2",
         "node-opcua-assert": "2.77.0",
-        "node-opcua-basic-types": "2.85.0",
-        "node-opcua-buffer-utils": "2.85.0",
-        "node-opcua-certificate-manager": "2.85.0",
-        "node-opcua-client-dynamic-extension-object": "2.85.0",
-        "node-opcua-common": "2.85.0",
+        "node-opcua-basic-types": "2.86.1",
+        "node-opcua-buffer-utils": "2.86.0",
+        "node-opcua-certificate-manager": "2.86.1",
+        "node-opcua-client-dynamic-extension-object": "2.86.1",
+        "node-opcua-common": "2.86.1",
         "node-opcua-constants": "2.77.0",
-        "node-opcua-crypto": "^1.12.0",
-        "node-opcua-data-model": "2.85.0",
-        "node-opcua-data-value": "2.85.0",
-        "node-opcua-date-time": "2.85.0",
-        "node-opcua-debug": "2.85.0",
-        "node-opcua-extension-object": "2.85.0",
+        "node-opcua-crypto": "^2.1.2",
+        "node-opcua-data-model": "2.86.1",
+        "node-opcua-data-value": "2.86.1",
+        "node-opcua-date-time": "2.86.0",
+        "node-opcua-debug": "2.86.0",
+        "node-opcua-extension-object": "2.86.1",
         "node-opcua-hostname": "2.77.0",
-        "node-opcua-nodeid": "2.85.0",
-        "node-opcua-object-registry": "2.85.0",
-        "node-opcua-pki": "^2.18.4",
-        "node-opcua-pseudo-session": "2.85.0",
-        "node-opcua-schemas": "2.85.0",
-        "node-opcua-secure-channel": "2.85.0",
-        "node-opcua-service-browse": "2.85.0",
-        "node-opcua-service-call": "2.85.0",
-        "node-opcua-service-discovery": "2.85.0",
-        "node-opcua-service-endpoints": "2.85.0",
-        "node-opcua-service-filter": "2.85.0",
-        "node-opcua-service-history": "2.85.0",
-        "node-opcua-service-query": "2.85.0",
-        "node-opcua-service-read": "2.85.0",
-        "node-opcua-service-register-node": "2.85.0",
-        "node-opcua-service-secure-channel": "2.85.0",
-        "node-opcua-service-session": "2.85.0",
-        "node-opcua-service-subscription": "2.85.0",
-        "node-opcua-service-translate-browse-path": "2.85.0",
-        "node-opcua-service-write": "2.85.0",
-        "node-opcua-status-code": "2.85.0",
-        "node-opcua-types": "2.85.0",
-        "node-opcua-utils": "2.85.0",
-        "node-opcua-variant": "2.85.0",
+        "node-opcua-nodeid": "2.86.0",
+        "node-opcua-object-registry": "2.86.0",
+        "node-opcua-pki": "^3.0.1",
+        "node-opcua-pseudo-session": "2.86.1",
+        "node-opcua-schemas": "2.86.1",
+        "node-opcua-secure-channel": "2.86.1",
+        "node-opcua-service-browse": "2.86.1",
+        "node-opcua-service-call": "2.86.1",
+        "node-opcua-service-discovery": "2.86.1",
+        "node-opcua-service-endpoints": "2.86.1",
+        "node-opcua-service-filter": "2.86.1",
+        "node-opcua-service-history": "2.86.1",
+        "node-opcua-service-query": "2.86.1",
+        "node-opcua-service-read": "2.86.1",
+        "node-opcua-service-register-node": "2.86.1",
+        "node-opcua-service-secure-channel": "2.86.1",
+        "node-opcua-service-session": "2.86.1",
+        "node-opcua-service-subscription": "2.86.1",
+        "node-opcua-service-translate-browse-path": "2.86.1",
+        "node-opcua-service-write": "2.86.1",
+        "node-opcua-status-code": "2.86.1",
+        "node-opcua-types": "2.86.1",
+        "node-opcua-utils": "2.86.0",
+        "node-opcua-variant": "2.86.1",
         "once": "^1.4.0",
         "thenify": "^3.3.1"
     },
@@ -64,10 +64,10 @@
         "@types/underscore": "^1.11.4",
         "dequeue": "^1.0.5",
         "mocha": "^10.1.0",
-        "node-opcua-address-space": "2.85.0",
-        "node-opcua-binary-stream": "2.85.0",
-        "node-opcua-factory": "2.85.0",
-        "node-opcua-leak-detector": "2.85.0",
+        "node-opcua-address-space": "2.86.1",
+        "node-opcua-binary-stream": "2.86.0",
+        "node-opcua-factory": "2.86.1",
+        "node-opcua-leak-detector": "2.86.0",
         "node-opcua-nodesets": "2.77.0",
         "should": "^13.2.3",
         "sinon": "^14.0.2",
@@ -93,5 +93,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "68498fcf7b20ea9f7bd66e8529c546221daf5d52"
+    "gitHead": "389ba18585ff4b62f6fee58b69bd871a8e6b0dff"
 }

package/source/alarms_and_conditions/client_alarm_tools_dump_event.ts

@@ -2,7 +2,6 @@ import * as chalk from "chalk";
 import { AttributeIds } from "node-opcua-data-model";
 import { NodeId } from "node-opcua-nodeid";
 import { IBasicSession } from "node-opcua-pseudo-session";
-import { StatusCodes } from "node-opcua-status-code";
 import { DataType, Variant, VariantLike } from "node-opcua-variant";
 
 /**
@@ -17,7 +16,7 @@ export async function dumpEvent(session: IBasicSession, fields: string[], eventF
             attributeId: AttributeIds.BrowseName,
             nodeId
         });
-        if (dataValue.statusCode === StatusCodes.Good) {
+        if (dataValue.statusCode.isGood()) {
             const browseName = dataValue.value.value.name!;
             return browseName;
         } else {

package/source/alarms_and_conditions/client_tools.ts

@@ -76,7 +76,7 @@ export function callConditionRefresh(subscription: ClientSubscription, callback?
                     result = result!;
 
                     // istanbul ignore next
-                    if (result.statusCode !== StatusCodes.Good) {
+                    if (result.statusCode.isNotGood()) {
                         warningLog(new CallMethodRequest(methodToCall).toString());
                         return innerCallback(new Error("Error " + result.statusCode.toString()));
                     }

package/source/client_monitored_item_toolbox.ts

@@ -129,7 +129,7 @@ export class ClientMonitoredItemToolbox {
             const res = response.results[0];
 
             /* istanbul ignore next */
-            if (response.results.length === 1 && res.statusCode !== StatusCodes.Good) {
+            if (response.results.length === 1 && res.statusCode.isNotGood()) {
                 return callback(new Error("Error" + res.statusCode.toString()));
             }
             callback(null, response.results);

package/source/client_session_keepalive_manager.ts

@@ -158,7 +158,7 @@ export class ClientSessionKeepAliveManager extends EventEmitter implements Clien
                     return;
                 }
 
-                if (dataValue.statusCode === StatusCodes.Good) {
+                if (dataValue.statusCode.isGood()) {
                     const newState = dataValue.value.value as ServerState;
                     // istanbul ignore next
                     if (newState !== this.lastKnownState && this.lastKnownState) {

package/source/client_utils.ts

@@ -83,7 +83,7 @@ export function readUAAnalogItem(session: ClientSession, nodeId: NodeIdLike, ...
         const nodesToRead: ReadValueIdOptions[] = [];
 
         function processProperty(browsePathResult: BrowsePathResult, propertyName: string) {
-            if (browsePathResult.statusCode === StatusCodes.Good) {
+            if (browsePathResult.statusCode.isGood()) {
                 browsePathResult.targets = browsePathResult.targets || [];
                 nodesToRead.push({
                     attributeId: AttributeIds.Value,

package/source/private/client_base_impl.ts

@@ -579,9 +579,10 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
                             "the server certificate has changed,  we need to retrieve server certificate again: ",
                             err.message
                         );
+                        const oldServerCertificate = this.serverCertificate;
                         warningLog(
                             "old server certificate ",
-                            this.serverCertificate ? makeSHA1Thumbprint(this.serverCertificate!).toString("hex") : "undefined"
+                            oldServerCertificate ? makeSHA1Thumbprint(oldServerCertificate!).toString("hex") : "undefined"
                         );
                         // the server may have shut down the channel because its certificate
                         // has changed ....
@@ -590,7 +591,19 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
                             if (err1) {
                                 return _failAndRetry(err1, "Failing to fetch new server certificate", callback);
                             }
-                            warningLog("new server certificate ", makeSHA1Thumbprint(this.serverCertificate!).toString("hex"));
+                            const newServerCertificate = this.serverCertificate!;
+                            warningLog("new server certificate ", makeSHA1Thumbprint(newServerCertificate).toString("hex"));
+
+                            const sha1Old = makeSHA1Thumbprint(oldServerCertificate!);
+                            const sha1New = makeSHA1Thumbprint(newServerCertificate);
+                            if (sha1Old === sha1New) {
+                                warningLog("server certificate has not changed, but was expected to have changed");
+                                return _failAndRetry(
+                                    new Error("Server Certificate not changed"),
+                                    "Failing to fetch new server certificate",
+                                    callback
+                                );
+                            }
                             this._internal_create_secure_channel(infiniteConnectionRetry, (err3?: Error | null) => {
                                 if (err3) {
                                     return _failAndRetry(err3, "trying to create new channel with new certificate", callback);

package/source/private/client_monitored_item_impl.ts

@@ -310,7 +310,7 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
         this.statusCode = monitoredItemResult.statusCode;
 
         /* istanbul ignore else */
-        if (monitoredItemResult.statusCode === StatusCodes.Good) {
+        if (monitoredItemResult.statusCode.isGood()) {
             this.result = monitoredItemResult;
             this.monitoredItemId = monitoredItemResult.monitoredItemId;
             this.monitoringParameters.samplingInterval = monitoredItemResult.revisedSamplingInterval;
@@ -348,7 +348,7 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
     public _after_create(monitoredItemResult: MonitoredItemCreateResult): void {
         this._applyResult(monitoredItemResult);
 
-        if (this.statusCode === StatusCodes.Good) {
+        if (this.statusCode.isGood()) {
             /**
              * Notify the observers that the monitored item is now fully initialized.
              * @event initialized
@@ -366,7 +366,7 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
     }
 
     public _terminate_and_emit(err?: Error): void {
-        if (this.statusCode.value === StatusCodes.Bad.value) {
+        if ((this as any)._terminated) {
             return; // already terminated
         }
         if (err) {
@@ -380,8 +380,7 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
          */
         this.emit("terminated", err);
         this.removeAllListeners();
-        this.statusCode = StatusCodes.Bad;
-
+    
         // also remove from subscription
         const clientHandle = this.monitoringParameters.clientHandle;
         delete this.subscription.monitoredItems[clientHandle];

package/source/private/client_session_impl.ts

@@ -520,7 +520,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
      * ```javascript
      *     session.readVariableValue("ns=2;s=Furnace_1.Temperature",function(err,dataValue) {
      *        if(err) { return callback(err); }
-     *        if (dataValue.statusCode === opcua.StatusCodes.Good) {
+     *        if (dataValue.isGood()) {
      *        }
      *        console.log(dataValue.toString());
      *        callback();
@@ -1091,7 +1091,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
      *
      *  ``` javascript
      *  session.readAllAttributes("ns=2;s=Furnace_1.Temperature",function(err,data) {
-     *    if(data.statusCode === StatusCodes.Good) {
+     *    if(data.statusCode.isGood()) {
      *      console.log(" nodeId      = ",data.nodeId.toString());
      *      console.log(" browseName  = ",data.browseName.toString());
      *      console.log(" description = ",data.description.toString());
@@ -2099,7 +2099,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
                 }
 
                 /* istanbul ignore next */
-                if (dataValue.statusCode !== StatusCodes.Good) {
+                if (dataValue.statusCode.isNotGood()) {
                     return callback(new Error("readNamespaceArray : " + dataValue.statusCode.toString()));
                 }
                 assert(dataValue.value.value instanceof Array);

package/source/private/client_subscription_impl.ts

@@ -428,7 +428,7 @@ export class ClientSubscriptionImpl extends EventEmitter implements ClientSubscr
             if (!statusCode) {
                 return callback(new Error("Internal Error"));
             }
-            if (statusCode !== StatusCodes.Good) {
+            if (statusCode.isNotGood()) {
                 return callback(null, statusCode);
             }
             callback(null, StatusCodes.Good);

package/source/private/opcua_client_impl.ts

@@ -6,6 +6,7 @@
 // tslint:disable:no-empty
 
 import * as crypto from "crypto";
+import { createPublicKey } from "crypto";
 import { callbackify } from "util";
 import * as async from "async";
 import * as chalk from "chalk";
@@ -17,13 +18,14 @@ import {
     exploreCertificate,
     extractPublicKeyFromCertificateSync,
     Nonce,
+    PrivateKey,
     PrivateKeyPEM,
     toPem
 } from "node-opcua-crypto";
 
 import { LocalizedText } from "node-opcua-data-model";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
-import { extractFullyQualifiedDomainName, getHostname, resolveFullyQualifiedDomainName } from "node-opcua-hostname";
+import { extractFullyQualifiedDomainName } from "node-opcua-hostname";
 import { ClientSecureChannelLayer, computeSignature, fromURI, getCryptoFactory, SecurityPolicy } from "node-opcua-secure-channel";
 import { ApplicationDescriptionOptions, ApplicationType, EndpointDescription, UserTokenType } from "node-opcua-service-endpoints";
 import { MessageSecurityMode, UserTokenPolicy } from "node-opcua-service-secure-channel";
@@ -31,8 +33,6 @@ import {
     ActivateSessionRequest,
     ActivateSessionResponse,
     AnonymousIdentityToken,
-    CloseSessionRequest,
-    CloseSessionResponse,
     CreateSessionRequest,
     CreateSessionResponse,
     UserNameIdentityToken,
@@ -41,7 +41,7 @@ import {
 import { CallbackT, StatusCode, StatusCodes } from "node-opcua-status-code";
 import { ErrorCallback, Callback } from "node-opcua-status-code";
 
-import { SignatureData, SignatureDataOptions, UserIdentityToken } from "node-opcua-types";
+import { SignatureDataOptions, UserIdentityToken } from "node-opcua-types";
 import { isNullOrUndefined, matchUri } from "node-opcua-utils";
 
 import { ClientSession } from "../client_session";
@@ -132,7 +132,7 @@ interface X509TokenAndSignature {
 function createX509IdentityToken(
     context: IdentityTokenContext,
     certificate: Certificate,
-    privateKey: PrivateKeyPEM
+    privateKey: PrivateKey
 ): X509TokenAndSignature {
     const endpoint = context.endpoint;
     assert(endpoint instanceof EndpointDescription);
@@ -250,7 +250,7 @@ function createUserNameIdentityToken(
 
     assert(serverCertificate instanceof Buffer);
     serverCertificate = toPem(serverCertificate, "CERTIFICATE");
-    const publicKey = extractPublicKeyFromCertificateSync(serverCertificate);
+    const publicKey = createPublicKey(extractPublicKeyFromCertificateSync(serverCertificate));
 
     const serverNonce: Nonce = session.serverNonce || Buffer.alloc(0);
     assert(serverNonce instanceof Buffer);
@@ -1236,7 +1236,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
 
                 case UserTokenType.Certificate: {
                     const certificate = userIdentityInfo.certificateData;
-                    const privateKey = userIdentityInfo.privateKey;
+                    const privateKey = crypto.createPrivateKey(userIdentityInfo.privateKey);
                     ({ userIdentityToken, userTokenSignature } = createX509IdentityToken(context, certificate, privateKey));
                     break;
                 }

package/source/reconnection.ts

@@ -8,7 +8,7 @@ import * as 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";
-import { CallbackT, StatusCodes } from "node-opcua-status-code";
+import { CallbackT, StatusCode, StatusCodes } from "node-opcua-status-code";
 import { ErrorCallback } from "node-opcua-status-code";
 import { CloseSessionRequest } from "node-opcua-types";
 
@@ -320,7 +320,7 @@ function repair_client_session_by_recreating_a_new_session(
                         // those one need to be recreated and repaired ....
                         for (let i = 0; i < results.length; i++) {
                             const statusCode = results[i].statusCode;
-                            if (statusCode === StatusCodes.BadSubscriptionIdInvalid) {
+                            if (statusCode.equals(StatusCodes.BadSubscriptionIdInvalid)) {
                                 // repair subscription
                                 debugLog(
                                     chalk.red("         WARNING SUBSCRIPTION  "),

package/source/tools/read_history_server_capabilities.ts

@@ -41,7 +41,7 @@ export function readHistoryServerCapabilities(
         if (!result) {
             return callback(new Error("Internal Error"));
         }
-        if (result.statusCode !== StatusCodes.Good) {
+        if (result.statusCode.isNotGood()) {
             return callback(new Error("StatusCode = " + result.statusCode.toString()));
         }
 
@@ -89,7 +89,7 @@ export function readHistoryServerCapabilities(
             }
 
             const nodeIds = results.map((innerResult: BrowsePathResult) =>
-                innerResult.statusCode === StatusCodes.Good && innerResult.targets
+                innerResult.statusCode.isGood() && innerResult.targets
                     ? innerResult.targets[0].targetId
                     : new NodeId()
             );

package/source/verify.ts

@@ -1,3 +1,4 @@
+import { createPrivateKey } from "crypto";
 import { OPCUACertificateManager } from "node-opcua-certificate-manager";
 import { OPCUASecureObject } from "node-opcua-common";
 
@@ -126,7 +127,7 @@ export async function performCertificateSanityCheck(
 ): Promise<void> {
     // verify that certificate is matching private key, and inform the developper if not
     const certificate = this.getCertificate();
-    const privateKey = convertPEMtoDER(this.getPrivateKey());
+    const privateKey = this.getPrivateKey();
     //
     if (!publicKeyAndPrivateKeyMatches(certificate, privateKey)) {
         errorLog("[NODE-OPCUA-E01] Configuration error : the certificate and the private key do not match !");