node-opcua-server 2.112.0 → 2.114.0

package/dist/opcua_server.js

@@ -29,15 +29,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -138,13 +129,11 @@ function moveSessionToChannel(session, channel) {
     session._attach_channel(channel);
     (0, node_opcua_assert_1.assert)(session.channel.channelId === channel.channelId);
 }
-function _attempt_to_close_some_old_unactivated_session(server) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const session = server.engine.getOldestInactiveSession();
-        if (session) {
-            yield server.engine.closeSession(session.authenticationToken, false, "Forcing");
-        }
-    });
+async function _attempt_to_close_some_old_unactivated_session(server) {
+    const session = server.engine.getOldestInactiveSession();
+    if (session) {
+        await server.engine.closeSession(session.authenticationToken, false, "Forcing");
+    }
 }
 function getRequiredEndpointInfo(endpoint) {
     (0, node_opcua_assert_1.assert)(endpoint instanceof node_opcua_types_1.EndpointDescription);
@@ -412,7 +401,6 @@ function _installRegisterServerManager(self) {
     });
 }
 function validate_applicationUri(channel, request) {
-    var _a, _b;
     const applicationUri = request.clientDescription.applicationUri;
     const clientCertificate = request.clientCertificate;
     // if session is insecure there is no need to check certificate information
@@ -423,7 +411,7 @@ function validate_applicationUri(channel, request) {
         return true; // can't check
     }
     const e = (0, node_opcua_crypto_1.exploreCertificate)(clientCertificate);
-    const uniformResourceIdentifier = (_b = (_a = e.tbsCertificate.extensions.subjectAltName) === null || _a === void 0 ? void 0 : _a.uniformResourceIdentifier) !== null && _b !== void 0 ? _b : null;
+    const uniformResourceIdentifier = e.tbsCertificate.extensions.subjectAltName?.uniformResourceIdentifier ?? null;
     const applicationUriFromCert = uniformResourceIdentifier && uniformResourceIdentifier.length > 0 ? uniformResourceIdentifier[0] : null;
     /* istanbul ignore next */
     if (applicationUriFromCert !== applicationUri) {
@@ -434,7 +422,6 @@ function validate_applicationUri(channel, request) {
     return applicationUriFromCert === applicationUri;
 }
 function validate_security_endpoint(server, request, channel) {
-    var _a;
     debugLog("validate_security_endpoint = ", request.endpointUrl);
     let endpoints = server._get_endpoints(request.endpointUrl);
     // endpointUrl String The network address that the Client used to access the Session Endpoint.
@@ -447,7 +434,7 @@ function validate_security_endpoint(server, request, channel) {
     // ToDo: check endpointUrl validity and emit an AuditUrlMismatchEventType event if not
     // sometime endpoints have a extra leading "/" that can be ignored
     // don't be too harsh.
-    if (endpoints.length === 0 && ((_a = request.endpointUrl) === null || _a === void 0 ? void 0 : _a.endsWith("/"))) {
+    if (endpoints.length === 0 && request.endpointUrl?.endsWith("/")) {
         endpoints = server._get_endpoints(request.endpointUrl.slice(0, -1));
     }
     if (endpoints.length === 0) {
@@ -630,7 +617,10 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
          */
         this.maxConnectionsPerEndpoint = options.maxConnectionsPerEndpoint || default_maxConnectionsPerEndpoint;
         // build Info
-        const buildInfo = Object.assign(Object.assign({}, default_build_info), options.buildInfo);
+        const buildInfo = {
+            ...default_build_info,
+            ...options.buildInfo
+        };
         // repair product name
         buildInfo.productUri = buildInfo.productUri || this.serverInfo.productUri;
         this.serverInfo.productUri = this.serverInfo.productUri || buildInfo.productUri;
@@ -654,7 +644,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
         }
         // note: we need to delay initialization of endpoint as certain resources
         // such as %FQDN% might not be ready yet at this stage
-        this._delayInit = () => __awaiter(this, void 0, void 0, function* () {
+        this._delayInit = async () => {
             /* istanbul ignore next */
             if (!options) {
                 throw new Error("Internal Error");
@@ -695,18 +685,18 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 //     });
                 // });
             }
-        });
+        };
     }
     initialize(...args) {
         const done = args[0];
         (0, node_opcua_assert_1.assert)(!this.initialized, "server is already initialized"); // already initialized ?
-        this._preInitTask.push(() => __awaiter(this, void 0, void 0, function* () {
+        this._preInitTask.push(async () => {
             /* istanbul ignore else */
             if (this._delayInit) {
-                yield this._delayInit();
+                await this._delayInit();
                 this._delayInit = undefined;
             }
-        }));
+        });
         this.performPreInitialization()
             .then(() => {
             OPCUAServer.registry.register(this);
@@ -772,15 +762,15 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
         debugLog("OPCUAServer is now un-registering itself from  the discovery server " + this.buildInfo);
         this.registerServerManager.stop((err) => {
             debugLog("OPCUAServer unregistered from discovery server", err);
-            setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                yield this.engine.shutdown();
+            setTimeout(async () => {
+                await this.engine.shutdown();
                 debugLog("OPCUAServer#shutdown: started");
                 base_server_1.OPCUABaseServer.prototype.shutdown.call(this, (err1) => {
                     debugLog("OPCUAServer#shutdown: completed");
                     this.dispose();
                     callback(err1);
                 });
-            }), timeout);
+            }, timeout);
         });
     }
     dispose() {
@@ -977,7 +967,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                     node_opcua_status_code_1.StatusCodes.BadCertificateUseNotAllowed.equals(certificateStatus) ||
                     node_opcua_status_code_1.StatusCodes.BadSecurityChecksFailed.equals(certificateStatus) ||
                     !node_opcua_status_code_1.StatusCodes.Good.equals(certificateStatus))) {
-                debugLog("isValidX509IdentityToken => certificateStatus = ", certificateStatus === null || certificateStatus === void 0 ? void 0 : certificateStatus.toString());
+                debugLog("isValidX509IdentityToken => certificateStatus = ", certificateStatus?.toString());
                 return callback(null, node_opcua_status_code_1.StatusCodes.BadIdentityTokenRejected);
             }
             if (node_opcua_status_code_1.StatusCodes.Good !== certificateStatus) {
@@ -1082,171 +1072,151 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
     }
     // session services
     // eslint-disable-next-line max-statements
-    _on_CreateSessionRequest(message, channel) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const request = message.request;
-            (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_session_1.CreateSessionRequest);
-            function rejectConnection(server, statusCode) {
-                server.engine.incrementSecurityRejectedSessionCount();
-                const response1 = new node_opcua_types_1.ServiceFault({
-                    responseHeader: { serviceResult: statusCode }
-                });
-                channel.send_response("MSG", response1, message);
-                // and close !
-            }
-            // From OPCUA V1.03 Part 4 5.6.2 CreateSession
-            // A Server application should limit the number of Sessions. To protect against misbehaving Clients and denial
-            // of service attacks, the Server shall close the oldest Session that is not activated before reaching the
-            // maximum number of supported Sessions
-            if (this.currentSessionCount >= this.engine.serverCapabilities.maxSessions) {
-                yield _attempt_to_close_some_old_unactivated_session(this);
-            }
-            // check if session count hasn't reach the maximum allowed sessions
-            if (this.currentSessionCount >= this.engine.serverCapabilities.maxSessions) {
-                return rejectConnection(this, node_opcua_status_code_1.StatusCodes.BadTooManySessions);
-            }
-            // Release 1.03 OPC Unified Architecture, Part 4 page 24 - CreateSession Parameters
-            // client should prove a sessionName
-            // Session name is a Human readable string that identifies the Session. The Server makes this name and the
-            // sessionId visible in its AddressSpace for diagnostic purposes. The Client should provide a name that is
-            // unique for the instance of the Client.
-            // If this parameter is not specified the Server shall assign a value.
-            if (utils.isNullOrUndefined(request.sessionName)) {
-                // see also #198
-                // let's the server assign a sessionName for this lazy client.
-                debugLog("assigning OPCUAServer.fallbackSessionName because client's sessionName is null ", OPCUAServer.fallbackSessionName);
-                request.sessionName = OPCUAServer.fallbackSessionName;
-            }
-            // Duration Requested maximum number of milliseconds that a Session should remain open without activity.
-            // If the Client fails to issue a Service request within this interval, then the Server shall automatically
-            // terminate the Client Session.
-            const revisedSessionTimeout = _adjust_session_timeout(request.requestedSessionTimeout);
-            // Release 1.02 page 27 OPC Unified Architecture, Part 4: CreateSession.clientNonce
-            // A random number that should never be used in any other request. This number shall have a minimum length of 32
-            // bytes. Profiles may increase the required length. The Server shall use this value to prove possession of
-            // its application instance Certificate in the response.
-            if (!request.clientNonce || request.clientNonce.length < 32) {
-                if (channel.securityMode !== node_opcua_secure_channel_1.MessageSecurityMode.None) {
-                    errorLog(chalk_1.default.red("SERVER with secure connection: Missing or invalid client Nonce "), request.clientNonce && request.clientNonce.toString("hex"));
-                    return rejectConnection(this, node_opcua_status_code_1.StatusCodes.BadNonceInvalid);
-                }
-            }
-            if ((0, node_opcua_secure_channel_1.nonceAlreadyBeenUsed)(request.clientNonce)) {
-                errorLog(chalk_1.default.red("SERVER with secure connection: None has already been used"), request.clientNonce && request.clientNonce.toString("hex"));
+    async _on_CreateSessionRequest(message, channel) {
+        const request = message.request;
+        (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_session_1.CreateSessionRequest);
+        function rejectConnection(server, statusCode) {
+            server.engine.incrementSecurityRejectedSessionCount();
+            const response1 = new node_opcua_types_1.ServiceFault({
+                responseHeader: { serviceResult: statusCode }
+            });
+            channel.send_response("MSG", response1, message);
+            // and close !
+        }
+        // From OPCUA V1.03 Part 4 5.6.2 CreateSession
+        // A Server application should limit the number of Sessions. To protect against misbehaving Clients and denial
+        // of service attacks, the Server shall close the oldest Session that is not activated before reaching the
+        // maximum number of supported Sessions
+        if (this.currentSessionCount >= this.engine.serverCapabilities.maxSessions) {
+            await _attempt_to_close_some_old_unactivated_session(this);
+        }
+        // check if session count hasn't reach the maximum allowed sessions
+        if (this.currentSessionCount >= this.engine.serverCapabilities.maxSessions) {
+            return rejectConnection(this, node_opcua_status_code_1.StatusCodes.BadTooManySessions);
+        }
+        // Release 1.03 OPC Unified Architecture, Part 4 page 24 - CreateSession Parameters
+        // client should prove a sessionName
+        // Session name is a Human readable string that identifies the Session. The Server makes this name and the
+        // sessionId visible in its AddressSpace for diagnostic purposes. The Client should provide a name that is
+        // unique for the instance of the Client.
+        // If this parameter is not specified the Server shall assign a value.
+        if (utils.isNullOrUndefined(request.sessionName)) {
+            // see also #198
+            // let's the server assign a sessionName for this lazy client.
+            debugLog("assigning OPCUAServer.fallbackSessionName because client's sessionName is null ", OPCUAServer.fallbackSessionName);
+            request.sessionName = OPCUAServer.fallbackSessionName;
+        }
+        // Duration Requested maximum number of milliseconds that a Session should remain open without activity.
+        // If the Client fails to issue a Service request within this interval, then the Server shall automatically
+        // terminate the Client Session.
+        const revisedSessionTimeout = _adjust_session_timeout(request.requestedSessionTimeout);
+        // Release 1.02 page 27 OPC Unified Architecture, Part 4: CreateSession.clientNonce
+        // A random number that should never be used in any other request. This number shall have a minimum length of 32
+        // bytes. Profiles may increase the required length. The Server shall use this value to prove possession of
+        // its application instance Certificate in the response.
+        if (!request.clientNonce || request.clientNonce.length < 32) {
+            if (channel.securityMode !== node_opcua_secure_channel_1.MessageSecurityMode.None) {
+                errorLog(chalk_1.default.red("SERVER with secure connection: Missing or invalid client Nonce "), request.clientNonce && request.clientNonce.toString("hex"));
                 return rejectConnection(this, node_opcua_status_code_1.StatusCodes.BadNonceInvalid);
             }
-            // check application spoofing
-            // check if applicationUri in createSessionRequest matches applicationUri in client Certificate
-            if (!validate_applicationUri(channel, request)) {
-                return rejectConnection(this, node_opcua_status_code_1.StatusCodes.BadCertificateUriInvalid);
-            }
-            const { errCode, endpoint } = validate_security_endpoint(this, request, channel);
-            if (errCode !== node_opcua_status_code_1.StatusCodes.Good) {
-                return rejectConnection(this, errCode);
-            }
-            // see Release 1.02  27  OPC Unified Architecture, Part 4
-            const session = this.createSession({
-                clientDescription: request.clientDescription,
-                sessionTimeout: revisedSessionTimeout,
-                server: this
-            });
-            session.endpoint = endpoint;
-            (0, node_opcua_assert_1.assert)(session);
-            (0, node_opcua_assert_1.assert)(session.sessionTimeout === revisedSessionTimeout);
-            session.clientDescription = request.clientDescription;
-            session.sessionName = request.sessionName || `<unknown session name ${unnamed_session_count++}>`;
-            // Depending upon on the  SecurityPolicy  and the  SecurityMode  of the  SecureChannel,  the exchange of
-            // ApplicationInstanceCertificates   and  Nonces  may be optional and the signatures may be empty. See
-            // Part  7  for the definition of  SecurityPolicies  and the handling of these parameters
-            // serverNonce:
-            // A random number that should never be used in any other request.
-            // This number shall have a minimum length of 32 bytes.
-            // The Client shall use this value to prove possession of its application instance
-            // Certificate in the ActivateSession request.
-            // This value may also be used to prove possession of the userIdentityToken it
-            // specified in the ActivateSession request.
-            //
-            // ( this serverNonce will only be used up to the _on_ActivateSessionRequest
-            //   where a new nonce will be created)
-            session.nonce = this.makeServerNonce();
-            session.channelId = channel.channelId;
-            session._attach_channel(channel);
-            const serverCertificateChain = this.getCertificateChain();
-            const hasEncryption = true;
-            // If the securityPolicyUri is None and none of the UserTokenPolicies requires encryption
-            if (session.channel.securityMode === node_opcua_secure_channel_1.MessageSecurityMode.None) {
-                // ToDo: Check that none of our insecure endpoint has a a UserTokenPolicy that require encryption
-                // and set hasEncryption = false under this condition
-            }
-            const response = new node_opcua_service_session_1.CreateSessionResponse({
-                // A identifier which uniquely identifies the session.
-                sessionId: session.nodeId,
-                // A unique identifier assigned by the Server to the Session.
-                // The token used to authenticate the client in subsequent requests.
-                authenticationToken: session.authenticationToken,
-                revisedSessionTimeout,
-                serverNonce: session.nonce,
-                // serverCertificate: type ApplicationServerCertificate
-                // The application instance Certificate issued to the Server.
-                // A Server shall prove possession by using the private key to sign the Nonce provided
-                // by the Client in the request. The Client shall verify that this Certificate is the same as
-                // the one it used to create the SecureChannel.
-                // The ApplicationInstanceCertificate type is defined in OpCUA 1.03 part 4 - $7.2 page 108
-                // If the securityPolicyUri is None and none of the UserTokenPolicies requires
-                // encryption, the Server shall not send an ApplicationInstanceCertificate and the Client
-                // shall ignore the ApplicationInstanceCertificate.
-                serverCertificate: hasEncryption ? serverCertificateChain : undefined,
-                // The endpoints provided by the server.
-                // The Server shall return a set of EndpointDescriptions available for the serverUri
-                // specified in the request.[...]
-                // The Client shall verify this list with the list from a Discovery Endpoint if it used a Discovery
-                // Endpoint to fetch the EndpointDescriptions.
-                // It is recommended that Servers only include the endpointUrl, securityMode,
-                // securityPolicyUri, userIdentityTokens, transportProfileUri and securityLevel with all
-                // other parameters set to null. Only the recommended parameters shall be verified by
-                // the client.
-                serverEndpoints: _serverEndpointsForCreateSessionResponse(this, session.endpoint.endpointUrl, request.serverUri),
-                // This parameter is deprecated and the array shall be empty.
-                serverSoftwareCertificates: null,
-                // This is a signature generated with the private key associated with the
-                // serverCertificate. This parameter is calculated by appending the clientNonce to the
-                // clientCertificate and signing the resulting sequence of bytes.
-                // The SignatureAlgorithm shall be the AsymmetricSignatureAlgorithm specified in the
-                // SecurityPolicy for the Endpoint.
-                // The SignatureData type is defined in 7.30.
-                serverSignature: this.computeServerSignature(channel, request.clientCertificate, request.clientNonce),
-                // The maximum message size accepted by the server
-                // The Client Communication Stack should return a Bad_RequestTooLarge error to the
-                // application if a request message exceeds this limit.
-                // The value zero indicates that this parameter is not used.
-                maxRequestMessageSize: 0x4000000
-            });
-            this.emit("create_session", session);
-            session.on("session_closed", (session1, deleteSubscriptions, reason) => {
-                (0, node_opcua_assert_1.assert)(typeof reason === "string");
-                if (this.isAuditing) {
-                    (0, node_opcua_assert_1.assert)(reason === "Timeout" || reason === "Terminated" || reason === "CloseSession" || reason === "Forcing");
-                    const sourceName = "Session/" + reason;
-                    this.raiseEvent("AuditSessionEventType", {
-                        /* part 5 -  6.4.3 AuditEventType */
-                        actionTimeStamp: { dataType: "DateTime", value: new Date() },
-                        status: { dataType: "Boolean", value: true },
-                        serverId: { dataType: "String", value: "" },
-                        // ClientAuditEntryId contains the human-readable AuditEntryId defined in Part 3.
-                        clientAuditEntryId: { dataType: "String", value: "" },
-                        // The ClientUserId identifies the user of the client requesting an action. The ClientUserId can be
-                        // obtained from the UserIdentityToken passed in the ActivateSession call.
-                        clientUserId: { dataType: "String", value: "" },
-                        sourceName: { dataType: "String", value: sourceName },
-                        /* part 5 - 6.4.7 AuditSessionEventType */
-                        sessionId: { dataType: "NodeId", value: session1.nodeId }
-                    });
-                }
-                this.emit("session_closed", session1, deleteSubscriptions);
-            });
+        }
+        if ((0, node_opcua_secure_channel_1.nonceAlreadyBeenUsed)(request.clientNonce)) {
+            errorLog(chalk_1.default.red("SERVER with secure connection: None has already been used"), request.clientNonce && request.clientNonce.toString("hex"));
+            return rejectConnection(this, node_opcua_status_code_1.StatusCodes.BadNonceInvalid);
+        }
+        // check application spoofing
+        // check if applicationUri in createSessionRequest matches applicationUri in client Certificate
+        if (!validate_applicationUri(channel, request)) {
+            return rejectConnection(this, node_opcua_status_code_1.StatusCodes.BadCertificateUriInvalid);
+        }
+        const { errCode, endpoint } = validate_security_endpoint(this, request, channel);
+        if (errCode !== node_opcua_status_code_1.StatusCodes.Good) {
+            return rejectConnection(this, errCode);
+        }
+        // see Release 1.02  27  OPC Unified Architecture, Part 4
+        const session = this.createSession({
+            clientDescription: request.clientDescription,
+            sessionTimeout: revisedSessionTimeout,
+            server: this
+        });
+        session.endpoint = endpoint;
+        (0, node_opcua_assert_1.assert)(session);
+        (0, node_opcua_assert_1.assert)(session.sessionTimeout === revisedSessionTimeout);
+        session.clientDescription = request.clientDescription;
+        session.sessionName = request.sessionName || `<unknown session name ${unnamed_session_count++}>`;
+        // Depending upon on the  SecurityPolicy  and the  SecurityMode  of the  SecureChannel,  the exchange of
+        // ApplicationInstanceCertificates   and  Nonces  may be optional and the signatures may be empty. See
+        // Part  7  for the definition of  SecurityPolicies  and the handling of these parameters
+        // serverNonce:
+        // A random number that should never be used in any other request.
+        // This number shall have a minimum length of 32 bytes.
+        // The Client shall use this value to prove possession of its application instance
+        // Certificate in the ActivateSession request.
+        // This value may also be used to prove possession of the userIdentityToken it
+        // specified in the ActivateSession request.
+        //
+        // ( this serverNonce will only be used up to the _on_ActivateSessionRequest
+        //   where a new nonce will be created)
+        session.nonce = this.makeServerNonce();
+        session.channelId = channel.channelId;
+        session._attach_channel(channel);
+        const serverCertificateChain = this.getCertificateChain();
+        const hasEncryption = true;
+        // If the securityPolicyUri is None and none of the UserTokenPolicies requires encryption
+        if (session.channel.securityMode === node_opcua_secure_channel_1.MessageSecurityMode.None) {
+            // ToDo: Check that none of our insecure endpoint has a a UserTokenPolicy that require encryption
+            // and set hasEncryption = false under this condition
+        }
+        const response = new node_opcua_service_session_1.CreateSessionResponse({
+            // A identifier which uniquely identifies the session.
+            sessionId: session.nodeId,
+            // A unique identifier assigned by the Server to the Session.
+            // The token used to authenticate the client in subsequent requests.
+            authenticationToken: session.authenticationToken,
+            revisedSessionTimeout,
+            serverNonce: session.nonce,
+            // serverCertificate: type ApplicationServerCertificate
+            // The application instance Certificate issued to the Server.
+            // A Server shall prove possession by using the private key to sign the Nonce provided
+            // by the Client in the request. The Client shall verify that this Certificate is the same as
+            // the one it used to create the SecureChannel.
+            // The ApplicationInstanceCertificate type is defined in OpCUA 1.03 part 4 - $7.2 page 108
+            // If the securityPolicyUri is None and none of the UserTokenPolicies requires
+            // encryption, the Server shall not send an ApplicationInstanceCertificate and the Client
+            // shall ignore the ApplicationInstanceCertificate.
+            serverCertificate: hasEncryption ? serverCertificateChain : undefined,
+            // The endpoints provided by the server.
+            // The Server shall return a set of EndpointDescriptions available for the serverUri
+            // specified in the request.[...]
+            // The Client shall verify this list with the list from a Discovery Endpoint if it used a Discovery
+            // Endpoint to fetch the EndpointDescriptions.
+            // It is recommended that Servers only include the endpointUrl, securityMode,
+            // securityPolicyUri, userIdentityTokens, transportProfileUri and securityLevel with all
+            // other parameters set to null. Only the recommended parameters shall be verified by
+            // the client.
+            serverEndpoints: _serverEndpointsForCreateSessionResponse(this, session.endpoint.endpointUrl, request.serverUri),
+            // This parameter is deprecated and the array shall be empty.
+            serverSoftwareCertificates: null,
+            // This is a signature generated with the private key associated with the
+            // serverCertificate. This parameter is calculated by appending the clientNonce to the
+            // clientCertificate and signing the resulting sequence of bytes.
+            // The SignatureAlgorithm shall be the AsymmetricSignatureAlgorithm specified in the
+            // SecurityPolicy for the Endpoint.
+            // The SignatureData type is defined in 7.30.
+            serverSignature: this.computeServerSignature(channel, request.clientCertificate, request.clientNonce),
+            // The maximum message size accepted by the server
+            // The Client Communication Stack should return a Bad_RequestTooLarge error to the
+            // application if a request message exceeds this limit.
+            // The value zero indicates that this parameter is not used.
+            maxRequestMessageSize: 0x4000000
+        });
+        this.emit("create_session", session);
+        session.on("session_closed", (session1, deleteSubscriptions, reason) => {
+            (0, node_opcua_assert_1.assert)(typeof reason === "string");
             if (this.isAuditing) {
-                // ------------------------------------------------------------------------------------------------------
-                this.raiseEvent("AuditCreateSessionEventType", {
+                (0, node_opcua_assert_1.assert)(reason === "Timeout" || reason === "Terminated" || reason === "CloseSession" || reason === "Forcing");
+                const sourceName = "Session/" + reason;
+                this.raiseEvent("AuditSessionEventType", {
                     /* part 5 -  6.4.3 AuditEventType */
                     actionTimeStamp: { dataType: "DateTime", value: new Date() },
                     status: { dataType: "Boolean", value: true },
@@ -1256,30 +1226,48 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                     // The ClientUserId identifies the user of the client requesting an action. The ClientUserId can be
                     // obtained from the UserIdentityToken passed in the ActivateSession call.
                     clientUserId: { dataType: "String", value: "" },
-                    sourceName: { dataType: "String", value: "Session/CreateSession" },
+                    sourceName: { dataType: "String", value: sourceName },
                     /* part 5 - 6.4.7 AuditSessionEventType */
-                    sessionId: { dataType: "NodeId", value: session.nodeId },
-                    /* part 5 - 6.4.8 AuditCreateSessionEventType */
-                    // SecureChannelId shall uniquely identify the SecureChannel. The application shall use the same
-                    // identifier in all AuditEvents related to the Session Service Set (AuditCreateSessionEventType,
-                    // AuditActivateSessionEventType and their subtypes) and the SecureChannel Service Set
-                    // (AuditChannelEventType and its subtypes
-                    secureChannelId: { dataType: "String", value: session.channel.channelId.toString() },
-                    // Duration
-                    revisedSessionTimeout: { dataType: "Duration", value: session.sessionTimeout },
-                    // clientCertificate
-                    clientCertificate: { dataType: "ByteString", value: session.channel.clientCertificate },
-                    // clientCertificateThumbprint
-                    clientCertificateThumbprint: {
-                        dataType: "String",
-                        value: thumbprint(session.channel.clientCertificate)
-                    }
+                    sessionId: { dataType: "NodeId", value: session1.nodeId }
                 });
             }
-            // -----------------------------------------------------------------------------------------------------------
-            (0, node_opcua_assert_1.assert)(response.authenticationToken);
-            channel.send_response("MSG", response, message);
+            this.emit("session_closed", session1, deleteSubscriptions);
         });
+        if (this.isAuditing) {
+            // ------------------------------------------------------------------------------------------------------
+            this.raiseEvent("AuditCreateSessionEventType", {
+                /* part 5 -  6.4.3 AuditEventType */
+                actionTimeStamp: { dataType: "DateTime", value: new Date() },
+                status: { dataType: "Boolean", value: true },
+                serverId: { dataType: "String", value: "" },
+                // ClientAuditEntryId contains the human-readable AuditEntryId defined in Part 3.
+                clientAuditEntryId: { dataType: "String", value: "" },
+                // The ClientUserId identifies the user of the client requesting an action. The ClientUserId can be
+                // obtained from the UserIdentityToken passed in the ActivateSession call.
+                clientUserId: { dataType: "String", value: "" },
+                sourceName: { dataType: "String", value: "Session/CreateSession" },
+                /* part 5 - 6.4.7 AuditSessionEventType */
+                sessionId: { dataType: "NodeId", value: session.nodeId },
+                /* part 5 - 6.4.8 AuditCreateSessionEventType */
+                // SecureChannelId shall uniquely identify the SecureChannel. The application shall use the same
+                // identifier in all AuditEvents related to the Session Service Set (AuditCreateSessionEventType,
+                // AuditActivateSessionEventType and their subtypes) and the SecureChannel Service Set
+                // (AuditChannelEventType and its subtypes
+                secureChannelId: { dataType: "String", value: session.channel.channelId.toString() },
+                // Duration
+                revisedSessionTimeout: { dataType: "Duration", value: session.sessionTimeout },
+                // clientCertificate
+                clientCertificate: { dataType: "ByteString", value: session.channel.clientCertificate },
+                // clientCertificateThumbprint
+                clientCertificateThumbprint: {
+                    dataType: "String",
+                    value: thumbprint(session.channel.clientCertificate)
+                }
+            });
+        }
+        // -----------------------------------------------------------------------------------------------------------
+        (0, node_opcua_assert_1.assert)(response.authenticationToken);
+        channel.send_response("MSG", response, message);
     }
     // TODO : implement this:
     //
@@ -1459,96 +1447,92 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
      *
      * @private
      */
-    _apply_on_SessionObject(ResponseClass, message, channel, actionToPerform) {
-        return __awaiter(this, void 0, void 0, function* () {
-            (0, node_opcua_assert_1.assert)(typeof actionToPerform === "function");
-            function sendResponse(response1) {
-                try {
-                    (0, node_opcua_assert_1.assert)(response1 instanceof ResponseClass || response1 instanceof node_opcua_types_1.ServiceFault);
-                    if (message.session) {
-                        const counterName = ResponseClass.schema.name.replace("Response", "");
-                        message.session.incrementRequestTotalCounter(counterName);
-                    }
-                    return channel.send_response("MSG", response1, message);
+    async _apply_on_SessionObject(ResponseClass, message, channel, actionToPerform) {
+        (0, node_opcua_assert_1.assert)(typeof actionToPerform === "function");
+        function sendResponse(response1) {
+            try {
+                (0, node_opcua_assert_1.assert)(response1 instanceof ResponseClass || response1 instanceof node_opcua_types_1.ServiceFault);
+                if (message.session) {
+                    const counterName = ResponseClass.schema.name.replace("Response", "");
+                    message.session.incrementRequestTotalCounter(counterName);
                 }
-                catch (err) {
-                    warningLog(err);
-                    // istanbul ignore next
-                    if (util_1.types.isNativeError(err)) {
-                        // istanbul ignore next
-                        errorLog("Internal error in issuing response\nplease contact support@sterfive.com", message.request.toString(), "\n", response1.toString());
-                    }
+                return channel.send_response("MSG", response1, message);
+            }
+            catch (err) {
+                warningLog(err);
+                // istanbul ignore next
+                if (util_1.types.isNativeError(err)) {
                     // istanbul ignore next
-                    throw err;
+                    errorLog("Internal error in issuing response\nplease contact support@sterfive.com", message.request.toString(), "\n", response1.toString());
                 }
+                // istanbul ignore next
+                throw err;
             }
-            function sendError(statusCode) {
-                if (message.session) {
-                    message.session.incrementRequestErrorCounter(ResponseClass.schema.name.replace("Response", ""));
-                }
-                return g_sendError(channel, message, ResponseClass, statusCode);
+        }
+        function sendError(statusCode) {
+            if (message.session) {
+                message.session.incrementRequestErrorCounter(ResponseClass.schema.name.replace("Response", ""));
             }
-            let response;
-            /* istanbul ignore next */
-            if (!message.session || message.session_statusCode !== node_opcua_status_code_1.StatusCodes.Good) {
-                const errMessage = "INVALID SESSION  !! ";
-                response = new ResponseClass({ responseHeader: { serviceResult: message.session_statusCode } });
-                debugLog(chalk_1.default.red.bold(errMessage), chalk_1.default.yellow(message.session_statusCode.toString()), response.constructor.name);
-                return sendResponse(response);
-            }
-            (0, node_opcua_assert_1.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
-            // Bad_SessionClosed  StatusCodes  are returned to the  Client. In addition,   the  Server  deletes the entry
-            // for the  Client  from its  SessionDiagnostics Array  Variable  and notifies any other  Clients  who were
-            // subscribed to this entry.
-            if (message.session.status === "closed") {
-                // note : use StatusCodes.BadSessionClosed , for pending message for this session
-                return sendError(node_opcua_status_code_1.StatusCodes.BadSessionIdInvalid);
-            }
-            if (message.session.status === "new") {
-                // mark session as being screwed ! so it cannot be activated anymore
-                message.session.status = "screwed";
-                return sendError(node_opcua_status_code_1.StatusCodes.BadSessionNotActivated);
-            }
-            if (message.session.status !== "active") {
-                // mark session as being screwed ! so it cannot be activated anymore
-                message.session.status = "screwed";
-                // note : use StatusCodes.BadSessionClosed , for pending message for this session
-                return sendError(node_opcua_status_code_1.StatusCodes.BadSessionIdInvalid);
-            }
-            // lets also reset the session watchdog so it doesn't
-            // (Sessions are terminated by the Server automatically if the Client fails to issue a Service
-            // request on the Session within the timeout period negotiated by the Server in the
-            // CreateSession Service response. )
-            if (message.session.keepAlive) {
-                (0, node_opcua_assert_1.assert)(typeof message.session.keepAlive === "function");
-                message.session.keepAlive();
-            }
-            message.session.incrementTotalRequestCount();
-            yield actionToPerform(message.session, sendResponse, sendError);
-        });
+            return g_sendError(channel, message, ResponseClass, statusCode);
+        }
+        let response;
+        /* istanbul ignore next */
+        if (!message.session || message.session_statusCode !== node_opcua_status_code_1.StatusCodes.Good) {
+            const errMessage = "INVALID SESSION  !! ";
+            response = new ResponseClass({ responseHeader: { serviceResult: message.session_statusCode } });
+            debugLog(chalk_1.default.red.bold(errMessage), chalk_1.default.yellow(message.session_statusCode.toString()), response.constructor.name);
+            return sendResponse(response);
+        }
+        (0, node_opcua_assert_1.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
+        // Bad_SessionClosed  StatusCodes  are returned to the  Client. In addition,   the  Server  deletes the entry
+        // for the  Client  from its  SessionDiagnostics Array  Variable  and notifies any other  Clients  who were
+        // subscribed to this entry.
+        if (message.session.status === "closed") {
+            // note : use StatusCodes.BadSessionClosed , for pending message for this session
+            return sendError(node_opcua_status_code_1.StatusCodes.BadSessionIdInvalid);
+        }
+        if (message.session.status === "new") {
+            // mark session as being screwed ! so it cannot be activated anymore
+            message.session.status = "screwed";
+            return sendError(node_opcua_status_code_1.StatusCodes.BadSessionNotActivated);
+        }
+        if (message.session.status !== "active") {
+            // mark session as being screwed ! so it cannot be activated anymore
+            message.session.status = "screwed";
+            // note : use StatusCodes.BadSessionClosed , for pending message for this session
+            return sendError(node_opcua_status_code_1.StatusCodes.BadSessionIdInvalid);
+        }
+        // lets also reset the session watchdog so it doesn't
+        // (Sessions are terminated by the Server automatically if the Client fails to issue a Service
+        // request on the Session within the timeout period negotiated by the Server in the
+        // CreateSession Service response. )
+        if (message.session.keepAlive) {
+            (0, node_opcua_assert_1.assert)(typeof message.session.keepAlive === "function");
+            message.session.keepAlive();
+        }
+        message.session.incrementTotalRequestCount();
+        await actionToPerform(message.session, sendResponse, sendError);
     }
-    _apply_on_Subscription(ResponseClass, message, channel, actionToPerform) {
-        return __awaiter(this, void 0, void 0, function* () {
-            (0, node_opcua_assert_1.assert)(typeof actionToPerform === "function");
-            const request = message.request;
-            (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(request, "subscriptionId"));
-            this._apply_on_SessionObject(ResponseClass, message, channel, (session, sendResponse, sendError) => __awaiter(this, void 0, void 0, function* () {
-                const subscription = session.getSubscription(request.subscriptionId);
-                if (!subscription) {
-                    return sendError(node_opcua_status_code_1.StatusCodes.BadSubscriptionIdInvalid);
-                }
-                subscription.resetLifeTimeAndKeepAliveCounters();
-                yield actionToPerform(session, subscription, sendResponse, sendError);
-            }));
+    async _apply_on_Subscription(ResponseClass, message, channel, actionToPerform) {
+        (0, node_opcua_assert_1.assert)(typeof actionToPerform === "function");
+        const request = message.request;
+        (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(request, "subscriptionId"));
+        this._apply_on_SessionObject(ResponseClass, message, channel, async (session, sendResponse, sendError) => {
+            const subscription = session.getSubscription(request.subscriptionId);
+            if (!subscription) {
+                return sendError(node_opcua_status_code_1.StatusCodes.BadSubscriptionIdInvalid);
+            }
+            subscription.resetLifeTimeAndKeepAliveCounters();
+            await actionToPerform(session, subscription, sendResponse, sendError);
         });
     }
     _apply_on_SubscriptionIds(ResponseClass, message, channel, actionToPerform) {
         (0, node_opcua_assert_1.assert)(typeof actionToPerform === "function");
         const request = message.request;
         (0, node_opcua_assert_1.assert)(Object.prototype.hasOwnProperty.call(request, "subscriptionIds"));
-        this._apply_on_SessionObject(ResponseClass, message, channel, (session, sendResponse, sendError) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_SessionObject(ResponseClass, message, channel, async (session, sendResponse, sendError) => {
             const subscriptionIds = request.subscriptionIds;
             if (!request.subscriptionIds || request.subscriptionIds.length === 0) {
                 return sendError(node_opcua_status_code_1.StatusCodes.BadNothingToDo);
@@ -1557,7 +1541,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             // resolve potential pending promises ....
             for (let i = 0; i < results.length; i++) {
                 if (results[i].then) {
-                    results[i] = yield results[i];
+                    results[i] = await results[i];
                 }
             }
             const response = new ResponseClass({
@@ -1569,10 +1553,10 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 results
             });
             sendResponse(response);
-        }));
+        });
     }
     _apply_on_Subscriptions(ResponseClass, message, channel, actionToPerform) {
-        this._apply_on_SubscriptionIds(ResponseClass, message, channel, (session, subscriptionId) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_SubscriptionIds(ResponseClass, message, channel, async (session, subscriptionId) => {
             /* istanbul ignore next */
             if (isSubscriptionIdInvalid(subscriptionId)) {
                 return node_opcua_status_code_1.StatusCodes.BadSubscriptionIdInvalid;
@@ -1582,21 +1566,19 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 return node_opcua_status_code_1.StatusCodes.BadSubscriptionIdInvalid;
             }
             return actionToPerform(session, subscription);
-        }));
-    }
-    _closeSession(authenticationToken, deleteSubscriptions, reason) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (deleteSubscriptions && this.options.onDeleteMonitoredItem) {
-                const session = this.getSession(authenticationToken);
-                if (session) {
-                    const subscriptions = session.publishEngine.subscriptions;
-                    for (const subscription of subscriptions) {
-                        yield subscription.applyOnMonitoredItem(this.options.onDeleteMonitoredItem.bind(null, subscription));
-                    }
+        });
+    }
+    async _closeSession(authenticationToken, deleteSubscriptions, reason) {
+        if (deleteSubscriptions && this.options.onDeleteMonitoredItem) {
+            const session = this.getSession(authenticationToken);
+            if (session) {
+                const subscriptions = session.publishEngine.subscriptions;
+                for (const subscription of subscriptions) {
+                    await subscription.applyOnMonitoredItem(this.options.onDeleteMonitoredItem.bind(null, subscription));
                 }
             }
-            yield this.engine.closeSession(authenticationToken, deleteSubscriptions, reason);
-        });
+        }
+        await this.engine.closeSession(authenticationToken, deleteSubscriptions, reason);
     }
     /**
      * @method _on_CloseSessionRequest
@@ -1624,9 +1606,9 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
         }
         // session has been created but not activated !
         const wasNotActivated = session.status === "new";
-        (() => __awaiter(this, void 0, void 0, function* () {
+        (async () => {
             try {
-                yield this._closeSession(request.requestHeader.authenticationToken, request.deleteSubscriptions, "CloseSession");
+                await this._closeSession(request.requestHeader.authenticationToken, request.deleteSubscriptions, "CloseSession");
                 // if (false && wasNotActivated) {
                 //  return sendError(StatusCodes.BadSessionNotActivated);
                 // }
@@ -1636,7 +1618,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             catch (err) {
                 sendError(node_opcua_status_code_1.StatusCodes.BadInternalError);
             }
-        }))();
+        })();
     }
     // browse services
     /**
@@ -1906,20 +1888,20 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
     _on_DeleteSubscriptionsRequest(message, channel) {
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_subscription_1.DeleteSubscriptionsRequest);
-        this._apply_on_SubscriptionIds(node_opcua_service_subscription_1.DeleteSubscriptionsResponse, message, channel, (session, subscriptionId) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_SubscriptionIds(node_opcua_service_subscription_1.DeleteSubscriptionsResponse, message, channel, async (session, subscriptionId) => {
             let subscription = this.engine.findOrphanSubscription(subscriptionId);
             // istanbul ignore next
             if (subscription) {
                 warningLog("Deleting an orphan subscription", subscriptionId);
-                yield this._beforeDeleteSubscription(subscription);
+                await this._beforeDeleteSubscription(subscription);
                 return this.engine.deleteOrphanSubscription(subscription);
             }
             subscription = session.getSubscription(subscriptionId);
             if (subscription) {
-                yield this._beforeDeleteSubscription(subscription);
+                await this._beforeDeleteSubscription(subscription);
             }
             return session.deleteSubscription(subscriptionId);
-        }));
+        });
     }
     _on_TransferSubscriptionsRequest(message, channel) {
         //
@@ -1935,14 +1917,14 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
         const engine = this.engine;
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_subscription_1.TransferSubscriptionsRequest);
-        this._apply_on_SubscriptionIds(node_opcua_service_subscription_1.TransferSubscriptionsResponse, message, channel, (session, subscriptionId) => __awaiter(this, void 0, void 0, function* () { return yield engine.transferSubscription(session, subscriptionId, request.sendInitialValues); }));
+        this._apply_on_SubscriptionIds(node_opcua_service_subscription_1.TransferSubscriptionsResponse, message, channel, async (session, subscriptionId) => await engine.transferSubscription(session, subscriptionId, request.sendInitialValues));
     }
     _on_CreateMonitoredItemsRequest(message, channel) {
         const engine = this.engine;
         const addressSpace = engine.addressSpace;
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_subscription_1.CreateMonitoredItemsRequest);
-        this._apply_on_Subscription(node_opcua_service_subscription_1.CreateMonitoredItemsResponse, message, channel, (session, subscription, sendResponse, sendError) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_Subscription(node_opcua_service_subscription_1.CreateMonitoredItemsResponse, message, channel, async (session, subscription, sendResponse, sendError) => {
             const timestampsToReturn = request.timestampsToReturn;
             if (timestampsToReturn === node_opcua_service_read_1.TimestampsToReturn.Invalid) {
                 return sendError(node_opcua_status_code_1.StatusCodes.BadTimestampsToReturnInvalid);
@@ -1958,15 +1940,15 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             const options = this.options;
             let results = [];
             if (options.onCreateMonitoredItem) {
-                const resultsPromise = request.itemsToCreate.map((monitoredItemCreateRequest) => __awaiter(this, void 0, void 0, function* () {
+                const resultsPromise = request.itemsToCreate.map(async (monitoredItemCreateRequest) => {
                     const { monitoredItem, createResult } = subscription.preCreateMonitoredItem(addressSpace, timestampsToReturn, monitoredItemCreateRequest);
                     if (monitoredItem) {
-                        yield options.onCreateMonitoredItem(subscription, monitoredItem);
+                        await options.onCreateMonitoredItem(subscription, monitoredItem);
                         subscription.postCreateMonitoredItem(monitoredItem, monitoredItemCreateRequest, createResult);
                     }
                     return createResult;
-                }));
-                results = yield Promise.all(resultsPromise);
+                });
+                results = await Promise.all(resultsPromise);
             }
             else {
                 results = request.itemsToCreate.map((monitoredItemCreateRequest) => {
@@ -1983,12 +1965,12 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 // ,diagnosticInfos: []
             });
             sendResponse(response);
-        }));
+        });
     }
     _on_ModifySubscriptionRequest(message, channel) {
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_subscription_1.ModifySubscriptionRequest);
-        this._apply_on_Subscription(node_opcua_service_subscription_1.ModifySubscriptionResponse, message, channel, (session, subscription, sendResponse, sendError) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_Subscription(node_opcua_service_subscription_1.ModifySubscriptionResponse, message, channel, async (session, subscription, sendResponse, sendError) => {
             subscription.modify(request);
             const response = new node_opcua_service_subscription_1.ModifySubscriptionResponse({
                 revisedLifetimeCount: subscription.lifeTimeCount,
@@ -1996,12 +1978,12 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 revisedPublishingInterval: subscription.publishingInterval
             });
             sendResponse(response);
-        }));
+        });
     }
     _on_ModifyMonitoredItemsRequest(message, channel) {
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_subscription_1.ModifyMonitoredItemsRequest);
-        this._apply_on_Subscription(node_opcua_service_subscription_1.ModifyMonitoredItemsResponse, message, channel, (session, subscription, sendResponse, sendError) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_Subscription(node_opcua_service_subscription_1.ModifyMonitoredItemsResponse, message, channel, async (session, subscription, sendResponse, sendError) => {
             const timestampsToReturn = request.timestampsToReturn;
             if (timestampsToReturn === node_opcua_service_read_1.TimestampsToReturn.Invalid) {
                 return sendError(node_opcua_status_code_1.StatusCodes.BadTimestampsToReturnInvalid);
@@ -2033,7 +2015,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 results
             });
             sendResponse(response);
-        }));
+        });
     }
     _on_PublishRequest(message, channel) {
         const request = message.request;
@@ -2050,14 +2032,14 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_subscription_1.SetPublishingModeRequest);
         const publishingEnabled = request.publishingEnabled;
-        this._apply_on_Subscriptions(node_opcua_service_subscription_1.SetPublishingModeResponse, message, channel, (session, subscription) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_Subscriptions(node_opcua_service_subscription_1.SetPublishingModeResponse, message, channel, async (session, subscription) => {
             return subscription.setPublishingMode(publishingEnabled);
-        }));
+        });
     }
     _on_DeleteMonitoredItemsRequest(message, channel) {
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_subscription_1.DeleteMonitoredItemsRequest);
-        this._apply_on_Subscription(node_opcua_service_subscription_1.DeleteMonitoredItemsResponse, message, channel, (session, subscription, sendResponse, sendError) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_Subscription(node_opcua_service_subscription_1.DeleteMonitoredItemsResponse, message, channel, async (session, subscription, sendResponse, sendError) => {
             /* istanbul ignore next */
             if (!request.monitoredItemIds || request.monitoredItemIds.length === 0) {
                 return sendError(node_opcua_status_code_1.StatusCodes.BadNothingToDo);
@@ -2068,17 +2050,17 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                     return sendError(node_opcua_status_code_1.StatusCodes.BadTooManyOperations);
                 }
             }
-            const resultsPromises = request.monitoredItemIds.map((monitoredItemId) => __awaiter(this, void 0, void 0, function* () {
+            const resultsPromises = request.monitoredItemIds.map(async (monitoredItemId) => {
                 if (this.options.onDeleteMonitoredItem) {
                     const monitoredItem = subscription.getMonitoredItem(monitoredItemId);
                     if (monitoredItem) {
-                        yield this.options.onDeleteMonitoredItem(subscription, monitoredItem);
+                        await this.options.onDeleteMonitoredItem(subscription, monitoredItem);
                     }
                 }
                 return subscription.removeMonitoredItem(monitoredItemId);
-            }));
+            });
             try {
-                const results = yield Promise.all(resultsPromises);
+                const results = await Promise.all(resultsPromises);
                 const response = new node_opcua_service_subscription_1.DeleteMonitoredItemsResponse({
                     diagnosticInfos: undefined,
                     results
@@ -2089,12 +2071,12 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 warningLog(err);
                 return sendError(node_opcua_status_code_1.StatusCodes.BadInternalError);
             }
-        }));
+        });
     }
     _on_SetTriggeringRequest(message, channel) {
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_subscription_1.SetTriggeringRequest);
-        this._apply_on_Subscription(node_opcua_service_subscription_1.SetTriggeringResponse, message, channel, (session, subscription, sendResponse, sendError) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_Subscription(node_opcua_service_subscription_1.SetTriggeringResponse, message, channel, async (session, subscription, sendResponse, sendError) => {
             /* */
             const { triggeringItemId, linksToAdd, linksToRemove } = request;
             /**
@@ -2125,20 +2107,18 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 });
                 sendResponse(response);
             }
-        }));
-    }
-    _beforeDeleteSubscription(subscription) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.options.onDeleteMonitoredItem) {
-                return;
-            }
-            yield subscription.applyOnMonitoredItem(this.options.onDeleteMonitoredItem.bind(null, subscription));
         });
     }
+    async _beforeDeleteSubscription(subscription) {
+        if (!this.options.onDeleteMonitoredItem) {
+            return;
+        }
+        await subscription.applyOnMonitoredItem(this.options.onDeleteMonitoredItem.bind(null, subscription));
+    }
     _on_RepublishRequest(message, channel) {
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_subscription_1.RepublishRequest);
-        this._apply_on_Subscription(node_opcua_service_subscription_1.RepublishResponse, message, channel, (session, subscription, sendResponse, sendError) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_Subscription(node_opcua_service_subscription_1.RepublishResponse, message, channel, async (session, subscription, sendResponse, sendError) => {
             // update diagnostic counter
             subscription.subscriptionDiagnostics.republishRequestCount += 1;
             subscription.subscriptionDiagnostics.republishMessageRequestCount += 1;
@@ -2156,7 +2136,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
             // update diagnostic counter
             subscription.subscriptionDiagnostics.republishMessageCount += 1;
             sendResponse(response);
-        }));
+        });
     }
     // Bad_NothingToDo
     // Bad_TooManyOperations
@@ -2165,7 +2145,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
     _on_SetMonitoringModeRequest(message, channel) {
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_subscription_1.SetMonitoringModeRequest);
-        this._apply_on_Subscription(node_opcua_service_subscription_1.SetMonitoringModeResponse, message, channel, (session, subscription, sendResponse, sendError) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_Subscription(node_opcua_service_subscription_1.SetMonitoringModeResponse, message, channel, async (session, subscription, sendResponse, sendError) => {
             /* istanbul ignore next */
             if (!request.monitoredItemIds || request.monitoredItemIds.length === 0) {
                 return sendError(node_opcua_status_code_1.StatusCodes.BadNothingToDo);
@@ -2192,13 +2172,13 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 results
             });
             sendResponse(response);
-        }));
+        });
     }
     // _on_TranslateBrowsePathsToNodeIds service
     _on_TranslateBrowsePathsToNodeIdsRequest(message, channel) {
         const request = message.request;
         (0, node_opcua_assert_1.assert)(request instanceof node_opcua_service_translate_browse_path_1.TranslateBrowsePathsToNodeIdsRequest);
-        this._apply_on_SessionObject(node_opcua_service_translate_browse_path_1.TranslateBrowsePathsToNodeIdsResponse, message, channel, (session, sendResponse, sendError) => __awaiter(this, void 0, void 0, function* () {
+        this._apply_on_SessionObject(node_opcua_service_translate_browse_path_1.TranslateBrowsePathsToNodeIdsResponse, message, channel, async (session, sendResponse, sendError) => {
             if (!request.browsePaths || request.browsePaths.length === 0) {
                 return sendError(node_opcua_status_code_1.StatusCodes.BadNothingToDo);
             }
@@ -2220,7 +2200,7 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
                 .catch((err) => {
                 sendError(node_opcua_status_code_1.StatusCodes.BadInternalError);
             });
-        }));
+        });
     }
     // Call Service Result Codes
     // Symbolic Id Description
@@ -2384,14 +2364,9 @@ class OPCUAServer extends base_server_1.OPCUABaseServer {
         });
         return endPoint;
     }
-    initializeCM() {
-        const _super = Object.create(null, {
-            initializeCM: { get: () => super.initializeCM }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            yield _super.initializeCM.call(this);
-            yield this.userCertificateManager.initialize();
-        });
+    async initializeCM() {
+        await super.initializeCM();
+        await this.userCertificateManager.initialize();
     }
 }
 exports.OPCUAServer = OPCUAServer;