node-opcua-client 2.104.0 → 2.105.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-client",
-    "version": "2.104.0",
+    "version": "2.105.1",
     "description": "pure nodejs OPCUA SDK - module client",
     "scripts": {
         "clean": "npx rimraf node_modules dist *.tsbuildinfo certificates",
@@ -17,54 +17,54 @@
         "@types/async": "^3.2.20",
         "async": "^3.2.4",
         "chalk": "4.1.2",
-        "node-opcua-assert": "2.104.0",
-        "node-opcua-basic-types": "2.104.0",
-        "node-opcua-buffer-utils": "2.104.0",
-        "node-opcua-certificate-manager": "2.104.0",
-        "node-opcua-client-dynamic-extension-object": "2.104.0",
-        "node-opcua-common": "2.104.0",
+        "node-opcua-assert": "2.105.0",
+        "node-opcua-basic-types": "2.105.0",
+        "node-opcua-buffer-utils": "2.105.0",
+        "node-opcua-certificate-manager": "2.105.0",
+        "node-opcua-client-dynamic-extension-object": "2.105.0",
+        "node-opcua-common": "2.105.0",
         "node-opcua-constants": "2.98.1",
-        "node-opcua-crypto": "3.0.5",
-        "node-opcua-data-model": "2.104.0",
-        "node-opcua-data-value": "2.104.0",
-        "node-opcua-date-time": "2.104.0",
-        "node-opcua-debug": "2.104.0",
-        "node-opcua-extension-object": "2.104.0",
-        "node-opcua-hostname": "2.104.0",
-        "node-opcua-nodeid": "2.104.0",
-        "node-opcua-object-registry": "2.104.0",
-        "node-opcua-pki": "4.2.0",
-        "node-opcua-pseudo-session": "2.104.0",
-        "node-opcua-schemas": "2.104.0",
-        "node-opcua-secure-channel": "2.104.0",
-        "node-opcua-service-browse": "2.104.0",
-        "node-opcua-service-call": "2.104.0",
-        "node-opcua-service-discovery": "2.104.0",
-        "node-opcua-service-endpoints": "2.104.0",
-        "node-opcua-service-filter": "2.104.0",
-        "node-opcua-service-history": "2.104.0",
-        "node-opcua-service-query": "2.104.0",
-        "node-opcua-service-read": "2.104.0",
-        "node-opcua-service-register-node": "2.104.0",
-        "node-opcua-service-secure-channel": "2.104.0",
-        "node-opcua-service-session": "2.104.0",
-        "node-opcua-service-subscription": "2.104.0",
-        "node-opcua-service-translate-browse-path": "2.104.0",
-        "node-opcua-service-write": "2.104.0",
-        "node-opcua-status-code": "2.104.0",
-        "node-opcua-types": "2.104.0",
-        "node-opcua-utils": "2.104.0",
-        "node-opcua-variant": "2.104.0",
+        "node-opcua-crypto": "3.0.6",
+        "node-opcua-data-model": "2.105.0",
+        "node-opcua-data-value": "2.105.0",
+        "node-opcua-date-time": "2.105.0",
+        "node-opcua-debug": "2.105.0",
+        "node-opcua-extension-object": "2.105.0",
+        "node-opcua-hostname": "2.105.0",
+        "node-opcua-nodeid": "2.105.0",
+        "node-opcua-object-registry": "2.105.0",
+        "node-opcua-pki": "4.2.1",
+        "node-opcua-pseudo-session": "2.105.0",
+        "node-opcua-schemas": "2.105.0",
+        "node-opcua-secure-channel": "2.105.0",
+        "node-opcua-service-browse": "2.105.0",
+        "node-opcua-service-call": "2.105.0",
+        "node-opcua-service-discovery": "2.105.0",
+        "node-opcua-service-endpoints": "2.105.0",
+        "node-opcua-service-filter": "2.105.0",
+        "node-opcua-service-history": "2.105.0",
+        "node-opcua-service-query": "2.105.0",
+        "node-opcua-service-read": "2.105.0",
+        "node-opcua-service-register-node": "2.105.0",
+        "node-opcua-service-secure-channel": "2.105.0",
+        "node-opcua-service-session": "2.105.0",
+        "node-opcua-service-subscription": "2.105.0",
+        "node-opcua-service-translate-browse-path": "2.105.0",
+        "node-opcua-service-write": "2.105.0",
+        "node-opcua-status-code": "2.105.0",
+        "node-opcua-types": "2.105.0",
+        "node-opcua-utils": "2.105.0",
+        "node-opcua-variant": "2.105.0",
         "thenify": "^3.3.1"
     },
     "devDependencies": {
         "@types/underscore": "^1.11.5",
         "dequeue": "^1.0.5",
         "mocha": "^10.2.0",
-        "node-opcua-address-space": "2.104.0",
-        "node-opcua-binary-stream": "2.104.0",
-        "node-opcua-factory": "2.104.0",
-        "node-opcua-leak-detector": "2.104.0",
+        "node-opcua-address-space": "2.105.1",
+        "node-opcua-binary-stream": "2.105.0",
+        "node-opcua-factory": "2.105.0",
+        "node-opcua-leak-detector": "2.105.0",
         "node-opcua-nodesets": "2.103.0",
         "should": "^13.2.3",
         "sinon": "^15.1.0",
@@ -90,7 +90,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "3cd6d355e8b3c66822d08a3ca682659ea5d1a55d",
+    "gitHead": "049e61e271b2681cd8d4102e3fba942becab70ae",
     "files": [
         "dist",
         "source"

package/source/alarms_and_conditions/client_alarm_tools_acknowledge_all_conditions.ts

@@ -21,7 +21,6 @@ const errorLog = make_errorLog(__filename);
  * @param comment
  */
 export async function acknowledgeCondition(session: ClientSession, eventStuff: EventStuff, comment: string): Promise<StatusCode> {
-
     try {
         const conditionId = eventStuff.conditionId.value;
         const eventId = eventStuff.eventId.value;
@@ -95,12 +94,9 @@ export async function findActiveConditions(session: ClientSession): Promise<Even
                 if (RefreshEndEventHasBeenReceived) {
                     return;
                 }
-          
-          
+
                 // dumpEvent(session, fields, eventFields);
                 const pojo = fieldsToJson(fields, eventFields) as any;
-                
-                // console.log(pojo.eventType.value.toString({ addressSpace}), RefreshEndEventType, RefreshStartEventType);
 
                 // make sure we only start recording event after the RefreshStartEvent has been received
                 if (!refreshStartEventHasBeenReceived) {

package/source/alarms_and_conditions/client_alarm_tools_dump_event.ts

@@ -4,6 +4,10 @@ import { NodeId } from "node-opcua-nodeid";
 import { IBasicSession } from "node-opcua-pseudo-session";
 import { DataType, Variant, VariantLike } from "node-opcua-variant";
 
+import { make_warningLog } from "node-opcua-debug";
+
+const warningLog = make_warningLog("ClientAlarmTool");
+
 /**
  *
  * @param session
@@ -32,8 +36,7 @@ export async function dumpEvent(session: IBasicSession, fields: string[], eventF
         }
         if (variant.dataType === DataType.NodeId) {
             const name = await getBrowseName(_session, variant.value);
-            // tslint:disable-next-line: no-console
-            console.log(
+            warningLog(
                 chalk.yellow(w(name, 30), w(_fields[index], 25)),
                 chalk.cyan(w(DataType[variant.dataType], 10).toString()),
                 chalk.cyan.bold(name),
@@ -43,7 +46,7 @@ export async function dumpEvent(session: IBasicSession, fields: string[], eventF
             );
         } else {
             // tslint:disable-next-line: no-console
-            console.log(
+            warningLog(
                 chalk.yellow(w("", 30), w(_fields[index], 25)),
                 chalk.cyan(w(DataType[variant.dataType as number], 10).toString()),
                 variant.value

package/source/client_session_keepalive_manager.ts

@@ -120,7 +120,6 @@ export class ClientSessionKeepAliveManager extends EventEmitter implements Clien
                 timeSinceLastServerContact
             );
             // no need to send a ping yet
-            // console.log("Skipping ",timeSinceLastServerContact,this.session.timeout);
             return timeSinceLastServerContact - this.pingTimeout;
         }
 

package/source/private/client_base_impl.ts

@@ -753,10 +753,10 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
         if (!fs.existsSync(this.certificateFile)) {
             await withLock({ fileToLock: this.certificateFile + ".mutex" }, async () => {
                 if (fs.existsSync(this.certificateFile)) {
-                    // the file may have been created in between    
+                    // the file may have been created in between
                     return;
                 }
-                console.log("Creating default certificate ... please wait");
+                warningLog("Creating default certificate ... please wait");
                 if (this.disconnecting) return;
 
                 await ClientBaseImpl.createCertificate(
@@ -810,13 +810,13 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
 
     protected _handleUnrecoverableConnectionFailure(err: Error, callback: ErrorCallback): void {
         debugLog(err.message);
-        this.emit("connection_failed");
+        this.emit("connection_failed", err);
         this._setInternalState("disconnected");
         return callback(err);
     }
     private _handleDisconnectionWhileConnecting(err: Error, callback: ErrorCallback) {
         debugLog(err.message);
-        this.emit("connection_failed");
+        this.emit("connection_failed", err);
         this._setInternalState("disconnected");
         return callback(err);
     }
@@ -937,7 +937,6 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
                     /* */
                     this._handleDisconnectionWhileConnecting(err, callback);
                 } else {
-                    console.log("REMOVE ME", err.stack);
                     err = new Error("The connection may have been rejected by server,\n" + "Err = (" + err.message + ")");
                     this._handleUnrecoverableConnectionFailure(err, callback);
                 }

package/source/private/client_session_impl.ts

@@ -309,7 +309,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
     get subscriptionCount(): number {
         return this._publishEngine ? this._publishEngine.subscriptionCount : 0;
     }
-    
+
     get isReconnecting(): boolean {
         return this._client ? this._client.isReconnecting || this._reconnecting?.reconnecting : false;
     }
@@ -337,7 +337,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
         this._client._activateSession(this, userIdentityInfo, (err1: Error | null, session2?: ClientSessionImpl) => {
             if (err1) {
                 this.userIdentityInfo = old_userIdentity;
-                console.log("err1  = ", err1.message);
+                warningLog("activate session error = ", err1.message);
                 return callback!(null, StatusCodes.BadUserAccessDenied);
             }
             this.userIdentityInfo = userIdentityInfo;
@@ -450,8 +450,8 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
                     if (r.references && r.references.length > this.requestedMaxReferencesPerNode) {
                         warningLog(
                             chalk.yellow("warning") +
-                            " BrowseResponse : the server didn't take into" +
-                            " account our requestedMaxReferencesPerNode "
+                                " BrowseResponse : the server didn't take into" +
+                                " account our requestedMaxReferencesPerNode "
                         );
                         warningLog("        this.requestedMaxReferencesPerNode= " + this.requestedMaxReferencesPerNode);
                         warningLog("        got " + r.references.length + "for " + nodesToBrowse[i].nodeId.toString());
@@ -460,7 +460,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
                 }
             }
             for (const r of results) {
-                r.references = r.references || /* istanbul ignore next */[];
+                r.references = r.references || /* istanbul ignore next */ [];
             }
             assert(results[0] instanceof BrowseResult);
             return callback(null, isArray ? results : results[0]);
@@ -546,7 +546,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
      * ```javascript
      *     const dataValues = await session.readVariableValue(["ns=1;s=Temperature","ns=1;s=Pressure"]);
      * ```
-     * 
+     *
      * @deprecated
      */
     public readVariableValue(nodeId: NodeIdLike, callback: ResponseCallback<DataValue>): void;
@@ -759,7 +759,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
                 return callback(new Error(response.responseHeader.serviceResult.toString()));
             }
 
-            response.results = response.results || /* istanbul ignore next */[];
+            response.results = response.results || /* istanbul ignore next */ [];
             callback(null, response);
         });
     }
@@ -891,7 +891,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
                 return callback(new Error(response.responseHeader.serviceResult.toString()));
             }
 
-            response.results = response.results || /* istanbul ignore next */[];
+            response.results = response.results || /* istanbul ignore next */ [];
 
             assert(nodesToRead.length === response.results.length);
 
@@ -1034,7 +1034,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
             if (response.responseHeader.serviceResult.isNot(StatusCodes.Good)) {
                 return callback(new Error(response.responseHeader.serviceResult.toString()));
             }
-            response.results = response.results || /* istanbul ignore next */[];
+            response.results = response.results || /* istanbul ignore next */ [];
             assert(nodesToWrite.length === response.results.length);
             callback(null, isArray ? response.results : response.results[0]);
         });
@@ -1256,7 +1256,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
                 warningLog(
                     chalk.yellow(
                         "please make sure to refactor your code and check that " +
-                        "the second argument of your callback function is named"
+                            "the second argument of your callback function is named"
                     ),
                     chalk.cyan("dataValue" + (isArray ? "s" : ""))
                 );
@@ -1289,7 +1289,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
 
             // perform ExtensionObject resolution
             promoteOpaqueStructureWithCallback(this, response.results!, () => {
-                response.results = response.results || /* istanbul ignore next */[];
+                response.results = response.results || /* istanbul ignore next */ [];
                 return callback(null, isArray ? response.results : response.results[0]);
             });
         });
@@ -1490,7 +1490,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
                 if (!response) {
                     return callback(new Error("Internal Error"));
                 }
-                response.results = response.results || /* istanbul ignore next */[];
+                response.results = response.results || /* istanbul ignore next */ [];
                 callback(err, isArray ? response.results : response.results[0]);
             }
         );
@@ -1535,7 +1535,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
             if (!response || !(response instanceof TranslateBrowsePathsToNodeIdsResponse)) {
                 return callback(new Error("Internal Error"));
             }
-            response.results = response.results || /* istanbul ignore next */[];
+            response.results = response.results || /* istanbul ignore next */ [];
 
             callback(null, isArray ? response.results : response.results[0]);
         });
@@ -1694,9 +1694,9 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
             if (response.responseHeader.serviceResult.isNot(StatusCodes.Good)) {
                 err = new Error(
                     " ServiceResult is " +
-                    response.responseHeader.serviceResult.toString() +
-                    " request was " +
-                    request.constructor.name
+                        response.responseHeader.serviceResult.toString() +
+                        " request was " +
+                        request.constructor.name
                 );
 
                 if (response && response.responseHeader.serviceDiagnostics) {
@@ -1943,7 +1943,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
                 return callback(new Error("Internal Error"));
             }
 
-            response.registeredNodeIds = response.registeredNodeIds || /* istanbul ignore next */[];
+            response.registeredNodeIds = response.registeredNodeIds || /* istanbul ignore next */ [];
 
             callback(null, response.registeredNodeIds);
         });
@@ -2038,7 +2038,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
         const privateThis = this as any;
         if (!(!privateThis.pendingTransactions || privateThis.pendingTransactions.length === 0)) {
             // tslint:disable-next-line: no-console
-            console.log("dispose when pendingTransactions is not empty ");
+            warningLog("dispose when pendingTransactions is not empty ");
         }
     }
 
@@ -2073,12 +2073,11 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
                 str += "\n reviseTokenLifetime...... " + this._client._secureChannel.securityToken.revisedLifetime;
             }
         }
-        str += "\n keepAlive ................ " + this._keepAliveManager ? true:  false;
+        str += "\n keepAlive ................ " + this._keepAliveManager ? true : false;
         if (this._keepAliveManager) {
             str += "\n keepAlive checkInterval.. " + this._keepAliveManager.checkInterval;
             str += "\n defaultTransportTimeout.. " + ClientSecureChannelLayer.defaultTransportTimeout;
-
-        } 
+        }
         return str;
     }
 
@@ -2277,7 +2276,7 @@ export class ClientSessionImpl extends EventEmitter implements ClientSession {
     ) {
         if (this.recursive_repair_detector >= 1) {
             // tslint:disable-next-line: no-console
-            console.log("recreate_session_and_reperform_transaction => Already in Progress");
+            warningLog("recreate_session_and_reperform_transaction => Already in Progress");
             return callback(new Error("Cannot recreate session"));
         }
         this.recursive_repair_detector += 1;

package/source/private/opcua_client_impl.ts

@@ -13,14 +13,7 @@ import chalk from "chalk";
 
 import { assert } from "node-opcua-assert";
 import { createFastUninitializedBuffer } from "node-opcua-buffer-utils";
-import {
-    Certificate,
-    exploreCertificate,
-    extractPublicKeyFromCertificateSync,
-    Nonce,
-    PrivateKey,
-    toPem
-} from "node-opcua-crypto";
+import { Certificate, exploreCertificate, extractPublicKeyFromCertificateSync, Nonce, PrivateKey, toPem } from "node-opcua-crypto";
 
 import { LocalizedText } from "node-opcua-data-model";
 import { checkDebugFlag, make_debugLog, make_errorLog, make_warningLog } from "node-opcua-debug";
@@ -608,7 +601,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
                             innerCallback();
                         });
                     } catch (err) {
-                        console.log("Exception catch in inner function,  check your code ", err);
+                        errorLog("Exception catch in inner function,  check your code ", err);
                         errorLog("OPCUAClientImpl#withClientSession", (<Error>err).message);
                         the_error = err as Error;
                         innerCallback();
@@ -637,7 +630,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
             ],
             (err1) => {
                 if (err1) {
-                    console.log("err", err1.message);
+                    errorLog("err", err1.message);
                 }
                 if (need_disconnect) {
                     errorLog("Disconnecting client after failure");
@@ -728,7 +721,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
                 const result = await func(session, subscription);
                 return result;
             } catch (err) {
-                console.log("withSubscriptionAsync inner function failed ", (<Error>err).message);
+                errorLog("withSubscriptionAsync inner function failed ", (<Error>err).message);
                 throw err;
             } finally {
                 await subscription.terminate();
@@ -756,9 +749,14 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
         if (!this.__resolveEndPoint() || !this.endpoint) {
             return callback!(
                 new Error(
-                    " End point must exist " + this._secureChannel!.endpointUrl +
-                    "  securityMode = " + MessageSecurityMode[this.securityMode] +
-                    "  securityPolicy = " + this.securityPolicy));
+                    " End point must exist " +
+                        this._secureChannel!.endpointUrl +
+                        "  securityMode = " +
+                        MessageSecurityMode[this.securityMode] +
+                        "  securityPolicy = " +
+                        this.securityPolicy
+                )
+            );
         }
 
         assert(
@@ -845,7 +843,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
         this.clientNonce = crypto.randomBytes(32);
 
         // recycle session name if already exists
-        const sessionName = session.name
+        const sessionName = session.name;
 
         const request = new CreateSessionRequest({
             clientCertificate: this.getCertificate(),
@@ -855,7 +853,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
             maxResponseMessageSize: 800000,
             requestedSessionTimeout: this.requestedSessionTimeout,
             serverUri: this.serverUri,
-            sessionName,
+            sessionName
         });
 
         // a client Nonce must be provided if security mode is set
@@ -864,10 +862,8 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
         this.performMessageTransaction(request, (err: Error | null, response?: Response) => {
             /* istanbul ignore next */
             if (err) {
-                console.log("__createSession_step3 has failed", err.message);
+                debugLog("__createSession_step3 has failed", err.message);
                 return callback(err);
-
-                //  //xxxxxx               qdqsdqsdqsdqsd
                 //                 // we could have an invalid state here or a connection error
                 //                 errorLog("error: ", err.message, " retrying in ... 5 secondes");
                 //                 setTimeout(() => {
@@ -1155,20 +1151,32 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
         if (!this.__resolveEndPoint() || !this.endpoint) {
             /* istanbul ignore next */
             if (this._serverEndpoints) {
-                warningLog("server endpoints =",
-                    this._serverEndpoints.map(
-                        (endpoint) =>
-                            endpoint.endpointUrl + " "
-                            + MessageSecurityMode[endpoint.securityMode] + " "
-                            + endpoint.securityPolicyUri + " "
-                            + endpoint.userIdentityTokens?.map((u) => UserTokenType[u.tokenType]).join(",")
-                    ).join('\n')
+                warningLog(
+                    "server endpoints =",
+                    this._serverEndpoints
+                        .map(
+                            (endpoint) =>
+                                endpoint.endpointUrl +
+                                " " +
+                                MessageSecurityMode[endpoint.securityMode] +
+                                " " +
+                                endpoint.securityPolicyUri +
+                                " " +
+                                endpoint.userIdentityTokens?.map((u) => UserTokenType[u.tokenType]).join(",")
+                        )
+                        .join("\n")
                 );
             }
-            return callback(new Error(
-                " End point must exist " + this._secureChannel!.endpointUrl +
-                "  securityMode = " + MessageSecurityMode[this.securityMode] +
-                "  securityPolicy = " + this.securityPolicy));
+            return callback(
+                new Error(
+                    " End point must exist " +
+                        this._secureChannel!.endpointUrl +
+                        "  securityMode = " +
+                        MessageSecurityMode[this.securityMode] +
+                        "  securityPolicy = " +
+                        this.securityPolicy
+                )
+            );
         }
         this.serverUri = this.endpoint.server.applicationUri || "invalid application uri";
         this.endpointUrl = this._secureChannel!.endpointUrl;

package/source/reconnection.ts

@@ -167,7 +167,6 @@ function repair_client_session_by_recreating_a_new_session(
     session: ClientSessionImpl,
     callback: (err?: Error) => void
 ) {
-
     // As we don"t know if server has been rebooted or not,
     // and may be upgraded in between, we have to invalidate the extra data type manager
     invalidateExtraDataTypeManager(session);
@@ -367,8 +366,7 @@ function repair_client_session_by_recreating_a_new_session(
                 //      call Republish
                 return _ask_for_subscription_republish(newSession, (err) => {
                     if (err) {
-                        // tslint:disable-next-line: no-console
-                        console.log("warning: Subscription republished has failed ", err.message);
+                        warningLog("warning: Subscription republished has failed ", err.message);
                     }
                     innerCallback(err);
                 });