cpee 2.1.29 → 2.1.50

data/lib/cpee/implementation_callbacks.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'json'
+require_relative 'fail'
 
 module CPEE
   module Callbacks
@@ -54,13 +55,13 @@ module CPEE
         opts = @a[1]
         callback = @r[-1]
 
-        if opts[:redis].sismember("instance:#{id}/callbacks",callback)
+        if CPEE::Persistence::is_member?(id,opts,'callbacks',callback)
           res = {}
-          res[:uuid] = opts[:redis].get("instance:#{id}/callback/#{callback}/uuid")
-          res[:type] = opts[:redis].get("instance:#{id}/callback/#{callback}/type")
-          res[:position] = opts[:redis].get("instance:#{id}/callback/#{callback}/position")
-          res[:label] = opts[:redis].get("instance:#{id}/callback/#{callback}/label")
-          if sub = opts[:redis].get("instance:#{id}/callback/#{callback}/subscription")
+          res[:uuid]     = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/uuid")
+          res[:type]     = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type")
+          res[:position] = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/position")
+          res[:label]    = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/label")
+          if sub = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/subscription")
             res[:subscription] = sub
           end
 
@@ -77,7 +78,7 @@ module CPEE
         opts = @a[1]
         callback = @r[-1]
 
-        if opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'callback'
+        if CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'callback'
           CPEE::Message::send(
             :'callback-end',
             callback,
@@ -88,7 +89,7 @@ module CPEE
             {},
             opts[:redis]
           )
-        elsif opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'vote'
+        elsif CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'vote'
           CPEE::Message::send(
             :'vote-response',
             callback,
@@ -112,7 +113,7 @@ module CPEE
         opts = @a[1]
         callback = @r[-1]
 
-        if opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'callback'
+        if CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'callback'
           ret = {}
           ret['values'] = @p.map{ |e|
             [e.name, e.class == Riddl::Parameter::Simple ? [:simple,e.value] : [:complex,e.mimetype,e.value.path] ]
@@ -129,7 +130,7 @@ module CPEE
             ret,
             opts[:redis]
           )
-        elsif opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'vote'
+        elsif CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'vote'
           if @p.length == 1 && @p[0].name == 'continue' && @p[0].class == Riddl::Parameter::Simple
             CPEE::Message::send(
               :'vote-response',

data/lib/cpee/implementation_notifications.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'json'
+require_relative 'fail'
 
 module CPEE
   module Notifications
@@ -188,7 +189,7 @@ module CPEE
         on.pmessage do |pat, what, message|
           if pat == 'forward:*'
             id, key = what.match(/forward:([^\/]+)\/(.+)/).captures
-            if sse = opts.dig(:sse_connections,id.to_i,key)
+            if sse = opts.dig(:sse_connections,id,key)
               sse.send message
             else
               DeleteSubscription::set(id,opts,key)
@@ -197,7 +198,7 @@ module CPEE
             mess = JSON.parse(message[message.index(' ')+1..-1])
             state = mess.dig('content','state')
             if state == 'finished' || state == 'abandoned'
-              opts.dig(:sse_connections,mess.dig('instance').to_i)&.each do |key,sse|
+              opts.dig(:sse_connections,mess.dig('instance').to_s)&.each do |key,sse|
                 EM.add_timer(10) do # just to be sure that all messages arrived. 10 seconds should be enough ... we think ... therefore we are (not sure)
                   sse.close
                 end
@@ -218,7 +219,7 @@ module CPEE
     class SSE < Riddl::SSEImplementation #{{{
       def onopen
         @opts = @a[1]
-        @id = @a[0]
+        @id = @a[0].to_s
         @key = @r[-2]
         if CPEE::Persistence::exists_handler?(@id,@opts,@key)
           @opts[:sse_connections][@id] ||= {}

data/lib/cpee/implementation_properties.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require_relative 'attributes_helper'
+require_relative 'fail'
 require_relative 'value_helper'
 require 'json'
 require 'erb'
@@ -226,7 +227,7 @@ module CPEE
     end #}}}
     class PutState < Riddl::Implementation #{{{
       def self::set(id,opts,state)
-        CPEE::Persistence::set_item(id,opts,'state',:state => state, :timestamp => Time.now.xmlschema(3))
+        CPEE::Persistence::set_item(id,opts,'state',:state => state, :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h)
       end
 
       def self::run(id,opts,state)
@@ -241,7 +242,6 @@ module CPEE
               PutState::set id, opts, 'stopped'
             end
           else
-            ### Most probably this is never needed. Lets see.
             PutState::set id, opts, state
         end
       end

data/lib/cpee/message.rb

@@ -15,28 +15,62 @@
 module CPEE
 
   module Message
+    WHO = 'cpee'
+    TYPE = 'instance'
 
-    def self::send(type, event, cpee, instance, instance_uuid, instance_name, content={}, backend)
+    def self::set_workers(workers)
+      @@tworkers = (workers < 1 && workers > 99 ? 1 : workers).freeze
+      @@last = -1
+    end
+
+    def self::target
+      @@last < @@tworkers-1 ? @@last += 1 : @@last = 0
+    end
+
+    def self::send(type, event, cpee, instance, instance_uuid, instance_name, content={}, backend=nil)
+      target = '%02i' % CPEE::Message::target
       topic = ::File::dirname(event)
       name = ::File::basename(event)
-      backend.publish(type.to_s + ':' + event,
+      payload = {
+        WHO => cpee,
+        TYPE + '-url' => File.join(cpee,instance.to_s),
+        TYPE => instance,
+        'topic' => topic,
+        'type' => type,
+        'name' => name,
+        'timestamp' =>  Time.now.xmlschema(3),
+        'content' => content
+      }
+      payload[TYPE + '-uuid'] = instance_uuid if instance_uuid
+      payload[TYPE + '-name'] = instance_name if instance_name
+
+      backend.publish(type.to_s + ':' + target + ':' + event.to_s,
         instance.to_s + ' ' +
-        JSON::generate(
-          { 'cpee' => cpee,
-            'instance-url' => File.join(cpee,instance.to_s),
-            'instance-uuid' => instance_uuid,
-            'instance-name' => instance_name,
-            'instance' => instance,
-            'topic' => topic,
-            'type' => type,
-            'name' => name,
-            'timestamp' =>  Time.now.xmlschema(3),
-            'content' => content
-          }
-        )
+        JSON::generate(payload)
       )
     end
 
+    def self::send_url(type, event, cpee, content={}, backend)
+      EM.defer do
+        topic = ::File::dirname(event)
+        name = ::File::basename(event)
+        payload = {
+          WHO => cpee,
+          'topic' => topic,
+          'type' => type,
+          'name' => name,
+          'timestamp' =>  Time.now.xmlschema(3),
+          'content' => content
+        }
+        client = Riddl::Client.new(backend)
+        client.post [
+          Riddl::Parameter::Simple::new('type',type),
+          Riddl::Parameter::Simple::new('topic',topic),
+          Riddl::Parameter::Simple::new('event',name),
+          Riddl::Parameter::Complex::new('notification','application/json',JSON::generate(payload))
+        ]
+      end
+    end
   end
 
 end

data/lib/cpee/persistence.rb

@@ -15,6 +15,11 @@
 module CPEE
 
   module Persistence
+    @@obj = 'instance'
+    def self::obj #{{{
+      @@obj
+    end #}}}
+
     def self::set_list(id,opts,item,values,deleted=[]) #{{{
       ah = AttributesHelper.new
       attributes = Persistence::extract_list(id,opts,'attributes').to_h
@@ -30,20 +35,20 @@ module CPEE
         {
           :changed => values.keys,
           :deleted => deleted,
-          :values => values,
+          :values => values.transform_values{|val| JSON::parse(val) rescue val },
           :attributes => ah.translate(attributes,dataelements,endpoints),
         },
         opts[:redis]
       )
     end #}}}
     def self::extract_set(id,opts,item) #{{{
-      opts[:redis].smembers("instance:#{id}/#{item}").map do |e|
-        [e,opts[:redis].get("instance:#{id}/#{item}/#{e}")]
+      opts[:redis].smembers(@@obj + ":#{id}/#{item}").map do |e|
+        [e,opts[:redis].get(@@obj + ":#{id}/#{item}/#{e}")]
       end
     end #}}}
     def self::extract_list(id,opts,item) #{{{
-      opts[:redis].zrange("instance:#{id}/#{item}",0,-1).map do |e|
-        [e,opts[:redis].get("instance:#{id}/#{item}/#{e}")]
+      opts[:redis].zrange(@@obj + ":#{id}/#{item}",0,-1).map do |e|
+        [e,opts[:redis].get(@@obj + ":#{id}/#{item}/#{e}")]
       end
     end #}}}
 
@@ -60,15 +65,32 @@ module CPEE
       )
     end #}}}
     def self::extract_item(id,opts,item) #{{{
-      opts[:redis].get("instance:#{id}/#{item}")
+      opts[:redis].get(@@obj + ":#{id}/#{item}")
     end #}}}
 
     def self::exists?(id,opts) #{{{
-      opts[:redis].exists?("instance:#{id}/state")
+      opts[:redis].exists?(@@obj + ":#{id}/state")
     end #}}}
+    def self::is_member?(id,opts,item,value) #{{{
+      opts[:redis].sismember(@@obj + ":#{id}/#{item}",value)
+    end  #}}}
+
+    def self::each_object(opts)
+      opts[:redis].zrevrange(@@obj + 's',0,-1).each do |instance|
+        yield instance
+      end
+    end
+
+    def self::new_object(opts)
+      opts[:redis].zrevrange(@@obj + 's', 0, 0).first.to_i + 1
+    end
+
+    def self::keys(id,opts,item=nil)
+      opts[:redis].keys(File.join(@@obj + ":#{id}",item.to_s,'*'))
+    end
 
     def self::set_handler(id,opts,key,url,values,update=false) #{{{
-      exis = opts[:redis].smembers("instance:#{id}/handlers/#{key}")
+      exis = opts[:redis].smembers(@@obj + ":#{id}/handlers/#{key}")
 
       if update == false && exis.length > 0
         return 405
@@ -101,14 +123,14 @@ module CPEE
       200
     end #}}}
     def self::extract_handler(id,opts,key) #{{{
-      opts[:redis].smembers("instance:#{id}/handlers/#{key}")
+      opts[:redis].smembers(@@obj + ":#{id}/handlers/#{key}")
     end #}}}
     def self::exists_handler?(id,opts,key) #{{{
-      opts[:redis].exists?("instance:#{id}/handlers/#{key}")
+      opts[:redis].exists?(@@obj + ":#{id}/handlers/#{key}")
     end #}}}
     def self::extract_handlers(id,opts) #{{{
-      opts[:redis].smembers("instance:#{id}/handlers").map do |e|
-        [e, opts[:redis].get("instance:#{id}/handlers/#{e}/url")]
+      opts[:redis].smembers(@@obj + ":#{id}/handlers").map do |e|
+        [e, opts[:redis].get(@@obj + ":#{id}/handlers/#{e}/url")]
       end
     end #}}}
   end

data/lib/cpee.xml

@@ -7,7 +7,7 @@
 
   CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License along with
   CPEE (file COPYING in the main directory).  If not, see

data/server/executionhandlers/ruby/backend/instance.template

@@ -11,7 +11,7 @@ class Instance < WEEL
 <% end -%>
 
 <% unless positions.nil? || positions.empty? -%>
-  search <% positions.each_with_index { |de,i| %><%= (i > 0 ? ', ' : '') %>Position.new(:<%= de[0] %>, :<%=de[1] %>, <%= de[2].nil? || de[2].strip.empty? ? 'nil' : '"' + de[2] + '"' %>)<% } %>
+  search <% positions.each_with_index { |de,i| %><%= (i > 0 ? ', ' : '') %>Position.new(:<%= de[0] %>, 0, :<%=de[1] %>, <%= de[2].nil? || de[2].strip.empty? ? 'nil' : '"' + de[2] + '"' %>)<% } %>
 <% end -%>
 
   <%= dsl.strip.gsub(/\n/,"\n  ") %>

data/server/executionhandlers/ruby/backend/run

@@ -6,17 +6,17 @@ opts[:pid] = Process.pid
 
 global_controller = File.join(opts[:global_executionhandlers],opts[:executionhandler],'controller.rb')
 controller        = File.join(opts[:executionhandlers],       opts[:executionhandler],'controller.rb')
-if File.exists? global_controller
+if File.exist? global_controller
   require global_controller
-elsif File.exists? controller
+elsif File.exist? controller
   require controller
 end
 
 global_connectionhandler = File.join(opts[:global_executionhandlers],opts[:executionhandler],'connection.rb')
 connectionhandler        = File.join(opts[:executionhandlers],       opts[:executionhandler],'connection.rb')
-if File.exists? global_connectionhandler
+if File.exist? global_connectionhandler
   require global_connectionhandler
-elsif File.exists? connectionhandler
+elsif File.exist? connectionhandler
   require connectionhandler
 end
 

data/server/executionhandlers/ruby/connection.rb

@@ -15,6 +15,7 @@
 require 'charlock_holmes'
 require 'mimemagic'
 require 'base64'
+require 'get_process_mem'
 
 class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::loop_guard(arguments,id,count) # {{{
@@ -31,14 +32,18 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
 		controller.notify("state/change", :state => newstate)
   end # }}}
   def self::inform_syntax_error(arguments,err,code)# {{{
+    # TODO extract spot (code) where error happened for better error handling (ruby 3.1 only)
+    # https://github.com/rails/rails/pull/45818/commits/3beb2aff3be712e44c34a588fbf35b79c0246ca5
     controller = arguments[0]
-    controller.notify("description/error", :message => err.message)
+    mess = err.backtrace ? err.backtrace[0].gsub(/([\w -_]+):(\d+):in.*/,'\\1, Line \2: ') : ''
+    mess += err.message
+    controller.notify("description/error", :message => mess)
   end# }}}
   def self::inform_connectionwrapper_error(arguments,err) # {{{
     controller = arguments[0]
     p err.message
     p err.backtrace
-    controller.notify("executionhandler/error", :message => err.message)
+    controller.notify("executionhandler/error", :message => err.backtrace[0].gsub(/([\w -_]+):(\d+):in.*/,'\\1, Line \2: ') + err.message)
   end # }}}
   def self::inform_position_change(arguments,ipc={}) # {{{
     controller = arguments[0]
@@ -59,10 +64,10 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end # }}}
 
   def prepare(readonly, endpoints, parameters, replay=false) #{{{
-    if replay && @controller.attributes[:replayer]
-      @handler_endpoint = @controller.attributes[:replayer]
-    else
-      @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
+    @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
+    if @controller.attributes['mock']
+      @handler_endpoint_orig = @handler_endpoint
+      @handler_endpoint = @controller.attributes['mock'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
     end
     params = parameters.dup
     params[:arguments] = params[:arguments].dup if params[:arguments]
@@ -77,7 +82,19 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end #}}}
 
   def additional #{{{
-    { :attributes => @controller.attributes }
+    {
+      :attributes => @controller.attributes,
+      :cpee => {
+        'base' => @controller.base_url,
+        'instance' => @controller.instance_id,
+        'instance_url' => @controller.instance_url,
+        'instance_uuid' => @controller.uuid
+      },
+      :task => {
+        'label' => @label,
+        'id' => @handler_position
+      }
+    }
   end #}}}
 
   def proto_curl(parameters) #{{{
@@ -114,31 +131,46 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       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'
+    status = result = headers = nil
+    begin
+      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)
 
-    @handler_passthrough = callback
-    @controller.callback(self,callback,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
+      @handler_passthrough = callback
+      @controller.callback(self,callback,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
+
+      status, result, headers = client.request type => params
+      if status == 561
+        @handler_endpoint = @handler_endpoint_orig
+        params.delete_if { |p| p.name == 'original_endpoint' }
+        params.each do |p|
+          if p.name == 'attributes'
+            t = JSON::parse(p.value) rescue {}
+            t['mock'] = @controller.attributes['mock']
+            p.value = t.to_json
+          end
+        end
+      end
+    end while status == 561
 
-    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", :'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
@@ -150,6 +182,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
@@ -182,8 +215,13 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     true
   end # }}}
 
+  def activity_uuid
+    @handler_activity_uuid
+  end
+
   def inform_activity_done # {{{
     @controller.notify("activity/done", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
+    @controller.notify("status/resource_utilization", :mib => GetProcessMem.new.mb, **Process.times.to_h)
   end # }}}
   def inform_activity_manipulate # {{{
     @controller.notify("activity/manipulating", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
@@ -220,6 +258,10 @@ 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'
           result = XML::Smart::string(result[0].value.read) rescue nil
         elsif result[0].mimetype == 'text/plain'
@@ -238,8 +280,15 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
           result = result[0]
         end
       end
+    else
+      Riddl::Parameter::Array[*result]
+    end
+    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
-    result
   end
 
   def detect_encoding(text)
@@ -271,13 +320,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
@@ -286,7 +335,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 = {
@@ -301,10 +349,17 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end
 
   def callback(result=nil,options={})
-    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :annotations => @anno)
+    recv = structurize_result(result)
+    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv, :annotations => @anno)
     @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
     if options['CPEE_UPDATE']
       if options['CPEE_UPDATE_STATUS']
         @controller.notify("activity/status", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'])
@@ -315,6 +370,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       @handler_passthrough = nil
       if options['CPEE_SALVAGE']
         @handler_continue.continue WEEL::Signal::Salvage
+      elsif options['CPEE_STOP']
+        @handler_continue.continue WEEL::Signal::Stop
       else
         @handler_continue.continue
       end
@@ -331,15 +388,17 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
   end #}}}
 
-  def test_condition(mr,code)
-    res = mr.instance_eval(code)
-    @controller.notify("condition/eval", :instance_uuid => @controller.uuid, :code => code, :condition => (res ? "true" : "false"))
+  def test_condition(mr,code,args)
+    res = mr.instance_eval(code,'Condition',1)
+    @controller.notify("gateway/decide", :instance_uuid => @controller.uuid, :code => code, :condition => (res ? "true" : "false"))
     res
   end
 
-  def simulate(type,nesting,tid,parent,parameters={}) #{{{
-    pp "#{type} - #{nesting} - #{tid} - #{parent} - #{parameters.inspect}"
+  def join_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]
+    @controller.notify("gateway/join", :instance_uuid => @controller.uuid, :branches => branches)
+  end
 
+  def simulate(type,nesting,tid,parent,parameters={}) #{{{
     @controller.vote("simulating/step",
       :'activity-uuid' => @handler_activity_uuid,
       :label => @label,