node-opcua-client 2.140.0 → 2.142.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-client",
-    "version": "2.140.0",
+    "version": "2.142.0",
     "description": "pure nodejs OPCUA SDK - module client",
     "scripts": {
         "clean": "npx rimraf -g node_modules dist *.tsbuildinfo certificates",
@@ -17,56 +17,55 @@
         "@types/async": "^3.2.24",
         "async": "^3.2.6",
         "chalk": "4.1.2",
-        "node-opcua-alarm-condition": "2.140.0",
+        "node-opcua-alarm-condition": "2.142.0",
         "node-opcua-assert": "2.139.0",
         "node-opcua-basic-types": "2.139.0",
         "node-opcua-buffer-utils": "2.139.0",
-        "node-opcua-certificate-manager": "2.140.0",
-        "node-opcua-client-dynamic-extension-object": "2.140.0",
-        "node-opcua-common": "2.139.0",
+        "node-opcua-certificate-manager": "2.142.0",
+        "node-opcua-client-dynamic-extension-object": "2.142.0",
+        "node-opcua-common": "2.142.0",
         "node-opcua-constants": "2.139.0",
-        "node-opcua-crypto": "4.15.0",
+        "node-opcua-crypto": "4.16.0",
         "node-opcua-data-model": "2.139.0",
-        "node-opcua-data-value": "2.139.0",
+        "node-opcua-data-value": "2.142.0",
         "node-opcua-date-time": "2.139.0",
         "node-opcua-debug": "2.139.0",
         "node-opcua-extension-object": "2.139.0",
         "node-opcua-hostname": "2.139.0",
         "node-opcua-nodeid": "2.139.0",
         "node-opcua-object-registry": "2.139.0",
-        "node-opcua-pki": "4.18.0",
-        "node-opcua-pseudo-session": "2.140.0",
-        "node-opcua-schemas": "2.139.0",
-        "node-opcua-secure-channel": "2.140.0",
-        "node-opcua-service-browse": "2.139.0",
-        "node-opcua-service-call": "2.139.0",
-        "node-opcua-service-discovery": "2.139.0",
-        "node-opcua-service-endpoints": "2.139.0",
-        "node-opcua-service-filter": "2.139.0",
-        "node-opcua-service-history": "2.139.0",
-        "node-opcua-service-query": "2.139.0",
-        "node-opcua-service-read": "2.139.0",
-        "node-opcua-service-register-node": "2.139.0",
-        "node-opcua-service-secure-channel": "2.139.0",
-        "node-opcua-service-session": "2.139.0",
-        "node-opcua-service-subscription": "2.140.0",
-        "node-opcua-service-translate-browse-path": "2.139.0",
-        "node-opcua-service-write": "2.139.0",
+        "node-opcua-pki": "5.1.0",
+        "node-opcua-pseudo-session": "2.142.0",
+        "node-opcua-schemas": "2.142.0",
+        "node-opcua-secure-channel": "2.142.0",
+        "node-opcua-service-browse": "2.142.0",
+        "node-opcua-service-call": "2.142.0",
+        "node-opcua-service-discovery": "2.142.0",
+        "node-opcua-service-endpoints": "2.142.0",
+        "node-opcua-service-filter": "2.142.0",
+        "node-opcua-service-history": "2.142.0",
+        "node-opcua-service-query": "2.142.0",
+        "node-opcua-service-read": "2.142.0",
+        "node-opcua-service-register-node": "2.142.0",
+        "node-opcua-service-secure-channel": "2.142.0",
+        "node-opcua-service-session": "2.142.0",
+        "node-opcua-service-subscription": "2.142.0",
+        "node-opcua-service-translate-browse-path": "2.142.0",
+        "node-opcua-service-write": "2.142.0",
         "node-opcua-status-code": "2.139.0",
-        "node-opcua-types": "2.139.0",
+        "node-opcua-types": "2.142.0",
         "node-opcua-utils": "2.139.0",
-        "node-opcua-variant": "2.139.0",
-        "thenify": "^3.3.1"
+        "node-opcua-variant": "2.142.0",
+        "thenify-ex": "4.2.0"
     },
     "devDependencies": {
         "@types/underscore": "^1.13.0",
         "dequeue": "^1.0.5",
-        "node-opcua-address-space": "2.140.0",
+        "node-opcua-address-space": "2.142.0",
         "node-opcua-binary-stream": "2.139.0",
         "node-opcua-factory": "2.139.0",
         "node-opcua-leak-detector": "2.139.0",
-        "node-opcua-nodesets": "2.139.0",
-        "underscore": "^1.13.7"
+        "node-opcua-nodesets": "2.139.0"
     },
     "eslintConfig": {
         "env": {
@@ -88,7 +87,7 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "f966ee4ce83c1012795fbf030d261df091c3c189",
+    "gitHead": "50cfa07779d4c07b299176ac9c27527fcd97d079",
     "files": [
         "dist",
         "source"

package/source/alarms_and_conditions/client_tools.ts

@@ -66,9 +66,9 @@ ClientSessionImpl.prototype.acknowledgeCondition = function (
 
 // tslint:disable:no-var-requires
 // tslint:disable:max-line-length
-const thenify = require("thenify");
+import { withCallback } from "thenify-ex";
 const opts = { multiArgs: false };
-ClientSessionImpl.prototype.addCommentCondition = thenify.withCallback(ClientSessionImpl.prototype.addCommentCondition, opts);
-ClientSessionImpl.prototype.findMethodId = thenify.withCallback(ClientSessionImpl.prototype.findMethodId, opts);
-ClientSessionImpl.prototype.confirmCondition = thenify.withCallback(ClientSessionImpl.prototype.confirmCondition, opts);
-ClientSessionImpl.prototype.acknowledgeCondition = thenify.withCallback(ClientSessionImpl.prototype.acknowledgeCondition, opts);
+ClientSessionImpl.prototype.addCommentCondition = withCallback(ClientSessionImpl.prototype.addCommentCondition, opts);
+ClientSessionImpl.prototype.findMethodId = withCallback(ClientSessionImpl.prototype.findMethodId, opts);
+ClientSessionImpl.prototype.confirmCondition = withCallback(ClientSessionImpl.prototype.confirmCondition, opts);
+ClientSessionImpl.prototype.acknowledgeCondition = withCallback(ClientSessionImpl.prototype.acknowledgeCondition, opts);

package/source/private/client_base_impl.ts

@@ -223,30 +223,21 @@ function __findEndpoint(this: ClientBaseImpl, endpointUrl: string, params: FindE
 /**
  * check if certificate is trusted or untrusted
  */
-function _verify_serverCertificate(
+async function _verify_serverCertificate(
     certificateManager: OPCUACertificateManager,
-    serverCertificate: Certificate,
-    callback: ErrorCallback
-) {
-    certificateManager.checkCertificate(serverCertificate, (err: Error | null, status?: StatusCode) => {
-        if (err) {
-            return callback(err);
-        }
-        if (status !== StatusCodes.Good) {
-            // istanbul ignore next
-            if (doDebug) {
-                // do it again for debug purposes
-                certificateManager.verifyCertificate(serverCertificate, (err1: Error | null, status1?: VerificationStatus) => {
-                    debugLog(status1);
-                });
-            }
-            warningLog("serverCertificate = ", makeSHA1Thumbprint(serverCertificate).toString("hex"));
-            warningLog("serverCertificate = ", serverCertificate.toString("base64"));
-
-            return callback(new Error("server Certificate verification failed with err " + status?.toString()));
+    serverCertificate: Certificate) {
+    const status = await certificateManager.checkCertificate(serverCertificate);
+    if (status !== StatusCodes.Good) {
+        // istanbul ignore next
+        if (doDebug) {
+            // do it again for debug purposes
+            const status1 = await certificateManager.verifyCertificate(serverCertificate);
+            debugLog(status1);
         }
-        callback();
-    });
+        warningLog("serverCertificate = ", makeSHA1Thumbprint(serverCertificate).toString("hex"));
+        warningLog("serverCertificate = ", serverCertificate.toString("base64"));
+        throw new Error("server Certificate verification failed with err " + status?.toString());
+    }
 }
 
 const forceEndpointDiscoveryOnConnect = !!parseInt(process.env.NODEOPCUA_CLIENT_FORCE_ENDPOINT_DISCOVERY || "0", 10);
@@ -1436,8 +1427,12 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
 
             assert(endpoint);
 
-            _verify_serverCertificate(this.clientCertificateManager, endpoint.serverCertificate, (err1?: Error) => {
-                if (err1) {
+            _verify_serverCertificate(this.clientCertificateManager, endpoint.serverCertificate)
+                .then(() => {
+                    this.serverCertificate = endpoint.serverCertificate;
+                    callback(null, endpoint.endpointUrl!);
+                })
+                .catch((err1: Error) => {
                     warningLog("[NODE-OPCUA-W25] client's server certificate verification has failed ", err1.message);
                     warningLog("                 clientCertificateManager.rootDir = ", this.clientCertificateManager.rootDir);
 
@@ -1462,10 +1457,7 @@ export class ClientBaseImpl extends OPCUASecureObject implements OPCUAClientBase
                         );
                     }
                     return callback(err1);
-                }
-                this.serverCertificate = endpoint.serverCertificate;
-                callback(null, endpoint.endpointUrl!);
-            });
+                });
         });
     }
     private _accumulate_statistics() {
@@ -1791,12 +1783,12 @@ class TmpClient extends ClientBaseImpl {
 
 // tslint:disable:no-var-requires
 // tslint:disable:max-line-length
-const thenify = require("thenify");
-ClientBaseImpl.prototype.connect = thenify.withCallback(ClientBaseImpl.prototype.connect);
-ClientBaseImpl.prototype.disconnect = thenify.withCallback(ClientBaseImpl.prototype.disconnect);
-ClientBaseImpl.prototype.getEndpoints = thenify.withCallback(ClientBaseImpl.prototype.getEndpoints);
-ClientBaseImpl.prototype.findServers = thenify.withCallback(ClientBaseImpl.prototype.findServers);
-ClientBaseImpl.prototype.findServersOnNetwork = thenify.withCallback(ClientBaseImpl.prototype.findServersOnNetwork);
+import { withCallback } from "thenify-ex";
+ClientBaseImpl.prototype.connect = withCallback(ClientBaseImpl.prototype.connect);
+ClientBaseImpl.prototype.disconnect = withCallback(ClientBaseImpl.prototype.disconnect);
+ClientBaseImpl.prototype.getEndpoints = withCallback(ClientBaseImpl.prototype.getEndpoints);
+ClientBaseImpl.prototype.findServers = withCallback(ClientBaseImpl.prototype.findServers);
+ClientBaseImpl.prototype.findServersOnNetwork = withCallback(ClientBaseImpl.prototype.findServersOnNetwork);
 
 OPCUAClientBase.create = (options: OPCUAClientBaseOptions): OPCUAClientBase => {
     return new ClientBaseImpl(options);

package/source/private/client_monitored_item_group_impl.ts

@@ -215,14 +215,14 @@ Please investigate the code of the event handler function to fix the error.`
 
 // tslint:disable:no-var-requires
 // tslint:disable:max-line-length
-const thenify = require("thenify");
+import { withCallback } from "thenify-ex";
 const opts = { multiArgs: false };
 
-ClientMonitoredItemGroupImpl.prototype.terminate = thenify.withCallback(ClientMonitoredItemGroupImpl.prototype.terminate);
-ClientMonitoredItemGroupImpl.prototype.setMonitoringMode = thenify.withCallback(
+ClientMonitoredItemGroupImpl.prototype.terminate = withCallback(ClientMonitoredItemGroupImpl.prototype.terminate);
+ClientMonitoredItemGroupImpl.prototype.setMonitoringMode = withCallback(
     ClientMonitoredItemGroupImpl.prototype.setMonitoringMode
 );
-ClientMonitoredItemGroupImpl.prototype.modify = thenify.withCallback(ClientMonitoredItemGroupImpl.prototype.modify);
+ClientMonitoredItemGroupImpl.prototype.modify = withCallback(ClientMonitoredItemGroupImpl.prototype.modify);
 
 ClientMonitoredItemGroup.create = (
     subscription: ClientSubscription,

package/source/private/client_monitored_item_impl.ts

@@ -386,12 +386,12 @@ export class ClientMonitoredItemImpl extends EventEmitter implements ClientMonit
 
 // tslint:disable:no-var-requires
 // tslint:disable:max-line-length
-const thenify = require("thenify");
+import { withCallback } from "thenify-ex";
 const opts = { multiArgs: false };
 
-ClientMonitoredItemImpl.prototype.terminate = thenify.withCallback(ClientMonitoredItemImpl.prototype.terminate);
-ClientMonitoredItemImpl.prototype.setMonitoringMode = thenify.withCallback(ClientMonitoredItemImpl.prototype.setMonitoringMode);
-ClientMonitoredItemImpl.prototype.modify = thenify.withCallback(ClientMonitoredItemImpl.prototype.modify);
+ClientMonitoredItemImpl.prototype.terminate = withCallback(ClientMonitoredItemImpl.prototype.terminate);
+ClientMonitoredItemImpl.prototype.setMonitoringMode = withCallback(ClientMonitoredItemImpl.prototype.setMonitoringMode);
+ClientMonitoredItemImpl.prototype.modify = withCallback(ClientMonitoredItemImpl.prototype.modify);
 
 ClientMonitoredItem.create = (
     subscription: ClientSubscription,

package/source/private/client_session_impl.ts

@@ -2185,44 +2185,44 @@ async function promoteOpaqueStructureForCall(session: IBasicSessionAsync2, callM
 
 // tslint:disable:no-var-requires
 // tslint:disable:max-line-length
-const thenify = require("thenify");
+import { withCallback } from "thenify-ex";
 const opts = { multiArgs: false };
 
-ClientSessionImpl.prototype.browse = thenify.withCallback(ClientSessionImpl.prototype.browse, opts);
-ClientSessionImpl.prototype.browseNext = thenify.withCallback(ClientSessionImpl.prototype.browseNext, opts);
-ClientSessionImpl.prototype.readVariableValue = thenify.withCallback(ClientSessionImpl.prototype.readVariableValue, opts);
-ClientSessionImpl.prototype.readHistoryValue = thenify.withCallback(ClientSessionImpl.prototype.readHistoryValue, opts);
-ClientSessionImpl.prototype.readAggregateValue = thenify.withCallback(ClientSessionImpl.prototype.readAggregateValue, opts);
-ClientSessionImpl.prototype.historyRead = thenify.withCallback(ClientSessionImpl.prototype.historyRead, opts);
-ClientSessionImpl.prototype.write = thenify.withCallback(ClientSessionImpl.prototype.write, opts);
-ClientSessionImpl.prototype.writeSingleNode = thenify.withCallback(ClientSessionImpl.prototype.writeSingleNode, opts);
-ClientSessionImpl.prototype.readAllAttributes = thenify.withCallback(ClientSessionImpl.prototype.readAllAttributes, opts);
-ClientSessionImpl.prototype.read = thenify.withCallback(ClientSessionImpl.prototype.read, opts);
-ClientSessionImpl.prototype.createSubscription = thenify.withCallback(ClientSessionImpl.prototype.createSubscription, opts);
-ClientSessionImpl.prototype.createSubscription2 = thenify.withCallback(ClientSessionImpl.prototype.createSubscription2, opts);
-ClientSessionImpl.prototype.deleteSubscriptions = thenify.withCallback(ClientSessionImpl.prototype.deleteSubscriptions, opts);
-ClientSessionImpl.prototype.transferSubscriptions = thenify.withCallback(ClientSessionImpl.prototype.transferSubscriptions, opts);
-ClientSessionImpl.prototype.createMonitoredItems = thenify.withCallback(ClientSessionImpl.prototype.createMonitoredItems, opts);
-ClientSessionImpl.prototype.modifyMonitoredItems = thenify.withCallback(ClientSessionImpl.prototype.modifyMonitoredItems, opts);
-ClientSessionImpl.prototype.modifySubscription = thenify.withCallback(ClientSessionImpl.prototype.modifySubscription, opts);
-ClientSessionImpl.prototype.setTriggering = thenify.withCallback(ClientSessionImpl.prototype.setTriggering, opts);
-ClientSessionImpl.prototype.setMonitoringMode = thenify.withCallback(ClientSessionImpl.prototype.setMonitoringMode, opts);
-ClientSessionImpl.prototype.publish = thenify.withCallback(ClientSessionImpl.prototype.publish, opts);
-ClientSessionImpl.prototype.republish = thenify.withCallback(ClientSessionImpl.prototype.republish, opts);
-ClientSessionImpl.prototype.deleteMonitoredItems = thenify.withCallback(ClientSessionImpl.prototype.deleteMonitoredItems, opts);
-ClientSessionImpl.prototype.setPublishingMode = thenify.withCallback(ClientSessionImpl.prototype.setPublishingMode, opts);
-ClientSessionImpl.prototype.translateBrowsePath = thenify.withCallback(ClientSessionImpl.prototype.translateBrowsePath, opts);
-ClientSessionImpl.prototype.performMessageTransaction = thenify.withCallback(
+ClientSessionImpl.prototype.browse = withCallback(ClientSessionImpl.prototype.browse, opts);
+ClientSessionImpl.prototype.browseNext = withCallback(ClientSessionImpl.prototype.browseNext, opts);
+ClientSessionImpl.prototype.readVariableValue = withCallback(ClientSessionImpl.prototype.readVariableValue, opts);
+ClientSessionImpl.prototype.readHistoryValue = withCallback(ClientSessionImpl.prototype.readHistoryValue, opts);
+ClientSessionImpl.prototype.readAggregateValue = withCallback(ClientSessionImpl.prototype.readAggregateValue, opts);
+ClientSessionImpl.prototype.historyRead = withCallback(ClientSessionImpl.prototype.historyRead, opts);
+ClientSessionImpl.prototype.write = withCallback(ClientSessionImpl.prototype.write, opts);
+ClientSessionImpl.prototype.writeSingleNode = withCallback(ClientSessionImpl.prototype.writeSingleNode, opts);
+ClientSessionImpl.prototype.readAllAttributes = withCallback(ClientSessionImpl.prototype.readAllAttributes, opts);
+ClientSessionImpl.prototype.read = withCallback(ClientSessionImpl.prototype.read, opts);
+ClientSessionImpl.prototype.createSubscription = withCallback(ClientSessionImpl.prototype.createSubscription, opts);
+ClientSessionImpl.prototype.createSubscription2 = withCallback(ClientSessionImpl.prototype.createSubscription2, opts);
+ClientSessionImpl.prototype.deleteSubscriptions = withCallback(ClientSessionImpl.prototype.deleteSubscriptions, opts);
+ClientSessionImpl.prototype.transferSubscriptions = withCallback(ClientSessionImpl.prototype.transferSubscriptions, opts);
+ClientSessionImpl.prototype.createMonitoredItems = withCallback(ClientSessionImpl.prototype.createMonitoredItems, opts);
+ClientSessionImpl.prototype.modifyMonitoredItems = withCallback(ClientSessionImpl.prototype.modifyMonitoredItems, opts);
+ClientSessionImpl.prototype.modifySubscription = withCallback(ClientSessionImpl.prototype.modifySubscription, opts);
+ClientSessionImpl.prototype.setTriggering = withCallback(ClientSessionImpl.prototype.setTriggering, opts);
+ClientSessionImpl.prototype.setMonitoringMode = withCallback(ClientSessionImpl.prototype.setMonitoringMode, opts);
+ClientSessionImpl.prototype.publish = withCallback(ClientSessionImpl.prototype.publish, opts);
+ClientSessionImpl.prototype.republish = withCallback(ClientSessionImpl.prototype.republish, opts);
+ClientSessionImpl.prototype.deleteMonitoredItems = withCallback(ClientSessionImpl.prototype.deleteMonitoredItems, opts);
+ClientSessionImpl.prototype.setPublishingMode = withCallback(ClientSessionImpl.prototype.setPublishingMode, opts);
+ClientSessionImpl.prototype.translateBrowsePath = withCallback(ClientSessionImpl.prototype.translateBrowsePath, opts);
+ClientSessionImpl.prototype.performMessageTransaction = withCallback(
     ClientSessionImpl.prototype.performMessageTransaction,
     opts
 );
-ClientSessionImpl.prototype.close = thenify.withCallback(ClientSessionImpl.prototype.close, opts);
-ClientSessionImpl.prototype.call = thenify.withCallback(ClientSessionImpl.prototype.call, opts);
-ClientSessionImpl.prototype.getMonitoredItems = thenify.withCallback(ClientSessionImpl.prototype.getMonitoredItems, opts);
-ClientSessionImpl.prototype.getArgumentDefinition = thenify.withCallback(ClientSessionImpl.prototype.getArgumentDefinition, opts);
-ClientSessionImpl.prototype.queryFirst = thenify.withCallback(ClientSessionImpl.prototype.queryFirst, opts);
-ClientSessionImpl.prototype.registerNodes = thenify.withCallback(ClientSessionImpl.prototype.registerNodes, opts);
-ClientSessionImpl.prototype.unregisterNodes = thenify.withCallback(ClientSessionImpl.prototype.unregisterNodes, opts);
-ClientSessionImpl.prototype.readNamespaceArray = thenify.withCallback(ClientSessionImpl.prototype.readNamespaceArray, opts);
-ClientSessionImpl.prototype.getBuiltInDataType = thenify.withCallback(ClientSessionImpl.prototype.getBuiltInDataType, opts);
-ClientSessionImpl.prototype.changeUser = thenify.withCallback(ClientSessionImpl.prototype.changeUser, opts);
+ClientSessionImpl.prototype.close = withCallback(ClientSessionImpl.prototype.close, opts);
+ClientSessionImpl.prototype.call = withCallback(ClientSessionImpl.prototype.call, opts);
+ClientSessionImpl.prototype.getMonitoredItems = withCallback(ClientSessionImpl.prototype.getMonitoredItems, opts);
+ClientSessionImpl.prototype.getArgumentDefinition = withCallback(ClientSessionImpl.prototype.getArgumentDefinition, opts);
+ClientSessionImpl.prototype.queryFirst = withCallback(ClientSessionImpl.prototype.queryFirst, opts);
+ClientSessionImpl.prototype.registerNodes = withCallback(ClientSessionImpl.prototype.registerNodes, opts);
+ClientSessionImpl.prototype.unregisterNodes = withCallback(ClientSessionImpl.prototype.unregisterNodes, opts);
+ClientSessionImpl.prototype.readNamespaceArray = withCallback(ClientSessionImpl.prototype.readNamespaceArray, opts);
+ClientSessionImpl.prototype.getBuiltInDataType = withCallback(ClientSessionImpl.prototype.getBuiltInDataType, opts);
+ClientSessionImpl.prototype.changeUser = withCallback(ClientSessionImpl.prototype.changeUser, opts);

package/source/private/client_subscription_impl.ts

@@ -863,16 +863,16 @@ export function ClientMonitoredItem_create(
 }
 // tslint:disable:no-var-requires
 // tslint:disable:max-line-length
-const thenify = require("thenify");
+import { withCallback } from "thenify-ex";
 const opts = { multiArgs: false };
 
-ClientSubscriptionImpl.prototype.setPublishingMode = thenify.withCallback(ClientSubscriptionImpl.prototype.setPublishingMode);
-ClientSubscriptionImpl.prototype.monitor = thenify.withCallback(ClientSubscriptionImpl.prototype.monitor);
-ClientSubscriptionImpl.prototype.monitorItems = thenify.withCallback(ClientSubscriptionImpl.prototype.monitorItems);
-ClientSubscriptionImpl.prototype.setTriggering = thenify.withCallback(ClientSubscriptionImpl.prototype.setTriggering);
-ClientSubscriptionImpl.prototype.modify = thenify.withCallback(ClientSubscriptionImpl.prototype.modify);
-ClientSubscriptionImpl.prototype.terminate = thenify.withCallback(ClientSubscriptionImpl.prototype.terminate);
-ClientSubscriptionImpl.prototype.getMonitoredItems = thenify.withCallback(ClientSubscriptionImpl.prototype.getMonitoredItems);
+ClientSubscriptionImpl.prototype.setPublishingMode = withCallback(ClientSubscriptionImpl.prototype.setPublishingMode);
+ClientSubscriptionImpl.prototype.monitor = withCallback(ClientSubscriptionImpl.prototype.monitor);
+ClientSubscriptionImpl.prototype.monitorItems = withCallback(ClientSubscriptionImpl.prototype.monitorItems);
+ClientSubscriptionImpl.prototype.setTriggering = withCallback(ClientSubscriptionImpl.prototype.setTriggering);
+ClientSubscriptionImpl.prototype.modify = withCallback(ClientSubscriptionImpl.prototype.modify);
+ClientSubscriptionImpl.prototype.terminate = withCallback(ClientSubscriptionImpl.prototype.terminate);
+ClientSubscriptionImpl.prototype.getMonitoredItems = withCallback(ClientSubscriptionImpl.prototype.getMonitoredItems);
 
 ClientSubscription.create = (clientSession: ClientSession, options: ClientSubscriptionOptions) => {
     return new ClientSubscriptionImpl(clientSession, options);

package/source/private/opcua_client_impl.ts

@@ -583,7 +583,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
         const session = await client.createSession2(userIdentity);
 
         const oldClose = session.close as any;
-        (session as any).close = thenify.withCallback((...args: any[]): any => {
+        (session as any).close = withCallback((...args: any[]): any => {
             if (args.length === 1) {
                 return session.close(true, args[0]);
             }
@@ -1214,7 +1214,7 @@ export class OPCUAClientImpl extends ClientBaseImpl implements OPCUAClient {
 
 // tslint:disable:no-var-requires
 // tslint:disable:max-line-length
-const thenify = require("thenify");
+import { withCallback } from "thenify-ex";
 /**
 
  *
@@ -1232,15 +1232,15 @@ const thenify = require("thenify");
  *     const session = client.createSession(userIdentityInfo);
  *
  */
-OPCUAClientImpl.prototype.createSession = thenify.withCallback(OPCUAClientImpl.prototype.createSession);
-OPCUAClientImpl.prototype.createSession2 = thenify.withCallback(OPCUAClientImpl.prototype.createSession2);
+OPCUAClientImpl.prototype.createSession = withCallback(OPCUAClientImpl.prototype.createSession);
+OPCUAClientImpl.prototype.createSession2 = withCallback(OPCUAClientImpl.prototype.createSession2);
 /**
  */
-OPCUAClientImpl.prototype.changeSessionIdentity = thenify.withCallback(OPCUAClientImpl.prototype.changeSessionIdentity);
+OPCUAClientImpl.prototype.changeSessionIdentity = withCallback(OPCUAClientImpl.prototype.changeSessionIdentity);
 /**
  * @example
  *    const session  = await client.createSession();
  *    await client.closeSession(session);
  */
-OPCUAClientImpl.prototype.closeSession = thenify.withCallback(OPCUAClientImpl.prototype.closeSession);
-OPCUAClientImpl.prototype.reactivateSession = thenify.withCallback(OPCUAClientImpl.prototype.reactivateSession);
+OPCUAClientImpl.prototype.closeSession = withCallback(OPCUAClientImpl.prototype.closeSession);
+OPCUAClientImpl.prototype.reactivateSession = withCallback(OPCUAClientImpl.prototype.reactivateSession);

package/source/tools/findservers.ts

@@ -91,6 +91,6 @@ export function findServersOnNetwork(
 }
 
 // tslint:disable:no-var-requires
-const thenify = require("thenify");
-(module.exports as any).findServersOnNetwork = thenify.withCallback((module.exports as any).findServersOnNetwork);
-(module.exports as any).findServers = thenify.withCallback((module.exports as any).findServers);
+import { withCallback } from "thenify-ex";
+(module.exports as any).findServersOnNetwork = withCallback((module.exports as any).findServersOnNetwork);
+(module.exports as any).findServers = withCallback((module.exports as any).findServers);

package/source/tools/read_history_server_capabilities.ts

@@ -126,9 +126,9 @@ export function readHistoryServerCapabilities(
     });
 }
 // tslint:disable:no-var-requires
-const thenify = require("thenify");
+import { withCallback } from "thenify-ex";
 const opts = { multiArgs: false };
-(module as any).exports.readHistoryServerCapabilities = thenify.withCallback(
+(module as any).exports.readHistoryServerCapabilities = withCallback(
     (module as any).exports.readHistoryServerCapabilities,
     opts
 );