cpee 1.5.7 → 1.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b9072d66749c0b959532cde9a01d95fdf94280d6e2068e68c012027e8f94fcb
-  data.tar.gz: 71b87598486ac3dbb351bd2946090aed25b525f1603d8902988e0cd9ead4f61e
+  metadata.gz: 34b1f3d471e5c92ca9881d9d87b40e64a2174f124e1798b0f7a0dbd3a0735ead
+  data.tar.gz: aee9d4bd111c3358f93a0131fb832700909539c1bbbea3368c07468de1ae3369
 SHA512:
-  metadata.gz: '082193a63a7e5d2506232ae27e367c94f8689631b7b09d832053495a3dc276b1b1ed3a9c637a9523b1879bcef79c59ec2851f14735893bde43bada52ee4a5604'
-  data.tar.gz: 579a869a59bcd79ae5c9c5f75eaaa0e3eca6f8c4926b62f615e91ae413ede2b0e5652aa6e172413ba3e627e62854a0ee5f6a5d777cbb9f9b756005b2854b134a
+  metadata.gz: 4d4fb94c2c888fbd119ef01740df796346d1ab861ceedc9ba0a2164af557472fec49edd88f9b30f25484ab7997cafd5b54ae753e8d54061684881e338f2f49c1
+  data.tar.gz: bca86531f532f2f05c40d24d50fae035d4d569a798a9e418de6febb2364bc8255e1d9ced729ffbc226e18911f9d6224821529bc3ebe44fca6dc614cd7c9192cc

data/cockpit/index.html

@@ -188,7 +188,7 @@
                     <button name="state_stop" title='stop'>Stop</button>
                     <span id="state_extended">
                       <span> / </span>
-                      <button name="state_sim" title='simulate'>Sim</button>
+                      <button name="state_replay" title='replay'>Replay</button>
                       <span> / </span>
                       <button name="state_abandon" title='abandon'>Abandon</button>
                     </span>

data/cockpit/js/instance.js

@@ -78,7 +78,7 @@ function cockpit() { //{{{
   $("button[name=savesvg]").click(function(){ save_svg(); });
   $("button[name=state_start]").click(function(){ $(this).attr("disabled","disabled");start_instance(); });
   $("button[name=state_stop]").click(function(){ $(this).attr("disabled","disabled");stop_instance(); });
-  $("button[name=state_simulate]").click(function(){ $(this).attr("disabled","disabled");sim_instance(); });
+  $("button[name=state_replay]").click(function(){ $(this).attr("disabled","disabled");replay_instance(); });
   $("button[name=state_abandon]").click(function(){ aba_instance(); });
   $("input[name=votecontinue]").click(check_subscription);
   $("input[name=testsetfile]").change(load_testsetfile_after);
@@ -624,13 +624,13 @@ function monitor_instance_state_change(notification) { //{{{
       $('#state_extended').show();
       $("button[name=state_start]").show();
       $("button[name=state_stop]").hide();
-      $("button[name=state_sim]").show();
+      $("button[name=state_replay]").show();
       $("button[name=state_abandon]").show();
     } else if (notification == "running") {
       $('#state_extended').hide();
       $("button[name=state_start]").hide();
       $("button[name=state_stop]").show();
-      $("button[name=state_sim]").hide();
+      $("button[name=state_replay]").hide();
       $("button[name=state_abandon]").hide();
     }
 
@@ -699,12 +699,12 @@ function start_instance() {// {{{
     error: report_failure
   });
 }// }}}
-function sim_instance() {// {{{
+function replay_instance() {// {{{
   var url = $('body').attr('current-instance');
   $.ajax({
     type: "PUT",
     url: url + "/properties/values/state",
-    data: ({value: "simulating"}),
+    data: ({value: "replaying"}),
     error: report_failure
   });
 }// }}}

data/cockpit/track.html

@@ -83,11 +83,11 @@
               </button>
               <span id="state_extended">
                 <span> / </span>
-                <button name="state_sim" title='simulate'>
+                <button name="state_replay" title='replay'>
                   <svg viewBox="0 -1.5 7 12" width="10" height="16">
                     <path
                       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                      d="M 0,7.0741552 1.598154,6.8788136 q 0.144277,1.0115903 0.58266,1.4859901 0.443932,0.474402 1.193067,0.474402 0.793528,0 1.193066,-0.418589 0.405089,-0.4255654 0.405089,-0.990661 0,-0.362777 -0.172025,-0.6139303 Q 4.633538,6.5578953 4.211802,6.3695302 3.923247,6.2439536 2.896654,5.9230353 1.575957,5.5114228 1.04324,4.911445 0.294105,4.0672905 0.294105,2.8533821 q 0,-0.7813662 0.349596,-1.4580852 Q 0.998846,0.7116014 1.659195,0.3558006 2.325092,0 3.262898,0 4.794462,0 5.565794,0.8441546 6.342674,1.6883092 6.381518,3.0975591 L 4.73897,3.1882531 Q 4.633538,2.3999106 4.283941,2.0580629 3.939894,1.7092386 3.246251,1.7092386 q -0.71584,0 -1.120927,0.3697537 -0.260811,0.2372006 -0.260811,0.6348602 0,0.3627771 0.244164,0.6209071 0.31075,0.3278947 1.509366,0.6836954 1.198616,0.3558008 1.770178,0.7395073 0.577111,0.3767302 0.898962,1.0394962 0.327399,0.6557896 0.327399,1.6255215 0,0.8790367 -0.388439,1.6464517 -0.388442,0.767412 -1.098732,1.1441413 -0.710291,0.369755 -1.770178,0.369755 -1.542663,0 -2.369485,-0.8929903 Q 0.160924,8.7903717 0,7.0741552 Z"/>
+                      d="m -0.24999978,8.9999993 c 0,-2.7488167 0,-5.4976332 0,-8.24644997 C 1.1183278,0.76955385 2.4884861,0.71666052 3.8555376,0.79065567 4.5083287,0.83810218 5.2238942,1.0790874 5.5755039,1.7307256 6.1661398,2.7080902 6.0299484,4.2180754 5.1108772,4.9019222 4.7622397,5.1617467 4.3480204,5.2956156 3.9336064,5.3605366 4.9287868,5.9394132 5.4254071,7.0996814 6.0167729,8.0858876 6.1549588,8.3769029 6.4657247,8.7723933 6.5,8.9999999 c -0.5944185,0 -1.1888371,0 -1.7832559,0 C 4.0758679,7.9893475 3.4946311,6.9294648 2.7923497,5.9678488 2.4230355,5.5319748 1.8508715,5.5458842 1.3513114,5.5576027 c -0.1507526,-0.00412 -0.044576,0.272902 -0.076255,0.3990664 0,1.0144436 0,2.028887 0,3.0433307 -0.50835205,-3e-7 -1.01670555,8e-7 -1.52505618,-5e-7 z M 1.2750578,4.2411336 C 2.111059,4.2189781 2.9581852,4.3060525 3.7849326,4.1387394 4.4863715,3.8915585 4.5732952,2.6432813 3.9026802,2.2941453 3.5098807,2.068434 3.050719,2.1857044 2.6267379,2.1489138 c -0.4505578,-0.00242 -0.90112,0.00147 -1.3516801,-3.456e-4 0,0.6975176 0,1.3950347 0,2.0925522 z"
                   </svg>
                 </button>
                 <span> / </span>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.5.7"
+  s.version          = "1.5.8"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/controller.rb

@@ -167,6 +167,11 @@ module CPEE
       @thread = @instance.sim
     end # }}}
 
+    def replay # {{{
+      @thread.join if !@thread.nil? && @thread.alive?
+      @thread = @instance.replay
+    end # }}}
+
     def start # {{{
       @thread.join if !@thread.nil? && @thread.alive?
       unless @positions.empty?
@@ -244,7 +249,7 @@ module CPEE
     def serialize_state! # {{{
       @properties.activate_schema(:finished) if @instance.state == :finished || @instance.state == :abandoned
       @properties.activate_schema(:inactive) if @instance.state == :stopped  || @instance.state == :ready
-      @properties.activate_schema(:active)   if @instance.state == :running  || @instance.state == :simulating
+      @properties.activate_schema(:active)   if @instance.state == :running  || @instance.state == :simulating || @instance.state == :replaying
       if [:finished, :stopped, :ready, :abandoned].include?(@instance.state)
         state_change! @instance.state
       end
@@ -376,6 +381,8 @@ module CPEE
             start
           when 'simulating'
             sim
+          when 'replaying'
+            replay
           when 'ready'
             @instance.state_signal
           when 'abandoned'

data/server/handlerwrappers/default.rb

@@ -46,8 +46,12 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @label = ''
   end # }}}
 
-  def prepare(readonly, endpoints, parameters) #{{{
-    @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
+  def prepare(readonly, endpoints, parameters, replay=false) #{{{
+    if replay
+      @handler_endpoint = @controller.attributes[:replayer]
+    else
+      @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
+    end
     params = parameters.dup
     params[:arguments] = params[:arguments].dup if params[:arguments]
     params[:arguments]&.map! do |ele|
@@ -60,73 +64,78 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     params
   end #}}}
 
-  def activity_handle(passthrough, parameters) # {{{
-    raise "Wrong endpoint" if @handler_endpoint.nil? || @handler_endpoint.empty?
-    @label = parameters[:label]
-    @sensors = parameters[:sensors]
-    @aggregators = parameters[:aggregators]
-    @costs = parameters[:costs]
-    @controller.notify("activity/calling", :instance => @controller.instance, :instance_uuid => @controller.uuid, :label => @label, :instance_name => @controller.info, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
-    if passthrough.to_s.empty?
-      params = []
-      callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
-      (parameters[:arguments] || []).each do |s|
-        if s.respond_to?(:mimetype)
-          params <<  Riddl::Parameter::Complex.new(s.name.to_s,v.mimetype,v.value)
+  def proto_curl(parameters) #{{{
+    params = []
+    callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
+    (parameters[:arguments] || []).each do |s|
+      if s.respond_to?(:mimetype)
+        params <<  Riddl::Parameter::Complex.new(s.name.to_s,v.mimetype,v.value)
+      else
+        if s.name.to_s =~ /^__Q_/
+          params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__Q_/,''),CPEE::ValueHelper::generate(s.value),:query)
+        elsif s.name.to_s =~ /^__B_/
+          params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__B_/,''),CPEE::ValueHelper::generate(s.value),:body)
+        elsif s.name.to_s =~ /^__H_/
+          params <<  Riddl::Header.new(s.name.to_s.sub(/^__H_/,''),CPEE::ValueHelper::generate(s.value))
+        elsif s.name.to_s =~ /^__C_/
+          params <<  Riddl::Parameter::Complex.new(s.name.to_s.sub(/^__C_/,''),*CPEE::ValueHelper::generate(s.value).split(';',2))
         else
-          if s.name.to_s =~ /^__Q_/
-            params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__Q_/,''),CPEE::ValueHelper::generate(s.value),:query)
-          elsif s.name.to_s =~ /^__B_/
-            params <<  Riddl::Parameter::Simple.new(s.name.to_s.sub(/^__B_/,''),CPEE::ValueHelper::generate(s.value),:body)
-          elsif s.name.to_s =~ /^__H_/
-            params <<  Riddl::Header.new(s.name.to_s.sub(/^__H_/,''),CPEE::ValueHelper::generate(s.value))
-          elsif s.name.to_s =~ /^__C_/
-            params <<  Riddl::Parameter::Complex.new(s.name.to_s.sub(/^__C_/,''),*CPEE::ValueHelper::generate(s.value).split(';',2))
-          else
-            params <<  Riddl::Parameter::Simple.new(s.name.to_s,CPEE::ValueHelper::generate(s.value))
-          end
+          params <<  Riddl::Parameter::Simple.new(s.name.to_s,CPEE::ValueHelper::generate(s.value))
         end
       end
+    end
 
-      params << Riddl::Header.new("CPEE-BASE",@controller.base_url)
-      params << Riddl::Header.new("CPEE-INSTANCE",@controller.instance)
-      params << Riddl::Header.new("CPEE-INSTANCE-URL",@controller.instance_url)
-      params << Riddl::Header.new("CPEE-INSTANCE-UUID",@controller.uuid)
-      params << Riddl::Header.new("CPEE-CALLBACK",@controller.instance_url + '/callbacks/' + callback)
-      params << Riddl::Header.new("CPEE-CALLBACK-ID",callback)
-      params << Riddl::Header.new("CPEE-ACTIVITY",@handler_position)
-      params << Riddl::Header.new("CPEE-LABEL",parameters[:label]||'')
-      @controller.attributes.each do |key,value|
-        params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
-      end
+    params << Riddl::Header.new("CPEE-BASE",@controller.base_url)
+    params << Riddl::Header.new("CPEE-INSTANCE",@controller.instance)
+    params << Riddl::Header.new("CPEE-INSTANCE-URL",@controller.instance_url)
+    params << Riddl::Header.new("CPEE-INSTANCE-UUID",@controller.uuid)
+    params << Riddl::Header.new("CPEE-CALLBACK",@controller.instance_url + '/callbacks/' + callback)
+    params << Riddl::Header.new("CPEE-CALLBACK-ID",callback)
+    params << Riddl::Header.new("CPEE-ACTIVITY",@handler_position)
+    params << Riddl::Header.new("CPEE-LABEL",@label||'')
+    params << Riddl::Header.new("CPEE-REPLAY",@controller.attributes['replayer_args'])
+    @controller.attributes.each do |key,value|
+      params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
+    end
 
-      tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
-      type = $2 || parameters[:method] || 'post'
+    tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
+    type = $2 || parameters[:method] || 'post'
 
-      client = Riddl::Client.new(tendpoint)
+    client = Riddl::Client.new(tendpoint)
 
-      @controller.callbacks[callback] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
-      @handler_passthrough = callback
+    @controller.callbacks[callback] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
+    @handler_passthrough = callback
 
-      status, result, headers = client.request type => params
-      if status < 200 || status >= 300
-        headers['CPEE_SALVAGE'] = true
-        c = result[0]&.value
-        c = c.read if c.respond_to? :read
-        callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => c }))) ], headers)
+    status, result, headers = client.request type => params
+    if status < 200 || status >= 300
+      headers['CPEE_SALVAGE'] = true
+      c = result[0]&.value
+      c = c.read if c.respond_to? :read
+      callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => c }))) ], headers)
+    else
+      if headers['CPEE_INSTANTIATION']
+        @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+      end
+      if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
+        headers['CPEE_UPDATE'] = true
+        callback result, headers
+      elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
+        # do nothing, later on things will happend
       else
-        if headers['CPEE_INSTANTIATION']
-          @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
-        end
-        if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
-          headers['CPEE_UPDATE'] = true
-          callback result, headers
-        elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
-          # do nothing, later on things will happend
-        else
-          callback result, headers
-        end
+        callback result, headers
       end
+    end
+  end #}}}
+
+  def activity_handle(passthrough, parameters) # {{{
+    raise "Wrong endpoint" if @handler_endpoint.nil? || @handler_endpoint.empty?
+    @label = parameters[:label]
+    @sensors = parameters[:sensors]
+    @aggregators = parameters[:aggregators]
+    @costs = parameters[:costs]
+    @controller.notify("activity/calling", :instance => @controller.instance, :instance_uuid => @controller.uuid, :label => @label, :instance_name => @controller.info, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+    if passthrough.to_s.empty?
+      proto_curl parameters
     else
       @controller.callbacks[passthrough] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
       @handler_passthrough = passthrough

data/server/resources/properties.schema.active

@@ -71,6 +71,7 @@
       <running putable="true"/>
       <ready putable="true"/>
       <simulating putable="true"/>
+      <replaying putable="true"/>
       <abandoned putable="true"/>
     </ready>
     <running>
@@ -82,6 +83,11 @@
       <ready putable="false"/>
       <stopped putable="false"/>
     </simulating>
+    <replaying>
+      <stopping putable="true"/>
+      <finishing putable="false"/>
+      <finished putable="false"/>
+    </replaying>
     <stopping>
       <stopped putable="false"/>
     </stopping>
@@ -89,6 +95,7 @@
       <abandoned putable="true"/>
       <stopped putable="true"/>
       <running putable="true"/>
+      <replaying putable="true"/>
       <simulating putable="true"/>
     </stopped>
     <abandoned/>

data/server/resources/properties.schema.finished

@@ -71,6 +71,7 @@
       <ready putable="true"/>
       <running putable="true"/>
       <simulating putable="true"/>
+      <replaying putable="true"/>
       <abandoned putable="true"/>
     </ready>
     <running>
@@ -82,6 +83,11 @@
       <ready putable="false"/>
       <stopped putable="false"/>
     </simulating>
+    <replaying>
+      <stopping putable="true"/>
+      <finishing putable="false"/>
+      <finished putable="false"/>
+    </replaying>
     <stopping>
       <stopped putable="false"/>
     </stopping>
@@ -90,6 +96,7 @@
       <stopped putable="true"/>
       <running putable="true"/>
       <simulating putable="true"/>
+      <replaying putable="true"/>
     </stopped>
     <abandoned/>
     <finished/>

data/server/resources/properties.schema.inactive

@@ -71,6 +71,7 @@
       <running putable="true"/>
       <ready putable="true"/>
       <simulating putable="true"/>
+      <replaying putable="true"/>
       <abandoned putable="true"/>
     </ready>
     <running>
@@ -82,14 +83,17 @@
       <ready putable="false"/>
       <stopped putable="false"/>
     </simulating>
-    <stopping>
-      <stopped putable="false"/>
-    </stopping>
+    <replaying>
+      <stopping putable="true"/>
+      <finishing putable="false"/>
+      <finished putable="false"/>
+    </replaying>
     <stopped>
       <abandoned putable="true"/>
       <stopped putable="true"/>
       <running putable="true"/>
       <simulating putable="true"/>
+      <replaying putable="true"/>
     </stopped>
     <abandoned/>
     <finished/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl