node-opcua-server 2.53.0 → 2.56.1

package/source/sessions_compatible_for_transfer.ts

@@ -1,33 +1,34 @@
-import { ServerSession } from "./server_session";
 import { assert } from "node-opcua-assert";
 import { UserIdentityToken, AnonymousIdentityToken, UserNameIdentityToken, X509IdentityToken } from "node-opcua-types";
+import { ServerSession } from "./server_session";
 
 export function sessionsCompatibleForTransfer(sessionSrc: ServerSession, sessionDest: ServerSession): boolean {
-  assert(sessionDest);
-  assert(sessionSrc);
-  if (!sessionSrc.userIdentityToken && !sessionDest.userIdentityToken) {
-    return true;
-  }
-  if (sessionSrc.userIdentityToken instanceof AnonymousIdentityToken) {
-    if (!(sessionDest.userIdentityToken instanceof AnonymousIdentityToken)) {
-      return false;
+    assert(sessionDest);
+    assert(sessionSrc);
+    if (!sessionSrc.userIdentityToken && !sessionDest.userIdentityToken) {
+        return true;
     }
-    return true;
-  } else if (sessionSrc.userIdentityToken instanceof UserNameIdentityToken) {
-    if (!(sessionDest.userIdentityToken instanceof UserNameIdentityToken)) {
-      return false;
+    if (sessionSrc.userIdentityToken instanceof AnonymousIdentityToken) {
+        if (!(sessionDest.userIdentityToken instanceof AnonymousIdentityToken)) {
+            return false;
+        }
+        return true;
+    } else if (sessionSrc.userIdentityToken instanceof UserNameIdentityToken) {
+        if (!(sessionDest.userIdentityToken instanceof UserNameIdentityToken)) {
+            return false;
+        }
+        return sessionSrc.userIdentityToken.userName === sessionDest.userIdentityToken.userName;
     }
-    return sessionSrc.userIdentityToken.userName === sessionDest.userIdentityToken.userName;
-  }
-  // istanbul ignore else
-  else if (sessionSrc.userIdentityToken instanceof X509IdentityToken) {
-    if (!(sessionDest.userIdentityToken instanceof X509IdentityToken)) {
-      return false;
+    // istanbul ignore else
+    else if (sessionSrc.userIdentityToken instanceof X509IdentityToken) {
+        if (!(sessionDest.userIdentityToken instanceof X509IdentityToken)) {
+            return false;
+        }
+        return (
+            sessionSrc.userIdentityToken.certificateData.toString("hex") ===
+            sessionDest.userIdentityToken.certificateData.toString("hex")
+        );
+    } else {
+        throw new Error("Unsupported Identity token");
     }
-    return (
-      sessionSrc.userIdentityToken.certificateData.toString("hex") === sessionDest.userIdentityToken.certificateData.toString("hex")
-    );
-  } else {
-    throw new Error("Unsupported Identity token");
-  }
 }

package/source/validate_filter.ts

@@ -3,7 +3,7 @@
  */
 import { assert } from "node-opcua-assert";
 
-import {BaseNode, UAVariable} from "node-opcua-address-space";
+import { BaseNode, UAVariable } from "node-opcua-address-space";
 import { AttributeIds } from "node-opcua-data-model";
 import { NodeClass } from "node-opcua-data-model";
 import { ExtensionObject } from "node-opcua-extension-object";
@@ -11,18 +11,12 @@ import { NodeId } from "node-opcua-nodeid";
 import { DataChangeFilter, EventFilter } from "node-opcua-service-filter";
 import { DeadbandType } from "node-opcua-service-subscription";
 import { StatusCode, StatusCodes } from "node-opcua-status-code";
-import {ReadValueIdOptions} from "node-opcua-types";
-import {BaseNode2} from "./monitored_item";
-
-function __validateDataChangeFilter(
-  filter: DataChangeFilter,
-  itemToMonitor: ReadValueIdOptions,
-  node: UAVariable
-): StatusCode {
+import { ReadValueIdOptions } from "node-opcua-types";
 
+function __validateDataChangeFilter(filter: DataChangeFilter, itemToMonitor: ReadValueIdOptions, node: UAVariable): StatusCode {
     assert(itemToMonitor.attributeId === AttributeIds.Value);
 
-    if ((node.nodeClass !== NodeClass.Variable)) {
+    if (node.nodeClass !== NodeClass.Variable) {
         return StatusCodes.BadNodeIdInvalid;
     }
 
@@ -54,27 +48,19 @@ function __validateDataChangeFilter(
     return StatusCodes.Good;
 }
 
-export function validateFilter(
-  filter: ExtensionObject | null,
-  itemToMonitor: ReadValueIdOptions,
-  node: BaseNode
-) {
-
+export function validateFilter(filter: ExtensionObject | null, itemToMonitor: ReadValueIdOptions, node: BaseNode): StatusCode {
     // handle filter information
-    if (filter && filter instanceof EventFilter
-      && itemToMonitor.attributeId !== AttributeIds.EventNotifier) {
+    if (filter && filter instanceof EventFilter && itemToMonitor.attributeId !== AttributeIds.EventNotifier) {
         // invalid filter on Event
         return StatusCodes.BadFilterNotAllowed;
     }
 
-    if (filter && filter instanceof DataChangeFilter
-      && itemToMonitor.attributeId !== AttributeIds.Value) {
+    if (filter && filter instanceof DataChangeFilter && itemToMonitor.attributeId !== AttributeIds.Value) {
         // invalid DataChange filter on non Value Attribute
         return StatusCodes.BadFilterNotAllowed;
     }
 
-    if (filter && itemToMonitor.attributeId !== AttributeIds.EventNotifier
-      && itemToMonitor.attributeId !== AttributeIds.Value) {
+    if (filter && itemToMonitor.attributeId !== AttributeIds.EventNotifier && itemToMonitor.attributeId !== AttributeIds.Value) {
         return StatusCodes.BadFilterNotAllowed;
     }
 

package/test_helpers/create_certificates.js

@@ -1 +1 @@
-require("node-opcua-pki/bin/crypto_create_CA");
+require("node-opcua-pki/bin/crypto_create_CA");