opcua_client 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fd39e3b07294cf1cf3f7e037c6bb31e202f8d4279e7ff59c06ec1f709641654
-  data.tar.gz: a2385d369880786ae3e970625c2a9419ab6c97bf63f861e496b90161aa280cf1
+  metadata.gz: 93f9f3a4464f5273ae87fb6e0d3c75ec902db88a659e48d40dd6da7bd75b0168
+  data.tar.gz: bff1a7a86aca728eb200099d62d594b79cc7ae4800c4337ab0b8370e50c6d435
 SHA512:
-  metadata.gz: 5652899ac7728aa8b2efc6ed0fcd9b9021f9d864cb68f98aafe7665026215b740afda38557e05f1c714dd77199ff8c38f984ad0605adc21371e9f3d727408b5f
-  data.tar.gz: e6a3bef6175e9ebef8b4422e2f97f48a856d873349520470f700cb05200419a22ca95e98e1d0c6aa2cfa73465ddd96e149c5c86cdbe004fa453cc37654d0c9c5
+  metadata.gz: 83ed7b449e8e3203750d48a8e1352035931f35515d91d85c2be52ebc38b5293a04444c449d25ec850026c8edfd3184ef1f83cd2a8ab632b8718f85f5ba62815f
+  data.tar.gz: 2fa13a2d7d99b6534a6db547b8a0419a1bd1b5488b881d80d1b2d3d9537628c5c97257aa56420cc0d739cbe47d16e74b0bd52d01f05d91562f4e735357439267

data/ext/opcua_client/opcua_client.c

@@ -247,6 +247,66 @@ static VALUE rb_disconnect(VALUE self) {
     return RB_UINT2NUM(status);
 }
 
+static UA_StatusCode multiRead(UA_Client *client, const UA_NodeId *nodeId, UA_Variant *out, const long varsCount) {
+        
+    UA_UInt16 rvSize = UA_TYPES[UA_TYPES_READVALUEID].memSize;
+    UA_ReadValueId *rValues = UA_calloc(varsCount, rvSize);
+    
+    for (int i=0; i<varsCount; i++) {
+        UA_ReadValueId *readItem = &rValues[i];
+        readItem->nodeId = nodeId[i];
+        readItem->attributeId = UA_ATTRIBUTEID_VALUE;
+    }
+    
+    UA_ReadRequest request;
+    UA_ReadRequest_init(&request);
+    request.nodesToRead = rValues;
+    request.nodesToReadSize = varsCount;
+    
+    UA_ReadResponse response = UA_Client_Service_read(client, request);
+    UA_StatusCode retval = response.responseHeader.serviceResult;
+    if(retval == UA_STATUSCODE_GOOD) {
+        if(response.resultsSize == varsCount)
+            retval = response.results[0].status;
+        else
+            retval = UA_STATUSCODE_BADUNEXPECTEDERROR;
+    }
+    
+    if(retval != UA_STATUSCODE_GOOD) {
+        UA_ReadResponse_deleteMembers(&response);
+        UA_free(rValues);
+        return retval;
+    }
+    
+    /* Set the StatusCode */
+    UA_DataValue *results = response.results;
+    
+    if (response.resultsSize != varsCount) {
+        retval = UA_STATUSCODE_BADUNEXPECTEDERROR;
+        UA_ReadResponse_deleteMembers(&response);
+        UA_free(rValues);
+        return retval;
+    }
+    
+    for (int i=0; i<varsCount; i++) {
+        if ((results[i].hasStatus && results[i].status != UA_STATUSCODE_GOOD) || !results[i].hasValue) {
+            retval = UA_STATUSCODE_BADUNEXPECTEDERROR;
+            UA_ReadResponse_deleteMembers(&response);
+            UA_free(rValues);
+            return retval;
+        }
+    }
+    
+    for (int i=0; i<varsCount; i++) {
+        out[i] = results[i].value;
+        UA_Variant_init(&results[i].value);
+    }
+    
+    UA_ReadResponse_deleteMembers(&response);
+    UA_free(rValues);
+    return retval;
+}
+
 static UA_StatusCode multiWrite(UA_Client *client, const UA_NodeId *nodeId, const UA_Variant *in, const long varsSize) {
     UA_AttributeId attributeId = UA_ATTRIBUTEID_VALUE;
     
@@ -299,6 +359,96 @@ static UA_StatusCode multiWrite(UA_Client *client, const UA_NodeId *nodeId, cons
     return retval;
 }
 
+static VALUE rb_readUaValues(VALUE self, VALUE v_nsIndex, VALUE v_aryNames) {
+    if (RB_TYPE_P(v_nsIndex, T_FIXNUM) != 1) {
+        return raise_invalid_arguments_error();
+    }
+    
+    Check_Type(v_aryNames, T_ARRAY);
+    const long namesCount = RARRAY_LEN(v_aryNames);
+    
+    int nsIndex = FIX2INT(v_nsIndex);
+    
+    struct UninitializedClient * uclient;
+    TypedData_Get_Struct(self, struct UninitializedClient, &UA_Client_Type, uclient);
+    UA_Client *client = uclient->client;
+    
+    UA_UInt16 nidSize = UA_TYPES[UA_TYPES_NODEID].memSize;
+    UA_UInt16 variantSize = UA_TYPES[UA_TYPES_VARIANT].memSize;
+    
+    UA_NodeId *nodes = UA_calloc(namesCount, nidSize);
+    UA_Variant *readValues = UA_calloc(namesCount, variantSize);
+    
+    for (int i=0; i<namesCount; i++) {
+        VALUE v_name = rb_ary_entry(v_aryNames, i);
+        
+        if (RB_TYPE_P(v_name, T_STRING) != 1) {
+            return raise_invalid_arguments_error();
+        }
+        
+        char *name = StringValueCStr(v_name);
+        nodes[i] = UA_NODEID_STRING(nsIndex, name);
+    }
+    
+    UA_StatusCode status = multiRead(client, nodes, readValues, namesCount);
+    
+    VALUE resultArray = Qnil;
+    
+    if (status == UA_STATUSCODE_GOOD) {
+        // printf("%s\n", "value read successful");
+        
+        resultArray = rb_ary_new2(namesCount);
+        
+        for (int i=0; i<namesCount; i++) {
+            // printf("the value is: %i\n", val);
+            
+            VALUE rubyVal = Qnil;
+            
+            if (UA_Variant_hasScalarType(&readValues[i], &UA_TYPES[UA_TYPES_INT16])) {
+                UA_Int16 val = *(UA_Int16*)readValues[i].data;
+                rubyVal = INT2FIX(val);
+            } else if (UA_Variant_hasScalarType(&readValues[i], &UA_TYPES[UA_TYPES_UINT16])) {
+                UA_UInt16 val = *(UA_UInt16*)readValues[i].data;
+                rubyVal = INT2FIX(val);
+            } else if (UA_Variant_hasScalarType(&readValues[i], &UA_TYPES[UA_TYPES_INT32])) {
+                 UA_Int32 val = *(UA_Int32*)readValues[i].data;
+                 rubyVal = INT2FIX(val);
+            } else if (UA_Variant_hasScalarType(&readValues[i], &UA_TYPES[UA_TYPES_UINT32])) {
+                 UA_UInt32 val = *(UA_UInt32*)readValues[i].data;
+                 rubyVal = INT2FIX(val);
+            } else if (UA_Variant_hasScalarType(&readValues[i], &UA_TYPES[UA_TYPES_BOOLEAN])) {
+                 UA_Boolean val = *(UA_Boolean*)readValues[i].data;
+                 rubyVal = val ? Qtrue : Qfalse;
+            } else if (UA_Variant_hasScalarType(&readValues[i], &UA_TYPES[UA_TYPES_FLOAT])) {
+                 UA_Float val = *(UA_Float*)readValues[i].data;
+                 rubyVal = DBL2NUM(val);
+            } else {
+                rubyVal = Qnil; // unsupported
+            }
+            
+            rb_ary_push(resultArray, rubyVal);
+        }
+    } else {
+        /* Clean up */
+        for (int i=0; i<namesCount; i++) {
+            UA_Variant_deleteMembers(&readValues[i]);
+        }
+        UA_free(nodes);
+        UA_free(readValues);
+        
+        return raise_ua_status_error(status);
+    }
+    
+    /* Clean up */
+    for (int i=0; i<namesCount; i++) {
+        UA_Variant_deleteMembers(&readValues[i]);
+    }
+    UA_free(nodes);
+    UA_free(readValues);
+    
+    return resultArray;
+}
+
 static VALUE rb_writeUaValues(VALUE self, VALUE v_nsIndex, VALUE v_aryNames, VALUE v_aryNewValues, int uaType) {
     if (RB_TYPE_P(v_nsIndex, T_FIXNUM) != 1) {
         return raise_invalid_arguments_error();
@@ -695,6 +845,8 @@ void Init_opcua_client()
     rb_define_method(cClient, "multi_write_boolean", rb_writeBooleanValues, 3);
     rb_define_method(cClient, "multi_write_bool", rb_writeBooleanValues, 3);
     
+    rb_define_method(cClient, "multi_read", rb_readUaValues, 2);
+    
     rb_define_method(cClient, "create_subscription", rb_createSubscription, 0);
     rb_define_method(cClient, "add_monitored_item", rb_addMonitoredItem, 3);
 

data/lib/opcua_client/version.rb

@@ -1,3 +1,3 @@
 module OPCUAClient
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opcua_client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ritvars Rundzans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: