node-opcua-client-proxy 2.55.0 → 2.58.0

package/source/proxy_object.ts

@@ -1,14 +1,13 @@
-/**
- * @module node-opcua-client-proxy
- */
-import { NodeClass } from "node-opcua-data-model";
-import { NodeId } from "node-opcua-nodeid";
-import { ProxyBaseNode } from "./proxy_base_node";
-import { UAProxyManager } from "./proxy_manager";
-
-export class ProxyObject extends ProxyBaseNode {
-
-    constructor(proxyManager: UAProxyManager, nodeId: NodeId) {
-        super(proxyManager, nodeId, NodeClass.Object);
-    }
-}
+/**
+ * @module node-opcua-client-proxy
+ */
+import { NodeClass } from "node-opcua-data-model";
+import { NodeId } from "node-opcua-nodeid";
+import { ProxyBaseNode } from "./proxy_base_node";
+import { UAProxyManager } from "./proxy_manager";
+
+export class ProxyObject extends ProxyBaseNode {
+    constructor(proxyManager: UAProxyManager, nodeId: NodeId) {
+        super(proxyManager, nodeId, NodeClass.Object);
+    }
+}

package/source/proxy_state.ts

@@ -2,20 +2,20 @@
  * @module node-opcua-client-proxy
  */
 import { NodeId } from "node-opcua-nodeid";
+import { ProxyNode } from "./proxy_transition";
 
 export class ProxyState {
-
     private _node: any;
 
-    constructor(proxyNode: any) {
-        Object.defineProperty(this, "_node", { value: proxyNode, enumerable: false });
+    constructor(proxyNode: ProxyNode) {
+        this._node = proxyNode;
     }
 
-    public get browseName() {
+    public get browseName(): string {
         return this._node.browseName.toString();
     }
 
-    public get stateNumber() {
+    public get stateNumber(): string {
         // note stateNumber has no real dataValue
         return this._node.stateNumber.nodeId.value.toString();
     }
@@ -26,11 +26,10 @@ export class ProxyState {
     }
 
     public toString(): string {
-
         return "state " + this.browseName + " stateNumber :" + this.stateNumber.toString();
     }
 }
 
-export function makeProxyState(node: any) {
+export function makeProxyState(node: ProxyNode): ProxyState {
     return new ProxyState(node);
 }

package/source/proxy_state_machine.ts

@@ -1,25 +1,23 @@
-/**
- * @module node-opcua-client-proxy
- */
-import { EventEmitter } from "events";
-import { assert } from "node-opcua-assert";
-import { NodeId } from "node-opcua-nodeid";
-import { UAProxyManager } from "./proxy_manager";
-
-export class StateMachineProxy extends EventEmitter {
-
-    public nodeId: NodeId;
-    private proxyManager: UAProxyManager;
-
-    constructor(proxyManager: UAProxyManager, nodeId: NodeId) {
-
-        super();
-        this.nodeId = nodeId;
-        this.proxyManager = proxyManager;
-        assert(this.proxyManager.session, "expecting valid session");
-        Object.defineProperty(this, "proxyManager", {
-            enumerable: false,
-            writable: true
-        });
-    }
-}
+/**
+ * @module node-opcua-client-proxy
+ */
+import { EventEmitter } from "events";
+import { assert } from "node-opcua-assert";
+import { NodeId } from "node-opcua-nodeid";
+import { UAProxyManager } from "./proxy_manager";
+
+export class StateMachineProxy extends EventEmitter {
+    public nodeId: NodeId;
+    private proxyManager: UAProxyManager;
+
+    constructor(proxyManager: UAProxyManager, nodeId: NodeId) {
+        super();
+        this.nodeId = nodeId;
+        this.proxyManager = proxyManager;
+        assert(this.proxyManager.session, "expecting valid session");
+        Object.defineProperty(this, "proxyManager", {
+            enumerable: false,
+            writable: true
+        });
+    }
+}

package/source/proxy_transition.ts

@@ -1,31 +1,41 @@
+import { QualifiedName } from "node-opcua-data-model";
+import { NodeId } from "node-opcua-nodeid";
+
+export interface ProxyNode {
+    nodeId: NodeId;
+    browseName: QualifiedName;
+    $fromState: ProxyNode;
+    $toState: ProxyNode;
+    $components: ProxyNode[];
+    typeDefinition?: { toString(): string };
+}
 /**
  * @module node-opcua-client-proxy
  */
 export class ProxyTransition {
+    private _node: ProxyNode;
 
-    private _node: any;
-
-    constructor(proxyNode: any) {
-        Object.defineProperty(this, "_node", {value: proxyNode, enumerable: false});
+    constructor(proxyNode: ProxyNode) {
+        this._node = proxyNode;
     }
 
-    get nodeId() {
+    get nodeId(): string {
         // note stateNumber has no real dataValue
         return this._node.nodeId.value.toString();
     }
 
-    get browseName() {
+    get browseName(): string {
         return this._node.browseName.toString();
     }
 
-    get fromStateNode() {
+    get fromStateNode(): ProxyNode {
         return this._node.$fromState;
     }
 
-    get toStateNode() {
+    get toStateNode(): ProxyNode {
         return this._node.$toState;
     }
 }
-export function makeProxyTransition(node: any) {
+export function makeProxyTransition(node: ProxyNode): ProxyTransition {
     return new ProxyTransition(node);
 }

package/source/proxy_variable.ts

@@ -1,15 +1,14 @@
-/**
- * @module node-opcua-client-proxy
- */
-import { NodeClass } from "node-opcua-data-model";
-import { NodeId } from "node-opcua-nodeid";
-import { ReferenceDescription } from "node-opcua-service-browse";
-import { ProxyBaseNode } from "./proxy_base_node";
-import { UAProxyManager } from "./proxy_manager";
-
-export class ProxyVariable extends ProxyBaseNode {
-
-    constructor(proxyManager: UAProxyManager, nodeId: NodeId, reference: ReferenceDescription) {
-        super(proxyManager, nodeId, NodeClass.Variable);
-    }
-}
+/**
+ * @module node-opcua-client-proxy
+ */
+import { NodeClass } from "node-opcua-data-model";
+import { NodeId } from "node-opcua-nodeid";
+import { ReferenceDescription } from "node-opcua-service-browse";
+import { ProxyBaseNode } from "./proxy_base_node";
+import { UAProxyManager } from "./proxy_manager";
+
+export class ProxyVariable extends ProxyBaseNode {
+    constructor(proxyManager: UAProxyManager, nodeId: NodeId, reference: ReferenceDescription) {
+        super(proxyManager, nodeId, NodeClass.Variable);
+    }
+}

package/source/state_machine_proxy.ts

@@ -1,57 +1,59 @@
-/**
- * @module node-opcua-client-proxy
- */
-import { assert } from "node-opcua-assert";
-import { makeProxyState, ProxyState } from "./proxy_state";
-import { makeProxyTransition, ProxyTransition } from "./proxy_transition";
-
-export class ProxyStateMachineType {
-
-    public initialState: ProxyState | undefined;
-    public states: ProxyState[];
-    public transitions: ProxyTransition[];
-
-    constructor(obj: any) {
-
-        const localInitialState = obj.$components.filter((component: any) => {
-            if (!component.typeDefinition) {
-                return false;
-            }
-            return component.typeDefinition.toString() === "InitialStateType";
-        });
-
-        if (localInitialState.length) {
-            assert(localInitialState.length === 1);
-            this.initialState = new ProxyState(localInitialState[0]);
-        } else {
-            this.initialState = undefined;
-        }
-
-        this.states = obj.$components.filter((component: any) => {
-            if (!component.typeDefinition) {
-                return false;
-            }
-            return component.typeDefinition.toString() === "StateType";
-        }).map(makeProxyState);
-
-        this.transitions = obj.$components.filter((component: any) => {
-            if (!component.typeDefinition) {
-                return false;
-            }
-            return component.typeDefinition.toString() === "TransitionType";
-        }).map(makeProxyTransition);
-    }
-
-    // var initialStateTypeId = makeRefId("InitialStateType");
-    //
-    // var initialStateType = addressSpace.findObjectType("InitialStateType");
-    // should(!!initialStateType).eql(true);
-    //
-    // var stateType = addressSpace.findObjectType("StateType");
-    // should(!!stateType).eql(true);
-    //
-    // var transitionType = addressSpace.findObjectType("TransitionType");
-    // should(!!transitionType).eql(true);
-
-    // }
-}
+/**
+ * @module node-opcua-client-proxy
+ */
+import { assert } from "node-opcua-assert";
+import { makeProxyState, ProxyState } from "./proxy_state";
+import { makeProxyTransition, ProxyNode, ProxyTransition } from "./proxy_transition";
+
+export class ProxyStateMachineType {
+    public initialState: ProxyState | undefined;
+    public states: ProxyState[];
+    public transitions: ProxyTransition[];
+
+    constructor(obj: ProxyNode) {
+        const localInitialState = obj.$components.filter((component: any) => {
+            if (!component.typeDefinition) {
+                return false;
+            }
+            return component.typeDefinition.toString() === "InitialStateType";
+        });
+
+        if (localInitialState.length) {
+            assert(localInitialState.length === 1);
+            this.initialState = new ProxyState(localInitialState[0]);
+        } else {
+            this.initialState = undefined;
+        }
+
+        this.states = obj.$components
+            .filter((component: any) => {
+                if (!component.typeDefinition) {
+                    return false;
+                }
+                return component.typeDefinition.toString() === "StateType";
+            })
+            .map(makeProxyState);
+
+        this.transitions = obj.$components
+            .filter((component: ProxyNode) => {
+                if (!component.typeDefinition) {
+                    return false;
+                }
+                return component.typeDefinition.toString() === "TransitionType";
+            })
+            .map(makeProxyTransition);
+    }
+
+    // var initialStateTypeId = makeRefId("InitialStateType");
+    //
+    // var initialStateType = addressSpace.findObjectType("InitialStateType");
+    // should(!!initialStateType).eql(true);
+    //
+    // var stateType = addressSpace.findObjectType("StateType");
+    // should(!!stateType).eql(true);
+    //
+    // var transitionType = addressSpace.findObjectType("TransitionType");
+    // should(!!transitionType).eql(true);
+
+    // }
+}