cpee 1.4.10 → 1.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bcb32efae8a0010345e6075833164b82be63e32fc74fe492e30794c39f1e0bb
-  data.tar.gz: 6374a34d2c0366549f152dcf5eadb896a2357c70f1d6c23b66985cda12c062f0
+  metadata.gz: 78ed01a7dac4df1f58e1eb2bd77533f4dd3e879bc19f5e03b3ba6238b28c6ffa
+  data.tar.gz: 43a2d6b29c263f66a958195107476fa6550fee13b02bd3031ff8ecedce984710
 SHA512:
-  metadata.gz: 7dd02049b645e866bfb8947a9fadf5d1718aa154d846cf0d36875b5d9bae38e39c31f8dbb8aa9c66f20422404e95047b97e7e55ffcacdd4a78ed7cf62620c78a
-  data.tar.gz: 61cc7b86287410f500f546cf777c65c9895b48de648cba65de6670135549d5a831f28028f4ed084137dee055148eadc69a30960af9eebe2b4280f5b26936efa7
+  metadata.gz: b41c3d08a32c2990a5553dbb1f8acadf56dd48b5258be876f01f2bbd43d52add1d7d5568e273594761724e88034c0a6124f9ca7a5914cfe34b626834e502a39a
+  data.tar.gz: 57534ab3ff2262ef9eb1fcda812104f9a7884deea25d1c4a38bba60f2aa183c2bb4ce3b899491b212109957d8e67482f11223c1c0a3a94e47201b67ad4451c57

data/cockpit/js/instance.js

@@ -1,6 +1,7 @@
 var ws;
 var suspended_monitoring = false;
 var myid = ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16));
+var paths = '#dat_details input, #dat_details textarea, #dat_details select, #dat_details button, #dat_details [contenteditable], #dat_dataelements input, #dat_dataelements textarea, #dat_dataelements select, #dat_dataelements button, #dat_dataelements [contenteditable], #dat_endpoints input, #dat_endpoints textarea, #dat_endpoints select, #dat_endpoints button, #dat_endpoints [contenteditable], #dat_attributes input, #dat_attributes textarea, #dat_attributes select, #dat_attributes button, #dat_attributes [contenteditable]';
 var loading = false;
 var subscription;
 var subscription_state = 'less';
@@ -526,6 +527,13 @@ function monitor_instance_state_change(notification) { //{{{
       but = " ⇒ <button onclick='$(this).attr(\"disabled\",\"disabled\");stop_instance();'>stop</button>";
     }
 
+    // disable all input, also check themes
+    format_visual_forms();
+    // remove all markings with state change
+    if (save['graph_adaptor'] && save['graph_adaptor'].illustrator) {
+      save['graph_adaptor'].illustrator.get_elements().removeClass('marked');
+    }
+
     if (notification == "finished") {
       $('.tabbehind button').hide();
     } else {
@@ -826,7 +834,7 @@ function load_modeltype() {// {{{
   $.ajax({
     cache: false,
     dataType: 'xml',
-    url: $('body').attr('current-testsets') + name + ".xml",
+    url: $('body').attr('current-testsets') + "." + name + ".xml",
     success: function(res){
       $.ajax({
         type: "PUT",
@@ -1063,6 +1071,18 @@ function format_visual_vote_clear() {//{{{
   $("#votes").empty();
 }//}}}
 
+function format_visual_forms() { //{{{
+  if (save['state'] != "ready" && save['state'] != "stopped") {
+    $(paths).each(function(k,e){
+      $(e).attr('disabled','disable');
+    });
+  } else {
+    $(paths).each(function(k,e){
+      $(e).removeAttr('disabled');
+    });
+  }
+} //}}}
+
 function format_code(res,skim,lnums) {// {{{
  try {
   res = res.replace(/&/g,'&amp;');

data/cockpit/testsets/Async.xml

@@ -0,0 +1,42 @@
+<testset>
+  <dataelements/>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <endpoints>
+    <timeout xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <test xmlns="http://riddl.org/ns/common-patterns/properties/1.0">http://localhost:9301/</test>
+  </endpoints>
+  <positions/>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="test">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments/>
+          <sensors/>
+        </parameters>
+        <finalize output="result"/>
+        <update output="result"/>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <attributes>
+    <info xmlns="http://riddl.org/ns/common-patterns/properties/1.0">Async</info>
+    <modeltype xmlns="http://riddl.org/ns/common-patterns/properties/1.0">CPEE</modeltype>
+  </attributes>
+</testset>

data/cockpit/testsets/testsets.xml

@@ -1,5 +1,6 @@
 <testsets>
   <!--testset>Centurio</testset-->
+  <testset>Async</testset>
   <testset>Log</testset>
   <testset>BCS</testset>
   <testset>BCO</testset>

data/cockpit/themes/compact/theme.js

@@ -68,6 +68,7 @@ function WFAdaptorManifestation(adaptor) {
       }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval);
       save['details'].content(node);
+      format_visual_forms();
     }
   }; //}}}
 
@@ -117,6 +118,8 @@ function WFAdaptorManifestation(adaptor) {
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
     } else if(e.button == 2) { // right-click
+      if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
+
       var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
       var group = null;
       var menu = {};
@@ -170,6 +173,7 @@ function WFAdaptorManifestation(adaptor) {
     self.adaptor.illustrator.get_elements().removeClass('clicked');
 
     if (e && e.ctrlKey) {
+      if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
       var tab = $('#dat_details');
           tab.empty();
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);

data/cockpit/themes/default/theme.js

@@ -68,6 +68,7 @@ function WFAdaptorManifestation(adaptor) {
       }
       save['details'] = new RelaxNGui(rng,tab,self.adaptor.description.context_eval);
       save['details'].content(node);
+      format_visual_forms();
     }
   }; //}}}
 
@@ -117,6 +118,8 @@ function WFAdaptorManifestation(adaptor) {
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
     } else if(e.button == 2) { // right-click
+      if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
+
       var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
       var group = null;
       var menu = {};
@@ -170,6 +173,7 @@ function WFAdaptorManifestation(adaptor) {
     self.adaptor.illustrator.get_elements().removeClass('clicked');
 
     if (e && e.ctrlKey) {
+      if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
       var tab = $('#dat_details');
           tab.empty();
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);

data/cpee.gemspec

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

@@ -33,7 +33,7 @@
       </layer>
       <layer name="notifications">
         <apply-to>/{}</apply-to>
-      </layer>  
+      </layer>
     </tile>
   </facade>
 </declaration>

data/lib/cpee/implementation.rb

@@ -108,6 +108,8 @@ module CPEE
       controller[id].mutex.synchronize do
         if controller[id].callbacks.has_key?(callback)
           controller[id].callbacks[callback].callback(@p,@h)
+        else
+          @status = 503
         end
       end
     end

data/log/logs/1/test

@@ -0,0 +1 @@
+test

data/server/instances/1/properties.xml

@@ -1,114 +1,38 @@
 <properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
   <attributes>
-    <uuid>34574182-a968-4e52-b401-4a16604be6a9</uuid>
-    <info>Spawn Machining</info>
+    <uuid/>
+    <info>Lego Plate</info>
     <modeltype>CPEE</modeltype>
-    <theme>default</theme>
-    <customer>pilotfabrik</customer>
-    <status>development</status>
-    <artefacts>[ { "group": "Orders", "name": "3D Printer Side" } ]</artefacts>
   </attributes>
-  <state>ready</state>
+  <state>stopped</state>
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <positions/>
   <dataelements>
-    <instances>[]</instances>
+    <i>0</i>
   </dataelements>
   <endpoints>
     <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
-    <start_instance>https://centurio.work/flow/start/instance/</start_instance>
-    <start_url>https://centurio.work/flow/start/url/</start_url>
-    <hoert_die_signale>https://centurio.work/data/mm500/signals/</hoert_die_signale>
+    <move>http://plate.wst.univie.ac.at:9200/go-next</move>
   </endpoints>
-  <dsl>parallel :wait =&gt; -1 do
-  parallel_branch do
-    call :a1, :hoert_die_signale, parameters: { :label =&gt; "Listen to NC Start signals", :method =&gt; :get, :arguments =&gt; nil, :sensors =&gt; nil }, update: &lt;&lt;-END
-      data.instances &lt;&lt; result
-      status.nudge!
-    END
-  end
-  parallel_branch do
-    loop pre_test{true}  do
-      choose :exclusive do
-        alternative test{data.instances.empty?} do
-          manipulate :a3, { :label =&gt; "Sleep" }, &lt;&lt;-END
-            status.wait_until_nudged!
-          END
-        end
-        otherwise  do
-          call :a2, :start_url, parameters: { :label =&gt; "Spawn Subprocess", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :info, :value =&gt; "3D Drucker Seite"), ⭐(:name =&gt; :behavior, :value =&gt; "fork_running"), ⭐(:name =&gt; :url, :value =&gt; "https://centurio.work/customers/prime/Machining%20MM500.xml"), ⭐(:name =&gt; :init, :value =&gt; "{ \"instance\": \"#{data.instances.last}\" }")] }, finalize: &lt;&lt;-END
-            data.instances.pop
-          END
-        end
-      end
-    end
-  end
+  <dsl>loop pre_test{i&lt;2}  do
+  call :a1, :move, parameters: { :label =&gt; "Move to next station", :method =&gt; :post, :arguments =&gt; nil }, finalize: &lt;&lt;-END
+    data.i= data.i + 1
+  END
 end
 </dsl>
   <dslx>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <parallel wait="-1">
-        <parallel_branch>
-          <call id="a1" endpoint="hoert_die_signale">
-            <parameters>
-              <label>Listen to NC Start signals</label>
-              <method>:get</method>
-              <arguments/>
-              <sensors/>
-            </parameters>
-            <finalize output="result"/>
-            <update output="result">data.instances &lt;&lt; result
-status.nudge!</update>
-            <_timing>
-              <_timing_min/>
-              <_timing_max/>
-              <_timing_avg/>
-            </_timing>
-            <_notes>
-              <_notes_general/>
-              <_notes_output/>
-              <_attachments/>
-            </_notes>
-          </call>
-        </parallel_branch>
-        <parallel_branch>
-          <loop mode="pre_test" condition="true">
-            <choose mode="exclusive">
-              <alternative condition="data.instances.empty?">
-                <manipulate id="a3" label="Sleep">status.wait_until_nudged!</manipulate>
-              </alternative>
-              <otherwise>
-                <call id="a2" endpoint="start_url">
-                  <parameters>
-                    <label>Spawn Subprocess</label>
-                    <method>:post</method>
-                    <arguments>
-                      <info>3D Drucker Seite</info>
-                      <behavior>fork_running</behavior>
-                      <url>https://centurio.work/customers/prime/Machining%20MM500.xml</url>
-                      <init>
-                        <instance>!data.instances.last</instance>
-                      </init>
-                    </arguments>
-                  </parameters>
-                  <finalize output="result">data.instances.pop</finalize>
-                  <update output="result"/>
-                  <_timing>
-                    <_timing_min/>
-                    <_timing_max/>
-                    <_timing_avg/>
-                  </_timing>
-                  <_notes>
-                    <_notes_general/>
-                    <_notes_output/>
-                    <_attachments/>
-                  </_notes>
-                </call>
-              </otherwise>
-            </choose>
-          </loop>
-        </parallel_branch>
-      </parallel>
+      <loop mode="pre_test" condition="i&lt;2">
+        <call id="a1" endpoint="move">
+          <parameters>
+            <label>Move to next station</label>
+            <method>:post</method>
+            <arguments/>
+          </parameters>
+          <finalize output="result">data.i= data.i + 1</finalize>
+          <update output="result"/>
+        </call>
+      </loop>
     </description>
   </dslx>
   <status>
@@ -117,68 +41,17 @@ status.nudge!</update>
   </status>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
-      <parallel wait="-1">
-        <parallel_branch>
-          <call id="a1" endpoint="hoert_die_signale">
-            <parameters>
-              <label>Listen to NC Start signals</label>
-              <method>:get</method>
-              <arguments/>
-              <sensors/>
-            </parameters>
-            <finalize output="result"/>
-            <update output="result">data.instances &lt;&lt; result
-status.nudge!</update>
-            <_timing>
-              <_timing_min/>
-              <_timing_max/>
-              <_timing_avg/>
-            </_timing>
-            <_notes>
-              <_notes_general/>
-              <_notes_output/>
-              <_attachments/>
-            </_notes>
-          </call>
-        </parallel_branch>
-        <parallel_branch>
-          <loop mode="pre_test" condition="true">
-            <choose mode="exclusive">
-              <alternative condition="data.instances.empty?">
-                <manipulate id="a3" label="Sleep">status.wait_until_nudged!</manipulate>
-              </alternative>
-              <otherwise>
-                <call id="a2" endpoint="start_url">
-                  <parameters>
-                    <label>Spawn Subprocess</label>
-                    <method>:post</method>
-                    <arguments>
-                      <info>3D Drucker Seite</info>
-                      <behavior>fork_running</behavior>
-                      <url>https://centurio.work/customers/prime/Machining%20MM500.xml</url>
-                      <init>
-                        <instance>!data.instances.last</instance>
-                      </init>
-                    </arguments>
-                  </parameters>
-                  <finalize output="result">data.instances.pop</finalize>
-                  <update output="result"/>
-                  <_timing>
-                    <_timing_min/>
-                    <_timing_max/>
-                    <_timing_avg/>
-                  </_timing>
-                  <_notes>
-                    <_notes_general/>
-                    <_notes_output/>
-                    <_attachments/>
-                  </_notes>
-                </call>
-              </otherwise>
-            </choose>
-          </loop>
-        </parallel_branch>
-      </parallel>
+      <loop mode="pre_test" condition="i&lt;2">
+        <call id="a1" endpoint="move">
+          <parameters>
+            <label>Move to next station</label>
+            <method>:post</method>
+            <arguments/>
+          </parameters>
+          <finalize output="result">data.i= data.i + 1</finalize>
+          <update output="result"/>
+        </call>
+      </loop>
     </description>
   </description>
   <transformation>

data/server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/consumer-secret

@@ -0,0 +1 @@
+67c4f55a8651a9e6638dabb3162e59c5

data/server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/producer-secret

@@ -0,0 +1 @@
+a80086de3fde314651e73260eef88b7f

data/server/instances/10/notifications/182434032285ca1d06a8b6554b8889c8/subscription.xml

@@ -0,0 +1,23 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9299/events">
+  <topic id="activity">
+    <event>calling</event>
+    <event>failed</event>
+    <event>manipulating</event>
+    <event>done</event>
+  </topic>
+  <topic id="dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="description">
+    <event>error</event>
+  </topic>
+  <topic id="state">
+    <event>change</event>
+  </topic>
+  <topic id="status">
+    <event>change</event>
+  </topic>
+</subscription>

data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/consumer-secret

@@ -0,0 +1 @@
+f1b893f930441651cf29a0d5cc655934

data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/producer-secret

@@ -0,0 +1 @@
+27c304e972512ee874969576adcf3c6c

data/server/instances/10/notifications/512a3785631a5245dbb45fa150ea72ed/subscription.xml

@@ -0,0 +1,6 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://solo.wst.univie.ac.at:9299/log">
+  <topic id="activity">
+    <event>calling</event>
+    <event>done</event>
+  </topic>
+</subscription>