cpee 2.1.60 → 2.1.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd7942bd8ba2e107cd418f077feefe68de8b560246102828b8eebdeafa4fe86f
-  data.tar.gz: 980b94821ec080ac2c2e5cd315a9a0750c36dfa9268bf42b016d2c3c16d3a8be
+  metadata.gz: de80687b26430a0d4051fded9d255695cbe12bd5d3f5595bbaf370076d0bc7ef
+  data.tar.gz: a97d8605202a279b884a7872f7045270b0600ca7ebd889aadd598222f4671992
 SHA512:
-  metadata.gz: ab5b010270a03e60c8492026fe496596563ac3427a94e471178e4015857ea95e84a7bebfd3825274a9d5fb2182a24c2aa6f53524674e8ee41c9c12b9a0c441a9
-  data.tar.gz: ef5153737d63496863bd245efd153c2ce3d6ed388f1b3529d790d12be2935eb067375d7a3b7208b5dafde201f27b1f3a7fe6c4f85d72f5f769f6e22b0086fc99
+  metadata.gz: 9f8223d762b0396e5bfe72bb5f3aa649ddcac18d9d69e3d4e009272f7acaef9119c5de0489110c795f46b3b9fa3e482b6754615da2c067ba8f981a00ebee3a03
+  data.tar.gz: 731c82b38a6a493535becdf2389c57d0471e182442d86d7b198d79aa8b7470af8ffd0a4042847257eb9fbbee707adb2e88cb946b5f181e116ffe00c57bf547ea

data/cockpit/js/edit.js

@@ -1,3 +1,5 @@
+skip_location = true;
+
 document.addEventListener('graph:changed', function (e) {
   $("button[name=save]").prop("disabled",false);
 }, false);

data/cockpit/js/instance.js

@@ -1,5 +1,6 @@
 var es;
 var suspended_redrawing = false;
+var skip_location = false;
 var myid = ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16));
 var paths = '#dat_details input, #dat_details textarea, #dat_details select, #dat_details button, #dat_details [contenteditable], #dat_dataelements input, #dat_dataelements textarea, #dat_dataelements select, #dat_dataelements button, #dat_dataelements [contenteditable], #dat_endpoints input, #dat_endpoints textarea, #dat_endpoints select, #dat_endpoints button, #dat_endpoints [contenteditable], #dat_attributes input, #dat_attributes textarea, #dat_attributes select, #dat_attributes button, #dat_attributes [contenteditable]';
 var loading = false;
@@ -1175,7 +1176,10 @@ async function set_testset(testset,exec) {// {{{
   tset.append($("testset > attributes",testset));
   tset.append($("testset > description",testset));
   tset.append($("testset > transformation",testset));
-  $('testset > attributes > info',tset).remove();
+  if (skip_location) {
+    $('properties > attributes > info',tset).remove();
+    $('properties > attributes > design_dir',tset).remove();
+  }
 
   promises.push(
     $.ajax({

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.60"
+  s.version          = "2.1.62"
   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."
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 1.0'
-  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.111'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.121'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'rubyzip', '~>2'
@@ -30,4 +30,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'mimemagic', '~>0'
   s.add_runtime_dependency 'get_process_mem', '~>0.2'
   s.add_runtime_dependency 'webrick', '~>1.7'
+  s.add_runtime_dependency 'rbtrace', '~>0.4'
+  s.add_runtime_dependency 'cpee-eval-ruby', '~> 1.0'
 end

data/lib/cpee/implementation_properties.rb

@@ -109,6 +109,7 @@ module CPEE
         doc.find('/p:properties/p:state/@changed').first.value = CPEE::Persistence::extract_item(id,opts,'state/@changed')
         doc.find('/p:properties/p:status/p:id').first.text = CPEE::Persistence::extract_item(id,opts,'status/id')
         doc.find('/p:properties/p:status/p:message').first.text = CPEE::Persistence::extract_item(id,opts,'status/message')
+        doc.find('/p:properties/p:executionhandler').first.text = CPEE::Persistence::extract_item(id,opts,'executionhandler')
         %w{dataelements endpoints attributes}.each do |item|
           des = doc.find("/p:properties/p:#{item}").first
           CPEE::Persistence::extract_list(id,opts,item).each{ |de| des.add(*de) }

data/lib/cpee/message.rb

@@ -39,8 +39,8 @@ module CPEE
       @@last < @@tworkers-1 ? @@last += 1 : @@last = 0
     end
 
-    def self::send(type, event, cpee, instance, instance_uuid, instance_name, content={}, backend=nil)
-      target = '%02i' % CPEE::Message::target
+    def self::send(type, event, cpee, instance, instance_uuid, instance_name, content={}, backend=nil, tt=nil)
+      target = '%02i' % (tt || CPEE::Message::target)
       topic = ::File::dirname(event)
       name = ::File::basename(event)
       payload = {

data/server/executionhandlers/ruby/connection.rb

@@ -16,6 +16,7 @@ require 'charlock_holmes'
 require 'mimemagic'
 require 'base64'
 require 'get_process_mem'
+require 'cpee-eval-ruby/translation'
 
 class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::loop_guard(arguments,id,count) # {{{
@@ -35,6 +36,9 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::inform_syntax_error(arguments,err,code)# {{{
     # TODO extract spot (code) where error happened for better error handling (ruby 3.1 only)
     # https://github.com/rails/rails/pull/45818/commits/3beb2aff3be712e44c34a588fbf35b79c0246ca5
+    puts err.message
+    puts err.backtrace
+
     controller = arguments[0]
     mess = err.backtrace ? err.backtrace[0].gsub(/([\w -_]+):(\d+):in.*/,'\\1, Line \2: ') : ''
     mess += err.message
@@ -273,7 +277,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       @controller.notify("status/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :id => status.id, :message => status.message)
     end
     unless changed_dataelements.nil? || changed_dataelements.empty?
-      de = dataelements.slice(*changed_dataelements).transform_values { |v| enc = detect_encoding(v); (enc == 'OTHER' ? v : (v.encode('UTF-8',enc) rescue convert_to_base64(v))) }
+      de = dataelements.slice(*changed_dataelements).transform_values { |v| enc = CPEE::EvalRuby::Translation::detect_encoding(v); (enc == 'OTHER' ? v : (v.encode('UTF-8',enc) rescue CPEE::EvalRuby::Translation::convert_to_base64(v))) }
       @controller.notify("dataelements/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => de)
     end
     unless changed_endpoints.nil? || changed_endpoints.empty?
@@ -288,105 +292,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     @controller.vote("activity/syncing_before", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label, :parameters => parameters)
   end # }}}
 
-  def simplify_result(result)
-    if result.length == 1
-      if result[0].is_a? Riddl::Parameter::Simple
-        result = result[0].value
-      elsif result[0].is_a? Riddl::Parameter::Complex
-        if result[0].mimetype == 'application/json'
-          result = JSON::parse(result[0].value.read) rescue nil
-        elsif result[0].mimetype == 'text/csv'
-          result = result[0].value.read
-        elsif result[0].mimetype == 'text/yaml'
-          result = YAML::load(result[0].value.read) rescue nil
-        elsif result[0].mimetype == 'application/xml' || result[0].mimetype == 'text/xml'
-          result = XML::Smart::string(result[0].value.read) rescue nil
-        elsif result[0].mimetype == 'text/plain'
-          result = result[0].value.read
-          if result.start_with?("<?xml version=")
-            result = XML::Smart::string(result)
-          else
-            result = result.to_f if result == result.to_f.to_s
-            result = result.to_i if result == result.to_i.to_s
-          end
-        elsif result[0].mimetype == 'text/html'
-          result = result[0].value.read
-          result = result.to_f if result == result.to_f.to_s
-          result = result.to_i if result == result.to_i.to_s
-        else
-          result = result[0]
-        end
-      end
-    else
-      result = Riddl::Parameter::Array[*result]
-    end
-    if result.is_a? String
-      enc = detect_encoding(result)
-      enc == 'OTHER' ? result : (result.encode('UTF-8',enc) rescue convert_to_base64(result))
-    else
-      result
-    end
-  end
-
-  def detect_encoding(text)
-    if text.is_a? String
-      if text.valid_encoding? && text.encoding.name == 'UTF-8'
-        'UTF-8'
-      else
-        res = CharlockHolmes::EncodingDetector.detect(text)
-        if res.is_a?(Hash) && res[:type] == :text && res[:ruby_encoding] != "binary"
-          res[:encoding]
-        elsif res.is_a?(Hash) && res[:type] == :binary
-          'BINARY'
-        else
-          'ISO-8859-1'
-        end
-      end
-    else
-      'OTHER'
-    end
-  end
-
-  def convert_to_base64(text)
-    ('data:' + MimeMagic.by_magic(text).type + ';base64,' + Base64::encode64(text)) rescue ('data:application/octet-stream;base64,' + Base64::encode64(text))
-  end
-
-  def structurize_result(result)
-    result.map do |r|
-      if r.is_a? Riddl::Parameter::Simple
-        { 'name' => r.name, 'data' => r.value }
-      elsif r.is_a? Riddl::Parameter::Complex
-        res = if r.mimetype == 'application/json'
-          ttt = r.value.read
-          enc = detect_encoding(ttt)
-          enc == 'OTHER' ? ttt.inspect : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
-        elsif r.mimetype == 'text/csv'
-          ttt = r.value.read
-          enc = detect_encoding(ttt)
-          enc == 'OTHER' ? ttt.inspect : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
-        elsif r.mimetype == 'text/plain' || r.mimetype == 'text/html'
-          ttt = r.value.read
-          ttt = ttt.to_f if ttt == ttt.to_f.to_s
-          ttt = ttt.to_i if ttt == ttt.to_i.to_s
-          enc = detect_encoding(ttt)
-          enc == 'OTHER' ? ttt.inspect : (ttt.encode('UTF-8',enc) rescue convert_to_base64(ttt))
-        else
-          convert_to_base64(r.value.read)
-        end
-
-        tmp = {
-          'name' => r.name == '' ? 'result' : r.name,
-          'mimetype' => r.mimetype,
-          'data' => res.to_s
-        }
-        r.value.rewind
-        tmp
-      end
-    end
-  end
-
   def callback(result=nil,options={})
-    recv = structurize_result(result)
+    recv = CPEE::EvalRuby::Translation::structurize_result(result)
     @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv, :annotations => @anno)
 
     @guard_files += result
@@ -397,7 +304,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     if options['CPEE_EVENT']
       @controller.notify("task/#{options['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
     else
-      @handler_returnValue = simplify_result(result)
+      @handler_returnValue = recv
       @handler_returnOptions = options
     end
     if options['CPEE_STATUS']
@@ -430,11 +337,24 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     GC.start
   end #}}}
 
-  def test_condition(mr,code,args)
-    res = mr.instance_eval(code,'Condition',1)
+  def test_condition(dataelements,endpoints,local,additional,code,args={})
+    res = WEEL::ReadStructure.new(dataelements,endpoints,local,additional).instance_eval(code,'Condition',1)
     @controller.notify("gateway/decide", :instance_uuid => @controller.uuid, :code => code, :condition => (res ? "true" : "false"))
     res
   end
+  def eval_expression(dataelements,endpoints,local,additional,code)
+    WEEL::ReadStructure.new(dataelements,endpoints,local,additional).instance_eval(code)
+  end
+  def manipulate(readonly,lock,dataelements,endpoints,status,local,additional,code,where,result=nil,options=nil)
+    result = CPEE::EvalRuby::Translation::simplify_structurized_result(result)
+    struct = if readonly
+      WEEL::ReadStructure.new(dataelements,endpoints,local,additional)
+    else
+      WEEL::ManipulateStructure.new(dataelements,endpoints,status,local,additional)
+    end
+    struct.instance_eval(code,where,1)
+    struct
+  end
 
   def join_branches(branches) # factual, so for inclusive or [[a],[b],[c,d,e]]
     @controller.notify("gateway/join", :instance_uuid => @controller.uuid, :branches => branches)

data/server/executionhandlers/ruby/controller.rb

@@ -29,7 +29,6 @@ class ParaStruct < OpenStruct
     table.to_json
   end
 end
-def →(a); ParaStruct.new(a); end
 def ⭐(a); ParaStruct.new(a); end
 
 class Controller
@@ -175,7 +174,7 @@ class Controller
       @votes += votes
       psredis = @opts[:redis_dyn].call "Instance #{@id} Vote"
       collect = []
-      psredis.subscribe(votes.map{|e| ['vote-response:' + e.to_s] }.flatten) do |on|
+      psredis.subscribe(votes.map{|e| ['vote-response:00:' + e.to_s] }.flatten) do |on|
         on.message do |what, message|
           index = message.index(' ')
           mess = message[index+1..-1]

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -622,7 +622,7 @@
           </xsl:call-template>
         </xsl:otherwise>
       </xsl:choose>
-      <xsl:text>, :value =&gt; -&gt;{ </xsl:text>
+      <xsl:text>, :value =&gt; </xsl:text>
       <xsl:choose>
         <xsl:when test="not(node())">
           <xsl:text>nil</xsl:text>
@@ -645,7 +645,9 @@
         <xsl:otherwise>
           <xsl:choose>
             <xsl:when test="substring(text(),1,1) = '!'">
-              <xsl:value-of select="substring(text(),2)"/>
+              <xsl:text>🠊("</xsl:text>
+              <xsl:value-of select="str:replace(str:replace(substring(text(),2),'\','\\'),'&quot;','\&quot;')"/>
+              <xsl:text>")</xsl:text>
             </xsl:when>
             <xsl:otherwise>
               <xsl:text>"</xsl:text>
@@ -655,7 +657,7 @@
           </xsl:choose>
         </xsl:otherwise>
       </xsl:choose>
-      <xsl:text> }</xsl:text>
+      <xsl:text> </xsl:text>
       <xsl:for-each select="@*">
         <xsl:text>, :</xsl:text>
         <xsl:value-of select="name()"/>

data/server/executionhandlers/rubyext/backend/README.md

@@ -0,0 +1,17 @@
+* run is copied into every instance.
+* opts.yaml is written on each start.
+* instance.rb is written on each start.
+
+## What can you do to make it more robust?
+
+Replace run with a program that actually compiles and runs instance.rb.  Of
+courses the transformation_* xslts would have to be adapted to create suitable
+code. The compiled executable would just need to behave the same as the instance.rb,
+dispersing all the same events through redis.
+
+More suitable languages would be crystal and javascript, c++. Less suitable,
+but doable, would be python, C. I.e., all languages that do not support multi-line
+lambdas would produce much less readable code, thus the "Description" tab in
+the cockpit would be garbage.
+
+Definitely do tell me if you are interessted in doing something like this ;-)

data/server/executionhandlers/rubyext/backend/instance.template

@@ -0,0 +1,18 @@
+<%# coding: UTF-8 %>
+class Instance < WEEL
+  connectionwrapper ConnectionWrapper
+
+<% for key, value in endpoints -%>
+  endpoint :<%= key %> => <%=  CPEE::ValueHelper::parse(value).inspect %>
+<% end  -%>
+
+<% for key, value in dataelements -%>
+  data :<%= key %> => <%=  CPEE::ValueHelper::parse(value).inspect %>
+<% end -%>
+
+<% unless positions.nil? || positions.empty? -%>
+  search <% positions.each_with_index { |de,i| %><%= (i > 0 ? ', ' : '') %>Position.new(:<%= de[0] %>, 0, :<%=de[1] %>, <%= de[2].nil? || de[2].strip.empty? ? 'nil' : '"' + de[2] + '"' %>)<% } %>
+<% end -%>
+
+  <%= dsl.strip.gsub(/\n/,"\n  ") %>
+end

data/server/executionhandlers/rubyext/backend/opts.yaml

@@ -0,0 +1,8 @@
+:host: localhost
+:url: http://localhost:8298/
+:redis_path: /tmp/redis.sock
+:redis_db: 3
+:executionhandlers: ../../executionhandlers/
+:executionhandler: rubyext
+:url_result_transformation: http://localhost:9302/structurize
+:url_code: http://localhost:9302/exec

data/server/executionhandlers/rubyext/backend/run

@@ -0,0 +1,38 @@
+#!/usr/bin/ruby
+require 'rbtrace'
+require 'yaml'
+opts = YAML::load_file(File.join(__dir__,'opts.yaml'))
+opts[:pidf] = __FILE__ + '.pid'
+opts[:pid] = Process.pid
+
+global_controller = File.join(opts[:global_executionhandlers],opts[:executionhandler],'controller.rb')
+controller        = File.join(opts[:executionhandlers],       opts[:executionhandler],'controller.rb')
+if File.exist? global_controller
+  require global_controller
+elsif File.exist? controller
+  require controller
+end
+
+global_connectionhandler = File.join(opts[:global_executionhandlers],opts[:executionhandler],'connection.rb')
+connectionhandler        = File.join(opts[:executionhandlers],       opts[:executionhandler],'connection.rb')
+if File.exist? global_connectionhandler
+  require global_connectionhandler
+elsif File.exist? connectionhandler
+  require connectionhandler
+end
+
+require_relative 'instance'
+controller = Controller.new(File.basename(__dir__).to_i, __dir__, opts)
+controller.instance = Instance.new controller
+
+File.write(opts[:pidf],opts[:pid])
+
+%w{TERM HUP INT}.each do |sig|
+  Signal.trap(sig) do
+    puts "Caught #{sig}!"
+    controller.stop
+  end
+end
+
+controller.start
+File.unlink(opts[:pidf])