rename getPrivateNamespace => getOwnNamespace

node-opcua · Jun 19, 2018 · 4745065 · 4745065
1 parent ed4ae99
commit 4745065
Show file tree

Hide file tree

Showing 103 changed files with 252 additions and 208 deletions.
diff --git a/documentation/sample_server.js b/documentation/sample_server.js
@@ -17,7 +17,7 @@ function post_initialize() {
     function construct_my_address_space(server) {
 
         const addressSpace = server.engine.addressSpace;
-        const namespace = addressSpace.getPrivateNamespace();
+        const namespace = addressSpace.getOwnNamespace();
 
         // declare a new object
         const device = namespace.addObject({

diff --git a/documentation/sample_server_with_historizing_variable.js b/documentation/sample_server_with_historizing_variable.js
@@ -11,7 +11,7 @@ const server = new opcua.OPCUAServer({
 });
 function construct_address_space(server) {
   const addressSpace = server.engine.addressSpace;
-  const namespace = addressSpace.getPrivateNamespace();
+  const namespace = addressSpace.getOwnNamespace();
   const vessel = namespace.addObject({
       browseName: "Vessel",
       organizedBy: addressSpace.rootFolder.objects

diff --git a/documentation/server_with_da_variables.js b/documentation/server_with_da_variables.js
@@ -9,7 +9,7 @@ const server = new opcua.OPCUAServer({
 function post_initialize() {
 
     const addressSpace = server.engine.addressSpace;
-    const namespace = addressSpace.getPrivateNamespace();
+    const namespace = addressSpace.getOwnNamespace();
 
     const myDevice = namespace.addObject({
         organizedBy: addressSpace.rootFolder.objects,

diff --git a/documentation/server_with_method.js b/documentation/server_with_method.js
@@ -9,7 +9,7 @@ const server = new opcua.OPCUAServer({
 function post_initialize() {
 
     const addressSpace = server.engine.addressSpace;
-    const namespace =addressSpace.getPrivateNamespace();
+    const namespace =addressSpace.getOwnNamespace();
 
     const myDevice = namespace.addObject({
         organizedBy: addressSpace.rootFolder.objects,

diff --git a/documentation/weather.js b/documentation/weather.js
@@ -80,7 +80,7 @@ function post_initialize() {
     function construct_my_address_space(server) {
        // declare some folders
        const addressSpace = server.engine.addressSpace;
-       const namespace = addressSpace.getPrivateNamespace();
+       const namespace = addressSpace.getOwnNamespace();
        const citiesNode  = namespace.addFolder("ObjectsFolder",{ browseName: "Cities"});
        function create_CityNode(city_name) {
            // declare the city node

diff --git a/...-opcua-address-space-for-conformance-testing/src/address_space_for_conformance_testing.js b/...-opcua-address-space-for-conformance-testing/src/address_space_for_conformance_testing.js
@@ -143,7 +143,7 @@ function makeVariant(dataTypeName, isArray, current_value) {
 
 function _add_variable(namespace, parent, varName, dataTypeName, current_value, isArray, extra_name) {
 
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
     assert(typeof extra_name === "string");
     assert(addressSpace instanceof AddressSpace);
 
@@ -440,7 +440,7 @@ function add_simulation_variables(namespace, scalarFolder) {
     });
     install_Timer();
 
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
     addressSpace.registerShutdownTask(tearDown_Timer);
 
 }
@@ -1164,7 +1164,7 @@ function add_ObjectWithMethod(namespace, parentFolder) {
 
 function add_enumeration_variable(namespaceDemo, parentFolder) {
 
-    const addressSpace = namespaceDemo.__addressSpace;
+    const addressSpace = namespaceDemo.addressSpace;
 
     const myEnumType = namespaceDemo.addEnumerationType({
         browseName: "SimulationEnumerationType",
@@ -1193,7 +1193,7 @@ function add_enumeration_variable(namespaceDemo, parentFolder) {
 
 function add_trigger_nodes(namespace, parentFolder) {
 
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
 
     // add 2 nodes that generate an event when ever they are written to.
     function _add_trigger_node(browseName, nodeId) {
@@ -1245,7 +1245,7 @@ function add_trigger_nodes(namespace, parentFolder) {
 
 function add_sampleView(namespace) {
 
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
     namespace.addView({
         organizedBy: addressSpace.rootFolder.views,
         browseName: "SampleView",

diff --git a/packages/node-opcua-address-space/src/address_space.js b/packages/node-opcua-address-space/src/address_space.js
@@ -126,7 +126,7 @@ AddressSpace.prototype.getNamespace = function (namespaceIndexOrName) {
 AddressSpace.prototype.getDefaultNamespace= function() {
     return this.getNamespace(0);
 };
-AddressSpace.prototype.getPrivateNamespace= function() {
+AddressSpace.prototype.getOwnNamespace= function() {
 
     const self = this;
     if (this._private_namespaceIndex>=self._namespaceArray.length){
@@ -149,12 +149,15 @@ AddressSpace.prototype.registerNamespace = function (namespaceUri) {
     const self = this;
 
     let index = this._namespaceArray.findIndex(ns=> ns.namespaceUri === namespaceUri);
-    if (index !== -1) { return self._namespaceArray[index]; }
+    if (index !== -1) {
+        assert(self._namespaceArray[index].addressSpace === self);
+        return self._namespaceArray[index];
+    }
 
     index= self._namespaceArray.length;
     self._namespaceArray.push(new Namespace({
         namespaceUri: namespaceUri,
-        addressSpace:self,
+        addressSpace: self,
         index: index,
         version: "undefined",
         publicationDate: new Date()
@@ -639,7 +642,7 @@ AddressSpace.prototype._build_new_NodeId = function () {
     if (this._namespaceArray.length <= 1) {
         throw new Error("Please create a private namespace");
     }
-    const privateNamespace = this.getPrivateNamespace();
+    const privateNamespace = this.getOwnNamespace();
     return privateNamespace._build_new_NodeId();
 };
 
@@ -950,11 +953,11 @@ function _increase_version_number(node) {
 AddressSpace.prototype._resolveRequestedNamespace =  function(options)
 {
     if (!options.nodeId) {
-        return this.getPrivateNamespace();
+        return this.getOwnNamespace();
     }
     if (typeof options.nodeId === "string"){
         if (options.nodeId.match(/^(i|s|g|b)=/)) {
-            options.nodeId = this.getPrivateNamespace()._construct_nodeId(options);
+            options.nodeId = this.getOwnNamespace()._construct_nodeId(options);
         }
     }
     options.nodeId = resolveNodeId(options.nodeId);
@@ -966,21 +969,21 @@ AddressSpace.prototype.addObject =function(options) {
     return this._resolveRequestedNamespace(options).addObject(options);
 };
 
-utils.setDeprecated(AddressSpace,"addObject","use addressSpace.getPrivateNamespace().addObject(..) instead");
+utils.setDeprecated(AddressSpace,"addObject","use addressSpace.getOwnNamespace().addObject(..) instead");
 AddressSpace.prototype.addVariable =function(options) {
     return this._resolveRequestedNamespace(options).addVariable(options);
 };
-utils.setDeprecated(AddressSpace,"addVariable","use addressSpace.getPrivateNamespace().addVariable(..) instead");
+utils.setDeprecated(AddressSpace,"addVariable","use addressSpace.getOwnNamespace().addVariable(..) instead");
 
 AddressSpace.prototype.addObjectType =function(options) {
     return this._resolveRequestedNamespace(options).addObjectType(options);
 };
-utils.setDeprecated(AddressSpace,"addObjectType","use addressSpace.getPrivateNamespace().addObjectType() instead");
+utils.setDeprecated(AddressSpace,"addObjectType","use addressSpace.getOwnNamespace().addObjectType() instead");
 
 AddressSpace.prototype.addVariableType =function(options) {
    return this._resolveRequestedNamespace(options).addVariableType(options);
 };
-utils.setDeprecated(AddressSpace,"addVariableType","use addressSpace.getPrivateNamespace().addVariableType() instead");
+utils.setDeprecated(AddressSpace,"addVariableType","use addressSpace.getOwnNamespace().addVariableType() instead");
 
 /**
  *
@@ -993,9 +996,9 @@ utils.setDeprecated(AddressSpace,"addVariableType","use addressSpace.getPrivateN
  * @return {BaseNode}
  */
 AddressSpace.prototype.addFolder = function (parentFolder, options) {
-    return this.getPrivateNamespace().addFolder(parentFolder, options);
+    return this.getOwnNamespace().addFolder(parentFolder, options);
 };
-utils.setDeprecated(AddressSpace,"addFolder","use addressSpace.getPrivateNamespace().addFolder(..) instead");
+utils.setDeprecated(AddressSpace,"addFolder","use addressSpace.getOwnNamespace().addFolder(..) instead");
 
 
 /**

diff --git a/packages/node-opcua-address-space/src/address_space_add_enumeration_type.js b/packages/node-opcua-address-space/src/address_space_add_enumeration_type.js
@@ -103,7 +103,7 @@ exports.install = function (AddressSpace) {
         assert(_.isString(options.browseName));
         assert(_.isArray(options.enumeration));
 
-        const addressSpace = self.__addressSpace;
+        const addressSpace = self.addressSpace;
         let definition;
         const enumerationType = addressSpace.findDataType("Enumeration");
         assert(enumerationType.nodeId instanceof NodeId);

diff --git a/packages/node-opcua-address-space/src/address_space_add_event_type.js b/packages/node-opcua-address-space/src/address_space_add_event_type.js
@@ -158,7 +158,7 @@ exports.install = function (AddressSpace) {
      *
      */
     AddressSpace.prototype.addEventType = function (options) {
-        console.log("AddressSpace#addEventType is deprecated. please use addressSpace.getPrivateNamespace().addEventType() instead");
+        console.log("AddressSpace#addEventType is deprecated. please use addressSpace.getOwnNamespace().addEventType() instead");
         return this._resolveRequestedNamespace(options).addEventType(options);
     };
 

diff --git a/packages/node-opcua-address-space/src/address_space_add_method.js b/packages/node-opcua-address-space/src/address_space_add_method.js
@@ -28,7 +28,7 @@ exports.install = function (AddressSpace) {
 
         const self = this;
 
-        const addressSpace = self.__addressSpace;
+        const addressSpace = self.addressSpace;
 
         assert(isNonEmptyQualifiedName(options.browseName));
 
@@ -72,7 +72,7 @@ exports.install = function (AddressSpace) {
     Namespace.prototype.addMethod = function (parentObject, options) {
         const self = this;
 
-        const addressSpace = self.__addressSpace;
+        const addressSpace = self.addressSpace;
 
         assert(_.isObject(parentObject) && parentObject instanceof BaseNode,"expecting a valid parent object");
 

diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/acknowledgeable_condition.js b/packages/node-opcua-address-space/src/alarms_and_conditions/acknowledgeable_condition.js
@@ -327,7 +327,7 @@ UAAcknowledgeableConditionBase.instantiate = function instantiate(namespace,cond
 
     //xx assert(options.conditionOf,"must provide a conditionOf Node");
 
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
 
     const conditionNode = UAConditionBase.instantiate(namespace, conditionTypeId, options, data);
     Object.setPrototypeOf(conditionNode,UAAcknowledgeableConditionBase.prototype);

diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/alarm_condition.js b/packages/node-opcua-address-space/src/alarms_and_conditions/alarm_condition.js
@@ -710,7 +710,7 @@ exports.UAAlarmConditionBase = UAAlarmConditionBase;
 UAAlarmConditionBase.instantiate = function (namespace, alarmConditionTypeId, options, data) {
 
     assert(namespace instanceof Namespace);
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
 
     //xx assert(options.hasOwnProperty("conditionOf")); // must provide a conditionOf
     assert(options.hasOwnProperty("inputNode")); // must provide a inputNode

diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/condition.js b/packages/node-opcua-address-space/src/alarms_and_conditions/condition.js
@@ -1722,7 +1722,7 @@ function _getCompositeKey(node, key) {
 UAConditionBase.instantiate = function(namespace, conditionTypeId, options, data) {
     /* eslint max-statements: ["error", 100] */
     assert(namespace instanceof Namespace);
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
 
     const conditionType = addressSpace.findEventType(conditionTypeId);
 

diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/discrete_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/discrete_alarm.js
@@ -58,7 +58,7 @@ util.inherits(UADiscreteAlarm, UAAlarmConditionBase);
 UADiscreteAlarm.instantiate = function(namespace, discreteAlarmTypeId, options, data) {
 
     assert(namespace instanceof Namespace);
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
     assert(addressSpace instanceof AddressSpace);
 
     const discreteAlarmType = addressSpace.findEventType(discreteAlarmTypeId);

diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_deviation_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_deviation_alarm.js
@@ -52,7 +52,7 @@ exports.UAExclusiveDeviationAlarm = UAExclusiveDeviationAlarm;
 UAExclusiveDeviationAlarm.instantiate = function(namespace, type,options,data ){
 
     assert(namespace instanceof Namespace);
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
     assert(addressSpace instanceof AddressSpace);
 
     const exclusiveDeviationAlarmType = addressSpace.findEventType("ExclusiveDeviationAlarmType");

diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_level_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_level_alarm.js
@@ -22,7 +22,7 @@ exports.UAExclusiveLevelAlarm =UAExclusiveLevelAlarm;
 UAExclusiveLevelAlarm.instantiate = function(namespace,type,option,data) {
 
     assert(namespace instanceof Namespace);
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
     assert(addressSpace instanceof AddressSpace);
 
     return UAExclusiveLimitAlarm.instantiate(namespace, type, option, data);

diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_limit_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/exclusive_limit_alarm.js
@@ -101,7 +101,7 @@ exports.UAExclusiveLimitAlarm = UAExclusiveLimitAlarm;
 UAExclusiveLimitAlarm.instantiate = function (namespace, type, options, data) {
 
     assert(namespace instanceof Namespace);
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
     assert(addressSpace instanceof AddressSpace);
 
     //xx assert(options.conditionOf,"must provide a conditionOf Node");

diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/limit_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/limit_alarm.js
@@ -163,7 +163,7 @@ exports.UALimitAlarm = UALimitAlarm;
  */
 UALimitAlarm.instantiate = function (namespace, limitAlarmTypeId, options, data) {
     assert(namespace instanceof Namespace);
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
     assert(addressSpace instanceof AddressSpace);
 
     /* eslint max-instructions: off */

diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_deviation_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_deviation_alarm.js
@@ -60,7 +60,7 @@ UANonExclusiveDeviationAlarm.instantiate = function(namespace, type,options,data
 
 
     assert(namespace instanceof Namespace);
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
     assert(addressSpace instanceof AddressSpace);
 
     const nonExclusiveDeviationAlarmType = addressSpace.findEventType("NonExclusiveDeviationAlarmType");

diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_limit_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/non_exclusive_limit_alarm.js
@@ -151,7 +151,7 @@ exports.UANonExclusiveLimitAlarm = UANonExclusiveLimitAlarm;
 UANonExclusiveLimitAlarm.instantiate = function (namespace, type, options, data) {
 
     assert(namespace instanceof Namespace);
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
     assert(addressSpace instanceof AddressSpace);
 
     options.optionals = options.optionals || [];

diff --git a/packages/node-opcua-address-space/src/alarms_and_conditions/off_normal_alarm.js b/packages/node-opcua-address-space/src/alarms_and_conditions/off_normal_alarm.js
@@ -145,7 +145,7 @@ UAOffNormalAlarm.prototype._onNormalStateDataValueChange = function (dataValue)
 UAOffNormalAlarm.instantiate = function (namespace, limitAlarmTypeId, options, data) {
 
     assert(namespace instanceof Namespace);
-    const addressSpace = namespace.__addressSpace;
+    const addressSpace = namespace.addressSpace;
     assert(addressSpace instanceof AddressSpace);
 
     const offNormalAlarmType = addressSpace.findEventType("OffNormalAlarmType");

diff --git a/packages/node-opcua-address-space/src/base_node.js b/packages/node-opcua-address-space/src/base_node.js
@@ -115,7 +115,7 @@ function BaseNode(options) {
     this.browseName = _get_QualifiedBrowseName(options.browseName);
 
     // re-use browseName as displayName if displayName is missing
-    options.displayName = options.displayName || options.browseName.toString();
+    options.displayName = options.displayName || options.browseName.name.toString();
 
     this._setDisplayName(options.displayName);
 
@@ -1311,12 +1311,15 @@ BaseNode.prototype.full_name = function () {
     return this.browseName.toString();
 };
 
+BaseNode.prototype.ownReferences = function () {
+    const self = this;
+    const _private = BaseNode_getPrivate(self);
+    return _.map(_private._referenceIdx);
+};
 BaseNode.prototype.allReferences = function () {
-
     const self = this;
     const _private = BaseNode_getPrivate(self);
     return [].concat(_.map(_private._referenceIdx), _.map(_private._back_referenceIdx));
-
 };
 
 
@@ -1968,7 +1971,7 @@ BaseNode.prototype._clone = function (Constructor, options, optionalFilter, extr
         Namespace._process_modelling_rule(options.references, options.modellingRule);
     }
 
-    options.nodeId = self.addressSpace.getPrivateNamespace()._construct_nodeId(options);
+    options.nodeId = self.addressSpace.getOwnNamespace()._construct_nodeId(options);
 
     assert(options.nodeId instanceof NodeId);
 

diff --git a/packages/node-opcua-address-space/src/data_access/address_space_add_AnalogItem.js b/packages/node-opcua-address-space/src/data_access/address_space_add_AnalogItem.js
@@ -35,7 +35,7 @@ exports.install = function (AddressSpace) {
     Namespace.prototype.addDataItem = function(options) {
 
         const namespace = this;
-        const addressSpace = namespace.__addressSpace;
+        const addressSpace = namespace.addressSpace;
         assert(addressSpace instanceof AddressSpace);
         const dataType = options.dataType || "Number";
 
@@ -107,7 +107,7 @@ exports.install = function (AddressSpace) {
     Namespace.prototype.addAnalogDataItem = function (options) {
 
         const namespace = this;
-        const addressSpace = namespace.__addressSpace;
+        const addressSpace = namespace.addressSpace;
 
         assert(options.hasOwnProperty("engineeringUnitsRange"), "expecting engineeringUnitsRange");
 

diff --git a/packages/node-opcua-address-space/src/data_access/address_space_add_MultiStateDiscrete.js b/packages/node-opcua-address-space/src/data_access/address_space_add_MultiStateDiscrete.js
@@ -77,7 +77,7 @@ module.exports.install = function(AddressSpace) {
     Namespace.prototype.addMultiStateDiscrete = function(options) {
 
         const namespace = this;
-        const addressSpace = namespace.__addressSpace;
+        const addressSpace = namespace.addressSpace;
         assert(addressSpace instanceof AddressSpace);
         assert(options.hasOwnProperty("enumStrings"));
         assert(!options.hasOwnProperty("ValuePrecision"));

diff --git a/...ges/node-opcua-address-space/src/data_access/address_space_add_MultiStateValueDiscrete.js b/...ges/node-opcua-address-space/src/data_access/address_space_add_MultiStateValueDiscrete.js
@@ -94,7 +94,7 @@ module.exports.install = function (AddressSpace) {
         assert(!options.hasOwnProperty("ValuePrecision"));
 
         const namespace = this;
-        const addressSpace = namespace.__addressSpace;
+        const addressSpace = namespace.addressSpace;
 
         const multiStateValueDiscreteType = addressSpace.findVariableType("MultiStateValueDiscreteType");
         assert(multiStateValueDiscreteType, "expecting MultiStateValueDiscreteType to be defined , check nodeset xml file");

diff --git a/packages/node-opcua-address-space/src/data_access/address_space_add_TwoStateDiscrete.js b/packages/node-opcua-address-space/src/data_access/address_space_add_TwoStateDiscrete.js
@@ -26,7 +26,7 @@ module.exports.install = function (AddressSpace) {
 
     Namespace.prototype.addTwoStateDiscrete = function (options) {
         const namespace = this;
-        const addressSpace = namespace.__addressSpace;
+        const addressSpace = namespace.addressSpace;
 
         assert(!options.hasOwnProperty("ValuePrecision"));