node-opcua-server-configuration 2.74.0 → 2.76.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-server-configuration",
-    "version": "2.74.0",
+    "version": "2.76.1",
     "description": "pure nodejs OPCUA SDK - module -server",
     "scripts": {
         "build": "tsc -b",
@@ -11,38 +11,38 @@
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "dependencies": {
+        "chalk": "4.1.2",
         "memfs": "^3.4.7",
-        "node-opcua-address-space": "2.74.0",
-        "node-opcua-address-space-base": "2.74.0",
-        "node-opcua-assert": "2.74.0",
-        "node-opcua-basic-types": "2.74.0",
-        "node-opcua-certificate-manager": "2.74.0",
-        "node-opcua-client": "2.74.0",
-        "node-opcua-common": "2.74.0",
+        "node-opcua-address-space": "2.76.1",
+        "node-opcua-address-space-base": "2.76.0",
+        "node-opcua-assert": "2.76.0",
+        "node-opcua-basic-types": "2.76.0",
+        "node-opcua-binary-stream": "2.76.0",
+        "node-opcua-certificate-manager": "2.76.0",
+        "node-opcua-common": "2.76.0",
         "node-opcua-constants": "2.74.0",
         "node-opcua-crypto": "^1.11.0",
-        "node-opcua-data-model": "2.74.0",
-        "node-opcua-debug": "2.74.0",
-        "node-opcua-file-transfer": "2.74.0",
-        "node-opcua-hostname": "2.74.0",
-        "node-opcua-nodeid": "2.74.0",
-        "node-opcua-nodesets": "2.74.0",
+        "node-opcua-data-model": "2.76.0",
+        "node-opcua-debug": "2.76.0",
+        "node-opcua-file-transfer": "2.76.1",
+        "node-opcua-hostname": "2.76.0",
+        "node-opcua-nodeid": "2.76.0",
         "node-opcua-pki": "^2.17.0",
-        "node-opcua-pseudo-session": "2.74.0",
-        "node-opcua-secure-channel": "2.74.0",
-        "node-opcua-server": "2.74.0",
-        "node-opcua-service-translate-browse-path": "2.74.0",
-        "node-opcua-status-code": "2.74.0",
-        "node-opcua-types": "2.74.0",
-        "node-opcua-variant": "2.74.0",
+        "node-opcua-pseudo-session": "2.76.0",
+        "node-opcua-secure-channel": "2.76.0",
+        "node-opcua-server": "2.76.1",
+        "node-opcua-service-translate-browse-path": "2.76.0",
+        "node-opcua-status-code": "2.76.0",
+        "node-opcua-types": "2.76.0",
+        "node-opcua-variant": "2.76.0",
         "rimraf": "^3.0.2"
     },
     "devDependencies": {
-        "node-opcua-binary-stream": "2.74.0",
-        "node-opcua-data-value": "2.74.0",
-        "node-opcua-leak-detector": "2.74.0",
-        "should": "^13.2.3",
-        "sinon": "^14.0.0"
+        "node-opcua-client": "2.76.1",
+        "node-opcua-data-value": "2.76.0",
+        "node-opcua-leak-detector": "2.76.0",
+        "node-opcua-nodesets": "2.74.0",
+        "should": "^13.2.3"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -59,5 +59,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "003ee041795f3b737afaaef5721045ee31ea9f77"
+    "gitHead": "d87d1dc4ab8f153a442f83552e3264621f0a409b"
 }

package/source/server/push_certificate_manager_helpers.ts

@@ -375,7 +375,9 @@ export async function promoteCertificateGroup(certificateGroup: UACertificateGro
             conditionOf: certificateGroup,
             inputNode: NodeId.nullNodeId,
             normalState: NodeId.nullNodeId,
-            optionals: ["ExpirationLimit"]
+            optionals: ["ExpirationLimit"],
+            conditionName: "CertificateExpired",                                                      
+            conditionClass: resolveNodeId("CertificateExpirationAlarmType"),
         });
     }
     certificateGroup.setEventNotifier(EventNotifierFlags.SubscribeToEvents);
@@ -468,8 +470,6 @@ export async function installPushCertificateManagement(
         serverConfiguration.applyChanges!.bindMethod(_applyChanges);
     }
 
-    //xx installCertificateExpirationAlarm(addressSpace);
-
     const cg = serverConfiguration.certificateGroups.getComponents();
 
     const defaultApplicationGroup = serverConfiguration.certificateGroups.getComponentByName("DefaultApplicationGroup")!;

package/dist/server/install_CertificateAlarm.d.ts

@@ -1,11 +0,0 @@
-/**
- * @module node-opcua-server-configuration-server
- */
-import { AddressSpace, UACertificateExpirationAlarmEx } from "node-opcua-address-space";
-/**
- *
- * @param addressSpace
- * @returns
- * @deprecated
- */
-export declare function installCertificateExpirationAlarm(addressSpace: AddressSpace): UACertificateExpirationAlarmEx;

package/dist/server/install_CertificateAlarm.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.installCertificateExpirationAlarm = void 0;
-/**
- * @module node-opcua-server-configuration-server
- */
-const node_opcua_address_space_1 = require("node-opcua-address-space");
-const node_opcua_debug_1 = require("node-opcua-debug");
-const node_opcua_nodeid_1 = require("node-opcua-nodeid");
-const node_opcua_variant_1 = require("node-opcua-variant");
-const debugLog = (0, node_opcua_debug_1.make_debugLog)("ServerConfiguration");
-const errorLog = (0, node_opcua_debug_1.make_errorLog)("ServerConfiguration");
-const doDebug = (0, node_opcua_debug_1.checkDebugFlag)("ServerConfiguration");
-/**
- *
- * @param addressSpace
- * @returns
- * @deprecated
- */
-function installCertificateExpirationAlarm(addressSpace) {
-    var _a;
-    debugLog("installCertificateExpirationAlarm");
-    /**
-     * note: the ServerCertificateAlarm is not in the OPCUA standard
-     */
-    const server = addressSpace.rootFolder.objects.server;
-    const namespace = addressSpace.getOwnNamespace();
-    const options = {
-        browseName: "ServerCertificateAlarm",
-        conditionSource: undefined,
-        eventSourceOf: server,
-        inputNode: new node_opcua_nodeid_1.NodeId(),
-        normalState: new node_opcua_nodeid_1.NodeId(),
-        optionals: ["ExpirationLimit"]
-    };
-    const certificateExpirationAlarm = (0, node_opcua_address_space_1.instantiateCertificateExpirationAlarm)(namespace, "CertificateExpirationAlarmType", options);
-    certificateExpirationAlarm.currentBranch().setRetain(false);
-    certificateExpirationAlarm.activeState.setValue(false);
-    certificateExpirationAlarm.ackedState.setValue(false);
-    (_a = certificateExpirationAlarm.suppressedState) === null || _a === void 0 ? void 0 : _a.setValue(false);
-    certificateExpirationAlarm.certificate.setValueFromSource({ dataType: node_opcua_variant_1.DataType.ByteString, value: null });
-    certificateExpirationAlarm.eventId.setValueFromSource({ dataType: node_opcua_variant_1.DataType.ByteString, value: null });
-    return certificateExpirationAlarm;
-}
-exports.installCertificateExpirationAlarm = installCertificateExpirationAlarm;
-//# sourceMappingURL=install_CertificateAlarm.js.map

package/dist/server/install_CertificateAlarm.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"install_CertificateAlarm.js","sourceRoot":"","sources":["../../source/server/install_CertificateAlarm.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,uEAMkC;AAGlC,uDAAgF;AAChF,yDAAuD;AACvD,2DAA8C;AAE9C,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,qBAAqB,CAAC,CAAC;AACtD,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAAC,qBAAqB,CAAC,CAAC;AACtD,MAAM,OAAO,GAAG,IAAA,iCAAc,EAAC,qBAAqB,CAAC,CAAC;AAEtD;;;;;GAKG;AACH,SAAgB,iCAAiC,CAAC,YAA0B;;IACxE,QAAQ,CAAC,mCAAmC,CAAC,CAAC;IAC9C;;OAEG;IACH,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC;IACtD,MAAM,SAAS,GAAG,YAAY,CAAC,eAAe,EAAE,CAAC;IAEjD,MAAM,OAAO,GAAqC;QAC9C,UAAU,EAAE,wBAAwB;QACpC,eAAe,EAAE,SAAS;QAC1B,aAAa,EAAE,MAAM;QACrB,SAAS,EAAE,IAAI,0BAAM,EAAE;QACvB,WAAW,EAAE,IAAI,0BAAM,EAAE;QACzB,SAAS,EAAE,CAAC,iBAAiB,CAAC;KACjC,CAAC;IACF,MAAM,0BAA0B,GAAG,IAAA,gEAAqC,EACpE,SAAS,EACT,gCAAgC,EAChC,OAAO,CACV,CAAC;IACF,0BAA0B,CAAC,aAAa,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5D,0BAA0B,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvD,0BAA0B,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,MAAA,0BAA0B,CAAC,eAAe,0CAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5D,0BAA0B,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1G,0BAA0B,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,6BAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAEtG,OAAO,0BAA0B,CAAC;AACtC,CAAC;AA7BD,8EA6BC"}

package/source/server/install_CertificateAlarm.ts

@@ -1,56 +0,0 @@
-/**
- * @module node-opcua-server-configuration-server
- */
-import {
-    AddressSpace,
-    BaseNode,
-    instantiateCertificateExpirationAlarm,
-    UACertificateExpirationAlarmEx,
-    UAObject
-} from "node-opcua-address-space";
-import { InstantiateOffNormalAlarmOptions } from "node-opcua-address-space";
-import { coerceQualifiedName, NodeClass } from "node-opcua-data-model";
-import { checkDebugFlag, make_debugLog, make_errorLog } from "node-opcua-debug";
-import { NodeId, sameNodeId } from "node-opcua-nodeid";
-import { DataType } from "node-opcua-variant";
-
-const debugLog = make_debugLog("ServerConfiguration");
-const errorLog = make_errorLog("ServerConfiguration");
-const doDebug = checkDebugFlag("ServerConfiguration");
-
-/**
- *
- * @param addressSpace
- * @returns
- * @deprecated
- */
-export function installCertificateExpirationAlarm(addressSpace: AddressSpace): UACertificateExpirationAlarmEx {
-    debugLog("installCertificateExpirationAlarm");
-    /**
-     * note: the ServerCertificateAlarm is not in the OPCUA standard
-     */
-    const server = addressSpace.rootFolder.objects.server;
-    const namespace = addressSpace.getOwnNamespace();
-
-    const options: InstantiateOffNormalAlarmOptions = {
-        browseName: "ServerCertificateAlarm",
-        conditionSource: undefined,
-        eventSourceOf: server,
-        inputNode: new NodeId(),
-        normalState: new NodeId(),
-        optionals: ["ExpirationLimit"]
-    };
-    const certificateExpirationAlarm = instantiateCertificateExpirationAlarm(
-        namespace,
-        "CertificateExpirationAlarmType",
-        options
-    );
-    certificateExpirationAlarm.currentBranch().setRetain(false);
-    certificateExpirationAlarm.activeState.setValue(false);
-    certificateExpirationAlarm.ackedState.setValue(false);
-    certificateExpirationAlarm.suppressedState?.setValue(false);
-    certificateExpirationAlarm.certificate.setValueFromSource({ dataType: DataType.ByteString, value: null });
-    certificateExpirationAlarm.eventId.setValueFromSource({ dataType: DataType.ByteString, value: null });
-
-    return certificateExpirationAlarm;
-}