cpee 2.1.25 → 2.1.30

data/lib/cpee/fail.rb

@@ -0,0 +1,23 @@
+
+# This file is part of CPEE.
+#
+# CPEE is free software: you can redistribute it and/or modify it under the terms
+# of the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License along with
+# CPEE (file COPYING in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
+module CPEE
+  class FAIL < Riddl::Implementation #{{{
+    def response
+      @status = 404
+      nil
+    end
+  end #}}}
+end

data/lib/cpee/implementation.rb

@@ -16,6 +16,7 @@ require 'fileutils'
 require 'redis'
 require 'riddl/server'
 require 'riddl/client'
+require_relative 'fail'
 require_relative 'redis'
 require_relative 'message'
 require_relative 'persistence'
@@ -83,7 +84,7 @@ module CPEE
     opts[:sse_connections]            = {}
 
     opts[:statemachine]               = CPEE::StateMachine.new opts[:states], %w{running simulating replaying finishing stopping abandoned finished} do |id|
-      opts[:redis].get("instance:#{id}/state")
+      CPEE::Persistence::extract_item(id,opts,"state")
     end
 
     opts[:runtime_cmds]               << [
@@ -176,16 +177,14 @@ module CPEE
 
   class Instances < Riddl::Implementation #{{{
     def response
-      redis = @a[0][:redis]
+      opts = @a[0]
       Riddl::Parameter::Complex.new("wis","text/xml") do
         ins = XML::Smart::string('<instances/>')
-        redis.zrevrange('instances',0,-1).each do |instance|
-          statekey = "instance:#{instance}/state"
-          attributes = "instance:#{instance}/attributes/"
-          info = redis.get(attributes + 'info')
-          uuid = redis.get(attributes + 'uuid')
-          state = redis.get(statekey)
-          state_changed = redis.get(File.join(statekey,'@changed'))
+        CPEE::Persistence::each_object(opts) do |instance|
+          info = CPEE::Persistence::extract_item(instance,opts,'attributes/info')
+          uuid = CPEE::Persistence::extract_item(instance,opts,'attributes/uuid')
+          state = CPEE::Persistence::extract_item(instance,opts,'state')
+          state_changed = CPEE::Persistence::extract_item(instance,opts,'state/@changed')
           ins.root.add('instance', info,  'uuid' => uuid, 'id' => instance, 'state' => state, 'state_changed' => state_changed )
         end
         ins.to_s
@@ -209,9 +208,9 @@ module CPEE
       doc = XML::Smart::open_unprotected(opts[:properties_init])
       doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
       name     = @p[0].value
-      id       = redis.zrevrange('instances', 0, 0).first.to_i + 1
+      id       = CPEE::Persistence::new_object(opts)
       uuid     = SecureRandom.uuid
-      instance = 'instance:' + id.to_s
+      instance = CPEE::Persistence::OBJ + ':' + id.to_s
       redis.multi do |multi|
         multi.zadd('instances',id,id)
         doc.root.find(PROPERTIES_PATHS_FULL.join(' | ')).each do |e|
@@ -235,12 +234,12 @@ module CPEE
             doc.register_namespace 'np', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
             key = File.basename(File.dirname(f))
             url = doc.find('string(/np:subscription/@url)')
-            multi.sadd("instance:#{id}/handlers",key)
-            multi.set("instance:#{id}/handlers/#{key}/url",url)
+            multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers",key)
+            multi.set(CPEE::Persistence::OBJ + ":#{id}/handlers/#{key}/url",url)
             doc.find('/np:subscription/np:topic/*').each do |e|
               c = File.join(e.parent.attributes['id'],e.qname.name,e.text)
-              multi.sadd("instance:#{id}/handlers/#{key}",c)
-              multi.sadd("instance:#{id}/handlers/#{c}",key)
+              multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers/#{key}",c)
+              multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers/#{c}",key)
             end
           end rescue nil # all the ones that are not ok, are ignored
         end
@@ -251,6 +250,12 @@ module CPEE
         multi.set(File.join(instance, 'state', '@changed'), Time.now.xmlschema(3))
       end
 
+      content = {
+        :state => 'ready',
+        :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h
+      }
+      CPEE::Message::send(:event,'state/change',File.join(opts[:url],'/'),id,uuid,name,content,redis)
+
       @headers << Riddl::Header.new("CPEE-INSTANCE", id.to_s)
       @headers << Riddl::Header.new("CPEE-INSTANCE-URL", File.join(opts[:url].to_s,id.to_s,'/'))
       @headers << Riddl::Header.new("CPEE-INSTANCE-UUID", uuid)
@@ -263,7 +268,7 @@ module CPEE
     def response
       opts = @a[0]
       id = @r[0].to_i
-      unless opts[:redis].exists?("instance:#{id}/state")
+      unless CPEE::Persistence::exists?(id,opts)
         @status = 404
         return
       end
@@ -285,11 +290,22 @@ module CPEE
       opts = @a[0]
       redis = opts[:redis]
       id = @r[0].to_i
-      unless redis.exists?("instance:#{id}/state")
+      unless CPEE::Persistence::exists?(id,opts)
         @status = 404
         return
       end
-      empt = redis.keys("instance:#{id}/*").to_a
+
+      content = {
+        :state => 'purged',
+        :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h
+      }
+      state = CPEE::Persistence::extract_item(id,opts,'state')
+      if state == 'stopped' || state == 'ready'
+        CPEE::Message::send(:event,'state/change',File.join(opts[:url],'/'),id,content[:attributes]['uuid'],content[:attributes]['info'],content,redis)
+      end
+
+      empt = CPEE::Persistence::keys(id,opts).to_a
+      empt.delete_if{|e| e =~ /\/handlers/ }
       redis.multi do |multi|
         multi.del empt
         multi.zrem 'instances', id

data/lib/cpee/implementation_callbacks.rb

@@ -13,17 +13,22 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'json'
+require_relative 'fail'
 
 module CPEE
   module Callbacks
 
     def self::implementation(id,opts)
       Proc.new do
-        run CPEE::Callbacks::Callbacks, id, opts if get
-        on resource do
-          run CPEE::Callbacks::GetCallback, id, opts if get
-          run CPEE::Callbacks::DelCallback, id, opts if delete
-          run CPEE::Callbacks::ExCallback, id, opts if put
+        if CPEE::Persistence::exists?(id,opts)
+          run CPEE::Callbacks::Callbacks, id, opts if get
+          on resource do
+            run CPEE::Callbacks::GetCallback, id, opts if get
+            run CPEE::Callbacks::DelCallback, id, opts if delete
+            run CPEE::Callbacks::ExCallback, id, opts if put
+          end
+        else
+          run CPEE::FAIL
         end
       end
     end
@@ -50,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
 
@@ -73,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,
@@ -84,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,
@@ -108,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] ]
@@ -125,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,29 +13,34 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'json'
+require_relative 'fail'
 
 module CPEE
   module Notifications
 
     def self::implementation(id,opts)
       Proc.new do
-        on resource "notifications" do
-          run CPEE::Notifications::Overview if get
-          on resource "topics" do
-            run CPEE::Notifications::Topics, opts if get
-          end
-          on resource "subscriptions" do
-            run CPEE::Notifications::Subscriptions, id, opts if get
-            run CPEE::Notifications::CreateSubscription, id, opts if post 'create_subscription'
-            on resource do
-              run CPEE::Notifications::Subscription, id, opts if get
-              run CPEE::Notifications::UpdateSubscription, id, opts if put 'change_subscription'
-              run CPEE::Notifications::DeleteSubscription, id, opts if delete
-              on resource 'sse' do
-                run CPEE::Notifications::SSE, id, opts if sse
+        if CPEE::Persistence::exists?(id,opts)
+          on resource "notifications" do
+            run CPEE::Notifications::Overview if get
+            on resource "topics" do
+              run CPEE::Notifications::Topics, opts if get
+            end
+            on resource "subscriptions" do
+              run CPEE::Notifications::Subscriptions, id, opts if get
+              run CPEE::Notifications::CreateSubscription, id, opts if post 'create_subscription'
+              on resource do
+                run CPEE::Notifications::Subscription, id, opts if get
+                run CPEE::Notifications::UpdateSubscription, id, opts if put 'change_subscription'
+                run CPEE::Notifications::DeleteSubscription, id, opts if delete
+                on resource 'sse' do
+                  run CPEE::Notifications::SSE, id, opts if sse
+                end
               end
             end
           end
+        else
+          run CPEE::FAIL
         end
       end
     end
@@ -184,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)
@@ -193,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
@@ -214,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'
@@ -25,71 +26,75 @@ module CPEE
 
     def self::implementation(id,opts)
       Proc.new do
-        run CPEE::Properties::Get, id, opts if get
-        run CPEE::Properties::Patch, id, opts if patch 'set-some-properties'
-        run CPEE::Properties::Put, id, opts if put 'set-some-properties'
-        on resource 'state' do
-          run CPEE::Properties::GetStateMachine, id, opts if get 'machine'
-          run CPEE::Properties::GetState, id, opts if get
-          run CPEE::Properties::PutState, id, opts if put 'state'
-          on resource '@changed' do
-            run CPEE::Properties::GetStateChanged, id, opts if get
-          end
-        end
-        on resource 'status' do
-          run CPEE::Properties::GetStatus, id, opts if get
-          run CPEE::Properties::PutStatus, id, opts if put 'status'
-          on resource 'id' do
-            run CPEE::Properties::GetStatusID, id, opts if get
-          end
-          on resource 'message' do
-            run CPEE::Properties::GetStatusMessage, id, opts if get
-          end
-        end
-        on resource 'executionhandler' do
-          run CPEE::Properties::GetExecutionHandler, id, opts if get
-          run CPEE::Properties::PutExecutionHandler, id, opts if put 'executionhandler'
-        end
-        on resource 'positions' do
-          run CPEE::Properties::GetPositions, id, opts if get
-          run CPEE::Properties::PatchPositions, id, opts if patch 'positions'
-          run CPEE::Properties::PutPositions, id, opts if put 'positions'
-          run CPEE::Properties::PostPositions, id, opts if post 'position'
-          on resource do
-            run CPEE::Properties::GetDetail, 'positions', id, opts if get
-            run CPEE::Properties::SetDetail, id, opts if put 'detail'
-            run CPEE::Properties::DelDetail, id, opts if delete
-            on resource '@passthrough' do
-              run CPEE::Properties::GetPt, id, opts if get
+        if CPEE::Persistence::exists?(id,opts)
+          run CPEE::Properties::Get, id, opts if get
+          run CPEE::Properties::Patch, id, opts if patch 'set-some-properties'
+          run CPEE::Properties::Put, id, opts if put 'set-some-properties'
+          on resource 'state' do
+            run CPEE::Properties::GetStateMachine, id, opts if get 'machine'
+            run CPEE::Properties::GetState, id, opts if get
+            run CPEE::Properties::PutState, id, opts if put 'state'
+            on resource '@changed' do
+              run CPEE::Properties::GetStateChanged, id, opts if get
             end
           end
-        end
-        %w{dataelements endpoints attributes}.each do |ele|
-          on resource ele do
-            run CPEE::Properties::GetItems, ele, id, opts if get
-            run CPEE::Properties::PatchItems, ele, id, opts if patch ele
-            run CPEE::Properties::PutItems, ele, id, opts if put ele
-            run CPEE::Properties::PostItem, ele, id, opts if post ele[0..-2]
+          on resource 'status' do
+            run CPEE::Properties::GetStatus, id, opts if get
+            run CPEE::Properties::PutStatus, id, opts if put 'status'
+            on resource 'id' do
+              run CPEE::Properties::GetStatusID, id, opts if get
+            end
+            on resource 'message' do
+              run CPEE::Properties::GetStatusMessage, id, opts if get
+            end
+          end
+          on resource 'executionhandler' do
+            run CPEE::Properties::GetExecutionHandler, id, opts if get
+            run CPEE::Properties::PutExecutionHandler, id, opts if put 'executionhandler'
+          end
+          on resource 'positions' do
+            run CPEE::Properties::GetPositions, id, opts if get
+            run CPEE::Properties::PatchPositions, id, opts if patch 'positions'
+            run CPEE::Properties::PutPositions, id, opts if put 'positions'
+            run CPEE::Properties::PostPositions, id, opts if post 'position'
             on resource do
-              run CPEE::Properties::GetItem, ele, id, opts if get
-              run CPEE::Properties::SetItem, ele, id, opts if put 'string'
-              run CPEE::Properties::DelItem, ele, id, opts if delete
+              run CPEE::Properties::GetDetail, 'positions', id, opts if get
+              run CPEE::Properties::SetDetail, id, opts if put 'detail'
+              run CPEE::Properties::DelDetail, id, opts if delete
+              on resource '@passthrough' do
+                run CPEE::Properties::GetPt, id, opts if get
+              end
             end
           end
-        end
-        on resource 'dsl' do
-          run CPEE::Properties::GetComplex, 'dsl', 'text/plain', id, opts if get
-        end
-        on resource 'dslx' do
-          run CPEE::Properties::GetComplex, 'dslx', 'text/xml', id, opts if get
-        end
-        on resource 'description' do
-          run CPEE::Properties::GetComplex, 'description', 'text/xml', id, opts if get
-          run CPEE::Properties::PutDescription, id, opts if put 'description'
-        end
-        on resource 'transformation' do
-          run CPEE::Properties::GetTransformation, id, opts if get
-          run CPEE::Properties::PutTransformation, id, opts if put 'transformation'
+          %w{dataelements endpoints attributes}.each do |ele|
+            on resource ele do
+              run CPEE::Properties::GetItems, ele, id, opts if get
+              run CPEE::Properties::PatchItems, ele, id, opts if patch ele
+              run CPEE::Properties::PutItems, ele, id, opts if put ele
+              run CPEE::Properties::PostItem, ele, id, opts if post ele[0..-2]
+              on resource do
+                run CPEE::Properties::GetItem, ele, id, opts if get
+                run CPEE::Properties::SetItem, ele, id, opts if put 'string'
+                run CPEE::Properties::DelItem, ele, id, opts if delete
+              end
+            end
+          end
+          on resource 'dsl' do
+            run CPEE::Properties::GetComplex, 'dsl', 'text/plain', id, opts if get
+          end
+          on resource 'dslx' do
+            run CPEE::Properties::GetComplex, 'dslx', 'text/xml', id, opts if get
+          end
+          on resource 'description' do
+            run CPEE::Properties::GetComplex, 'description', 'text/xml', id, opts if get
+            run CPEE::Properties::PutDescription, id, opts if put 'description'
+          end
+          on resource 'transformation' do
+            run CPEE::Properties::GetTransformation, id, opts if get
+            run CPEE::Properties::PutTransformation, id, opts if put 'transformation'
+          end
+        else
+          run CPEE::FAIL
         end
       end
     end

data/lib/cpee/message.rb

@@ -15,25 +15,27 @@
 module CPEE
 
   module Message
+    WHO = 'cpee'
+    TYPE = 'instance'
 
     def self::send(type, event, cpee, instance, instance_uuid, instance_name, content={}, backend)
       topic = ::File::dirname(event)
       name = ::File::basename(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 + ':' + event,
         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
 

data/lib/cpee/persistence.rb

@@ -15,6 +15,8 @@
 module CPEE
 
   module Persistence
+    OBJ = 'instance'
+
     def self::set_list(id,opts,item,values,deleted=[]) #{{{
       ah = AttributesHelper.new
       attributes = Persistence::extract_list(id,opts,'attributes').to_h
@@ -37,13 +39,13 @@ module CPEE
       )
     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,11 +62,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?(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
@@ -97,14 +120,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/server/executionhandlers/ruby/connection.rb

@@ -149,10 +149,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   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", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
+    @anno = parameters.delete(:annotations) rescue nil
+    @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
     else
@@ -200,7 +198,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       @controller.notify("status/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :id => status.id, :message => status.message)
     end
     unless changed_dataelements.nil? || changed_dataelements.empty?
-      de = dataelements.slice(*changed_dataelements).transform_values { |v| enc = detect_encoding(v); (enc == 'OTHER' ? v.inspect : (v.encode('UTF-8',enc) rescue convert_to_base64(v))) }
+      de = dataelements.slice(*changed_dataelements).transform_values { |v| enc = detect_encoding(v); (enc == 'OTHER' ? v : (v.encode('UTF-8',enc) rescue convert_to_base64(v))) }
       @controller.notify("dataelements/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => de)
     end
     unless changed_endpoints.nil? || changed_endpoints.empty?
@@ -222,6 +220,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/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'
@@ -278,7 +278,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
             ''
           else
             enc = detect_encoding(ttt)
-            enc == 'OTHER' ? ttt.inspect : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
+            enc == 'OTHER' ? ttt : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
           end
         elsif r.mimetype == 'text/plain' || r.mimetype == 'text/html'
           ttt = r.value.read
@@ -303,7 +303,7 @@ 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), :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
+    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :annotations => @anno)
     @guard_files += result
     @handler_returnValue = simplify_result(result)
     @handler_returnOptions = options

data/server/executionhandlers/ruby/controller.rb

@@ -21,6 +21,7 @@ require 'cpee/value_helper'
 require 'cpee/attributes_helper'
 require 'cpee/message'
 require 'cpee/redis'
+require 'cpee/persistence'
 
 require 'ostruct'
 class ParaStruct < OpenStruct
@@ -41,8 +42,8 @@ class Controller
     @id = id
 
     @attributes = {}
-    @redis.keys("instance:#{id}/attributes/*").each do |key|
-      @attributes[File.basename(key)] = @redis.get(key)
+    CPEE::Persistence::extract_list(id,opts,'attributes').each do |de|
+      @attributes[de[0]] = de[1]
     end
 
     @attributes_helper = AttributesHelper.new
@@ -152,7 +153,8 @@ class Controller
     topic, name = what.split('/')
     handler = File.join(topic,'vote',name)
     votes = []
-    @redis.smembers("instance:#{id}/handlers/#{handler}").each do |client|
+
+    CPEE::Persistence::extract_handler(id,@opts,handler).each do |client|
       voteid = Digest::MD5.hexdigest(Kernel::rand().to_s)
       content[:key] = voteid
       content[:attributes] = attributes_translated