node-opcua-server 2.84.0 → 2.86.0

package/source/monitored_item.ts

@@ -108,7 +108,7 @@ function _validate_parameters(monitoringParameters: any) {
 function statusCodeHasChanged(newDataValue: DataValue, oldDataValue: DataValue): boolean {
     assert(newDataValue instanceof DataValue);
     assert(oldDataValue instanceof DataValue);
-    return newDataValue.statusCode !== oldDataValue.statusCode;
+    return newDataValue.statusCode.value !== oldDataValue.statusCode.value;
 }
 
 function valueHasChanged(
@@ -145,7 +145,6 @@ function valueHasChanged(
             //      DataChange if (absolute value of (last cached value - current value) >
             //                                          (deadbandValue/100.0) * ((high-low) of EURange)))
             //
-            // Specifying a deadbandValue outside of this range will be rejected and reported with the
             // StatusCode BadDeadbandFilterInvalid (see Table 27).
             // If the Value of the MonitoredItem is an array, then the deadband calculation logic shall be applied to
             // each element of the array. If an element that requires a DataChange is found, then no further
@@ -180,10 +179,6 @@ function timestampHasChanged(t1: DateTime, t2: DateTime): boolean {
     return (t1 as Date).getTime() !== (t2 as Date).getTime();
 }
 
-function isGoodish(statusCode: StatusCode): boolean {
-    return statusCode.value < 0x10000000;
-}
-
 function apply_dataChange_filter(this: MonitoredItem, newDataValue: DataValue, oldDataValue: DataValue): boolean {
     /* istanbul ignore next */
     if (!this.filter || !(this.filter instanceof DataChangeFilter)) {
@@ -993,7 +988,7 @@ export class MonitoredItem extends EventEmitter {
             return callback(new Error("Invalid "));
         }
         const variable = (this.node as UAVariable);
-        if (!this.oldDataValue || this.oldDataValue.statusCode == StatusCodes.BadDataUnavailable) {
+        if (!this.oldDataValue || this.oldDataValue.statusCode.value == StatusCodes.BadDataUnavailable.value) {
             variable.readValueAsync(sessionContext, (err: Error | null, dataValue?: DataValue) => {
                 callback(err, dataValue);
             });
@@ -1198,7 +1193,7 @@ export class MonitoredItem extends EventEmitter {
 
         assert(dataValue instanceof DataValue);
         // lets verify that, if status code is good then we have a valid Variant in the dataValue
-        assert(!isGoodish(dataValue.statusCode) || dataValue.value instanceof Variant);
+        assert(!dataValue.statusCode.isGoodish() || dataValue.value instanceof Variant);
         // xx assert(isGoodish(dataValue.statusCode) || util.isNullOrUndefined(dataValue.value) );
         // let's check that data Value is really a different object
         // we may end up with corrupted queue if dataValue are recycled and stored as is in notifications

package/source/opcua_server.ts

@@ -40,7 +40,9 @@ import {
     UAView,
     EventTypeLike,
     UAObjectType,
-    PseudoVariantStringPredefined
+    PseudoVariantStringPredefined,
+    innerBrowse,
+    innerBrowseNext
 } from "node-opcua-address-space";
 import { getDefaultCertificateManager, OPCUACertificateManager } from "node-opcua-certificate-manager";
 import { ServerState } from "node-opcua-common";
@@ -132,7 +134,7 @@ import {
     TranslateBrowsePathsToNodeIdsResponse
 } from "node-opcua-service-translate-browse-path";
 import { WriteRequest, WriteResponse } from "node-opcua-service-write";
-import { ErrorCallback, StatusCode, StatusCodes } from "node-opcua-status-code";
+import { CallbackT, ErrorCallback, StatusCode, StatusCodes } from "node-opcua-status-code";
 import {
     ApplicationDescriptionOptions,
     BrowseResult,
@@ -149,7 +151,8 @@ import {
     IssuedIdentityToken,
     BrowseResultOptions,
     ServiceFault,
-    ServerDiagnosticsSummaryDataType
+    ServerDiagnosticsSummaryDataType,
+    BrowseDescriptionOptions
 } from "node-opcua-types";
 import { DataType } from "node-opcua-variant";
 import { VariantArrayType } from "node-opcua-variant";
@@ -1577,16 +1580,17 @@ export class OPCUAServer extends OPCUABaseServer {
                 }
             }
             if (
-                StatusCodes.BadCertificateUntrusted === certificateStatus ||
-                StatusCodes.BadCertificateTimeInvalid === certificateStatus ||
-                StatusCodes.BadCertificateIssuerTimeInvalid === certificateStatus ||
-                StatusCodes.BadCertificateIssuerUseNotAllowed === certificateStatus ||
-                StatusCodes.BadCertificateIssuerRevocationUnknown === certificateStatus ||
-                StatusCodes.BadCertificateRevocationUnknown === certificateStatus ||
-                StatusCodes.BadCertificateRevoked === certificateStatus ||
-                StatusCodes.BadCertificateUseNotAllowed === certificateStatus ||
-                StatusCodes.BadSecurityChecksFailed === certificateStatus ||
-                StatusCodes.Good !== certificateStatus
+                certificateStatus &&
+                (StatusCodes.BadCertificateUntrusted.equals(certificateStatus) ||
+                    StatusCodes.BadCertificateTimeInvalid.equals(certificateStatus) ||
+                    StatusCodes.BadCertificateIssuerTimeInvalid.equals(certificateStatus) ||
+                    StatusCodes.BadCertificateIssuerUseNotAllowed.equals(certificateStatus) ||
+                    StatusCodes.BadCertificateIssuerRevocationUnknown.equals(certificateStatus) ||
+                    StatusCodes.BadCertificateRevocationUnknown.equals(certificateStatus) ||
+                    StatusCodes.BadCertificateRevoked.equals(certificateStatus) ||
+                    StatusCodes.BadCertificateUseNotAllowed.equals(certificateStatus) ||
+                    StatusCodes.BadSecurityChecksFailed.equals(certificateStatus) ||
+                    !StatusCodes.Good.equals(certificateStatus))
             ) {
                 debugLog("isValidX509IdentityToken => certificateStatus = ", certificateStatus?.toString());
 
@@ -2029,7 +2033,7 @@ export class OPCUAServer extends OPCUABaseServer {
         const session = this.getSession(authenticationToken);
 
         function rejectConnection(server: OPCUAServer, statusCode: StatusCode): void {
-            if (statusCode === StatusCodes.BadSessionIdInvalid) {
+            if (statusCode.equals(StatusCodes.BadSessionIdInvalid)) {
                 server.engine.incrementRejectedSessionCount();
             } else {
                 server.engine.incrementRejectedSessionCount();
@@ -2125,7 +2129,7 @@ export class OPCUAServer extends OPCUABaseServer {
             request.userTokenSignature,
             session.endpoint!,
             (err: Error | null, statusCode?: StatusCode) => {
-                if (statusCode !== StatusCodes.Good) {
+                if (!statusCode || statusCode.isNotGood()) {
                     /* istanbul ignore next */
                     if (!(statusCode && statusCode instanceof StatusCode)) {
                         return rejectConnection(this, StatusCodes.BadCertificateInvalid);
@@ -2283,7 +2287,7 @@ export class OPCUAServer extends OPCUABaseServer {
             return sendResponse(response);
         }
 
-        assert(message.session_statusCode === StatusCodes.Good);
+        assert(message.session_statusCode.isGood());
 
         // OPC UA Specification 1.02 part 4 page 26
         // When a  Session  is terminated, all outstanding requests on the  Session  are aborted and
@@ -2532,50 +2536,34 @@ export class OPCUAServer extends OPCUABaseServer {
                 assert(request.nodesToBrowse[0].schema.name === "BrowseDescription");
 
                 const context = session.sessionContext;
-
-                const f = callbackify(this.engine.browseWithAutomaticExpansion).bind(this.engine);
-                (f as any)(request.nodesToBrowse, context, (err?: Error | null, results?: BrowseResult[]) => {
-                    // istanbul ignore next
-                    if (!results) {
-                        throw new Error("internal error : " + err?.message);
-                    }
-
-                    assert(results[0].schema.name === "BrowseResult");
-
-                    // handle continuation point and requestedMaxReferencesPerNode
-                    const maxBrowseContinuationPoints = this.engine.serverCapabilities.maxBrowseContinuationPoints;
-                    results = results.map((result: BrowseResult) => {
-                        assert(!result.continuationPoint);
-
-                        // istanbul ignore next
-                        if (!session.continuationPointManager) {
-                            return new BrowseResult({ statusCode: StatusCodes.BadNoContinuationPoints });
-                        }
-
-                        if (session.continuationPointManager.hasReachedMaximum(maxBrowseContinuationPoints)) {
-                            return new BrowseResult({ statusCode: StatusCodes.BadNoContinuationPoints });
+                const browseAll = (nodesToBrowse: BrowseDescriptionOptions[], callack: CallbackT<BrowseResult[]>) => {
+                    const f = callbackify(this.engine.browseWithAutomaticExpansion).bind(this.engine);
+                    (f as any)(request.nodesToBrowse, context, callack);
+                };
+                // handle continuation point and requestedMaxReferencesPerNode
+                const maxBrowseContinuationPoints = this.engine.serverCapabilities.maxBrowseContinuationPoints;
+
+                innerBrowse(
+                    {
+                        browseAll,
+                        context,
+                        continuationPointManager: session.continuationPointManager,
+                        requestedMaxReferencesPerNode,
+                        maxBrowseContinuationPoints
+                    },
+                    request.nodesToBrowse,
+                    (err, results) => {
+                        if (!results) {
+                            return sendError(StatusCodes.BadInternalError);
                         }
-                        const truncatedResult = session.continuationPointManager.registerReferences(
-                            requestedMaxReferencesPerNode,
-                            result.references || [],
-                            { continuationPoint: null }
-                        );
-                        let { statusCode } = truncatedResult;
-                        const { continuationPoint, values } = truncatedResult;
-                        statusCode = result.statusCode;
-                        return new BrowseResult({
-                            statusCode,
-                            continuationPoint,
-                            references: values
+                        assert(results[0].schema.name === "BrowseResult");
+                        response = new BrowseResponse({
+                            diagnosticInfos: undefined,
+                            results
                         });
-                    });
-
-                    response = new BrowseResponse({
-                        diagnosticInfos: undefined,
-                        results
-                    });
-                    sendResponse(response);
-                });
+                        sendResponse(response);
+                    }
+                );
             }
         );
     }
@@ -2597,28 +2585,23 @@ export class OPCUAServer extends OPCUABaseServer {
                 if (!request.continuationPoints || request.continuationPoints.length === 0) {
                     return sendError(StatusCodes.BadNothingToDo);
                 }
-                const results = request.continuationPoints
-                    .map((continuationPoint: ContinuationPoint, index: number) =>
-                        session.continuationPointManager.getNextReferences(0, {
-                            continuationPoint,
-                            index,
-                            releaseContinuationPoints: request.releaseContinuationPoints
-                        })
-                    )
-                    .map(
-                        (r) =>
-                            <BrowseResultOptions>{
-                                continuationPoint: r.continuationPoint,
-                                references: r.values,
-                                statusCode: r.statusCode
-                            }
-                    );
-
-                const response = new BrowseNextResponse({
-                    diagnosticInfos: undefined,
-                    results
-                });
-                sendResponse(response);
+                innerBrowseNext(
+                    {
+                        continuationPointManager: session.continuationPointManager
+                    },
+                    request.continuationPoints,
+                    request.releaseContinuationPoints,
+                    (err, results) => {
+                        if (err) {
+                            return sendError(StatusCodes.BadInternalError);
+                        }
+                        const response = new BrowseNextResponse({
+                            diagnosticInfos: undefined,
+                            results
+                        });
+                        sendResponse(response);
+                    }
+                );
             }
         );
     }
@@ -3191,7 +3174,7 @@ export class OPCUAServer extends OPCUABaseServer {
                     linksToAdd,
                     linksToRemove
                 );
-                if (statusCode !== StatusCodes.Good) {
+                if (statusCode.isNotGood()) {
                     const response = new ServiceFault({ responseHeader: { serviceResult: statusCode } });
                     sendResponse(response);
                 } else {
@@ -3506,7 +3489,10 @@ export class OPCUAServer extends OPCUABaseServer {
         return g_sendError(channel, message, HistoryUpdateResponse, StatusCodes.BadServiceUnsupported);
     }
 
-    private createEndpoint(port1: number, serverOptions: {defaultSecureTokenLifetime?: number, timeout? : number}): OPCUAServerEndPoint {
+    private createEndpoint(
+        port1: number,
+        serverOptions: { defaultSecureTokenLifetime?: number; timeout?: number }
+    ): OPCUAServerEndPoint {
         // add the tcp/ip endpoint with no security
         const endPoint = new OPCUAServerEndPoint({
             port: port1,

package/source/server_end_point.ts

@@ -10,7 +10,7 @@ import * as async from "async";
 
 import { assert } from "node-opcua-assert";
 import { ICertificateManager, OPCUACertificateManager } from "node-opcua-certificate-manager";
-import { Certificate, convertPEMtoDER, makeSHA1Thumbprint, PrivateKeyPEM, split_der } from "node-opcua-crypto";
+import { Certificate, convertPEMtoDER, makeSHA1Thumbprint, PrivateKey, PrivateKeyPEM, split_der } from "node-opcua-crypto";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { getFullyQualifiedDomainName, resolveFullyQualifiedDomainName } from "node-opcua-hostname";
 import {
@@ -112,7 +112,7 @@ function dumpChannelInfo(channels: ServerSecureChannelLayer[]): void {
 }
 
 const emptyCertificate = Buffer.alloc(0);
-const emptyPrivateKeyPEM = "";
+const emptyPrivateKey = null as any as PrivateKey;
 
 let OPCUAServerEndPointCounter = 0;
 
@@ -129,7 +129,7 @@ export interface OPCUAServerEndPointOptions {
     /**
      * privateKey
      */
-    privateKey: PrivateKeyPEM;
+    privateKey: PrivateKey;
 
     certificateManager: OPCUACertificateManager;
 
@@ -169,7 +169,7 @@ export interface AddStandardEndpointDescriptionsParam {
     allowAnonymous?: boolean;
     disableDiscovery?: boolean;
     securityModes?: MessageSecurityMode[];
- 
+
     restricted?: boolean;
     allowUnsecurePassword?: boolean;
     resourcePath?: string;
@@ -225,7 +225,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
     public _on_openSecureChannelFailure?: (socketData: any, channelData: any) => void;
 
     private _certificateChain: Certificate;
-    private _privateKey: PrivateKeyPEM;
+    private _privateKey: PrivateKey;
     private _channels: { [key: string]: ServerSecureChannelLayer };
     private _server?: Server;
     private _endpoints: EndpointDescription[];
@@ -277,7 +277,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
 
     public dispose(): void {
         this._certificateChain = emptyCertificate;
-        this._privateKey = emptyPrivateKeyPEM;
+        this._privateKey = emptyPrivateKey;
 
         assert(Object.keys(this._channels).length === 0, "OPCUAServerEndPoint channels must have been deleted");
 
@@ -295,7 +295,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
     }
 
     public toString(): string {
-        const privateKey1 = convertPEMtoDER(this.getPrivateKey());
+        const privateKey1 = this.getPrivateKey().export({ format: "der", type: "pkcs1" });
 
         const txt =
             " end point" +
@@ -332,7 +332,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
     /**
      * the private key
      */
-    public getPrivateKey(): PrivateKeyPEM {
+    public getPrivateKey(): PrivateKey {
         return this._privateKey;
     }
 
@@ -439,12 +439,11 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
         options.userTokenTypes = options.userTokenTypes || defaultUserTokenTypes;
 
         options.allowAnonymous = options.allowAnonymous === undefined ? true : options.allowAnonymous;
-        // make sure we do not have anonymous 
+        // make sure we do not have anonymous
         if (!options.allowAnonymous) {
             options.userTokenTypes = options.userTokenTypes.filter((r) => r !== UserTokenType.Anonymous);
         }
 
-
         const defaultHostname = options.hostname || getFullyQualifiedDomainName();
 
         let hostnames: string[] = [defaultHostname];

package/source/server_subscription.ts

@@ -961,7 +961,7 @@ export class Subscription extends EventEmitter {
             );
 
             // TODO if attributeId === AttributeIds.Value : sampling interval required here
-            if (dataValueSamplingInterval.statusCode === StatusCodes.Good) {
+            if (dataValueSamplingInterval.statusCode.isGood()) {
                 // node provides a Minimum sampling interval ...
                 samplingInterval = dataValueSamplingInterval.value.value;
                 assert(samplingInterval >= 0 && samplingInterval <= MonitoredItem.maximumSamplingInterval);
@@ -1056,7 +1056,7 @@ export class Subscription extends EventEmitter {
 
         const createResult = this._createMonitoredItemStep2(timestampsToReturn, monitoredItemCreateRequest, node);
 
-        assert(createResult.statusCode === StatusCodes.Good);
+        assert(createResult.statusCode.isGood());
 
         const monitoredItem = this.getMonitoredItem(createResult.monitoredItemId);
         // istanbul ignore next

package/source/validate_filter.ts

@@ -57,7 +57,7 @@ function __validateDataChangeFilter(filter: DataChangeFilter, itemToMonitor: Rea
         }
 
         // node must also have a valid euRange
-        if (!(node as any).euRange) {
+        if (!node.getChildByName("EURange", 0)) {
             // tslint:disable:no-console
             console.log(" node has no euRange ! Dead band Percent cannot be used on node " + node.nodeId.toString());
             return StatusCodes.BadMonitoredItemFilterUnsupported;