cpee 2.1.74 → 2.1.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f1d52202968f85e94d8d27cb948b88151f0f22311adae38417f3979bd4d3cb2
-  data.tar.gz: 17e41e203881e61545037a863729cbaa9dcdbd1b2f0e0ff947d7b1a607ff315d
+  metadata.gz: b2d89a96cf818f522774efe8d3ff16db84d5e05076adc7d67ea5672882bd5e3d
+  data.tar.gz: 3562319ace848faf37d6e470f33d924ffbf2d4b53f925ac8e76bf7dcad54cabc
 SHA512:
-  metadata.gz: a78c6d6c8916c8e76f06dbbb71bce7dd4d47d042655bd307ad020b3e4cbd1295549871af927f52b2a5d81c302ab266ec46356f3a73ec7fa20a03d425c5e3cbee
-  data.tar.gz: '087e00e92adea25818ed49f421e1ddb591685e5a8221499d5e9f2369d19274d676bb7f63d9c4217571c3cc4680f58508d1c913f5d22539ad38381ec771fa6945'
+  metadata.gz: 6c46e594dcf3d287742d3bcea20b753887f956031a815e75c4a621689a500ebe00694cd00ab61559be8e899a7cc0d570e7bd5c95620136ef17cee72b17909a7d
+  data.tar.gz: 2aa325aa049ac762f8cd03495b90c54f4756f5c95306103cb00538a052aa28416086e698f6dee5ddf6353c48f8fe71b7bf5d16964463928b2d4dd1215bb7a1a6

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.74"
+  s.version          = "2.1.77"
   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."
@@ -32,4 +32,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'webrick', '~>1.7'
   s.add_runtime_dependency 'rbtrace', '~>0.4'
   s.add_runtime_dependency 'cpee-eval-ruby', '~> 1.0', '>= 1.0.4'
+  s.add_runtime_dependency 'by', '~> 1.1', '>= 1.1.0'
 end

data/lib/cpee/implementation.rb

@@ -86,8 +86,16 @@ module CPEE
     opts[:redis_pid]                  ||= 'redis.pid' # use e.g. /var/run/redis.pid if you do global. Look it up in your redis config
     opts[:redis_db_name]              ||= 'redis.rdb' # use e.g. /var/lib/redis.rdb for global stuff. Look it up in your redis config
 
+    opts[:libs_preload]               ||= ['weel', 'json', 'redis', 'securerandom', 'riddl/client', 'cpee/value_helper', 'cpee/attributes_helper', 'cpee/message', 'cpee/redis', 'cpee/persistence', 'yaml', 'charlock_holmes', 'psych', 'xml/smart', 'ostruct', 'bigdecimal', 'mimemagic', 'cpee-eval-ruby/translation', 'get_process_mem']
+
     CPEE::redis_connect opts, 'Server Main'
 
+    ### start by server
+    if opts[:libs_preload]&.is_a?(Array) && opts[:libs_preload].length > 0
+      puts '(re)starting by-server ... it will keep running, just to let you know ...'
+      `/usr/bin/env by-server '#{opts[:libs_preload].join("' '")}'`
+    end
+
     opts[:sse_keepalive_frequency]    ||= 10
     opts[:sse_connections]            = {}
 
@@ -181,6 +189,7 @@ module CPEE
       interface 'main' do
         run CPEE::Instances, opts if get '*'
         run CPEE::NewInstance, opts if post 'instance-new'
+        run CPEE::NewInstanceFull, opts if post 'instance-full-new'
         on resource 'executionhandlers' do
           run CPEE::ExecutionHandlers, opts if get
         end
@@ -298,8 +307,53 @@ module CPEE
     end
   end #}}}
 
+  class NewInstanceFull < Riddl::Implementation #{{{
+    def response
+      opts  = @a[0]
+      redis = opts[:redis]
+
+      doc   = XML::Smart::string(@p[0].value.read)
+      doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
+      doc.register_namespace 'sub', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
+
+      id, uuid = NewInstance::create(opts,redis,doc.find('string(/*/p:attributes/p:info)'))
+
+      subscriptions = []
+      doc.find('/*/sub:subscriptions/sub:subscription').each do |s|
+        sub = []
+        unless sub[0] = s.attributes['id']
+          sub[0] = Digest::MD5.hexdigest(Kernel::rand().to_s)
+        end
+
+        unless sub[1] = s.attributes['url']
+          raise "no url"
+        end
+
+        sub[2] = []
+        s.find('sub:topic').each do |t|
+          %w(event vote).each do |type|
+            t.find('sub:' + type).each do |e|
+              sub[2] << File.join(t.attributes['id'],type,e.text)
+            end
+          end
+        end
+
+        CPEE::Persistence::set_handler(id,opts,*sub)
+      end
+
+      CPEE::Properties::Put::change_first(id,opts,doc)
+      CPEE::Properties::PutState::run(id,opts,'running') if doc.find('string(/*/p:state)') == 'running'
+
+      @headers << Riddl::Header.new("CPEE-INSTANCE", id.to_s)
+      @headers << Riddl::Header.new("CPEE-INSTANCE-URL", File.join(opts[:url].to_s,id.to_s,'/'))
+      @headers << Riddl::Header.new("CPEE-INSTANCE-UUID", uuid)
+
+      Riddl::Parameter::Simple.new("id", id.to_s)
+    end
+  end #}}}
+
   class NewInstance < Riddl::Implementation #{{{
-    def path(e)
+    def self::path(e)
       ret = []
       until e.qname.name == 'properties'
         ret << (e.class == XML::Smart::Dom::Attribute ? '@' : '') + e.qname.name
@@ -308,12 +362,9 @@ module CPEE
       File.join(*ret.reverse)
     end
 
-    def response
-      opts = @a[0]
-      redis = opts[:redis]
+    def self::create(opts,redis,name)
       doc = XML::Smart::open_unprotected(opts[:properties_init])
       doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
-      name     = @p[0].value
       id       = CPEE::Persistence::new_object(opts)
       uuid     = SecureRandom.uuid
       instance = CPEE::Persistence::obj + ':' + id.to_s
@@ -322,17 +373,17 @@ module CPEE
         doc.root.find(PROPERTIES_PATHS_FULL.join(' | ')).each do |e|
           if e.class == XML::Smart::Dom::Element && e.element_only?
             val = e.find('*').map { |f| f.dump }.join
-            multi.set(File.join(instance, path(e)), val)
+            multi.set(File.join(instance, NewInstance::path(e)), val)
           else
-            multi.set(File.join(instance, path(e)), e.text)
+            multi.set(File.join(instance, NewInstance::path(e)), e.text)
           end
         end
         doc.root.find(PROPERTIES_PATHS_INDEX_UNORDERED.join(' | ')).each do |e|
-          p = path(e)
+          p = NewInstance::path(e)
           multi.sadd(File.join(instance, File.dirname(p)), File.basename(p))
         end
         doc.root.find(PROPERTIES_PATHS_INDEX_ORDERED.join(' | ')).each_with_index do |e,i|
-          p = path(e)
+          p = NewInstance::path(e)
           multi.zadd(File.join(instance, File.dirname(p)), i, File.basename(p))
         end
         Dir[File.join(opts[:notifications_init],'*','subscription.xml')].each do |f|
@@ -355,13 +406,22 @@ module CPEE
         multi.zadd(File.join(instance, 'attributes'), -1, 'info')
         multi.set(File.join(instance, 'state', '@changed'), Time.now.xmlschema(3))
       end
-
       content = {
         :state => 'ready',
         :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h
       }
       CPEE::Message::send(:event,'state/change',File.join(opts[:url],'/'),id,uuid,name,content,redis)
 
+      return id, uuid
+    end
+
+    def response
+      opts  = @a[0]
+      redis = opts[:redis]
+      name  = @p[0].value
+
+      id, uuid = NewInstance::create(opts,redis,name)
+
       @headers << Riddl::Header.new("CPEE-INSTANCE", id.to_s)
       @headers << Riddl::Header.new("CPEE-INSTANCE-URL", File.join(opts[:url].to_s,id.to_s,'/'))
       @headers << Riddl::Header.new("CPEE-INSTANCE-UUID", uuid)

data/lib/cpee/implementation_properties.rb

@@ -176,6 +176,7 @@ module CPEE
               CPEE::Properties::PatchPositions::set id, opts, node.first.dump
             end
           end
+          CPEE::Persistence::wait(opts)
 
           if (node = doc.find('/p:properties/p:state')).any?
             CPEE::Properties::PutState::run id, opts, node.first.text
@@ -184,6 +185,41 @@ module CPEE
       end
     end #}}}
     class Put < Riddl::Implementation #{{{
+      def self::change_first(id,opts,doc)
+        if (node = doc.find('/p:properties/p:status')).any?
+          CPEE::Properties::PutStatus::set id, opts, node.first.dump
+        end
+        if (node = doc.find('/p:properties/p:executionhandler')).any?
+          CPEE::Properties::PutExecutionHandler::set id, opts, node.first.text, false
+        end
+
+        %w{dataelements endpoints attributes}.each do |item|
+          if (node = doc.find('/p:properties/p:' + item)).any?
+            CPEE::Properties::PutItems::set item, id, opts, node.first.dump
+          end
+        end
+
+        if (node = doc.find('/p:properties/p:transformation')).any?
+          CPEE::Properties::PutTransformation::set id, opts, node.first.dump
+        end
+        if (node = doc.find('/p:properties/p:description/*')).any?
+          CPEE::Properties::PutDescription::set id, opts, node.first.dump
+        end
+
+        if (node = doc.find('/p:properties/p:positions')).any?
+          if node.first.find('p:*').any?
+            CPEE::Properties::PutPositions::set id, opts, node.first.dump
+          end
+        end
+        CPEE::Persistence::wait(opts)
+      end
+
+      def self::change_last(id,opts,doc)
+        if (node = doc.find('/p:properties/p:state')).any?
+          CPEE::Properties::PutState::run id, opts, node.first.text
+        end
+      end
+
       def response
         id = @a[0]
         opts = @a[1]
@@ -192,35 +228,8 @@ module CPEE
         else
           doc = XML::Smart::string(@p[0].value.read)
           doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
-          if (node = doc.find('/p:properties/p:status')).any?
-            CPEE::Properties::PutStatus::set id, opts, node.first.dump
-          end
-          if (node = doc.find('/p:properties/p:executionhandler')).any?
-            CPEE::Properties::PutExecutionHandler::set id, opts, node.first.text
-          end
-
-          %w{dataelements endpoints attributes}.each do |item|
-            if (node = doc.find('/p:properties/p:' + item)).any?
-              CPEE::Properties::PutItems::set item, id, opts, node.first.dump
-            end
-          end
-
-          if (node = doc.find('/p:properties/p:transformation')).any?
-            CPEE::Properties::PutTransformation::set id, opts, node.first.dump
-          end
-          if (node = doc.find('/p:properties/p:description/*')).any?
-            CPEE::Properties::PutDescription::set id, opts, node.first.dump
-          end
-
-          if (node = doc.find('/p:properties/p:positions')).any?
-            if node.first.find('p:*').any?
-              CPEE::Properties::PutPositions::set id, opts, node.first.dump
-            end
-          end
-
-          if (node = doc.find('/p:properties/p:state')).any?
-            CPEE::Properties::PutState::run id, opts, node.first.text
-          end
+          CPEE::Properties::Put::change_first(id,opts,doc)
+          CPEE::Properties::Put::change_last(id,opts,doc)
         end
       end
     end #}}}
@@ -330,18 +339,21 @@ module CPEE
       end
     end #}}}
     class PutExecutionHandler < Riddl::Implementation #{{{
-      def self::set(id,opts,hw)
+      def self::set(id,opts,hw,transform=true)
         CPEE::Persistence::set_item(id,opts,'executionhandler',:executionhandler => hw)
-        desc = CPEE::Persistence::extract_item(id,opts,'description')
-        dslx = CPEE::Persistence::extract_item(id,opts,'dslx')
-        xml = XML::Smart::string(dslx)
-        xml.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
-        dsl = Object.const_get('CPEE::ExecutionHandler::' + hw.capitalize)::dslx_to_dsl(xml)
-        CPEE::Persistence::set_item(id,opts,'description',
-          :description => xml,
-          :dslx => dslx,
-          :dsl => dsl
-        )
+        if transform
+          desc = CPEE::Persistence::extract_item(id,opts,'description')
+          dslx = CPEE::Persistence::extract_item(id,opts,'dslx')
+          endpoints = CPEE::Persistence::extract_list(id,opts,'endpoints')
+          xml = XML::Smart::string(dslx)
+          xml.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
+          dsl = Object.const_get('CPEE::ExecutionHandler::' + hw.capitalize)::dslx_to_dsl(xml,endpoints)
+          CPEE::Persistence::set_item(id,opts,'description',
+            :description => xml,
+            :dslx => dslx,
+            :dsl => dsl
+          )
+        end
       end
       def response
         id = @a[0]
@@ -663,7 +675,7 @@ module CPEE
     end #}}}
 
     class PutDescription < Riddl::Implementation #{{{
-      def self::transform(descxml,tdesc,tdesctype,tdata,tdatatype,tendp,tendptype,hw,opts) #{{{
+      def self::transform(descxml,tdesc,tdesctype,tdata,tdatatype,tendp,tendptype,hw,id,opts) #{{{
         desc = XML::Smart::string(descxml) rescue nil
         if desc.nil?
           if descxml.empty?
@@ -681,6 +693,32 @@ module CPEE
         de = {}
         ep = {}
 
+        ### endpoints extraction
+        addit = if tendptype == 'rest' && !tdata.empty?
+          srv = Riddl::Client.interface(tendp,opts[:transformation_service])
+          status, res = srv.post [
+            Riddl::Parameter::Complex.new("description","text/xml",descxml),
+            Riddl::Parameter::Simple.new("type","endpoints")
+          ]
+          if status >= 200 && status < 300
+            res
+          else
+            raise 'Could not extract endpoints'
+          end
+        elsif tendptype == 'xslt' && !tdata.empty?
+          trans = XML::Smart::open_unprotected(tendp.text)
+          desc.transform_with(trans)
+        elsif tendptype == 'clean'
+          []
+        else
+          nil
+        end
+        unless addit.nil?
+          addit.each_slice(2).each do |k,v|
+            ep[k.value.to_sym] = v.value
+          end
+        end
+
         ### description transformation, including dslx to dsl
         addit = if tdesctype == 'copy' || tdesc.empty?
           desc || ''
@@ -705,7 +743,7 @@ module CPEE
         end
         unless addit.nil?
           dslx = addit.to_s
-          dsl = Object.const_get('CPEE::ExecutionHandler::' + hw.capitalize)::dslx_to_dsl(addit)
+          dsl = Object.const_get('CPEE::ExecutionHandler::' + hw.capitalize)::dslx_to_dsl(addit,CPEE::Persistence::extract_list(id,opts,'endpoints').to_h.merge(ep))
         end
 
         ### dataelements extraction
@@ -734,32 +772,6 @@ module CPEE
           end
         end
 
-        ### endpoints extraction
-        addit = if tendptype == 'rest' && !tdata.empty?
-          srv = Riddl::Client.interface(tendp,opts[:transformation_service])
-          status, res = srv.post [
-            Riddl::Parameter::Complex.new("description","text/xml",descxml),
-            Riddl::Parameter::Simple.new("type","endpoints")
-          ]
-          if status >= 200 && status < 300
-            res
-          else
-            raise 'Could not extract endpoints'
-          end
-        elsif tendptype == 'xslt' && !tdata.empty?
-          trans = XML::Smart::open_unprotected(tendp.text)
-          desc.transform_with(trans)
-        elsif tendptype == 'clean'
-          []
-        else
-          nil
-        end
-        unless addit.nil?
-          addit.each_slice(2).each do |k,v|
-            ep[k.value.to_sym] = v.value
-          end
-        end
-
         [dslx, dsl, de, ep]
       end #}}}
 
@@ -773,6 +785,7 @@ module CPEE
           CPEE::Persistence::extract_item(id,opts,'transformation/endpoints'),
           CPEE::Persistence::extract_item(id,opts,'transformation/endpoints/@type'),
           CPEE::Persistence::extract_item(id,opts,'executionhandler'),
+          id,
           opts
         )
         CPEE::Persistence::set_item(id,opts,'description',

data/lib/cpee/message.rb

@@ -39,6 +39,23 @@ module CPEE
       @@last < @@tworkers-1 ? @@last += 1 : @@last = 0
     end
 
+    def self::wait(backend,sub,tt=nil)
+      target = '%02i' % (tt || CPEE::Message::target)
+      wid = Digest::MD5.hexdigest(Kernel::rand().to_s)
+      begin
+        sub.subscribe_with_timeout(2,'event:' + target + ':transaction/finished') do |on|
+          on.message do |what,message|
+            mess = message[0...message.index(' ')]
+            sub.unsubscribe('event:' + target + ':transaction/finished') if mess == wid
+          end
+          backend.publish('event:' + target + ':transaction/start',wid + ' {}')
+        end
+      rescue => e
+        puts "timeout error"
+      end
+      sub.disconnect!
+    end
+
     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)
@@ -50,7 +67,7 @@ module CPEE
         'topic' => topic,
         'type' => type,
         'name' => name,
-        'timestamp' =>  Time.now.xmlschema(4),
+        'timestamp' =>  Time.now.xmlschema(6),
         'content' => content
       }
       payload[@@type + '-uuid'] = instance_uuid if instance_uuid

data/lib/cpee/persistence.rb

@@ -23,6 +23,10 @@ module CPEE
       @@obj = it
     end #}}}
 
+    def self::wait(opts)
+      CPEE::Message::wait(opts[:redis],opts[:redis_dyn].call('Temporary Storage Transaction Subscriber'))
+    end
+
     def self::set_list(id,opts,item,values,deleted=[]) #{{{
       ah = AttributesHelper.new
       attributes = Persistence::extract_list(id,opts,'attributes').to_h

data/lib/engine.xml

@@ -16,6 +16,10 @@
 
 <description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:doc="http://cpee.org/ns/documentation">
 
+  <message name="instance-new">
+    <parameter name="info" type="string"/>
+  </message>
+
   <message name="list-of-workflow-instances">
     <parameter name="wis" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
       <doc:documentation>d</doc:documentation>
@@ -27,8 +31,10 @@
     <parameter name="id" type="nonNegativeInteger"/>
   </message>
 
-  <message name="instance-new">
-    <parameter name="info" type="string"/>
+  <message name="instance-full-new">
+    <parameter name="testset" mimetype="*/xml" handler="http://riddl.org/ns/handlers/relaxng">
+      <xi:include href="properties/set-testset.rng"/>
+    </parameter>
   </message>
 
   <message name="instance-info">
@@ -48,6 +54,7 @@
       <doc:documentation>a</doc:documentation>
     </get>
     <post in="instance-new" out="instance-id"/>
+    <post in="instance-full-new" out="instance-id"/>
     <resource relative="executionhandlers">
       <get out="executionhandlerlist"/>
     </resource>

data/lib/properties/set-testset.rng

@@ -0,0 +1,49 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="state.rng"/>
+  <include href="status.rng"/>
+  <include href="executionhandler.rng"/>
+  <include href="positions.rng"/>
+  <include href="dataelements.rng"/>
+  <include href="endpoints.rng"/>
+  <include href="attributes.rng"/>
+  <include href="description.rng"/>
+  <include href="transformation.rng"/>
+  <include href="subscriptions.rng"/>
+
+  <start>
+    <element name="testset" ns="http://cpee.org/ns/properties/2.0">
+      <interleave>
+        <optional>
+          <ref name="subscriptions"/>
+        </optional>
+        <optional>
+          <ref name="set-state"/>
+        </optional>
+        <optional>
+          <ref name="status"/>
+        </optional>
+        <optional>
+          <ref name="executionhandler"/>
+        </optional>
+        <optional>
+          <ref name="positions"/>
+        </optional>
+        <optional>
+          <ref name="dataelements"/>
+        </optional>
+        <optional>
+          <ref name="endpoints"/>
+        </optional>
+        <optional>
+          <ref name="attributes"/>
+        </optional>
+        <optional>
+          <ref name="description"/>
+        </optional>
+        <optional>
+          <ref name="transformation"/>
+        </optional>
+      </interleave>
+    </element>
+  </start>
+</grammar>

data/lib/properties/subscriptions.rng

@@ -0,0 +1,43 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <define name="subscriptions">
+    <element name="subscriptions" ns="http://riddl.org/ns/common-patterns/notifications-producer/2.0">
+      <zeroOrMore>
+        <ref name="subscription"/>
+      </zeroOrMore>
+    </element>
+  </define>
+
+  <define name="subscription">
+    <element name="subscription" ns="http://riddl.org/ns/common-patterns/notifications-producer/2.0">
+      <attribute name="id">
+        <data type="string">
+          <param name="pattern">[a-zA-Z0-9_]+</param>
+        </data>
+      </attribute>
+      <optional>
+        <attribute name="url">
+          <data type="string"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <element name="topic">
+          <attribute name="id">
+            <data type="string"/>
+          </attribute>
+          <oneOrMore>
+            <element>
+              <choice>
+                <name>event</name>
+                <name>vote</name>
+              </choice>
+              <data type="string">
+                <param name="pattern">[\w_]+</param>
+              </data>
+            </element>
+          </oneOrMore>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
+
+</grammar>

data/server/executionhandlers/eval/execution.rb

@@ -23,7 +23,7 @@ module CPEE
       BACKEND_RUN      = File.expand_path(File.join(__dir__,'backend','run'))
       BACKEND_TEMPLATE = File.expand_path(File.join(__dir__,'backend','instance.template'))
 
-      def self::dslx_to_dsl(dslx) # transpile
+      def self::dslx_to_dsl(dslx,ep) # transpile
         trans = XML::Smart::open_unprotected(ExecutionHandler::Eval::DSL_TO_DSLX_XSL)
         dslx.transform_with(trans).to_s
       end

data/server/executionhandlers/ruby/backend/{run → run.rb}

@@ -1,5 +1,5 @@
-#!/usr/bin/ruby
-require 'rbtrace'
+#!/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/dsl_to_dslx.xsl

@@ -810,7 +810,7 @@
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:text>"</xsl:text>
-                    <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+                    <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\&quot;')"/>
                     <xsl:text>"</xsl:text>
                   </xsl:otherwise>
                 </xsl:choose>
@@ -830,11 +830,11 @@
                 <xsl:choose>
                   <xsl:when test="substring(.,1,1) = '!'">
                     <xsl:text>>🠊("</xsl:text>
-                    <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
+                    <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\&quot;')"/>
                     <xsl:text>")</xsl:text>
                   </xsl:when>
                   <xsl:otherwise>
-                    <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+                    <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\&quot;')"/>
                   </xsl:otherwise>
                 </xsl:choose>
                 <xsl:text>"</xsl:text>
@@ -864,11 +864,11 @@
           <xsl:choose>
             <xsl:when test="substring(.,1,1) = '!'">
               <xsl:text>>🠊("</xsl:text>
-              <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
+              <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\&quot;')"/>
               <xsl:text>")</xsl:text>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+              <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\&quot;')"/>
             </xsl:otherwise>
           </xsl:choose>
           <xsl:text>"</xsl:text>
@@ -892,11 +892,11 @@
         <xsl:choose>
           <xsl:when test="substring(.,1,1) = '!'">
             <xsl:text>>🠊("</xsl:text>
-            <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
+            <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\&quot;')"/>
             <xsl:text>")</xsl:text>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+            <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\&quot;')"/>
           </xsl:otherwise>
         </xsl:choose>
         <xsl:text>"</xsl:text>

data/server/executionhandlers/ruby/execution.rb

@@ -19,11 +19,11 @@ module CPEE
     module Ruby
       BACKEND_INSTANCE = 'instance.rb'
       DSL_TO_DSLX_XSL  = File.expand_path(File.join(__dir__,'dsl_to_dslx.xsl'))
-      BACKEND_RUN      = File.expand_path(File.join(__dir__,'backend','run'))
+      BACKEND_RUN      = File.expand_path(File.join(__dir__,'backend','run.rb'))
       BACKEND_OPTS     = File.expand_path(File.join(__dir__,'backend','opts.yaml'))
       BACKEND_TEMPLATE = File.expand_path(File.join(__dir__,'backend','instance.template'))
 
-      def self::dslx_to_dsl(dslx) # transpile
+      def self::dslx_to_dsl(dslx,ep) # transpile
         trans = XML::Smart::open_unprotected(ExecutionHandler::Ruby::DSL_TO_DSLX_XSL)
         dslx.transform_with(trans).to_s
       end

data/server/routing/end.pid

@@ -0,0 +1 @@
+949873

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

@@ -0,0 +1 @@
+949891

data/server/routing/forward-votes.pid

@@ -0,0 +1 @@
+949885

data/server/routing/persist.pid

@@ -0,0 +1 @@
+949879

data/server/routing/persist.rb

@@ -36,6 +36,7 @@ Daemonite.new do |opts|
     opts[:events] = []
     0.upto(opts[:workers]-1) do |w|
       opts[:events] += [
+        'event:' + ('%02i' % w) + ':transaction/start',
         'event:' + ('%02i' % w) + ':state/change',
         'event:' + ('%02i' % w) + ':executionhandler/change',
         'event:' + ('%02i' % w) + ':description/change',
@@ -107,6 +108,8 @@ Daemonite.new do |opts|
                 end
               end
             end
+          when /event:(\d+):transaction\/start/
+            opts[:redis].publish('event:' + $1 + ':transaction/finished',message)
           when /event:\d+:transformation\/change/
             opts[:redis].multi do |multi|
               multi.set("instance:#{instance}/transformation/description",mess.dig('content','description'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.74
+  version: 2.1.77
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2025-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -178,6 +178,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: by
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -880,9 +900,11 @@ files:
 - lib/properties/properties.rng
 - lib/properties/set-properties.rng
 - lib/properties/set-some-properties.rng
+- lib/properties/set-testset.rng
 - lib/properties/simple.rng
 - lib/properties/state.rng
 - lib/properties/status.rng
+- lib/properties/subscriptions.rng
 - lib/properties/t_attributes.rng
 - lib/properties/t_dataelements.rng
 - lib/properties/t_endpoints.rng
@@ -904,7 +926,7 @@ files:
 - server/executionhandlers/ruby/backend/README.md
 - server/executionhandlers/ruby/backend/instance.template
 - server/executionhandlers/ruby/backend/opts.yaml
-- server/executionhandlers/ruby/backend/run
+- server/executionhandlers/ruby/backend/run.rb
 - server/executionhandlers/ruby/connection.rb
 - server/executionhandlers/ruby/controller.rb
 - server/executionhandlers/ruby/dsl_to_dslx.xsl
@@ -917,9 +939,13 @@ 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
@@ -946,7 +972,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: The cloud process execution engine (cpee.org). If you just need workflow