cpee 2.1.29 → 2.1.50

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
@@ -34,6 +35,7 @@ def ⭐(a); ParaStruct.new(a); end
 class Controller
   def initialize(id,dir,opts)
     CPEE::redis_connect(opts,"Instance #{id}")
+    CPEE::Message::set_workers(opts[:workers])
 
     @redis = opts[:redis]
     @votes = []
@@ -41,8 +43,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
@@ -52,31 +54,39 @@ class Controller
     @loop_guard = {}
 
     @callback_keys = {}
-    @psredis = @opts[:redis_dyn].call "Instance #{@id} Callback Response"
 
-    Thread.new do
+    @subs = Thread.new do
+      @psredis = @opts[:redis_dyn].call "Instance #{@id} Callback Response"
       @psredis.psubscribe('callback-response:*','callback-end:*') do |on|
         on.pmessage do |pat, what, message|
-          if pat == 'callback-response:*' && @callback_keys.has_key?(what[18..-1])
-            index = message.index(' ')
-            mess = message[index+1..-1]
-            instance = message[0...index]
-            m = JSON.parse(mess)
-            resp = []
-            m['content']['values'].each do |e|
-              if e[1][0] == 'simple'
-                resp << Riddl::Parameter::Simple.new(e[0],e[1][1])
-              elsif e[1][0] == 'complex'
-                resp << Riddl::Parameter::Complex.new(e[0],e[1][1],File.open(e[1][2]))
+          if pat == 'callback-response:*'
+            _, worker, identifier = what.split(':')
+            if @callback_keys.has_key?(identifier)
+              index = message.index(' ')
+              mess = message[index+1..-1]
+              instance = message[0...index]
+              m = JSON.parse(mess)
+              resp = []
+              m['content']['values'].each do |e|
+                if e[1][0] == 'simple'
+                  resp << Riddl::Parameter::Simple.new(e[0],e[1][1])
+                elsif e[1][0] == 'complex'
+                  resp << Riddl::Parameter::Complex.new(e[0],e[1][1],File.open(e[1][2]))
+                end
               end
+              @callback_keys[identifier].send(:callback,resp,m['content']['headers'])
             end
-            @callback_keys[what[18..-1]].send(:callback,resp,m['content']['headers'])
           end
           if pat == 'callback-end:*'
-            @callback_keys.delete(what[13..-1])
+            _, worker, identifier = what.split(':')
+            @callback_keys.delete(identifier)
           end
         end
       end
+      @psredis.close
+    rescue =>  e
+      sleep 1
+      retry
     end
   end
 
@@ -136,7 +146,6 @@ class Controller
         CPEE::Message::send(:'vote-response',key,base,@id,uuid,info,true,@redis)
       end
     end
-    @thread.join if !@thread.nil? && @thread.alive?
   end
 
   def info
@@ -152,7 +161,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

data/server/executionhandlers/ruby/desc.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<description xmlns="http://cpee.org/ns/description/1.0">
+  <call id="a3" endpoint="">
+    <parameters>
+      <label>asdasd</label>
+      <method>:post</method>
+      <arguments/>
+    </parameters>
+    <annotations>
+      <_timing>
+        <_timing_weight/>
+        <_timing_avg/>
+        <explanations/>
+      </_timing>
+      <_shifting>
+        <_shifting_type>Duration</_shifting_type>
+      </_shifting>
+      <_context_data_analysis>
+        <probes/>
+        <ips/>
+      </_context_data_analysis>
+      <report>
+        <url/>
+      </report>
+      <_notes>
+        <_notes_general/>
+      </_notes>
+    </annotations>
+    <documentation>
+      <input/>
+      <output/>
+      <implementation>
+        <description/>
+      </implementation>
+    </documentation>
+  </call>
+  <closed_loop overrun="wait" execution="sequential">
+    <_probability>
+      <_probability_min/>
+      <_probability_max/>
+      <_probability_avg/>
+    </_probability>
+    <closed_loop_measuring ctime="200">
+      <_expected/>
+    </closed_loop_measuring>
+    <closed_loop_measuring ctime="200">
+      <_expected>
+        <value>test</value>
+        <value>bla</value>
+      </_expected>
+    </closed_loop_measuring>
+    <closed_loop_control ctime="200">
+      <_expected>
+        <change>
+          <type>:PID</type>
+          <value>grrr</value>
+          <upper/>
+          <lower/>
+        </change>
+        <change>
+          <type>:PID</type>
+          <value>duuur</value>
+          <upper/>
+          <lower/>
+        </change>
+      </_expected>
+      <closed_loop_control ctime="200">
+        <_expected/>
+      </closed_loop_control>
+    </closed_loop_control>
+    <closed_loop_cancel condition=""/>
+  </closed_loop>
+  <call id="a1" endpoint="">
+    <parameters>
+      <label/>
+      <method>:post</method>
+      <arguments/>
+    </parameters>
+    <annotations>
+      <_timing>
+        <_timing_weight/>
+        <_timing_avg/>
+        <explanations/>
+      </_timing>
+      <_shifting>
+        <_shifting_type>Duration</_shifting_type>
+      </_shifting>
+      <_context_data_analysis>
+        <probes/>
+        <ips/>
+      </_context_data_analysis>
+      <report>
+        <url/>
+      </report>
+      <_notes>
+        <_notes_general/>
+      </_notes>
+    </annotations>
+    <documentation>
+      <input/>
+      <output/>
+      <implementation>
+        <description/>
+      </implementation>
+    </documentation>
+  </call>
+</description>

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -6,10 +6,10 @@
   <xsl:template match="/">
     <xsl:text>control flow do</xsl:text>
     <xsl:call-template name="print-newline"/>
-    <xsl:apply-templates select="//d:description"/>
+    <xsl:apply-templates select="/d:description"/>
     <xsl:text>end</xsl:text>
   </xsl:template>
-  <xsl:template match="//d:description">
+  <xsl:template match="/d:description">
     <xsl:apply-templates>
       <xsl:with-param name="myspace">
         <xsl:value-of select="0*$myspacemultiplier"/>
@@ -221,6 +221,67 @@
       <xsl:text>end</xsl:text>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
+    <xsl:if test="name()='closed_loop'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:text>closed_loop</xsl:text>
+      <xsl:if test="@overrun">
+        <xsl:text> :overrun =&gt; </xsl:text>
+        <xsl:value-of select="@overrun"/>
+        <xsl:if test="@execution">
+          <xsl:text>, :execution =&gt; :</xsl:text>
+          <xsl:value-of select="@execution"/>
+        </xsl:if>
+      </xsl:if>
+      <xsl:text> do</xsl:text>
+      <xsl:call-template name="print-newline"/>
+      <xsl:apply-templates>
+        <xsl:with-param name="myspace">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:apply-templates>
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:text>end</xsl:text>
+      <xsl:call-template name="print-newline"/>
+    </xsl:if>
+    <xsl:if test="name()='closed_loop_measuring' or name()='closed_loop_control'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:text>closed_loop_slice :type =&gt; :</xsl:text>
+      <xsl:value-of select="substring(name(),13,10)"/>
+      <xsl:if test="@ctime">
+        <xsl:text>, :ctime =&gt; </xsl:text>
+        <xsl:value-of select="@ctime"/>
+      </xsl:if>
+      <xsl:text> do</xsl:text>
+      <xsl:call-template name="print-newline"/>
+      <xsl:apply-templates>
+        <xsl:with-param name="myspace">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:apply-templates>
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:text>end</xsl:text>
+      <xsl:call-template name="print-newline"/>
+    </xsl:if>
     <xsl:if test="name()='choose'">
       <xsl:call-template name="print-space">
         <xsl:with-param name="i">1</xsl:with-param>
@@ -229,14 +290,6 @@
         </xsl:with-param>
       </xsl:call-template>
       <xsl:text>choose </xsl:text>
-      <xsl:choose>
-        <xsl:when test="@mode='exclusive'">
-          <xsl:text>:exclusive</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>:inclusive</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
       <xsl:text> do</xsl:text>
       <xsl:call-template name="print-newline"/>
       <xsl:apply-templates>
@@ -374,17 +427,7 @@
         <xsl:value-of select="$myspace+$myspacemultiplier"/>
       </xsl:with-param>
     </xsl:call-template>
-    <xsl:text>parallel_branch</xsl:text>
-    <xsl:if test="@pass">
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="@pass"/>
-    </xsl:if>
-    <xsl:text> do</xsl:text>
-    <xsl:if test="@local">
-      <xsl:text> |</xsl:text>
-      <xsl:value-of select="@local"/>
-      <xsl:text>|</xsl:text>
-    </xsl:if>
+    <xsl:text>parallel_branch data do |local|</xsl:text>
     <xsl:call-template name="print-newline"/>
     <xsl:apply-templates>
       <xsl:with-param name="myspace">
@@ -749,9 +792,9 @@
               <xsl:otherwise>
                 <xsl:choose>
                   <xsl:when test="substring(.,1,1) = '!'">
-                    <xsl:text>#{</xsl:text>
-                    <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
-                    <xsl:text>.to_json}</xsl:text>
+                    <xsl:text>#{(</xsl:text>
+                    <xsl:value-of select="substring(.,2)"/>
+                    <xsl:text>).to_json}</xsl:text>
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:text>\"</xsl:text>

data/server/executionhandlers/ruby/execution.rb

@@ -46,6 +46,7 @@ module CPEE
             :redis_url => opts[:redis_url],
             :redis_path => File.join(opts[:basepath],opts[:redis_path]),
             :redis_db => opts[:redis_db],
+            :workers => opts[:workers],
             :global_executionhandlers => opts[:global_executionhandlers],
             :executionhandlers => opts[:executionhandlers],
             :executionhandler => hw

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/resources/topics.xml

@@ -25,8 +25,9 @@
     <vote>syncing_before</vote>
     <vote>syncing_after</vote>
   </topic>
-  <topic id='condition'>
-    <event>eval</event>
+  <topic id='gateway'>
+    <event>decide</event>
+    <event>join</event>
   </topic>
   <topic id='position'>
     <event>change</event>
@@ -41,6 +42,7 @@
     <vote>change</vote>
   </topic>
   <topic id='status'>
+    <event>resource_utilization</event>
     <event>change</event>
   </topic>
   <topic id='dataelements'>

data/server/routing/end.pid

@@ -0,0 +1 @@
+1105683

data/server/routing/end.rb

@@ -23,7 +23,8 @@ Daemonite.new do |opts|
   opts[:runtime_opts] += [
     ["--url=URL", "-uURL", "Specify redis url", ->(p){ opts[:redis_url] = p }],
     ["--path=PATH", "-pPATH", "Specify redis path, e.g. /tmp/redis.sock", ->(p){ opts[:redis_path] = p }],
-    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }]
+    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }],
+    ["--workers=NUM", "-wNUM", "Number of workers that are expected, e.g. 3", ->(p) { opts[:workers] = p.to_i }]
   ]
 
   on startup do
@@ -37,7 +38,7 @@ Daemonite.new do |opts|
   run do
     opts[:pubsubredis].psubscribe('callback-end:*') do |on|
       on.pmessage do |pat, what, message|
-        _, key = what.split(':')
+        _, worker, key = what.split(':',3)
         index = message.index(' ')
         instance = message[0...index]
         opts[:redis].multi do |multi|

data/server/routing/forward-events-00.pid

@@ -0,0 +1 @@
+1105692

data/server/routing/forward-events.rb

@@ -23,25 +23,30 @@ Daemonite.new do |opts|
   opts[:runtime_opts] += [
     ["--url=URL", "-uURL", "Specify redis url", ->(p){ opts[:redis_url] = p }],
     ["--path=PATH", "-pPATH", "Specify redis path, e.g. /tmp/redis.sock", ->(p){ opts[:redis_path] = p }],
-    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }]
+    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }],
+    ["--worker=NUM", "-wNUM", "Specify the worker id, e.g. 0", ->(p) { opts[:worker] = p.to_i }]
   ]
 
+  on setup do
+    opts[:worker] ||= 0
+    opts[:worker] = ('%02i' % opts[:worker]).freeze
+    opts[:pidfile] = File.basename(opts[:pidfile],'.pid') + '-' + opts[:worker].to_s + '.pid'
+  end
+
   on startup do
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
-
     CPEE::redis_connect opts, 'Server Routing Forward Events'
     opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Forward Events Sub'
   end
 
   run do
-    opts[:pubsubredis].psubscribe('event:*') do |on|
+    opts[:pubsubredis].psubscribe("event:#{opts[:worker]}:*") do |on|
       on.pmessage do |pat, what, message|
         index = message.index(' ')
         mess = message[index+1..-1]
         instance = message[0...index]
-        type = pat[0..-3]
-        event = what[(type.length+1)..-1]
+        type, worker, event = what.split(':',3)
         topic = ::File::dirname(event)
         name = ::File::basename(event)
         long = File.join(topic,type,name)
@@ -51,17 +56,25 @@ Daemonite.new do |opts|
             if url.nil? || url == ""
               opts[:redis].publish("forward:#{instance}/#{key}",mess)
             else
-              p "#{type}/#{topic}/#{event}-#{url}"
-              client = Riddl::Client.new(url)
-              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',mess)
-              ]
+              # Ractor.new(url,type,topic,name,mess) do |url,type,topic,name,mess|
+              # sadly typhoes does not support ractors
+              Thread.new do
+                Riddl::Client.new(url).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',mess)
+                ]
+              end
             end
           end
         end
+        unless opts[:redis].exists?("instance:#{instance}/state")
+          empt = opts[:redis].keys("instance:#{instance}/*").to_a
+          opts[:redis].multi do |multi|
+            multi.del empt
+          end
+        end
       rescue => e
         puts e.message
         puts e.backtrace

data/server/routing/forward-votes.pid

@@ -0,0 +1 @@
+1105689

data/server/routing/forward-votes.rb

@@ -49,7 +49,8 @@ Daemonite.new do |opts|
   opts[:runtime_opts] += [
     ["--url=URL", "-uURL", "Specify redis url", ->(p){ opts[:redis_url] = p }],
     ["--path=PATH", "-pPATH", "Specify redis path, e.g. /tmp/redis.sock", ->(p){ opts[:redis_path] = p }],
-    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }]
+    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }],
+    ["--workers=NUM", "-wNUM", "Number of workers that are expected, e.g. 3", ->(p) { opts[:workers] = p.to_i }]
   ]
 
   on startup do
@@ -64,11 +65,10 @@ Daemonite.new do |opts|
     opts[:pubsubredis].psubscribe('vote:*') do |on|
       on.pmessage do |pat, what, message|
         index = message.index(' ')
+        instance = message[0...index]
         mess = message[index+1..-1]
 
-        instance = message[0...index]
-        type = pat[0..-3]
-        event = what[(type.length+1)..-1]
+        type, worker, event = what.split(':',3)
         topic = ::File::dirname(event)
         name = ::File::basename(event)
         long = File.join(topic,type,name)

data/server/routing/persist.pid

@@ -0,0 +1 @@
+1105686

data/server/routing/persist.rb

@@ -20,42 +20,50 @@ require 'daemonite'
 require_relative '../../lib/cpee/value_helper'
 require_relative '../../lib/cpee/redis'
 
-EVENTS = %w{
-  event:state/change
-  event:executionhandler/change
-  event:description/change
-  event:dataelements/change
-  event:endpoints/change
-  event:attributes/change
-  event:transformation/change
-  event:status/change
-  event:position/change
-  event:handler/change
-  callback:activity/content
-}
+EVENTS =
 
 Daemonite.new do |opts|
   opts[:runtime_opts] += [
     ["--url=URL", "-uURL", "Specify redis url", ->(p){ opts[:redis_url] = p }],
     ["--path=PATH", "-pPATH", "Specify redis path, e.g. /tmp/redis.sock", ->(p){ opts[:redis_path] = p }],
-    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }]
+    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }],
+    ["--workers=NUM", "-wNUM", "Number of workers that are expected, e.g. 3", ->(p) { opts[:workers] = p.to_i }]
   ]
 
   on startup do
-    opts[:redis_path] ||= '/tmp/redis.sock'
+    opts[:redis_path] ||= '/tmp/redis.sock'.freeze
     opts[:redis_db] ||= 1
-
+    opts[:events] = []
+    0.upto(opts[:workers]-1) do |w|
+      opts[:events] += [
+        'event:' + ('%02i' % w) + ':state/change',
+        'event:' + ('%02i' % w) + ':executionhandler/change',
+        'event:' + ('%02i' % w) + ':description/change',
+        'event:' + ('%02i' % w) + ':dataelements/change',
+        'event:' + ('%02i' % w) + ':endpoints/change',
+        'event:' + ('%02i' % w) + ':attributes/change',
+        'event:' + ('%02i' % w) + ':transformation/change',
+        'event:' + ('%02i' % w) + ':status/change',
+        'event:' + ('%02i' % w) + ':position/change',
+        'event:' + ('%02i' % w) + ':handler/change',
+        'callback:' + ('%02i' % w) + ':activity/content'
+      ]
+    end
+    opts[:events].freeze
     CPEE::redis_connect opts, 'Server Routing Persist'
     opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Persist Sub'
+  rescue => e
+    puts e.message
+    puts e.backtrace
   end
 
   run do
-    opts[:pubsubredis].subscribe(EVENTS) do |on|
+    opts[:pubsubredis].subscribe(opts[:events]) do |on|
       on.message do |what, message|
         mess = JSON.parse(message[message.index(' ')+1..-1])
         instance = mess.dig('instance')
         case what
-          when 'callback:activity/content'
+          when /callback:\d+:activity\/content/
             key = mess.dig('content','key')
             opts[:redis].multi do |multi|
               multi.sadd("instance:#{instance}/callbacks",key)
@@ -64,26 +72,28 @@ Daemonite.new do |opts|
               multi.set("instance:#{instance}/callback/#{key}/position",mess.dig('content','activity'))
               multi.set("instance:#{instance}/callback/#{key}/type",'callback')
             end
-          when 'event:state/change'
+          when /event:\d+:state\/change/
             opts[:redis].multi do |multi|
-              multi.set("instance:#{instance}/state",mess.dig('content','state'))
-              multi.set("instance:#{instance}/state/@changed",mess.dig('timestamp'))
+              unless mess.dig('content','state') == 'purged'
+                multi.set("instance:#{instance}/state",mess.dig('content','state'))
+                multi.set("instance:#{instance}/state/@changed",mess.dig('timestamp'))
+              end
             end
-          when 'event:executionhandler/change'
+          when /event:\d+:executionhandler\/change/
             opts[:redis].set("instance:#{instance}/executionhandler",mess.dig('content','executionhandler'))
-          when 'event:description/change'
+          when /event:\d+:description\/change/
             opts[:redis].multi do |multi|
               multi.set("instance:#{instance}/description",mess.dig('content','description'))
               multi.set("instance:#{instance}/dslx",mess.dig('content','dslx'))
               multi.set("instance:#{instance}/dsl",mess.dig('content','dsl'))
             end
-          when 'event:dataelements/change', 'event:endpoints/change', 'event:attributes/change'
+          when /event:\d+:dataelements\/change/, /event:\d+:endpoints\/change/, /event:\d+:attributes\/change/
             topic = mess.dig('topic')
             opts[:redis].multi do |multi|
               mess.dig('content','changed')&.each_with_index do |c,i|
-                unless what == 'event:attributes/change' && c == 'uuid'
+                unless what =~ /event:\d+:attributes\/change/ && c == 'uuid'
                   multi.zadd("instance:#{instance}/#{topic}",i,c)
-                  if what == 'event:dataelements/change'
+                  if what =~ /event:\d+:dataelements\/change/
                     multi.set("instance:#{instance}/#{topic}/#{c}",CPEE::ValueHelper::generate(mess.dig('content','values',c)))
                   else
                     multi.set("instance:#{instance}/#{topic}/#{c}",mess.dig('content','values',c))
@@ -91,13 +101,13 @@ Daemonite.new do |opts|
                 end
               end
               mess.dig('content','deleted')&.to_a&.each do |c|
-                unless what == 'event:attributes/change' && c == 'uuid'
+                unless what =~ /event:\d+:attributes\/change/ && c == 'uuid'
                   multi.zrem("instance:#{instance}/#{topic}",c)
                   multi.del("instance:#{instance}/#{topic}/#{c}")
                 end
               end
             end
-          when 'event:transformation/change'
+          when /event:\d+:transformation\/change/
             opts[:redis].multi do |multi|
               multi.set("instance:#{instance}/transformation/description",mess.dig('content','description'))
               multi.set("instance:#{instance}/transformation/description/@type",mess.dig('content','description_type'))
@@ -106,12 +116,12 @@ Daemonite.new do |opts|
               multi.set("instance:#{instance}/transformation/endpoints",mess.dig('content','endpoints'))
               multi.set("instance:#{instance}/transformation/endpoints/@type",mess.dig('content','endpoints_type'))
             end
-          when 'event:status/change'
+          when /event:\d+:status\/change/
             opts[:redis].multi do |multi|
               multi.set("instance:#{instance}/status/id",mess.dig('content','id'))
               multi.set("instance:#{instance}/status/message",mess.dig('content','message'))
             end
-          when 'event:position/change'
+          when /event:\d+:position\/change/
             opts[:redis].multi do |multi|
               c = mess.dig('content')
               c.dig('unmark')&.each do |ele|
@@ -138,7 +148,7 @@ Daemonite.new do |opts|
                 multi.set("instance:#{instance}/positions/#{ele['position']}",'after')
               end
             end
-          when 'event:handler/change'
+          when /event:\d+:handler\/change/
             opts[:redis].multi do |multi|
               mess.dig('content','changed').each do |c|
                 multi.sadd("instance:#{instance}/handlers",mess.dig('content','key'))

data/server/server.pid

@@ -0,0 +1 @@
+592827