refactor: usertoken in constructor

umati · Sep 16, 2024 · 74eca47 · 74eca47
1 parent a753599
commit 74eca47
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -1,8 +1,9 @@
+import { UserTokenType } from "node-opcua";
 import { OpcUaDeviceProxyClass } from "./ua-device";
 
-const UaDevice = new OpcUaDeviceProxyClass("opc.tcp://opcua.umati.app:4843")
-// const UaDevice = new OpcUaDeviceProxyClass("opc.tcp://opcua.umati.app:4840")
-// const UaDevice = new OpcUaDeviceProxyClass("opc.tcp://127.0.0.1:4840")
+// const UaDevice = new OpcUaDeviceProxyClass("opc.tcp://opcua.umati.app:4843", { type: UserTokenType.Anonymous })
+// const UaDevice = new OpcUaDeviceProxyClass("opc.tcp://opcua.umati.app:4840", { type: UserTokenType.Anonymous })
+const UaDevice = new OpcUaDeviceProxyClass("opc.tcp://127.0.0.1:4840", { type: UserTokenType.Anonymous })
 
 ;(async () => {
     function shutdown() {

diff --git a/src/ua-device.ts b/src/ua-device.ts
@@ -4,7 +4,6 @@ import {
     ClientSession,
     CreateSubscriptionRequestOptions,
     UserIdentityInfo,
-    UserTokenType,
     DataValue,
     StatusCode,
     AttributeIds,
@@ -127,17 +126,15 @@ const createSubscriptionRequest: CreateSubscriptionRequestOptions = {
     // priority: 1,
 }
 
-let userIdentityInfo: UserIdentityInfo = {
-    type: UserTokenType.Anonymous
-}
-
 export class OpcUaDeviceProxyClass {
 
     readonly endpoint: string
     readonly client: OPCUAClient
+    readonly userIdentityInfo: UserIdentityInfo
 
     private session: ClientSession | undefined
     private subscription: ClientSubscription | undefined
+
     private monitoredItemValueMap: Map<string, ClientMonitoredItem> = new Map()
     private namespaceArray: string[] = []
     private serverProfileArray: string[] = []
@@ -158,8 +155,9 @@ export class OpcUaDeviceProxyClass {
     private findMachinesOnServerInterval: NodeJS.Timeout | undefined
     private updateSummeryInterval: NodeJS.Timeout | undefined
 
-    constructor (endpoint: string) {
+    constructor (endpoint: string, userIdentityInfo: UserIdentityInfo) {
         this.endpoint = endpoint
+        this.userIdentityInfo = userIdentityInfo
         this.client = OPCUAClient.create(optionsInitial)
         this.client.on("backoff", (retry: number, delay: number) => {
             console.warn(`OPC UA Client: unable to connect to the OPC UA Device @ '${endpoint}' - attempt '${retry}' retrying in '${delay / 1000.0}' seconds`)
@@ -316,7 +314,7 @@ export class OpcUaDeviceProxyClass {
 
     async initialize() {
         await this.client.connect(this.endpoint)
-        await this.createSession(userIdentityInfo)
+        await this.createSession(this.userIdentityInfo)
         await this.readServerState()
         if (this.serverState > 0) {
             console.error(`OPC UA Client: OPC UA Device @ '${this.endpoint}' has invalid ServerState '${this.serverState}'`)