cpee 2.1.26 → 2.1.32

data/cockpit/templates/Worklist.xml

@@ -1,33 +1,75 @@
+<?xml version="1.0"?>
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <executionhandler>ruby</executionhandler>
-  <dataelements>
-    <bla/>
-  </dataelements>
+  <dataelements/>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <worklist>http://cpee.org:9398</worklist>
+    <subprocess>https-post://cpee.org/flow/start/url/</subprocess>
+    <worklist>https-post://cpee.org/worklist/server/</worklist>
+    <send>https-post://cpee.org/ing/correlators/message/send/</send>
+    <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
+    <user>https-post://cpee.org/services/timeout-user.php</user>
+    <auto>https-post://cpee.org/services/timeout-auto.php</auto>
   </endpoints>
-  <positions/>
+  <attributes>
+    <info>Worklist</info>
+    <modeltype>CPEE</modeltype>
+    <organisation1>http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
+    <theme>extended</theme>
+    <creator>Christine Ashcreek</creator>
+    <author>Christine Ashcreek</author>
+    <design_stage>development</design_stage>
+    <design_dir>Templates.dir</design_dir>
+  </attributes>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a1" endpoint="worklist">
         <parameters>
           <label>OK OR NOT OK</label>
-          <method>:post</method>
           <arguments>
-            <orgmodel>organisation1</orgmodel>
-            <domain>Virtual Business 1</domain>
-            <form>http://cpee.org/~demo/form/form-f.html</form>
-            <role>Regular</role>
-            <schaden>55546</schaden>
-            <text>fetzen hin</text>
+            <orgmodel>https://cpee.org/~demo/orgviz/organisation_informatik.xml</orgmodel>
+            <domain>VirtualBusiness1</domain>
+            <form>https://cpee.org/~demo/form/form-f.html</form>
+            <role>Assistant</role>
+            <data>
+              <schaden>10000</schaden>
+              <text>destroyed</text>
+            </data>
           </arguments>
         </parameters>
         <code>
-          <finalize>data.bla = result</finalize>
+          <prepare/>
+          <finalize output="result">data.bla = result</finalize>
+          <update output="result"/>
+          <rescue output="result"/>
         </code>
-        <annotations/>
-        <documentation/>
+        <annotations>
+          <_timing>
+            <_timing_weight/>
+            <_timing_avg/>
+            <explanations/>
+          </_timing>
+          <_context_data_analysis>
+            <probes/>
+            <ips/>
+          </_context_data_analysis>
+          <report>
+            <url/>
+          </report>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+        <documentation>
+          <input/>
+          <output/>
+          <implementation>
+            <description/>
+          </implementation>
+          <code>
+            <description/>
+          </code>
+        </documentation>
       </call>
     </description>
   </description>
@@ -36,14 +78,4 @@
     <dataelements type="none"/>
     <endpoints type="none"/>
   </transformation>
-  <attributes>
-    <info>Worklist</info>
-    <modeltype>CPEE</modeltype>
-    <organisation1>http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
-    <theme>extended</theme>
-    <creator>Christine Ashcreek</creator>
-    <author>Christine Ashcreek</author>
-    <design_stage>development</design_stage>
-    <design_dir>Templates.dir</design_dir>
-  </attributes>
-</testset>
+</testset>

data/cockpit/templates/instantiate/Take_Perf.xml

@@ -15,19 +15,22 @@
           <method>:get</method>
           <arguments/>
         </parameters>
-        <_timing>
-          <_timing_min/>
-          <_timing_max/>
-          <_timing_avg/>
-        </_timing>
-        <_notes>
-          <_notes_general/>
-          <_attachments/>
-        </_notes>
         <code>
           <finalize output="result"/>
           <update output="result"/>
         </code>
+        <annotations>
+          <_timing>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+            <_attachments/>
+          </_notes>
+        </annotations>
+        <documentation/>
       </call>
     </description>
   </description>
@@ -43,4 +46,4 @@
     <customer>pilotfabrik</customer>
     <status>development</status>
   </attributes>
-</testset>
+</testset>

data/cockpit/templates/instantiate/Take_Sub.xml

@@ -19,14 +19,6 @@
             <endpoints/>
             <stream/>
           </arguments>
-          <stream>
-            <sensors/>
-            <aggregators/>
-            <costs/>
-          </stream>
-          <report>
-            <url/>
-          </report>
         </parameters>
         <annotations>
           <_timing>
@@ -39,7 +31,11 @@
           <_notes>
             <_notes_general/>
           </_notes>
+          <report>
+            <url/>
+          </report>
         </annotations>
+        <documentation/>
       </call>
     </description>
   </description>

data/cockpit/templates/instantiate/Take_X.xml

@@ -17,19 +17,22 @@
             <timeout>!data.time</timeout>
           </arguments>
         </parameters>
-        <_timing>
-          <_timing_min/>
-          <_timing_max/>
-          <_timing_avg/>
-        </_timing>
-        <_notes>
-          <_notes_general/>
-          <_attachments/>
-        </_notes>
         <code>
           <finalize output="result">data.duration = data.time</finalize>
           <update output="result"/>
         </code>
+        <annotations>
+          <_timing>
+            <_timing_min/>
+            <_timing_max/>
+            <_timing_avg/>
+          </_timing>
+          <_notes>
+            <_notes_general/>
+            <_attachments/>
+          </_notes>
+        </annotations>
+        <documentation/>
       </call>
     </description>
   </description>

data/cockpit/themes/compact/theme.js

@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/control/theme.js

@@ -329,7 +329,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/default/theme.js

@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/extended/theme.js

@@ -329,7 +329,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/model/theme.js

@@ -292,7 +292,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/packed/theme.js

@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cockpit/themes/preset/theme.js

@@ -311,7 +311,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.26"
+  s.version          = "2.1.32"
   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."

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] ||= {}