fix monitored item sample and object comparaison

packages/node-opcua-address-space/package.json

@@ -46,7 +46,6 @@
         "node-opcua-utils": "^2.6.0-alpha.1",
         "node-opcua-variant": "^2.6.0-alpha.1",
         "node-opcua-xml2json": "^2.6.0-alpha.1",
-        "object.values": "^1.1.1",
         "pretty-error": "^2.1.1",
         "set-prototype-of": "^1.0.0",
         "thenify": "^3.3.0",
@@ -85,4 +84,4 @@
     ],
     "homepage": "http://node-opcua.github.io/",
     "gitHead": "07dcdd8e8c7f2b55544c6e23023093e35674829c"
-}
+}

packages/node-opcua-address-space/src/base_node.ts

@@ -65,8 +65,6 @@ import { MinimalistAddressSpace, Reference } from "./reference";
 // tslint:disable:no-bitwise
 // tslint:disable:no-console
 
-require("object.values");
-
 const doDebug = false;
 
 function defaultBrowseFilterFunc(context?: SessionContext): boolean {

packages/node-opcua-address-space/src/ua_variable.ts

@@ -617,7 +617,6 @@ export class UAVariable extends BaseNode implements UAVariablePublic {
             context = SessionContext.defaultContext;
         }
 
-        console.log("xyxy DataValue = ", dataValue.toString());
         if (!dataValue.sourceTimestamp) {
 
 

packages/node-opcua-end2end-test/test/end_to_end/test_e2e_monitored_item_extension_objects.ts

@@ -112,8 +112,8 @@ describe("AZA1- testing Client-Server subscription use case, on a fake server ex
             try {
 
                 const itemToMonitor = {
+                    attributeId: AttributeIds.Value,
                     nodeId,
-                    attributeId: AttributeIds.Value
                 };
                 const parameters: MonitoringParametersOptions = {
                     queueSize: 10,

packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_SubscriptionUseCase.js

@@ -28,7 +28,7 @@ const perform_operation_on_monitoredItem = require("../../test_helpers/perform_o
 
 const Subscription = require("node-opcua-server").Subscription;
 
-const doDebug = true;
+const doDebug = false;
 const f = require("../../test_helpers/display_function_name").f.bind(null, true);
 
 function trace_console_log() {
@@ -1126,6 +1126,7 @@ module.exports = function(test) {
             //   - The second Publish contains a DataChangeNotification with a value.statusCode matching 
             //     the written value (and value.value matching the value before the write). 
             //   - The third Publish contains no DataChangeNotifications. 
+            //     (Did not expect a dataChange since the values written were the same, i.e. unchanged.)
             perform_operation_on_subscription(client, endpointUrl, function(session, subscription, callback) {
 
                 const notificationMessageSpy = new sinon.spy();
@@ -1135,6 +1136,7 @@ module.exports = function(test) {
                 });
 
                 const monitoredItemOnChangedSpy = new sinon.spy();
+                const subscription_raw_notificiationSpy = new sinon.spy();
 
                 subscription.publishingInterval.should.eql(100);
 
@@ -1166,6 +1168,8 @@ module.exports = function(test) {
                     });
 
                     monitoredItem.on("changed", monitoredItemOnChangedSpy);
+
+                    subscription.on("raw_notification", subscription_raw_notificiationSpy);
                 }
 
 
@@ -1214,24 +1218,25 @@ module.exports = function(test) {
                     create_monitored_item.bind(null),
                     wait.bind(null, 300),
 
+                    //  - Write a status code to the Value  attribute (don’t change the value of the Value attribute). 
                     write.bind(null, 1, StatusCodes.GoodWithOverflowBit),
                     wait.bind(null, 300),
 
+                    //  - Write the existing value and status code to the Value attribute. 
                     write.bind(null, 1, StatusCodes.GoodWithOverflowBit),
                     wait.bind(null, 300),
 
                     function(callback) {
                         // wait until next notification received;
                         const lambda = (response) => {
 
-                            console.log("response: ", response.constructor.name)
+                            console.log("response: ", response.constructor.name, "notificationData.length", response.notificationMessage.notificationData.length);
                             if (response.constructor.name === "PublishResponse") {
 
                                 client.removeListener("receive_response", lambda);
                                 // console.log(" xxxx ", response.toString());
-
                                 if (response.notificationMessage.notificationData.length !== 0) {
-                                    return callback(new Errro("Test has failed because PublishResponse has a unexpected notification data"))
+                                    return callback(new Error("Test has failed because PublishResponse has a unexpected notification data"))
                                 }
                                 callback();
                             }
@@ -1241,16 +1246,29 @@ module.exports = function(test) {
                     //xx wait.bind(null, subscription.publishingInterval * subscription.maxKeepAliveCount + 500),
                     function(callback) {
 
-                        monitoredItemOnChangedSpy.callCount.should.eql(2);
-                        monitoredItemOnChangedSpy.getCall(0).args[0].statusCode.should.eql(StatusCodes.Good);
-                        monitoredItemOnChangedSpy.getCall(1).args[0].statusCode.should.eql(StatusCodes.GoodWithOverflowBit);
-
-                        callback();
+                        try {
+                            if (doDebug) {
+                                console.log("subscription_raw_notificiationSpy = ", subscription_raw_notificiationSpy.callCount);
+                                console.log("monitoredItemOnChangedSpy         = ", monitoredItemOnChangedSpy.callCount);
+                                for (let i = 0; i < monitoredItemOnChangedSpy.callCount; i++) {
+                                    console.log("    ", monitoredItemOnChangedSpy.getCall(i).args[0].statusCode.toString());
+                                }
+                            }
+                            monitoredItemOnChangedSpy.callCount.should.eql(2);
+                            monitoredItemOnChangedSpy.getCall(0).args[0].statusCode.should.eql(StatusCodes.Good);
+                            monitoredItemOnChangedSpy.getCall(1).args[0].statusCode.should.eql(StatusCodes.GoodWithOverflowBit);
+                            callback();
+                        } catch (err) {
+                            console.log(err);
+                            callback(err);
+                        }
 
                     }
                 ], callback);
 
-            }, done);
+            }, (err) => {
+                done(err);
+            });
 
         });
 

packages/node-opcua-end2end-test/test/end_to_end/u_test_e2e_ctt_5.10.5_test3.js

@@ -13,31 +13,39 @@
  -    * compare the published NotificationMessage to the republished NotificationMessage (should equal).
  */
 
-const assert = require("node-opcua-assert").assert;
-const async = require("async");
+const { assert } = require("node-opcua-assert");
 const should = require("should");
 const sinon = require("sinon");
 const opcua = require("node-opcua");
+const chalk = require("chalk");
 
-const OPCUAClient = opcua.OPCUAClient;
+const {
+    OPCUAClient,
+    ClientSubscription
+} = opcua;
+
+const doDebug = false;
 
 const {
     perform_operation_on_subscription_async
 } = require("../../test_helpers/perform_operation_on_client_session");
 
-async function f(func) {
-    await async function() {
-        debugLog("       * " + func.name.replace(/_/g, " ").replace(/(given|when|then)/, chalk.green("**$1**")));
-        await func();
-        debugLog("       ! " + func.name.replace(/_/g, " ").replace(/(given|when|then)/, chalk.green("**$1**")));
-
-    }();
+function f(func) {
+    const fct = async function(...args) {
+        if (doDebug) {
+            console.log("       * " + func.name.replace(/_/g, " ").replace(/(given|when|then)/, chalk.green("**$1**")));
+        }
+        await func.apply(null, args);
+        if (doDebug) {
+            console.log("       ! " + func.name.replace(/_/g, " ").replace(/(given|when|then)/, chalk.green("**$1**")));
+        }
+    }
+    return fct;
 }
 module.exports = function(test) {
 
     describe("Testing ctt  ", function() {
 
-        const ClientSubscription = opcua.ClientSubscription;
         let subscription = null;
 
         const nodeId = "ns=2;s=Scalar_Static_Int32";
@@ -153,7 +161,6 @@ module.exports = function(test) {
                 const response = await session.republish(request);
                 //xx console.log(" xx = ",index,request.toString());
                 //xx console.log(" xx = ",index,response.toString());
-                should.not.exist(err);
                 response.notificationMessage.notificationData[0].monitoredItems[0].should.eql(expected_values[index]);
             }
 
@@ -189,9 +196,9 @@ module.exports = function(test) {
                 sequenceNumbers = [seqNumber1 + 1, seqNumber1 + 2, seqNumber1 + 3];
                 //xx console.log(expected_values, sequenceNumbers);
 
-                f(verify_republish)(session, 0);
-                f(verify_republish)(session, 1);
-                f(verify_republish)(session, 2);
+                await f(verify_republish)(session, 0);
+                await f(verify_republish)(session, 1);
+                await f(verify_republish)(session, 2);
 
             });
         });