cpee 2.0.11 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec2d0a3e32433094917a00ceb63a0b31bf58f3d7cc0596a3578ea559c62f7d19
-  data.tar.gz: e3c0b6196e91ce7453e29e280cc694dee44d2fa004b9a4734742d43558bd4944
+  metadata.gz: 8626501eb6fa91fc0c21782e57a5448f070fc717aa38d0cfb68bf783b5608794
+  data.tar.gz: a76f7036d8777a7b0d58eb1ba31b4a8c2cf6fe8b0ed45d34fe54001094224be8
 SHA512:
-  metadata.gz: 8bd50b009072a41ae75dd650ddbd777802250baf2a667a212c0a79971a837018d9abccb555363c9708c0c1eea2133fba888958ff5b77631b4b9f76ea76288864
-  data.tar.gz: af9862cf80d23a3653043e5a5b7ebd5015a64f825e521cf9ae57703d1995e5119691f8e85fbeb9444ee5fc9928d72a797b927fc0ba46e900669ff3e0a39a6d0c
+  metadata.gz: 4e7cc5e856f65f51c2bf89fdf1870cfede3e191c08b944f48a6eb03def8dea5bd5f9eb1e994863615068e6ff31f6ed33438cac119848b0626000f427125bcd80
+  data.tar.gz: 7d630f9034480e0ae433c9c983d30210cf24eaafcca8e89ef8afbacc7bb55e734a69505a91f807cb52c714cd2d1900f7140214519d40b3486f074e099f00ac1a

data/cockpit/js/ui.js

@@ -53,7 +53,7 @@ $(document).ready(function() {
         } else {
           $("body").attr('current-save',res_def['save-url']);
         }
-        if (res['testsets-url']) {
+        if (res['templates-url']) {
           $("body").attr('current-templates',res['templates-url']);
         } else {
           $("body").attr('current-templates',res_def['templates-url']);

data/cockpit/templates/Track Test.xml

@@ -24,7 +24,7 @@
                   <method>:post</method>
                   <arguments>
                     <behavior>wait_running</behavior>
-                    <url>http://localhost/flow/templates/instantiate.local/Take_Sub.xml</url>
+                    <url>https://cpee.org/flow/templates/instantiate/Take_Sub.xml</url>
                     <init>
                       <time>4</time>
                     </init>

data/cockpit/templates/instantiate.local/Take_Sub.xml

@@ -15,10 +15,8 @@
           <method>:post</method>
           <arguments>
             <behavior>wait_running</behavior>
-            <url>http://localhost/flow/templates/instantiate/Take_Perf.xml</url>
-            <init>
-              <time>!data.time</time>
-            </init>
+            <url>https://cpee.org/flow/templates/instantiate/Take_Perf.xml</url
+            <init/>
             <endpoints/>
             <stream/>
           </arguments>

data/cockpit/templates/instantiate/Take_Sub.xml

@@ -3,6 +3,7 @@
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>
     <start_url>https://cpee.org/flow/start/url/</start_url>
+    <timeout>https://cpee.org/services/timeout.php</timeout>
   </endpoints>
   <positions/>
   <description>
@@ -13,7 +14,7 @@
           <method>:post</method>
           <arguments>
             <behavior>wait_running</behavior>
-            <url>https://cpee.org/flow/templates/instantiate/Take_Perf.xml</url>
+            <url>https://cpee.org/flow/templates/instantiate/Take_X.xml</url>
             <init/>
             <endpoints/>
             <stream/>

data/cockpit/templates/instantiate/Take_X.xml

@@ -1,6 +1,6 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <dataelements>
-    <time>5</time>
+    <time>15</time>
   </dataelements>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <endpoints>

data/cockpit/themes/compact/rngs/loop.rng

@@ -19,4 +19,4 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/compact/rngs/parallel.rng

@@ -18,4 +18,4 @@
       <data type="string"/>
     </attribute>
   </element>
-</element>
+</element>

data/cockpit/themes/default/rngs/loop.rng

@@ -19,4 +19,4 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/default/rngs/parallel.rng

@@ -18,4 +18,4 @@
       <data type="string"/>
     </attribute>
   </element>
-</element>
+</element>

data/cockpit/themes/extended/rngs/loop.rng

@@ -19,4 +19,4 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/extended/rngs/parallel.rng

@@ -18,4 +18,4 @@
       <data type="string"/>
     </attribute>
   </element>
-</element>
+</element>

data/cockpit/themes/extended/theme.js

@@ -267,6 +267,7 @@ function WFAdaptorManifestation(adaptor) {
         var ep = self.endpoints[$(node).attr('endpoint')];
         var wait = $('_timing_wait',$(node).children('annotations')).text();
         var threshold = $('_timing_threshold',$(node).children('annotations')).text();
+        var adur = $('_timing_avg',$(node).children('annotations')).text();
         var lab = $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'');
         var ret = [ { column: 'ID', value: $(node).attr('id') } ];
         if (lab != '') {
@@ -278,6 +279,9 @@ function WFAdaptorManifestation(adaptor) {
         if (threshold != '') {
           ret.push({ column: 'Threshold', value: 'κ = ' + threshold });
         }
+        if (adur != '') {
+          ret.push({ column: 'Duration', value: '~T = ' + adur + 'm' });
+        }
         return ret;
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },

data/cockpit/themes/packed/rngs/loop.rng

@@ -19,4 +19,4 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/packed/rngs/parallel.rng

@@ -18,4 +18,4 @@
       <data type="string"/>
     </attribute>
   </element>
-</element>
+</element>

data/cockpit/themes/preset/rngs/loop.rng

@@ -19,4 +19,4 @@
       <data type="nonNegativeInteger" rngui:label="Times"/>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/preset/rngs/parallel.rng

@@ -18,4 +18,4 @@
       <data type="string"/>
     </attribute>
   </element>
-</element>
+</element>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0.11"
+  s.version          = "2.0.13"
   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/implementation.rb

@@ -227,7 +227,7 @@ module CPEE
             end
           end rescue nil # all the ones that are not ok, are ignored
         end
-        multi.set(File.join(instance, 'attributes', 'uuid'), SecureRandom.uuid)
+        multi.set(File.join(instance, 'attributes', 'uuid'), uuid)
         multi.zadd(File.join(instance, 'attributes'), -2, 'uuid')
         multi.set(File.join(instance, 'attributes', 'info'), name)
         multi.zadd(File.join(instance, 'attributes'), -1, 'info')

data/lib/cpee/implementation_notifications.rb

@@ -102,28 +102,24 @@ module CPEE
       end
     end #}}}
 
-     class CreateSubscription < Riddl::Implementation #{{{
+    class CreateSubscription < Riddl::Implementation #{{{
       def response
         id = @a[0]
         opts = @a[1]
 
-        if opts[:statemachine].readonly? id
-          @status = 423
-        else
-          key = Digest::MD5.hexdigest(Kernel::rand().to_s)
+        key = Digest::MD5.hexdigest(Kernel::rand().to_s)
 
-          url = @p[0].name == 'url' ? @p.shift.value : nil
-          values = []
-          while @p.length > 0
-            topic = @p.shift.value
-            base = @p.shift
-            type = base.name
-            values += base.value.split(',').map { |i| File.join(topic,type[0..-2],i) }
-          end
-          @header = CPEE::Persistence::set_handler(id,opts,key,url,values)
-
-          Riddl::Parameter::Simple.new('key',key)
+        url = @p[0].name == 'url' ? @p.shift.value : nil
+        values = []
+        while @p.length > 0
+          topic = @p.shift.value
+          base = @p.shift
+          type = base.name
+          values += base.value.split(',').map { |i| File.join(topic,type[0..-2],i) }
         end
+        @header = CPEE::Persistence::set_handler(id,opts,key,url,values)
+
+        Riddl::Parameter::Simple.new('key',key)
       end
     end #}}}
 
@@ -180,7 +176,7 @@ module CPEE
             state = mess.dig('content','state')
             if state == 'finished' || state == 'abandoned'
               opts.dig(:sse_connections,mess.dig('instance').to_i)&.each do |key,sse|
-                EM.add_timer(2) do # just to be sure that all messages arrived
+                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
               end
@@ -202,7 +198,7 @@ module CPEE
         @opts = @a[1]
         @id = @a[0]
         @key = @r[-2]
-        if !@opts[:statemachine].readonly?(@id) && CPEE::Persistence::exists_handler?(@id,@opts,@key)
+        if CPEE::Persistence::exists_handler?(@id,@opts,@key)
           @opts[:sse_connections][@id] ||= {}
           @opts[:sse_connections][@id][@key] = self
           true

data/lib/cpee/implementation_properties.rb

@@ -660,8 +660,11 @@ module CPEE
           @status = 422 # semantic error
         else
           begin
-            PutDescription::set(id,opts,@p[0].value.read)
-          rescue
+            # force-encoding because johannes managed to sneak in ascii special characters. why the browser is not sanitizing it is beyond me.
+            PutDescription::set(id,opts,@p[0].value.read.force_encoding('UTF-8'))
+          rescue => e
+            puts e.message
+            puts e.backtrace
             @status = 400
           end
         end

data/server/handlerwrappers/default.rb

@@ -126,6 +126,9 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       if headers['CPEE_INSTANTIATION']
         @controller.notify("task/instantiation", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']))
       end
+      if headers['CPEE_EVENT']
+        @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint)
+      end
       if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
         headers['CPEE_UPDATE'] = true
         callback result, headers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.13
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -508,16 +508,11 @@ files:
 - server/resources/topics.xml
 - server/resources/transformation.xml
 - server/resources/transformation_dslx.xsl
-- server/routing/end.pid
 - server/routing/end.rb
-- server/routing/forward-events.pid
 - server/routing/forward-events.rb
-- server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
-- server/routing/persist.pid
 - server/routing/persist.rb
 - server/server.conf
-- server/server.pid
 - server/server.rb
 - tools/cpee
 - tools/server/resources/notifications/logging/subscription.xml

data/server/routing/end.pid

@@ -1 +0,0 @@
-189089

data/server/routing/forward-events.pid

@@ -1 +0,0 @@
-189071

data/server/routing/forward-votes.pid

@@ -1 +0,0 @@
-189081

data/server/routing/persist.pid

@@ -1 +0,0 @@
-189085

data/server/server.pid

@@ -1 +0,0 @@
-189185