cpee-handlerwrapper-opcua 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5e99c034c7a91e6794c5c262c41cf7936f650181799dce95e20fcbc97fedf2e
-  data.tar.gz: b624904fa7d53581424512348891c558bb0c2bcd485497f99734c8ffcbeb90d5
+  metadata.gz: 75f8d367a1dc766fb0d718129b3df522b488c23c0851b223cd82361fb09bceab
+  data.tar.gz: 127104e0d36ad736b127c06c3cc415496db6b1f07744ac758dfe4ed60f486c05
 SHA512:
-  metadata.gz: 21bdb6a8e9919b110965160535e112e2f75b69d8476912037de9408c6d2134561e7c3da0248531738a20f69566c8ca5ab05a1f0a98439c3d79f80de3c41381f6
-  data.tar.gz: bc830bf16c10b98e94abad66c9737ff3b67dfb76b886ae84fd4f7bc3569f10b9887eca0af15ddb8acec40358af1b734d70d590ad1d78865ed97ea1f82f3ba34e
+  metadata.gz: a6cfc998614c19c4480ac9cfd41bbec4d3b975038b0eb1d773f19715f781728c4ba36bc068b8061f0a94a3a354c3cc95609ea7bc5c8c25ca3e7847e880de89a5
+  data.tar.gz: f3524fe41cf3409b909f489d5525c49a583e87d8fe8b16e9caa3c1c2c075391a30f546a8926dabb81572e4c5283c25f60d872ddaa738101216db45dcacd103a7

data/cpee-handlerwrapper-opcua.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-handlerwrapper-opcua"
-  s.version          = "0.3"
+  s.version          = "0.4"
   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.5'
   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,17 +44,22 @@ 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
+    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
+    params
   end #}}}
 
   def activity_handle(passthrough, parameters) # {{{
@@ -157,9 +162,10 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
         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 }))) ], 'CPEE_SALVAGE' => true)
+          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)
@@ -170,7 +176,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
           elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
             # do nothing, later on things will happend
           else
-            callback result
+            callback result, headers
           end
         end
       end
@@ -186,6 +192,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?
@@ -291,15 +300,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.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-15 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.5
   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.5
 - !ruby/object:Gem::Dependency
   name: opcua
   requirement: !ruby/object:Gem::Requirement