cpee 1.4.8 → 1.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 416188034ef7c0020c76c14841e2aab9556634ae
-  data.tar.gz: d2ceda09e62188498ee0e565733007bcd90397f2
+SHA256:
+  metadata.gz: 9bcb32efae8a0010345e6075833164b82be63e32fc74fe492e30794c39f1e0bb
+  data.tar.gz: 6374a34d2c0366549f152dcf5eadb896a2357c70f1d6c23b66985cda12c062f0
 SHA512:
-  metadata.gz: a0fb17d5cbcad12b931b0cb378f9d50092792bdd8c98808f07540e8fabf4a6515e8462d39eea1408eb4efd7534443cfae12d95b6afce16f41c712f1739eb1aa9
-  data.tar.gz: 4d91c2f7a529aa8f5b44a11a6003bf817f16decc39dc4a7709262f4e04c6a1be8b495a7632733564388d312ed7accc8d4dcc1f5e9539b4d3625e2f922c9786b4
+  metadata.gz: 7dd02049b645e866bfb8947a9fadf5d1718aa154d846cf0d36875b5d9bae38e39c31f8dbb8aa9c66f20422404e95047b97e7e55ffcacdd4a78ed7cf62620c78a
+  data.tar.gz: 61cc7b86287410f500f546cf777c65c9895b48de648cba65de6670135549d5a831f28028f4ed084137dee055148eadc69a30960af9eebe2b4280f5b26936efa7

data/cockpit/config.json

@@ -0,0 +1,6 @@
+{
+  "testsets-url": "https://centurio.work/customers/prime/",
+  "repo-url": "https://centurio.work/plan/",
+  "base-url": "https://centurio.work/flow/engine/"
+}
+~

data/cockpit/css/ui.css

@@ -65,15 +65,15 @@ ui-tabbed ui-tabbar ui-behind button {
 #areainstance div.section:nth-child(3) button[name=loadmodeltype]   { white-space: normal; width: 10em; height: 2em; }
 
 #areaexecution input { padding: 0; margin:0; }
-#areaexecution table.compact { width: 100%; }
-#areaexecution table.compact tr td:nth-child(1) { width: 15ex; }
+#areaexecution table.x-ui-compact { width: 100%; }
+#areaexecution table.x-ui-compact tr td:nth-child(1) { width: 15ex; }
 
-#areaexecution table.compact tbody.debug tr:last-child td { padding-bottom: 0.5em; }
-#areaexecution table.compact tbody.debug tr:last-child td input { vertical-align: middle; }
-#areaexecution table.compact tbody.exe tr:first-child td { padding-top: 0.5em; }
-#areaexecution table.compact tbody.exe { border-top: 1px solid #a1a1a1; }
+#areaexecution table.x-ui-compact tbody.debug tr:last-child td { padding-bottom: 0.5em; }
+#areaexecution table.x-ui-compact tbody.debug tr:last-child td input { vertical-align: middle; }
+#areaexecution table.x-ui-compact tbody.exe tr:first-child td { padding-top: 0.5em; }
+#areaexecution table.x-ui-compact tbody.exe { border-top: 1px solid #a1a1a1; }
 
-#areaexecution table.compact tbody.exe td { height: 2.2em; }
+#areaexecution table.x-ui-compact tbody.exe td { height: 2.2em; }
 
 #dat_endpoints {
   border-collapse:collapse;

data/cockpit/index.html

@@ -125,7 +125,7 @@
       </ui-tabbar>
       <ui-content>
         <ui-area data-belongs-to-tab="new" id="areanew"> <!--{{{-->
-          <table class='layout'>
+          <table class='x-ui-layout'>
           <tr>
             <td>Repository:</td>
             <td><input name="repo-url" type="text" value=""/></td>
@@ -170,7 +170,7 @@
           </div>
         </ui-area> <!--}}}-->
         <ui-area data-belongs-to-tab="execution" id="areaexecution" class='inactive'> <!--{{{-->
-          <table class='compact'>
+          <table class='x-ui-compact'>
             <tbody class='debug'>
               <tr>
                 <td>Debugging:</td>
@@ -229,11 +229,11 @@
         </ui-area>
         <ui-resizehandle data-belongs-to-tab="details" data-label="drag to resize"></ui-resizehandle>
         <ui-area data-belongs-to-tab="details" id="detailcolumn">
-          <div id="dat_details" class='layout'></div>
+          <div id="dat_details" class='x-ui-layout'></div>
         </ui-area>
         <ui-area data-belongs-to-tab="dsl" id="areadsl" class="inactive"></ui-area>
         <ui-area data-belongs-to-tab="log" id="arealog" class="inactive"> <!--{{{-->
-          <table id="dat_log" class="layout"></table>
+          <table id="dat_log" class="x-ui-layout"></table>
         </ui-area> <!--}}}-->
       </ui-content>
     </ui-rest>

data/cockpit/js/instance.js

@@ -367,8 +367,10 @@ function adaptor_update() { //{{{
   $('g.element[element-endpoint]').each(function(k,ele){
     if (save['endpoints_cache'][$(ele).attr('element-endpoint')] && save['endpoints_cache'][$(ele).attr('element-endpoint')]) {
       var c = $(ele).find('g.replace');
-      var symbol = save['endpoints_cache'][$(ele).attr('element-endpoint')].symbol.documentElement;
-      c.replaceWith($(symbol).clone());
+      var symbol = save['endpoints_cache'][$(ele).attr('element-endpoint')].symbol;
+      if (symbol) {
+        c.replaceWith($(symbol.documentElement).clone());
+      }
     }
   });
 } //}}}
@@ -739,7 +741,8 @@ function set_testset(testset,exec) {// {{{
         data: ({value: res}),
         error: report_failure,
         success: function(res){
-          if (exec) start_instance();
+          // use promises you filthy animal
+          if (exec) setTimeout(start_instance,2000);
         }
       });
     }

data/cockpit/themes/compact/theme.js

@@ -23,13 +23,13 @@ function WFAdaptorManifestation(adaptor) {
       return($X(ntxt));
     } else {
       if (opts && opts == 'clone') {
+        base = base.clone();
         if (base.attr('id')) {
-          base = base.clone();
-          // not very generic, because it is assumed that id is attribute of top level
-          // a better solution would be to parse rng for get_free_id()
-          // but: there is lots of lock-in to element-id, so fuck it
           base.attr('id',self.adaptor.description.get_free_id());
         }
+        base.find('*[id]').each(function(k,v){
+          $(v).attr('id',self.adaptor.description.get_free_id(base));
+        });
       }
       return base;
     }
@@ -59,9 +59,9 @@ function WFAdaptorManifestation(adaptor) {
     var tab  = $('#dat_details');
     var node = self.adaptor.description.get_node_by_svg_id(svgid).get(0);
         tab.empty();
-    if (self.adaptor.description.elements[$(node).attr('svg-type')]) {
+    if (self.adaptor.description.elements[$(node).attr('svg-subtype')]) {
       save['details_target'] = { 'svgid': svgid, 'model': self.adaptor.description };
-      var rng = self.adaptor.description.elements[$(node).attr('svg-type')].clone();
+      var rng = self.adaptor.description.elements[$(node).attr('svg-subtype')].clone();
       if (save['endpoints_cache'][$(node).attr('endpoint')] && save['endpoints_cache'][$(node).attr('endpoint')].schema) {
         var schema = save['endpoints_cache'][$(node).attr('endpoint')].schema.documentElement;
         $(rng).find(' > element[name="parameters"] > element[name="arguments"]').replaceWith($(schema).clone());
@@ -275,6 +275,37 @@ function WFAdaptorManifestation(adaptor) {
       'click': self.events.click,
     }//}}}
   }; /*}}}*/
+  this.elements.stop = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/stop.svg'
+    },//}}}
+    'description': self.adaptor.theme_dir + 'rngs/stop.rng',
+    'permissible_children': function(node,mode) { //{{{
+      return [];
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'click': self.events.click,
+    }//}}}
+  }; /*}}}*/
+  this.elements.terminate = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'final': true,
+      'svg': self.adaptor.theme_dir + 'symbols/terminate.svg'
+    },//}}}
+    'description': self.adaptor.theme_dir + 'rngs/terminate.rng',
+    'permissible_children': function(node,mode) { //{{{
+      return [];
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'click': self.events.click,
+    }//}}}
+  }; /*}}}*/
 
   // Complex Elements
   this.elements.choose = { /*{{{*/
@@ -390,6 +421,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -463,6 +504,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -525,6 +576,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -602,6 +663,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': self.adaptor.description.insert_last_into,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': self.adaptor.description.insert_last_into,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': self.adaptor.description.insert_last_into,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -683,6 +754,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -758,6 +839,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),
@@ -856,6 +947,16 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
+        {'label': 'Terminate',
+         'function_call': func,
+         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
+         'type': 'terminate',
+         'params': [self.adaptor.description.elements.terminate, node]},
+        {'label': 'Stop',
+         'function_call': func,
+         'menu_icon': self.elements.stop.illustrator.svg.clone(),
+         'type': 'stop',
+         'params': [self.adaptor.description.elements.stop, node]},
         {'label': 'Critical',
          'function_call': func,
          'menu_icon': self.elements.critical.illustrator.svg.clone(),

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

@@ -25,6 +25,35 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="sensors" rngui:header="Sensors">
+      <zeroOrMore rngui:label="Add Sensor">
+        <element name="sensor">
+          <element name="name" rngui:label="Label">
+            <data type="string" rngui:label="Label"/>
+          </element>
+          <element name="extractor_url" rngui:label="Extractor Url">
+            <data type="string" rngui:label="Url"/>
+          </element>
+          <element name="extractor_arg" rngui:label="Extractor Argument">
+            <data type="string" rngui:label="Path"/>
+          </element>
+          <element name="visualizer_url" rngui:label="Visualizer Url">
+            <data type="string" rngui:label="Url"/>
+          </element>
+          <element name="visualizer_config" rngui:label="Visualizer Config">
+            <data type="string" rngui:label="Url"/>
+          </element>
+          <element name="visualizer_params" rngui:header="Visualizer Arguments">
+            <zeroOrMore rngui:label="Create Argument Pair">
+              <element rngui:label='Name'>
+                <anyName/>
+                <data type="string" rngui:label="Value"/>
+              </element>
+            </zeroOrMore>
+          </element>
+        </element>
+      </zeroOrMore>
+    </element>
   </element>
   <element name="_timing" rngui:header="Timing">
     <element name="_timing_min" rngui:label='Min in m'>

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

@@ -25,6 +25,35 @@
         </element>
       </zeroOrMore>
     </element>
+    <element name="sensors" rngui:header="Sensors">
+      <zeroOrMore rngui:label="Add Sensor">
+        <element name="sensor">
+          <element name="name" rngui:label="Label">
+            <data type="string" rngui:label="Label"/>
+          </element>
+          <element name="extractor_url" rngui:label="Extractor Url">
+            <data type="string" rngui:label="Url"/>
+          </element>
+          <element name="extractor_arg" rngui:label="Extractor Argument">
+            <data type="string" rngui:label="Path"/>
+          </element>
+          <element name="visualizer_url" rngui:label="Visualizer Url">
+            <data type="string" rngui:label="Url"/>
+          </element>
+          <element name="visualizer_config" rngui:label="Visualizer Config">
+            <data type="string" rngui:label="Url"/>
+          </element>
+          <element name="visualizer_params" rngui:header="Visualizer Arguments">
+            <zeroOrMore rngui:label="Create Argument Pair">
+              <element rngui:label='Name'>
+                <anyName/>
+                <data type="string" rngui:label="Value"/>
+              </element>
+            </zeroOrMore>
+          </element>
+        </element>
+      </zeroOrMore>
+    </element>
   </element>
   <element name="finalize" rngui:header="Finalize" rngui:label="Code">
     <attribute name="output" rngui:label="Access Variable" rngui:default="result">

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.4.8"
+  s.version          = "1.4.10"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/controller.rb

@@ -226,7 +226,7 @@ module CPEE
 
     def finalize_if_finished
       if @instance.state == :finished
-        @instance = nil
+        #@instance = nil
       end
     end
 

data/lib/cpee/instantiation.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'riddl/server'
+require 'securerandom'
 require 'xml/smart'
 require 'base64'
 require 'uri'
@@ -77,31 +78,21 @@ module CPEE
         return ins
       end #}}}
       private :load_testset
-      def handle_waiting(cpee,instance,behavior) #{{{
+      def handle_waiting(cpee,instance,behavior,selfurl,cblist) #{{{
         if behavior =~ /^wait/
           condition = behavior.match(/_([^_]+)_/)&.[](1) || 'finished'
-          @headers << Riddl::Header.new('CPEE_CALLBACK','true')
+          @headers << Riddl::Header.new('CPEE-CALLBACK','true')
           cb = @h['CPEE_CALLBACK']
 
           if cb
+            cbk = SecureRandom.uuid
             srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
             status, response = srv.resource("/#{instance}/notifications/subscriptions/").post [
+              Riddl::Parameter::Simple.new("url",File.join(selfurl,'callback',cbk)),
               Riddl::Parameter::Simple.new("topic","state"),
-              Riddl::Parameter::Simple.new("events","change"),
+              Riddl::Parameter::Simple.new("events","change")
             ]
-            key = response.first.value
-
-            srv.resource("/#{instance}/notifications/subscriptions/#{key}/ws/").ws do |conn|
-              conn.on :message do |msg|
-                if JSON::parse(XML::Smart::string(msg.data).find('string(/event/notification)'))['state'] == condition
-                  conn.close
-                  Riddl::Client.new(cb).put [
-                    # TODO extract all dataelements from instance
-                    Riddl::Parameter::Simple.new('instance',instance)
-                  ]
-                end
-              end
-            end
+            cblist[cbk] = cb, condition, instance
           end
         end
       end #}}}
@@ -135,6 +126,8 @@ module CPEE
 
       def response
         cpee = @a[0]
+        selfurl = @a[1]
+        cblist = @a[2]
         status, res = Riddl::Client.new(@p[2].value).get
         tdoc = if status >= 200 && status < 300
           res[0].value.read
@@ -145,8 +138,9 @@ module CPEE
         if (instance = load_testset(tdoc,cpee,@p[0].value)) == -1
           @status = 500
         else
+          @headers << Riddl::Header.new('CPEE-INSTANTIATION',File.join(cpee,instance))
           handle_data cpee, instance, @p[3]&.value
-          handle_waiting cpee, instance, @p[1].value
+          handle_waiting cpee, instance, @p[1].value, selfurl, cblist
           handle_starting cpee, instance, @p[1].value
           return Riddl::Parameter::Simple.new("url",cpee + instance)
         end
@@ -160,6 +154,8 @@ module CPEE
         cpee     = @a[0]
         behavior = @a[1] ? 'fork_ready' : @p[0].value
         data     = @a[1] ? 0 : 1
+        selfurl  = @a[2]
+        cblist   = @a[3]
         tdoc = if @p[data].additional =~ /base64/
           Base64.decode64(@p[data].value.read)
         else
@@ -169,8 +165,9 @@ module CPEE
         if (instance = load_testset(tdoc,cpee)) == -1
           @status = 500
         else
+          @headers << Riddl::Header.new('CPEE-INSTANTIATION',File.join(cpee,instance))
           handle_data cpee, instance, @p[data+1]&.value
-          handle_waiting cpee, instance, behavior
+          handle_waiting cpee, instance, behavior, selfurl, cblist
           handle_starting cpee, instance, behavior
           return Riddl::Parameter::Simple.new("url",cpee + instance)
         end
@@ -182,29 +179,55 @@ module CPEE
 
       def response
         cpee     = @a[0]
+        selfurl  = @a[1]
+        cblist   = @a[2]
         instance = @p[1].value
 
         handle_data cpee, instance, @p[2]&.value
-        handle_waiting cpee, instance, @p[0].value
+        handle_waiting cpee, instance, @p[0].value, selfurl, cblist
         handle_starting cpee, instance, @p[0].value
         return Riddl::Parameter::Simple.new("url",cpee + instance)
       end
     end #}}}
 
+    class ContinueTask < Riddl::Implementation #{{{
+      def response
+        cblist       = @a[0]
+        topic        = @p[1].value
+        event_name   = @p[2].value
+        notification = JSON.parse(@p[3].value)
+
+        cb, condition, instance = cblist[@r.last]
+        if notification['state'] == condition
+          Riddl::Client.new(cb).put [
+            # TODO extract all dataelements from instance
+            Riddl::Parameter::Simple.new('instance',instance)
+          ]
+        end
+      end
+    end #}}}
+
     def self::implementation(opts)
       opts[:cpee] ||= 'http://localhost:9298/'
+      opts[:self] ||= "http#{opts[:secure] ? 's' : ''}://#{opts[:host]}:#{opts[:port]}/"
+      opts[:cblist] ||= {}
       Proc.new do
         on resource do
-          run InstantiateXML, opts[:cpee],true if post 'xmlsimple'
+          run InstantiateXML, opts[:cpee], true if post 'xmlsimple'
           on resource 'xml' do
             run InstantiateXML, opts[:cpee], false if post 'xml'
           end
           on resource 'url' do
-            run InstantiateUrl, opts[:cpee] if post 'url'
+            run InstantiateUrl, opts[:cpee], opts[:self], opts[:cblist] if post 'url'
           end
           on resource 'instance' do
             run HandleInstance, opts[:cpee] if post 'instance'
           end
+          on resource 'callback' do
+            on resource do
+              run ContinueTask, opts[:cblist] if post
+            end
+          end
         end
       end
     end