cpee 2.1.79 → 2.1.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c964061a70cac85b0e31055837221a3a29682b805b09896eaf5625834950f8f9
-  data.tar.gz: 67cb5bf54c347a06c90862645e0b59cb47319be0088ec9a1f2b0b92f6d0fdd5c
+  metadata.gz: 2e3fdbc0afe42014b71076ce61c30e7cb3942296d18d9b9e69589e498198fa54
+  data.tar.gz: 27743df8fef01b352f3f0dd22584a707e17112c7c7ea3fe483e29d89dff0dfbc
 SHA512:
-  metadata.gz: 1c28c2b6a6c3e4440ffc5dbb5bb610cd501b76e98e5021c9b2fe391b93b2128d52b5e319db8f4d2b45fe7c136abc23b56e5a1b25061b4d18f725ec8f8d3af482
-  data.tar.gz: 899cefe9a892dc6e9159c3c0bf35109b26c141b775e74cd65dbc1d6b0aedaa2fdc73ad372641ee756b8906ce94de4243f2c7ba753430f8b3778f4d39df21a750
+  metadata.gz: fadeddcddb31ef17785cd016a6fc198a31b0ff7fc0807eba9f50bd2a595274c93534088e46482627b16a22f3ffac10c2b1866ea16294e14f66929aafa00ade99
+  data.tar.gz: f4489da3ae07ecbb5441ccbacb6c6b76cc9f605754f61698d49afcca3419b543fcaeccc8f215f059ec7db8245b99bbb1b642aa60870a2343ab4b8883a79275ca

data/README.md

@@ -1,7 +1,7 @@
 All code in this package is provided under the LGPL-3 license.
 Please read the file COPYING in the main directory.
 
-Tested for MRI 2.6, 2.7
+Tested for MRI 2.6, >= 2.7
 
 Searching for mem-leaks:
   valgrind --num-callers=50 --error-limit=no --partial-loads-ok=yes --undef-value-errors=no ./server/server.rb -v start

data/cockpit/css/wfadaptor.css

@@ -102,6 +102,15 @@ svg rect.tile {
   fill-opacity: 0.3;
   display: none;
 }
+svg .standline {
+  stroke: var(--wfadaptor-base);
+  stroke-width:1.6;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+}
 svg .stand {
   fill: var(--wfadaptor-background);
   fill-opacity:1;

data/cockpit/js/wfadaptor.js

@@ -105,7 +105,7 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
     }
     for(element in manifestation.elements) {
       if (manifestation.elements[element].illustrator) {
-        if (manifestation.elements[element].illustrator.svg) {
+        if (manifestation.elements[element].illustrator.svg && (typeof manifestation.elements[element].illustrator.svg === 'string' || manifestation.elements[element].illustrator.svg instanceof String)) {
           deferreds.push(
             $.ajax({
               type: "GET",
@@ -117,6 +117,46 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
               }
             })
           );
+        } else if (manifestation.elements[element].illustrator.svg && (typeof manifestation.elements[element].illustrator.svg === 'object' || manifestation.elements[element].illustrator.svg instanceof Object)) {
+          if (manifestation.elements[element].illustrator.svg.start) {
+            deferreds.push(
+              $.ajax({
+                type: "GET",
+                dataType: "xml",
+                url: manifestation.elements[element].illustrator.svg.start,
+                context: element,
+                success: function(res){
+                  manifestation.elements[this].illustrator.svg.start = $(res.documentElement);
+                }
+              })
+            );
+          }
+          if (manifestation.elements[element].illustrator.svg.middle) {
+            deferreds.push(
+              $.ajax({
+                type: "GET",
+                dataType: "xml",
+                url: manifestation.elements[element].illustrator.svg.middle,
+                context: element,
+                success: function(res){
+                  manifestation.elements[this].illustrator.svg.middle = $(res.documentElement);
+                }
+              })
+            );
+          }
+          if (manifestation.elements[element].illustrator.svg.end) {
+            deferreds.push(
+              $.ajax({
+                type: "GET",
+                dataType: "xml",
+                url: manifestation.elements[element].illustrator.svg.end,
+                context: element,
+                success: function(res){
+                  manifestation.elements[this].illustrator.svg.end = $(res.documentElement);
+                }
+              })
+            );
+          }
         }
         illustrator.elements[element] = manifestation.elements[element].illustrator;
         illustrator.elements[element].type = manifestation.elements[element].type || 'abstract';
@@ -182,6 +222,9 @@ function WfIllustrator(wf_adaptor) { // View  {{{
       '  <marker id="arrow" viewBox="0 0 10 10" refX="33" refY="5" orient="auto" markerUnits="strokeWidth" markerWidth="4.5" makerHeight="4.5">' +
       '    <path d="m 2 2 l 6 3 l -6 3 z"/>' +
       '  </marker>' +
+      '  <clipPath id="squareclip">' +
+      '    <rect x="-1" y="-1" width="32" height="32"/>' +
+      '  </clipPath>' +
       '</defs>'));
     self.svg.defs = {};
     self.svg.defs['unknown'] = $X('<g xmlns="http://www.w3.org/2000/svg" class="unknown">' +
@@ -190,6 +233,7 @@ function WfIllustrator(wf_adaptor) { // View  {{{
       '</g>');
     for(element in self.elements)
       if(self.elements[element].svg) {
+        console.log(self.elements[element].svg);
         var sym = $X('<g xmlns="http://www.w3.org/2000/svg"/>').append(self.elements[element].svg.clone().children()); // append all children to symbol
         $.each(self.elements[element].svg.attr('class').split(/\s+/), function(index, item) { sym.addClass(item); }); // copy all classes from the root node
         self.svg.defs[element] = sym;
@@ -382,7 +426,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     id_counter = {};
     labels = [];
     illustrator.clear();
-    var graph = parse(description.children('description').get(0), {'row':0,'col':0,final:false,wide:false});
+    var graph = parse(description.children('description').get(0), {'row':0,'col':0,dim:{},final:false,wide:false});
     illustrator.set_svg(graph);
     // set labels
     self.set_labels(graph);
@@ -434,7 +478,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     id_counter = {};
     labels = [];
     illustrator.clear();
-    var graph = parse(description.children('description').get(0), {'row':0,'col':0});
+    var graph = parse(description.children('description').get(0), {'row':0,'col':0,dim:{}});
     illustrator.set_svg(graph);
     // set labels
     self.set_labels(graph);
@@ -445,7 +489,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     if(update_illustrator){
       labels = [];
       illustrator.clear();
-      var graph = parse(description.children('description').get(0), {'row':0,'col':0});
+      var graph = parse(description.children('description').get(0), {'row':0,'col':0,dim:{}});
       illustrator.set_svg(graph);
       self.set_labels(graph);
     }
@@ -524,7 +568,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
   // }}}
   // Helper Functions {{{
   var parse = function(root, parent_pos)  { // private {{{
-    var pos = jQuery.extend(true, {}, parent_pos);
+    var pos = $.extend(true, {}, parent_pos);
     var max = {'row': 0,'col': 0};
     var prev = [parent_pos]; // connects parent with child(s), depending on the expansion
     var endnodes = [];
@@ -571,7 +615,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       if(illustrator.elements[tname] != undefined && illustrator.elements[tname].type == 'complex') {
         if(illustrator.elements[tname] != undefined && !illustrator.elements[tname].svg) pos.row--;
         // TODO: Remaining problem is the order inside the svg. Thats why the connection is above the icon
-        block = parse(context, jQuery.extend(true, {}, pos));
+        block = parse(context, $.extend(true, {}, pos));
         group.append(block.svg);
         block.svg.attr('id', 'group-' + $(context).attr('svg-id'));
         if(illustrator.elements[sname].endnodes == 'aggregate') endnodes = []; // resets endpoints e.g. potential preceding primitive
@@ -588,11 +632,11 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       var g;
       set_details(tname,sname,pos,context);
 
-      var origpos = jQuery.extend(true, {}, pos);
+      var origpos = $.extend(true, {}, pos);
       [g, endnodes] = draw_position(tname,origpos,prev,block,group,endnodes,context);
 
       // Prepare next iteration {{{
-      if(root_expansion == 'vertical') { prev = jQuery.extend(true, {}, endnodes); pos.row = block.max.row;} // covers e.g. input's for alternative, parallel_branch, ... everything with horizontal expansion
+      if(root_expansion == 'vertical') { prev = $.extend(true, {}, endnodes); pos.row = block.max.row;} // covers e.g. input's for alternative, parallel_branch, ... everything with horizontal expansion
       if(root_expansion == 'horizontal') pos.col = block.max.col;
       if(max.row < block.max.row) max.row = block.max.row;
       if(max.col < block.max.col) max.col = block.max.col;
@@ -616,7 +660,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
           [undefined, endnodes] = draw_position(ctname,pos,prev,block,group,[],context,{svg: g, pos: origpos});
         }
         set_details(ctname,csname,pos,context,true);
-        prev = jQuery.extend(true, {}, endnodes);
+        prev = $.extend(true, {}, endnodes);
       }
     });
 
@@ -711,7 +755,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     }
     if(illustrator.elements[sname] != undefined && illustrator.elements[sname].endnodes != 'this') {
       for(i in block.endnodes) { endnodes.push(block.endnodes[i]); } // collects all endpoints from different childs e.g. alternatives from choose
-    } else { endnodes = [jQuery.extend(true, {}, pos)]; } // sets this element as only endpoint (aggregate)
+    } else { endnodes = [$.extend(true, {}, pos)]; } // sets this element as only endpoint (aggregate)
     if(prev[0].row == 0 || prev[0].col == 0) { // this enforces the connection from description to the first element
       illustrator.draw.draw_connection(group, { row: 1, col: 1 }, pos, null, null, true);
     } else {
@@ -719,7 +763,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
         for (node in prev) {
           if (!prev[node].final) {
             if (prev[node].wide) {
-              var pn = jQuery.extend(true, {}, prev[node]);
+              var pn = $.extend(true, {}, prev[node]);
               if (pos.col > prev[node].col) {
                 pn.col = pos.col;
               }

data/cockpit/templates/Subprocess.xml

@@ -1,9 +1,16 @@
 <?xml version="1.0"?>
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <executionhandler>ruby</executionhandler>
-  <dataelements/>
+  <dataelements>
+    <res>{"CPEE-INSTANCE":"51480","CPEE-INSTANCE-URL":"https://cpee.org/flow/engine/51480","CPEE-INSTANCE-UUID":"61291a99-86a7-4396-8e0c-456728c60d09","CPEE-STATE":"finished","b":4,"end":1741703309.6717181,"start":1741703308.456953,"teams":["Eugen Rigger","Celine Mader","Nataliia Klievtsova","Juergen Mangler","David Williamson","Alan Joannidi","Dariusz Opoka","David Ellis","Martin Hintzen","Mark Mattimoe","Ekaterina Zhuravleva","Joanne Mailen","Andreas Schmid","Iain Wilkie","Luke Chan","Eliot Horsman","MEHDI FARIK","Nic Winter","Salim Akram","ROMAIN VIRY","CORINNE DELOR","YANN LISSILLOUR","Julian Chatwin","Gregor Mayr","Andreas Fussenegger","Alexandru Zloteanu","Clemens Neuner","Birthe Bittner","Jan Schrottenholzer","Michael Schoech","J&#xF6;rg Linden","Peter John Keill","Tobias Jonk","Ralf Mueller","Peter Kovacs","Sara Mota","Ulrich Juergenschellert","Yi Ju","Sven Scharfe","Armando Hoedl","Fabienne Meier","Olaf Zalewski","Stefan Bildstein","Sebastian Schade","Tomi Walter","Pascal Wolf","Thibaut Escourrou","Peter Jezsoviczki","Felix Breuss","Thomas Kladensky","Hossam Haridy","Christoph Stadler","Jens Beecken","Bernhard Klocker"]}</res>
+    <start>1741706229.7376199</start>
+    <substart>0.8481366634368896</substart>
+    <subend>2.062901735305786</subend>
+    <duration>69.02397441864014</duration>
+    <teams>{"CPEE-INSTANCE":"51480","CPEE-INSTANCE-URL":"https://cpee.org/flow/engine/51480","CPEE-INSTANCE-UUID":"61291a99-86a7-4396-8e0c-456728c60d09","CPEE-STATE":"finished","b":4,"end":1741703309.6717181,"start":1741703308.456953,"teams":["Eugen Rigger","Celine Mader","Nataliia Klievtsova","Juergen Mangler","David Williamson","Alan Joannidi","Dariusz Opoka","David Ellis","Martin Hintzen","Mark Mattimoe","Ekaterina Zhuravleva","Joanne Mailen","Andreas Schmid","Iain Wilkie","Luke Chan","Eliot Horsman","MEHDI FARIK","Nic Winter","Salim Akram","ROMAIN VIRY","CORINNE DELOR","YANN LISSILLOUR","Julian Chatwin","Gregor Mayr","Andreas Fussenegger","Alexandru Zloteanu","Clemens Neuner","Birthe Bittner","Jan Schrottenholzer","Michael Schoech","J&#xF6;rg Linden","Peter John Keill","Tobias Jonk","Ralf Mueller","Peter Kovacs","Sara Mota","Ulrich Juergenschellert","Yi Ju","Sven Scharfe","Armando Hoedl","Fabienne Meier","Olaf Zalewski","Stefan Bildstein","Sebastian Schade","Tomi Walter","Pascal Wolf","Thibaut Escourrou","Peter Jezsoviczki","Felix Breuss","Thomas Kladensky","Hossam Haridy","Christoph Stadler","Jens Beecken","Bernhard Klocker"]}</teams>
+  </dataelements>
   <endpoints>
-    <subprocess>https-post://echo.bpm.in.tum.de/flow/start/url/</subprocess>
+    <subprocess>https-post://cpee.org/flow/start/url/</subprocess>
     <user>https-post://cpee.org/services/timeout-user.php</user>
     <auto>https-post://cpee.org/services/timeout-auto.php</auto>
     <timeout>https://cpee.org/services/timeout.php</timeout>
@@ -12,11 +19,11 @@
   </endpoints>
   <attributes>
     <guarded>none</guarded>
-    <info>Subprocess</info>
     <modeltype>CPEE</modeltype>
     <theme>extended</theme>
-    <creator>Christine Ashcreek</creator>
     <guarded_id/>
+    <info>Subprocess</info>
+    <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
     <model_uuid>1fc43528-3e4a-40ee-8503-c0ed7e5d883c</model_uuid>
     <model_version/>
@@ -45,7 +52,8 @@
           <finalize output="result">data.res = result
 data.substart = result['start'].to_f - data.start.to_f
 data.subend = result['end'].to_f - data.start.to_f
-data.duration = Time.now.to_f - data.start.to_f</finalize>
+data.duration = Time.now.to_f - data.start.to_f
+data.teams = result</finalize>
           <update output="result"/>
           <rescue output="result"/>
         </code>

data/cockpit/templates/Subprocess.xml.attrs

@@ -1,10 +1,10 @@
 {
   "guarded": "none",
-  "info": "Subprocess",
   "modeltype": "CPEE",
   "theme": "extended",
-  "creator": "Christine Ashcreek",
   "guarded_id": "",
+  "info": "Subprocess",
+  "creator": "Christine Ashcreek",
   "author": "Christine Ashcreek",
   "model_uuid": "1fc43528-3e4a-40ee-8503-c0ed7e5d883c",
   "model_version": "",

data/cockpit/templates/Wait.xml

@@ -1,18 +1,23 @@
 <?xml version="1.0"?>
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <executionhandler>ruby</executionhandler>
-  <dataelements/>
+  <dataelements>
+    <b>4</b>
+    <end>1741703309.6717181</end>
+    <start>1741703308.456953</start>
+  </dataelements>
   <endpoints>
     <timeout>https://cpee.org/services/timeout.php</timeout>
     <subprocess>https://cpee.org/flow/start/url/</subprocess>
+    <orgmodel>http://localhost/data/ideas_phase1/zt.xml</orgmodel>
   </endpoints>
   <attributes>
     <guarded>none</guarded>
-    <info>Wait</info>
     <modeltype>CPEE</modeltype>
     <theme>extended</theme>
-    <creator>Christine Ashcreek</creator>
     <guarded_id/>
+    <info>Wait</info>
+    <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
     <model_uuid>c92d0c0b-8bbd-40dd-baad-01c5616dfceb</model_uuid>
     <model_version/>
@@ -68,6 +73,51 @@
           </code>
         </documentation>
       </call>
+      <call id="a3" endpoint="orgmodel">
+        <parameters>
+          <label>Names</label>
+          <method>:get</method>
+          <arguments/>
+        </parameters>
+        <code>
+          <prepare/>
+          <finalize output="result">result.register_namespace 'o', 'http://cpee.org/ns/organisation/1.0'
+data.teams = result.find("/o:organisation/o:subjects/o:subject[o:relation/@role='Product Manager']/@id").to_a</finalize>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
+        <annotations>
+          <_generic/>
+          <_timing>
+            <_timing_weight/>
+            <_timing_avg/>
+            <explanations/>
+          </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
+          <_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>
   <transformation>
@@ -75,4 +125,11 @@
     <dataelements type="none"/>
     <endpoints type="none"/>
   </transformation>
+  <subscriptions xmlns="http://riddl.org/ns/common-patterns/notifications-producer/2.0">
+    <subscription id="_instantiation_9c70f0aec95a9c021bb58785ecd8b674" url="http://localhost:9296/callback/_instantiation_9c70f0aec95a9c021bb58785ecd8b674">
+      <topic id="state">
+        <event>change</event>
+      </topic>
+    </subscription>
+  </subscriptions>
 </testset>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.79"
+  s.version          = "2.1.83"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The 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

@@ -93,7 +93,7 @@ module CPEE
     CPEE::redis_connect opts, 'Server Main'
 
     ### start by server
-    if opts[:libs_preload]&.is_a?(Array) && opts[:libs_preload].length > 0
+    if opts[:libs_preload]&.is_a?(Array) && opts[:libs_preload].length > 0 && opts[:libs_preloader]&.is_a?(String) && opts[:libs_preloader]&.strip != ''
       puts '(re)starting by-server ...'
       `pkill -f #{File.basename(opts[:libs_preloader])}`
       `#{opts[:libs_preloader]} '#{opts[:libs_preload].join("' '")}'`

data/lib/cpee/implementation_callbacks.rb

@@ -108,6 +108,13 @@ module CPEE
     end #}}}
 
     class ExCallback < Riddl::Implementation #{{{
+      def cleanup_encoding(val)
+        enc = CharlockHolmes::EncodingDetector.detect(val)
+        if enc[:type] == :text && enc[:confidence] > 40
+          val.force_encoding(enc[:ruby_encoding])
+        end
+        val
+      end
       def response
         id = @a[0]
         opts = @a[1]
@@ -125,10 +132,10 @@ module CPEE
               if e.class == Riddl::Parameter::Simple
                 [:simple,e.value]
               elsif e.class == Riddl::Parameter::Complex && e.value.size <= 512000
-                [:complex,e.mimetype,e.value.read]
+                [:complex,e.mimetype,cleanup_encoding(e.value.read)]
               else
-                # [:complex,'cpee-external-' + e.mimetype,e.value.read]
-                [:complex, e.mimetype,e.value.read]
+                # [:complex,'cpee-external-' + e.mimetype,cleanup_encoding(e.value.read)]
+                [:complex, e.mimetype,cleanup_encoding(e.value.read)]
               end
             ]
           }

data/lib/cpee/message.rb

@@ -17,6 +17,9 @@ module CPEE
   module Message
     @@who = 'cpee'
     @@type = 'instance'
+    @@tworkers = 1
+    @@last = -1
+
     def self::who #{{{
       @@who
     end #}}}

data/lib/cpee/persistence.rb

@@ -12,6 +12,9 @@
 # CPEE (file COPYING in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+require_relative 'attributes_helper'
+require_relative 'message'
+
 module CPEE
 
   module Persistence

data/server/executionhandlers/ruby/backend/run.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env by
-# require 'rbtrace'
 require 'yaml'
 opts = YAML::load_file(File.join(__dir__,'opts.yaml'))
 opts[:pidf] = __FILE__ + '.pid'

data/server/executionhandlers/ruby/connection.rb

@@ -297,13 +297,19 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
     if options['CPEE_EVENT']
       @controller.notify("task/#{options['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
-    else
-      @handler_returnValue = recv
-      @handler_returnOptions = options
     end
     if options['CPEE_STATUS']
       @controller.notify("activity/status", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_STATUS'])
     end
+
+    if options['CPEE_STATUS'] || options['CPEE_EVENT'] || options['CPEE_INSTANTIATION']
+      @handler_returnValue = nil
+      @handler_returnOptions = nil
+    else
+      @handler_returnValue = recv
+      @handler_returnOptions = options
+    end
+
     if options['CPEE_UPDATE']
       @handler_continue.continue WEEL::Signal::UpdateAgain
     else

data/server/executionhandlers/ruby/execution.rb

@@ -55,7 +55,6 @@ module CPEE
         end
         template = ERB.new(File.read(ExecutionHandler::Ruby::BACKEND_TEMPLATE), trim_mode: '-')
         res = template.result_with_hash(dsl: dsl, dataelements: dataelements, endpoints: endpoints, positions: positions)
-        pp dataelements
         File.write(File.join(opts[:instances],id.to_s,ExecutionHandler::Ruby::BACKEND_INSTANCE),res)
       end
 

data/tools/cpee

@@ -6,6 +6,7 @@ require 'fileutils'
 require 'webrick'
 require 'typhoeus'
 require 'xml/smart'
+require 'redis'
 require 'zip'
 require 'pp'
 
@@ -55,10 +56,12 @@ ARGV.options { |opt|
   opt.on(wrap("[ui]                   starts a simple static web server with the ui on http://localhost:8080. Use [cpui DIR] if you want stuff in apache or nginx."))
 	opt.on("")
   opt.on(wrap("[convert]              converts all testsets in the current directory to the newest format"))
+	opt.on("")
+  opt.on(wrap("[vacuum]               clean a redis.rdb in the current directory"))
   opt.parse!
 }
 if (ARGV.length == 0) ||
-   (ARGV.length == 1  && !(%w(ui convert).include?(ARGV[0]))) ||
+   (ARGV.length == 1  && !(%w(ui convert vacuum).include?(ARGV[0]))) ||
    (ARGV.length == 2  && !(%w(abandon abandon! stopping start delete! cpui new).include?(ARGV[0]))) ||
    (ARGV.length == 3  && !(%w(archive a_by_name).include?(ARGV[0]))) ||
    (ARGV.length >  3)
@@ -424,4 +427,17 @@ elsif command == 'new'
   else
     puts 'Directory already exists.'
   end
+elsif command == 'vacuum'
+  begin
+    redis = Redis.new(path: 'redis.sock', db: 0, id: 'vacuum')
+    instances = redis.zrange('instances', 0, -1)
+    redis.keys('*').each do |key|
+      k = key.match(/instance:(\d+)/)
+      if k && ! instances.include?(k[1])
+        redis.del key
+      end
+    end
+  rescue => e
+    puts 'no redis.sock or no redis db 0 found ...'
+  end
 end

data/tools/server/cpee.conf

@@ -0,0 +1,4 @@
+:workers: 1
+:libs_preload: []
+:libs_preloader: ''
+:libs_preloaderrun: /usr/bin/ruby

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.79
+  version: 2.1.83
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Ralph Vigne
 - Gerhard Stuermer
-autorequire:
 bindir: tools
 cert_chain: []
-date: 2025-02-21 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -914,7 +913,6 @@ files:
 - lib/properties/t_status.rng
 - lib/properties/t_transformation.rng
 - lib/properties/transformation.rng
-- server/dev.rb
 - server/executionhandlers/eval/backend/README.md
 - server/executionhandlers/eval/backend/instance.template
 - server/executionhandlers/eval/backend/opts.yaml
@@ -939,25 +937,20 @@ files:
 - server/resources/states.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
-- server/routing/end.pid
 - server/routing/end.rb
-- server/routing/forward-events-00.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.pid
-- server/server.rb
 - tools/cpee
 - tools/server/cpee
+- tools/server/cpee.conf
 - tools/server/resources/notifications/logging/subscription.xml
 - tools/server/resources/properties.init
 homepage: http://cpee.org/
 licenses:
 - LGPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -972,8 +965,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: The cloud process execution engine (cpee.org). If you just need workflow
   execution, without a rest service exposing it, then use WEEL.

data/server/dev.rb

@@ -1,34 +0,0 @@
-#!/usr/bin/ruby
-#
-# 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
-  module DEVELOP
-    RIDDL = "/home/mangler/Projects/riddl/lib/ruby"
-    WEEL = "/home/mangler/Projects/weel/lib/"
-  end
-end
-
-require 'rubygems'
-gem 'nokogiri'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/cpee/implementation')
-
-Riddl::Server.new(CPEE::SERVER, :port => 8298) do |opts|
-  accessible_description true
-  cross_site_xhr true
-  opts[:watchdog_start_off] true
-
-  use CPEE::implementation(opts)
-end.loop!

data/server/routing/end.pid

@@ -1 +0,0 @@
-55683

data/server/routing/forward-events-00.pid

@@ -1 +0,0 @@
-55702

data/server/routing/forward-votes.pid

@@ -1 +0,0 @@
-55696

data/server/routing/persist.pid

@@ -1 +0,0 @@
-55689

data/server/server.rb

@@ -1,27 +0,0 @@
-#!/usr/bin/ruby
-#
-# 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/>.
-
-require 'rubygems'
-gem 'nokogiri'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/cpee/implementation')
-
-Riddl::Server.new(CPEE::SERVER, :port => 8298) do |opts|
-  accessible_description true
-  cross_site_xhr true
-  process_out false
-
-  use CPEE::implementation(opts)
-end.loop!