cpee 2.1.51 → 2.1.52

data/cockpit/themes/default/rngs/call.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">

data/cockpit/themes/default/rngs/callmanipulate.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">

data/cockpit/themes/default/theme.js

@@ -1444,7 +1444,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

data/cockpit/themes/extended/rngs/call.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">

data/cockpit/themes/extended/rngs/callmanipulate.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">

data/cockpit/themes/extended/theme.js

@@ -1482,7 +1482,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

data/cockpit/themes/model/theme.js

@@ -1375,7 +1375,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

data/cockpit/themes/packed/rngs/call.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">

data/cockpit/themes/packed/rngs/callmanipulate.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">

data/cockpit/themes/packed/theme.js

@@ -1443,7 +1443,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

data/cockpit/themes/preset/rngs/call.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">

data/cockpit/themes/preset/rngs/callmanipulate.rng

@@ -3,7 +3,9 @@
     <data type="string" rngui:readonly="true"/>
   </attribute>
   <attribute name="endpoint" rngui:label="Endpoint">
-    <data type="string"/>
+    <data type="string">
+      <param name="pattern">^[a-z_][a-zA-Z0-9_]*$</param>
+    </data>
   </attribute>
   <element name="parameters" rngui:header="Properties">
     <element name="label" rngui:label="Label">

data/cockpit/themes/preset/theme.js

@@ -1444,7 +1444,7 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_event_one = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{
-      'svg': self.adaptor.theme_dir + 'symbols/parallel_eventbased_exclusive.svg'
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     }//}}}
   }; /*}}}*/
   this.elements.parallel_branch_normal = { /*{{{*/

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.51"
+  s.version          = "2.1.52"
   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."
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
-  s.add_runtime_dependency 'riddl', '~> 0.126'
+  s.add_runtime_dependency 'riddl', '~> 1.0'
   s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.111'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.0'

data/lib/cpee/message.rb

@@ -15,8 +15,20 @@
 module CPEE
 
   module Message
-    WHO = 'cpee'
-    TYPE = 'instance'
+    @@who = 'cpee'
+    @@type = 'instance'
+    def self::who #{{{
+      @@who
+    end #}}}
+    def self::who=(it) #{{{
+      @@who = it
+    end #}}}
+    def self::type #{{{
+      @@type
+    end #}}}
+    def self::type=(it) #{{{
+      @@type = it
+    end #}}}
 
     def self::set_workers(workers)
       @@tworkers = (workers < 1 && workers > 99 ? 1 : workers).freeze
@@ -32,17 +44,17 @@ module CPEE
       topic = ::File::dirname(event)
       name = ::File::basename(event)
       payload = {
-        WHO => cpee,
-        TYPE + '-url' => File.join(cpee,instance.to_s),
-        TYPE => instance,
+        @@who => cpee,
+        @@type + '-url' => File.join(cpee,instance.to_s),
+        @@type => instance,
         'topic' => topic,
         'type' => type,
         'name' => name,
         'timestamp' =>  Time.now.xmlschema(3),
         'content' => content
       }
-      payload[TYPE + '-uuid'] = instance_uuid if instance_uuid
-      payload[TYPE + '-name'] = instance_name if instance_name
+      payload[@@type + '-uuid'] = instance_uuid if instance_uuid
+      payload[@@type + '-name'] = instance_name if instance_name
 
       backend.publish(type.to_s + ':' + target + ':' + event.to_s,
         instance.to_s + ' ' +
@@ -55,7 +67,7 @@ module CPEE
         topic = ::File::dirname(event)
         name = ::File::basename(event)
         payload = {
-          WHO => cpee,
+          @@who => cpee,
           'topic' => topic,
           'type' => type,
           'name' => name,

data/lib/cpee/persistence.rb

@@ -19,6 +19,9 @@ module CPEE
     def self::obj #{{{
       @@obj
     end #}}}
+    def self::obj=(it) #{{{
+      @@obj = it
+    end #}}}
 
     def self::set_list(id,opts,item,values,deleted=[]) #{{{
       ah = AttributesHelper.new
@@ -81,6 +84,15 @@ module CPEE
       end
     end
 
+    def self::new_object(opts)
+      id = opts[:redis].zrevrange(@@obj + 's', 0, 0).first.to_i + 1
+      opts[:redis].zadd(@@obj + 's',id,id)
+      id
+    end
+    def self::new_static_object(id,opts)
+      opts[:redis].set(File.join(@@obj + ":#{id}",'state'),'')
+      nil
+    end
     def self::new_object(opts)
       id = opts[:redis].zrevrange(@@obj + 's', 0, 0).first.to_i + 1
       opts[:redis].zadd(@@obj + 's',id,id)

data/lib/properties.xml

@@ -133,7 +133,7 @@
     <parameter name="dslx" mimetype="*/xml"/>
   </message> <!--}}}-->
   <message name="description"> <!--{{{-->
-    <parameter name="description" mimetype="*/xml"/>
+    <parameter name="description" mimetype="*"/>
   </message> <!--}}}-->
 
   <message name="transformation"> <!--{{{-->

data/server/executionhandlers/ruby/connection.rb

@@ -66,9 +66,9 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
 
   def prepare(readonly, endpoints, parameters, replay=false) #{{{
     @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
-    if @controller.attributes['mock']
+    if @controller.attributes['twin_engine']
       @handler_endpoint_orig = @handler_endpoint
-      @handler_endpoint = @controller.attributes['mock'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
+      @handler_endpoint = @controller.attributes['twin_engine'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
     end
     params = parameters.dup
     params[:arguments] = params[:arguments].dup if params[:arguments]
@@ -146,15 +146,42 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       @guard_files += result
 
       if status == 561
-        @handler_endpoint = @handler_endpoint_orig
+        if @controller.attributes['twin_translate']
+          gettrans = Riddl::Client.new(@controller.attributes['twin_translate'])
+          gtstatus, gtresult, gtheaders = gettrans.get
+          if gtstatus >= 200 && gtstatus < 300
+            transwhat = case headers['CPEE-TWIN-TASKTYPE']
+              when 'i'; 'instantiation'
+              when 'ir'; 'ipc-receive'
+              when 'is'; 'ipc-send'
+              else
+                'instantiation'
+            end
+            JSON::parse(gtresult.value.read).each do |e|
+              if e['type'] == transwhat
+                @handler_endpoint = e['endpoint'] if e['endpoint']
+                e['arguments']&.each do |k,a|
+                  params.each do |p|
+                    p.value = a if p.name == k
+                  end
+                end
+              end
+            end
+          end
+        else
+          @handler_endpoint = @handler_endpoint_orig
+        end
         params.delete_if { |p| p.name == 'original_endpoint' }
         params.each do |p|
           if p.name == 'attributes'
             t = JSON::parse(p.value) rescue {}
-            t['mock'] = @controller.attributes['mock']
+            t['twin_engine'] = @controller.attributes['twin_engine'] if @controller.attributes['twin_engine']
+            t['twin_target'] = @controller.attributes['twin_target'] if @controller.attributes['twin_target']
+            t['twin_translate'] = @controller.attributes['twin_engine'] if @controller.attributes['twin_translate']
             p.value = t.to_json
           end
         end
+        pp params
       end
     end while status == 561
 

data/tools/cpee

@@ -40,6 +40,8 @@ ARGV.options { |opt|
 	opt.on("")
   opt.on(wrap("[abandon URL]          ready or stopped processes are abandoned. Examples:\ncpee abandon http://localhost:9298/1/\ncpee abandon http://localhost:9298/1-200\ncpee abandon http://localhost:9298/*"))
 	opt.on("")
+  opt.on(wrap("[stopping URL]         print all stopping proccess ids"))
+	opt.on("")
   opt.on(wrap("[a_by_name URL STRING] ready or stopped processes are abandoned by regex on attributes/info. Examples:\ncpee abandon http://localhost:9298/1/ \"aa.a\"\ncpee abandon http://localhost:9298/1-200 aaa"))
 	opt.on("")
   opt.on(wrap("[start URL]            stopped processes are started; all others are not touched. Examples:\ncpee start http://localhost:9298/1\ncpee start http://localhost:9298/1-200\ncpee start http://localhost:9298/*"))
@@ -57,7 +59,7 @@ ARGV.options { |opt|
 }
 if (ARGV.length == 0) ||
    (ARGV.length == 1  && !(%w(ui convert).include?(ARGV[0]))) ||
-   (ARGV.length == 2  && !(%w(abandon abandon! start delete! cpui new).include?(ARGV[0]))) ||
+   (ARGV.length == 2  && !(%w(abandon abandon! stopping start delete! cpui new).include?(ARGV[0]))) ||
    (ARGV.length == 3  && !(%w(archive a_by_name).include?(ARGV[0]))) ||
    (ARGV.length >  3)
   puts ARGV.options
@@ -284,6 +286,35 @@ elsif command == 'abandon!'
       end
     end
   end
+elsif command == 'stopping'
+  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
+  base = File.dirname(p1)
+  names = []
+  if File.basename(p1) =~ /(\d+)-(\d+)/
+    names = ($1.to_i..$2.to_i).to_a
+  elsif File.basename(p1) == '*'
+    res = Typhoeus.get(File.join(base,'/'), headers: { 'see-instances' => 'true' })
+    if res.success?
+      XML::Smart.string(res.response_body) do |doc|
+        doc.find('//instance/@id').each do |ele|
+          names << ele.value
+        end
+      end
+      names.reverse!
+    else
+      exit
+    end
+  else
+    names << File.basename(p1).to_i
+  end
+  names.each do |name|
+    res1 = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
+    if res1.success?
+      if res1.response_body == 'stopping'
+        puts name
+      end
+    end
+  end
 elsif command == 'abandon'
   p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.51
+  version: 2.1.52
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-10-10 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.126'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.126'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: weel
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +172,7 @@ files:
 - cockpit/css/graph.css
 - cockpit/css/model.css
 - cockpit/css/replay.css
+- cockpit/css/resources.css
 - cockpit/css/track.css
 - cockpit/css/ui.css
 - cockpit/css/wfadaptor.css
@@ -185,6 +186,7 @@ files:
 - cockpit/js/modifiers.js
 - cockpit/js/parameters.js
 - cockpit/js/replay.js
+- cockpit/js/resources.js
 - cockpit/js/track.js
 - cockpit/js/ui.js
 - cockpit/js/wfadaptor.js
@@ -369,6 +371,62 @@ files:
 - cockpit/themes/control/symbols/terminate.svg
 - cockpit/themes/control/symbols/test.svg
 - cockpit/themes/control/theme.js
+- cockpit/themes/dataflow/rngs/alternative.rng
+- cockpit/themes/dataflow/rngs/call.rng
+- cockpit/themes/dataflow/rngs/callmanipulate.rng
+- cockpit/themes/dataflow/rngs/choose.rng
+- cockpit/themes/dataflow/rngs/closed_loop.rng
+- cockpit/themes/dataflow/rngs/closed_loop_cancel.rng
+- cockpit/themes/dataflow/rngs/closed_loop_control.rng
+- cockpit/themes/dataflow/rngs/closed_loop_measuring.rng
+- cockpit/themes/dataflow/rngs/critical.rng
+- cockpit/themes/dataflow/rngs/escape.rng
+- cockpit/themes/dataflow/rngs/group.rng
+- cockpit/themes/dataflow/rngs/loop.rng
+- cockpit/themes/dataflow/rngs/manipulate.rng
+- cockpit/themes/dataflow/rngs/otherwise.rng
+- cockpit/themes/dataflow/rngs/parallel.rng
+- cockpit/themes/dataflow/rngs/parallel_branch.rng
+- cockpit/themes/dataflow/rngs/scripts.rng
+- cockpit/themes/dataflow/rngs/start.rng
+- cockpit/themes/dataflow/rngs/stop.rng
+- cockpit/themes/dataflow/rngs/terminate.rng
+- cockpit/themes/dataflow/symbols/alternative.svg
+- cockpit/themes/dataflow/symbols/arrow.svg
+- cockpit/themes/dataflow/symbols/call.svg
+- cockpit/themes/dataflow/symbols/call_sensor.svg
+- cockpit/themes/dataflow/symbols/callmanipulate.svg
+- cockpit/themes/dataflow/symbols/callmanipulate_sensor.svg
+- cockpit/themes/dataflow/symbols/choose.svg
+- cockpit/themes/dataflow/symbols/choose_exclusive.svg
+- cockpit/themes/dataflow/symbols/choose_inclusive.svg
+- cockpit/themes/dataflow/symbols/closed_loop.svg
+- cockpit/themes/dataflow/symbols/closed_loop_cancel.svg
+- cockpit/themes/dataflow/symbols/closed_loop_control.svg
+- cockpit/themes/dataflow/symbols/closed_loop_measuring.svg
+- cockpit/themes/dataflow/symbols/complex.svg
+- cockpit/themes/dataflow/symbols/critical.svg
+- cockpit/themes/dataflow/symbols/delete.svg
+- cockpit/themes/dataflow/symbols/end.svg
+- cockpit/themes/dataflow/symbols/escape.svg
+- cockpit/themes/dataflow/symbols/event_end.svg
+- cockpit/themes/dataflow/symbols/loop.svg
+- cockpit/themes/dataflow/symbols/manipulate.svg
+- cockpit/themes/dataflow/symbols/otherwise.svg
+- cockpit/themes/dataflow/symbols/parallel.svg
+- cockpit/themes/dataflow/symbols/parallel_branch.svg
+- cockpit/themes/dataflow/symbols/parallel_branch_compact.svg
+- cockpit/themes/dataflow/symbols/parallel_branch_event.svg
+- cockpit/themes/dataflow/symbols/parallel_branch_normal.svg
+- cockpit/themes/dataflow/symbols/parallel_eventbased_exclusive.svg
+- cockpit/themes/dataflow/symbols/parallel_eventbased_parallel.svg
+- cockpit/themes/dataflow/symbols/scripts.svg
+- cockpit/themes/dataflow/symbols/start.svg
+- cockpit/themes/dataflow/symbols/start_event.svg
+- cockpit/themes/dataflow/symbols/stop.svg
+- cockpit/themes/dataflow/symbols/terminate.svg
+- cockpit/themes/dataflow/symbols/test.svg
+- cockpit/themes/dataflow/theme.js
 - cockpit/themes/default/rngs/alternative.rng
 - cockpit/themes/default/rngs/call.rng
 - cockpit/themes/default/rngs/callmanipulate.rng
@@ -715,13 +773,9 @@ files:
 - server/resources/test.pdf
 - 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.conf
 - server/server.pid

data/server/routing/end.pid

@@ -1 +0,0 @@
-1105683

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

@@ -1 +0,0 @@
-1105692

data/server/routing/forward-votes.pid

@@ -1 +0,0 @@
-1105689

data/server/routing/persist.pid

@@ -1 +0,0 @@
-1105686