node-opcua-address-space 2.170.1 → 2.172.0

package/src/get_basic_datatype.ts

@@ -1,7 +1,6 @@
-import { IAddressSpace } from "node-opcua-address-space-base";
+import type { IAddressSpace } from "node-opcua-address-space-base";
 import { DataType } from "node-opcua-basic-types";
-import { NodeClass } from "node-opcua-data-model";
-import { NodeId, NodeIdLike } from "node-opcua-nodeid";
+import type { NodeId, NodeIdLike } from "node-opcua-nodeid";
 
 export interface IBaseNodeVariableOrVariableType {
     addressSpace: IAddressSpace;
@@ -15,7 +14,7 @@ export function _getBasicDataTypeFromDataTypeNodeId(
     addressSpace: IAddressSpace,
     dataTypeNodeId: { nodeId: NodeIdLike } | NodeIdLike
 ): DataType {
-    const dataTypeNodeId_  =  (dataTypeNodeId as any).nodeId ? (dataTypeNodeId as any).nodeId : dataTypeNodeId;
+    const dataTypeNodeId_ = (dataTypeNodeId as any).nodeId ? (dataTypeNodeId as any).nodeId : dataTypeNodeId;
     const dataTypeNode = addressSpace.findDataType(dataTypeNodeId_);
     if (!dataTypeNode) {
         return DataType.Null;
@@ -36,6 +35,6 @@ export function _getBasicDataType(uaNode: IBaseNodeVariableOrVariableType): Data
         // may be node has been deleted already
         return DataType.Null;
     }
-    _uaNode._basicDataType =  _getBasicDataTypeFromDataTypeNodeId(addressSpace, _uaNode.dataType);
+    _uaNode._basicDataType = _getBasicDataTypeFromDataTypeNodeId(addressSpace, _uaNode.dataType);
     return _uaNode._basicDataType;
 }

package/src/historical_access/address_space_historical_data_node.ts

@@ -4,13 +4,21 @@
 // tslint:disable:no-console
 
 import chalk from "chalk";
-
+import type {
+    ContinuationData,
+    IAddressSpace,
+    ISessionContext,
+    IVariableHistorian,
+    IVariableHistorianOptions,
+    UAVariable
+} from "node-opcua-address-space-base";
 import { assert } from "node-opcua-assert";
-import { AccessLevelFlag, NodeClass, QualifiedNameLike } from "node-opcua-data-model";
-import { DataValue } from "node-opcua-data-value";
+import { AccessLevelFlag, NodeClass, type QualifiedNameLike } from "node-opcua-data-model";
+import type { DataValue } from "node-opcua-data-value";
 import { isMinDate, minDate } from "node-opcua-date-time";
-import { UAHistoricalDataConfiguration } from "node-opcua-nodeset-ua";
-import { NumericRange } from "node-opcua-numeric-range";
+import { make_warningLog } from "node-opcua-debug";
+import type { UAHistoricalDataConfiguration } from "node-opcua-nodeset-ua";
+import type { NumericRange } from "node-opcua-numeric-range";
 import {
     HistoryData,
     HistoryReadResult,
@@ -19,72 +27,73 @@ import {
     ReadProcessedDetails,
     ReadRawModifiedDetails
 } from "node-opcua-service-history";
-import { StatusCodes } from "node-opcua-status-code";
-import { CallbackT } from "node-opcua-status-code";
+import { type CallbackT, StatusCodes } from "node-opcua-status-code";
 import { DataType } from "node-opcua-variant";
-import {
-    IAddressSpace,
-    IVariableHistorian,
-    IVariableHistorianOptions,
-    UAVariable,
-    ContinuationData
-} from "node-opcua-address-space-base";
-import { make_warningLog } from "node-opcua-debug";
-import { ISessionContext } from "node-opcua-address-space-base";
-
-import { UAVariableImpl } from "../ua_variable_impl";
 import { AddressSpace } from "../../source/address_space_ts";
-import { AddressSpacePrivate } from "../address_space_private";
+import type { AddressSpacePrivate } from "../address_space_private";
+import { UAVariableImpl } from "../ua_variable_impl";
 
 const warningLog = make_warningLog(__filename);
 
 // tslint:disable:no-var-requires
+interface DequeueItem<T> {
+    data: T | null;
+    next: DequeueItem<T>;
+    prev: DequeueItem<T>;
+}
+interface Dequeue<T> {
+    push(value: T): void;
+    shift(): T | undefined;
+    first(): T | undefined;
+    length: number;
+    head: DequeueItem<T>;
+}
 const Dequeue = require("dequeue");
 
 /* interface Historian  */
 // {
 //
 // }
-function inInTimeRange(historyReadDetails: any, dataValue: DataValue): boolean {
+function inInTimeRange(historyReadDetails: ReadRawModifiedDetails, dataValue: DataValue): boolean {
     if (
         historyReadDetails.startTime &&
         !isMinDate(historyReadDetails.startTime) &&
-        dataValue.sourceTimestamp! < historyReadDetails.startTime
+        (dataValue.sourceTimestamp || 0) < historyReadDetails.startTime
     ) {
         return false;
     }
     if (
         historyReadDetails.endTime &&
         !isMinDate(historyReadDetails.endTime) &&
-        dataValue.sourceTimestamp! > historyReadDetails.endTime
+        (dataValue.sourceTimestamp || 0) > historyReadDetails.endTime
     ) {
         return false;
     }
     return true;
 }
 
-function inInTimeRange2(historyReadDetails: any, dataValue: DataValue): boolean {
+function inInTimeRange2(historyReadDetails: ReadRawModifiedDetails, dataValue: DataValue): boolean {
     if (
         historyReadDetails.endTime &&
         !isMinDate(historyReadDetails.endTime) &&
-        dataValue.sourceTimestamp! > historyReadDetails.endTime
+        (dataValue.sourceTimestamp || 0) > historyReadDetails.endTime
     ) {
         return false;
     }
     return !(
         historyReadDetails.startTime &&
         !isMinDate(historyReadDetails.startTime) &&
-        dataValue.sourceTimestamp! < historyReadDetails.startTime
+        (dataValue.sourceTimestamp || 0) < historyReadDetails.startTime
     );
 }
 
 function filter_dequeue(
-    q: any,
+    q: Dequeue<DataValue>,
     historyReadRawModifiedDetails: ReadRawModifiedDetails,
     onlyThisNumber: number,
     isReversed: boolean
-) {
-    const r: any[] = [];
+): DataValue[] {
+    const r: DataValue[] = [];
     const predicate = isReversed
         ? inInTimeRange2.bind(null, historyReadRawModifiedDetails)
         : inInTimeRange.bind(null, historyReadRawModifiedDetails);
@@ -117,7 +126,7 @@ function filter_dequeue(
 
 export class VariableHistorian implements IVariableHistorian {
     public readonly node: UAVariable;
-    private readonly _timeline: any /* Dequeue */;
+    private readonly _timeline: Dequeue<DataValue>;
     private readonly _maxOnlineValues: number;
     private lastDate: Date;
     private lastDatePicoSeconds: number;
@@ -149,8 +158,8 @@ export class VariableHistorian implements IVariableHistorian {
                     this.lastDate,
                     "\n last known picoSeconds = ",
                     this.lastDatePicoSeconds,
-                    "\n lastValue = ",
-                    this._timeline[this._timeline.length - 1]?.toString()
+                    "\n lastValue = "
+                    /// this._timeline[this._timeline.length - 1]?.toString()
                 );
                 // artificially increment date by one 100 picoseconds
                 newDataValue.sourcePicoseconds++;
@@ -170,7 +179,7 @@ export class VariableHistorian implements IVariableHistorian {
 
         if (this._timeline.length >= this._maxOnlineValues || this._timeline.length === 1) {
             const first = this._timeline.first();
-            (this.node as UAVariableImpl)._update_startOfOnlineArchive(first.sourceTimestamp);
+            (this.node as UAVariableImpl)._update_startOfOnlineArchive(first?.sourceTimestamp || minDate);
             // we update the node startOnlineDate
         }
     }
@@ -204,7 +213,7 @@ function _get_startOfArchive(node: UAVariableImpl) {
     if (!node.$historicalDataConfiguration) {
         throw new Error("this variable has no HistoricalDataConfiguration");
     }
-    return node.$historicalDataConfiguration!.startOfArchive?.readValue();
+    return node.$historicalDataConfiguration?.startOfArchive?.readValue();
 }
 
 function _update_startOfArchive(this: UAVariableImpl, newDate: Date): void {
@@ -255,7 +264,7 @@ function _historyPush(this: UAVariableImpl, newDataValue: DataValue) {
     if (!this.varHistorian) {
         throw new Error("this variable has no HistoricalDataConfiguration");
     }
-    assert(Object.prototype.hasOwnProperty.call(this, "historizing"), "expecting a historizing attribute on node");
+    assert(Object.hasOwn(this, "historizing"), "expecting a historizing attribute on node");
     if (!this.historizing) {
         return; //
     }
@@ -265,11 +274,11 @@ function _historyPush(this: UAVariableImpl, newDataValue: DataValue) {
 
 function _historyReadModify(
     this: UAVariable,
-    context: ISessionContext,
-    historyReadRawModifiedDetails: ReadRawModifiedDetails,
-    indexRange: NumericRange | null,
-    dataEncoding: QualifiedNameLike | null,
-    continuationData: ContinuationData,
+    _context: ISessionContext,
+    _historyReadRawModifiedDetails: ReadRawModifiedDetails,
+    _indexRange: NumericRange | null,
+    _dataEncoding: QualifiedNameLike | null,
+    _continuationData: ContinuationData,
     callback: CallbackT<HistoryReadResult>
 ) {
     //
@@ -338,15 +347,18 @@ function _historyReadRawAsync(
     callback: CallbackT<DataValue[]>
 ) {
     assert(typeof callback === "function");
-    this.varHistorian!.extractDataValues(historyReadRawModifiedDetails, maxNumberToExtract, isReversed, reverseDataValue, callback);
+    if (!this.varHistorian) {
+        return callback(new Error("this variable has no HistoricalDataConfiguration"));
+    }
+    this.varHistorian.extractDataValues(historyReadRawModifiedDetails, maxNumberToExtract, isReversed, reverseDataValue, callback);
 }
 
 function _historyReadRaw(
     this: UAVariable,
     context: ISessionContext,
     historyReadRawModifiedDetails: ReadRawModifiedDetails,
-    indexRange: NumericRange | null,
-    dataEncoding: QualifiedNameLike | null,
+    _indexRange: NumericRange | null,
+    _dataEncoding: QualifiedNameLike | null,
     continuationData: ContinuationData,
     callback: CallbackT<HistoryReadResult>
 ): void {
@@ -455,7 +467,8 @@ function _historyReadRaw(
             historyData: new HistoryData({ dataValues: values }),
             statusCode
         });
-        return callback(null, result2);
+        callback(null, result2);
+        return;
     }
 
     // todo add special treatment for when startTime > endTime
@@ -464,17 +477,18 @@ function _historyReadRaw(
     let maxNumberToExtract = 0;
     let isReversed = false;
     let reverseDataValue = false;
-    if (isMinDate(historyReadRawModifiedDetails.endTime!)) {
+    if (isMinDate(historyReadRawModifiedDetails.endTime)) {
         // end time is not specified
         maxNumberToExtract = historyReadRawModifiedDetails.numValuesPerNode;
-        if (isMinDate(historyReadRawModifiedDetails.startTime!)) {
+        if (isMinDate(historyReadRawModifiedDetails.startTime)) {
             // end start and start time are not specified, this is invalid
             const result = new HistoryReadResult({
                 statusCode: StatusCodes.BadHistoryOperationUnsupported // should be an error
             });
-            return callback(null, result);
+            callback(null, result);
+            return;
         }
-    } else if (isMinDate(historyReadRawModifiedDetails.startTime!)) {
+    } else if (isMinDate(historyReadRawModifiedDetails.startTime)) {
         // start time is not specified
         // end time is specified
         maxNumberToExtract = historyReadRawModifiedDetails.numValuesPerNode;
@@ -488,12 +502,13 @@ function _historyReadRaw(
             const result = new HistoryReadResult({
                 statusCode: StatusCodes.BadHistoryOperationUnsupported // should be an error
             });
-            return callback(null, result);
+            callback(null, result);
+            return;
         }
     } else {
         // start time is specified
         // end time is specified
-        if (historyReadRawModifiedDetails.endTime!.getTime() < historyReadRawModifiedDetails.startTime!.getTime()) {
+        if ((historyReadRawModifiedDetails.endTime?.getTime() || 0) < (historyReadRawModifiedDetails.startTime?.getTime() || 0)) {
             reverseDataValue = true;
             const tmp = historyReadRawModifiedDetails.endTime;
             historyReadRawModifiedDetails.endTime = historyReadRawModifiedDetails.startTime;
@@ -714,7 +729,7 @@ export function AddressSpace_installHistoricalDataNode(
     node._historyReadRaw = _historyReadRaw;
     node._historyReadRawAsync = _historyReadRawAsync;
 
-    node.varHistorian = (options as any).historian || AddressSpace.historizerFactory.create(node, options);
+    node.varHistorian = (options as { historian?: boolean }).historian || AddressSpace.historizerFactory.create(node, options);
 
     const historicalDataConfigurationType = addressSpace.findObjectType("HistoricalDataConfigurationType");
     if (!historicalDataConfigurationType) {

package/src/idx_iterator.ts

@@ -1,9 +1,4 @@
-
-
-
-
 export class IndexIterator {
-
     public current: number[] | null = null;
     constructor(private limits: number[]) {
         this.reset();
@@ -17,14 +12,13 @@ export class IndexIterator {
     public increment() {
         if (!this.current) return;
 
-
         const increase = (n: number): boolean => {
             if (n < 0) {
                 return false;
             }
             if (!this.current) return false;
             if (this.current[n] + 1 >= this.limits[n]) {
-                if (n==0) {
+                if (n === 0) {
                     this.current = null;
                     return false;
                 }
@@ -33,7 +27,7 @@ export class IndexIterator {
             }
             this.current[n] = this.current[n] + 1;
             return true;
-        }
+        };
         const n = this.limits.length - 1;
         if (!increase(n)) {
             this.current = null;
@@ -43,10 +37,8 @@ export class IndexIterator {
         if (!this.current) {
             throw new Error("Outof bond");
         }
-        const r = [... this.current];
+        const r = [...this.current];
         this.increment();
         return r;
     }
-
-
-}
+}

package/src/index_current.ts

@@ -1,63 +1,51 @@
 /**
  * @module node-opcua-address-space
  */
-export { AddressSpace } from "./address_space";
-export * from "../source/session_context";
-export * from "../source/helpers/dump_tools";
+
+export * from "node-opcua-nodeset-ua";
+export { ContinuationPointManager } from "../source/continuation_points/continuation_point_manager";
 export * from "../source/helpers/adjust_browse_direction";
-export * from "../source/pseudo_session";
-export * from "../source/helpers/make_optionals_map";
 export * from "../source/helpers/argument_list";
 export * from "../source/helpers/call_helpers";
+export * from "../source/helpers/dump_tools";
 export * from "../source/helpers/ensure_secure_access";
+export * from "../source/helpers/make_optionals_map";
 export * from "../source/helpers/resolve_opaque_on_address_space";
 export * from "../source/interfaces/alarms_and_conditions/condition_info_i";
-export * from "../source/interfaces/nodeset_loader_options"
-export * from "../src/nodeset_tools/construct_namespace_dependency";
-
-
-export * from "../source/set_namespace_meta_data";
-export * from "../source/namespace";
-export * from "../source/namespace_data_access";
-export * from "../source/namespace_machine_state"
-export * from "../source/namespace_alarm_and_condition";
-
+export * from "../source/interfaces/nodeset_loader_options";
+export * from "../source/interfaces/state_machine/ua_transition_ex";
 export { ensureDatatypeExtracted, ensureDatatypeExtractedWithCallback } from "../source/loader/ensure_datatype_extracted";
-
 export * from "../source/loader/generateAddressSpaceRaw";
 export * from "../source/loader/register_node_promoter";
-
-export { ContinuationPointManager } from "../source/continuation_points/continuation_point_manager";
-
-export { promoteToStateMachine, promoteToStateMachineType } from "./state_machine/finite_state_machine";
-export * from "../source/interfaces/state_machine/ua_transition_ex";
-
-export * from "./namespace_impl";
-export * from "./extension_object_array_node";
-export * from "./event_data";
-
-export { NamespaceOptions } from "./nodeid_manager";
-export * from "./nodeset_tools/nodeset_to_xml";
-export { dumpToBSD } from "./nodeset_tools/dump_to_bsd";
-export { adjustNamespaceArray } from "./nodeset_tools/adjust_namespace_array";
+export * from "../source/namespace";
+export * from "../source/namespace_alarm_and_condition";
+export * from "../source/namespace_data_access";
+export * from "../source/namespace_machine_state";
+export * from "../source/pseudo_session";
+export * from "../source/session_context";
+export * from "../source/set_namespace_meta_data";
+export * from "../source/ua_addin";
+export * from "../source/ua_interface";
+export { NodeIdManager } from "../src/nodeid_manager";
+export * from "../src/nodeset_tools/construct_namespace_dependency";
+export * from "../src/private_namespace";
+export * from "../src/validate_data_type_correctness";
+export { AddressSpace } from "./address_space";
+export * from "./alarms_and_conditions";
 export { makeAttributeEventName } from "./base_node_impl";
-export { resolveReferenceNode, resolveReferenceType } from "./reference_impl";
-
-export * from "./data_access/adjust_datavalue_status_code";
 export * from "./data_access/add_dataItem_stuff";
+export * from "./data_access/adjust_datavalue_status_code";
 export * from "./data_access/ua_multistate_discrete_impl";
 export * from "./data_access/ua_multistate_value_discrete_impl";
 export * from "./data_access/ua_two_state_discrete_impl";
-
-export { VariableHistorian } from "./historical_access/address_space_historical_data_node";
-export { NodeIdManager } from "../src/nodeid_manager";
-export * from "../src/private_namespace";
-
-export * from "./alarms_and_conditions";
 export * from "./event_data";
-
-export * from "node-opcua-nodeset-ua";
-
-export * from "../src/validate_data_type_correctness";
-export * from "../source/ua_addin";
-export * from "../source/ua_interface";
+export * from "./event_data";
+export * from "./extension_object_array_node";
+export { VariableHistorian } from "./historical_access/address_space_historical_data_node";
+export * from "./namespace_impl";
+export { NamespaceOptions } from "./nodeid_manager";
+export { adjustNamespaceArray } from "./nodeset_tools/adjust_namespace_array";
+export { dumpToBSD } from "./nodeset_tools/dump_to_bsd";
+export * from "./nodeset_tools/nodeset_to_xml";
+export { resolveReferenceNode, resolveReferenceType } from "./reference_impl";
+export { promoteToStateMachine, promoteToStateMachineType } from "./state_machine/finite_state_machine";