opcua-webapi-ts 1.1.4 → 1.1.6

package/dist/cjs/common/nodes/UaDataType.js

@@ -20,38 +20,6 @@ class UaDataType extends _1.UaDefintionNode {
     get enumValues() {
         return this._enumValues;
     }
-    setEnumVariable(node) {
-        if ("EnumStrings" == node.browseName ||
-            "EnumValues" == node.browseName) {
-            this.setEnumValues(node.value);
-        }
-    }
-    setEnumValues(value) {
-        if (types_1.UaVariantType.LocalizedText == value.type) {
-            let enumStrings = value.toLocalizedTexts();
-            if (null == enumStrings)
-                return;
-            this._enumValues = new Map;
-            let index = 0;
-            for (let item of enumStrings) {
-                this._enumValues.set(index, item);
-                index++;
-            }
-        }
-        else if (types_1.UaVariantType.ExtensionObject == value.type) {
-            let extensionObjects = value.toExtensionObjects();
-            if (null == extensionObjects)
-                return;
-            let enumValues = new Map;
-            for (let item of extensionObjects) {
-                let enumValue = structure_1.UaEnumValueType.fromExtensionObject(item);
-                if (!enumValue)
-                    return;
-                enumValues.set(enumValue.value, enumValue.displayName);
-            }
-            this._enumValues = enumValues;
-        }
-    }
     classify() {
         let isBasicDataType = false;
         if (0 == this._nodeId.nsIndex) {
@@ -73,7 +41,7 @@ class UaDataType extends _1.UaDefintionNode {
         if (this._enumValues) {
             for (let item of this._enumValues) {
                 enumValues.push({
-                    value: item[0],
+                    index: item[0],
                     text: item[1].text
                 });
             }
@@ -85,9 +53,42 @@ class UaDataType extends _1.UaDefintionNode {
             displayName: this._displayName.text,
             description: (this._description) ? this._description.text : undefined,
             isAbstract: this._isAbstract,
-            enumValues: (enumValues.length == 0) ? enumValues : undefined
+            enumValues: (enumValues.length != 0) ? enumValues : undefined
         };
         return ret;
     }
+    setEnumVariable(node) {
+        if ("EnumStrings" == node.browseName ||
+            "EnumValues" == node.browseName) {
+            if (node.value)
+                this.setEnumValues(node.value);
+        }
+    }
+    setEnumValues(value) {
+        if (types_1.UaVariantType.LocalizedText == value.type) {
+            let enumStrings = value.toLocalizedTexts();
+            if (null == enumStrings)
+                return;
+            this._enumValues = new Map;
+            let index = 0;
+            for (let item of enumStrings) {
+                this._enumValues.set(index, item);
+                index++;
+            }
+        }
+        else if (types_1.UaVariantType.ExtensionObject == value.type) {
+            let extensionObjects = value.toExtensionObjects();
+            if (null == extensionObjects)
+                return;
+            let enumValues = new Map;
+            for (let item of extensionObjects) {
+                let enumValue = structure_1.UaEnumValueType.fromExtensionObject(item);
+                if (!enumValue)
+                    return;
+                enumValues.set(enumValue.value, enumValue.displayName);
+            }
+            this._enumValues = enumValues;
+        }
+    }
 }
 exports.UaDataType = UaDataType;

package/dist/cjs/common/nodes/UaMethod.js

@@ -66,8 +66,8 @@ class UaMethod extends _1.UaInstanceNode {
             name: this._browseName,
             displayName: this._displayName.text,
             description: (this._description) ? this._description.text : undefined,
-            inputArguments: inputArgs,
-            outputArguments: outputArgs
+            inputArguments: (inputArgs.length != 0) ? inputArgs : undefined,
+            outputArguments: (outputArgs.length != 0) ? outputArgs : undefined
         };
         return ret;
     }

package/dist/cjs/common/nodes/UaObject.js

@@ -59,7 +59,7 @@ class UaObject extends _1.UaInstanceNode {
             name: this._browseName,
             displayName: this._displayName.text,
             description: (this._description) ? this._description.text : undefined,
-            typeDefinition: this._typeDefinitionId.toString(),
+            typeDefinitionId: this._typeDefinitionId.toString(),
             eventNotifier: this._eventNotifier,
             children: (children.length != 0) ? children : undefined
         };

package/dist/cjs/common/nodes/UaVariable.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UaVariable = void 0;
 const opcua_webapi_1 = require("opcua-webapi");
-const types_1 = require("../types");
 const _1 = require(".");
 class UaVariable extends _1.UaInstanceNode {
     constructor(nodeId, browseName, displayName, dataType, valueRank, accessLevel, userAccessLevel, historizing, typeDefinitionId) {
@@ -12,8 +11,8 @@ class UaVariable extends _1.UaInstanceNode {
         this._accessLevel = accessLevel;
         this._userAccessLevel = userAccessLevel;
         this._historizing = historizing;
-        this._value = types_1.UaVariant.null();
         this._typeDefinitionId = typeDefinitionId;
+        this._dataValue = null;
     }
     get nodeClass() {
         return opcua_webapi_1.NodeClass.Variable;
@@ -34,10 +33,13 @@ class UaVariable extends _1.UaInstanceNode {
         return this._historizing;
     }
     get value() {
-        return this._value;
+        return (this._dataValue && this._dataValue.statusCode.isGood()) ? this._dataValue.value : null;
     }
-    set value(val) {
-        this._value = val;
+    get dataValue() {
+        return this._dataValue;
+    }
+    set dataValue(value) {
+        this._dataValue = value;
     }
     get typeDefinitionId() {
         return this._typeDefinitionId;
@@ -64,10 +66,12 @@ class UaVariable extends _1.UaInstanceNode {
             nodeClass: opcua_webapi_1.NodeClass.Variable,
             name: this._browseName,
             displayName: this._displayName.text,
-            typeDefinition: this._typeDefinitionId.toString(),
+            typeDefinitionId: this._typeDefinitionId.toString(),
             dataType: this._dataType.toString(),
             valueRank: this._valueRank,
             accessLevel: this._accessLevel,
+            historizing: this._historizing,
+            value: this._dataValue ? this._dataValue.value.value : undefined,
             children: (children.length != 0) ? children : undefined
         };
         return ret;

package/dist/cjs/common/structure/UaReadProcessedDetails.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UaReadProcessedDetails = void 0;
+const opcua_webapi_1 = require("opcua-webapi");
+const nodes_1 = require("../nodes");
+const types_1 = require("../types");
+class UaReadProcessedDetails {
+    constructor(startTime, endTime, processingInterval, aggregateType) {
+        this._startTime = startTime;
+        this._endTime = endTime;
+        this._processingInterval = processingInterval;
+        this._aggregateType = (aggregateType) ? aggregateType : null;
+    }
+    get startTime() {
+        return this._startTime;
+    }
+    get endTime() {
+        return this._endTime;
+    }
+    get processingInterval() {
+        return this._processingInterval;
+    }
+    get aggregateType() {
+        return this._aggregateType;
+    }
+    toStruct() {
+        let aggregateType = [];
+        if (this._aggregateType) {
+            for (let item of this._aggregateType) {
+                aggregateType.push(item.toString());
+            }
+        }
+        let details = {
+            StartTime: this.startTime,
+            EndTime: this.endTime,
+            ProcessingInterval: this.processingInterval,
+            AggregateType: aggregateType
+        };
+        return details;
+    }
+    static fromStruct(details) {
+        let startTime = details.StartTime;
+        let endTime = details.EndTime;
+        let processingInterval = details.ProcessingInterval;
+        let aggregateType = null;
+        if (details.AggregateType && details.AggregateType.length > 0) {
+            aggregateType = [];
+            for (let item of details.AggregateType) {
+                let aggregateTypeId = (0, types_1.parseUaNodeIdOrNull)(item);
+                if (null == aggregateTypeId)
+                    continue;
+                aggregateType.push(aggregateTypeId);
+            }
+        }
+        if (null == startTime || null == endTime || null == processingInterval)
+            return null;
+        return new UaReadProcessedDetails(startTime, endTime, processingInterval, aggregateType);
+    }
+    toExtensionObject() {
+        return new types_1.UaExtensionObject(UaReadProcessedDetails.dataTypeId, (0, opcua_webapi_1.ReadProcessedDetailsToJSONTyped)(this.toStruct()));
+    }
+    static fromExtensionObject(extensionObject) {
+        if (!UaReadProcessedDetails.dataTypeId.equal(extensionObject.typeId))
+            return null;
+        let details = (0, opcua_webapi_1.ReadProcessedDetailsFromJSON)(extensionObject.body);
+        return UaReadProcessedDetails.fromStruct(details);
+    }
+}
+exports.UaReadProcessedDetails = UaReadProcessedDetails;
+UaReadProcessedDetails.dataTypeId = new types_1.UaNodeId(nodes_1.DataTypeIds.ReadProcessedDetails);

package/dist/cjs/common/structure/index.js

@@ -26,6 +26,7 @@ __exportStar(require("./UaHistoryEvent"), exports);
 __exportStar(require("./UaLiteralOperand"), exports);
 __exportStar(require("./UaRange"), exports);
 __exportStar(require("./UaReadAtTimeDetails"), exports);
-__exportStar(require("./UaReadEventDetails"), exports);
 __exportStar(require("./UaReadRawModifiedDetails"), exports);
+__exportStar(require("./UaReadProcessedDetails"), exports);
+__exportStar(require("./UaReadEventDetails"), exports);
 __exportStar(require("./UaSimpleAttributeOperand"), exports);

package/dist/cjs/common/types/UaReference.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UaReference = void 0;
+const types_1 = require("../types");
+class UaReference {
+    constructor(nodeId, nodeClass, browseName, displayName, referenceTypeId, typeDefinitionId) {
+        this._nodeId = nodeId;
+        this._nodeClass = nodeClass;
+        this._browseName = (browseName) ? browseName : "";
+        this._displayName = (displayName) ? displayName : types_1.UaLocalizedText.nullText;
+        this._referenceTypeId = (referenceTypeId) ? referenceTypeId : types_1.UaNodeId.nullNodeId;
+        this._typeDefinitionId = (typeDefinitionId) ? typeDefinitionId : types_1.UaNodeId.nullNodeId;
+    }
+    get nodeId() {
+        return this._nodeId;
+    }
+    get nodeClass() {
+        return this._nodeClass;
+    }
+    get browseName() {
+        return this._browseName;
+    }
+    get displayName() {
+        return this._displayName;
+    }
+    set displayName(value) {
+        this._displayName = value;
+    }
+    get referenceTypeId() {
+        return this._referenceTypeId;
+    }
+    set referenceTypeId(value) {
+        this._referenceTypeId = value;
+    }
+    get typeDefinitionId() {
+        return this._typeDefinitionId;
+    }
+    set typeDefinitionId(value) {
+        this._typeDefinitionId = value;
+    }
+    get description() {
+        return this._description;
+    }
+    set description(value) {
+        this._description = value;
+    }
+    toJson() {
+        let ret = {
+            nodeId: this._nodeId.toString(),
+            nodeClass: this._nodeClass,
+            name: this._browseName,
+            displayName: this._displayName.text,
+            description: (this._description) ? this._description.text : undefined,
+            typeDefinitionId: (!this._typeDefinitionId.isEmpty()) ? this._typeDefinitionId.toString() : undefined,
+        };
+        return ret;
+    }
+}
+exports.UaReference = UaReference;

package/dist/cjs/common/types/index.js

@@ -23,7 +23,6 @@ __exportStar(require("./UaHistoryDataResult"), exports);
 __exportStar(require("./UaHistoryEventFieldList"), exports);
 __exportStar(require("./UaHistoryEventResult"), exports);
 __exportStar(require("./UaLocalizedText"), exports);
-__exportStar(require("./UaLink"), exports);
 __exportStar(require("./UaNodeId"), exports);
 __exportStar(require("./UaQuery"), exports);
 __exportStar(require("./UaQueryFilter"), exports);
@@ -34,3 +33,4 @@ __exportStar(require("./UaAccessLevel"), exports);
 __exportStar(require("./UaBrowseMask"), exports);
 __exportStar(require("./UaValueRank"), exports);
 __exportStar(require("./UaWriteMask"), exports);
+__exportStar(require("./UaReference"), exports);

package/dist/client/UaWebClient.d.ts

@@ -22,6 +22,7 @@ export declare class UaWebClient {
     getGeneratedEventType(typeId: UaNodeId): Promise<Array<UaNodeId>>;
     historyReadRawData(nodeId: UaNodeId, startTime: Date, endTime: Date, numValuesPerNode?: number | null, continuationPoint?: string | null, returnBounds?: boolean | null, isReadModified?: boolean | null, timestampsToReturn?: number | null, releaseContinuationPoints?: boolean | null): Promise<UaHistoryDataResult>;
     historyReadAtTime(nodeId: UaNodeId, requiredTimes: Array<Date>, useSimpleBounds?: boolean | null, continuationPoint?: string | null, timestampsToReturn?: number | null, releaseContinuationPoints?: boolean | null): Promise<UaHistoryDataResult>;
+    historyReadProcessed(nodeId: UaNodeId, startTime: Date, endTime: Date, processingInterval: number, aggregateType?: UaNodeId | null, continuationPoint?: string | null, timestampsToReturn?: number | null, releaseContinuationPoints?: boolean | null): Promise<UaHistoryDataResult>;
     historyReadEvent(nodeId: UaNodeId, startTime: Date, endTime: Date, select: Array<string>, where?: UaQuery | null, numValuesPerNode?: number | null, continuationPoint?: string | null, releaseContinuationPoints?: boolean | null): Promise<UaHistoryEventResult>;
     browse(nodesToBrowse: Array<UaBrowseDescription>, maxReferencesPerNode?: number, view?: ViewDescription, additionalParameters?: UaClientParameters): Promise<Array<UaBrowseResult>>;
     browseNext(continuationPoints: Array<string>, releaseContinuationPoints: boolean, additionalParameters?: UaClientParameters): Promise<Array<UaBrowseResult>>;

package/dist/client/UaWebClient.js

@@ -288,7 +288,7 @@ class UaWebClient {
             let details = new common_2.UaReadRawModifiedDetails(startTime, endTime, (numValuesPerNode) ? numValuesPerNode : 0, (returnBounds) ? returnBounds : false, (isReadModified) ? isReadModified : false);
             let historyReadDetails = details.toExtensionObject();
             let nodesToRead = [nodeToRead];
-            let results = yield this.historyRead(nodesToRead, historyReadDetails, (timestampsToReturn) ? timestampsToReturn : opcua_webapi_1.TimestampsToReturn.Neither, (releaseContinuationPoints) ? releaseContinuationPoints : false);
+            let results = yield this.historyRead(nodesToRead, historyReadDetails, (timestampsToReturn) ? timestampsToReturn : opcua_webapi_1.TimestampsToReturn.Both, (releaseContinuationPoints) ? releaseContinuationPoints : false);
             if (results[0].statusCode.isNotGood())
                 throw new common_1.UaError(results[0].statusCode);
             let extensionObject = results[0].historyData;
@@ -309,7 +309,29 @@ class UaWebClient {
             let details = new common_2.UaReadAtTimeDetails(requiredTimes, useSimpleBounds);
             let historyReadDetails = details.toExtensionObject();
             let nodesToRead = [nodeToRead];
-            let results = yield this.historyRead(nodesToRead, historyReadDetails, (timestampsToReturn) ? timestampsToReturn : opcua_webapi_1.TimestampsToReturn.Neither, (releaseContinuationPoints) ? releaseContinuationPoints : false);
+            let results = yield this.historyRead(nodesToRead, historyReadDetails, (timestampsToReturn) ? timestampsToReturn : opcua_webapi_1.TimestampsToReturn.Both, (releaseContinuationPoints) ? releaseContinuationPoints : false);
+            if (results[0].statusCode.isNotGood())
+                throw new common_1.UaError(results[0].statusCode);
+            let extensionObject = results[0].historyData;
+            if (!extensionObject)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
+            let historyData = common_1.UaHistoryData.fromExtensionObject(extensionObject);
+            if (null == historyData)
+                throw new common_1.UaError((0, common_1.makeUaStatusCode)(opcua_webapi_1.StatusCodes.BadDecodingError));
+            let ret = new common_1.UaHistoryDataResult(historyData.dataValues, results[0].continuationPoint);
+            return ret;
+        });
+    }
+    historyReadProcessed(nodeId, startTime, endTime, processingInterval, aggregateType, continuationPoint, timestampsToReturn, releaseContinuationPoints) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let nodeToRead = new common_1.UaHistoryReadValueId(nodeId, continuationPoint);
+            let aggregateTypeId = (aggregateType) ?
+                aggregateType :
+                common_1.UaNodeId.from(common_1.ObjectIds.AggregateFunction_Interpolative);
+            let details = new common_1.UaReadProcessedDetails(startTime, endTime, processingInterval, [aggregateTypeId]);
+            let historyReadDetails = details.toExtensionObject();
+            let nodesToRead = [nodeToRead];
+            let results = yield this.historyRead(nodesToRead, historyReadDetails, (timestampsToReturn) ? timestampsToReturn : opcua_webapi_1.TimestampsToReturn.Both, (releaseContinuationPoints) ? releaseContinuationPoints : false);
             if (results[0].statusCode.isNotGood())
                 throw new common_1.UaError(results[0].statusCode);
             let extensionObject = results[0].historyData;

package/dist/client/utils/UaNodeReader.d.ts

@@ -1,88 +1,60 @@
-import { UaLocalizedText, UaNode, UaNodeId, UaLink } from "../../common";
+import { UaNode, UaNodeId, UaReference } from "../../common";
 import { UaWebClient } from "../UaWebClient";
-type NodeToBrowse = {
+export type BrowseReferenceResult = {
     nodeId: UaNodeId;
-    nodeClassToReturn: number;
+    references: Array<UaReference>;
 };
-type CpToBrowse = {
-    nodeId: UaNodeId;
-    continuationPoint: string;
-};
-type BrowseResult = {
-    fromNodeId: UaNodeId;
-    nodeId: UaNodeId;
-    nodeClass: number;
-    browseName: string;
-    displayName: UaLocalizedText;
-    referenceTypeId: UaNodeId;
-    isForward?: boolean;
-    typeDefinitionId?: UaNodeId;
-};
-type ReadResult = {
-    parentId: UaNodeId;
-    node: UaNode;
-};
-export type ReadChildResult = {
+export type ReadChildNodeResult = {
     nodeId: UaNodeId;
     children: Array<UaNode>;
 };
-export type ReadLinkResult = {
-    nodeId: UaNodeId;
-    links: Array<UaLink>;
-};
-export declare abstract class UaNodeReaderBase {
-    protected _finished: boolean;
-    protected _nodesToBrowse: Array<NodeToBrowse>;
-    protected _continuationPointToBrowse: Array<CpToBrowse>;
-    protected _browseResults: Array<BrowseResult>;
-    protected _readResults: Map<string, ReadResult>;
-    protected _nodeClassToReturn: number;
-    protected _returnDescription: boolean;
-    private static s_variableTypeWithoutMember;
-    private static s_variableNameToReadValue;
-    constructor(returnDescription: boolean, returnVariables: boolean, returnMethod: boolean);
-    protected _browseNodes(client: UaWebClient): Promise<void>;
-    protected _browseContinuationPoints(client: UaWebClient): Promise<void>;
-    protected _readNodes(client: UaWebClient): Promise<void>;
-    protected _buildNodeTree(): void;
-    private _readTypes;
-    private _readObjects;
-    private _readVariables;
-    private _readMethods;
-    private _updateNodesToBrowse;
-}
-export declare class UaNodeReader extends UaNodeReaderBase {
-    private _nodeIds;
-    private _isRootNodeRead;
-    constructor(nodeIds: Array<UaNodeId>, returnDescription?: boolean | null, returnVariables?: boolean | null, returnMethod?: boolean | null);
-    readAll(client: UaWebClient): Promise<void>;
-    read(client: UaWebClient): Promise<void>;
-    isFinish(): boolean;
-    getResults(): Array<UaNode>;
-    private _readRootNodes;
-}
-export declare class UaNodeChildReader extends UaNodeReaderBase {
-    private _nodeIds;
-    constructor(nodeIds: Array<UaNodeId>, returnDescription?: boolean | null, returnVariables?: boolean | null, returnMethod?: boolean | null);
-    readAll(client: UaWebClient): Promise<void>;
-    read(client: UaWebClient): Promise<void>;
-    isFinish(): boolean;
-    getResults(): Array<ReadChildResult>;
-}
-export declare class UaNodeLinkReader {
+export declare class UaNodeReferenceBrowser {
     private _nodesToBrowse;
     private _continuationPointToBrowse;
-    private _browseResults;
+    private _referenceType;
+    private _nodeClassToReturn;
     private _returnDescription;
+    private _maxNodesPerBrowse;
+    private _maxReferencesPerNode;
     private _readResults;
-    constructor(nodeIds: Array<UaNodeId>, returnDescription?: boolean | null);
-    readAll(client: UaWebClient): Promise<void>;
-    read(client: UaWebClient): Promise<void>;
+    constructor(nodeIds: Array<UaNodeId>, referenceType: UaNodeId, nodeClassToReturn: number, returnDescription: boolean, maxNodesPerBrowse?: number | null, maxReferencesPerNode?: number | null);
+    browse(client: UaWebClient): Promise<void>;
+    browseOnce(client: UaWebClient): Promise<void>;
+    results(): Array<BrowseReferenceResult>;
     isFinish(): boolean;
-    getResults(): Array<ReadLinkResult>;
     private _browseNodes;
     private _browseContinuationPoints;
-    private _buildResults;
     private _readDescriptions;
 }
-export {};
+export declare class UaChildBrowser extends UaNodeReferenceBrowser {
+    constructor(nodeIds: Array<UaNodeId>, returnDescription?: boolean);
+}
+export declare class UaLinkBrowser extends UaNodeReferenceBrowser {
+    constructor(nodeIds: Array<UaNodeId>, returnDescription?: boolean);
+}
+export declare class UaNodeReader {
+    private _nodeClassToReturn;
+    private _returnDescription;
+    private _returnAttributes;
+    private _returnValue;
+    private static s_variableTypeWithoutMember;
+    private static s_variablesNameToRead;
+    constructor(returnDescription?: boolean | null, returnVariable?: boolean | null, returnMethod?: boolean | null, returnAttributes?: boolean | null, returnValue?: boolean | null);
+    read(nodeIds: Array<UaNodeId>, client: UaWebClient): Promise<Array<UaNode>>;
+    readByReferences(references: Array<UaReference>, client: UaWebClient): Promise<Array<UaNode>>;
+    private _readRootNodes;
+    private _readNodes;
+    private _readTypes;
+    private _readObjects;
+    private _readVariables;
+    private _readMethods;
+    private _buildNodeTree;
+}
+export declare class UaObjectReader extends UaNodeReader {
+    constructor(returnDescription?: boolean | null, returnValue?: boolean | null);
+    read(nodeIds: Array<UaNodeId>, client: UaWebClient): Promise<Array<UaNode>>;
+}
+export declare class UaTypeReader extends UaNodeReader {
+    constructor();
+    read(nodeIds: Array<UaNodeId>, client: UaWebClient): Promise<Array<UaNode>>;
+}