opcua 0.14 → 0.19

data/ext/opcua/helpers/finders.c

@@ -46,6 +46,34 @@ bool server_node_get_reference(UA_Server *server, UA_NodeId parent, UA_NodeId *r
   return false;
 }
 
+bool server_node_get_reference_by_name(UA_Server *server, UA_NodeId parent, UA_QualifiedName name, UA_NodeId *result, bool inverse) {
+	UA_BrowseDescription bDes;
+  UA_BrowseDescription_init(&bDes);
+  bDes.nodeId = parent;
+  bDes.resultMask = UA_BROWSERESULTMASK_ALL;
+  bDes.browseDirection = inverse ? 1 : 0;
+  UA_BrowseResult bRes = UA_Server_browse(server, 999, &bDes);
+
+  for (int i=0; i < bRes.referencesSize; i++) {
+    UA_ReferenceDescription *ref = &(bRes.references[i]);
+
+    UA_QualifiedName qn;  UA_QualifiedName_init(&qn);
+    UA_Server_readBrowseName(server, ref->nodeId.nodeId, &qn);
+
+    if (UA_QualifiedName_equal(&qn,&name)) {
+      UA_NodeId_copy(&ref->nodeId.nodeId,result);
+
+      UA_BrowseResult_deleteMembers(&bRes);
+      UA_BrowseResult_clear(&bRes);
+      return true;
+    }
+  }
+
+  UA_BrowseResult_deleteMembers(&bRes);
+  UA_BrowseResult_clear(&bRes);
+  return false;
+}
+
 bool client_node_get_reference_by_name(UA_Client *client, UA_NodeId parent, UA_QualifiedName name, UA_NodeId *result, bool inverse) {
   UA_BrowseRequest bReq;
   UA_BrowseRequest_init(&bReq);

data/ext/opcua/helpers/finders.h

@@ -6,6 +6,7 @@
 
 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 server_node_get_reference_by_name(UA_Server *server, UA_NodeId parent, UA_QualifiedName name, 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);

data/ext/opcua/helpers/values.c

@@ -1,6 +1,6 @@
 #include "values.h"
 
-VALUE mOPCUA;
+VALUE mTYPES;
 
 /* -- */
 static void variant_set_one_dimension(UA_Variant *variant,UA_UInt32 len) { //{{{
@@ -154,8 +154,14 @@ bool value_to_variant(VALUE value, UA_Variant *variant, UA_UInt32 proposal) { //
       case T_SYMBOL:
         {
           VALUE str = rb_obj_as_string(value);
-          UA_String tmp = UA_STRING(StringValuePtr(str));
-          UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_STRING]);
+          if (proposal == UA_TYPES_STRING) {
+            UA_String tmp = UA_STRING(StringValuePtr(str));
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_STRING]);
+          } else if (proposal == UA_TYPES_BYTESTRING) {
+            printf("rrrrr\n");
+            UA_ByteString tmp = UA_BYTESTRING(StringValuePtr(str));
+            UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_BYTESTRING]);
+          }
           done = true;
           break;
         }
@@ -171,10 +177,11 @@ bool value_to_variant(VALUE value, UA_Variant *variant, UA_UInt32 proposal) { //
   return done;
 } //}}}
 
-void Init_types() {/*{{{*/
+void Init_types(VALUE mOPCUA) {/*{{{*/
   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            ));
+  rb_define_const(mTYPES, "FLOAT",               INT2NUM(UA_TYPES_FLOAT              ));
   rb_define_const(mTYPES, "DOUBLE",              INT2NUM(UA_TYPES_DOUBLE             ));
   rb_define_const(mTYPES, "INT32",               INT2NUM(UA_TYPES_INT32              ));
   rb_define_const(mTYPES, "INT16",               INT2NUM(UA_TYPES_INT16              ));
@@ -189,6 +196,9 @@ static VALUE UA_TYPES_DATETIME_to_value(UA_DateTime data) { //{{{
 static VALUE UA_TYPES_BOOLEAN_to_value(UA_Boolean data) { //{{{
   return data ? Qtrue : Qfalse;
 } //}}}
+static VALUE UA_TYPES_FLOAT_to_value(UA_Float data) { //{{{
+  return DBL2NUM((double)data);
+} //}}}
 static VALUE UA_TYPES_DOUBLE_to_value(UA_Double data) { //{{{
   return DBL2NUM(data);
 } //}}}
@@ -213,6 +223,9 @@ static VALUE UA_TYPES_UINT16_to_value(UA_UInt16 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 UA_TYPES_BYTESTRING_to_value(UA_ByteString data) { //{{{
+  return rb_str_export_locale(rb_str_new((char *)(data.data),data.length));
+} //}}}
 
 VALUE extract_value(UA_Variant value) { //{{{
   VALUE ret = rb_ary_new2(2);
@@ -228,6 +241,9 @@ VALUE extract_value(UA_Variant value) { //{{{
     } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_BOOLEAN])) {
       rb_ary_store(ret,0,UA_TYPES_BOOLEAN_to_value(*(UA_Boolean *)value.data));
       rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Boolean")));
+    } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_FLOAT])) {
+      rb_ary_store(ret,0,UA_TYPES_FLOAT_to_value(*(UA_Float *)value.data));
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Float")));
     } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_DOUBLE])) {
       rb_ary_store(ret,0,UA_TYPES_DOUBLE_to_value(*(UA_Double *)value.data));
       rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Double")));
@@ -252,6 +268,11 @@ VALUE extract_value(UA_Variant value) { //{{{
     } 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")));
+    } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_BYTESTRING])) {
+      rb_ary_store(ret,0,UA_TYPES_BYTESTRING_to_value(*(UA_ByteString *)value.data));
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.String")));
+    } else {
+      //printf("Unknown Datatype\n");
     }
   } else if (value.arrayDimensionsSize == 1 || (value.arrayDimensionsSize == 0 && value.arrayLength > 0)) {
     if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_DATETIME])) {
@@ -268,6 +289,13 @@ VALUE extract_value(UA_Variant value) { //{{{
       for (int i=0; i < value.arrayLength; i++) {
         rb_ary_push(res,UA_TYPES_BOOLEAN_to_value(((UA_Boolean *)value.data)[i]));
       }
+    } else if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_FLOAT])) {
+      VALUE res = rb_ary_new();
+      rb_ary_store(ret,0,res);
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Float")));
+      for (int i=0; i < value.arrayLength; i++) {
+        rb_ary_push(res,UA_TYPES_FLOAT_to_value(((UA_Float *)value.data)[i]));
+      }
     } else if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_DOUBLE])) {
       VALUE res = rb_ary_new();
       rb_ary_store(ret,0,res);

data/ext/opcua/helpers/values.h

@@ -4,9 +4,8 @@
 #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 void Init_types(VALUE mOPCUA);
 RUBY_EXTERN VALUE extract_value(UA_Variant value);
 
 #endif

data/ext/opcua/server/server.c

@@ -224,11 +224,15 @@ static UA_StatusCode node_add_method_callback( //{{{
     rb_ary_push(args,rb_ary_entry(ret,0));
   }
 
-  rb_proc_call(me->method,args);
+  VALUE ret = rb_proc_call(me->method,args);
+
+  if (outputSize == 1) {
+    value_to_variant(ret,output,-1);
+  }
 
   return UA_STATUSCODE_GOOD;
 } //}}}
-static UA_NodeId node_add_method_ua(UA_NodeId n, UA_LocalizedText dn, UA_QualifiedName qn, node_struct *parent,size_t inputArgumentsSize,const UA_Argument *inputArguments, VALUE blk) { //{{{
+static UA_NodeId node_add_method_ua(UA_NodeId n, UA_LocalizedText dn, UA_QualifiedName qn, node_struct *parent,size_t inputArgumentsSize,const UA_Argument *inputArguments,size_t outputArgumentsSize,const UA_Argument *outputArguments, VALUE blk) { //{{{
   UA_MethodAttributes mnAttr = UA_MethodAttributes_default;
   mnAttr.displayName = dn;
   mnAttr.executable = true;
@@ -248,8 +252,8 @@ static UA_NodeId node_add_method_ua(UA_NodeId n, UA_LocalizedText dn, UA_Qualifi
                          &node_add_method_callback,
                          inputArgumentsSize,
                          inputArguments,
-                         0,
-                         NULL,
+                         outputArgumentsSize,
+                         outputArguments,
                          (void *)me,
                          NULL);
 
@@ -264,6 +268,8 @@ static UA_NodeId node_add_method_ua(UA_NodeId n, UA_LocalizedText dn, UA_Qualifi
 } //}}}
 static UA_NodeId node_add_method_ua_simple(char* nstr, node_struct *parent, VALUE opts, VALUE blk) { //{{{
   UA_Argument inputArguments[RHASH_SIZE(opts)];
+  UA_Argument outputArguments[1];
+  int counter = 0;
 
   VALUE ary = rb_funcall(opts, rb_intern("to_a"), 0);
   for (long i=0; i<RARRAY_LEN(ary); i++) {
@@ -272,11 +278,20 @@ static UA_NodeId node_add_method_ua_simple(char* nstr, node_struct *parent, VALU
     if (NIL_P(str) || TYPE(str) != T_STRING)
       rb_raise(rb_eTypeError, "cannot convert obj to string");
     char *nstr = (char *)StringValuePtr(str);
-    UA_Argument_init(&inputArguments[i]);
-    inputArguments[i].description = UA_LOCALIZEDTEXT("en-US", nstr);
-    inputArguments[i].name = UA_STRING(nstr);
-    inputArguments[i].dataType = UA_TYPES[NUM2INT(RARRAY_AREF(item, 1))].typeId;
-    inputArguments[i].valueRank = UA_VALUERANK_SCALAR;
+    if (rb_str_cmp(str,rb_str_new2("return"))) {
+      UA_Argument_init(&inputArguments[counter]);
+      inputArguments[counter].description = UA_LOCALIZEDTEXT("en-US", nstr);
+      inputArguments[counter].name = UA_STRING(nstr);
+      inputArguments[counter].dataType = UA_TYPES[NUM2INT(RARRAY_AREF(item, 1))].typeId;
+      inputArguments[counter].valueRank = UA_VALUERANK_SCALAR;
+      counter++;
+    } else {
+      UA_Argument_init(&outputArguments[0]);
+      outputArguments[0].description = UA_LOCALIZEDTEXT("en-US", nstr);
+      outputArguments[0].name = UA_STRING(nstr);
+      outputArguments[0].dataType = UA_TYPES[NUM2INT(RARRAY_AREF(item, 1))].typeId;
+      outputArguments[0].valueRank = UA_VALUERANK_SCALAR;
+    }
   }
   int nodeid = nodecounter++;
 
@@ -288,8 +303,10 @@ static UA_NodeId node_add_method_ua_simple(char* nstr, node_struct *parent, VALU
     UA_LOCALIZEDTEXT("en-US", nstr),
     UA_QUALIFIEDNAME(parent->master->default_ns, nstr),
     parent,
-    RHASH_SIZE(opts),
+    counter,
     inputArguments,
+    RHASH_SIZE(opts)-counter,
+    outputArguments,
     blk
   );
 } //}}}
@@ -556,16 +573,38 @@ static UA_StatusCode node_manifest_iter(UA_NodeId child_id, UA_Boolean is_invers
             UA_BrowsePathResult_clear(&property);
           }
           if(nc == UA_NODECLASS_METHOD) {
-            UA_NodeId ttt;
+            UA_NodeId ia;
+            UA_NodeId oa;
             VALUE blk = rb_hash_aref(parent->master->methods,INT2NUM(child_id.identifier.numeric));
-            if (server_node_get_reference(parent->master->master, child_id, &ttt, false)) {
+
+            bool iacheck = server_node_get_reference_by_name(parent->master->master, child_id, UA_QUALIFIEDNAME(0,"InputArguments"), &ia, false);
+            bool oacheck = server_node_get_reference_by_name(parent->master->master, child_id, UA_QUALIFIEDNAME(0,"OutputArguments"), &oa, false);
+            if (iacheck && oacheck) {
+              UA_Variant arv1; UA_Variant_init(&arv1);
+              UA_Variant arv2; UA_Variant_init(&arv2);
+              UA_Server_readValue(parent->master->master, ia, &arv1);
+              UA_Server_readValue(parent->master->master, oa, &arv2);
+
+              // todo differentiate between input and output reference
+              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,arv1.arrayLength,(UA_Argument *)arv1.data,arv2.arrayLength,(UA_Argument *)arv2.data,blk);
+              UA_Variant_clear(&arv1);
+              UA_Variant_clear(&arv2);
+            } else if (iacheck) {
               UA_Variant arv; UA_Variant_init(&arv);
-              UA_Server_readValue(parent->master->master, ttt, &arv);
+              UA_Server_readValue(parent->master->master, ia, &arv);
 
-              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,arv.arrayLength,(UA_Argument *)arv.data,blk);
+              // todo differentiate between input and output reference
+              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,arv.arrayLength,(UA_Argument *)arv.data,0,NULL,blk);
+              UA_Variant_clear(&arv);
+            } else if (oacheck) {
+              UA_Variant arv; UA_Variant_init(&arv);
+              UA_Server_readValue(parent->master->master, oa, &arv);
+
+              // todo differentiate between input and output reference
+              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,0,NULL,arv.arrayLength,(UA_Argument *)arv.data,blk);
               UA_Variant_clear(&arv);
             } else {
-              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,0,NULL,blk);
+              node_add_method_ua(UA_NODEID_STRING(parent->master->default_ns,buffer),dn,qn,newnode,0,NULL,0,NULL,blk);
             }
           }
         }
@@ -719,6 +758,7 @@ static VALUE node_value_set(VALUE self, VALUE value) { //{{{
     }
 
     UA_Server_writeValue(ns->master->master, ns->id, variant);
+    UA_Variant_deleteMembers(&variant);
   }
   return self;
 } //}}}
@@ -860,7 +900,7 @@ static VALUE server_add_namespace(VALUE self, VALUE name) { //{{{
   char *nstr = (char *)StringValuePtr(str);
 
   pss->default_ns = UA_Server_addNamespace(pss->master, nstr);
-  return self;
+  return INT2NUM(pss->default_ns);
 } //}}}
 static VALUE server_types(VALUE self) { //{{{
   server_struct *pss;
@@ -913,6 +953,21 @@ static VALUE server_namespaces(VALUE self) { //{{{
   RB_OBJ_FREEZE(ret);
   return rb_ary_entry(ret,0);
 } //}}}
+static VALUE server_active_namespace(VALUE self) { //{{{
+  server_struct *pss;
+  Data_Get_Struct(self, server_struct, pss);
+  return UINT2NUM(pss->default_ns);
+} //}}}
+static VALUE server_active_namespace_set(VALUE self, VALUE val) { //{{{
+  server_struct *pss;
+  Data_Get_Struct(self, server_struct, pss);
+
+  if (NIL_P(val) || TYPE(val) != T_FIXNUM)
+    rb_raise(rb_eTypeError, "namespace is not an integer");
+
+  pss->default_ns = NUM2UINT(val);
+  return self;
+} //}}}
 
 void Init_server(void) {
   mOPCUA = rb_define_module("OPCUA");
@@ -923,7 +978,7 @@ void Init_server(void) {
   rb_define_const(mOPCUA, "BASEDATAVARIABLETYPE", INT2NUM(UA_NS0ID_BASEDATAVARIABLETYPE));
   rb_define_const(mOPCUA, "PROPERTYTYPE", INT2NUM(UA_NS0ID_PROPERTYTYPE));
 
-  Init_types();
+  Init_types(mOPCUA);
 
   cServer            = rb_define_class_under(mOPCUA, "Server", rb_cObject);
   cNode              = rb_define_class_under(cServer, "Node", rb_cObject);
@@ -940,6 +995,8 @@ void Init_server(void) {
   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, "active_namespace", server_active_namespace, 0);
+  rb_define_method(cServer, "active_namespace=", server_active_namespace_set, 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);
@@ -956,7 +1013,7 @@ void Init_server(void) {
   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);
+  rb_define_method(cTypeTopNode, "add_reference_type", node_add_reference_type, 2);
   rb_define_method(cTypeTopNode, "folder", node_type_folder, 0);
 
   rb_define_method(cTypeSubNode, "add_object_type", node_add_object_type, 1);

data/opcua.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "opcua"
-  s.version          = "0.14"
+  s.version          = "0.19"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of opcua (open62541) ruby bindings. C performance, Ruby elegance, simplicity, and productivity."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opcua
 version: !ruby/object:Gem::Version
-  version: '0.14'
+  version: '0.19'
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -63,8 +63,8 @@ description: see https://github.com/etm/opcua-smart
 email: juergen.mangler@gmail.com
 executables: []
 extensions:
-- ext/opcua/server/extconf.rb
 - ext/opcua/client/extconf.rb
+- ext/opcua/server/extconf.rb
 extra_rdoc_files:
 - README.md
 files:
@@ -74,6 +74,7 @@ files:
 - cert/cert.h
 - cert/cert_key.h
 - example/bug5.rb
+- example/client_get_float.rb
 - example/client_get_sync.rb
 - example/client_get_value.rb
 - example/client_method.rb
@@ -81,8 +82,16 @@ files:
 - example/client_subscription.rb
 - example/kelch.KMT
 - example/server.rb
+- example/server_browse.rb
 - example/server_deep.rb
+- example/server_values.rb
+- example/server_xml.rb
+- example/test
+- example/test.mpf
 - example/test.rb
+- example/test1
+- example/tester.mpf
+- example/turm.rb
 - ext/opcua/client/client.c
 - ext/opcua/client/client.h
 - ext/opcua/client/extconf.rb
@@ -135,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Preliminary release of opcua (open62541) ruby bindings. C performance, Ruby