opcua 0.11 → 0.12

data/example/client_get_sync.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/ruby
+require_relative '../lib/opcua/client'
+#require 'opcua/client'
+
+### username & pass in url (e.g. siemens)
+# client = OPCUA::Client.new("opc.tcp://OpcUaClient:SUNRISE@localhost:4840")
+
+client = OPCUA::Client.new("opc.tcp://localhost:4840")
+client.subscription_interval = 100 # default 500
+
+node = client.get 2, '/KalimatC34/Tools/Tool1/ToolNumber'  # get node from nodeid
+p node.value
+node.on_value_change do
+  puts 'now'
+end

data/example/client_get_value.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby
+require_relative '../lib/opcua/client'
+#require 'opcua/client'
+
+### username & pass in url (e.g. siemens)
+# client = OPCUA::Client.new("opc.tcp://OpcUaClient:SUNRISE@localhost:4840")
+
+client = OPCUA::Client.new("opc.tcp://localhost:4840")
+client.subscription_interval = 100 # default 500
+
+if (node = client.get 2, '/KalimatC34/Tools/Tool1/ToolNumber')  # get node from nodeid
+  p node
+  p node.value
+else
+  p 'invalid nodeid'
+end

data/example/client_set_value.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/ruby
+require_relative '../lib/opcua/client'
+#require 'opcua/client'
+
+### username & pass in url (e.g. siemens)
+# client = OPCUA::Client.new("opc.tcp://OpcUaClient:SUNRISE@localhost:4840")
+
+client = OPCUA::Client.new("opc.tcp://localhost:4840")
+client.default_ns = 2
+
+if (node = client.get '/KalimatC34/Tools/Tool1/ToolNumber')
+  node.value = [:a, :b]
+else
+  p 'invalid nodeid'
+end

data/example/server.rb

@@ -16,9 +16,9 @@ Daemonite.new do
       t.add_variable :SollWertX
       t.add_variable :SollWertY
       t.add_variable :SollWertZ
-      t.add_variable :ToolNumber
+      t.add_variable_rw :ToolNumber
       t.add_variable :DuploNumber
-      t.add_variable :testValue1
+      t.add_property :testValue1
       t.add_method :testMethod, test1: OPCUA::TYPES::STRING, test2: OPCUA::TYPES::DATETIME do |node, test1, test2|
         ns, nid = node.id
         puts '-' * 10
@@ -45,18 +45,30 @@ Daemonite.new do
     t3 = tools.manifest(:Tool3,tt)
 
     opts[:tn] = t1.find(:ToolNumber)
+    opts[:tn].description = 'test test'
+    opts[:tn].value = [0,1]
+    p opts[:tn].description
 
     measurments_t1 = t1.find(:Measurements)
     measurments_t1.manifest(:M1,mt)
     measurments_t1.manifest(:M2,mt)
+
+    p opts['server'].namespaces
   rescue => e
     puts e.message
   end
 
+
+  counter = 0
   run do |opts|
     GC.start
     sleep opts['server'].run
-    opts[:tn].value = Time.now
+    # if counter % 100 == 0
+    #   opts[:tn].value = [counter, counter]
+    #   # opts[:tn].value = 1
+    #   p opts[:tn].value
+    # end
+    # counter += 1
   rescue => e
     puts e.message
   end

data/ext/opcua/client/client.c

@@ -2,6 +2,7 @@
 #include "../../../cert/cert.h"
 #include "../../../cert/cert_key.h"
 
+
 VALUE mOPCUA = Qnil;
 VALUE cClient = Qnil;
 VALUE cVarNode = Qnil;
@@ -10,6 +11,11 @@ VALUE cNode = Qnil;
 
 #include "../values.h"
 
+#include <signal.h>
+
+static volatile bool keepRunning = true;
+void intHandler(int dummy) { keepRunning = false; }
+
 /* -- */
 static void  node_free(node_struct *ns) { //{{{
   if (ns != NULL) {
@@ -26,6 +32,7 @@ static node_struct * node_alloc(client_struct *client, UA_NodeId nodeid) { //{{{
   ns->master = client;
   ns->id  = nodeid;
   ns->on_change  = Qnil;
+  ns->waiting = 0;
 
   return ns;
 } //}}}
@@ -51,6 +58,28 @@ static VALUE node_value(VALUE self) { //{{{
   UA_Variant_clear(&value);
   return rb_ary_entry(ret,0);
 } //}}}
+static VALUE node_value_set(VALUE self, VALUE value) { //{{{
+  node_struct *ns;
+  Data_Get_Struct(self, node_struct, ns);
+  if (!ns->master->started) rb_raise(rb_eRuntimeError, "Client disconnected.");
+
+  UA_Variant variant;
+  if (value_to_variant(value,&variant)) {
+    // printf("-----------------------------------------%ld\n",variant.arrayDimensionsSize);
+    if (variant.arrayDimensionsSize > 0) {
+       UA_Int32 ads = (UA_Int32) variant.arrayDimensionsSize;
+       UA_Client_writeValueRankAttribute(ns->master->master, ns->id, &ads);
+       UA_Client_writeArrayDimensionsAttribute(ns->master->master, ns->id, variant.arrayDimensionsSize, variant.arrayDimensions);
+     }
+
+    UA_StatusCode retval = UA_Client_writeValueAttribute(ns->master->master, ns->id, &variant);
+    if (retval != UA_STATUSCODE_GOOD) {
+      rb_raise(rb_eRuntimeError, "Can't set value: %s.", UA_StatusCode_name(retval));
+    }
+  }
+
+  return self;
+} //}}}
 static VALUE node_on_change(VALUE self) { //{{{
   node_struct *ns;
   Data_Get_Struct(self, node_struct, ns);
@@ -67,6 +96,82 @@ static VALUE node_on_change(VALUE self) { //{{{
 
   return self;
 } //}}}
+static void node_on_value_change_handler(UA_Client *client, UA_UInt32 subId, void *subContext, UA_UInt32 monId, void *monContext, UA_DataValue *value) {
+  VALUE ins = (VALUE)monContext;
+  VALUE blk = RARRAY_AREF(ins,1);
+
+  node_struct *ns;
+  Data_Get_Struct(RARRAY_AREF(ins,0), node_struct, ns);
+  ns->waiting = ns->waiting + 1;
+
+  if (ns->waiting == 2 && (NIL_P(blk) || TYPE(blk) != T_NIL)) {
+    VALUE args = rb_ary_new2(3);
+    VALUE ret = extract_value(value->value);
+    rb_ary_store(args,0,rb_ary_entry(ret,0));
+    if (value->hasSourceTimestamp) {
+      rb_ary_store(args,1,rb_time_new(UA_DateTime_toUnixTime(value->sourceTimestamp),0));
+    } else {
+      if (value->hasServerTimestamp) {
+        rb_ary_store(args,1,rb_time_new(UA_DateTime_toUnixTime(value->serverTimestamp),0));
+      } else {
+        rb_ary_store(args,1,Qnil);
+      }
+    }
+    rb_ary_store(args,2,rb_ary_entry(ret,1));
+    rb_proc_call(blk,args);
+  }
+}
+static VALUE node_on_value_change(VALUE self) {
+  node_struct *ns;
+  Data_Get_Struct(self, node_struct, ns);
+  if (!ns->master->started) rb_raise(rb_eRuntimeError, "Client disconnected.");
+
+  if (!rb_block_given_p())
+    rb_raise(rb_eArgError, "you need to supply a block with #on_change");
+
+  UA_CreateSubscriptionRequest sreq; UA_CreateSubscriptionRequest_init(&sreq);
+  sreq.requestedPublishingInterval = 100;
+  sreq.requestedLifetimeCount = 10000;
+  sreq.requestedMaxKeepAliveCount = 10;
+  sreq.maxNotificationsPerPublish = 0;
+  sreq.publishingEnabled = true;
+  sreq.priority = 0;
+
+  UA_CreateSubscriptionResponse sres = UA_Client_Subscriptions_create(ns->master->master, sreq, NULL, NULL, NULL);
+  if (sres.responseHeader.serviceResult != UA_STATUSCODE_GOOD)
+    rb_raise(rb_eRuntimeError, "Subscription could not be created.");
+
+  VALUE ins = rb_ary_new2(2);
+  rb_ary_store(ins,0,self);
+  rb_ary_store(ins,1,rb_block_proc());
+  ns->waiting = 0;
+
+  UA_MonitoredItemCreateRequest monRequest = UA_MonitoredItemCreateRequest_default(ns->id);
+  UA_MonitoredItemCreateResult monResponse =
+  UA_Client_MonitoredItems_createDataChange(ns->master->master, sres.subscriptionId,
+                                            UA_TIMESTAMPSTORETURN_BOTH,
+                                            monRequest, (void *)ins, node_on_value_change_handler, NULL);
+
+  if(monResponse.statusCode != UA_STATUSCODE_GOOD) {
+    rb_raise(rb_eRuntimeError, "Monitoring item failed: %s\n", UA_StatusCode_name(monResponse.statusCode));
+  }
+
+  keepRunning = true;
+  signal(SIGINT, intHandler);
+  while (ns->waiting < 2 && keepRunning) {
+    UA_Client_run_iterate(ns->master->master, 100);
+  }
+  signal(SIGINT, SIG_DFL);  // reset the disposition for SIGINT to the default
+
+  UA_MonitoredItemCreateResult_clear(&monResponse);
+  UA_MonitoredItemCreateRequest_clear(&monRequest);
+
+  UA_Client_Subscriptions_deleteSingle(ns->master->master, sres.subscriptionId);
+  UA_CreateSubscriptionResponse_clear(&sres);
+  UA_CreateSubscriptionRequest_clear(&sreq);
+
+  return self;
+}
 
 /* -- */
 static void  client_free(client_struct *pss) { //{{{
@@ -238,28 +343,31 @@ static VALUE client_get(int argc, VALUE* argv, VALUE self) { //{{{
   if (NIL_P(ns) || TYPE(ns) != T_FIXNUM)
     rb_raise(rb_eTypeError, "ns is not a valid (numeric) namespace id");
 
-  node_struct *res;
+  UA_NodeId it;
+
   if (TYPE(id) == T_FIXNUM) {
-    res = node_alloc(pss, UA_NODEID_NUMERIC(NUM2INT(ns), NUM2INT(id)));
+    it = UA_NODEID_NUMERIC(NUM2INT(ns), NUM2INT(id));
   } else {
     VALUE str = rb_obj_as_string(id);
     if (NIL_P(str) || TYPE(str) != T_STRING)
       rb_raise(rb_eTypeError, "cannot convert url to string");
     char *nstr = (char *)StringValuePtr(str);
 
-    res = node_alloc(pss, UA_NODEID_STRING(NUM2INT(ns), nstr));
+    it = UA_NODEID_STRING(NUM2INT(ns), nstr);
   }
 
   UA_NodeClass nc;UA_NodeClass_init(&nc);
-  UA_Client_readNodeClassAttribute(pss->master, res->id, &nc);
+  UA_Client_readNodeClassAttribute(pss->master, it, &nc);
 
   VALUE node;
   if (nc == UA_NODECLASS_VARIABLE) {
-    node = node_wrap(cVarNode,res);
+    node = node_wrap(cVarNode,node_alloc(pss, it));
   } else if (nc == UA_NODECLASS_METHOD) {
-    node = node_wrap(cMethodNode,res);
+    node = node_wrap(cMethodNode,node_alloc(pss, it));
+  } else if (nc == UA_NODECLASS_UNSPECIFIED) {
+    node = Qnil;
   } else {
-    node = node_wrap(cNode,res);
+    node = node_wrap(cNode,node_alloc(pss, it));
   }
   UA_NodeClass_clear(&nc);
 
@@ -323,6 +431,25 @@ static VALUE client_debug_set(VALUE self, VALUE val) { //{{{
   return self;
 } //}}}
 
+static VALUE client_namespaces(VALUE self) { //{{{
+  client_struct *pss;
+  Data_Get_Struct(self, client_struct, pss);
+  if (!pss->started) rb_raise(rb_eRuntimeError, "Client disconnected.");
+
+  UA_Variant value;
+  UA_Variant_init(&value);
+  UA_StatusCode retval = UA_Client_readValueAttribute(pss->master, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_NAMESPACEARRAY), &value);
+
+  VALUE ret = Qnil;
+  if (retval == UA_STATUSCODE_GOOD) {
+    ret = extract_value(value);
+  }
+
+  UA_Variant_clear(&value);
+  RB_OBJ_FREEZE(ret);
+  return rb_ary_entry(ret,0);
+} //}}}
+
 static VALUE node_id(VALUE self) { //{{{
   node_struct *ns;
 
@@ -348,7 +475,7 @@ static VALUE node_to_s(VALUE self) { //{{{
   Data_Get_Struct(self, node_struct, ns);
 
   if (ns->id.identifierType == UA_NODEIDTYPE_NUMERIC) {
-    ret = rb_sprintf("ns=%d;n=%d", ns->id.namespaceIndex, ns->id.identifier.numeric);
+    ret = rb_sprintf("ns=%d;i=%d", ns->id.namespaceIndex, ns->id.identifier.numeric);
   } else if(ns->id.identifierType == UA_NODEIDTYPE_STRING) {
     ret = rb_sprintf("ns=%d;s=%.*s", ns->id.namespaceIndex, (int)ns->id.identifier.string.length, ns->id.identifier.string.data);
   } else {
@@ -357,7 +484,7 @@ static VALUE node_to_s(VALUE self) { //{{{
   return ret;
 } //}}}
 
-static VALUE node_call(int argc, VALUE* argv, VALUE self) {
+static VALUE node_call(int argc, VALUE* argv, VALUE self) { //{{{
   node_struct *ns;
 
   VALUE splat;
@@ -389,7 +516,7 @@ static VALUE node_call(int argc, VALUE* argv, VALUE self) {
   } else {
     return Qfalse;
   }
-}
+} //}}}
 
 static void  client_run_handler(UA_Client *client, UA_UInt32 subId, void *subContext, UA_UInt32 monId, void *monContext, UA_DataValue *value) { //{{{
   VALUE val = (VALUE)monContext;
@@ -465,9 +592,9 @@ void Init_client(void) {
   mOPCUA = rb_define_module("OPCUA");
 
   cClient     = rb_define_class_under(mOPCUA, "Client", rb_cObject);
-  cNode       = rb_define_class_under(mOPCUA, "cNode", rb_cObject);
-  cMethodNode = rb_define_class_under(mOPCUA, "cMethodNode", rb_cObject);
-  cVarNode    = rb_define_class_under(mOPCUA, "cVarNode", rb_cObject);
+  cNode       = rb_define_class_under(cClient, "cNode", rb_cObject);
+  cMethodNode = rb_define_class_under(cClient, "cMethodNode", cNode);
+  cVarNode    = rb_define_class_under(cClient, "cVarNode", cNode);
 
   Init_types();
 
@@ -480,18 +607,17 @@ void Init_client(void) {
   rb_define_method(cClient, "subscription_interval=", client_subscription_interval_set, 1);
   rb_define_method(cClient, "default_ns", client_default_ns, 0);
   rb_define_method(cClient, "default_ns=", client_default_ns_set, 1);
+  rb_define_method(cClient, "namespaces", client_namespaces, 0);
   rb_define_method(cClient, "debug", client_debug, 0);
   rb_define_method(cClient, "debug=", client_debug_set, 1);
 
   rb_define_method(cNode, "to_s", node_to_s, 0);
   rb_define_method(cNode, "id", node_id, 0);
 
-  rb_define_method(cMethodNode, "to_s", node_to_s, 0);
-  rb_define_method(cMethodNode, "id", node_id, 0);
   rb_define_method(cMethodNode, "call", node_call, -1);
 
-  rb_define_method(cVarNode, "to_s", node_to_s, 0);
-  rb_define_method(cVarNode, "id", node_id, 0);
   rb_define_method(cVarNode, "value", node_value, 0);
+  rb_define_method(cVarNode, "value=", node_value_set, 1);
   rb_define_method(cVarNode, "on_change", node_on_change, 0);
+  rb_define_method(cVarNode, "on_value_change", node_on_value_change, 0);
 }

data/ext/opcua/client/client.h

@@ -22,4 +22,5 @@ typedef struct node_struct {
   client_struct *master;
   VALUE on_change;
   UA_NodeId id;
+  int waiting;
 } node_struct;

data/ext/opcua/server/extconf.rb

@@ -5,5 +5,6 @@ spec = eval(File.read(__dir__ + '/../../../opcua.gemspec'))
 $CFLAGS  = '-g -Wall ' + $CFLAGS
 $CFLAGS  << ''
 $LDFLAGS << ' -lopen62541'
+
 dir_config('server')
 create_makefile('server')

data/ext/opcua/server/server.c

@@ -2,9 +2,13 @@
 
 VALUE mOPCUA = Qnil;
 VALUE cServer = Qnil;
-VALUE cObjectsNode = Qnil;
-VALUE cTypesTopNode = Qnil;
-VALUE cTypesSubNode = Qnil;
+VALUE cNode = Qnil;
+VALUE cObjectNode = Qnil;
+VALUE cTypeTopNode = Qnil;
+VALUE cTypeSubNode = Qnil;
+VALUE cReferenceTopNode = Qnil;
+VALUE cReferenceSubNode = Qnil;
+VALUE cReferenceNode = Qnil;
 VALUE cVarNode = Qnil;
 VALUE cMethodNode = Qnil;
 
@@ -41,7 +45,7 @@ static VALUE node_wrap(VALUE klass, node_struct *ns) { //{{{
 static VALUE node_type_folder(VALUE self) { //{{{
   node_struct *ns;
   Data_Get_Struct(self, node_struct, ns);
-  return node_wrap(cTypesTopNode, node_alloc(ns->master, UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE)));
+  return node_wrap(cTypeTopNode, node_alloc(ns->master, UA_NODEID_NUMERIC(0, UA_NS0ID_FOLDERTYPE)));
 } //}}}
 static VALUE node_add_object_type(VALUE self, VALUE name) { //{{{
   node_struct *ns;
@@ -66,7 +70,34 @@ static VALUE node_add_object_type(VALUE self, VALUE name) { //{{{
                               NULL,
                               NULL);
 
-  return node_wrap(cTypesSubNode,node_alloc(ns->master,n));
+  return node_wrap(cTypeSubNode,node_alloc(ns->master,n));
+} //}}}
+static VALUE node_add_reference_type(VALUE self, VALUE name, VALUE type) { //{{{
+  node_struct *ns;
+
+  Data_Get_Struct(self, node_struct, ns);
+
+  VALUE str = rb_obj_as_string(name);
+  if (NIL_P(str) || TYPE(str) != T_STRING)
+    rb_raise(rb_eTypeError, "cannot convert arg 1 to string");
+  char *nstr = (char *)StringValuePtr(str);
+  if (TYPE(type) != T_FIXNUM)
+    rb_raise(rb_eTypeError, "cannot convert arg 2 to integer");
+
+  UA_NodeId n = UA_NODEID_NUMERIC(ns->master->default_ns, nodecounter++);
+
+  UA_ReferenceTypeAttributes rtAttr = UA_ReferenceTypeAttributes_default;
+                             rtAttr.displayName = UA_LOCALIZEDTEXT("en-US", nstr);
+  UA_Server_addReferenceTypeNode(ns->master->master,
+                                 n,
+                                 ns->id,
+                                 UA_NODEID_NUMERIC(0, NUM2INT(type)),
+                                 UA_QUALIFIEDNAME(ns->master->default_ns, nstr),
+                                 rtAttr,
+                                 NULL,
+                                 NULL);
+
+  return node_wrap(cReferenceSubNode,node_alloc(ns->master,n));
 } //}}}
 
 static VALUE node_id(VALUE self) { //{{{
@@ -94,7 +125,7 @@ static VALUE node_to_s(VALUE self) { //{{{
   Data_Get_Struct(self, node_struct, ns);
 
   if (ns->id.identifierType == UA_NODEIDTYPE_NUMERIC) {
-    ret = rb_sprintf("ns=%d;n=%d", ns->id.namespaceIndex, ns->id.identifier.numeric);
+    ret = rb_sprintf("ns=%d;i=%d", ns->id.namespaceIndex, ns->id.identifier.numeric);
   } else if(ns->id.identifierType == UA_NODEIDTYPE_STRING) {
     ret = rb_sprintf("ns=%d;s=%.*s", ns->id.namespaceIndex, (int)ns->id.identifier.string.length, ns->id.identifier.string.data);
   } else {
@@ -102,6 +133,33 @@ static VALUE node_to_s(VALUE self) { //{{{
   }
   return ret;
 } //}}}
+static VALUE node_add_reference(VALUE self, VALUE to, VALUE type) { //{{{
+  node_struct *ns;
+  node_struct *tos;
+  node_struct *tys;
+
+  Data_Get_Struct(self, node_struct, ns);
+
+  if (!(rb_obj_is_kind_of(type,cReferenceSubNode) || rb_obj_is_kind_of(to,cTypeSubNode))) {
+    rb_raise(rb_eArgError, "arguments have to be NodeIDs.");
+  }
+  Data_Get_Struct(to, node_struct, tos);
+  Data_Get_Struct(type, node_struct, tys);
+  UA_NodeId n = UA_NODEID_NUMERIC(ns->master->default_ns, nodecounter++);
+
+  UA_ExpandedNodeId toNodeId;
+                    toNodeId.serverIndex = 0;
+                    toNodeId.namespaceUri = UA_STRING_NULL;
+                    toNodeId.nodeId = tos->id;
+
+  UA_Server_addReference(ns->master->master,
+                         n,
+                         tys->id,
+                         toNodeId,
+                         true);
+
+  return node_wrap(cReferenceNode,node_alloc(ns->master,n));
+} //}}}
 
 static UA_StatusCode node_add_method_callback( //{{{
   UA_Server *server,
@@ -121,7 +179,7 @@ static UA_StatusCode node_add_method_callback( //{{{
   // );
 
   VALUE args = rb_ary_new();
-  rb_ary_push(args, Data_Wrap_Struct(cObjectsNode,NULL,NULL,me));
+  rb_ary_push(args, Data_Wrap_Struct(cObjectNode,NULL,NULL,me));
   for (int i = 0; i < inputSize; i++) {
     VALUE ret = extract_value(input[i]);
     rb_ary_push(args,rb_ary_entry(ret,0));
@@ -220,10 +278,9 @@ static VALUE node_add_method(int argc, VALUE* argv, VALUE self) { //{{{
   return node_wrap(CLASS_OF(self),node_alloc(parent->master,node_add_method_ua_simple(nstr,parent,opts,blk)));
 } //}}}
 
-static UA_NodeId node_add_variable_ua(UA_Int32 type, UA_NodeId n, UA_LocalizedText dn, UA_QualifiedName qn, node_struct *parent, VALUE ref, UA_Byte accesslevelmask) { //{{{
+static UA_NodeId node_add_variable_ua(UA_Int32 type, UA_NodeId n, UA_LocalizedText dn, UA_QualifiedName qn, node_struct *parent, UA_Byte accesslevelmask) { //{{{
   UA_VariableAttributes vAttr = UA_VariableAttributes_default;
   vAttr.displayName = dn;
-
   vAttr.accessLevel = accesslevelmask;
 
   UA_Server_addVariableNode(parent->master->master,
@@ -231,34 +288,30 @@ static UA_NodeId node_add_variable_ua(UA_Int32 type, UA_NodeId n, UA_LocalizedTe
                             parent->id,
                             UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
                             qn,
-                            UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
+                            UA_NODEID_NUMERIC(0, type),
                             vAttr,
                             NULL,
                             NULL);
 
-  if (ref != Qnil) {
-    UA_Server_addReference(parent->master->master,
-                           n,
-                           UA_NODEID_NUMERIC(0, UA_NS0ID_HASMODELLINGRULE),
-                           UA_EXPANDEDNODEID_NUMERIC(0, type),
-                           true);
-  }
+  UA_Server_addReference(parent->master->master,
+                         n,
+                         UA_NODEID_NUMERIC(0, UA_NS0ID_HASMODELLINGRULE),
+                         UA_EXPANDEDNODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_MANDATORY),
+                         true);
 
   return n;
-
 } //}}}
-static UA_NodeId node_add_variable_ua_simple(UA_Int32 type, char* nstr, node_struct *parent, VALUE ref, UA_Byte accesslevelmask,bool numeric) { //{{{
+static UA_NodeId node_add_variable_ua_simple(UA_Int32 type, char* nstr, node_struct *parent, UA_Byte accesslevelmask, bool numeric) { //{{{
   return node_add_variable_ua(
     type,
     numeric ? UA_NODEID_NUMERIC(parent->master->default_ns,nodecounter++) : UA_NODEID_STRING(parent->master->default_ns,nstr),
     UA_LOCALIZEDTEXT("en-US", nstr),
     UA_QUALIFIEDNAME(parent->master->default_ns, nstr),
     parent,
-    ref,
     accesslevelmask
   );
 } //}}}
-static VALUE node_add_variable_wrap(int argc, VALUE* argv, VALUE self, UA_Byte accesslevelmask,bool numeric) { //{{{
+static VALUE node_add_variable_wrap(int argc, VALUE* argv, VALUE self, UA_Byte accesslevelmask, bool numeric) { //{{{
   node_struct *parent;
 
   if (argc > 2 || argc == 0) { // there should only be 1 or 2 arguments
@@ -269,7 +322,7 @@ static VALUE node_add_variable_wrap(int argc, VALUE* argv, VALUE self, UA_Byte a
   if (argc == 2 && argv[1] != Qnil) {
     type = NUM2INT(argv[1]);
   } else {
-    type = UA_NS0ID_MODELLINGRULE_MANDATORY;
+    type = UA_NS0ID_BASEDATAVARIABLETYPE;
   }
 
   Data_Get_Struct(self, node_struct, parent);
@@ -279,7 +332,7 @@ static VALUE node_add_variable_wrap(int argc, VALUE* argv, VALUE self, UA_Byte a
     rb_raise(rb_eTypeError, "cannot convert obj to string");
   char *nstr = (char *)StringValuePtr(str);
 
-  return node_wrap(cVarNode,node_alloc(parent->master,node_add_variable_ua_simple(type,nstr,parent,argv[1],accesslevelmask,numeric)));
+  return node_wrap(cVarNode,node_alloc(parent->master,node_add_variable_ua_simple(type,nstr,parent,accesslevelmask,numeric)));
 } //}}}
 static VALUE node_add_variable(int argc, VALUE* argv, VALUE self) { //{{{
   return node_add_variable_wrap(argc,argv,self,UA_ACCESSLEVELMASK_READ,true);
@@ -364,7 +417,7 @@ static VALUE node_add_object(int argc, VALUE* argv, VALUE self) { //{{{
     type = UA_NS0ID_MODELLINGRULE_MANDATORY;
   }
 
-  if (!(rb_obj_is_kind_of(argv[1],cTypesTopNode) || rb_obj_is_kind_of(argv[1],cTypesSubNode))) {
+  if (!(rb_obj_is_kind_of(argv[1],cTypeTopNode) || rb_obj_is_kind_of(argv[1],cTypeSubNode))) {
     rb_raise(rb_eArgError, "argument 2 has to be a type.");
   }
 
@@ -401,12 +454,24 @@ static bool node_get_reference(UA_Server *server, UA_NodeId parent, UA_NodeId *r
   UA_BrowseDescription_init(&bDes);
   bDes.nodeId = parent;
   bDes.resultMask = UA_BROWSERESULTMASK_ALL;
-  UA_BrowseResult bRes = UA_Server_browse(server, 3, &bDes);
+  UA_BrowseResult bRes = UA_Server_browse(server, 999, &bDes);
 
   if (bRes.referencesSize > 0) {
     UA_ReferenceDescription *ref = &(bRes.references[0]);
 
-    *result = ref->nodeId.nodeId;
+    UA_NodeId_copy(&ref->nodeId.nodeId,result);
+
+		UA_QualifiedName qn;  UA_QualifiedName_init(&qn);
+		UA_Server_readBrowseName(server, ref->nodeId.nodeId, &qn);
+
+		// printf("NS: %d ---> NodeId %u; %-16.*s\n",
+		// 			 ref->nodeId.nodeId.namespaceIndex,
+		// 			 ref->nodeId.nodeId.identifier.numeric,
+		// 			 (int)qn.name.length,
+		// 			 qn.name.data
+		// );
+
+    UA_BrowseResult_deleteMembers(&bRes);
     UA_BrowseResult_clear(&bRes);
     return true;
   }
@@ -480,7 +545,18 @@ static UA_StatusCode node_manifest_iter(UA_NodeId child_id, UA_Boolean is_invers
             free(newparent);
           }
           if(nc == UA_NODECLASS_VARIABLE) {
-            node_add_variable_ua(UA_NS0ID_MODELLINGRULE_MANDATORY,UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,Qtrue,al);
+            UA_QualifiedName pqn;UA_QualifiedName_init(&pqn);
+            UA_Server_readBrowseName(parent->master->master, UA_NODEID_NUMERIC(0, UA_NS0ID_PROPERTYTYPE), &pqn);
+            UA_BrowsePathResult property = node_browse_path(parent->master->master, child_id, UA_NODEID_NUMERIC(0, UA_NS0ID_HASTYPEDEFINITION), pqn);
+
+            if (property.statusCode == UA_STATUSCODE_GOOD) {
+              node_add_variable_ua(UA_NS0ID_PROPERTYTYPE,UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,al);
+            } else {
+              node_add_variable_ua(UA_NS0ID_BASEDATAVARIABLETYPE,UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,al);
+            }
+
+            UA_BrowsePathResult_clear(&property);
+            UA_QualifiedName_clear(&pqn);
           }
           if(nc == UA_NODECLASS_METHOD) {
             UA_NodeId ttt;
@@ -512,7 +588,7 @@ static VALUE node_manifest(VALUE self, VALUE name, VALUE parent) { //{{{
   node_struct *ns;
   node_struct *ts;
 
-  if (!(rb_obj_is_kind_of(parent,cTypesTopNode) || rb_obj_is_kind_of(parent,cTypesSubNode))) {
+  if (!(rb_obj_is_kind_of(parent,cTypeTopNode) || rb_obj_is_kind_of(parent,cTypeSubNode))) {
     rb_raise(rb_eArgError, "argument 2 has to be a type.");
   }
 
@@ -569,13 +645,64 @@ static VALUE node_find(VALUE self, VALUE qname) { //{{{
     } else if (nc == UA_NODECLASS_METHOD) {
       node = node_wrap(cMethodNode,node_alloc(ns->master,ret));
     } else {
-      node = node_wrap(cObjectsNode,node_alloc(ns->master,ret));
+      node = node_wrap(cObjectNode,node_alloc(ns->master,ret));
     }
     UA_NodeClass_clear(&nc);
 
     return node;
   }
 } //}}}
+static VALUE server_get(int argc, VALUE* argv, VALUE self) { //{{{
+  if (argc > 2 || argc < 1) { // there should only be 1 or 2 arguments
+    rb_raise(rb_eArgError, "wrong number of arguments");
+  }
+
+  server_struct *pss;
+  Data_Get_Struct(self, server_struct, pss);
+
+  VALUE ns = UINT2NUM(pss->default_ns);
+  VALUE id;
+
+  if (argc == 1) {
+    id = argv[0];
+  } else {
+    ns = argv[0];
+    id = argv[1];
+  }
+
+  if (NIL_P(ns) || TYPE(ns) != T_FIXNUM)
+    rb_raise(rb_eTypeError, "ns is not a valid (numeric) namespace id");
+
+  UA_NodeId it;
+
+  if (TYPE(id) == T_FIXNUM) {
+    it = UA_NODEID_NUMERIC(NUM2INT(ns), NUM2INT(id));
+  } else {
+    VALUE str = rb_obj_as_string(id);
+    if (NIL_P(str) || TYPE(str) != T_STRING)
+      rb_raise(rb_eTypeError, "cannot convert url to string");
+    char *nstr = (char *)StringValuePtr(str);
+
+    it = UA_NODEID_STRING(NUM2INT(ns), nstr);
+  }
+
+  UA_NodeClass nc;UA_NodeClass_init(&nc);
+  UA_Server_readNodeClass(pss->master, it, &nc);
+
+  VALUE node;
+  if (nc == UA_NODECLASS_VARIABLE) {
+    node = node_wrap(cVarNode,node_alloc(pss, it));
+  } else if (nc == UA_NODECLASS_METHOD) {
+    node = node_wrap(cNode,node_alloc(pss, it));
+  } else if (nc == UA_NODECLASS_UNSPECIFIED) {
+    node = Qnil;
+  } else {
+    node = node_wrap(cNode,node_alloc(pss, it));
+  }
+  UA_NodeClass_clear(&nc);
+
+  return node;
+} //}}}
 
 static VALUE node_value_set(VALUE self, VALUE value) { //{{{
   node_struct *ns;
@@ -583,6 +710,14 @@ static VALUE node_value_set(VALUE self, VALUE value) { //{{{
 
   UA_Variant variant;
   if (value_to_variant(value,&variant)) {
+    // printf("-----------------------------------------%ld\n",variant.arrayDimensionsSize);
+    if (variant.arrayDimensionsSize > 0) {
+      UA_Server_writeValueRank(ns->master->master, ns->id, variant.arrayDimensionsSize);
+      UA_Variant uaArrayDimensions;
+      UA_Variant_setArray(&uaArrayDimensions, variant.arrayDimensions, variant.arrayDimensionsSize, &UA_TYPES[UA_TYPES_UINT32]);
+      UA_Server_writeArrayDimensions(ns->master->master, ns->id, uaArrayDimensions);
+    }
+
     UA_Server_writeValue(ns->master->master, ns->id, variant);
   }
   return self;
@@ -603,6 +738,36 @@ static VALUE node_value(VALUE self) { //{{{
   }
 
   UA_Variant_clear(&value);
+  return rb_ary_entry(ret,0);
+} //}}}
+static VALUE node_description_set(VALUE self, VALUE value) { //{{{
+  node_struct *ns;
+  Data_Get_Struct(self, node_struct, ns);
+
+  VALUE str = rb_obj_as_string(value);
+  if (NIL_P(str) || TYPE(str) != T_STRING)
+    rb_raise(rb_eTypeError, "cannot convert obj to string");
+  char *nstr = (char *)StringValuePtr(str);
+  UA_LocalizedText lt = UA_LOCALIZEDTEXT("en-US",nstr);
+
+  UA_Server_writeDescription(ns->master->master, ns->id, lt);
+  return self;
+} //}}}
+static VALUE node_description(VALUE self) { //{{{
+  node_struct *ns;
+
+  Data_Get_Struct(self, node_struct, ns);
+
+  UA_LocalizedText value;
+  UA_LocalizedText_init(&value);
+  UA_StatusCode retval = UA_Server_readDescription(ns->master->master, ns->id, &value);
+
+  VALUE ret = Qnil;
+  if (retval == UA_STATUSCODE_GOOD) {
+    ret = rb_str_export_locale(rb_str_new((char *)(value.text.data),value.text.length));
+  }
+
+  UA_LocalizedText_clear(&value);
   return ret;
 } //}}}
 
@@ -668,12 +833,17 @@ static VALUE server_add_namespace(VALUE self, VALUE name) { //{{{
 static VALUE server_types(VALUE self) { //{{{
   server_struct *pss;
   Data_Get_Struct(self, server_struct, pss);
-  return node_wrap(cTypesTopNode, node_alloc(pss, UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE)));
+  return node_wrap(cTypeTopNode, node_alloc(pss, UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE)));
+} //}}}
+static VALUE server_references(VALUE self) { //{{{
+  server_struct *pss;
+  Data_Get_Struct(self, server_struct, pss);
+  return node_wrap(cReferenceTopNode, node_alloc(pss, UA_NODEID_NUMERIC(0, UA_NS0ID_NONHIERARCHICALREFERENCES)));
 } //}}}
 static VALUE server_objects(VALUE self) { //{{{
   server_struct *pss;
   Data_Get_Struct(self, server_struct, pss);
-  return node_wrap(cObjectsNode, node_alloc(pss, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER)));
+  return node_wrap(cObjectNode, node_alloc(pss, UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER)));
 } //}}}
 static VALUE server_debug(VALUE self) { //{{{
   server_struct *pss;
@@ -694,6 +864,23 @@ static VALUE server_debug_set(VALUE self, VALUE val) { //{{{
   }
   return self;
 } //}}}
+static VALUE server_namespaces(VALUE self) { //{{{
+  server_struct *pss;
+  Data_Get_Struct(self, server_struct, pss);
+
+  UA_Variant value;
+  UA_Variant_init(&value);
+  UA_StatusCode retval = UA_Server_readValue(pss->master, UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_NAMESPACEARRAY), &value);
+
+  VALUE ret = Qnil;
+  if (retval == UA_STATUSCODE_GOOD) {
+    ret = extract_value(value);
+  }
+
+  UA_Variant_clear(&value);
+  RB_OBJ_FREEZE(ret);
+  return rb_ary_entry(ret,0);
+} //}}}
 
 void Init_server(void) {
   mOPCUA = rb_define_module("OPCUA");
@@ -701,45 +888,53 @@ void Init_server(void) {
   rb_define_const(mOPCUA, "MANDATORYPLACEHOLDER", INT2NUM(UA_NS0ID_MODELLINGRULE_MANDATORYPLACEHOLDER));
   rb_define_const(mOPCUA, "OPTIONAL", INT2NUM(UA_NS0ID_MODELLINGRULE_OPTIONAL));
   rb_define_const(mOPCUA, "OPTIONALPLACEHOLDER", INT2NUM(UA_NS0ID_MODELLINGRULE_OPTIONALPLACEHOLDER));
+  rb_define_const(mOPCUA, "BASEDATAVARIABLETYPE", INT2NUM(UA_NS0ID_BASEDATAVARIABLETYPE));
+  rb_define_const(mOPCUA, "PROPERTYTYPE", INT2NUM(UA_NS0ID_PROPERTYTYPE));
 
   Init_types();
 
-  cServer       = rb_define_class_under(mOPCUA, "Server", rb_cObject);
-  cObjectsNode  = rb_define_class_under(mOPCUA, "cObjectsNode", rb_cObject);
-  cTypesTopNode = rb_define_class_under(mOPCUA, "cTypesTopNode", rb_cObject);
-  cTypesSubNode = rb_define_class_under(mOPCUA, "cTypesSubNode", rb_cObject);
-  cVarNode      = rb_define_class_under(mOPCUA, "cVarNode", rb_cObject);
-  cMethodNode   = rb_define_class_under(mOPCUA, "cMethodNode", rb_cObject);
+  cServer            = rb_define_class_under(mOPCUA, "Server", rb_cObject);
+  cNode              = rb_define_class_under(cServer, "Node", rb_cObject);
+  cObjectNode        = rb_define_class_under(cServer, "ObjectNode", cNode);
+  cTypeTopNode       = rb_define_class_under(cServer, "TypeTopNode", cNode);
+  cTypeSubNode       = rb_define_class_under(cServer, "TypeSubNode", cNode);
+  cReferenceTopNode  = rb_define_class_under(cServer, "ReferenceTopNode", cNode);
+  cReferenceSubNode  = rb_define_class_under(cServer, "ReferenceSubNode", cNode);
+  cReferenceNode     = rb_define_class_under(cServer, "ObjectReferenceNode", cNode);
+  cVarNode           = rb_define_class_under(cServer, "ObjectVarNode", cNode);
+  cMethodNode        = rb_define_class_under(cServer, "ObjectMethodNode", cNode);
 
   rb_define_alloc_func(cServer, server_alloc);
   rb_define_method(cServer, "initialize", server_init, 0);
   rb_define_method(cServer, "run", server_run, 0);
   rb_define_method(cServer, "add_namespace", server_add_namespace, 1);
   rb_define_method(cServer, "types", server_types, 0);
+  rb_define_method(cServer, "references", server_references, 0);
   rb_define_method(cServer, "objects", server_objects, 0);
   rb_define_method(cServer, "debug", server_debug, 0);
   rb_define_method(cServer, "debug=", server_debug_set, 1);
+  rb_define_method(cServer, "namespaces", server_namespaces, 0);
+  rb_define_method(cServer, "get", server_get, -1);
+
+  rb_define_method(cNode, "to_s", node_to_s, 0);
+  rb_define_method(cNode, "id", node_id, 0);
+  rb_define_method(cNode, "description", node_description, 0);
+  rb_define_method(cNode, "description=", node_description_set, 1);
+
+  rb_define_method(cTypeTopNode, "add_object_type", node_add_object_type, 1);
+  rb_define_method(cTypeTopNode, "add_reference_type", node_add_reference_type, 1);
+  rb_define_method(cTypeTopNode, "folder", node_type_folder, 0);
+
+  rb_define_method(cTypeSubNode, "add_object_type", node_add_object_type, 1);
+  rb_define_method(cTypeSubNode, "add_variable", node_add_variable, -1);
+  rb_define_method(cTypeSubNode, "add_variable_rw", node_add_variable_rw, -1);
+  rb_define_method(cTypeSubNode, "add_object", node_add_object, -1);
+  rb_define_method(cTypeSubNode, "add_method", node_add_method, -1);
+  rb_define_method(cTypeSubNode, "add_reference", node_add_reference, 2);
+
+  rb_define_method(cObjectNode, "manifest", node_manifest, 2);
+  rb_define_method(cObjectNode, "find", node_find, 1);
 
-  rb_define_method(cTypesTopNode, "add_object_type", node_add_object_type, 1);
-  rb_define_method(cTypesTopNode, "folder", node_type_folder, 0);
-  rb_define_method(cTypesSubNode, "add_object_type", node_add_object_type, 1);
-  rb_define_method(cTypesSubNode, "add_variable", node_add_variable, -1);
-  rb_define_method(cTypesSubNode, "add_variable_rw", node_add_variable_rw, -1);
-  rb_define_method(cTypesSubNode, "add_object", node_add_object, -1);
-  rb_define_method(cTypesSubNode, "add_method", node_add_method, -1);
-  rb_define_method(cTypesSubNode, "to_s", node_to_s, 0);
-  rb_define_method(cTypesSubNode, "id", node_id, 0);
-
-  rb_define_method(cObjectsNode, "manifest", node_manifest, 2);
-  rb_define_method(cObjectsNode, "find", node_find, 1);
-  rb_define_method(cObjectsNode, "to_s", node_to_s, 0);
-  rb_define_method(cObjectsNode, "id", node_id, 0);
-
-  rb_define_method(cVarNode, "to_s", node_to_s, 0);
-  rb_define_method(cVarNode, "id", node_id, 0);
   rb_define_method(cVarNode, "value", node_value, 0);
   rb_define_method(cVarNode, "value=", node_value_set, 1);
-
-  rb_define_method(cMethodNode, "to_s", node_to_s, 0);
-  rb_define_method(cMethodNode, "id", node_id, 0);
 }