cpee-instantiation 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54e2fbfea39571218c38e9d1afb4a81689439d11cad30c988d7db9f5d523aaca
-  data.tar.gz: 9ca8330ce8f3ea4f7a5e3e1523afa44067eaa4d660f3db5135be0c60e79794ab
+  metadata.gz: 1f53d408e5dbfd7e322a845330ae10df4b8352798576d8bc244b6db6de0a3933
+  data.tar.gz: 8cbae1d0f118f5f7a53a5b6df2dc95946daaf30fa30c964d74ea5fcda0f6dbc8
 SHA512:
-  metadata.gz: e15d2bfdd3d31de04223c8799b61cdd5e38c7c99bf342bac736767a2f60d78dc320717bffa7650c5fc5bb2afd1ce8c16e6b4573d877ecf475d228081a42ea430
-  data.tar.gz: 5f5b2f07bc686d05e47571e638330f2da1dbc57a14472ee6d9c04bcaeae6f5003de6b253622aec7c3d98ab25d40cec7edb21e77bd66eb8215272e20922cd9caf
+  metadata.gz: 0ce67354922c16a1da5fa2077129081d043f8bb44fc308b2c991f5d6258a5e5eb8a834d68cbc7225db43445114e5447d2234ff90c027029244fa2070a691612d
+  data.tar.gz: 0516e8ba967d5896c925c8d82e2e651b0fa523bbddee621aba94ed995cbc6f7d002ec3d7e42852d4a81d0f5e69fbf43c8c2cbdb1b55d5feac89ad280f06d1a1b

data/cpee-instantiation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.0.2"
+  s.version          = "1.0.3"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Subprocess instantiation service for the cloud process execution engine (cpee.org)"

data/lib/cpee-instantiation/instantiation.rb

@@ -96,7 +96,6 @@ module CPEE
       def handle_waiting(cpee,instance,uuid,behavior,selfurl,cblist) #{{{
         if behavior =~ /^wait/
           condition = behavior.match(/_([^_]+)_/)&.[](1) || 'finished'
-          @headers << Riddl::Header.new('CPEE-CALLBACK','true')
           cb = @h['CPEE_CALLBACK']
 
           if cb
@@ -172,12 +171,14 @@ module CPEE
         if (instance, uuid = load_testset(tdoc,cpee,nil,stream)).first == -1
           @status = 500
         else
-          handle_data cpee, instance, @p[4]&.value if @p[4]&.name == 'init'
-          handle_endpoints cpee, instance, @p[4]&.value if @p[4]&.name == 'endpoints'
-          handle_endpoints cpee, instance, @p[5]&.value if @p[5]&.name == 'endpoints'
+          EM.defer do
+            handle_data cpee, instance, @p[4]&.value if @p[4]&.name == 'init'
+            handle_endpoints cpee, instance, @p[4]&.value if @p[4]&.name == 'endpoints'
+            handle_endpoints cpee, instance, @p[5]&.value if @p[5]&.name == 'endpoints'
 
-          handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
-          handle_starting cpee, instance, @p[0].value
+            handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
+            handle_starting cpee, instance, @p[0].value
+          end
 
           send = {
             'CPEE-INSTANCE' => instance,
@@ -185,6 +186,9 @@ module CPEE
             'CPEE-INSTANCE-UUID' => uuid,
             'CPEE-BEHAVIOR' => @p[0].value
           }
+          if @p[0].value =~ /^wait/
+            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
+          end
           @headers << Riddl::Header.new('CPEE-INSTANTIATION',JSON::generate(send))
           Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
         end
@@ -210,12 +214,14 @@ module CPEE
         if (instance, uuid = load_testset(tdoc,cpee,name,stream)).first == -1
           @status = 500
         else
-          handle_data cpee, instance, @p[2]&.value if @p[2]&.name == 'init'
-          handle_endpoints cpee, instance, @p[2]&.value if @p[2]&.name == 'endpoints'
-          handle_endpoints cpee, instance, @p[3]&.value if @p[3]&.name == 'endpoints'
+          EM.defer do
+            handle_data cpee, instance, @p[2]&.value if @p[2]&.name == 'init'
+            handle_endpoints cpee, instance, @p[2]&.value if @p[2]&.name == 'endpoints'
+            handle_endpoints cpee, instance, @p[3]&.value if @p[3]&.name == 'endpoints'
 
-          handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
-          handle_starting cpee, instance, @p[0].value
+            handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
+            handle_starting cpee, instance, @p[0].value
+          end
 
           send = {
             'CPEE-INSTANCE' => instance,
@@ -223,6 +229,9 @@ module CPEE
             'CPEE-INSTANCE-UUID' => uuid,
             'CPEE-BEHAVIOR' => @p[0].value
           }
+          if @p[0].value =~ /^wait/
+            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
+          end
           @headers << Riddl::Header.new('CPEE-INSTANTIATION',JSON::generate(send))
           Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
         end
@@ -247,9 +256,11 @@ module CPEE
         if (instance, uuid = load_testset(tdoc,cpee)).first == -1
           @status = 500
         else
-          handle_data cpee, instance, @p[data+1]&.value
-          handle_waiting cpee, instance, uuid, behavior, selfurl, cblist
-          handle_starting cpee, instance, behavior
+          EM.defer do
+            handle_data cpee, instance, @p[data+1]&.value
+            handle_waiting cpee, instance, uuid, behavior, selfurl, cblist
+            handle_starting cpee, instance, behavior
+          end
 
           send = {
             'CPEE-INSTANCE' => instance,
@@ -257,6 +268,9 @@ module CPEE
             'CPEE-INSTANCE-UUID' => uuid,
             'CPEE-BEHAVIOR' => behavior
           }
+          if @p[0].value =~ /^wait/
+            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
+          end
           Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
         end
       end
@@ -280,6 +294,9 @@ module CPEE
           handle_data cpee, instance, @p[2]&.value
           handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
           handle_starting cpee, instance, @p[0].value
+          if @p[0].value =~ /^wait/
+            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
+          end
           return Riddl::Parameter::Simple.new("url",cpee + instance)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Juergen eTM Mangler
-autorequire: 
+autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -93,7 +93,7 @@ homepage: http://cpee.org/
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Subprocess instantiation service for the cloud process execution engine (cpee.org)
 test_files: []