opcua-webapi-ts 1.1.4 → 1.1.5

package/dist/cjs/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/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/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/common/structure/UaReadProcessedDetails.d.ts

@@ -0,0 +1,18 @@
+import { ReadProcessedDetails } from "opcua-webapi";
+import { UaExtensionObject, UaNodeId } from "../types";
+export declare class UaReadProcessedDetails {
+    static dataTypeId: UaNodeId;
+    private _startTime;
+    private _endTime;
+    private _processingInterval;
+    private _aggregateType;
+    constructor(startTime: Date, endTime: Date, processingInterval: number, aggregateType?: Array<UaNodeId> | null);
+    get startTime(): Date;
+    get endTime(): Date;
+    get processingInterval(): number;
+    get aggregateType(): Array<UaNodeId> | null;
+    toStruct(): ReadProcessedDetails;
+    static fromStruct(details: ReadProcessedDetails): UaReadProcessedDetails | null;
+    toExtensionObject(): UaExtensionObject;
+    static fromExtensionObject(extensionObject: UaExtensionObject): UaReadProcessedDetails | null;
+}

package/dist/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/common/structure/index.d.ts

@@ -10,6 +10,7 @@ export * from "./UaHistoryEvent";
 export * from "./UaLiteralOperand";
 export * from "./UaRange";
 export * from "./UaReadAtTimeDetails";
-export * from "./UaReadEventDetails";
 export * from "./UaReadRawModifiedDetails";
+export * from "./UaReadProcessedDetails";
+export * from "./UaReadEventDetails";
 export * from "./UaSimpleAttributeOperand";

package/dist/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opcua-webapi-ts",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Provides OPC UA WebAPI wrapper and client based on opcua-webapi-typescript",
   "author": "DingYan",
   "main": "./dist/cjs/index.js",