node-opcua-client 2.114.0 → 2.116.0

package/source/client_utils.ts

@@ -2,16 +2,13 @@
  * @module node-opcua-client
  */
 
-import { assert } from "node-opcua-assert";
 import { AttributeIds } from "node-opcua-data-model";
 import { DataValue } from "node-opcua-data-value";
 import { NodeIdLike, resolveNodeId } from "node-opcua-nodeid";
 import { ReadValueIdOptions } from "node-opcua-service-read";
 import { BrowsePath, BrowsePathResult } from "node-opcua-service-translate-browse-path";
-import { StatusCodes } from "node-opcua-status-code";
 import { Variant } from "node-opcua-variant";
-import { ClientSession, ResponseCallback } from "./client_session";
-import { ClientSessionImpl } from "./private/client_session_impl";
+import { IBasicSessionAsync } from "node-opcua-pseudo-session";
 
 const hasPropertyRefId = resolveNodeId("HasProperty");
 
@@ -47,16 +44,7 @@ interface AnalogDataItemSnapshot {
  * @param nodeId
  * @param callback
  */
-export function readUAAnalogItem(session: ClientSession, nodeId: NodeIdLike): Promise<AnalogDataItemSnapshot>;
-export function readUAAnalogItem(
-    session: ClientSession,
-    nodeId: NodeIdLike,
-    callback: ResponseCallback<AnalogDataItemSnapshot>
-): void;
-export function readUAAnalogItem(session: ClientSession, nodeId: NodeIdLike, ...args: [any?, ...any[]]): any {
-    const callback = args[0] as ResponseCallback<AnalogDataItemSnapshot>;
-    assert(typeof callback === "function");
-
+export async function readUAAnalogItem(session: IBasicSessionAsync, nodeId: NodeIdLike): Promise<AnalogDataItemSnapshot> {
     const browsePath = [
         browsePathPropertyRequest(nodeId, "EngineeringUnits"),
         browsePathPropertyRequest(nodeId, "EURange"),
@@ -73,51 +61,35 @@ export function readUAAnalogItem(session: ClientSession, nodeId: NodeIdLike, ...
         valuePrecision: null
     };
 
-    session.translateBrowsePath(browsePath, (err: Error | null, browsePathResults?: BrowsePathResult[]) => {
-        if (err) {
-            return callback(err);
-        }
-        browsePathResults = browsePathResults || [];
+    const browsePathResults = await session.translateBrowsePath(browsePath);
 
-        const actions: any[] = [];
-        const nodesToRead: ReadValueIdOptions[] = [];
+    const actions: (   (readResult: DataValue) =>void)[] = [];
+    const nodesToRead: ReadValueIdOptions[] = [];
 
-        function processProperty(browsePathResult: BrowsePathResult, propertyName: string) {
-            if (browsePathResult.statusCode.isGood()) {
-                browsePathResult.targets = browsePathResult.targets || [];
-                nodesToRead.push({
-                    attributeId: AttributeIds.Value,
-                    nodeId: browsePathResult.targets[0].targetId
-                });
-                actions.push((readResult: DataValue) => ((analogItemData as any)[propertyName] = readResult.value.value));
-            }
+    function processProperty(browsePathResult: BrowsePathResult, propertyName: string) {
+        if (browsePathResult.statusCode.isGood()) {
+            browsePathResult.targets = browsePathResult.targets || [];
+            nodesToRead.push({
+                attributeId: AttributeIds.Value,
+                nodeId: browsePathResult.targets[0].targetId
+            });
+            actions.push(
+                (readResult: DataValue) =>
+                    ((analogItemData as unknown as Record<string, unknown>)[propertyName] = readResult.value.value)
+            );
         }
+    }
 
-        processProperty(browsePathResults[0], "engineeringUnits");
-        processProperty(browsePathResults[1], "engineeringUnitsRange");
-        processProperty(browsePathResults[2], "instrumentRange");
-        processProperty(browsePathResults[3], "valuePrecision");
-        processProperty(browsePathResults[4], "definition");
+    processProperty(browsePathResults[0], "engineeringUnits");
+    processProperty(browsePathResults[1], "engineeringUnitsRange");
+    processProperty(browsePathResults[2], "instrumentRange");
+    processProperty(browsePathResults[3], "valuePrecision");
+    processProperty(browsePathResults[4], "definition");
 
-        session.read(nodesToRead, (err1: Error | null, dataValues?: DataValue[]) => {
-            if (err1) {
-                return callback(err1);
-            }
-            /* istanbul ignore next */
-            if (!dataValues) {
-                return callback(new Error("Internal Error"));
-            }
-
-            dataValues.forEach((result: DataValue, index: number) => {
-                actions[index].call(null, result);
-            });
+    const dataValues = await session.read(nodesToRead);
 
-            callback(err1, analogItemData);
-        });
+    dataValues.forEach((result: DataValue, index: number) => {
+        actions[index].call(null, result);
     });
+    return analogItemData;
 }
-// tslint:disable:no-var-requires
-// tslint:disable:max-line-length
-const thenify = require("thenify");
-const opts = { multiArgs: false };
-(module as any).exports.readUAAnalogItem = thenify.withCallback((module as any).exports.readUAAnalogItem, opts);

package/source/index.ts

@@ -72,5 +72,5 @@ export * from "node-opcua-service-subscription";
 export * from "node-opcua-service-translate-browse-path";
 export * from "node-opcua-service-write";
 export * from "node-opcua-service-filter";
-export { IBasicSession, browseAll, readNamespaceArray } from "node-opcua-pseudo-session";
+export * from "node-opcua-pseudo-session";
 export * from "node-opcua-client-dynamic-extension-object";

package/source/opcua_client.ts

@@ -2,16 +2,12 @@
  * @module node-opcua-client
  */
 
-import { ByteString } from "node-opcua-basic-types";
-import { Certificate, PrivateKeyPEM } from "node-opcua-crypto";
-import { ConnectionStrategyOptions, Message, SecurityPolicy } from "node-opcua-secure-channel";
-import { ApplicationDescription, EndpointDescription, UserTokenType } from "node-opcua-service-endpoints";
-import { MessageSecurityMode } from "node-opcua-service-secure-channel";
-import { X509IdentityTokenOptions } from "node-opcua-types";
+import { ApplicationDescription, EndpointDescription } from "node-opcua-service-endpoints";
 import { CallbackT, ErrorCallback, StatusCode } from "node-opcua-status-code";
+import { ResponseCallback } from "node-opcua-pseudo-session";
 import { FindServersRequestLike, GetEndpointsOptions, OPCUAClientBase, OPCUAClientBaseOptions } from "./client_base";
 
-import { ClientSession, ResponseCallback } from "./client_session";
+import { ClientSession } from "./client_session";
 import { ClientSubscription, ClientSubscriptionOptions } from "./client_subscription";
 import { OPCUAClientImpl } from "./private/opcua_client_impl";
 import { UserIdentityInfo } from "./user_identity_info";

package/source/private/client_base_impl.ts

@@ -15,7 +15,7 @@ import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "n
 
 import { makeApplicationUrn } from "node-opcua-common";
 import { getHostname } from "node-opcua-hostname";
-import { IBasicTransportSettings } from "node-opcua-pseudo-session";
+import { IBasicTransportSettings, ResponseCallback } from "node-opcua-pseudo-session";
 import {
     ClientSecureChannelLayer,
     coerceConnectionStrategy,
@@ -48,7 +48,6 @@ import { matchUri } from "node-opcua-utils";
 import { getDefaultCertificateManager, makeSubject, OPCUACertificateManager } from "node-opcua-certificate-manager";
 import { VerificationStatus } from "node-opcua-pki";
 import { CloseSessionRequest, CloseSessionResponse } from "node-opcua-service-session";
-import { ResponseCallback } from "../client_session";
 import { Request, Response } from "../common";
 
 import {

package/source/private/client_session_impl.ts

@@ -21,7 +21,16 @@ import { DataValue } from "node-opcua-data-value";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
 import { ExtensionObject } from "node-opcua-extension-object";
 import { coerceNodeId, NodeId, NodeIdLike, resolveNodeId } from "node-opcua-nodeid";
-import { getBuiltInDataType, getArgumentDefinitionHelper, IBasicSession, IBasicTransportSettings } from "node-opcua-pseudo-session";
+import {
+    getBuiltInDataType,
+    getArgumentDefinitionHelper,
+    IBasicSession,
+    IBasicTransportSettings,
+    readAllAttributes,
+    NodeAttributes,
+    ResponseCallback,
+    BrowseDescriptionLike
+} from "node-opcua-pseudo-session";
 import { AnyConstructorFunc } from "node-opcua-schemas";
 import { ClientSecureChannelLayer, requestHandleNotSetValue, SignatureData } from "node-opcua-secure-channel";
 import { BrowseDescription, BrowseRequest, BrowseResponse, BrowseResult } from "node-opcua-service-browse";
@@ -98,7 +107,6 @@ import { DataType, Variant, VariantLike } from "node-opcua-variant";
 
 import {
     ArgumentDefinition,
-    BrowseDescriptionLike,
     CallMethodRequestLike,
     ClientSession,
     CreateMonitoredItemsRequestLike,
@@ -109,7 +117,6 @@ import {
     ModifyMonitoredItemsRequestLike,
     ModifySubscriptionRequestLike,
     MonitoredItemData,
-    NodeAttributes,
     QueryFirstRequestLike,
     SetMonitoringModeRequestLike,
     SubscriptionId,
@@ -127,8 +134,6 @@ import { ClientSidePublishEngine } from "./client_publish_engine";
 import { ClientSubscriptionImpl } from "./client_subscription_impl";
 import { IClientBase } from "./i_private_client";
 
-export type ResponseCallback<T> = (err: Error | null, response?: T) => void;
-
 const helpAPIChange = process.env.DEBUG && process.env.DEBUG.match(/API/);
 const debugLog = make_debugLog(__filename);
 const doDebug = checkDebugFlag(__filename);
@@ -168,55 +173,6 @@ function coerceReadValueId(node: any): ReadValueId {
     }
 }
 
-const keys = Object.keys(AttributeIds).filter((k: any) => (AttributeIds as any)[k] !== AttributeIds.INVALID);
-
-const attributeNames: string[] = ((): string[] => {
-    const r: string[] = [];
-    for (let i = 1; i <= 22; i++) {
-        r.push(attributeNameById[i].toString());
-    }
-    return r;
-})();
-
-function composeResult(nodes: any[], nodesToRead: ReadValueIdOptions[], dataValues: DataValue[]): NodeAttributes[] {
-    assert(nodesToRead.length === dataValues.length);
-    let c = 0;
-    const results = [];
-    let dataValue;
-    let k;
-    let nodeToRead;
-
-    for (const node of nodes) {
-        const data: NodeAttributes = {
-            nodeId: resolveNodeId(node),
-            statusCode: StatusCodes.BadNodeIdUnknown
-        };
-
-        let addedProperty = 0;
-
-        for (const key of attributeNames) {
-            dataValue = dataValues[c];
-            nodeToRead = nodesToRead[c];
-            c++;
-            if (dataValue.statusCode.equals(StatusCodes.Good)) {
-                k = lowerFirstLetter(key);
-                data[k] = dataValue.value ? dataValue.value.value : null;
-                addedProperty += 1;
-            }
-        }
-
-        /* istanbul ignore if */
-        if (addedProperty > 0) {
-            data.statusCode = StatusCodes.Good;
-        } else {
-            data.statusCode = StatusCodes.BadNodeIdUnknown;
-        }
-        results.push(data);
-    }
-
-    return results;
-}
-
 const emptyUint32Array = new Uint32Array(0);
 
 type EmptyCallback = (err?: Error) => void;
@@ -1113,48 +1069,11 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
     public readAllAttributes(nodes: NodeIdLike[], callback: (err: Error | null, data?: NodeAttributes[]) => void): void;
 
     public readAllAttributes(...args: any[]): void {
-        const arg0 = args[0];
-        const callback = args[1];
-        assert(typeof callback === "function");
-
-        const isArray = Array.isArray(arg0);
-
-        const nodes = isArray ? arg0 : [arg0];
-
-        const nodesToRead: ReadValueIdOptions[] = [];
-
-        for (const node of nodes) {
-            const nodeId = resolveNodeId(node);
-
-            /* istanbul ignore next */
-            if (!nodeId) {
-                throw new Error("cannot coerce " + node + " to a valid NodeId");
-            }
-
-            for (let attributeId = 1; attributeId <= 22; attributeId++) {
-                nodesToRead.push({
-                    attributeId,
-                    dataEncoding: undefined,
-                    indexRange: undefined,
-                    nodeId
-                });
-            }
-        }
-
-        this.read(nodesToRead, (err: Error | null, dataValues?: DataValue[]) => {
-            /* istanbul ignore next */
-            if (err) {
-                return callback(err);
-            }
-
-            /* istanbul ignore next */
-            if (!dataValues) {
-                return callback(new Error("Internal Error"));
-            }
-
-            const results = composeResult(nodes, nodesToRead, dataValues);
-            callback(err, isArray ? results : results[0]);
-        });
+        const nodes = args[0] as NodeIdLike[];
+        const callback = args[1] as (err: Error | null, data?: NodeAttributes[]) => void;
+        readAllAttributes(this, nodes)
+            .then((data: any) => callback(null, data))
+            .catch((err: Error) => callback(err));
     }
 
     /**
@@ -1797,7 +1716,6 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
     public hasBeenClosed(): boolean {
         return isNullOrUndefined(this._client) || this._closed || this._closeEventHasBeenEmitted;
     }
-    
 
     public async call(methodToCall: CallMethodRequestLike): Promise<CallMethodResult>;
     public async call(methodToCall: CallMethodRequestLike[]): Promise<CallMethodResult[]>;
@@ -2085,7 +2003,9 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
     public getBuiltInDataType(...args: any[]): any {
         const nodeId = args[0];
         const callback = args[1];
-        return getBuiltInDataType(this, nodeId, callback);
+        return getBuiltInDataType(this, nodeId)
+            .then((dataType: DataType) => callback(null, dataType))
+            .catch(callback);
     }
 
     public resumePublishEngine(): void {

package/source/private/i_private_client.ts

@@ -1,8 +1,8 @@
 import { ClientSecureChannelLayer } from "node-opcua-secure-channel";
 import { EndpointDescription } from "node-opcua-service-endpoints";
-import { IBasicTransportSettings } from "node-opcua-pseudo-session";
+import { IBasicTransportSettings, ResponseCallback } from "node-opcua-pseudo-session";
 
-import { ClientSession, ResponseCallback } from "../client_session";
+import { ClientSession } from "../client_session";
 import { Request, Response } from "../common";
 import { UserIdentityInfo } from "../user_identity_info";
 import { ClientSessionImpl } from "./client_session_impl";