node-opcua-server 2.163.1 → 2.164.2

package/source/opcua_server.ts

@@ -449,7 +449,7 @@ function build_scanning_node_function(addressSpace: AddressSpace, itemToMonitor:
 
     const node = addressSpace.findNode(itemToMonitor.nodeId) as UAVariable;
 
-    /* istanbul ignore next */
+    /* c8 ignore next */
     if (!node) {
         errorLog(" INVALID NODE ID  , ", itemToMonitor.nodeId.toString());
         dump(itemToMonitor);
@@ -523,7 +523,7 @@ function _installRegisterServerManager(self: OPCUAServer) {
     assert(self instanceof OPCUAServer);
     assert(!self.registerServerManager);
 
-    /* istanbul ignore next */
+    /* c8 ignore next */
     if (!self.registerServerMethod) {
         throw new Error("Internal Error");
     }
@@ -545,7 +545,7 @@ function _installRegisterServerManager(self: OPCUAServer) {
                 server: self
             });
             break;
-        /* istanbul ignore next */
+        /* c8 ignore next */
         default:
             throw new Error("Invalid switch");
     }
@@ -604,7 +604,7 @@ function validate_applicationUri(channel: ServerSecureChannelLayer, request: Cre
     const applicationUriFromCert =
         uniformResourceIdentifier && uniformResourceIdentifier.length > 0 ? uniformResourceIdentifier[0] : null;
 
-    /* istanbul ignore next */
+    /* c8 ignore next */
     if (applicationUriFromCert !== applicationUri) {
         errorLog("BadCertificateUriInvalid!");
         errorLog("applicationUri           = ", applicationUri);
@@ -1167,7 +1167,7 @@ export class OPCUAServer extends 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 = async () => {
-            /* istanbul ignore next */
+            /* c8 ignore next */
             if (!options) {
                 throw new Error("Internal Error");
             }
@@ -1267,7 +1267,7 @@ export class OPCUAServer extends OPCUABaseServer {
         assert(!this.initialized, "server is already initialized"); // already initialized ?
 
         this._preInitTask.push(async () => {
-            /* istanbul ignore else */
+            /* c8 ignore next */
             if (this._delayInit) {
                 await this._delayInit();
                 this._delayInit = undefined;
@@ -1362,7 +1362,7 @@ export class OPCUAServer extends OPCUABaseServer {
         assert(typeof callback === "function");
         debugLog("OPCUAServer#shutdown (timeout = ", timeout, ")");
 
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!this.engine) {
             return callback();
         }
@@ -1419,7 +1419,7 @@ export class OPCUAServer extends OPCUABaseServer {
         }
         OPCUAServer.registry.unregister(this);
 
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (this.engine) {
             this.engine.dispose();
         }
@@ -1439,7 +1439,7 @@ export class OPCUAServer extends OPCUABaseServer {
     public raiseEvent(eventType: "AuditCertificateMismatchEventType", options: RaiseAuditCertificateMismatchEventData): void;
 
     public raiseEvent(eventType: EventTypeLike | UAObjectType, options: RaiseEventData): void {
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!this.engine.addressSpace) {
             errorLog("addressSpace missing");
             return;
@@ -1447,7 +1447,7 @@ export class OPCUAServer extends OPCUABaseServer {
 
         const server = this.engine.addressSpace.findNode("Server") as UAObject;
 
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!server) {
             // xx throw new Error("OPCUAServer#raiseEvent : cannot find Server object");
             return;
@@ -1471,7 +1471,7 @@ export class OPCUAServer extends OPCUABaseServer {
      * @private
      */
     protected createSession(options: CreateSessionOption): ServerSession {
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!this.engine) {
             throw new Error("Internal Error");
         }
@@ -1535,12 +1535,12 @@ export class OPCUAServer extends OPCUABaseServer {
         }
         const cryptoFactory = getCryptoFactory(securityPolicy);
 
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!cryptoFactory) {
             return callback(null, StatusCodes.BadSecurityPolicyRejected);
         }
 
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (userIdentityToken.encryptionAlgorithm !== cryptoFactory.asymmetricEncryptionAlgorithm) {
             errorLog("invalid encryptionAlgorithm");
             errorLog("userTokenPolicy", userTokenPolicy.toString());
@@ -1569,7 +1569,7 @@ export class OPCUAServer extends OPCUABaseServer {
         const securityPolicy = adjustSecurityPolicy(channel, userTokenPolicy.securityPolicyUri);
 
         const cryptoFactory = getCryptoFactory(securityPolicy);
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!cryptoFactory) {
             return callback(null, StatusCodes.BadSecurityPolicyRejected);
         }
@@ -1602,7 +1602,7 @@ export class OPCUAServer extends OPCUABaseServer {
 
         // verify if certificate is Valid
         this.userCertificateManager!.checkCertificate(certificate, (err, certificateStatus) => {
-            /* istanbul ignore next */
+            /* c8 ignore next */
             if (err) {
                 return callback(err);
             }
@@ -1702,7 +1702,7 @@ export class OPCUAServer extends OPCUABaseServer {
             assert(serverNonce instanceof Buffer);
 
             const cryptoFactory = getCryptoFactory(securityPolicy);
-            /* istanbul ignore next */
+            /* c8 ignore next */
             if (!cryptoFactory) {
                 return callback(new Error(" Unsupported security Policy"));
             }
@@ -1737,7 +1737,7 @@ export class OPCUAServer extends OPCUABaseServer {
         callback: (err: Error | null, statusCode?: StatusCode) => void
     ): void {
         assert(typeof callback === "function");
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!userIdentityToken) {
             throw new Error("Invalid token");
         }
@@ -1794,7 +1794,7 @@ export class OPCUAServer extends OPCUABaseServer {
 
         const userTokenType = getTokenType(userIdentityToken);
         const userTokenPolicy = findUserTokenByPolicy(session.getEndpointDescription(), userTokenType, userIdentityToken.policyId!);
-        /** istanbul ignore next */
+        /** c8 ignore next */
         if (!userTokenPolicy) {
             return callback(null, false);
         }
@@ -2108,7 +2108,7 @@ export class OPCUAServer extends OPCUABaseServer {
 
         let response;
 
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!session) {
             // this may happen when the server has been restarted and a client tries to reconnect, thinking
             // that the previous session may still be active
@@ -2190,7 +2190,7 @@ export class OPCUAServer extends OPCUABaseServer {
             session.endpoint!,
             (err: Error | null, statusCode?: StatusCode) => {
                 if (!statusCode || statusCode.isNotGood()) {
-                    /* istanbul ignore next */
+                    /* c8 ignore next */
                     if (!(statusCode && statusCode instanceof StatusCode)) {
                         return rejectConnection(this, StatusCodes.BadCertificateInvalid);
                     }
@@ -2203,7 +2203,7 @@ export class OPCUAServer extends OPCUABaseServer {
                     session,
                     request.userIdentityToken as UserIdentityToken,
                     (err1: Error | null, authorized?: boolean) => {
-                        /* istanbul ignore next */
+                        /* c8 ignore next */
                         if (err1) {
                             return rejectConnection(this, StatusCodes.BadInternalError);
                         }
@@ -2261,13 +2261,18 @@ export class OPCUAServer extends OPCUABaseServer {
         // --- check that provided session matches session attached to channel
         if (channel.channelId !== session.channelId) {
             if (!(request instanceof ActivateSessionRequest)) {
-                errorLog(
-                    chalk.red.bgWhite(
-                        "ERROR: channel.channelId !== session.channelId  on processing request " + request.constructor.name
-                    ),
-                    channel.channelId,
-                    session.channelId
-                );
+                // Note: PublishRequests arriving on the new channel before
+                // ActivateSession completes the session transfer are expected
+                // transient occurrences, not errors worth logging.
+                if (request.constructor.name !== "PublishRequest") {
+                    errorLog(
+                        chalk.red.bgWhite(
+                            "ERROR: channel.channelId !== session.channelId  on processing request " + request.constructor.name
+                        ),
+                        channel.channelId,
+                        session.channelId
+                    );
+                }
             }
             message.session_statusCode = StatusCodes.BadSecureChannelIdInvalid;
         } else if (channel_has_session(channel, session)) {
@@ -2315,9 +2320,9 @@ export class OPCUAServer extends OPCUABaseServer {
                 return channel.send_response("MSG", response1, message);
             } catch (err) {
                 warningLog(err);
-                // istanbul ignore next
+                // c8 ignore next
                 if (types.isNativeError(err)) {
-                    // istanbul ignore next
+                    // c8 ignore next
                     errorLog(
                         "Internal error in issuing response\nplease contact support@sterfive.com",
                         message.request.toString(),
@@ -2325,7 +2330,7 @@ export class OPCUAServer extends OPCUABaseServer {
                         response1.toString()
                     );
                 }
-                // istanbul ignore next
+                // c8 ignore next
                 throw err;
             }
         }
@@ -2338,7 +2343,7 @@ export class OPCUAServer extends OPCUABaseServer {
         }
 
         let response: any;
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!message.session || message.session_statusCode !== StatusCodes.Good) {
             const errMessage = "=>" + message.session_statusCode?.toString();
             response = new ServiceFault({ responseHeader: { serviceResult: message.session_statusCode } });
@@ -2483,7 +2488,7 @@ export class OPCUAServer extends OPCUABaseServer {
             message,
             channel,
             async (session: ServerSession, subscriptionId: number) => {
-                /* istanbul ignore next */
+                /* c8 ignore next */
                 if (isSubscriptionIdInvalid(subscriptionId)) {
                     return StatusCodes.BadSubscriptionIdInvalid;
                 }
@@ -2915,7 +2920,7 @@ export class OPCUAServer extends OPCUABaseServer {
             channel,
             async (session: ServerSession, subscriptionId: number) => {
                 let subscription = this.engine.findOrphanSubscription(subscriptionId);
-                // istanbul ignore next
+                // c8 ignore next
                 if (subscription) {
                     warningLog("Deleting an orphan subscription", subscriptionId);
 
@@ -3078,7 +3083,7 @@ export class OPCUAServer extends OPCUABaseServer {
                     return sendError(StatusCodes.BadNothingToDo);
                 }
 
-                /* istanbul ignore next */
+                /* c8 ignore next */
                 if (this.engine.serverCapabilities.operationLimits.maxMonitoredItemsPerCall > 0) {
                     if (request.itemsToModify.length > this.engine.serverCapabilities.operationLimits.maxMonitoredItemsPerCall) {
                         return sendError(StatusCodes.BadTooManyOperations);
@@ -3157,12 +3162,12 @@ export class OPCUAServer extends OPCUABaseServer {
                 sendResponse: (response: Response) => void,
                 sendError: (statusCode: StatusCode) => void
             ) => {
-                /* istanbul ignore next */
+                /* c8 ignore next */
                 if (!request.monitoredItemIds || request.monitoredItemIds.length === 0) {
                     return sendError(StatusCodes.BadNothingToDo);
                 }
 
-                /* istanbul ignore next */
+                /* c8 ignore next */
                 if (this.engine.serverCapabilities.operationLimits.maxMonitoredItemsPerCall > 0) {
                     if (request.monitoredItemIds.length > this.engine.serverCapabilities.operationLimits.maxMonitoredItemsPerCall) {
                         return sendError(StatusCodes.BadTooManyOperations);
@@ -3311,12 +3316,12 @@ export class OPCUAServer extends OPCUABaseServer {
                 sendResponse: (response: Response) => void,
                 sendError: (statusCode: StatusCode) => void
             ) => {
-                /* istanbul ignore next */
+                /* c8 ignore next */
                 if (!request.monitoredItemIds || request.monitoredItemIds.length === 0) {
                     return sendError(StatusCodes.BadNothingToDo);
                 }
 
-                /* istanbul ignore next */
+                /* c8 ignore next */
                 if (this.engine.serverCapabilities.operationLimits.maxMonitoredItemsPerCall > 0) {
                     if (request.monitoredItemIds.length > this.engine.serverCapabilities.operationLimits.maxMonitoredItemsPerCall) {
                         return sendError(StatusCodes.BadTooManyOperations);
@@ -3495,7 +3500,7 @@ export class OPCUAServer extends OPCUABaseServer {
         );
     }
 
-    /* istanbul ignore next */
+    /* c8 ignore next */
     protected _on_Cancel(message: Message, channel: ServerSecureChannelLayer): void {
         return g_sendError(channel, message, CancelResponse, StatusCodes.BadServiceUnsupported);
     }
@@ -3504,38 +3509,38 @@ export class OPCUAServer extends OPCUABaseServer {
     // This Service Set defines Services to add and delete AddressSpace Nodes and References between them. All added
     // Nodes continue to exist in the AddressSpace even if the Client that created them disconnects from the Server.
     //
-    /* istanbul ignore next */
+    /* c8 ignore next */
     protected _on_AddNodes(message: Message, channel: ServerSecureChannelLayer): void {
         return g_sendError(channel, message, AddNodesResponse, StatusCodes.BadServiceUnsupported);
     }
 
-    /* istanbul ignore next */
+    /* c8 ignore next */
     protected _on_AddReferences(message: Message, channel: ServerSecureChannelLayer): void {
         return g_sendError(channel, message, AddReferencesResponse, StatusCodes.BadServiceUnsupported);
     }
 
-    /* istanbul ignore next */
+    /* c8 ignore next */
     protected _on_DeleteNodes(message: Message, channel: ServerSecureChannelLayer): void {
         return g_sendError(channel, message, DeleteNodesResponse, StatusCodes.BadServiceUnsupported);
     }
 
-    /* istanbul ignore next */
+    /* c8 ignore next */
     protected _on_DeleteReferences(message: Message, channel: ServerSecureChannelLayer): void {
         return g_sendError(channel, message, DeleteReferencesResponse, StatusCodes.BadServiceUnsupported);
     }
 
     // Query Service
-    /* istanbul ignore next */
+    /* c8 ignore next */
     protected _on_QueryFirst(message: Message, channel: ServerSecureChannelLayer): void {
         return g_sendError(channel, message, QueryFirstResponse, StatusCodes.BadServiceUnsupported);
     }
 
-    /* istanbul ignore next */
+    /* c8 ignore next */
     protected _on_QueryNext(message: Message, channel: ServerSecureChannelLayer): void {
         return g_sendError(channel, message, QueryNextResponse, StatusCodes.BadServiceUnsupported);
     }
 
-    /* istanbul ignore next */
+    /* c8 ignore next */
     protected _on_HistoryUpdate(message: Message, channel: ServerSecureChannelLayer): void {
         return g_sendError(channel, message, HistoryUpdateResponse, StatusCodes.BadServiceUnsupported);
     }
@@ -3573,7 +3578,7 @@ export class OPCUAServer extends OPCUABaseServer {
         serverOption: OPCUAServerOptions,
         endpointOptions: OPCUAServerEndpointOptions
     ): OPCUAServerEndPoint {
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!endpointOptions) {
             throw new Error("internal error");
         }
@@ -3581,7 +3586,7 @@ export class OPCUAServer extends OPCUABaseServer {
         endpointOptions.hostname = endpointOptions.hostname || hostname;
         endpointOptions.port = endpointOptions.port === undefined ? 26543 : endpointOptions.port;
 
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (
             !Object.prototype.hasOwnProperty.call(endpointOptions, "port") ||
             !isFinite(endpointOptions.port!) ||

package/source/register_server_manager.ts

@@ -1,4 +1,4 @@
-/**
+ /**
  * @module node-opcua-server
  */
 // tslint:disable:no-console
@@ -112,8 +112,8 @@ function constructRegisteredServer(server: IPartialServer, isOnline: boolean): R
     const info = exploreCertificate(server.getCertificate());
     const commonName = info.tbsCertificate.subject.commonName!;
 
-    const serverUri = info.tbsCertificate.extensions?.subjectAltName.uniformResourceIdentifier[0];
-    // istanbul ignore next
+    const serverUri = info.tbsCertificate.extensions?.subjectAltName?.uniformResourceIdentifier[0];
+    // c8 ignore next
     if (serverUri !== server.serverInfo.applicationUri) {
         warningLog(
             chalk.yellow("Warning certificate uniformResourceIdentifier doesn't match serverInfo.applicationUri"),
@@ -128,7 +128,7 @@ function constructRegisteredServer(server: IPartialServer, isOnline: boolean): R
         );
     }
 
-    // istanbul ignore next
+    // c8 ignore next
     if (!server.serverInfo.applicationName.text) {
         debugLog("warning: application name is missing");
     }
@@ -403,7 +403,11 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
                 if (!this.#_isTerminating()) {
                     this.#_setState(RegisterServerManagerStatus.INACTIVE);
                     this.#_emitEvent("serverRegistrationFailure");
-                    await pause(Math.min(5000, this.timeout));
+                    // interruptible pause: check for shutdown every 100ms
+                    const delay = Math.min(5000, this.timeout);
+                    for (let elapsed = 0; elapsed < delay && !this.#_isTerminating(); elapsed += 100) {
+                        await pause(100);
+                    }
                 }
             }
         }
@@ -513,6 +517,7 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
                     warningLog("RegisterServerManager#_establish_initial_connection: error disconnecting client", err);
                 }
             }
+            server.serverCertificateManager.referenceCounter--;
         }
     }
 
@@ -681,6 +686,7 @@ export class RegisterServerManager extends EventEmitter implements IRegisterServ
                 this._registration_client = null;
                 await tmp.disconnect();
             }
+            server.serverCertificateManager.referenceCounter--;
         }
     }
 

package/source/register_server_manager_mdns_only.ts

@@ -40,7 +40,7 @@ export class RegisterServerManagerMDNSONLY extends EventEmitter implements IRegi
     }
 
     public async start(): Promise<void> {
-        // istanbul ignore next
+        // c8 ignore next
         if (!this.server) {
             throw new Error("internal error");
         }

package/source/server_end_point.ts

@@ -376,11 +376,11 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
         securityPolicy: SecurityPolicy,
         options: EndpointDescriptionParams
     ): void {
-        // istanbul ignore next
+        // c8 ignore next
         if (securityMode === MessageSecurityMode.None && securityPolicy !== SecurityPolicy.None) {
             throw new Error(" invalid security ");
         }
-        // istanbul ignore next
+        // c8 ignore next
         if (securityMode !== MessageSecurityMode.None && securityPolicy === SecurityPolicy.None) {
             throw new Error(" invalid security ");
         }
@@ -396,7 +396,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
 
         const endpoint_desc = this.getEndpointDescription(securityMode, securityPolicy, endpointUrl);
 
-        // istanbul ignore next
+        // c8 ignore next
         if (endpoint_desc) {
             throw new Error(" endpoint already exist");
         }
@@ -591,7 +591,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
                         this.shutdown_channel(channel, callback1);
                     },
                     (err?: Error | null) => {
-                        /* istanbul ignore next */
+                        /* c8 ignore next */
                         if (!(Object.keys(this._channels).length === 0)) {
                             errorLog(" Bad !");
                         }
@@ -673,7 +673,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
         this._listen_callback = undefined;
         this._server
             .on("connection", (socket: NodeJS.Socket) => {
-                // istanbul ignore next
+                // c8 ignore next
                 if (doDebug) {
                     this._dump_statistics();
                     debugLog("server connected  with : " + (socket as any).remoteAddress + ":" + (socket as any).remotePort);
@@ -859,7 +859,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
         this.transactionsCountOldChannels += channel.transactionsCount;
         delete this._channels[channel.hashKey];
 
-        // istanbul ignore next
+        // c8 ignore next
         if (doDebug) {
             this._dump_statistics();
             debugLog("un-registering channel  - Count = ", this.currentChannelCount);
@@ -899,7 +899,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
         const nbConnections = this.activeChannelCount;
 
         if (nbConnections >= this.maxConnections) {
-            // istanbul ignore next
+            // c8 ignore next
             errorLog(chalk.bgRed.white("PREVENTING DDOS ATTACK => maxConnection =" + this.maxConnections));
 
             const unused_channels: ServerSecureChannelLayer[] = this.getChannels().filter((channel1: ServerSecureChannelLayer) => {
@@ -913,7 +913,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
                 );
                 // all channels are in used , we cannot get any
                 errorLog(`All channels are in used ! we cannot cancel any ${this.getChannels().length}`);
-                // istanbul ignore next
+                // c8 ignore next
                 if (doDebug) {
                     console.log("  - all channels are used !!!!");
                     false && dumpChannelInfo(this.getChannels());
@@ -921,7 +921,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
                 setTimeout(deny_connection, 1000);
                 return;
             }
-            // istanbul ignore next
+            // c8 ignore next
             if (doDebug) {
                 console.log(
                     "   - Unused channels that can be clobbered",
@@ -931,7 +931,7 @@ export class OPCUAServerEndPoint extends EventEmitter implements ServerSecureCha
             const channel = unused_channels[0];
             errorLog(`${unused_channels.length} : Forcefully closing oldest channel that have no session: ${channel.hashKey}`);
             channel.close(() => {
-                // istanbul ignore next
+                // c8 ignore next
                 if (doDebug) {
                     console.log("   _ Unused channel has been closed ", channel.hashKey);
                 }
@@ -1116,7 +1116,7 @@ function _makeEndpointDescription(options: MakeEndpointDescriptionOptions, paren
             //  when channel session security is not "None",
             //  userIdentityTokens can be left to null.
             //  in this case this mean that secure policy will be the same as connection security policy
-            // istanbul ignore next
+            // c8 ignore next
             if (process.env.NODEOPCUA_SERVER_EMULATE_SIEMENS) {
                 // However, for some reason SIEMENS plc requires that password get encrypted even though
                 // the secure channel is also encrypted ....

package/source/server_engine.ts

@@ -413,15 +413,15 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
             "http://opcfoundation.org/UA-Profile/Server/Standard", // Standard UA Server Profile",
             "http://opcfoundation.org/UA-Profile/Server/DataAccess",
             "http://opcfoundation.org/UA-Profile/Server/ComplexTypes2017",
-             "http://opcfoundation.org/UA-Profile/Server/Events",
+            "http://opcfoundation.org/UA-Profile/Server/Events",
             "http://opcfoundation.org/UA-Profile/Client/HistoricalAccess",
             "http://opcfoundation.org/UA-Profile/Server/Methods",
             "http://opcfoundation.org/UA-Profile/Server/StandardEventSubscription",
             "http://opcfoundation.org/UA-Profile/Transport/uatcp-uasc-uabinary",
             "http://opcfoundation.org/UA-Profile/Server/FileAccess",
             "http://opcfoundation.org/UA-Profile/Server/StateMachine",
-            
-       
+
+
             // "http://opcfoundation.org/UA-Profile/Transport/wss-uajson",
             // "http://opcfoundation.org/UA-Profile/Transport/wss-uasc-uabinary"
             // "http://opcfoundation.org/UA-Profile/Server/DurableSubscription"
@@ -775,7 +775,7 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
                 callback(err);
             })
             .then(() => {
-                /* istanbul ignore next */
+                /* c8 ignore next */
                 if (!this.addressSpace) {
                     throw new Error("Internal error");
                 }
@@ -864,7 +864,7 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
                     // make sur the provided function returns a valid value for the variant type
                     // This test may not be exhaustive but it will detect obvious mistakes.
 
-                    /* istanbul ignore next */
+                    /* c8 ignore next */
                     if (!isValidVariant(VariantArrayType.Scalar, dataType, func())) {
                         errorLog("func", func());
                         throw new Error("bindStandardScalar : func doesn't provide an value of type " + DataType[dataType]);
@@ -1303,8 +1303,8 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
                         return;
                     }
                     const outputArguments = getMonitoredItemsMethod.outputArguments!;
-                        const dataValue = outputArguments.readValue();
-                        if (!dataValue.value?.value) {
+                    const dataValue = outputArguments.readValue();
+                    if (!dataValue.value?.value) {
                         // value is null or undefined , meaning no arguments necessary
                         return;
                     }
@@ -1553,7 +1553,7 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
 
         const session = this.getSession(authenticationToken);
 
-        // istanbul ignore next
+        // c8 ignore next
         if (!session) {
             throw new Error("cannot find session with this authenticationToken " + authenticationToken.toString());
         }
@@ -1689,7 +1689,7 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
             statusCode: StatusCodes.Good
         });
 
-        // istanbul ignore next
+        // c8 ignore next
         if (doDebug) {
             debugLog("TransferResult", result.toString());
         }
@@ -1894,21 +1894,22 @@ export class ServerEngine extends EventEmitter implements IAddressSpaceAccessor
         if (!methodNode) {
             return;
         }
-        // istanbul ignore else
         if (methodNode && methodNode.bindMethod) {
             methodNode.bindMethod(func);
-        } else {
+        }
+        /* c8 ignore next */
+        else {
             warningLog(
                 chalk.yellow("WARNING:  cannot bind a method with id ") +
-                    chalk.cyan(nodeId.toString()) +
-                    chalk.yellow(". please check your nodeset.xml file or add this node programmatically")
+                chalk.cyan(nodeId.toString()) +
+                chalk.yellow(". please check your nodeset.xml file or add this node programmatically")
             );
             warningLog(traceFromThisProjectOnly());
         }
     }
 
     private _getServerSubscriptionDiagnosticsArrayNode(): UADynamicVariableArray<SubscriptionDiagnosticsDataType> | null {
-        // istanbul ignore next
+        // c8 ignore next
         if (!this.addressSpace) {
             doDebug && debugLog("ServerEngine#_getServerSubscriptionDiagnosticsArray : no addressSpace");
 

package/source/server_publish_engine.ts

@@ -410,7 +410,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         callback = callback || dummy_function;
         assert(typeof callback === "function");
 
-        // istanbul ignore next
+        // c8 ignore next
         if (!(request instanceof PublishRequest)) {
             throw new Error("Internal error : expecting a Publish Request here");
         }
@@ -470,7 +470,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
             }
             late_subscriptions.sort(compare_subscriptions);
 
-            // istanbul ignore next
+            // c8 ignore next
             if (doDebug) {
                 debugLog(
                     late_subscriptions
@@ -599,7 +599,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         //  Notification Message that is to be sent.
 
         const subscription = this.getSubscriptionById(subscriptionId);
-        /* istanbul ignore next */
+        /* c8 ignore next */
         if (!subscription) {
             traceLog("send_keep_alive_response  => invalid subscriptionId = ", subscriptionId);
             return false;
@@ -652,7 +652,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
 
         const invalid_published_request = parts[0];
         for (const publishData of invalid_published_request) {
-            // istanbul ignore next
+            // c8 ignore next
             if (doDebug) {
                 debugLog(chalk.cyan(" CANCELING TIMEOUT PUBLISH REQUEST "));
             }
@@ -664,7 +664,7 @@ export class ServerSidePublishEngine extends EventEmitter implements IServerSide
         publishData.callback(publishData.request, response);
     }
     public _send_valid_response_for_request(publishData: PublishData, response: PublishResponse): void {
-        // istanbul ignore next
+        // c8 ignore next
         if (doDebug) {
             debugLog("_send_response_for_request ", response.toString());
         }