node-opcua-data-model 2.63.1 → 2.64.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-data-model",
-    "version": "2.63.1",
+    "version": "2.64.1",
     "description": "pure nodejs OPCUA SDK - module -data-model",
     "scripts": {
         "build": "tsc -b",
@@ -13,17 +13,17 @@
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "dependencies": {
-        "node-opcua-assert": "2.63.0",
-        "node-opcua-basic-types": "2.63.1",
-        "node-opcua-binary-stream": "2.63.1",
-        "node-opcua-enum": "2.63.1",
-        "node-opcua-factory": "2.63.1",
-        "node-opcua-nodeid": "2.63.1",
-        "node-opcua-status-code": "2.63.1",
-        "node-opcua-utils": "2.63.1"
+        "node-opcua-assert": "2.64.1",
+        "node-opcua-basic-types": "2.64.1",
+        "node-opcua-binary-stream": "2.64.1",
+        "node-opcua-enum": "2.64.1",
+        "node-opcua-factory": "2.64.1",
+        "node-opcua-nodeid": "2.64.1",
+        "node-opcua-status-code": "2.64.1",
+        "node-opcua-utils": "2.64.1"
     },
     "devDependencies": {
-        "node-opcua-packet-analyzer": "2.63.1",
+        "node-opcua-packet-analyzer": "2.64.1",
         "should": "^13.2.3",
         "source-map-support": "^0.5.21"
     },
@@ -42,5 +42,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "d37385314fce703c1cc197104c592df03b2663fb"
+    "gitHead": "b65b8738603cd475d7d99a2b20b0ae9d32b4110c"
 }

package/source/diagnostic_info.ts

@@ -140,6 +140,19 @@ export class DiagnosticInfo extends BaseUAObject {
     public decodeDebug(stream: BinaryStream, options: DecodeDebugOptions): void {
         decodeDebug_DiagnosticInfo(this, stream, options);
     }
+
+    public static filterForResponse(diagnostic: DiagnosticInfo, requestedDiagnostics: number, diagnosticInfoMask: DiagnosticInfo_Mask): DiagnosticInfo {
+        const options: DiagnosticInfoOptions = {
+            symbolicId: (requestedDiagnostics & diagnosticInfoMask.SymbolicId) ? diagnostic.symbolicId: undefined,
+            localizedText: (requestedDiagnostics & diagnosticInfoMask.LocalizedText) ? diagnostic.localizedText: undefined,
+            additionalInfo: (requestedDiagnostics & diagnosticInfoMask.AdditionalInfo) ? diagnostic.additionalInfo: undefined,
+            innerStatusCode: (requestedDiagnostics & diagnosticInfoMask.InnerStatusCode) ? diagnostic.innerStatusCode: undefined,
+            innerDiagnosticInfo: (requestedDiagnostics & diagnosticInfoMask.InnerDiagnostics) ? diagnostic.innerDiagnosticInfo : (
+                diagnostic.innerDiagnosticInfo ? DiagnosticInfo.filterForResponse(diagnostic.innerDiagnosticInfo, requestedDiagnostics, diagnosticInfoMask) : undefined
+            ),
+        }
+        return new DiagnosticInfo(options);
+    }
 }
 
 DiagnosticInfo.prototype.schema = DiagnosticInfo.schema;
@@ -155,6 +168,43 @@ export interface DiagnosticInfoOptions {
     innerDiagnosticInfo?: DiagnosticInfo;
 }
 
+export enum DiagnosticInfo_ServiceLevelMask {
+    None = 0x00,
+    SymbolicId = 0x01,
+    LocalizedText = 0x02,
+    AdditionalInfo = 0x04,
+    InnerStatusCode = 0x08,
+    InnerDiagnostics = 0x10
+}
+
+export enum DiagnosticInfo_OperationLevelMask {
+    SymbolicId = 0x020,
+    LocalizedText = 0x040,
+    AdditionalInfo = 0x080,
+    InnerStatusCode = 0x0100,
+    InnerDiagnostics = 0x0200
+}
+
+type DiagnosticInfo_Mask = typeof DiagnosticInfo_ServiceLevelMask | typeof DiagnosticInfo_OperationLevelMask;
+
+export const RESPONSE_DIAGNOSTICS_MASK_ALL = 0x3FF;
+
+export function filterDiagnosticInfoLevel(returnDiagnostics: number, diagnostic: DiagnosticInfo | null, diagnosticInfoMask: DiagnosticInfo_Mask): DiagnosticInfo | null {
+    if (!diagnostic) {
+        return null;
+    }
+
+    return DiagnosticInfo.filterForResponse(diagnostic, returnDiagnostics, diagnosticInfoMask);
+}
+
+export function filterDiagnosticOperationLevel(returnDiagnostics: number, diagnostic: DiagnosticInfo | null): DiagnosticInfo | null {
+    return filterDiagnosticInfoLevel(returnDiagnostics, diagnostic, DiagnosticInfo_OperationLevelMask);
+}
+
+export function filterDiagnosticServiceLevel(returnDiagnostics: number, diagnostic: DiagnosticInfo | null): DiagnosticInfo | null {
+    return filterDiagnosticInfoLevel(returnDiagnostics, diagnostic, DiagnosticInfo_ServiceLevelMask);
+}
+
 export enum DiagnosticInfo_EncodingByte {
     SymbolicId = 0x01,
     NamespaceURI = 0x02,