cpee 2.1.29 → 2.1.50

data/cockpit/themes/preset/symbols/test.svg

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   class="clickable"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="test.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2062"
+     inkscape:window-height="1298"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="35.146667"
+     inkscape:cx="13.036699"
+     inkscape:cy="13.350011"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg10" />
+  <rect
+     transform="rotate(45,14,12)"
+     x="7"
+     y="3"
+     width="21"
+     height="21"
+     class="cline hfill stand"
+     id="rect2"
+     style="fill:#3465a4" />
+  <circle
+     cx="15.5"
+     cy="15.5"
+     r="7"
+     class="stand"
+     id="circle4" />
+  <circle
+     cx="15.5"
+     cy="15.5"
+     r="7"
+     class="stand"
+     id="circle6" />
+  <path
+     d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
+     class="stand"
+     id="path8"
+     style="fill:#ef2929;stroke-width:1" />
+</svg>

data/cockpit/themes/preset/theme.js

@@ -93,7 +93,7 @@ function WFAdaptorManifestation(adaptor) {
 
     nodes = JSON.parse(nodes);
     $(nodes).each(function(key,str) {
-      nodes[key] = $X(str);;
+      nodes[key] = $X(str);
     });
 
     var check1 = [];
@@ -176,14 +176,44 @@ function WFAdaptorManifestation(adaptor) {
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
       var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-      icon.children('.rfill').addClass('menu');
+      icon.find('.rfill').addClass('menu');
+      icon.find('.hfill').addClass('menu');
       menu['Delete'] = [{
         'label': 'Remove Element',
-        'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
+        'function_call': function(selector,target,selected){
+          del_ui_pos(target)
+          self.adaptor.description.remove(selector,target);
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
+        },
         'menu_icon': icon,
         'type': undefined,
         'params': [null, xml_node, self.selected()]
       }];
+      var nodes = localStorage.getItem('marked');
+      nodes = JSON.parse(nodes);
+      if (nodes && nodes.length > 0) {
+        var icond =  self.resources['delete'].clone();
+        icond.children('.standfat').addClass('menu');
+        menu['Delete'].push({
+          'label': 'Remove Marked Elements',
+          'function_call': function(){
+            $(nodes).each(function(key,str) {
+              nodes[key] = $X(str);
+            });
+            $(nodes).each(function(key,node){
+              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              del_ui_pos(target)
+              self.adaptor.description.remove(null,target);
+              localStorage.removeItem('marked');
+              localStorage.removeItem('marked_from');
+            });
+          },
+          'menu_icon': icond,
+          'type': undefined,
+          'params': []
+        })
+      }
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
       var icon =  self.elements.callmanipulate.illustrator.svg.clone();
@@ -198,7 +228,7 @@ function WFAdaptorManifestation(adaptor) {
     }
     if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
       var icon =  self.elements.call.illustrator.svg.clone();
-      icon.children('g.replace').addClass('active');
+      icon.children('g.replace').addClass('passive');
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
@@ -223,6 +253,18 @@ function WFAdaptorManifestation(adaptor) {
     new CustomMenu(e).contextmenu(menu);
   } //}}}
 
+  function positionHandling(svgid) {
+    var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+    var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+    if (vtarget.length > 0) {
+      if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+        del_ui_pos(xml_node);
+      } else {
+        add_ui_pos(xml_node);
+      }
+    }
+  }
+
   // Events
   this.events.touchend = function(svgid, e) { // {{{
     clearTimeout(self.presstimer);
@@ -234,6 +276,7 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
+      positionHandling(svgid);
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }
@@ -266,6 +309,8 @@ function WFAdaptorManifestation(adaptor) {
           localStorage.removeItem('marked_from');
         }
       }
+    } else if (e && (e.shiftKey)) {
+      positionHandling(svgid);
     } else {
       self.adaptor.illustrator.get_elements().removeClass('marked');
       localStorage.removeItem('marked');
@@ -299,6 +344,7 @@ function WFAdaptorManifestation(adaptor) {
 
   // other resources
   this.resources.arrow =  self.adaptor.theme_dir + 'symbols/arrow.svg';
+  this.resources.delete =  self.adaptor.theme_dir + 'symbols/delete.svg';
 
   // Primitive Elements
   this.elements.call = { /*{{{*/
@@ -311,10 +357,18 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
-          return 'callmanipulate';
+        if ($('> annotations > _context_data_analysis > probes > probe', node).length > 0) {
+          if ($('> code', node).length > 0) {
+            return 'callmanipulate_sensor';
+          } else {
+            return 'call_sensor';
+          }
         } else {
-          return 'call';
+          if ($('> code', node).length > 0) {
+            return 'callmanipulate';
+          } else {
+            return 'call';
+          }
         }
       },
       'svg': self.adaptor.theme_dir + 'symbols/call.svg'
@@ -1169,6 +1223,30 @@ function WFAdaptorManifestation(adaptor) {
       'expansion': function(node) {
         return 'vertical';
       },
+      'resolve_symbol': function(node) {
+        let plist = []
+        let dirty = false
+        $('*:not(:has(*))',node).each(function(i,n) {
+          let lines = n.textContent.split(/(\r\n)|\n|;/)
+          for (const l of lines) {
+            if (l != null) {
+              let m0 = l.match(/^[^=]*data\.([a-z0-9A-Z_]+)[^=]*=/)
+              if (m0 != null) {
+                plist.push(m0[1])
+              }
+              let m1 = l.match(/=[^=].*data\.([a-z0-9A-Z_]+)/)
+              let m2 = l.match(/^[^=]*data\.([a-z0-9A-Z_]+)[^=]*$/)
+              if (m1 != null && !plist.includes(m1[1])) {
+                dirty = true
+              }
+              if (m2 != null && !plist.includes(m2[1])) {
+                dirty = true
+              }
+            }
+          }
+        })
+        if (dirty) { return 'start_event'; }
+      },
       'closing_symbol': 'end',
       'col_shift': function(node) {
         return true;
@@ -1242,13 +1320,31 @@ function WFAdaptorManifestation(adaptor) {
   // Abstract Elements
   // * they may only have an illustrator (or other parts)
   // * they HAVE TO have a parent
+  this.elements.start_event = { /*{{{*/
+    'parent': 'start',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/start_event.svg'
+    }//}}}
+  }; /*}}}*/
+  this.elements.call_sensor = { /*{{{*/
+    'parent': 'call',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/call_sensor.svg'
+    }//}}}
+  }; /*}}}*/
   this.elements.callmanipulate = { /*{{{*/
     'parent': 'call',
     'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
     'illustrator': {//{{{
-      'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
-    },//}}}
+    }//}}}
+  }; /*}}}*/
+  this.elements.callmanipulate_sensor = { /*{{{*/
+    'parent': 'call',
+    'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/callmanipulate_sensor.svg'
+    }//}}}
   }; /*}}}*/
   this.elements.loop_head = { /*{{{*/
     'parent': 'loop',

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.29"
+  s.version          = "2.1.50"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
@@ -21,12 +21,13 @@ Gem::Specification.new do |s|
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
-  s.add_runtime_dependency 'riddl', '~> 0.114'
-  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.99'
+  s.add_runtime_dependency 'riddl', '~> 0.126'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.111'
   s.add_runtime_dependency 'highline', '~> 2.0'
-  s.add_runtime_dependency 'json', '~>2.1'
-  s.add_runtime_dependency 'redis', '~> 4.1'
+  s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'rubyzip', '~>2'
   s.add_runtime_dependency 'charlock_holmes', '~>0'
   s.add_runtime_dependency 'mimemagic', '~>0'
+  s.add_runtime_dependency 'get_process_mem', '~>0.2'
+  s.add_runtime_dependency 'webrick', '~>1.7'
 end

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'
@@ -53,6 +54,8 @@ module CPEE
     /p:properties/p:attributes/p:*
   }
   def self::implementation(opts)
+    opts[:see_instances]              ||= opts[:see_instances].nil? ? false : opts[:see_instances]
+
     opts[:instances]                  ||= File.expand_path(File.join(__dir__,'..','..','server','instances'))
     opts[:global_executionhandlers]   ||= File.expand_path(File.join(__dir__,'..','..','server','executionhandlers'))
     opts[:executionhandlers]          ||= ''
@@ -66,6 +69,12 @@ module CPEE
     opts[:watchdog_frequency]         ||= 7
     opts[:watchdog_start_off]         ||= false
     opts[:infinite_loop_stop]         ||= 10000
+    opts[:workers]                    ||= 1
+    opts[:workers_single]             ||= ['end','persist','forward-votes']
+    opts[:workers_multi]              ||= ['forward-events']
+
+    opts[:dashing_frequency]          ||= 3
+    opts[:dashing_target]             ||= nil
 
     ### set redis_cmd to nil if you want to do global
     ### at least redis_path or redis_url and redis_db have to be set if you do global
@@ -83,7 +92,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]               << [
@@ -101,11 +110,12 @@ module CPEE
       Dir[File.join(opts[:executionhandlers],'*','execution.rb')].each do |h|
         require h
       end unless opts[:executionhandlers].nil? || opts[:executionhandlers].strip == ''
+      CPEE::Message::set_workers(opts[:workers])
 
       parallel do
-        CPEE::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db])
+        CPEE::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db],opts[:workers],opts[:workers_single],opts[:workers_multi])
         EM.add_periodic_timer(opts[:watchdog_frequency]) do ### start services
-          CPEE::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db])
+          CPEE::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db],opts[:workers],opts[:workers_single],opts[:workers_multi])
         end
         EM.defer do ### catch all sse connections
           CPEE::Notifications::sse_distributor(opts)
@@ -113,6 +123,55 @@ module CPEE
         EM.add_periodic_timer(opts[:sse_keepalive_frequency]) do
           CPEE::Notifications::sse_heartbeat(opts)
         end
+
+        if opts[:dashing_target]
+          cpu_last = 0
+          idl_last = 0
+          EM.add_periodic_timer(opts[:dashing_frequency]) do
+            src = `cat /proc/stat | head -n 1`.split("\n")
+            srm = `cat /proc/meminfo`.split("\n")
+            sc = {}
+            sm = {}
+            src.each do |e|
+              x = e.split(' ')
+              sc[x[0]] = x[1..-1].map{|r| r.to_i}
+            end
+            srm.each do |e|
+              x = e.split(/\s+/)
+              sm[x[0].chop] = x[1].to_i
+            end
+            scc = 0
+            sci = 0
+            sc.each do |_,e|
+              scc = e[0..4].sum
+              sci = e[3]
+            end
+            cpu_delta = scc - cpu_last
+            cpu_idle  = sci - idl_last
+            cpu_used  = cpu_delta - cpu_idle
+            cpu_usage = '%.2f' % (100 * cpu_used / cpu_delta.to_f)
+            mem_tot   = '%.1f' % (sm['MemTotal']/1024.0)
+            mem_fre   = '%.1f' % (sm['MemFree']/1024.0)
+            mem_ava   = '%.1f' % (sm['MemAvailable']/1024.0)
+            mem_buc   = '%.1f' % ((sm['Buffers'] + sm['Cached'] + sm['SReclaimable'])/1024.0)
+            mem_usd   = '%.1f' % ((sm['MemTotal'] - sm['MemFree'] - sm['Buffers'] - sm['Cached'] - sm['SReclaimable'])/1024.0)
+
+            # puts "CPU usage at #{cpu_usage}%"
+            # puts "Mem usage at #{mem_tot}/#{mem_fre}/#{mem_usd}/#{mem_buc}/#{mem_ava}"
+            content = {}
+            content['cpu_usage'] = cpu_usage
+            content['mem_total'] = mem_tot
+            content['mem_free'] = mem_fre
+            content['mem_available'] = mem_ava
+            content['mem_bufferedandcached'] = mem_buc
+            content['mem_used'] = mem_usd
+            CPEE::Message::send_url(:event,'node/resource_utilization',File.join(opts[:url],'/'),content,File.join(opts[:dashing_target],'/dash/events'))
+
+            # Keep this as last for our next read
+            idl_last = sci
+            cpu_last = scc
+          end
+        end
       end
 
       cleanup do
@@ -145,50 +204,75 @@ module CPEE
     end
   end
 
-  def self::watch_services(watchdog_start_off,url,path,db)
+  def self::watch_services(watchdog_start_off,url,path,db,workers,workers_single,workers_multi)
     return if watchdog_start_off
-     EM.defer do
-       Dir[File.join(__dir__,'..','..','server','routing','*.rb')].each do |s|
-         s = s.sub(/\.rb$/,'')
-         pid = (File.read(s + '.pid').to_i rescue nil)
-         if (pid.nil? || !(Process.kill(0, pid) rescue false)) && !File.exist?(s + '.lock')
-           if url.nil?
-             system "#{s}.rb -p \"#{path}\" -d #{db} restart 1>/dev/null 2>&1"
-           else
-             system "#{s}.rb -u \"#{url}\" -d #{db} restart 1>/dev/null 2>&1"
-           end
-           puts "➡ Service #{File.basename(s,'.rb')} started ..."
-         end
-       end
+    EM.defer do
+      workers_single.each do |s|
+        s = File.join(__dir__,'..','..','server','routing',s)
+        next if File.exist?(s + '.lock')
+        pid = (File.read(s + '.pid').to_i rescue nil)
+        if (pid.nil? || !(Process.kill(0, pid) rescue false))
+          cmd = if url.nil?
+            "-p \"#{path}\" -d #{db} -w #{workers} restart 1>/dev/null 2>&1"
+          else
+            "-u \"#{url}\" -d #{db} -w #{workers} restart 1>/dev/null 2>&1"
+          end
+          system "#{s}.rb " + cmd + " 1>/dev/null 2>&1"
+          puts "➡ Service #{File.basename(s)} (#{cmd}) started ..."
+        end
+      end
+      workers_multi.each do |s|
+        s = File.join(__dir__,'..','..','server','routing',s.to_s)
+        next if File.exist?(s + '.lock')
+        (0...workers).each do |w|
+          w = '%02i' % w
+          pid = (File.read(s + '-' + w + '.pid').to_i rescue nil)
+          if (pid.nil? || !(Process.kill(0, pid) rescue false))
+            cmd = if url.nil?
+              "-p \"#{path}\" -d #{db} -w #{w} restart"
+            else
+              "-u \"#{url}\" -d #{db} -w #{w} restart"
+            end
+            system "#{s}.rb " + cmd + " 1>/dev/null 2>&1"
+            puts "➡ Service #{File.basename(s)}-#{w} (#{cmd}) started ..."
+          end
+        end
+      end
     end
   end
   def self::cleanup_services(watchdog_start_off)
     return if watchdog_start_off
-    Dir[File.join(__dir__,'..','..','server','routing','*.rb')].each do |s|
-      s = s.sub(/\.rb$/,'')
-      pid = (File.read(s + '.pid').to_i rescue nil)
+    Dir[File.join(__dir__,'..','..','server','routing','*.pid')].each do |s|
+      pid = (File.read(s).to_i rescue nil)
       if !pid.nil? || (Process.kill(0, pid) rescue false)
-        system "#{s}.rb stop 1>/dev/null 2>&1"
-        puts "➡ Service #{File.basename(s,'.rb')} stopped ..."
+        f = s.sub(/(-(\d+))?\.pid$/,'.rb')
+        if $2.nil?
+          system "#{f} stop 1>/dev/null 2>&1"
+        else
+          system "#{f} -w #{$2} stop 1>/dev/null 2>&1"
+        end
+        puts "➡ Service #{File.basename(s,'.pid')} stopped ..."
       end
     end
   end
 
   class Instances < Riddl::Implementation #{{{
     def response
-      redis = @a[0][:redis]
-      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'))
-          ins.root.add('instance', info,  'uuid' => uuid, 'id' => instance, 'state' => state, 'state_changed' => state_changed )
+      opts = @a[0]
+      if opts[:see_instances] || @h['SEE_INSTANCES'] == 'true'
+        Riddl::Parameter::Complex.new("wis","text/xml") do
+          ins = XML::Smart::string('<instances/>')
+          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
         end
-        ins.to_s
+      else
+        Riddl::Parameter::Complex.new("wis","text/xml",'<instances><!-- instances list disabled. --></instances>')
       end
     end
   end #}}}
@@ -209,9 +293,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 +319,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 +335,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)
@@ -289,19 +379,24 @@ module CPEE
         @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
       redis.multi do |multi|
-        multi.del empt
+        empt.each do |e|
+          multi.expire e, 30
+        end
         multi.zrem 'instances', id
       end
     end
   end #}}}
 
-    class FAIL < Riddl::Implementation #{{{
-      def response
-        @status = 404
-        nil
-      end
-    end #}}}
-
 end