cpee 2.1.87 → 2.1.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2daaf617d59eef8d41794e44b8b4488db897422baaee84ad06d9fd936923c896
-  data.tar.gz: 075d29fb38465e916b869a0d4602f143e0e31590535d1ec38eac6ffae7eb8b01
+  metadata.gz: 7826a9cc5914c6a2d2c33e1fbfc64bef917aef446ca899599edaf13dc9c52fdd
+  data.tar.gz: 9c25629356d3c85efe04ce7fd6b1317bfc053465ecd3384fd0d3a2bfc0df6190
 SHA512:
-  metadata.gz: 7d1d375b2bf0f363d97fa77c2e09dbd3f6d66130d328c77f9b02037b8b0951c93faa36f703a764cb85360af9220095af2836cb618baf0e4d23cd26b40d554eb8
-  data.tar.gz: '019b357616c43dd596200536e46226d0ee4960ada5d34e8a3d185398f9b835e451643182861b0b4cb55c54b828e1a7b69370afb6beb9f577b57631f18505979b'
+  metadata.gz: 86cc1b6157b1e05dcd6bde0417f15e027e565e032cc4aa9714de25506a3dd3b1dd5802580552ab047c1e776b9f0a8f0286a9935f3a84edea6428720443519db3
+  data.tar.gz: 6b23dd951e896591748d05ff281fa673710d0eb5828c5e93d1fb64e03276092b26bbb49b86840576c91dc658e2bb63352fe8e585d7557b2e315e74c026bbdddb

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.87"
+  s.version          = "2.1.91"
   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

@@ -29,29 +29,29 @@ module CPEE
 
   SERVER = File.expand_path(File.join(__dir__,'..','cpee.xml'))
   PROPERTIES_PATHS_FULL = %w{
-    /p:properties/p:executionhandler
-    /p:properties/p:positions/p:*
-    /p:properties/p:positions/p:*/@*
-    /p:properties/p:dataelements/p:*
-    /p:properties/p:endpoints/p:*
-    /p:properties/p:attributes/p:*
-    /p:properties/p:transformation/p:*
-    /p:properties/p:transformation/p:*/@*
-    /p:properties/p:description
-    /p:properties/p:dslx
-    /p:properties/p:dsl
-    /p:properties/p:status/p:id
-    /p:properties/p:status/p:message
-    /p:properties/p:state/@changed
-    /p:properties/p:state
+    /p:*/p:executionhandler
+    /p:*/p:positions/p:*
+    /p:*/p:positions/p:*/@*
+    /p:*/p:attributes/p:*
+    /p:*/p:dataelements/p:*
+    /p:*/p:endpoints/p:*
+    /p:*/p:transformation/p:*
+    /p:*/p:transformation/p:*/@*
+    /p:*/p:description
+    /p:*/p:dslx
+    /p:*/p:dsl
+    /p:*/p:status/p:id
+    /p:*/p:status/p:message
+    /p:*/p:state/@changed
+    /p:*/p:state
   }
   PROPERTIES_PATHS_INDEX_UNORDERED = %w{
-    /p:properties/p:positions/p:*
+    /p:*/p:positions/p:*
   }
   PROPERTIES_PATHS_INDEX_ORDERED = %w{
-    /p:properties/p:dataelements/p:*
-    /p:properties/p:endpoints/p:*
-    /p:properties/p:attributes/p:*
+    /p:*/p:dataelements/p:*
+    /p:*/p:endpoints/p:*
+    /p:*/p:attributes/p:*
   }
   def self::implementation(opts)
     opts[:see_instances]              ||= opts[:see_instances].nil? ? false : opts[:see_instances]
@@ -318,7 +318,9 @@ module CPEE
       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)'))
+      name = doc.find('string(/*/p:attributes/p:info)')
+
+      id, uuid = NewInstance::create(opts,redis,name,doc)
 
       subscriptions = []
       (doc.find('/*/sub:subscriptions/sub:subscription') rescue []).each do |s|
@@ -343,7 +345,13 @@ module CPEE
         CPEE::Persistence::set_handler(id,opts,*sub)
       end
 
-      CPEE::Properties::Put::change_first(id,opts,doc)
+      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)
+
+      CPEE::Properties::Put::change_first(id,opts,doc) # change again, for proper event sending
       CPEE::Properties::PutState::run(id,opts,'running') if doc.find('string(/*/p:state)') == 'running'
 
       @headers << Riddl::Header.new("CPEE-INSTANCE", id.to_s)
@@ -357,15 +365,15 @@ module CPEE
   class NewInstance < Riddl::Implementation #{{{
     def self::path(e)
       ret = []
-      until e.qname.name == 'properties'
+      until e.parent.is_a? XML::Smart::Dom
         ret << (e.class == XML::Smart::Dom::Attribute ? '@' : '') + e.qname.name
         e = e.parent
       end
       File.join(*ret.reverse)
     end
 
-    def self::create(opts,redis,name)
-      doc = XML::Smart::open_unprotected(opts[:properties_init])
+    def self::create(opts,redis,name,doc=nil)
+      doc = XML::Smart::open_unprotected(opts[:properties_init]) if doc.nil?
       doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
       id       = CPEE::Persistence::new_object(opts)
       uuid     = SecureRandom.uuid
@@ -373,11 +381,12 @@ module CPEE
       redis.multi do |multi|
         multi.zadd('instances',id,id)
         doc.root.find(PROPERTIES_PATHS_FULL.join(' | ')).each do |e|
+          p = NewInstance::path(e)
           if e.class == XML::Smart::Dom::Element && e.element_only?
             val = e.find('*').map { |f| f.dump }.join
-            multi.set(File.join(instance, NewInstance::path(e)), val)
+            multi.set(File.join(instance, p), val)
           else
-            multi.set(File.join(instance, NewInstance::path(e)), e.text)
+            multi.set(File.join(instance, p), e.text)
           end
         end
         doc.root.find(PROPERTIES_PATHS_INDEX_UNORDERED.join(' | ')).each do |e|
@@ -408,13 +417,8 @@ 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
+      [id, uuid]
     end
 
     def response
@@ -423,6 +427,11 @@ module CPEE
       name  = @p[0].value
 
       id, uuid = NewInstance::create(opts,redis,name)
+      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)
 
       @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,'/'))

data/lib/cpee/message.rb

@@ -77,7 +77,7 @@ module CPEE
       payload[@@type + '-name'] = instance_name if instance_name
 
       backend.publish(type.to_s + ':' + target + ':' + event.to_s,
-        instance.to_s + ' ' +
+        instance.to_s + ',' + instance_uuid.to_s + ' ' +
         JSON::generate(payload)
       )
     end

data/lib/cpee/statemachine.rb

@@ -14,6 +14,12 @@
 
 module CPEE
 
+  class DummyStateMachine
+    def setable?(id,nval); true end
+    def readonly?(id); true end
+    def final?(id); true end
+  end
+
   class StateMachine
     def initialize(file,&state)
       @states = XML::Smart.open_unprotected(file)

data/server/executionhandlers/eval/controller.rb

@@ -63,7 +63,7 @@ class Controller
             if @callback_keys.has_key?(identifier)
               index = message.index(' ')
               mess = message[index+1..-1]
-              instance = message[0...index]
+              instance, uuid = message[0...index].split(',')
               m = JSON.parse(mess)
               resp = []
               m['content']['values'].each do |e|

data/server/executionhandlers/ruby/controller.rb

@@ -63,7 +63,7 @@ class Controller
             if @callback_keys.has_key?(identifier)
               index = message.index(' ')
               mess = message[index+1..-1]
-              instance = message[0...index]
+              instance, uuid = message[0...index].split(',')
               m = JSON.parse(mess)
               resp = []
               m['content']['values'].each do |e|

data/server/routing/end.pid

@@ -0,0 +1 @@
+1396178

data/server/routing/end.rb

@@ -40,7 +40,7 @@ Daemonite.new do |opts|
       on.pmessage do |pat, what, message|
         _, worker, key = what.split(':',3)
         index = message.index(' ')
-        instance = message[0...index]
+        instance, uuid = message[0...index].split(',')
         opts[:redis].multi do |multi|
           multi.srem("instance:#{instance}/callbacks",key)
           multi.del("instance:#{instance}/callback/#{key}/uuid")

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

@@ -0,0 +1 @@
+1396198

data/server/routing/forward-events.rb

@@ -45,7 +45,7 @@ Daemonite.new do |opts|
       on.pmessage do |pat, what, message|
         index = message.index(' ')
         mess = message[index+1..-1]
-        instance = message[0...index]
+        instance, uuid = message[0...index].split(',')
         type, worker, event = what.split(':',3)
         topic = ::File::dirname(event)
         name = ::File::basename(event)
@@ -60,6 +60,8 @@ Daemonite.new do |opts|
               # sadly typhoes does not support ractors
               Thread.new do
                 Riddl::Client.new(url).post [
+                  Riddl::Header.new("CPEE-INSTANCE",instance),
+                  Riddl::Header.new("CPEE-INSTANCE-UUID",uuid),
                   Riddl::Parameter::Simple::new('type',type),
                   Riddl::Parameter::Simple::new('topic',topic),
                   Riddl::Parameter::Simple::new('event',name),

data/server/routing/forward-votes.pid

@@ -0,0 +1 @@
+1396191

data/server/routing/forward-votes.rb

@@ -66,7 +66,7 @@ Daemonite.new do |opts|
     opts[:pubsubredis].psubscribe('vote:*') do |on|
       on.pmessage do |pat, what, message|
         index = message.index(' ')
-        instance = message[0...index]
+        instance, uuid = message[0...index].split(',')
         mess = message[index+1..-1]
 
         type, worker, event = what.split(':',3)

data/server/routing/persist.pid

@@ -0,0 +1 @@
+1396184

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.87
+  version: 2.1.91
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 - Gerhard Stuermer
 bindir: tools
 cert_chain: []
-date: 2025-06-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -929,9 +929,13 @@ files:
 - server/resources/states.dot
 - server/resources/states.xml
 - server/resources/topics.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
 - tools/cpee
@@ -957,7 +961,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 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.