opcua 0.25 → 0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f86b954296eb2837114b76e0a32dc36cabfa922dfa30bdfc9b79e188fff0777e
-  data.tar.gz: c504ae5111b2422237dd7890f68739555338b46363b3158dc84b6e91f6052d2e
+  metadata.gz: e0bd449baa58c495096569ded2e6a50df7e0554ff273b0c853ae8302dc33e544
+  data.tar.gz: b6d8ee15542d9be07673ea0522c88f19e0309261ff454cf47f4f1d3b8b8fc927
 SHA512:
-  metadata.gz: a559fc42fa3809c643eb0d62ac5a345418118da336d38a6867fd3dbe7550eea5d33d32a1ded00cc2c08bee62fe17ccaca8ad1c500c800930f18bc208b0e94229
-  data.tar.gz: a23f8d80d7075ddbdca95f6f8fbd93e0f51e0a26136720a295073cf45e02cbf1adef2d205fcb131cd1de4ba02ea2db7446762c4c2ca1a66463354b87df7cfbdd
+  metadata.gz: 880f9af425e78f1dfd71e30383b4133201e1af01bd23de16c96a18e5ca0e75d0696b856d3453d8ea75fce4578f2574b823645b0ca39671c0fb626855e9dbc159
+  data.tar.gz: f695ee96bdfe1c19a632698b25171e08142b425cd1eeca2f10cb1f72fed7b58cc996bddedf4f833f072b2016696772b37c87a6def87f3ddef7549724321ab813

data/README.md

@@ -50,6 +50,8 @@ sudo make install
 gem install opcua
 ```
 
+If you get errors during compilation, please file an issue in github. Maybe the API open62541 API changed (constant improvements are happening).
+
 If the installation works correctly, but examples are still complaining about missing lib62541.so, try this:
 
 ```sh

data/example/client_subscription.rb

@@ -9,8 +9,14 @@ 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
+n2 = client.get 2, '/KalimatC34/Tools/Tool2/ToolNumber'  # get node from nodeid
+p node.unsubscribe
 node.on_change do |value,timestamp|
   p value
+  if value == 2
+    p 'unsub'
+    p node.unsubscribe
+  end
 end
 
 while true

data/ext/opcua/client/client.c

@@ -33,6 +33,7 @@ static node_struct * node_alloc(client_struct *client, UA_NodeId nodeid) { //{{{
   ns->id  = nodeid;
   ns->on_change  = Qnil;
   ns->waiting = 0;
+  ns->monId = 0;
 
   return ns;
 } //}}}
@@ -99,7 +100,6 @@ static VALUE node_on_change(VALUE self) { //{{{
   rb_gc_register_address(&ns->on_change);
 
   rb_ary_push(ns->master->subs,self);
-  ns->master->subs_changed = true;
 
   return self;
 } //}}}
@@ -184,7 +184,7 @@ static VALUE node_on_value_change(VALUE self) { // {{{
 /* -- */
 static void  client_free(client_struct *pss) { //{{{
   if (pss != NULL) {
-    if (!pss->firstrun) {
+    if (pss->subrun) {
       // do we need to delete the individual monResponse (#UA_MonitoredItemCreateResult_clear)?
       UA_Client_Subscriptions_deleteSingle(pss->master,pss->subscription_response.subscriptionId);
     }
@@ -201,11 +201,10 @@ static VALUE client_alloc(VALUE self) { //{{{
 
   pss->master = UA_Client_new();
   pss->config = UA_Client_getConfig(pss->master);
-  pss->firstrun = true;
+  pss->subrun = false;
   pss->started = true;
   pss->debug = true;
   pss->subs = rb_ary_new();
-  pss->subs_changed = false;
   pss->subscription_interval = 500;
   pss->default_ns = 2;
 
@@ -491,6 +490,20 @@ static VALUE node_to_s(VALUE self) { //{{{
   }
   return ret;
 } //}}}
+static VALUE unsubscribe(VALUE self) { //{{{
+  node_struct *ns;
+
+  Data_Get_Struct(self, node_struct, ns);
+
+  if (ns->master->subrun && ns->monId > 0) {
+    UA_Client_MonitoredItems_deleteSingle(ns->master->master, ns->master->subscription_response.subscriptionId, ns->monId);
+    ns->monId = 0;
+    rb_ary_delete(ns->master->subs, self);
+    return Qtrue;
+  } else {
+    return Qfalse;
+  }
+} //}}}
 
 static VALUE node_call(int argc, VALUE* argv, VALUE self) { //{{{
   node_struct *ns;
@@ -553,7 +566,7 @@ static VALUE node_call(int argc, VALUE* argv, VALUE self) { //{{{
   }
 } //}}}
 
-static void  client_run_handler(UA_Client *client, UA_UInt32 subId, void *subContext, UA_UInt32 monId, void *monContext, UA_DataValue *value) { //{{{
+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;
 
   if (NIL_P(val) || TYPE(val) != T_NIL) {
@@ -573,7 +586,7 @@ static void  client_run_handler(UA_Client *client, UA_UInt32 subId, void *subCon
     rb_proc_call(val,args);
   }
 } //}}}
-static void  client_run_iterate(VALUE key) { //{{{
+static void client_run_iterate(VALUE key) { //{{{
   node_struct *ns;
   Data_Get_Struct(key, node_struct, ns);
 
@@ -583,26 +596,28 @@ static void  client_run_iterate(VALUE key) { //{{{
   UA_Client_MonitoredItems_createDataChange(ns->master->master, ns->master->subscription_response.subscriptionId,
                                             UA_TIMESTAMPSTORETURN_BOTH,
                                             monRequest, (void *)ns->on_change, client_run_handler, NULL);
+  ns->monId = monResponse.monitoredItemId;
 
   if(monResponse.statusCode != UA_STATUSCODE_GOOD) {
     rb_raise(rb_eRuntimeError, "Monitoring item failed: %s\n", UA_StatusCode_name(monResponse.statusCode));
   }
+  UA_MonitoredItemCreateResult_clear(&monResponse);
+  UA_MonitoredItemCreateRequest_clear(&monRequest);
 } //}}}
 static VALUE client_run(VALUE self) { //{{{
   client_struct *pss;
   Data_Get_Struct(self, client_struct, pss);
   if (!pss->started) rb_raise(rb_eRuntimeError, "Client disconnected.");
 
-  if (pss->firstrun) {
-    pss->firstrun = false;
-    pss->subs_changed = false;
+  if (!pss->subrun) {
+    pss->subrun = true;
     pss->subscription_response = UA_Client_Subscriptions_create(pss->master, pss->subscription_request, NULL, NULL, NULL);
     if (pss->subscription_response.responseHeader.serviceResult != UA_STATUSCODE_GOOD)
       rb_raise(rb_eRuntimeError, "Subscription could not be created.");
-
-    for (int i = 0; i < RARRAY_LEN(pss->subs); i++) {
-      client_run_iterate(rb_ary_entry(pss->subs,i));
-    }
+  }
+  while (RARRAY_LEN(pss->subs)>0) {
+    VALUE aentry = rb_ary_pop(pss->subs);
+    client_run_iterate(aentry);
   }
   UA_Client_run_iterate(pss->master, 100);
 
@@ -613,7 +628,7 @@ static VALUE client_disconnect(VALUE self) { //{{{
   Data_Get_Struct(self, client_struct, pss);
   if (!pss->started) rb_raise(rb_eRuntimeError, "Client disconnected.");
 
-  if (!pss->firstrun) {
+  if (pss->subrun) {
     // do we need to delete the individual monResponse (#UA_MonitoredItemCreateResult_clear)?
     UA_Client_Subscriptions_deleteSingle(pss->master,pss->subscription_response.subscriptionId);
   }
@@ -648,6 +663,7 @@ void Init_client(void) {
 
   rb_define_method(cNode, "to_s", node_to_s, 0);
   rb_define_method(cNode, "id", node_id, 0);
+  rb_define_method(cNode, "unsubscribe", unsubscribe, 0);
 
   rb_define_method(cMethodNode, "call", node_call, -1);
 

data/ext/opcua/client/client.h

@@ -11,11 +11,10 @@ typedef struct client_struct {
   UA_CreateSubscriptionResponse subscription_response;
 
   UA_UInt32 subscription_interval;
-  bool firstrun;
+  bool subrun;
   bool started;
   bool debug;
   VALUE subs;
-  bool subs_changed;
   UA_UInt16 default_ns;
 } client_struct;
 
@@ -23,5 +22,6 @@ typedef struct node_struct {
   client_struct *master;
   VALUE on_change;
   UA_NodeId id;
+  UA_UInt32 monId;
   int waiting;
 } node_struct;

data/ext/opcua/helpers/finders.c

@@ -39,7 +39,6 @@ bool server_node_get_reference(UA_Server *server, UA_NodeId parent, UA_NodeId *r
 		// 			 qn.name.data
 		// );
 
-    UA_BrowseResult_deleteMembers(&bRes);
     UA_BrowseResult_clear(&bRes);
     return true;
   }
@@ -63,13 +62,11 @@ bool server_node_get_reference_by_name(UA_Server *server, UA_NodeId parent, UA_Q
     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;
 }
@@ -100,7 +97,6 @@ bool client_node_get_reference_by_name(UA_Client *client, UA_NodeId parent, UA_Q
     }
   }
 
-  UA_BrowseResponse_deleteMembers(&bResp);
   UA_BrowseResponse_clear(&bResp);
   return success;
 }
@@ -126,7 +122,6 @@ bool client_node_get_reference_by_type(UA_Client *client, UA_NodeId parent, UA_N
     }
   }
 
-  UA_BrowseResponse_deleteMembers(&bResp);
   UA_BrowseResponse_clear(&bResp);
   return success;
 }
@@ -164,7 +159,6 @@ bool client_node_list_references(UA_Client *client, UA_NodeId parent, bool inver
 
     }
   }
-  UA_BrowseResponse_deleteMembers(&bResp);
   UA_BrowseResponse_clear(&bResp);
   return false;
 }

data/ext/opcua/server/server.c

@@ -846,7 +846,7 @@ static VALUE node_value_set(VALUE self, VALUE value) { //{{{
     }
 
     UA_Server_writeValue(ns->master->master, ns->id, variant);
-    UA_Variant_deleteMembers(&variant);
+    UA_Variant_clear(&variant);
   }
   return self;
 } //}}}

data/opcua.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "opcua"
-  s.version          = "0.25"
+  s.version          = "0.26"
   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.25'
+  version: '0.26'
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite