node-opcua-server 2.68.1 → 2.70.0

package/source/opcua_server.ts

@@ -167,8 +167,7 @@ import { CreateMonitoredItemHook, DeleteMonitoredItemHook, Subscription } from "
 import { ISocketData } from "./i_socket_data";
 import { IChannelData } from "./i_channel_data";
 import { UAUserManagerBase, makeUserManager, UserManagerOptions } from "./user_manager";
-import { bindRoleSet} from "./user_manager_ua";
-
+import { bindRoleSet } from "./user_manager_ua";
 
 function isSubscriptionIdInvalid(subscriptionId: number): boolean {
     return subscriptionId < 0 || subscriptionId >= 0xffffffff;
@@ -605,7 +604,8 @@ function validate_applicationUri(channel: ServerSecureChannelLayer, request: Cre
         return true; // can't check
     }
     const e = exploreCertificate(clientCertificate);
-    const applicationUriFromCert = e.tbsCertificate.extensions!.subjectAltName.uniformResourceIdentifier[0];
+    const uniformResourceIdentifier = e.tbsCertificate.extensions!.subjectAltName?.uniformResourceIdentifier ?? null;
+    const applicationUriFromCert = uniformResourceIdentifier && uniformResourceIdentifier.length > 0 ? uniformResourceIdentifier[0] : null;
 
     /* istanbul ignore next */
     if (applicationUriFromCert !== applicationUri) {
@@ -848,7 +848,7 @@ export interface OPCUAServerOptions extends OPCUABaseServerOptions, OPCUAServerE
      * - MDNS: the server publish itself to the mDNS Multicast network directly
      * - LDS: the server registers itself to the LDS or LDS-ME (Local Discovery Server)
      *
-     *  @default  RegisterServerMethod.HIDDEN - by default the server
+     *  @default    .HIDDEN - by default the server
      *            will not register itself to the local discovery server
      *
      */
@@ -1309,8 +1309,8 @@ export class OPCUAServer extends OPCUABaseServer {
         debugLog("OPCUAServer is now unregistering itself from  the discovery server " + this.buildInfo);
         this.registerServerManager!.stop((err?: Error | null) => {
             debugLog("OPCUAServer unregistered from discovery server", err);
-            setTimeout(() => {
-                this.engine.shutdown();
+            setTimeout(async () => {
+                await this.engine.shutdown();
 
                 debugLog("OPCUAServer#shutdown: started");
                 OPCUABaseServer.prototype.shutdown.call(this, (err1?: Error) => {
@@ -1403,7 +1403,7 @@ export class OPCUAServer extends OPCUABaseServer {
         clientCertificate: Certificate,
         clientNonce: Nonce
     ): SignatureData | undefined {
-        return computeSignature(clientCertificate, clientNonce, this.getPrivateKey(), channel.messageBuilder.securityPolicy);
+        return computeSignature(clientCertificate, clientNonce, this.getPrivateKey(), channel.messageBuilder!.securityPolicy);
     }
 
     /**
@@ -1419,7 +1419,7 @@ export class OPCUAServer extends OPCUABaseServer {
         clientSignature: SignatureData
     ): boolean {
         const clientCertificate = channel.receiverCertificate!;
-        const securityPolicy = channel.messageBuilder.securityPolicy;
+        const securityPolicy = channel.messageBuilder!.securityPolicy;
         const serverCertificate = this.getCertificate();
 
         const result = verifySignature(serverCertificate, session.nonce!, clientSignature, clientCertificate, securityPolicy);
@@ -1472,7 +1472,7 @@ export class OPCUAServer extends OPCUABaseServer {
         callback: (err: Error | null, statusCode?: StatusCode) => void
     ): void {
         assert(userIdentityToken instanceof X509IdentityToken);
-        assert(typeof callback === 'function');
+        assert(typeof callback === "function");
 
         const securityPolicy = adjustSecurityPolicy(channel, userTokenPolicy.securityPolicyUri);
 
@@ -1605,7 +1605,7 @@ export class OPCUAServer extends OPCUABaseServer {
         endpointDescription: EndpointDescription,
         callback: (err: Error | null, statusCode?: StatusCode) => void
     ): void {
-        assert(typeof callback === 'function');
+        assert(typeof callback === "function");
         /* istanbul ignore next */
         if (!userIdentityToken) {
             throw new Error("Invalid token");
@@ -2064,10 +2064,9 @@ export class OPCUAServer extends OPCUABaseServer {
                 if (statusCode !== StatusCodes.Good) {
                     /* istanbul ignore next */
                     if (!(statusCode && statusCode instanceof StatusCode)) {
-                        const a = 23;
+                        return rejectConnection(this, StatusCodes.BadCertificateInvalid);
                     }
-                    assert(statusCode && statusCode instanceof StatusCode, "expecting statusCode");
-                    return rejectConnection(this, statusCode!);
+                    return rejectConnection(this, statusCode);
                 }
                 session.userIdentityToken = request.userIdentityToken as UserIdentityToken;
 

package/source/register_server_manager_mdns_only.ts

@@ -29,12 +29,11 @@ export class RegisterServerManagerMDNSONLY extends EventEmitter implements IRegi
 
     public stop(callback: () => void): void {
         if (this.bonjour) {
-            this.bonjour._stop_announcedOnMulticastSubnet();
+            this.bonjour.stopAnnouncedOnMulticastSubnetWithCallback(()=>{
+                this.emit("serverUnregistered");
+                setImmediate(callback);
+            });
         }
-        setImmediate(() => {
-            this.emit("serverUnregistered");
-            setImmediate(callback);
-        });
     }
 
     public start(callback: () => void): void {
@@ -44,13 +43,12 @@ export class RegisterServerManagerMDNSONLY extends EventEmitter implements IRegi
         }
         assert(this.server instanceof OPCUABaseServer);
 
-        this.bonjour._announcedOnMulticastSubnet({
+        this.bonjour.announcedOnMulticastSubnetWithCallback({
             capabilities: this.server.capabilitiesForMDNS,
             name: this.server.serverInfo.applicationUri!,
             path: "/", // <- to do
             port: this.server.endpoints[0].port
-        });
-        setImmediate(() => {
+        }, ()=>{
             this.emit("serverRegistered");
             setImmediate(callback);
         });

package/source/server_engine.ts

@@ -104,9 +104,9 @@ function upperCaseFirst(str: string) {
     return str.slice(0, 1).toUpperCase() + str.slice(1);
 }
 
-function shutdownAndDisposeAddressSpace(this: ServerEngine) {
+async function shutdownAndDisposeAddressSpace(this: ServerEngine) {
     if (this.addressSpace) {
-        this.addressSpace.shutdown();
+        await this.addressSpace.shutdown();
         this.addressSpace.dispose();
         delete (this as any).addressSpace;
     }
@@ -288,6 +288,7 @@ export interface CreateSessionOption {
 
 export type ClosingReason = "Timeout" | "Terminated" | "CloseSession" | "Forcing";
 
+export type ShutdownTask = (this: ServerEngine) => void | Promise<void>;
 /**
  *
  */
@@ -309,7 +310,7 @@ export class ServerEngine extends EventEmitter {
     private _sessions: { [key: string]: ServerSession };
     private _closedSessions: { [key: string]: ServerSession };
     private _orphanPublishEngine?: ServerSidePublishEngineForOrphanSubscription;
-    private _shutdownTasks: ((this: ServerEngine) => void)[];
+    private _shutdownTasks: ShutdownTask[];
     private _applicationUri: string;
     private _expectedShutdownTime!: Date;
     private _serverStatus: ServerStatusDataType;
@@ -473,7 +474,7 @@ export class ServerEngine extends EventEmitter {
     /**
      * @method shutdown
      */
-    public shutdown(): void {
+    public async shutdown(): Promise<void> {
         debugLog("ServerEngine#shutdown");
 
         this._internalState = "shutdown";
@@ -504,7 +505,7 @@ export class ServerEngine extends EventEmitter {
 
         // perform registerShutdownTask
         for (const task of this._shutdownTasks) {
-            task.call(this);
+            await task.call(this);
         }
 
         this.dispose();
@@ -1078,8 +1079,6 @@ export class ServerEngine extends EventEmitter {
                 });
             };
 
- 
-
             bindServerDiagnostics();
 
             bindServerStatus();
@@ -1090,7 +1089,7 @@ export class ServerEngine extends EventEmitter {
 
             const bindExtraStuff = () => {
                 // mainly for compliance
-
+                /*
                 // The version number for the data type description. i=104
                 bindStandardScalar(VariableIds.DataTypeDescriptionType_DataTypeVersion, DataType.String, () => {
                     return "0";
@@ -1125,6 +1124,7 @@ export class ServerEngine extends EventEmitter {
                         return namingRuleType.MandatoryPlaceholder ? namingRuleType.MandatoryPlaceholder.value : 0;
                     });
                 }
+*/
             };
 
             bindExtraStuff();
@@ -1893,7 +1893,7 @@ export class ServerEngine extends EventEmitter {
     ): void {
         const referenceTime = new Date(Date.now() - maxAge);
 
-        assert(typeof callback === 'function');
+        assert(typeof callback === "function");
         const objectMap: Record<string, BaseNode> = {};
         for (const nodeToRefresh of nodesToRefresh) {
             // only consider node  for which the caller wants to read the Value attribute
@@ -2078,7 +2078,7 @@ export class ServerEngine extends EventEmitter {
         callback: CallbackT<HistoryReadResult>
     ): void {
         assert(context instanceof SessionContext);
-        assert(typeof callback === 'function');
+        assert(typeof callback === "function");
 
         const nodeId = nodeToRead.nodeId;
         const indexRange = nodeToRead.indexRange;