cpee-model-management 1.0.17 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3a70760a747bb5dd295cac87766307d1d3775767af440e3090d2e108757837d
-  data.tar.gz: ed59f63e220bb3c6fb8e096ce21ee41f5542c59fff051e48c0d04ff7ee8ccd79
+  metadata.gz: 6fc783f8350eac7d65fbda35f275d4ea319878f2265e5d3e02eaf234eb0d4fd1
+  data.tar.gz: c16ceedc6068a9d0114ddc5456625f55a8a7072770d2e3af28479198a988282c
 SHA512:
-  metadata.gz: fd9497631d3a6d95a98b0f829211aa13712626bf1aac340a4bdb19eb80ee1b26e624bfa3e5766d1f8cceeb37d215f75b8c05478566802daf667a297eb4c4b075
-  data.tar.gz: 04c947de228d452fa277b01213c0a4a5deaa8d47bd3b357a94593c350c1ae15a728c470a38023a4298d9a2db808580bfe187cb1fe19dcf9bd4b634819a25a0a2
+  metadata.gz: 12fe97b8aa17301c3863fb983d0527efae7aacecfb313d5963a0a0d19aa30d73c00ff2b85275a1a0d50a48010d4185df3ff7fd9c4eae15c467ee230b8cc35154
+  data.tar.gz: 3a657a24d96ebde89e77378f35aed645e3548148c5c33ba28b064362030c5f9b35394e7704cf64b818d5d85b083ab0da84790575f1e8e601d25ae2e6ed0967d2

data/cpee-model-management.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.0.17"
+  s.version          = "1.1.1"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "(Lifecycle) manage your process models in a directory or git repo."

data/lib/cpee-model-management/implementation.rb

@@ -25,6 +25,7 @@ require 'fileutils'
 require 'pathname'
 require 'shellwords'
 require 'securerandom'
+require 'cpee/redis'
 
 module CPEE
   module ModelManagement
@@ -358,7 +359,7 @@ module CPEE
         Dir.mkdir(fname)
         FileUtils.touch(File.join(fname,'.gitignore'))
 
-        attrs = JSON::load File.open(fname + '.attrs')
+        attrs = {}
         attrs['creator'] = creator
         attrs['author'] = creator
         File.write(fname + '.attrs',JSON::pretty_generate(attrs))
@@ -507,6 +508,26 @@ module CPEE
         nil
       end
     end #}}}
+    class ShowUrl < Riddl::Implementation #{{{
+      def response
+        show = @a[0]
+        @status = 302
+        @headers << Riddl::Header.new('Location',show + @p.first.value)
+      end
+    end #}}}
+    class AbandonUrl < Riddl::Implementation #{{{
+      def response
+        aba = @p.first.value
+        res1 = Typhoeus.get(File.join(aba,'properties','state','/'))
+        if res1.success?
+          if res1.response_body == 'ready' || res1.response_body == 'stopped'
+            Typhoeus.put(File.join(aba,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
+          end
+        end
+        nil
+      end
+    end #}}}
+
     class MoveItem < Riddl::Implementation #{{{
       def response
         where = @a[0] == :main ? '' : Riddl::Protocols::Utils::unescape(@r[-2])
@@ -606,7 +627,17 @@ module CPEE
       end
     end #}}}
 
-    class Active < Riddl::SSEImplementation #{{{
+    class ManagementSend < Riddl::SSEImplementation #{{{
+      def onopen
+        @conns = @a[0]
+        @conns << self
+      end
+      def onclose
+        @conns.delete(self)
+      end
+    end #}}}
+
+    class StatSend < Riddl::SSEImplementation #{{{
       def onopen
         @conns = @a[0]
         @conns << self
@@ -616,31 +647,240 @@ module CPEE
       end
     end #}}}
 
+    class StatReceive < Riddl::Implementation #{{{
+      def response
+        redis         = @a[0]
+        receivers     = @a[1]
+        topic         = @p[1].value
+        event_name    = @p[2].value
+        notification  = JSON.parse(@p[3].value.read)
+
+        instancenr = notification['instance']
+        content = notification['content']
+        attr = content['attributes']
+        engine = notification['cpee']
+
+        prefix = File.join(engine,notification['instance-uuid'].to_s)
+
+        if topic == 'state'  && event_name == 'change'
+          if %w{abandoned finished}.include?(content['state'])
+            parent = redis.get(File.join(prefix,'parent'))
+            oldstate = redis.get(File.join(prefix,'state'))
+            children = redis.lrange(File.join(prefix,'children'),0,-1)
+            redis.multi do |multi|
+              multi.decr(File.join(engine,oldstate)) rescue nil
+              multi.incr(File.join(engine,'total_' + content['state']))
+              multi.lrem(File.join(engine,'instances'),0,notification['instance-uuid'])
+              multi.del(File.join(prefix,'instance-url'))
+              multi.del(File.join(prefix,'author'))
+              multi.del(File.join(prefix,'path'))
+              multi.del(File.join(prefix,'name'))
+              multi.del(File.join(prefix,'state'))
+              multi.del(File.join(prefix,'cpu'))
+              multi.del(File.join(prefix,'mem'))
+              multi.del(File.join(prefix,'time'))
+              children.each do |child|
+                if parent
+                  multi.set(File.join(engine,child,'parent'),parent)
+                else
+                  multi.del(File.join(engine,child,'parent'))
+                end
+              end
+              multi.del(File.join(prefix,'children'))
+              multi.del(File.join(prefix,'parent'))
+              if parent
+                multi.lrem(File.join(engine,parent,'children'),0,notification['instance-uuid'].to_s)
+              end
+            end
+          elsif %w{ready}.include?(content['state'])
+            exi = true if redis.lrange(File.join(engine,'instances'),0,-1).include?(notification['instance-uuid'])
+            redis.multi do |multi|
+              unless exi
+                multi.incr(File.join(engine,'total_created'))
+                multi.incr(File.join(engine,'ready'))
+                multi.rpush(File.join(engine,'instances'),notification['instance-uuid'])
+              end
+              multi.set(File.join(prefix,'instance-url'),notification['instance-url'])
+              multi.set(File.join(prefix,'author'),attr['author'])
+              multi.set(File.join(prefix,'state'),content['state'])
+              multi.set(File.join(prefix,'path'),File.join(attr['design_dir'],attr['info']+'.xml')) unless attr['design_dir'].nil? || attr['info'].nil?
+              multi.set(File.join(prefix,'name'),attr['info'])
+              multi.set(File.join(prefix,'cpu'),0)
+              multi.set(File.join(prefix,'mem'),0)
+              multi.set(File.join(prefix,'time'),0)
+            end
+          elsif %w{stopping}.include?(content['state'])
+            redis.set(File.join(prefix,'state'),content['state'])
+          elsif %w{stopped}.include?(content['state'])
+            redis.multi do |multi|
+              multi.decr(File.join(engine,'running'))
+              multi.incr(File.join(engine,'stopped'))
+              multi.set(File.join(prefix,'state'),content['state'])
+              multi.set(File.join(prefix,'cpu'),0)
+              multi.set(File.join(prefix,'mem'),0)
+              multi.set(File.join(prefix,'time'),0)
+            end
+          elsif %w{running}.include?(content['state'])
+            oldstate = redis.get(File.join(prefix,'state'))
+            redis.multi do |multi|
+              multi.decr(File.join(engine,oldstate)) rescue nil
+              multi.incr(File.join(engine,'running'))
+              multi.set(File.join(prefix,'name'),attr['info'])
+              multi.set(File.join(prefix,'state'),content['state'])
+              multi.set(File.join(prefix,'time'),Time.now.to_i)
+            end
+          end
+
+          url, author, path, name, state, parent = redis.mget(
+            File.join(prefix,'instance-url'),
+            File.join(prefix,'author'),
+            File.join(prefix,'path'),
+            File.join(prefix,'name'),
+            File.join(prefix,'state'),
+            File.join(prefix,'parent')
+          )
+          receivers.each do |conn|
+            conn.send JSON::generate(:topic => topic, :event => event_name, :engine => engine, :uuid => notification['instance-uuid'], :url => url, :author => author, :path => path.to_s, :name => name, :state => content['state'], :parent => parent.to_s)
+          end
+        elsif topic == 'task'  && event_name == 'instantiation'
+          redis.multi do |multi|
+            multi.rpush(File.join(engine,notification['instance-uuid'],'children'),content['received']['CPEE-INSTANCE-UUID'])
+            multi.set(File.join(engine,content['received']['CPEE-INSTANCE-UUID'],'parent'),notification['instance-uuid'])
+          end
+          prefix = File.join(engine,content['received']['CPEE-INSTANCE-UUID'].to_s)
+          url, author, path, name, state, parent = redis.mget(
+            File.join(prefix,'instance-url'),
+            File.join(prefix,'author'),
+            File.join(prefix,'path'),
+            File.join(prefix,'name'),
+            File.join(prefix,'state'),
+            File.join(prefix,'parent')
+          )
+          receivers.each do |conn|
+            conn.send JSON::generate(:topic => 'state', :event => 'change', :engine => engine, :uuid => content['received']['CPEE-INSTANCE-UUID'], :url => url, :author => author, :path => path.to_s, :name => name, :state => state, :parent => parent.to_s)
+          end
+        elsif topic == 'status'  && event_name == 'resource_utilization'
+          redis.multi do |multi|
+            multi.set(File.join(prefix,'name'),attr['info'])
+            multi.set(File.join(prefix,'cpu'),content['utime'] + content['stime'])
+            multi.set(File.join(prefix,'mem'),content['mib'])
+          end
+          receivers.each do |conn|
+            conn.send JSON::generate(:topic => topic, :event => event_name, :engine => engine, :uuid => notification['instance-uuid'], :cpu => content['utime'] + content['stime'], :mem => content['mib'])
+          end
+        elsif topic == 'node'  && event_name == 'resource_utilization'
+          redis.multi do |multi|
+            multi.set(File.join(engine,'cpu_usage'),content['cpu_usage'])
+            multi.set(File.join(engine,'mem_free'),content['mem_free'])
+            multi.set(File.join(engine,'mem_total'),content['mem_total'])
+            multi.set(File.join(engine,'mem_available'),content['mem_available'])
+          end
+          receivers.each do |conn|
+            conn.send JSON::generate(:topic => topic, :event => event_name, :engine => engine, :cpu_usage => content['cpu_usage'], :mem_free => content['mem_free'], :mem_total => content['mem_total'], :mem_available => content['mem_available'])
+          end
+        end
+      end
+    end #}}}
+
+    class StatGet < Riddl::Implementation #{{{
+      def response
+        redis = @a[0]
+        engine = @p[0].value
+        res = redis.mapped_mget(
+          File.join(engine,'total_created'),
+          File.join(engine,'total_finished'),
+          File.join(engine,'total_abandoned'),
+          File.join(engine,'ready'),
+          File.join(engine,'stopped'),
+          File.join(engine,'running')
+        ).transform_keys{ |k| File.basename(k) }.transform_values(&:to_i)
+        Riddl::Parameter::Complex.new('stats','application/json',JSON::pretty_generate(res || []))
+      end
+    end #}}}
+    class InstancesGet < Riddl::Implementation #{{{
+      def response
+        redis = @a[0]
+        engine = @p[0].value
+        doc = XML::Smart.string('<instances/>')
+        redis.lrange(File.join(engine,'instances'),0,-1).each do |i|
+          prefix = File.join(engine,i.to_s)
+          url, author, path, name, state, cpu, mem, parent = redis.mget(
+            File.join(prefix,'instance-url'),
+            File.join(prefix,'author'),
+            File.join(prefix,'path'),
+            File.join(prefix,'name'),
+            File.join(prefix,'state'),
+            File.join(prefix,'cpu'),
+            File.join(prefix,'mem'),
+            File.join(prefix,'parent')
+          )
+          doc.root.add('instance', :uuid => i, :url => url, :author => author, :path => path, :name => name, :state => state, :cpu => cpu, :mem => mem, :parent => parent)
+        end
+        Riddl::Parameter::Complex.new('tree','text/xml',doc.to_s)
+      end
+    end #}}}
+    class InstanceGet < Riddl::Implementation #{{{
+      def response
+        redis = @a[0]
+        engine = @p[0].value
+        uuid = @r[-1]
+        prefix = File.join(engine,uuid.to_s)
+        url, author, path, name, state, cpu, mem, parent = redis.mget(
+          File.join(prefix,'instance-url'),
+          File.join(prefix,'author'),
+          File.join(prefix,'path'),
+          File.join(prefix,'name'),
+          File.join(prefix,'state'),
+          File.join(prefix,'cpu'),
+          File.join(prefix,'mem'),
+          File.join(prefix,'parent')
+        )
+        Riddl::Parameter::Complex.new('instance','application/json',JSON.generate(:uuid => uuid, :url => url, :author => author, :path => path, :name => name, :state => state, :cpu => cpu, :mem => mem, :parent => parent))
+      end
+    end #}}}
+
+
     def self::implementation(opts)
-      opts[:connections] = []
+      opts[:management_receivers] = []
+      opts[:stat_receivers] = []
+
+      ### 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
+      opts[:redis_path]                 ||= 'redis.sock' # use e.g. /tmp/redis.sock for global stuff. Look it up in your redis config
+      opts[:redis_db]                   ||= 0
+      ### optional redis stuff
+      opts[:redis_url]                  ||= nil
+      opts[:redis_cmd]                  ||= 'redis-server --port 0 --unixsocket #redis_path# --unixsocketperm 600 --pidfile #redis_pid# --dir #redis_db_dir# --dbfilename #redis_db_name# --databases 1 --save 900 1 --save 300 10 --save 60 10000 --rdbcompression yes --daemonize yes'
+      opts[:redis_pid]                  ||= 'redis.pid' # use e.g. /var/run/redis.pid if you do global. Look it up in your redis config
+      opts[:redis_db_name]              ||= 'redis.rdb' # use e.g. /var/lib/redis.rdb for global stuff. Look it up in your redis config
+
+      CPEE::redis_connect opts, 'Server Main'
 
       Proc.new do
-        on resource do
+        interface 'events' do
+          run StatReceive, opts[:redis], opts[:stat_receivers] if post 'event'
+        end
+        interface 'implementation' do
           run GetList, :main, opts[:views], opts[:models] if get 'stage'
           run GetListFull, opts[:views], opts[:models] if get 'full'
           run GetStages, opts[:themes] if get 'stages'
-          run Create, :main, :cre, opts[:views], opts[:connections], opts[:templates], opts[:models] if post 'item'
-          run Create, :main, :dup, opts[:views], opts[:connections], opts[:templates], opts[:models] if post 'duplicate'
-          run CreateDir, opts[:connections], opts[:models] if post 'dir'
-          run Active, opts[:connections] if sse
+          run Create, :main, :cre, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'item'
+          run Create, :main, :dup, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'duplicate'
+          run CreateDir, opts[:management_receivers], opts[:models] if post 'dir'
+          run ManagementSend, opts[:management_receivers] if sse
           on resource '[a-zA-Z0-9öäüÖÄÜ _-]+\.dir' do
             run GetList, :sub, opts[:views], opts[:models] if get 'stage'
-            run Create, :sub, :cre, opts[:views], opts[:connections], opts[:templates], opts[:models] if post 'item'
-            run Create, :sub, :dup, opts[:views], opts[:connections], opts[:templates], opts[:models] if post 'duplicate'
-            run DeleteDir, opts[:connections], opts[:models] if delete
-            run RenameDir, opts[:connections], opts[:models] if put 'name'
+            run Create, :sub, :cre, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'item'
+            run Create, :sub, :dup, opts[:views], opts[:management_receivers], opts[:templates], opts[:models] if post 'duplicate'
+            run DeleteDir, opts[:management_receivers], opts[:models] if delete
+            run RenameDir, opts[:management_receivers], opts[:models] if put 'name'
             on resource '[a-zA-Z0-9öäüÖÄÜ _-]+\.xml' do
-              run DeleteItem, :sub, opts[:connections], opts[:models] if delete
+              run DeleteItem, :sub, opts[:management_receivers], opts[:models] if delete
               run GetItem, :sub, opts[:models] if get
-              run PutItem, :sub, opts[:connections], opts[:models] if put 'content'
-              run RenameItem, :sub, opts[:connections], opts[:models] if put 'name'
-              run MoveItem, :sub, opts[:connections], opts[:models] if put 'dirname'
-              run ShiftItem, :sub, opts[:connections], opts[:themes], opts[:models] if put 'newstage'
+              run PutItem, :sub, opts[:management_receivers], opts[:models] if put 'content'
+              run RenameItem, :sub, opts[:management_receivers], opts[:models] if put 'name'
+              run MoveItem, :sub, opts[:management_receivers], opts[:models] if put 'dirname'
+              run ShiftItem, :sub, opts[:management_receivers], opts[:themes], opts[:models] if put 'newstage'
               on resource 'open' do
                 run OpenItem, :sub, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models] if get 'stage'
               end
@@ -650,12 +890,12 @@ module CPEE
             end
           end
           on resource '[a-zA-Z0-9öäüÖÄÜ _-]+\.xml' do
-            run DeleteItem, :main, opts[:connections], opts[:models] if delete
+            run DeleteItem, :main, opts[:management_receivers], opts[:models] if delete
             run GetItem, :main, opts[:models] if get
-            run PutItem, :main, opts[:connections], opts[:models] if put 'content'
-            run RenameItem, :main, opts[:connections], opts[:models] if put 'name'
-            run MoveItem, :main, opts[:connections], opts[:models] if put 'dirname'
-            run ShiftItem, :main, opts[:connections], opts[:themes], opts[:models] if put 'newstage'
+            run PutItem, :main, opts[:management_receivers], opts[:models] if put 'content'
+            run RenameItem, :main, opts[:management_receivers], opts[:models] if put 'name'
+            run MoveItem, :main, opts[:management_receivers], opts[:models] if put 'dirname'
+            run ShiftItem, :main, opts[:management_receivers], opts[:themes], opts[:models] if put 'newstage'
             on resource 'open' do
               run OpenItem, :main, opts[:instantiate], opts[:cockpit], opts[:views], false, opts[:models] if get 'stage'
             end
@@ -663,6 +903,26 @@ module CPEE
               run OpenItem, :main, opts[:instantiate], opts[:cockpit], opts[:views], true, opts[:models] if get 'stage'
             end
           end
+          on resource 'dash' do
+            on resource 'show' do
+              run ShowUrl, opts[:show] if get 'url'
+            end
+            on resource 'abandon' do
+              run AbandonUrl if put 'url'
+            end
+            on resource 'events' do
+              run StatSend, opts[:stat_receivers] if sse
+            end
+            on resource 'instances' do
+              run InstancesGet, opts[:redis] if get 'engine'
+              on resource do
+                run InstanceGet, opts[:redis] if get 'engine'
+              end
+            end
+            on resource 'stats' do
+              run StatGet, opts[:redis] if get 'engine'
+            end
+          end
         end
       end
     end

data/lib/cpee-model-management/implementation.xml

@@ -0,0 +1,133 @@
+<description xmlns="http://riddl.org/ns/description/1.0" xmlns:ann="http://riddl.org/ns/annotation/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <message name="url">
+    <parameter name="url" type="string"/>
+  </message>
+  <message name="engine">
+    <parameter name="engine" type="string"/>
+  </message>
+  <message name="stats">
+    <parameter name="stats" mimetype="application/json"/>
+  </message>
+  <message name="tree">
+    <parameter name="tree" mimetype="text/xml"/>
+  </message>
+  <message name="instance">
+    <parameter name="instance" mimetype="application/json"/>
+  </message>
+  <message name="item">
+    <parameter name="stage" type="string">
+      <xi:include href="stages"/>
+    </parameter>
+    <parameter name="new" type="string">
+      <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+</param>
+    </parameter>
+  </message>
+  <message name="name">
+    <parameter name="new" type="string">
+      <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+</param>
+    </parameter>
+  </message>
+  <message name="dir">
+    <parameter name="dir" type="string">
+      <param name="pattern">([a-zA-Z0-9öäüÖÄÜ _-]+)|</param>
+    </parameter>
+  </message>
+  <message name="dirname">
+    <parameter name="dir" type="string">
+      <param name="pattern">([a-zA-Z0-9öäüÖÄÜ _-]+)\.dir|</param>
+    </parameter>
+  </message>
+  <message name="duplicate">
+    <parameter name="new" type="string">
+      <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+</param>
+    </parameter>
+    <parameter name="old" type="string">
+      <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+\.xml</param>
+    </parameter>
+  </message>
+  <message name="stages">
+    <parameter name="stages" type="string"/>
+  </message>
+  <message name="newstage">
+    <parameter name="stage" type="string">
+      <xi:include href="stages"/>
+    </parameter>
+  </message>
+  <message name="stage">
+    <optional>
+      <parameter name="stage" type="string">
+        <xi:include href="stages"/>
+      </parameter>
+    </optional>
+  </message>
+  <message name="full">
+    <parameter name="full" type="string"/>
+    <optional>
+      <parameter name="stage" type="string">
+        <xi:include href="stages"/>
+      </parameter>
+    </optional>
+  </message>
+  <message name="list">
+    <parameter name="list" mimetype="application/json"/>
+  </message>
+  <message name="content">
+    <parameter name="content" mimetype="application/xml"/>
+  </message>
+  <resource>
+    <post in="item"/>
+    <post in="dir"/>
+    <post in="duplicate"/>
+    <get in="stage" out="list"/>
+    <get in="full" out="list"/>
+    <get in="stages" out="list"/>
+    <sse/>
+    <resource relative="[a-zA-Z0-9&#xF6;&#xE4;&#xFC;&#xD6;&#xC4;&#xDC; _-]+\.dir">
+      <post in="item"/>
+      <post in="duplicate"/>
+      <get in="stage" out="list"/>
+      <delete/>
+      <put in="name"/> <!-- rename -->
+      <resource relative="[a-zA-Z0-9&#xF6;&#xE4;&#xFC;&#xD6;&#xC4;&#xDC; _-]+\.xml">
+        <get out='content'/>
+        <delete/>
+        <put in="content"/>
+        <put in="name"/> <!-- rename -->
+        <put in="dirname"/> <!-- move -->
+        <put in="newstage"/> <!-- shift -->
+        <resource relative="open"><get in="stage"/></resource>
+        <resource relative="open-new"><get in="stage"/></resource>
+      </resource>
+    </resource>
+    <resource relative="[a-zA-Z0-9&#xF6;&#xE4;&#xFC;&#xD6;&#xC4;&#xDC; _-]+\.xml">
+      <get out='content'/>
+      <delete/>
+      <put in="content"/>
+      <put in="name"/> <!-- rename -->
+      <put in="dirname"/> <!-- move -->
+      <put in="newstage"/> <!-- shift -->
+      <resource relative="open"><get in="stage"/></resource>
+      <resource relative="open-new"><get in="stage"/></resource>
+    </resource>
+    <resource relative="dash">
+      <resource relative="show">
+        <get in="url"/>
+      </resource>
+      <resource relative="abandon">
+        <put in="url"/>
+      </resource>
+      <resource relative="events">
+        <sse/>
+      </resource>
+      <resource relative="instances">
+        <get in="engine" out="tree"/>
+        <resource>
+          <get in="engine" out="instance"/>
+        </resource>
+      </resource>
+      <resource relative="stats">
+        <get in="engine" out="stats"/>
+      </resource>
+    </resource>
+  </resource>
+</description>

data/lib/cpee-model-management/moma.xml

@@ -1,98 +1,19 @@
-<description xmlns="http://riddl.org/ns/description/1.0" xmlns:ann="http://riddl.org/ns/annotation/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <message name="item">
-    <parameter name="stage" type="string">
-      <xi:include href="stages"/>
-    </parameter>
-    <parameter name="new" type="string">
-      <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+</param>
-    </parameter>
-  </message>
-  <message name="name">
-    <parameter name="new" type="string">
-      <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+</param>
-    </parameter>
-  </message>
-  <message name="dir">
-    <parameter name="dir" type="string">
-      <param name="pattern">([a-zA-Z0-9öäüÖÄÜ _-]+)|</param>
-    </parameter>
-  </message>
-  <message name="dirname">
-    <parameter name="dir" type="string">
-      <param name="pattern">([a-zA-Z0-9öäüÖÄÜ _-]+)\.dir|</param>
-    </parameter>
-  </message>
-  <message name="duplicate">
-    <parameter name="new" type="string">
-      <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+</param>
-    </parameter>
-    <parameter name="old" type="string">
-      <param name="pattern">[a-zA-Z0-9öäüÖÄÜ _-]+\.xml</param>
-    </parameter>
-  </message>
-  <message name="stages">
-    <parameter name="stages" type="string"/>
-  </message>
-  <message name="newstage">
-    <parameter name="stage" type="string">
-      <xi:include href="stages"/>
-    </parameter>
-  </message>
-  <message name="stage">
-    <optional>
-      <parameter name="stage" type="string">
-        <xi:include href="stages"/>
-      </parameter>
-    </optional>
-  </message>
-  <message name="full">
-    <parameter name="full" type="string"/>
-    <optional>
-      <parameter name="stage" type="string">
-        <xi:include href="stages"/>
-      </parameter>
-    </optional>
-  </message>
-  <message name="list">
-    <parameter name="list" mimetype="application/json"/>
-  </message>
-  <message name="content">
-    <parameter name="content" mimetype="application/xml"/>
-  </message>
-  <resource>
-    <post in="item"/>
-    <post in="dir"/>
-    <post in="duplicate"/>
-    <get in="stage" out="list"/>
-    <get in="full" out="list"/>
-    <get in="stages" out="list"/>
-    <sse/>
-    <resource relative="[a-zA-Z0-9&#xF6;&#xE4;&#xFC;&#xD6;&#xC4;&#xDC; _-]+\.dir">
-      <post in="item"/>
-      <post in="duplicate"/>
-      <get in="stage" out="list"/>
-      <delete/>
-      <put in="name"/> <!-- rename -->
-      <resource relative="[a-zA-Z0-9&#xF6;&#xE4;&#xFC;&#xD6;&#xC4;&#xDC; _-]+\.xml">
-        <get out='content'/>
-        <delete/>
-        <put in="content"/>
-        <put in="name"/> <!-- rename -->
-        <put in="dirname"/> <!-- move -->
-        <put in="newstage"/> <!-- shift -->
-        <resource relative="open"><get in="stage"/></resource>
-        <resource relative="open-new"><get in="stage"/></resource>
-      </resource>
-    </resource>
-    <resource relative="[a-zA-Z0-9&#xF6;&#xE4;&#xFC;&#xD6;&#xC4;&#xDC; _-]+\.xml">
-      <get out='content'/>
-      <delete/>
-      <put in="content"/>
-      <put in="name"/> <!-- rename -->
-      <put in="dirname"/> <!-- move -->
-      <put in="newstage"/> <!-- shift -->
-      <resource relative="open"><get in="stage"/></resource>
-      <resource relative="open-new"><get in="stage"/></resource>
-    </resource>
-  </resource>
-</description>
+<declaration xmlns="http://riddl.org/ns/declaration/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <interface name="implementation">
+    <xi:include href="implementation.xml"/>
+  </interface>
+  <interface name="events">
+    <xi:include href="http://www.riddl.org/ns/common-patterns/notifications-consumer/2.0/consumer.xml"/>
+  </interface>
+
+  <facade>
+    <tile>
+      <layer name="implementation">
+        <apply-to>/</apply-to>
+      </layer>
+      <layer name="events">
+        <apply-to>/dash/events</apply-to>
+      </layer>
+    </tile>
+  </facade>
+</declaration>

data/server/moma.conf

@@ -2,6 +2,7 @@
 :models: models
 :location: https://cpee.org/design/server/
 :instantiate: https://cpee.org/flow/start/
+:show: https://cpee.org/flow/index.html?monitor=
 :cockpit:
   draft: https://cpee.org/flow/model.html?monitor=
   development: https://cpee.org/flow/edit.html?monitor=