cpee 2.1.35 → 2.1.36

data/lib/cpee/message.rb

@@ -42,7 +42,6 @@ module CPEE
     def self::send_url(type, event, cpee, content={}, backend)
       topic = ::File::dirname(event)
       name = ::File::basename(event)
-      client = Riddl::Client.new(backend)
       payload = {
         WHO => cpee,
         'topic' => topic,

data/server/executionhandlers/ruby/connection.rb

@@ -85,6 +85,10 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         'instance' => @controller.instance_id,
         'instance_url' => @controller.instance_url,
         'instance_uuid' => @controller.uuid
+      },
+      :task => {
+        'label' => @label,
+        'id' => @handler_position
       }
     }
   end #}}}
@@ -138,16 +142,16 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       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", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']))
-      end
-      if headers['CPEE_EVENT']
-        @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint)
-      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?
+        if headers['CPEE_INSTANTIATION']
+          @controller.notify("task/instantiation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']))
+        end
+        if headers['CPEE_EVENT']
+          @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint)
+        end
         # do nothing, later on things will happend
       else
         callback result, headers
@@ -159,6 +163,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     raise "Wrong endpoint" if @handler_endpoint.nil? || @handler_endpoint.empty?
     @label = parameters[:label]
     @anno = parameters.delete(:annotations) rescue nil
+    @controller.notify("status/resource_utilization", :mib => GetProcessMem.new.mb, **Process.times.to_h)
     @controller.notify("activity/calling", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :annotations => @anno)
     if passthrough.to_s.empty?
       proto_curl parameters
@@ -230,6 +235,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       elsif result[0].is_a? Riddl::Parameter::Complex
         if result[0].mimetype == 'application/json'
           result = JSON::parse(result[0].value.read) rescue nil
+        elsif result[0].mimetype == 'text/csv'
+          result = result[0].value.read
         elsif result[0].mimetype == 'text/yaml'
           result = YAML::load(result[0].value.read) rescue nil
         elsif result[0].mimetype == 'application/xml' || result[0].mimetype == 'text/xml'
@@ -251,7 +258,12 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         end
       end
     end
-    result
+    if result.is_a? String
+      enc = detect_encoding(result)
+      enc == 'OTHER' ? result : (result.encode('UTF-8',enc) rescue convert_to_base64(result))
+    else
+      result
+    end
   end
 
   def detect_encoding(text)
@@ -283,13 +295,13 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         { 'name' => r.name, 'data' => r.value }
       elsif r.is_a? Riddl::Parameter::Complex
         res = if r.mimetype == 'application/json'
-          ttt = JSON::parse(r.value.read) rescue nil
-          if ttt.nil?
-            ''
-          else
-            enc = detect_encoding(ttt)
-            enc == 'OTHER' ? ttt : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
-          end
+          ttt = r.value.read
+          enc = detect_encoding(ttt)
+          enc == 'OTHER' ? ttt.inspect : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
+        elsif r.mimetype == 'text/csv'
+          ttt = r.value.read
+          enc = detect_encoding(ttt)
+          enc == 'OTHER' ? ttt.inspect : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
         elsif r.mimetype == 'text/plain' || r.mimetype == 'text/html'
           ttt = r.value.read
           ttt = ttt.to_f if ttt == ttt.to_f.to_s
@@ -298,7 +310,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
           enc == 'OTHER' ? ttt.inspect : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
         else
           convert_to_base64(r.value.read)
-          r.value.rewind
         end
 
         tmp = {
@@ -318,6 +329,9 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @guard_files += result
     @handler_returnValue = simplify_result(result)
     @handler_returnOptions = options
+    if options['CPEE_INSTANTIATION']
+      @controller.notify("task/instantiation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(options['CPEE_INSTANTIATION']))
+    end
     if options['CPEE_EVENT']
       @controller.notify("task/#{options['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
     end
@@ -354,8 +368,6 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end
 
   def simulate(type,nesting,tid,parent,parameters={}) #{{{
-    pp "#{type} - #{nesting} - #{tid} - #{parent} - #{parameters.inspect}"
-
     @controller.vote("simulating/step",
       :'activity-uuid' => @handler_activity_uuid,
       :label => @label,

data/server/resources/states.xml

@@ -14,6 +14,9 @@
     <running><!-- in this state you can set the following state -->
       <stopping/>
     </running>
+    <stopping><!-- in this state you can set the following state -->
+      <stopping/>
+    </stopping>
     <stopped><!-- in this state you can set the following four states -->
       <running/>
       <simulating/>

data/server/routing/end.pid

@@ -0,0 +1 @@
+931754

data/server/routing/forward-events.pid

@@ -0,0 +1 @@
+931760

data/server/routing/forward-votes.pid

@@ -0,0 +1 @@
+931764

data/server/routing/persist.pid

@@ -0,0 +1 @@
+931768

data/tools/cpee

@@ -162,7 +162,7 @@ elsif command == 'archive'
   if File.basename(p2) =~ /(\d+)-(\d+)/
     names = ($1.to_i..$2.to_i).to_a
   elsif File.basename(p2) == '*'
-    res = Typhoeus.get(File.join(base,'/'))
+    res = Typhoeus.get(File.join(base,'/'), headers: { 'see-instances' => 'true' })
     if res.success?
       XML::Smart.string(res.response_body) do |doc|
         doc.find('//instance/@id').each do |ele|
@@ -217,7 +217,7 @@ elsif command == 'abandon'
   if File.basename(p1) =~ /(\d+)-(\d+)/
     names = ($1.to_i..$2.to_i).to_a
   elsif File.basename(p1) == '*'
-    res = Typhoeus.get(File.join(base,'/'))
+    res = Typhoeus.get(File.join(base,'/'), headers: { 'see-instances' => 'true' })
     if res.success?
       XML::Smart.string(res.response_body) do |doc|
         doc.find('//instance/@id').each do |ele|
@@ -237,6 +237,8 @@ elsif command == 'abandon'
     if res1.success?
       if res1.response_body == 'running'
         Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=stopping")
+      elsif res1.response_body == 'stopping'
+        Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=stopping")
       elsif res1.response_body == 'ready' || res1.response_body == 'stopped'
         Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
       end
@@ -250,7 +252,7 @@ elsif command == 'start'
   if File.basename(p1) =~ /(\d+)-(\d+)/
     names = ($1.to_i..$2.to_i).to_a
   elsif File.basename(p1) == '*'
-    res = Typhoeus.get(File.join(base,'/'))
+    res = Typhoeus.get(File.join(base,'/'), headers: { 'see-instances' => 'true' })
     if res.success?
       XML::Smart.string(res.response_body) do |doc|
         doc.find('//instance/@id').each do |ele|
@@ -283,7 +285,7 @@ elsif command == 'delete!'
   if File.basename(p1) =~ /(\d+)-(\d+)/
     names = ($1.to_i..$2.to_i).to_a
   elsif File.basename(p1) == '*'
-    res = Typhoeus.get(File.join(base,'/'))
+    res = Typhoeus.get(File.join(base,'/'), headers: { 'see-instances' => 'true' })
     if res.success?
       XML::Smart.string(res.response_body) do |doc|
         doc.find('//instance/@id').each do |ele|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.35
+  version: 2.1.36
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2022-05-04 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -279,7 +279,9 @@ files:
 - cockpit/themes/compact/symbols/alternative.svg
 - cockpit/themes/compact/symbols/arrow.svg
 - cockpit/themes/compact/symbols/call.svg
+- cockpit/themes/compact/symbols/call_sensor.svg
 - cockpit/themes/compact/symbols/callmanipulate.svg
+- cockpit/themes/compact/symbols/callmanipulate_sensor.svg
 - cockpit/themes/compact/symbols/choose.svg
 - cockpit/themes/compact/symbols/choose_exclusive.svg
 - cockpit/themes/compact/symbols/choose_inclusive.svg
@@ -330,7 +332,9 @@ files:
 - cockpit/themes/control/symbols/alternative.svg
 - cockpit/themes/control/symbols/arrow.svg
 - cockpit/themes/control/symbols/call.svg
+- cockpit/themes/control/symbols/call_sensor.svg
 - cockpit/themes/control/symbols/callmanipulate.svg
+- cockpit/themes/control/symbols/callmanipulate_sensor.svg
 - cockpit/themes/control/symbols/choose.svg
 - cockpit/themes/control/symbols/choose_exclusive.svg
 - cockpit/themes/control/symbols/choose_inclusive.svg
@@ -381,7 +385,9 @@ files:
 - cockpit/themes/default/symbols/alternative.svg
 - cockpit/themes/default/symbols/arrow.svg
 - cockpit/themes/default/symbols/call.svg
+- cockpit/themes/default/symbols/call_sensor.svg
 - cockpit/themes/default/symbols/callmanipulate.svg
+- cockpit/themes/default/symbols/callmanipulate_sensor.svg
 - cockpit/themes/default/symbols/choose.svg
 - cockpit/themes/default/symbols/choose_exclusive.svg
 - cockpit/themes/default/symbols/choose_inclusive.svg
@@ -432,7 +438,9 @@ files:
 - cockpit/themes/extended/symbols/alternative.svg
 - cockpit/themes/extended/symbols/arrow.svg
 - cockpit/themes/extended/symbols/call.svg
+- cockpit/themes/extended/symbols/call_sensor.svg
 - cockpit/themes/extended/symbols/callmanipulate.svg
+- cockpit/themes/extended/symbols/callmanipulate_sensor.svg
 - cockpit/themes/extended/symbols/choose.svg
 - cockpit/themes/extended/symbols/choose_exclusive.svg
 - cockpit/themes/extended/symbols/choose_inclusive.svg
@@ -478,7 +486,9 @@ files:
 - cockpit/themes/model/symbols/alternative.svg
 - cockpit/themes/model/symbols/arrow.svg
 - cockpit/themes/model/symbols/call.svg
+- cockpit/themes/model/symbols/call_sensor.svg
 - cockpit/themes/model/symbols/callmanipulate.svg
+- cockpit/themes/model/symbols/callmanipulate_sensor.svg
 - cockpit/themes/model/symbols/choose.svg
 - cockpit/themes/model/symbols/choose_exclusive.svg
 - cockpit/themes/model/symbols/choose_inclusive.svg
@@ -529,7 +539,9 @@ files:
 - cockpit/themes/packed/symbols/alternative.svg
 - cockpit/themes/packed/symbols/arrow.svg
 - cockpit/themes/packed/symbols/call.svg
+- cockpit/themes/packed/symbols/call_sensor.svg
 - cockpit/themes/packed/symbols/callmanipulate.svg
+- cockpit/themes/packed/symbols/callmanipulate_sensor.svg
 - cockpit/themes/packed/symbols/choose.svg
 - cockpit/themes/packed/symbols/choose_exclusive.svg
 - cockpit/themes/packed/symbols/choose_inclusive.svg
@@ -580,7 +592,9 @@ files:
 - cockpit/themes/preset/symbols/alternative.svg
 - cockpit/themes/preset/symbols/arrow.svg
 - cockpit/themes/preset/symbols/call.svg
+- cockpit/themes/preset/symbols/call_sensor.svg
 - cockpit/themes/preset/symbols/callmanipulate.svg
+- cockpit/themes/preset/symbols/callmanipulate_sensor.svg
 - cockpit/themes/preset/symbols/choose.svg
 - cockpit/themes/preset/symbols/choose_exclusive.svg
 - cockpit/themes/preset/symbols/choose_inclusive.svg
@@ -678,9 +692,13 @@ files:
 - server/resources/states.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
+- server/routing/end.pid
 - server/routing/end.rb
+- server/routing/forward-events.pid
 - server/routing/forward-events.rb
+- server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
+- server/routing/persist.pid
 - server/routing/persist.rb
 - server/server.conf
 - server/server.rb