cpee 2.0.22 → 2.0.27

data/cockpit/themes/preset/theme.js

@@ -49,6 +49,16 @@ function WFAdaptorManifestation(adaptor) {
     });
     return svgid;
   }; //}}}
+  //{{{ Return the json for all marked tasks
+  this.marked_text = function(){
+    var nodes = [];
+    var markymark = _.uniq(self.marked());
+    $(markymark).each(function(key,svgid){
+      var node = self.adaptor.description.get_node_by_svg_id(svgid);
+      nodes.push($(node).serializePrettyXML());
+    });
+    return JSON.stringify(nodes);
+  }; //}}}
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
@@ -76,35 +86,46 @@ function WFAdaptorManifestation(adaptor) {
   }; //}}}
 
   function copyOrMove(menu,group,xml_node,mode) { //{{{
-    var markymark = _.uniq(self.marked());
+    var nodes = localStorage.getItem('marked');
+
+    if (typeof(nodes) != "string") { return; }
+
+    nodes = JSON.parse(nodes);
+    $(nodes).each(function(key,str) {
+      nodes[key] = $X(str);;
+    });
+
     var check1 = [];
     var check2 = [];
-    $(markymark).each(function(key,svgid){
-      var node = self.adaptor.description.get_node_by_svg_id(svgid);
+    $(nodes).each(function(key,node){
       check1.push($(node).attr('svg-type'));
     });
     $(group).each(function(key,value){
       check2.push(value.type);
     });
 
-    if (markymark.length > 0 && _.uniq(check1).length == _.intersection(check1,check2).length) {
-      var nodes = [];
-      $(markymark).each(function(key,svgid){
-        var node = self.adaptor.description.get_node_by_svg_id(svgid);
-        nodes.unshift(node);
-      });
-
+    if (nodes.length > 0 && _.uniq(check1).length == _.intersection(check1,check2).length) {
+      if (myid == localStorage.getItem('marked_from')) {
+        $(nodes).each(function(key,node){
+          nodes[key] = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+        });
+      }
+      nodes.reverse();
       var iconm =  self.resources['arrow'].clone();
       var iconc =  self.resources['arrow'].clone();
       iconm.children('.rfill').addClass('menu');
+      if (myid == localStorage.getItem('marked_from')) {
+        menu.push(
+          {
+            'label': '<em>Move Marked Elements</em>',
+            'function_call': mode,
+            'menu_icon': iconm,
+            'type': undefined,
+            'params': [nodes, xml_node]
+          }
+        );
+      }
       menu.push(
-        {
-          'label': '<em>Move Marked Elements</em>',
-          'function_call': mode,
-          'menu_icon': iconm,
-          'type': undefined,
-          'params': [nodes, xml_node]
-        },
         {
           'label': '<em>Copy Marked Elements</em>',
           'function_call': mode,
@@ -223,10 +244,20 @@ function WFAdaptorManifestation(adaptor) {
           tab.empty();
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
-        vtarget.parents('g.element[element-id]').toggleClass('marked');
+        var vt = vtarget.parents('g.element[element-id]');
+            vt.toggleClass('marked');
+        if (vt.hasClass('marked')) {
+          localStorage.setItem('marked',self.marked_text());
+          localStorage.setItem('marked_from',myid);
+        } else {
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
+        }
       }
     } else {
       self.adaptor.illustrator.get_elements().removeClass('marked');
+      localStorage.removeItem('marked');
+      localStorage.removeItem('marked_from');
 
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {

data/cockpit/track.html

@@ -37,11 +37,11 @@
 
     <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
 
-    <script type="text/javascript" src="/js_libs/ui.js"></script>
+    <script type="text/javascript" src="/js_libs/uidash.js"></script>
     <script type="text/javascript" src="/js_libs/custommenu.js"></script>
 
     <link   rel="stylesheet"      href="/js_libs/custommenu.css" type="text/css"/>
-    <link   rel="stylesheet"      href="/js_libs/ui.css" type="text/css"/>
+    <link   rel="stylesheet"      href="/js_libs/uidash.css" type="text/css"/>
 
     <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
 
@@ -58,7 +58,7 @@
     <link rel="stylesheet" href="css/ui.css" type="text/css"/>
     <link rel="stylesheet" href="css/track.css" type="text/css"/>
   </head>
-  <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui">
+  <body data-base-port="8298" data-res-port="9303" data-theme-base="themes" is="x-ui-">
     <div class='hidden' id='relaxngworker'></div>
     <div id="trackfull">
       <div id='graphcolumn'>
@@ -111,13 +111,6 @@
                 </svg>
               </button>
               <span id="state_extended">
-                <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.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>
                 <button name="state_abandon" title='abandon'>
                   <svg viewBox="0 -1.5 7 12" width="10" height="16">
                     <path

data/cockpit/transformations.xml

@@ -0,0 +1,4 @@
+<transformations>
+  <transformation>CPEE</transformation>
+  <transformation>Signavio</transformation>
+</transformations>

data/cpee.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0.22"
+  s.version          = "2.0.27"
   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."
 
   s.description      = "see http://cpee.org"
 
-  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,tools/archive,lib/**/*,cockpit/**/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*,server/redis*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
+  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,tools/archive,lib/**/*,cockpit/**/*,cockpit/templates/.templates.xml,cockpit/templates/.transformations.xml,cockpit/templates/.Signavio.xml,cockpit/templates/.CPEE.xml,cockpit/*.html,cockpit/themes/*/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*,server/redis*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
   s.require_path     = 'lib'
   s.extra_rdoc_files = ['README.md']
   s.bindir           = 'tools'
@@ -26,5 +26,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'json', '~>2.1'
   s.add_runtime_dependency 'redis', '~> 4.1'
-  s.add_runtime_dependency 'rubyzip', '~>1.2'
+  s.add_runtime_dependency 'rubyzip', '~>2'
 end

data/lib/callbacks.xml

@@ -20,11 +20,16 @@
       <xi:include href="callbacks/callbacks.rng"/>
     </parameter>
   </message>
+  <message name="callback">
+    <parameter name="callback" mimetype="application/json"/>
+  </message>
 
   <resource>
     <doc:documentation>xb</doc:documentation>
     <get in="*" out="callbacks"/>
     <resource>
+      <get out="callback"/>
+      <delete/>
       <put in="*"/>
     </resource>
   </resource>

data/lib/cpee/controller.rb

@@ -52,6 +52,34 @@ module CPEE
       @opts = opts
       @instance = nil
       @loop_guard = {}
+
+      @callback_keys = {}
+      @psredis = @opts[:redis_dyn].call
+
+      Thread.new do
+        @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]))
+                end
+              end
+              @callback_keys[what[18..-1]].send(:callback,resp,m['content']['headers'])
+            end
+            if pat == 'callback-end:*'
+              @callback_keys.delete(what[13..-1])
+            end
+          end
+        end
+      end
     end
 
     attr_reader :id
@@ -139,7 +167,7 @@ module CPEE
         @votes += votes
         psredis = @opts[:redis_dyn].call
         collect = []
-        psredis.subscribe(votes.map{|e| ['vote-response:' + e.to_s, 'vote-end:' + e.to_s] }.flatten) do |on|
+        psredis.subscribe(votes.map{|e| ['vote-response:' + e.to_s] }.flatten) do |on|
           on.message do |what, message|
             index = message.index(' ')
             mess = message[index+1..-1]
@@ -160,33 +188,7 @@ module CPEE
 
     def callback(hw,key,content)
       CPEE::Message::send(:callback,'activity/content',base,@id,uuid,info,content.merge(:key => key),@redis)
-
-      psredis = @opts[:redis_dyn].call
-      response = nil
-      Thread.new do
-        psredis.subscribe('callback-response:' + key, 'callback-end:' + key) do |on|
-          on.message do |what, message|
-            if what == 'callback-response:' + key
-              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
-              hw.send(:callback,resp,m['content']['headers'])
-            end
-            if what == 'callback-end:' + key
-              psredis.unsubscribe
-            end
-          end
-        end
-      end
+      @callback_keys[key] = hw
     end
 
     def cancel_callback(key)

data/lib/cpee/implementation_callbacks.rb

@@ -7,6 +7,8 @@ module CPEE
       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
         end
       end
@@ -26,6 +28,64 @@ module CPEE
           ret.to_s
         end
       end
+    end # }}}
+
+    class GetCallback < Riddl::Implementation #{{{
+      def response
+        id = @a[0]
+        opts = @a[1]
+        callback = @r[-1]
+
+        if opts[:redis].sismember("instance:#{id}/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[:subscription] = sub
+          end
+
+          Riddl::Parameter::Complex.new("callback","application/json",JSON.generate(res))
+        else
+          @status = 404
+        end
+      end
+    end #}}}
+
+    class DelCallback < Riddl::Implementation #{{{
+      def response
+        id = @a[0]
+        opts = @a[1]
+        callback = @r[-1]
+
+        if opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'callback'
+          CPEE::Message::send(
+            :'callback-end',
+            callback,
+            opts[:url],
+            id,
+            {},
+            {},
+            {},
+            opts[:redis]
+          )
+        elsif opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'vote'
+          CPEE::Message::send(
+            :'vote-response',
+            callback,
+            opts[:url],
+            id,
+            {},
+            {},
+            'true',
+            opts[:redis]
+          )
+        else
+          @status = 404
+        end
+        nil
+      end
     end #}}}
 
     class ExCallback < Riddl::Implementation #{{{

data/lib/cpee/implementation_notifications.rb

@@ -169,8 +169,12 @@ module CPEE
       conn.psubscribe('forward:*','event:state/change') do |on|
         on.pmessage do |pat, what, message|
           if pat == 'forward:*'
-            _, id, key = what.match(/forward(-end)?:([^\/]+)\/(.+)/).captures
-            opts.dig(:sse_connections,id.to_i,key)&.send message
+            id, key = what.match(/forward:([^\/]+)\/(.+)/).captures
+            if sse = opts.dig(:sse_connections,id.to_i,key)
+              sse.send message
+            else
+              DeleteSubscription::set(id,opts,key)
+            end
           elsif pat == 'event:state/change'
             mess = JSON.parse(message[message.index(' ')+1..-1])
             state = mess.dig('content','state')

data/server/handlerwrappers/default.rb

@@ -50,10 +50,12 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @handler_returnOptions = nil
     @handler_activity_uuid = Digest::MD5.hexdigest(Kernel::rand().to_s)
     @label = ''
+    @guard_files = []
+    @guard_items = []
   end # }}}
 
   def prepare(readonly, endpoints, parameters, replay=false) #{{{
-    if replay
+    if replay && @controller.attributes[:replayer]
       @handler_endpoint = @controller.attributes[:replayer]
     else
       @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
@@ -99,7 +101,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     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'])
+    params << Riddl::Header.new("CPEE-REPLAY",@controller.attributes['replayer_target']) if @controller.attributes[:replayer] && @controller.attributes['replayer_target']
     @controller.attributes.each do |key,value|
       params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
     end
@@ -109,8 +111,8 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
     client = Riddl::Client.new(tendpoint)
 
-    @controller.callback(self,callback,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
     @handler_passthrough = callback
+    @controller.callback(self,callback,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
 
     status, result, headers = client.request type => params
     if status < 200 || status >= 300
@@ -261,8 +263,8 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
   def callback(result=nil,options={})
     @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
-    result = simplify_result(result)
-    @handler_returnValue = result
+    @guard_files += result
+    @handler_returnValue = simplify_result(result)
     @handler_returnOptions = options
     if options['CPEE_UPDATE']
       if options['CPEE_UPDATE_STATUS']
@@ -280,6 +282,16 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     end
   end
 
+  def mem_guard() #{{{
+    @guard_files.each do |p|
+      if p&.respond_to?(:close)
+        p.close
+      elsif  p&.value&.respond_to?(:close)
+        p.value.close
+      end
+    end
+  end #}}}
+
   def test_condition(mr,code)
     res = mr.instance_eval(code)
     @controller.notify("condition/eval", :instance_uuid => @controller.uuid, :code => code, :condition => (res ? "true" : "false"))

data/server/resources/notifications/logging/subscription.xml

@@ -16,4 +16,10 @@
   <topic id="task">
     <event>instantiation</event>
   </topic>
+  <topic id="state">
+    <event>change</event>
+  </topic>
+  <topic id="description">
+    <event>change</event>
+  </topic>
 </subscription>

data/server/resources/transformation_dslx.xsl

@@ -509,7 +509,7 @@
       <xsl:when test="child::node()[not(self::text())]">
         <!-- FUUUU, there is probably much more TODO. Updated Matthias und Juergen, we tested for ing-opcua/execute -->
         <xsl:choose>
-          <xsl:when test="child::* and name(child::*)=concat(name(.),'_item')  and count(child::*[not(name()=name(../child::*[1]))])=0">
+          <xsl:when test="child::* and name(child::*)=concat(name(.),'_item') and count(child::*[not(name()=name(../child::*[1]))])=0">
             <xsl:text>"[ </xsl:text>
             <xsl:apply-templates select="*" mode="JSONArrayItem"/>
             <xsl:text>]"</xsl:text>

data/server/routing/end.pid

@@ -0,0 +1 @@
+592867

data/server/routing/end.rb

@@ -46,6 +46,7 @@ Daemonite.new do |opts|
           multi.del("instance:#{instance}/callback/#{key}/label")
           multi.del("instance:#{instance}/callback/#{key}/position")
           multi.del("instance:#{instance}/callback/#{key}/type")
+          multi.del("instance:#{instance}/callback/#{key}/subscription")
         end
       rescue => e
         puts e.message