node-opcua-address-space 2.54.0 → 2.57.0

package/source/loader/load_nodeset2.ts

@@ -14,7 +14,7 @@ import {
     UAVariable,
     UAVariableType
 } from "node-opcua-address-space-base";
-import { assert } from "node-opcua-assert";
+import { assert, renderError } from "node-opcua-assert";
 import { isValidGuid, StatusCodes } from "node-opcua-basic-types";
 import { ExtraDataTypeManager, populateDataTypeManager } from "node-opcua-client-dynamic-extension-object";
 import { EUInformation } from "node-opcua-data-access";
@@ -46,18 +46,14 @@ import {
     ReaderStateParserLike,
     Xml2Json,
     XmlAttributes,
-    Callback,
     SimpleCallback
 } from "node-opcua-xml2json";
-import * as PrettyError from "pretty-error";
 
 import { AddressSpacePrivate } from "../../src/address_space_private";
 import { NamespacePrivate } from "../../src/namespace_private";
 import { PseudoSession } from "../pseudo_session";
 import { promoteObjectsAndVariables } from "./namespace_post_step";
 
-const pe = new PrettyError();
-
 const doDebug = checkDebugFlag(__filename);
 const debugLog = make_debugLog(__filename);
 
@@ -446,8 +442,17 @@ export function makeStuff(addressSpace: IAddressSpace): any {
             this.obj.browseName = convertQualifiedName(attrs.BrowseName);
             this.obj.eventNotifier = ec.coerceByte(attrs.EventNotifier) || 0;
             this.obj.symbolicName = attrs.SymbolicName || null;
+
+            this.isDraft = attrs.ReleaseStatus === "Draft";
+            this.obj.isDeprecated = attrs.ReleaseStatus === "Deprecated";
+
         },
         finish(this: any) {
+            if (this.isDraft || this.isDeprecated) {
+                // ignore Draft or Deprecated element
+                debugLog("Ignoring Draft/Deprecated UAObject =", this.obj.browseName.toString());
+                return;
+            }
             _internal_createNode(this.obj);
         },
         parser: {
@@ -541,13 +546,16 @@ export function makeStuff(addressSpace: IAddressSpace): any {
             this.obj.displayName = "";
             this.obj.description = "";
             this.obj.symbolicName = attrs.SymbolicName;
+
             this.isDraft = attrs.ReleaseStatus === "Draft";
+            this.isDeprecated = attrs.ReleaseStatus === "Deprecated";
+
             this.definitionFields = [];
         },
         finish(this: any) {
-            if (this.isDraft) {
-                // ignore Draft element
-                debugLog("Ignoring Draft dataType =", this.obj.browseName.toString());
+            if (this.isDraft || this.isDeprecated) {
+                // ignore Draft or Deprecated element
+                debugLog("Ignoring Draft/Deprecated dataType =", this.obj.browseName.toString());
                 return;
             }
             let definitionFields = this.definitionFields;
@@ -1278,8 +1286,16 @@ export function makeStuff(addressSpace: IAddressSpace): any {
 
             this.obj.accessLevel = convertAccessLevel(attrs.AccessLevel);
             this.obj.userAccessLevel = this.obj.accessLevel; // convertAccessLevel(attrs.UserAccessLevel || attrs.AccessLevel);
+
+            this.isDraft = attrs.ReleaseStatus === "Draft";
+            this.isDeprecated = attrs.ReleaseStatus === "Deprecated";
+            
         },
         finish(this: any) {
+            if (this.isDraft || this.isDeprecated) {
+                debugLog("Ignoring Draft/Deprecated UAVariable =", this.obj.browseName.toString());
+                return;
+            }
             /*
             // set default value based on obj data Type
             if (this.obj.value === undefined) {
@@ -1355,8 +1371,16 @@ export function makeStuff(addressSpace: IAddressSpace): any {
 
             this.obj.historizing = false;
             this.obj.nodeId = convertToNodeId(attrs.NodeId) || null;
+
+            this.isDraft = attrs.ReleaseStatus === "Draft";
+            this.isDeprecated = attrs.ReleaseStatus === "Deprecated";
+
         },
         finish(this: any) {
+            if (this.isDraft || this.isDeprecated) {
+                debugLog("Ignoring Draft/Deprecated UAVariableType =", this.obj.browseName.toString());
+                return;
+            }
             try {
                 _internal_createNode(this.obj);
             } /* istanbul ignore next */ catch (err) {
@@ -1393,8 +1417,16 @@ export function makeStuff(addressSpace: IAddressSpace): any {
             this.obj.parentNodeId = attrs.ParentNodeId || null;
             this.obj.nodeId = convertToNodeId(attrs.NodeId) || null;
             this.obj.methodDeclarationId = attrs.MethodDeclarationId ? _translateNodeId(attrs.MethodDeclarationId) : null;
+
+            this.isDraft = attrs.ReleaseStatus === "Draft";
+            this.isDeprecated = attrs.ReleaseStatus === "Deprecated";
+
         },
         finish(this: any) {
+            if (this.isDraft || this.isDeprecated) {
+                debugLog("Ignoring Draft/Deprecated UAMethod =", this.obj.browseName.toString());
+                return;
+            }
             _internal_createNode(this.obj);
         },
         parser: {
@@ -1561,7 +1593,7 @@ export function makeStuff(addressSpace: IAddressSpace): any {
         finalSteps()
             .then(() => callback!())
             .catch((err1: Error) => {
-                console.log("Error ", pe.render(err1));
+                console.log("Error ", renderError(err1));
                 callback!(err1);
             });
     }

package/source/loader/namespace_post_step.ts

@@ -4,7 +4,6 @@ import { make_debugLog, checkDebugFlag } from "node-opcua-debug";
 import { UAObject, UAVariable, IAddressSpace, INamespace } from "node-opcua-address-space-base";
 import { NamespacePrivate } from "../../src/namespace_private";
 
-
 const debugLog = make_debugLog(__filename);
 const doDebug = checkDebugFlag(__filename);
 
@@ -14,7 +13,7 @@ export async function promoteObjectAndVariablesInNamespace(namespace: INamespace
     const namespaceP = namespace as NamespacePrivate;
     for (const a of namespaceP.nodeIterator()) {
         if (a.nodeClass === NodeClass.Object || a.nodeClass === NodeClass.Variable) {
-            const aa = a as (UAObject | UAVariable);
+            const aa = a as UAObject | UAVariable;
             if (aa.typeDefinition) {
                 const promoter = g_promotableObject[aa.typeDefinition.toString()];
                 if (promoter) {

package/source/loader/register_node_promoter.ts

@@ -3,6 +3,9 @@ import { UAObject, UAVariable } from "node-opcua-address-space-base";
 
 import { g_promotableObject } from "./namespace_post_step";
 
-export function registerNodePromoter(nodeId: NodeIdLike, promoter: ((node: UAVariable) => void) | ((node: UAObject) => void)): void {
+export function registerNodePromoter(
+    nodeId: NodeIdLike,
+    promoter: ((node: UAVariable) => void) | ((node: UAObject) => void)
+): void {
     g_promotableObject[resolveNodeId(nodeId).toString()] = promoter;
 }

package/source/namespace.ts

@@ -1,9 +1,7 @@
 import { INamespace } from "node-opcua-address-space-base";
 
-import { INamespaceAlarmAndCondition} from "./namespace_alarm_and_condition";
-import { INamespaceDataAccess} from "./namespace_data_access";
-import { INamespaceMachineState} from "./namespace_machine_state";
+import { INamespaceAlarmAndCondition } from "./namespace_alarm_and_condition";
+import { INamespaceDataAccess } from "./namespace_data_access";
+import { INamespaceMachineState } from "./namespace_machine_state";
 
-export interface Namespace extends INamespace, INamespaceAlarmAndCondition , INamespaceDataAccess, INamespaceMachineState {
-    
-}
+export interface Namespace extends INamespace, INamespaceAlarmAndCondition, INamespaceDataAccess, INamespaceMachineState {}

package/source/namespace_machine_state.ts

@@ -4,10 +4,9 @@ import { UATransitionEx } from "./interfaces/state_machine/ua_transition_ex";
 export interface INamespaceMachineState {
     addState(component: UAObject | UAObjectType, stateName: string, stateNumber: number, isInitialState?: boolean): UAState;
     addTransition(
-        component: UAObject | UAObjectType,/* StateMachine | StateMachineType,*/
+        component: UAObject | UAObjectType /* StateMachine | StateMachineType,*/,
         fromState: string,
         toState: string,
         transitionNumber: number
     ): UATransitionEx;
 }
-

package/source/pseudo_session.ts

@@ -25,7 +25,7 @@ import { NodeClass, AttributeIds } from "node-opcua-data-model";
 import { WriteValueOptions, ReadValueIdOptions, BrowseDescriptionOptions } from "node-opcua-types";
 import { randomGuid } from "node-opcua-basic-types";
 
-import { IAddressSpace, UAVariable, ISessionContext } from "node-opcua-address-space-base";
+import { IAddressSpace, UAVariable, ISessionContext, ContinuationPoint } from "node-opcua-address-space-base";
 
 import { ContinuationPointManager } from "./continuation_points/continuation_point_manager";
 import { callMethodHelper } from "./helpers/call_helpers";
@@ -79,15 +79,22 @@ export class PseudoSession implements IBasicSession {
             }
 
             // handle continuation points
-            results = results.map((result: BrowseResult) => {
+            results = results.map((result: BrowseResult, index) => {
                 assert(!result.continuationPoint);
-                const truncatedResult = this.continuationPointManager.register(
+                const r = this.continuationPointManager.registerReferences(
                     this.requestedMaxReferencesPerNode,
-                    result.references || []
+                    result.references || [],
+                    { continuationPoint: null, index }
                 );
-                assert(truncatedResult.statusCode === StatusCodes.Good);
-                truncatedResult.statusCode = result.statusCode;
-                return new BrowseResult(truncatedResult);
+                let { statusCode } = r;
+                const { continuationPoint, values } = r;
+                assert(statusCode === StatusCodes.Good || statusCode === StatusCodes.GoodNoData);
+                statusCode = result.statusCode;
+                return new BrowseResult({
+                    statusCode,
+                    continuationPoint,
+                    references: values
+                });
             });
             callback!(null, isArray ? results : results[0]);
         });
@@ -154,7 +161,11 @@ export class PseudoSession implements IBasicSession {
     public browseNext(continuationPoint: Buffer, releaseContinuationPoints: boolean): Promise<BrowseResult>;
 
     public browseNext(continuationPoints: Buffer[], releaseContinuationPoints: boolean): Promise<BrowseResult[]>;
-    public browseNext(continuationPoints: Buffer | Buffer[], releaseContinuationPoints: boolean, callback?: ResponseCallback<any>): any {
+    public browseNext(
+        continuationPoints: Buffer | Buffer[],
+        releaseContinuationPoints: boolean,
+        callback?: ResponseCallback<any>
+    ): any {
         setImmediate(() => {
             if (continuationPoints instanceof Buffer) {
                 return this.browseNext([continuationPoints], releaseContinuationPoints, (err, _results) => {
@@ -164,26 +175,23 @@ export class PseudoSession implements IBasicSession {
                     callback!(null, _results![0]);
                 });
             }
-            let results: any;
-            if (releaseContinuationPoints) {
-                // releaseContinuationPoints = TRUE
-                //   passed continuationPoints shall be reset to free resources in
-                //   the Server. The continuation points are released and the results
-                //   and diagnosticInfos arrays are empty.
-                results = continuationPoints.map((continuationPoint: any) => {
-                    return this.continuationPointManager.cancel(continuationPoint);
-                });
-            } else {
-                // let extract data from continuation points
 
-                // releaseContinuationPoints = FALSE
-                //   passed continuationPoints shall be used to get the next set of
-                //   browse information.
-                results = continuationPoints.map((continuationPoint: any) => {
-                    return this.continuationPointManager.getNext(continuationPoint);
-                });
-            }
-            results = results.map((r: any) => new BrowseResult(r));
+            const results = continuationPoints
+                .map((continuationPoint: ContinuationPoint, index: number) => {
+                    return this.continuationPointManager.getNextReferences(0, {
+                        continuationPoint,
+                        index,
+                        releaseContinuationPoints
+                    });
+                })
+                .map(
+                    (r) =>
+                        new BrowseResult({
+                            statusCode: r.statusCode,
+                            continuationPoint: r.continuationPoint,
+                            references: r.values
+                        })
+                );
 
             callback!(null, results);
         });
@@ -255,7 +263,7 @@ export class PseudoSession implements IBasicSession {
     public write(nodesToWrite: WriteValueOptions[]): Promise<StatusCode[]>;
     public write(nodesToWrite: WriteValueOptions[] | WriteValueOptions, callback?: ResponseCallback<any>): any {
         const isArray = nodesToWrite instanceof Array;
-        const _nodesToWrite: WriteValueOptions[]  = !isArray ? [nodesToWrite]: nodesToWrite;
+        const _nodesToWrite: WriteValueOptions[] = !isArray ? [nodesToWrite] : nodesToWrite;
         const context = this.context;
         setImmediate(() => {
             const statusCodesPromises = _nodesToWrite.map((nodeToWrite: WriteValueOptions) => {
@@ -265,7 +273,7 @@ export class PseudoSession implements IBasicSession {
                 const nodeId = nodeToWrite.nodeId!;
                 const obj = this.addressSpace.findNode(nodeId);
                 if (!obj) {
-                    return  StatusCodes.BadNodeIdUnknown;
+                    return StatusCodes.BadNodeIdUnknown;
                 }
                 return promisify(obj.writeAttribute).call(obj, context, nodeToWrite);
             });

package/source/session_context.ts

@@ -15,14 +15,7 @@ import {
     UserNameIdentityToken,
     X509IdentityToken
 } from "node-opcua-types";
-import {
-    ISessionContext,
-    UAObject,
-    UAObjectType,
-    UAVariable,
-    BaseNode,
-    ISessionBase
-} from "node-opcua-address-space-base";
+import { ISessionContext, UAObject, UAObjectType, UAVariable, BaseNode, ISessionBase } from "node-opcua-address-space-base";
 import { ObjectIds } from "node-opcua-constants";
 import { StatusCodes } from "node-opcua-status-code";
 import { NamespacePrivate } from "../src/namespace_private";

package/source/set_namespace_meta_data.ts

@@ -50,19 +50,25 @@ export function setNamespaceMetaData(namespace: INamespace): void {
     const namespaceVersion = metaData.namespaceVersion;
     namespaceVersion.setValueFromSource({ dataType: DataType.String, value: "1.0.0" });
 
-    metaData.defaultAccessRestrictions?.bindVariable({
-        get: () =>
-            new Variant({
-                dataType: DataType.UInt32,
-                value: namespace.getDefaultAccessRestrictions()
-            })
-    }, true);
-    metaData.defaultRolePermissions?.bindVariable({
-        get: () =>
-            new Variant({
-                dataType: DataType.ExtensionObject,
-                arrayType: VariantArrayType.Array,
-                value: namespace.getDefaultRolePermissions()
-            })
-    }, true);
+    metaData.defaultAccessRestrictions?.bindVariable(
+        {
+            get: () =>
+                new Variant({
+                    dataType: DataType.UInt32,
+                    value: namespace.getDefaultAccessRestrictions()
+                })
+        },
+        true
+    );
+    metaData.defaultRolePermissions?.bindVariable(
+        {
+            get: () =>
+                new Variant({
+                    dataType: DataType.ExtensionObject,
+                    arrayType: VariantArrayType.Array,
+                    value: namespace.getDefaultRolePermissions()
+                })
+        },
+        true
+    );
 }

package/source/xml_writer.ts

@@ -1,4 +1,3 @@
-
 export interface XmlWriter {
     translationTable: any;
     visitedNode: any;

package/source_nodejs/index.ts

@@ -1 +1 @@
-export * from "./generate_address_space";
+export * from "./generate_address_space";

package/src/address_space.ts

@@ -25,7 +25,7 @@ import {
 } from "node-opcua-types";
 import * as utils from "node-opcua-utils";
 import { lowerFirstLetter } from "node-opcua-utils";
-import { DataType, Variant, VariantArrayType, VariantT } from "node-opcua-variant";
+import { DataType, Variant, VariantArrayType, VariantOptions, VariantT } from "node-opcua-variant";
 import {
     AddReferenceOpts,
     IEventData,
@@ -41,17 +41,19 @@ import {
     UAVariableType,
     UAReferenceType,
     UAObject,
-    UAView
+    UAView,
+    RaiseEventData
 } from "node-opcua-address-space-base";
 
 import { adjustBrowseDirection } from "../source/helpers/adjust_browse_direction";
 import { UARootFolder } from "../source/ua_root_folder";
+import { Namespace } from "../source/namespace";
 
 import { AddressSpacePrivate } from "./address_space_private";
 import { UAAcknowledgeableConditionImpl, UAConditionImpl } from "./alarms_and_conditions";
 import { EventData } from "./event_data";
 import { AddressSpace_installHistoricalDataNode } from "./historical_access/address_space_historical_data_node";
-import { UANamespace } from "./namespace_impl";
+import { NamespaceImpl } from "./namespace_impl";
 import { isNonEmptyQualifiedName } from "./namespace_impl";
 import { NamespacePrivate } from "./namespace_private";
 import { ExtensionObjectConstructorFuncWithSchema, UADataTypeImpl } from "./ua_data_type_impl";
@@ -152,7 +154,7 @@ export class AddressSpace implements AddressSpacePrivate {
 
     public readonly isNodeIdString = isNodeIdString;
     private readonly _private_namespaceIndex: number;
-    private readonly _namespaceArray: UANamespace[];
+    private readonly _namespaceArray: NamespacePrivate[];
     private _shutdownTask: ShutdownTask[] = [];
     private _modelChangeTransactionCounter = 0;
     private _modelChanges: ModelChangeStructureDataType[] = [];
@@ -185,7 +187,7 @@ export class AddressSpace implements AddressSpacePrivate {
      * @param {string|number} namespace index or namespace uri.
      * @return {NameSpace} the namespace
      */
-    public getNamespace(namespaceIndexOrName: string | number): UANamespace {
+    public getNamespace(namespaceIndexOrName: string | number): NamespacePrivate {
         if (typeof namespaceIndexOrName === "number") {
             const namespaceIndex = namespaceIndexOrName;
             assert(namespaceIndex >= 0 && namespaceIndex < this._namespaceArray.length, "invalid namespace index ( out of bound)");
@@ -240,7 +242,7 @@ export class AddressSpace implements AddressSpacePrivate {
      * @param namespaceUri {string}
      * @returns {Namespace}
      */
-    public registerNamespace(namespaceUri: string): UANamespace {
+    public registerNamespace(namespaceUri: string): NamespacePrivate {
         let index = this._namespaceArray.findIndex((ns) => ns.namespaceUri === namespaceUri);
         if (index !== -1) {
             assert((this._namespaceArray[index].addressSpace as any) === (this as any));
@@ -248,7 +250,7 @@ export class AddressSpace implements AddressSpacePrivate {
         }
         index = this._namespaceArray.length;
         this._namespaceArray.push(
-            new UANamespace({
+            new NamespaceImpl({
                 addressSpace: this,
                 index,
                 namespaceUri,
@@ -659,7 +661,7 @@ export class AddressSpace implements AddressSpacePrivate {
      *
      * @private
      */
-    public constructEventData(eventTypeId: UAEventType, data: any): IEventData {
+    public constructEventData(eventTypeId: UAEventType, data: RaiseEventData): IEventData {
         data = data || {};
 
         // construct the reference dataStructure to store event Data
@@ -737,7 +739,7 @@ export class AddressSpace implements AddressSpacePrivate {
 
             visitedProperties[lowerName] = node;
             if (Object.prototype.hasOwnProperty.call(data, lowerName)) {
-                eventData.setValue(lowerName, node, data[lowerName]);
+                eventData.setValue(lowerName, node, data[lowerName] as VariantOptions);
                 // xx eventData[lowerName] = _coerceVariant(data[lowerName]);
             } else {
                 // add a property , but with a null variant
@@ -1019,7 +1021,7 @@ export class AddressSpace implements AddressSpacePrivate {
      * @example
      *
      *             // example 1
-     *             var extObj = addressSpace.constructExtensionObject("BuildInfo",{ productName: "PRODUCTNAME"});
+     *             var extObj = addressSpace.constructExtensionObject("BuildInfo",{ productName: "PRODUCT_NAME"});
      *
      *             // example 2
      *             serverStatusDataType.nodeClass.should.eql(NodeClass.DataType);
@@ -1027,7 +1029,7 @@ export class AddressSpace implements AddressSpacePrivate {
      *             var serverStatus  = addressSpace.constructExtensionObject(serverStatusDataType);
      *             serverStatus.constructor.name.should.eql("ServerStatusDataType");
      */
-    public constructExtensionObject(dataType: UADataType | NodeId, options: any): ExtensionObject {
+    public constructExtensionObject(dataType: UADataType | NodeId, options?: Record<string, unknown>): ExtensionObject {
         const Constructor = this.getExtensionObjectConstructor(dataType);
         return new Constructor(options);
     }
@@ -1147,7 +1149,7 @@ export class AddressSpace implements AddressSpacePrivate {
      * @param modelChange
      * @private
      */
-    public _collectModelChange(view: UAView | null, modelChange: ModelChangeStructureDataType) {
+    public _collectModelChange(view: UAView | null, modelChange: ModelChangeStructureDataType): void {
         // xx console.log("in _collectModelChange", modelChange.verb, verbFlags.get(modelChange.verb).toString());
         this._modelChanges.push(modelChange);
     }
@@ -1194,7 +1196,7 @@ export class AddressSpace implements AddressSpacePrivate {
                     results.push(parent as UAView);
                 } else {
                     const key = parent.nodeId.toString();
-                    if (Object.prototype.hasOwnProperty.call(visitedMap,key)) {
+                    if (Object.prototype.hasOwnProperty.call(visitedMap, key)) {
                         continue;
                     }
                     visitedMap[key] = parent;
@@ -1210,8 +1212,7 @@ export class AddressSpace implements AddressSpacePrivate {
      * @param func
      * @private
      */
-    public modelChangeTransaction(func: any): void {
-    
+    public modelChangeTransaction(func: () => void): void {
         this._modelChangeTransactionCounter = this._modelChangeTransactionCounter || 0;
 
         function beginModelChange(this: AddressSpace) {
@@ -1315,7 +1316,7 @@ export class AddressSpace implements AddressSpacePrivate {
 
         // ----------- now resolve target NodeId;
         if (params.nodeId instanceof BaseNodeImpl) {
-            assert(!Object.prototype.hasOwnProperty.call(params,"node"));
+            assert(!Object.prototype.hasOwnProperty.call(params, "node"));
             params.node = params.nodeId as BaseNode;
             params.nodeId = params.node.nodeId;
         } else {

package/src/address_space_private.ts

@@ -16,21 +16,20 @@ import {
     UAView,
     ISessionContext,
     AddReferenceOpts,
-    ContinuationPoint,
     UAVariableType,
     UAObjectType,
     UAReference,
-    UAVariable
+    UAVariable,
+    ContinuationData
 } from "node-opcua-address-space-base";
 
 import { UARootFolder } from "../source/ua_root_folder";
 
 import { NamespacePrivate } from "./namespace_private";
 import { ExtensionObjectConstructorFuncWithSchema } from "./ua_data_type_impl";
-import { UANamespace} from "./namespace_impl";
+import { NamespaceImpl } from "./namespace_impl";
 
 export interface AddressSpacePrivate extends IAddressSpace {
-
     rootFolder: UARootFolder;
 
     isFrugal: boolean;
@@ -44,11 +43,7 @@ export interface AddressSpacePrivate extends IAddressSpace {
 
     _coerce_DataType(dataType: NodeIdLike | BaseNode): NodeId;
 
-    _coerceType(
-        baseType: string | NodeId | BaseNode,
-        topMostBaseType: string,
-        nodeClass: NodeClass
-    ): UAVariableType | UAObjectType;
+    _coerceType(baseType: string | NodeId | BaseNode, topMostBaseType: string, nodeClass: NodeClass): UAVariableType | UAObjectType;
     _coerceTypeDefinition(typeDefinition: string | NodeId): NodeId;
 
     _coerce_VariableTypeIds(dataType: NodeId | string | BaseNode): NodeId;
@@ -57,9 +52,9 @@ export interface AddressSpacePrivate extends IAddressSpace {
 
     getOwnNamespace(): NamespacePrivate;
 
-    getNamespace(indexOrName: number | string): UANamespace;
+    getNamespace(indexOrName: number | string): NamespacePrivate;
 
-    registerNamespace(namespaceUri: string): UANamespace;
+    registerNamespace(namespaceUri: string): NamespacePrivate;
 
     getNamespaceArray(): NamespacePrivate[];
 
@@ -90,7 +85,7 @@ export interface AddressSpacePrivate extends IAddressSpace {
         historyReadDetails: ReadProcessedDetails,
         indexRange: NumericRange | null,
         dataEncoding: QualifiedNameLike | null,
-        continuationPoint: ContinuationPoint | null,
+        continuationData: ContinuationData,
         callback: CallbackT<HistoryReadResult>
     ) => void;