opcua 0.12 → 0.13

data/ext/opcua/helpers/finders.h

@@ -0,0 +1,13 @@
+#ifndef __OPCUA_SMART_FINDERS_H__
+#define __OPCUA_SMART_FINDERS_H__
+
+#include <open62541.h>
+#include <ruby.h>
+
+RUBY_EXTERN UA_BrowsePathResult node_browse_path(UA_Server *server, UA_NodeId relative, UA_NodeId ref, UA_QualifiedName mqn, bool inverse);
+RUBY_EXTERN bool server_node_get_reference(UA_Server *server, UA_NodeId parent, UA_NodeId *result, bool inverse);
+RUBY_EXTERN bool client_node_get_reference_by_name(UA_Client *client, UA_NodeId parent, UA_QualifiedName name, UA_NodeId *result, bool inverse);
+RUBY_EXTERN bool client_node_get_reference_by_type(UA_Client *client, UA_NodeId parent, UA_NodeId type, UA_NodeId *result, bool inverse);
+RUBY_EXTERN bool client_node_list_references(UA_Client *client, UA_NodeId parent, bool inverse);
+
+#endif

data/ext/opcua/{log_none.h → helpers/log_none.c}

@@ -1,3 +1,5 @@
+#include "log_none.h"
+
 void UA_Log_None_log(void *_, UA_LogLevel level, UA_LogCategory category, const char *msg, va_list args) { }
 void UA_Log_None_clear(void *logContext) { }
 const UA_Logger UA_Log_None_ = {UA_Log_None_log, NULL, UA_Log_None_clear};

data/ext/opcua/helpers/log_none.h

@@ -0,0 +1,12 @@
+#ifndef __OPCUA_SMART_LOG_NONE_H__
+#define __OPCUA_SMART_LOG_NONE_H__
+
+#include <open62541.h>
+#include <ruby.h>
+
+RUBY_EXTERN void UA_Log_None_log(void *_, UA_LogLevel level, UA_LogCategory category, const char *msg, va_list args);
+RUBY_EXTERN void UA_Log_None_clear(void *logContext);
+RUBY_EXTERN const UA_Logger UA_Log_None_;
+RUBY_EXTERN const UA_Logger *UA_Log_None;
+
+#endif

data/ext/opcua/{strnautocat.h → helpers/strnautocat.c}

@@ -1,3 +1,5 @@
+#include "strnautocat.h"
+
 char *strnautocat(char *str, char *s2, size_t num) {
   int len = 0;
   char *s;

data/ext/opcua/helpers/strnautocat.h

@@ -0,0 +1,8 @@
+#ifndef __OPCUA_SMART_STRNAUTOCAT_H__
+#define __OPCUA_SMART_STRNAUTOCAT_H__
+
+#include <ruby.h>
+
+RUBY_EXTERN char *strnautocat(char *str, char *s2, size_t num);
+
+#endif

data/ext/opcua/{values.h → helpers/values.c}

@@ -1,12 +1,13 @@
-/* -- */
-VALUE mTYPES = Qnil;
+#include "values.h"
+
+VALUE mOPCUA;
 
 /* -- */
-static void variant_set_one_dimension(UA_Variant *variant,UA_UInt32 len) {
+static void variant_set_one_dimension(UA_Variant *variant,UA_UInt32 len) { //{{{
   variant->arrayDimensions = (UA_UInt32 *)UA_Array_new(1, &UA_TYPES[UA_TYPES_UINT32]);
   variant->arrayDimensions[0] = len;
   variant->arrayDimensionsSize = 1;
-}
+} //}}}
 static bool value_to_array(VALUE value, UA_Variant *variant) {/*{{{*/
   int done = false;
 
@@ -92,7 +93,8 @@ static bool value_to_array(VALUE value, UA_Variant *variant) {/*{{{*/
   }
   return done;
 }/*}}}*/
-static bool value_to_variant(VALUE value, UA_Variant *variant) { //{{{
+
+bool value_to_variant(VALUE value, UA_Variant *variant, UA_UInt32 proposal) { //{{{
   bool done = false;
   if (rb_obj_is_kind_of(value,rb_cTime)) {
     UA_DateTime tmp = UA_DateTime_fromUnixTime(rb_time_timeval(value).tv_sec);
@@ -115,13 +117,39 @@ static bool value_to_variant(VALUE value, UA_Variant *variant) { //{{{
           break;
         }
       case T_FLOAT:
-      case T_FIXNUM:
         {
           UA_Double tmp = NUM2DBL(value);
           UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_DOUBLE]);
           done = true;
           break;
         }
+      case T_FIXNUM:
+        {
+          if (proposal == UA_TYPES_SBYTE) {
+            UA_SByte tmp = (UA_SByte)NUM2CHR(value);
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_SBYTE]);
+          } else if (proposal == UA_TYPES_BYTE) {
+            UA_SByte tmp = (UA_Byte)NUM2CHR(value);
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_BYTE]);
+          } else if (proposal == UA_TYPES_INT16) {
+            UA_Int16 tmp = NUM2INT(value);
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_INT16]);
+          } else if (proposal == UA_TYPES_UINT16) {
+            UA_UInt16 tmp = NUM2INT(value);
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_UINT16]);
+          } else if (proposal == UA_TYPES_INT32) {
+            UA_Int32 tmp = NUM2LONG(value);
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_INT32]);
+          } else if (proposal == UA_TYPES_UINT32) {
+            UA_UInt32 tmp = NUM2ULONG(value);
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_UINT32]);
+          } else {
+            UA_Int32 tmp = NUM2LONG(value);
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_INT32]);
+          }
+          done = true;
+          break;
+        }
       case T_STRING:
       case T_SYMBOL:
         {
@@ -142,9 +170,8 @@ static bool value_to_variant(VALUE value, UA_Variant *variant) { //{{{
   }
   return done;
 } //}}}
-/* ++ */
 
-static void Init_types() {/*{{{*/
+void Init_types() {/*{{{*/
   mTYPES = rb_define_module_under(mOPCUA,"TYPES");
   rb_define_const(mTYPES, "DATETIME",            INT2NUM(UA_TYPES_DATETIME           ));
   rb_define_const(mTYPES, "BOOLEAN",             INT2NUM(UA_TYPES_BOOLEAN            ));
@@ -156,32 +183,38 @@ static void Init_types() {/*{{{*/
   rb_define_const(mTYPES, "STRING",              INT2NUM(UA_TYPES_STRING             ));
 }/*}}}*/
 
-static VALUE UA_TYPES_DATETIME_to_value(UA_DateTime data) {
+static VALUE UA_TYPES_DATETIME_to_value(UA_DateTime data) { //{{{
   return rb_time_new(UA_DateTime_toUnixTime(data),0);
-}
-static VALUE UA_TYPES_BOOLEAN_to_value(UA_Boolean data) {
+} //}}}
+static VALUE UA_TYPES_BOOLEAN_to_value(UA_Boolean data) { //{{{
   return data ? Qtrue : Qfalse;
-}
-static VALUE UA_TYPES_DOUBLE_to_value(UA_Double data) {
+} //}}}
+static VALUE UA_TYPES_DOUBLE_to_value(UA_Double data) { //{{{
   return DBL2NUM(data);
-}
-static VALUE UA_TYPES_INT32_to_value(UA_Int32 data) {
+} //}}}
+static VALUE UA_TYPES_SBYTE_to_value(UA_SByte data) { //{{{
+  return CHR2FIX((signed char)data);
+} //}}}
+static VALUE UA_TYPES_INT32_to_value(UA_Int32 data) { //{{{
   return INT2NUM(data);
-}
-static VALUE UA_TYPES_INT16_to_value(UA_Int16 data) {
+} //}}}
+static VALUE UA_TYPES_INT16_to_value(UA_Int16 data) { //{{{
   return INT2NUM(data);
-}
-static VALUE UA_TYPES_UINT32_to_value(UA_UInt32 data) {
+} //}}}
+static VALUE UA_TYPES_BYTE_to_value(UA_Byte data) { //{{{
+  return CHR2FIX((unsigned char)data);
+} //}}}
+static VALUE UA_TYPES_UINT32_to_value(UA_UInt32 data) { //{{{
   return UINT2NUM(data);
-}
-static VALUE UA_TYPES_UINT16_to_value(UA_UInt16 data) {
+} //}}}
+static VALUE UA_TYPES_UINT16_to_value(UA_UInt16 data) { //{{{
   return UINT2NUM(data);
-}
-static VALUE UA_TYPES_STRING_to_value(UA_String data) {
+} //}}}
+static VALUE UA_TYPES_STRING_to_value(UA_String data) { //{{{
   return rb_str_export_locale(rb_str_new((char *)(data.data),data.length));
-}
+} //}}}
 
-static VALUE extract_value(UA_Variant value) { //{{{
+VALUE extract_value(UA_Variant value) { //{{{
   VALUE ret = rb_ary_new2(2);
   rb_ary_store(ret,0,Qnil);
   rb_ary_store(ret,1,Qnil);
@@ -210,6 +243,12 @@ static VALUE extract_value(UA_Variant value) { //{{{
     } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_UINT16])) {
       rb_ary_store(ret,0,UA_TYPES_UINT16_to_value(*(UA_UInt16 *)value.data));
       rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.UInt16")));
+    } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_SBYTE])) {
+      rb_ary_store(ret,0,UA_TYPES_SBYTE_to_value(*(UA_SByte *)value.data));
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.SByte")));
+    } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_BYTE])) {
+      rb_ary_store(ret,0,UA_TYPES_BYTE_to_value(*(UA_Byte *)value.data));
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Byte")));
     } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_STRING])) {
       rb_ary_store(ret,0,UA_TYPES_STRING_to_value(*(UA_String *)value.data));
       rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.String")));

data/ext/opcua/helpers/values.h

@@ -0,0 +1,12 @@
+#ifndef __OPCUA_SMART_VALUES_H__
+#define __OPCUA_SMART_VALUES_H__
+
+#include <open62541.h>
+#include <ruby.h>
+
+VALUE mTYPES;
+RUBY_EXTERN bool value_to_variant(VALUE value, UA_Variant *variant, UA_UInt32 proposal);
+RUBY_EXTERN void Init_types();
+RUBY_EXTERN VALUE extract_value(UA_Variant value);
+
+#endif

data/ext/opcua/server/finders.c

@@ -0,0 +1 @@
+../helpers/finders.c

data/ext/opcua/server/finders.h

@@ -0,0 +1 @@
+../helpers/finders.h

data/ext/opcua/server/log_none.c

@@ -0,0 +1 @@
+../helpers/log_none.c

data/ext/opcua/server/log_none.h

@@ -0,0 +1 @@
+../helpers/log_none.h

data/ext/opcua/server/server.c

@@ -12,7 +12,7 @@ VALUE cReferenceNode = Qnil;
 VALUE cVarNode = Qnil;
 VALUE cMethodNode = Qnil;
 
-#include "../values.h"
+#include "values.h"
 
 int nodecounter = 2000;
 
@@ -24,7 +24,7 @@ static void  node_free(node_struct *ns) { //{{{
     }
     free(ns);
   }
-} //}}}
+} // }}}
 static node_struct * node_alloc(server_struct *server, UA_NodeId nodeid) { //{{{
   node_struct *ns;
   ns = (node_struct *)malloc(sizeof(node_struct));
@@ -34,6 +34,7 @@ static node_struct * node_alloc(server_struct *server, UA_NodeId nodeid) { //{{{
   ns->master = server;
   ns->id     = nodeid;
   ns->method = Qnil;
+  ns->exists = true;
 
 	return ns;
 } //}}}
@@ -45,12 +46,14 @@ 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);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
   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;
 
   Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   VALUE str = rb_obj_as_string(name);
   if (NIL_P(str) || TYPE(str) != T_STRING)
@@ -76,6 +79,7 @@ static VALUE node_add_reference_type(VALUE self, VALUE name, VALUE type) { //{{{
   node_struct *ns;
 
   Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   VALUE str = rb_obj_as_string(name);
   if (NIL_P(str) || TYPE(str) != T_STRING)
@@ -104,6 +108,7 @@ static VALUE node_id(VALUE self) { //{{{
   node_struct *ns;
 
   Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   VALUE ret = rb_ary_new();
 
@@ -118,11 +123,23 @@ static VALUE node_id(VALUE self) { //{{{
   }
   return ret;
 } //}}}
+static VALUE node_name(VALUE self) { //{{{
+  node_struct *ns;
+
+  Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
+
+  UA_QualifiedName qn;  UA_QualifiedName_init(&qn);
+  UA_Server_readBrowseName(ns->master->master, ns->id, &qn);
+
+  return rb_sprintf("%.*s", (int)qn.name.length, qn.name.data);
+} //}}}
 static VALUE node_to_s(VALUE self) { //{{{
   node_struct *ns;
   VALUE ret;
 
   Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   if (ns->id.identifierType == UA_NODEIDTYPE_NUMERIC) {
     ret = rb_sprintf("ns=%d;i=%d", ns->id.namespaceIndex, ns->id.identifier.numeric);
@@ -139,12 +156,15 @@ static VALUE node_add_reference(VALUE self, VALUE to, VALUE type) { //{{{
   node_struct *tys;
 
   Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   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);
+  if (!tos->exists) rb_raise(rb_eRuntimeError, "To (arg 1) node does not exist anymore.");
   Data_Get_Struct(type, node_struct, tys);
+  if (!tys->exists) rb_raise(rb_eRuntimeError, "Type (arg 2) node does not exist anymore.");
   UA_NodeId n = UA_NODEID_NUMERIC(ns->master->default_ns, nodecounter++);
 
   UA_ExpandedNodeId toNodeId;
@@ -269,6 +289,7 @@ static VALUE node_add_method(int argc, VALUE* argv, VALUE self) { //{{{
   if (NIL_P(opts)) opts = rb_hash_new();
 
   Data_Get_Struct(self, node_struct, parent);
+  if (!parent->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   VALUE str = rb_obj_as_string(name);
   if (NIL_P(str) || TYPE(str) != T_STRING)
@@ -326,6 +347,7 @@ static VALUE node_add_variable_wrap(int argc, VALUE* argv, VALUE self, UA_Byte a
   }
 
   Data_Get_Struct(self, node_struct, parent);
+  if (!parent->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   VALUE str = rb_obj_as_string(argv[0]);
   if (NIL_P(str) || TYPE(str) != T_STRING)
@@ -422,7 +444,9 @@ static VALUE node_add_object(int argc, VALUE* argv, VALUE self) { //{{{
   }
 
   Data_Get_Struct(self, node_struct, parent);
+  if (!parent->exists) rb_raise(rb_eRuntimeError, "Parent node does not exist anymore.");
   Data_Get_Struct(argv[1], node_struct, datatype);
+  if (!datatype->exists) rb_raise(rb_eRuntimeError, "Datatype node does not exist anymore.");
 
   VALUE str = rb_obj_as_string(argv[0]);
   if (NIL_P(str) || TYPE(str) != T_STRING)
@@ -432,52 +456,6 @@ static VALUE node_add_object(int argc, VALUE* argv, VALUE self) { //{{{
   return node_wrap(CLASS_OF(self),node_alloc(parent->master,node_add_object_ua_simple(type,nstr,parent,datatype,argv[2])));
 } //}}}
 
-static UA_BrowsePathResult node_browse_path(UA_Server *server, UA_NodeId relative, UA_NodeId ref, UA_QualifiedName mqn) { //{{{
-  UA_RelativePathElement rpe;
-  UA_RelativePathElement_init(&rpe);
-  rpe.referenceTypeId = ref;
-  rpe.isInverse = false;
-  rpe.includeSubtypes = false;
-  rpe.targetName = mqn;
-
-  UA_BrowsePath bp;
-  UA_BrowsePath_init(&bp);
-  bp.startingNode = relative;
-  bp.relativePath.elementsSize = 1;
-  bp.relativePath.elements = &rpe;
-
-  return UA_Server_translateBrowsePathToNodeIds(server, &bp);
-} //}}}
-
-static bool node_get_reference(UA_Server *server, UA_NodeId parent, UA_NodeId *result) { //{{{
-	UA_BrowseDescription bDes;
-  UA_BrowseDescription_init(&bDes);
-  bDes.nodeId = parent;
-  bDes.resultMask = UA_BROWSERESULTMASK_ALL;
-  UA_BrowseResult bRes = UA_Server_browse(server, 999, &bDes);
-
-  if (bRes.referencesSize > 0) {
-    UA_ReferenceDescription *ref = &(bRes.references[0]);
-
-    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;
-  }
-  return false;
-} //}}}
-
 static UA_StatusCode node_manifest_iter(UA_NodeId child_id, UA_Boolean is_inverse, UA_NodeId reference_type_id, void *handle) { //{{{
     if (is_inverse) return UA_STATUSCODE_GOOD;
 
@@ -516,8 +494,8 @@ static UA_StatusCode node_manifest_iter(UA_NodeId child_id, UA_Boolean is_invers
       if (child_id.namespaceIndex == parent->master->default_ns) {
         UA_QualifiedName mqn;UA_QualifiedName_init(&mqn);
         UA_Server_readBrowseName(parent->master->master, UA_NODEID_NUMERIC(0, UA_NS0ID_MODELLINGRULE_MANDATORY), &mqn);
-
-        UA_BrowsePathResult mandatory = node_browse_path(parent->master->master, child_id, UA_NODEID_NUMERIC(0, UA_NS0ID_HASMODELLINGRULE), mqn);
+        UA_BrowsePathResult mandatory = node_browse_path(parent->master->master, child_id, UA_NODEID_NUMERIC(0, UA_NS0ID_HASMODELLINGRULE), mqn, false);
+        UA_QualifiedName_clear(&mqn);
 
         if (mandatory.statusCode == UA_STATUSCODE_GOOD && (nc == UA_NODECLASS_OBJECT || nc == UA_NODECLASS_VARIABLE || nc == UA_NODECLASS_METHOD)) {
           char * buffer = strnautocat(NULL,"",0);
@@ -529,7 +507,7 @@ static UA_StatusCode node_manifest_iter(UA_NodeId child_id, UA_Boolean is_invers
           buffer = strnautocat(buffer,(char *)qn.name.data,qn.name.length);
           if(nc == UA_NODECLASS_OBJECT) {
             UA_NodeId typeid;
-            node_get_reference(parent->master->master, child_id, &typeid);
+            server_node_get_reference(parent->master->master, child_id, &typeid, false);
 
             node_struct *thetype = node_alloc(parent->master,typeid);
 
@@ -547,7 +525,8 @@ static UA_StatusCode node_manifest_iter(UA_NodeId child_id, UA_Boolean is_invers
           if(nc == UA_NODECLASS_VARIABLE) {
             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);
+            UA_BrowsePathResult property = node_browse_path(parent->master->master, child_id, UA_NODEID_NUMERIC(0, UA_NS0ID_HASTYPEDEFINITION), pqn, false);
+            UA_QualifiedName_clear(&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);
@@ -556,12 +535,11 @@ static UA_StatusCode node_manifest_iter(UA_NodeId child_id, UA_Boolean is_invers
             }
 
             UA_BrowsePathResult_clear(&property);
-            UA_QualifiedName_clear(&pqn);
           }
           if(nc == UA_NODECLASS_METHOD) {
             UA_NodeId ttt;
             VALUE blk = rb_hash_aref(parent->master->methods,INT2NUM(child_id.identifier.numeric));
-            if (node_get_reference(parent->master->master, child_id, &ttt)) {
+            if (server_node_get_reference(parent->master->master, child_id, &ttt, false)) {
               UA_Variant arv; UA_Variant_init(&arv);
               UA_Server_readValue(parent->master->master, ttt, &arv);
 
@@ -573,7 +551,6 @@ static UA_StatusCode node_manifest_iter(UA_NodeId child_id, UA_Boolean is_invers
           }
         }
         UA_BrowsePathResult_clear(&mandatory);
-        UA_QualifiedName_clear(&mqn);
       }
 
       UA_NodeClass_clear(&nc);
@@ -593,7 +570,9 @@ static VALUE node_manifest(VALUE self, VALUE name, VALUE parent) { //{{{
   }
 
   Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
   Data_Get_Struct(parent, node_struct, ts);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Target node does not exist anymore.");
 
   VALUE str = rb_obj_as_string(name);
   if (NIL_P(str) || TYPE(str) != T_STRING)
@@ -620,13 +599,14 @@ static VALUE node_find(VALUE self, VALUE qname) { //{{{
   node_struct *ns;
 
   Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   VALUE str = rb_obj_as_string(qname);
   if (NIL_P(str) || TYPE(str) != T_STRING)
     rb_raise(rb_eTypeError, "cannot convert obj to string");
   char *nstr = (char *)StringValuePtr(str);
 
-  UA_BrowsePathResult bpr = node_browse_path(ns->master->master, ns->id, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), UA_QUALIFIEDNAME(ns->master->default_ns, nstr));
+  UA_BrowsePathResult bpr = node_browse_path(ns->master->master, ns->id, UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT), UA_QUALIFIEDNAME(ns->master->default_ns, nstr), false);
 
   if(bpr.statusCode != UA_STATUSCODE_GOOD || bpr.targetsSize < 1) {
     return Qnil;
@@ -707,9 +687,10 @@ static VALUE server_get(int argc, VALUE* argv, VALUE self) { //{{{
 static VALUE node_value_set(VALUE self, VALUE value) { //{{{
   node_struct *ns;
   Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   UA_Variant variant;
-  if (value_to_variant(value,&variant)) {
+  if (value_to_variant(value,&variant,-1)) {
     // printf("-----------------------------------------%ld\n",variant.arrayDimensionsSize);
     if (variant.arrayDimensionsSize > 0) {
       UA_Server_writeValueRank(ns->master->master, ns->id, variant.arrayDimensionsSize);
@@ -726,6 +707,7 @@ static VALUE node_value(VALUE self) { //{{{
   node_struct *ns;
 
   Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   UA_Variant value;
   UA_Variant_init(&value);
@@ -740,9 +722,34 @@ static VALUE node_value(VALUE self) { //{{{
   UA_Variant_clear(&value);
   return rb_ary_entry(ret,0);
 } //}}}
+static VALUE node_delete(VALUE self) { //{{{
+  node_struct *ns;
+
+  Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
+
+  UA_StatusCode retval = UA_Server_deleteNode(ns->master->master, ns->id, true);
+
+  if (retval == UA_STATUSCODE_GOOD) {
+    ns->exists = false;
+    return Qtrue;
+  }
+
+  return Qfalse;
+} //}}}
+static VALUE node_exists(VALUE self) { //{{{
+  node_struct *ns;
+
+  Data_Get_Struct(self, node_struct, ns);
+  if (ns->exists)
+    return Qtrue;
+  else
+    return Qfalse;
+} //}}}
 static VALUE node_description_set(VALUE self, VALUE value) { //{{{
   node_struct *ns;
   Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   VALUE str = rb_obj_as_string(value);
   if (NIL_P(str) || TYPE(str) != T_STRING)
@@ -757,6 +764,7 @@ static VALUE node_description(VALUE self) { //{{{
   node_struct *ns;
 
   Data_Get_Struct(self, node_struct, ns);
+  if (!ns->exists) rb_raise(rb_eRuntimeError, "Node does not exist anymore.");
 
   UA_LocalizedText value;
   UA_LocalizedText_init(&value);
@@ -918,8 +926,10 @@ void Init_server(void) {
 
   rb_define_method(cNode, "to_s", node_to_s, 0);
   rb_define_method(cNode, "id", node_id, 0);
+  rb_define_method(cNode, "name", node_name, 0);
   rb_define_method(cNode, "description", node_description, 0);
   rb_define_method(cNode, "description=", node_description_set, 1);
+  rb_define_method(cNode, "exists?", node_exists, 0);
 
   rb_define_method(cTypeTopNode, "add_object_type", node_add_object_type, 1);
   rb_define_method(cTypeTopNode, "add_reference_type", node_add_reference_type, 1);
@@ -931,10 +941,13 @@ void Init_server(void) {
   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(cTypeSubNode, "delete!", node_delete, 0);
 
   rb_define_method(cObjectNode, "manifest", node_manifest, 2);
   rb_define_method(cObjectNode, "find", node_find, 1);
+  rb_define_method(cObjectNode, "delete!", node_delete, 0);
 
   rb_define_method(cVarNode, "value", node_value, 0);
   rb_define_method(cVarNode, "value=", node_value_set, 1);
+  rb_define_method(cVarNode, "delete!", node_delete, 0);
 }