opcua 0.11 → 0.12

data/ext/opcua/values.h

@@ -2,6 +2,96 @@
 VALUE mTYPES = Qnil;
 
 /* -- */
+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;
+
+  if (rb_obj_is_kind_of(RARRAY_AREF(value,0),rb_cTime)) {
+    UA_DateTime tmp[RARRAY_LEN(value)];
+    for (int i=0; i < RARRAY_LEN(value); i++) {
+      if (TYPE(RARRAY_AREF(value,i)) == T_FALSE) {
+        tmp[i] = UA_DateTime_fromUnixTime(rb_time_timeval(RARRAY_AREF(value,i)).tv_sec);
+      } else {
+        tmp[i] = UA_DateTime_fromUnixTime(0);
+      }
+    }
+    variant_set_one_dimension(variant,1);
+    UA_Variant_setArrayCopy(variant, tmp, RARRAY_LEN(value), &UA_TYPES[UA_TYPES_BOOLEAN]);
+    done = true;
+  } else {
+    switch (TYPE(RARRAY_AREF(value,0))) {
+      case T_TRUE:
+      case T_FALSE:
+        {
+          UA_Boolean tmp[RARRAY_LEN(value)];
+          for (int i=0; i < RARRAY_LEN(value); i++) {
+            if (TYPE(RARRAY_AREF(value,i)) == T_FALSE) {
+              tmp[i] = false;
+            } else {
+              tmp[i] = true;
+            }
+          }
+          variant_set_one_dimension(variant,1);
+          UA_Variant_setArrayCopy(variant, tmp, RARRAY_LEN(value), &UA_TYPES[UA_TYPES_BOOLEAN]);
+          done = true;
+          break;
+        }
+      case T_FLOAT:
+      case T_FIXNUM:
+        {
+          UA_Double tmp[RARRAY_LEN(value)];
+          for (int i=0; i < RARRAY_LEN(value); i++) {
+            if (TYPE(RARRAY_AREF(value,i)) == T_FLOAT || TYPE(RARRAY_AREF(value,i)) == T_FIXNUM) {
+              tmp[i] = NUM2DBL(RARRAY_AREF(value,i));
+            } else {
+              tmp[i] = 0.0;
+            }
+          }
+          variant_set_one_dimension(variant,1);
+          UA_Variant_setArrayCopy(variant, tmp, RARRAY_LEN(value), &UA_TYPES[UA_TYPES_DOUBLE]);
+          done = true;
+          break;
+        }
+      case T_STRING:
+      case T_SYMBOL:
+        {
+          UA_String tmp[RARRAY_LEN(value)];
+          for (int i=0; i < RARRAY_LEN(value); i++) {
+            if (TYPE(RARRAY_AREF(value,i)) == T_STRING || TYPE(RARRAY_AREF(value,i)) == T_SYMBOL) {
+              VALUE str = rb_obj_as_string(RARRAY_AREF(value,i));
+              tmp[i] = UA_STRING(StringValuePtr(str));
+            } else {
+              tmp[i] = UA_STRING("");
+            }
+          }
+          variant_set_one_dimension(variant,1);
+          UA_Variant_setArrayCopy(variant, tmp, RARRAY_LEN(value), &UA_TYPES[UA_TYPES_STRING]);
+          done = true;
+          break;
+        }
+        //////// TODO Currently only one-dimensional data structures are supported
+        // case T_ARRAY:
+        //   {
+        //     UA_Variant xxx;
+        //     for (int i=0; i < RARRAY_LEN(value); i++) {
+        //       for (int j=0; j < RARRAY_LEN(RARRAY_AREF(value,0)); j++) {
+        //         if (j < RARRAY_LEN(RARRAY_AREF(value,i)) {
+        //         } else {
+        //         }
+        //       }
+        //     }
+        //     UA_Variant_setArrayCopy(variant, tmp, RARRAY_LEN(value) * RARRAY_LEN(RARRAY_AREF(value,0)), &UA_TYPES[UA_TYPES_STRING]);
+        //     done = true;
+        //     break;
+        //   }
+    }
+  }
+  return done;
+}/*}}}*/
 static bool value_to_variant(VALUE value, UA_Variant *variant) { //{{{
   bool done = false;
   if (rb_obj_is_kind_of(value,rb_cTime)) {
@@ -36,8 +126,6 @@ static bool value_to_variant(VALUE value, UA_Variant *variant) { //{{{
       case T_SYMBOL:
         {
           VALUE str = rb_obj_as_string(value);
-          if (NIL_P(str) || TYPE(str) != T_STRING)
-            rb_raise(rb_eTypeError, "cannot convert obj to string");
           UA_String tmp = UA_STRING(StringValuePtr(str));
           UA_Variant_setScalarCopy(variant, &tmp, &UA_TYPES[UA_TYPES_STRING]);
           done = true;
@@ -45,11 +133,10 @@ static bool value_to_variant(VALUE value, UA_Variant *variant) { //{{{
         }
       case T_ARRAY:
         {
-          // UA_UInt32 arrayDims = 0;
-          // attr.valueRank = UA_VALUERANK_ONE_DIMENSION;
-          // attr.arrayDimensions = &arrayDims;
-          // attr.arrayDimensionsSize = 1;
-          // UA_Variant_setArray(&attr.value, UA_Array_new(10, &UA_TYPES[type]), 10, &UA_TYPES[type]);
+          if (value_to_array(value,variant)) {
+            done = true;
+          }
+          break;
         }
     }
   }
@@ -69,45 +156,123 @@ static void Init_types() {/*{{{*/
   rb_define_const(mTYPES, "STRING",              INT2NUM(UA_TYPES_STRING             ));
 }/*}}}*/
 
+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) {
+  return data ? Qtrue : Qfalse;
+}
+static VALUE UA_TYPES_DOUBLE_to_value(UA_Double data) {
+  return DBL2NUM(data);
+}
+static VALUE UA_TYPES_INT32_to_value(UA_Int32 data) {
+  return INT2NUM(data);
+}
+static VALUE UA_TYPES_INT16_to_value(UA_Int16 data) {
+  return INT2NUM(data);
+}
+static VALUE UA_TYPES_UINT32_to_value(UA_UInt32 data) {
+  return UINT2NUM(data);
+}
+static VALUE UA_TYPES_UINT16_to_value(UA_UInt16 data) {
+  return UINT2NUM(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 ret = rb_ary_new2(2);
   rb_ary_store(ret,0,Qnil);
   rb_ary_store(ret,1,Qnil);
-  // printf("type: %s\n",value.type->typeName);
-  if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_DATETIME])) {
-    UA_DateTime raw = *(UA_DateTime *) value.data;
-    rb_ary_store(ret,0,rb_time_new(UA_DateTime_toUnixTime(raw),0));
-    rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.DateTime")));
-  } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_BOOLEAN])) {
-    UA_Boolean raw = *(UA_Boolean *) value.data;
-    rb_ary_store(ret,0,raw ? Qtrue : Qfalse);
-    rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Boolean")));
-  } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_DOUBLE])) {
-    UA_Double raw = *(UA_Double *) value.data;
-    rb_ary_store(ret,0,DBL2NUM(raw));
-    rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Double")));
-  } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_INT32])) {
-    UA_Int32 raw = *(UA_Int32 *) value.data;
-    rb_ary_store(ret,0,INT2NUM(raw));
-    rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Int32")));
-  } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_INT16])) {
-    UA_Int16 raw = *(UA_Int16 *) value.data;
-    rb_ary_store(ret,0,INT2NUM(raw));
-    rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Int16")));
-  } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_UINT32])) {
-    UA_UInt32 raw = *(UA_UInt32 *) value.data;
-    rb_ary_store(ret,0,UINT2NUM(raw));
-    rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.UInt32")));
-  } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_UINT16])) {
-    UA_UInt16 raw = *(UA_UInt16 *) value.data;
-    rb_ary_store(ret,0,UINT2NUM(raw));
-    rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.UInt16")));
-  } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_STRING])) {
-    UA_String raw = *(UA_String *) value.data;
-    rb_ary_store(ret,0,rb_str_export_locale(rb_str_new((char *)(raw.data),raw.length)));
-    rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.String")));
+  //printf("type: %s\n",value.type->typeName);
+  //printf("dim: %ld\n",value.arrayDimensionsSize);
+  //printf("alen: %ld\n",value.arrayLength);
+  if (value.arrayDimensionsSize == 0 && value.arrayLength == 0) {
+    if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_DATETIME])) {
+      rb_ary_store(ret,0,UA_TYPES_DATETIME_to_value(*(UA_DateTime *)value.data));
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.DateTime")));
+    } 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_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")));
+    } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_INT32])) {
+      rb_ary_store(ret,0,UA_TYPES_INT32_to_value(*(UA_Int32 *)value.data));
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Int32")));
+    } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_INT16])) {
+      rb_ary_store(ret,0,UA_TYPES_INT16_to_value(*(UA_Int16 *)value.data));
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Int16")));
+    } else if (UA_Variant_hasScalarType(&value, &UA_TYPES[UA_TYPES_UINT32])) {
+      rb_ary_store(ret,0,UA_TYPES_UINT32_to_value(*(UA_UInt32 *)value.data));
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.UInt32")));
+    } 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_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 (value.arrayDimensionsSize == 1 || (value.arrayDimensionsSize == 0 && value.arrayLength > 0)) {
+    if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_DATETIME])) {
+      VALUE res = rb_ary_new();
+      rb_ary_store(ret,0,res);
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.DateTime")));
+      for (int i=0; i < value.arrayLength; i++) {
+        rb_ary_push(res,UA_TYPES_DATETIME_to_value(((UA_DateTime *)value.data)[i]));
+      }
+    } else if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_BOOLEAN])) {
+      VALUE res = rb_ary_new();
+      rb_ary_store(ret,0,res);
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Boolean")));
+      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_DOUBLE])) {
+      VALUE res = rb_ary_new();
+      rb_ary_store(ret,0,res);
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Double")));
+      for (int i=0; i < value.arrayLength; i++) {
+        rb_ary_push(res,UA_TYPES_DOUBLE_to_value(((UA_Double *)value.data)[i]));
+      }
+    } else if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_INT32])) {
+      VALUE res = rb_ary_new();
+      rb_ary_store(ret,0,res);
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Int32")));
+      for (int i=0; i < value.arrayLength; i++) {
+        rb_ary_push(res,UA_TYPES_INT32_to_value(((UA_Int32 *)value.data)[i]));
+      }
+    } else if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_INT16])) {
+      VALUE res = rb_ary_new();
+      rb_ary_store(ret,0,res);
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.Int16")));
+      for (int i=0; i < value.arrayLength; i++) {
+        rb_ary_push(res,UA_TYPES_INT16_to_value(((UA_Int16 *)value.data)[i]));
+      }
+    } else if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_UINT32])) {
+      VALUE res = rb_ary_new();
+      rb_ary_store(ret,0,res);
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.UInt32")));
+      for (int i=0; i < value.arrayLength; i++) {
+        rb_ary_push(res,UA_TYPES_UINT32_to_value(((UA_UInt32 *)value.data)[i]));
+      }
+    } else if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_UINT16])) {
+      VALUE res = rb_ary_new();
+      rb_ary_store(ret,0,res);
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.UInt16")));
+      for (int i=0; i < value.arrayLength; i++) {
+        rb_ary_push(res,UA_TYPES_UINT16_to_value(((UA_UInt16 *)value.data)[i]));
+      }
+    } else if (UA_Variant_hasArrayType(&value, &UA_TYPES[UA_TYPES_STRING])) {
+      VALUE res = rb_ary_new();
+      rb_ary_store(ret,0,res);
+      rb_ary_store(ret,1,ID2SYM(rb_intern("VariantType.String")));
+      for (int i=0; i < value.arrayLength; i++) {
+        rb_ary_push(res,UA_TYPES_STRING_to_value(((UA_String *)value.data)[i]));
+      }
+    }
   }
-
   return ret;
 } //}}}
 /* ++ */

data/lib/opcua/client.rb

@@ -8,6 +8,17 @@ require 'daemonite'
 module OPCUA
   class Client
     alias_method :initialize_base, :initialize
+    alias_method :get_base, :get
+
+    def get(*a)
+      if a.length == 1 && a[0].to_s =~ /ns=(\d+);i=(.*)/
+        get_base $1.to_i, $2.to_i
+      elsif a.length == 1 && a[0].to_s =~ /ns=(\d+);s=(.*)/
+        get_base $1.to_i, $2
+      else
+        get_base *a
+      end
+    end
 
     def initialize(url)
       if url =~ /(^[^:]+):\/\/([^:]+):([^@]+)@(.*)$/

data/lib/opcua/server.rb

@@ -4,3 +4,54 @@ else
   require_relative 'server.so'
 end
 require 'daemonite'
+
+module OPCUA
+  class Server
+    alias_method :get_base, :get
+
+    def get(*a)
+      if a.length == 1 && a[0].to_s =~ /ns=(\d+);i=(.*)/
+        get_base $1.to_i, $2.to_i
+      elsif a.length == 1 && a[0].to_s =~ /ns=(\d+);s=(.*)/
+        get_base $1.to_i, $2
+      else
+        get_base *a
+      end
+    end
+
+    class ObjectNode
+      alias_method :find_one, :find
+
+      def find(*what)
+        if what.length == 0
+          nil
+        elsif what.length == 1
+          find_one what[0]
+        else
+          what.map{|e| find_one e}
+        end
+      end
+    end
+
+    class TypeSubNode
+      def add_property(name)
+        add_variable name, OPCUA::PROPERTYTYPE
+      end
+      def add_property_rw
+        add_variable_rw name, OPCUA::PROPERTYTYPE
+      end
+      def add_properties(*item)
+        item.each { |e| add_property e }
+      end
+      def add_property_rw(*item)
+        item.each { |e| add_property_rw e }
+      end
+      def add_variables(*item)
+        item.each { |e| add_variable e }
+      end
+      def add_variables_rw(*item)
+        item.each { |e| add_variable_rw e }
+      end
+    end
+  end
+end

data/opcua.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "opcua"
-  s.version          = "0.11"
+  s.version          = "0.12"
   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.11'
+  version: '0.12'
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-06-03 00:00:00.000000000 Z
+date: 2019-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -73,7 +73,10 @@ files:
 - Rakefile
 - cert/cert.h
 - cert/cert_key.h
+- example/client_get_sync.rb
+- example/client_get_value.rb
 - example/client_method.rb
+- example/client_set_value.rb
 - example/client_subscription.rb
 - example/kelch.KMT
 - example/server.rb