cpee-handlerwrapper-opcua 0.2 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5097543e5a1b74cc025835261dc297194cb4ac7446187ca44a8d694ac86ce032
-  data.tar.gz: 5aefcf1dc9ffe6d088993a7b64d6ce4a976a552870faad76b0cf9e7a7d37ace6
+  metadata.gz: c53decc037d22d3802022844c8483b9e680121f36e28ad05ce3e3250126de6ef
+  data.tar.gz: 999c8f9bd81fc344214559f82ab0e53b88212c4a49d37de1deb066ae0cf85905
 SHA512:
-  metadata.gz: 7932110d1fb1fde2e2f7fed5f5d958b7b6f9047942e3dd2ab6b01392b51fa292e1395e17ed73e444b32f18b90b280939943a94736781e241264f271e6d9cbc1a
-  data.tar.gz: 607f6b0b17991b6b0226c7b8b4ba1a188f0a95b458a64e2d8dbd271773fa9448ce6ae3030bf62c1e64a4e4d817d39ad510a06126c3e8d409638a9e9504727556
+  metadata.gz: 5f6f022ce8b077f2fa01ed2527f4a007847d97b63982b5334f9febd76f8829d4ff04ac250ac8bb320e786f7bac88ca9e1007c7872a183f45778dc046e000213b
+  data.tar.gz: a1560af1df4d1eb928717ba8b6c200c2929266df7af7ba31d0a3a9066c6ee67cd8c3ae1167eaa76a13b373621a8d4e2af18efe7250e66dd2d970bec78326b394

data/cpee-handlerwrapper-opcua.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-handlerwrapper-opcua"
-  s.version          = "0.2"
+  s.version          = "0.7"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "OPCUA for CPEE HandlerWrapper. Use opc.tcp-read|write|exececute:// links."
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'https://cpee.org//cpee-handlerwrapper-opcua'
 
-  s.add_runtime_dependency 'cpee', '~>1.5', '>= 1.5.3'
+  s.add_runtime_dependency 'cpee', '~>1.5', '>= 1.5.8'
   s.add_runtime_dependency 'opcua', '~>0', '>= 0.13'
   s.add_development_dependency 'rake', '~> 12'
   s.add_development_dependency 'rake-compiler', '~> 1.0'

data/lib/cpee-handlerwrapper-opcua.rb

@@ -44,127 +44,166 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @handler_position = position
     @handler_passthrough = nil
     @handler_returnValue = nil
+    @handler_returnOptions = nil
     @label = ''
   end # }}}
 
-  def prepare(readonly, endpoints, parameters)
-    @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
-    parameters[:arguments]&.each do |ele|
-      if ele.value.is_a?(Proc)
-        ele.value = readonly.instance_exec &ele.value
+  def prepare(readonly, endpoints, parameters, replay=false) #{{{
+    if replay
+      @handler_endpoint = @controller.attributes[:replayer]
+    else
+      @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
+    end
+    params = parameters.dup
+    params[:arguments] = params[:arguments].dup if params[:arguments]
+    params[:arguments]&.map! do |ele|
+      t = ele.dup
+      if t.value.is_a?(Proc)
+        t.value = readonly.instance_exec &t.value
       end
+      t
     end
-    parameters
-  end
+    params
+  end #}}}
 
-  def activity_handle(passthrough, parameters) # {{{
-    raise "Wrong endpoint" if @handler_endpoint.nil? || @handler_endpoint.empty?
-    @label = parameters[:label]
-    @sensors = parameters[:sensors]
-    @aggregators = parameters[:aggregators]
-    @costs = parameters[:costs]
-    @controller.notify("activity/calling", :instance => @controller.instance, :instance_uuid => @controller.uuid, :label => @label, :instance_name => @controller.info, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
-    if passthrough.to_s.empty?
-      if @handler_endpoint.start_with?('opc.tcp')
-        if @handler_endpoint =~ /^opc\.tcp-read:\/\/([^\/]+)\/(\d+)\/(.+)/
-          nid = $3 == $3.to_i.to_s ? $3.to_i : $3
-          ns  = $2
-          url = 'opc.tcp://' + $1
-          client = OPCUA::Client.new(url)
-          if (node = client.get ns.to_i, nid)
-            result = node.value
-          else
-            raise 'invalid nodeid'
-          end
-          client.disconnect
-          callback [Riddl::Parameter::Simple.new('value',result)], {}
-        elsif @handler_endpoint =~ /^opc\.tcp-write:\/\/([^\/]+)\/(\d+)\/([^\?]+)(\?value=(.*))?/
-          nid = $3 == $3.to_i.to_s ? $3.to_i : $3
-          ns  = $2
-          par = $5
-          url = 'opc.tcp://' + $1
-          client = OPCUA::Client.new(url)
-          if (node = client.get ns.to_i, nid)
-            (parameters[:arguments] || [→(:name => 'value', :value => par)] || []).each do |ele|
-              what = CPEE::ValueHelper::parse_extended(ele.value)
-              node.value = what
-              result = what
-            end
-          else
-            raise 'invalid nodeid'
-          end
-          client.disconnect
-          callback [Riddl::Parameter::Simple.new('value',result)], {}
-        elsif @handler_endpoint =~ /^opc\.tcp-execute:\/\/([^\/]+)\/(\d+)\/([^\?]+)(\?value=(.*))?/
-          nid = $3 == $3.to_i.to_s ? $3.to_i : $3
-          ns  = $2
-          par = $5
-          url = 'opc.tcp://' + $1
-          client = OPCUA::Client.new(url)
-          if (node = client.get ns.to_i, nid)
-            params = []
-            (parameters[:arguments] || []).each do |ele|
-              what = CPEE::ValueHelper::parse_extended(ele.value)
-              params << what
-            end
-            result = node.call *params
-          else
-            raise 'invalid nodeid'
-          end
-          client.disconnect
-          callback [Riddl::Parameter::Simple.new('value',result)], {}
-        end
+  def proto_curl(parameters) #{{{
+    params = []
+    callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
+    (parameters[:arguments] || []).each do |s|
+      if s.respond_to?(:mimetype)
+        params <<  Riddl::Parameter::Complex.new(s.name.to_s,v.mimetype,v.value)
       else
-        params = []
-        callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
-        (parameters[:arguments] || []).each do |s|
-          if s.respond_to?(:mimetype)
-            params <<  Riddl::Parameter::Complex.new(s.name.to_s,v.mimetype,v.value)
-          else
-            if s.name.to_s =~ /__$/
-              params <<  Riddl::Parameter::Simple.new(s.name.to_s.chop.chop,CPEE::ValueHelper::generate(s.value),:query)
-            else
-              params <<  Riddl::Parameter::Simple.new(s.name.to_s,CPEE::ValueHelper::generate(s.value))
-            end
-          end
+        if s.name.to_s =~ /^__Q_/
+          params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__Q_/,''),CPEE::ValueHelper::generate(s.value),:query)
+        elsif s.name.to_s =~ /^__B_/
+          params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__B_/,''),CPEE::ValueHelper::generate(s.value),:body)
+        elsif s.name.to_s =~ /^__H_/
+          params <<  Riddl::Header.new(s.name.to_s.sub(/^__H_/,''),CPEE::ValueHelper::generate(s.value))
+        elsif s.name.to_s =~ /^__C_/
+          params <<  Riddl::Parameter::Complex.new(s.name.to_s.sub(/^__C_/,''),*CPEE::ValueHelper::generate(s.value).split(';',2))
+        else
+          params <<  Riddl::Parameter::Simple.new(s.name.to_s,CPEE::ValueHelper::generate(s.value))
         end
+      end
+    end
 
-        params << Riddl::Header.new("CPEE-BASE",@controller.base_url)
-        params << Riddl::Header.new("CPEE-INSTANCE",@controller.instance)
-        params << Riddl::Header.new("CPEE-INSTANCE-URL",@controller.instance_url)
-        params << Riddl::Header.new("CPEE-INSTANCE-UUID",@controller.uuid)
-        params << Riddl::Header.new("CPEE-CALLBACK",@controller.instance_url + '/callbacks/' + callback)
-        params << Riddl::Header.new("CPEE-CALLBACK-ID",callback)
-        params << Riddl::Header.new("CPEE-ACTIVITY",@handler_position)
-        params << Riddl::Header.new("CPEE-LABEL",parameters[:label]||'')
-        @controller.attributes.each do |key,value|
-          params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
-        end
+    params << Riddl::Header.new("CPEE-BASE",@controller.base_url)
+    params << Riddl::Header.new("CPEE-INSTANCE",@controller.instance)
+    params << Riddl::Header.new("CPEE-INSTANCE-URL",@controller.instance_url)
+    params << Riddl::Header.new("CPEE-INSTANCE-UUID",@controller.uuid)
+    params << Riddl::Header.new("CPEE-CALLBACK",@controller.instance_url + '/callbacks/' + callback)
+    params << Riddl::Header.new("CPEE-CALLBACK-ID",callback)
+    params << Riddl::Header.new("CPEE-ACTIVITY",@handler_position)
+    params << Riddl::Header.new("CPEE-LABEL",@label||'')
+    params << Riddl::Header.new("CPEE-REPLAY",@controller.attributes['replayer_args'])
+    @controller.attributes.each do |key,value|
+      params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
+    end
+
+    tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
+    type = $2 || parameters[:method] || 'post'
 
-        tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
-        type = $2 || parameters[:method] || 'post'
+    client = Riddl::Client.new(tendpoint)
 
-        client = Riddl::Client.new(tendpoint)
+    @controller.callbacks[callback] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
+    @handler_passthrough = callback
 
-        @controller.callbacks[callback] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
-        @handler_passthrough = callback
+    status, result, headers = client.request type => params
+    if status < 200 || status >= 300
+      headers['CPEE_SALVAGE'] = true
+      c = result[0]&.value
+      c = c.read if c.respond_to? :read
+      callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => c }))) ], headers)
+    else
+      if headers['CPEE_INSTANTIATION']
+        @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+      end
+      if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
+        headers['CPEE_UPDATE'] = true
+        callback result, headers
+      elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
+        # do nothing, later on things will happend
+      else
+        callback result, headers
+      end
+    end
+  end #}}}
 
-        status, result, headers = client.request type => params
-        if status < 200 || status >= 300
-          callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => result[0].value.read }))) ], 'CPEE_SALVAGE' => true)
+  def proto_opcua(parameters)
+    if @handler_endpoint =~ /^opc\.tcp-read:\/\/([^\/]+)\/(\d+)\/(.+)/
+      nid = $3 == $3.to_i.to_s ? $3.to_i : $3
+      ns  = $2
+      url = 'opc.tcp://' + $1
+      begin
+        client = OPCUA::Client.new(url)
+        if (node = client.get ns.to_i, nid)
+          result = node.value
         else
-          if headers['CPEE_INSTANTIATION']
-            @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+          raise 'invalid nodeid'
+        end
+        client.disconnect
+        callback [Riddl::Parameter::Simple.new('value',result)], {}
+      rescue => e
+        callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => 0, 'error' => e.message }))) ], 'CPEE_SALVAGE' => true)
+      end
+    elsif @handler_endpoint =~ /^opc\.tcp-write:\/\/([^\/]+)\/(\d+)\/([^\?]+)(\?value=(.*))?/
+      nid = $3 == $3.to_i.to_s ? $3.to_i : $3
+      ns  = $2
+      par = $5
+      url = 'opc.tcp://' + $1
+      begin
+        client = OPCUA::Client.new(url)
+        if (node = client.get ns.to_i, nid)
+          (parameters[:arguments] || [→(:name => 'value', :value => par)] || []).each do |ele|
+            what = CPEE::ValueHelper::parse_extended(ele.value)
+            node.value = what
+            result = what
           end
-          if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
-            headers['CPEE_UPDATE'] = true
-            callback result, headers
-          elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
-            # do nothing, later on things will happend
-          else
-            callback result
+        else
+          raise 'invalid nodeid'
+        end
+        client.disconnect
+        callback [Riddl::Parameter::Simple.new('value',result)], {}
+      rescue => e
+        callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => 0, 'error' => e.message }))) ], 'CPEE_SALVAGE' => true)
+      end
+    elsif @handler_endpoint =~ /^opc\.tcp-execute:\/\/([^\/]+)\/(\d+)\/([^\?]+)(\?value=(.*))?/
+      nid = $3 == $3.to_i.to_s ? $3.to_i : $3
+      ns  = $2
+      par = $5
+      url = 'opc.tcp://' + $1
+      begin
+        client = OPCUA::Client.new(url)
+        if (node = client.get ns.to_i, nid)
+          params = []
+          (parameters[:arguments] || []).each do |ele|
+            what = CPEE::ValueHelper::parse_extended(ele.value)
+            params << what
           end
+          result = node.call *params
+        else
+          raise 'invalid nodeid'
         end
+        client.disconnect
+        callback [Riddl::Parameter::Simple.new('value',result)], {}
+      rescue => e
+        callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => 0, 'error' => e.message }))) ], 'CPEE_SALVAGE' => true)
+      end
+    end
+  end
+
+  def activity_handle(passthrough, parameters) # {{{
+    raise "Wrong endpoint" if @handler_endpoint.nil? || @handler_endpoint.empty?
+    @label = parameters[:label]
+    @sensors = parameters.dig(:stream,:sensors)
+    @aggregators = parameters.dig(:stream,:aggregators)
+    @costs = parameters.dig(:stream,:costs)
+    @controller.notify("activity/calling", :instance => @controller.instance, :instance_uuid => @controller.uuid, :label => @label, :instance_name => @controller.info, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+    if passthrough.to_s.empty?
+      if @handler_endpoint.start_with?('opc.tcp')
+        proto_opcua parameters
+      else
+        proto_curl parameters
       end
     else
       @controller.callbacks[passthrough] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
@@ -178,6 +217,9 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   def activity_result_value # {{{
     @handler_returnValue
   end # }}}
+  def activity_result_options # {{{
+    @handler_returnOptions
+  end # }}}
 
   def activity_stop # {{{
     unless @handler_passthrough.nil?
@@ -283,15 +325,15 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   def callback(result=nil,options={})
     @controller.notify("activity/receiving", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated, :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
     result = simplify_result(result)
+    @handler_returnValue = result
+    @handler_returnOptions = options
     if options['CPEE_UPDATE']
-      @handler_returnValue = result
       if options['CPEE_UPDATE_STATUS']
         @controller.notify("activity/status", :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'], :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
       end
       @handler_continue.continue WEEL::Signal::Again
     else
       @controller.callbacks.delete(@handler_passthrough)
-      @handler_returnValue = result
       @handler_passthrough = nil
       if options['CPEE_SALVAGE']
         @handler_continue.continue WEEL::Signal::Salvage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-handlerwrapper-opcua
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.7'
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cpee
@@ -19,7 +19,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.8
 - !ruby/object:Gem::Dependency
   name: opcua
   requirement: !ruby/object:Gem::Requirement