chore(opcua-binding): fix file naming inconsistency #1423

Author: erossignon

packages/binding-opcua/src/find-most-secure-channel.ts

@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR W3C-20150513
  ********************************************************************************/
 
-import { coerceSecurityPolicy, MessageSecurityMode, OPCUAClient, s, SecurityPolicy } from "node-opcua-client";
+import { MessageSecurityMode, OPCUAClient, SecurityPolicy } from "node-opcua-client";
 
 function getPriority(securityPolicy: string | null, securityMode: MessageSecurityMode): number {
     const encryptWeight = securityMode === MessageSecurityMode.SignAndEncrypt ? 100 : 0;
@@ -77,26 +77,22 @@ interface EndpointDescriptionMini {
     securityPolicyUri: string | null;
 }
 
+const defaultEndpoint: EndpointDescriptionMini = {
+    endpointUrl: null,
+    securityMode: MessageSecurityMode.None,
+    securityPolicyUri: SecurityPolicy.None,
+};
+
 async function findMostSecureChannelInternal(client: OPCUAClient): Promise<EndpointDescriptionMini> {
     let endpoints = await client.getEndpoints();
 
     // sort in descending order of security level
     endpoints = endpoints.sort((a, b) => {
         const securityLevelA = getPriority(a.securityPolicyUri, a.securityMode);
         const securityLevelB = getPriority(b.securityPolicyUri, b.securityMode);
-        if (securityLevelA !== securityLevelB) {
-            return securityLevelB - securityLevelA;
-        }
-        // keep original order
-        return 0;
+        return securityLevelB - securityLevelA;
     });
-    return (
-        endpoints[0]! || {
-            endpointUrl: null,
-            securityMode: MessageSecurityMode.None,
-            securityPolicyUri: SecurityPolicy.None,
-        }
-    );
+    return endpoints.length > 0 ? endpoints[0] : defaultEndpoint;
 }
 
 export async function findMostSecureChannel(

packages/binding-opcua/src/index.ts

@@ -16,5 +16,5 @@
 export * from "./factory";
 export * from "./codec";
 export * from "./opcua-protocol-client";
-export * from "./security_scheme";
+export * from "./security-scheme";
 // no protocol_client here => get access from factor

packages/binding-opcua/src/opcua-protocol-client.ts

@@ -63,7 +63,7 @@ import { Argument, BrowseDescription, BrowseResult, MessageSecurityMode, UserTok
 import { isGoodish2, ReferenceTypeIds } from "node-opcua";
 
 import { schemaDataValue } from "./codec";
-import { OPCUACAuthenticationScheme, OPCUAChannelSecurityScheme } from "./security_scheme";
+import { OPCUACAuthenticationScheme, OPCUAChannelSecurityScheme } from "./security-scheme";
 import { CertificateManagerSingleton } from "./certificate-manager-singleton";
 import { resolveChannelSecurity, resolvedUserIdentity } from "./opcua-security-resolver";
 import { findMostSecureChannel } from "./find-most-secure-channel";

packages/binding-opcua/src/opcua-security-resolver.ts

@@ -21,7 +21,7 @@ import {
     UserTokenType,
 } from "node-opcua-client";
 import { convertPEMtoDER } from "node-opcua-crypto";
-import { OPCUACAuthenticationScheme, OPCUAChannelSecurityScheme } from "./security_scheme";
+import { OPCUACAuthenticationScheme, OPCUAChannelSecurityScheme } from "./security-scheme";
 
 export interface OPCUAChannelSecuritySettings {
     securityPolicy: SecurityPolicy;