cpee 2.1.12 → 2.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b365831308d00c63c51738bb800255bb0fe6813f4cf368e7ec60b32609a2b8
-  data.tar.gz: a777bc87bcea1990238ff50950a0179c8b9076774496a53ed7bb1eedc2cb875c
+  metadata.gz: 49e634c161f11e6701a10d2823b9df0e45375ce9b0808cd90d5d0be60e8583a2
+  data.tar.gz: 30888c84a0244ce4cdfa9cf77f5be0637d50717de4b14fe0a51f300a9b151689
 SHA512:
-  metadata.gz: 6b4c1476fffb5bfa7b7bbadebc9af1cdf2a8b8703ff15f4378946661613e95be0b3fbf54416637d63e4410f5563a723ca0e91a3fddaaeeb5e60a49e63e82eecd
-  data.tar.gz: 1f274d19467c64173562ba9d01dd97c192dd1b2a5ce15556d866c00fa0908e13666361b59bda02f5222b04c68a131940ac942b633c4cefcc4bb7e1e240c52873
+  metadata.gz: ee8cd1e8a77277bd005e19caf3e6f52b21c9b79d7e29e4fa0072c7b56226fc063e2f1159eae7c1f5eab15f5d29095c39d748dd8d3b3c9872960dc93f09b9d53d
+  data.tar.gz: 50622f0ae03580818fa5f33347e1f5227906fd542923e400d50817ad77241fe8257b30fdc1020d4ebc37be977fb3e077321a0532d0ee65fb6c265bdf80d34255

data/cockpit/js/instance.js

@@ -56,7 +56,7 @@ var sub_more = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'instantiation' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'connectionwrapper' + '&' +
+               'topic'  + '=' + 'executionhandler' + '&' +
                'events' + '=' + 'error,change' + '&' +
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
@@ -78,7 +78,7 @@ var sub_less = 'topic'  + '=' + 'activity' + '&' +// {{{
                'events' + '=' + 'instantiation' + '&' +
                'topic'  + '=' + 'transformation' + '&' +
                'events' + '=' + 'change' + '&' +
-               'topic'  + '=' + 'connectionwrapper' + '&' +
+               'topic'  + '=' + 'executionhandler' + '&' +
                'events' + '=' + 'error,change' + '&' +
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
@@ -1366,6 +1366,11 @@ function append_to_log(what,type,message) {//{{{
   message = message.replace(/:\"/g,': "');
   message = message.replace(/:\{/g,': {');
   message = message.replace(/:\[/g,': [');
+  message = message.replace(/&/g, '&');
+  message = message.replace(/</g, '&lt;');
+  message = message.replace(/>/g, '&gt;');
+  message = message.replace(/"/g, '&quot;');
+  message = message.replace(/'/g, '&apos;');
   $("#dat_log").prepend("<tr><td class='fixed'><a title=\"" + d.strftime("[%d/%b/%Y %H:%M:%S]") + "\">D</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'><a title=\"" + what + "\">T</a></td><td class='fixed'>&#160;-&#160;</td><td class='fixed'>" +  type + "</td><td class='fixed'>&#160;-&#160;</td><td class='long'>" +  message + "</td></tr>");
   var dle = $("#dat_log").children();
   if (dle.length > 100) {

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.12"
+  s.version          = "2.1.16"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of 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

@@ -77,7 +77,7 @@ 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
 
-    CPEE::redis_connect opts
+    CPEE::redis_connect opts, 'Server Main'
 
     opts[:sse_keepalive_frequency]    ||= 10
     opts[:sse_connections]            = {}

data/lib/cpee/implementation_notifications.rb

@@ -179,7 +179,7 @@ module CPEE
     end #}}}
 
     def self::sse_distributor(opts) #{{{
-      conn = opts[:redis_dyn].call
+      conn = opts[:redis_dyn].call "Server SSE"
       conn.psubscribe('forward:*','event:state/change') do |on|
         on.pmessage do |pat, what, message|
           if pat == 'forward:*'

data/lib/cpee/redis.rb

@@ -15,29 +15,30 @@
 require 'redis'
 
 module CPEE
-  def self::redis_connect(opts)
+  def self::redis_connect(opts,name=nil)
     if opts[:redis_cmd].nil?
       begin
         if opts[:redis_path]
-          opts[:redis_dyn] = Proc.new { Redis.new(path: opts[:redis_path], db: opts[:redis_db]) }
+          opts[:redis_dyn] = Proc.new { |name| Redis.new(path: opts[:redis_path], db: opts[:redis_db], id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
         elsif opts[:redis_url]
-          opts[:redis_dyn] = Proc.new { Redis.new(url: opts[:redis_url], db: opts[:redis_db]) }
+          opts[:redis_dyn] = Proc.new { |name| Redis.new(url: opts[:redis_url], db: opts[:redis_db], id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
         else
           raise
         end
-        opts[:redis] = opts[:redis_dyn].call
+        opts[:redis] = opts[:redis_dyn].call name.gsub(/[^a-zA-Z0-9]/,'-')
         opts[:redis].dbsize
       rescue
         puts 'can not connect to redis. check if it is running and cpee is configured correctly ...'
         exit
       end
     else # we always assume file socket if redis is startet locally
-      opts[:redis_dyn] = Proc.new { Redis.new(path: File.join(opts[:basepath],opts[:redis_path]), db: opts[:redis_db].to_i) }
+      opts[:redis_dyn] = Proc.new { |name| Redis.new(path: File.join(opts[:basepath],opts[:redis_path]), db: opts[:redis_db].to_i, id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
       tried = false
       begin
-        opts[:redis] = opts[:redis_dyn].call
+        opts[:redis] = opts[:redis_dyn].call name.gsub(/[^a-zA-Z0-9]/,'-')
         opts[:redis].dbsize
-      rescue
+      rescue => e
+        puts e
         res = unless tried
           rcmd = opts[:redis_cmd]
           rcmd.gsub! /#redis_path#/, File.join(opts[:basepath],opts[:redis_path])

data/server/executionhandlers/ruby/connection.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'charlock_holmes'
+require 'base64'
 
 class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::loop_guard(arguments,id,count) # {{{
@@ -197,11 +198,12 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     unless status.nil?
       @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?
-      @controller.notify("dataelements/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => dataelements)
+    unless changed_dataelements.nil? || changed_dataelements.empty?
+      de = dataelements.slice(*changed_dataelements).transform_values { |v| detect_encoding(v) == 'UTF-8' ? v : 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?
-      @controller.notify("endpoints/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints)
+    unless changed_endpoints.nil? || changed_endpoints.empty?
+      @controller.notify("endpoints/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints.slice(*changed_endpoints))
     end
   end # }}}
 
@@ -241,12 +243,12 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     result
   end
 
-  def detected_encoding(text)
+  def detect_encoding(text)
     CharlockHolmes::EncodingDetector.detect(text)[:encoding] || 'ISO-8859-1'
   end
 
-  def convert_to_utf8(text)
-    CharlockHolmes::Converter.convert(text, detected_encoding(text), "UTF-8")
+  def convert_to_base64(text)
+    'data:application/octet-stream;base64,' + Base64::urlsafe_encode64(text)
   end
 
   def structurize_result(result)
@@ -267,7 +269,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         tmp = {
           'name' => r.name == '' ? 'result' : r.name,
           'mimetype' => r.mimetype,
-          'data' => res
+          'data' => (detect_encoding(res) == 'UTF-8' ? res : convert_to_base64(res))
         }
         r.value.rewind
         tmp

data/server/executionhandlers/ruby/controller.rb

@@ -33,7 +33,7 @@ def ⭐(a); ParaStruct.new(a); end
 
 class Controller
   def initialize(id,dir,opts)
-    CPEE::redis_connect(opts)
+    CPEE::redis_connect(opts,"Instance #{id}")
 
     @redis = opts[:redis]
     @votes = []
@@ -52,7 +52,7 @@ class Controller
     @loop_guard = {}
 
     @callback_keys = {}
-    @psredis = @opts[:redis_dyn].call
+    @psredis = @opts[:redis_dyn].call "Instance #{@id} Callback Response"
 
     Thread.new do
       @psredis.psubscribe('callback-response:*','callback-end:*') do |on|
@@ -163,7 +163,7 @@ class Controller
 
     if votes.length > 0
       @votes += votes
-      psredis = @opts[:redis_dyn].call
+      psredis = @opts[:redis_dyn].call "Instance #{@id} Vote"
       collect = []
       psredis.subscribe(votes.map{|e| ['vote-response:' + e.to_s] }.flatten) do |on|
         on.message do |what, message|

data/server/routing/end.rb

@@ -30,8 +30,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing End'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing End Sub'
   end
 
   run do

data/server/routing/forward-events.rb

@@ -30,8 +30,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing Forward Events'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Forward Events Sub'
   end
 
   run do

data/server/routing/forward-votes.rb

@@ -56,8 +56,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing Forward Votes'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Forward Votes Sub'
   end
 
   run do

data/server/routing/persist.rb

@@ -45,8 +45,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing Persist'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Persist Sub'
   end
 
   run do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.1.16
 platform: ruby
 authors:
 - Juergen eTM Mangler