cpee 1.4.29 → 1.4.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69167cf7972c5d782e186b52c9bc447b01ca491c3c711a483d6abf50249d9f46
-  data.tar.gz: e8354ec5bdd70105d979acf467de51d3368b050add7e86e3e6bf848c789bb89e
+  metadata.gz: 3af489d577c4dea65d15939ddba88e8f1ed6782583aa641ca534a38fe83ef310
+  data.tar.gz: 05ee4ea40caf21bd323f999dfb7b089312f7bf7502be0b4576b91cf838e16658
 SHA512:
-  metadata.gz: 046a33c964cccb7ea6ec83b52abcc2ac9ae44b648c9a45ebf0b8922666493b001df6a6191b0c4cee00720e837cf14d6b171104362aa517223bac393dff4a6079
-  data.tar.gz: d4ff60f1b32c7df91303848dac2dc410f02f672dd3c4ee4c7459d82a40cb6b74c7b6a8e5fdfa0b00f0670ec545c8682fdfe62000f49e5b87ee9dd7dd6658f6ea
+  metadata.gz: a836d6cba5336a23f026fb7a46946f85fa7cace8c3832bdebece0459e683138f7bc6056737eb84cd1231f26d59323500dac1fa8e7aa60b55d17dc65984e1f2d4
+  data.tar.gz: 998e48a4b3d21a7afbde101282ed0b3153fad3741a675a604b309dc1c7d53961348f6255e7bf179c719ec68d88bc0d5b54e422a1395539cfc28f7da906622652

data/cockpit/css/track.css

@@ -28,6 +28,7 @@
 
 #usage {
   line-height: 2em;
+  margin-top: 0.5em;
   margin-left: 2em;
   margin-right: 1em;
 }

data/cockpit/index.html

@@ -180,7 +180,16 @@
             <tbody class='exe'>
               <tr>
                 <td>State:</td>
-                <td id='state'></td>
+                <td id='state'>
+                  <span id="state_text"></span>
+                  <span> ⇒ </span>
+                  <button name="state_start" title='start'>Start</button>
+                  <button name="state_stop" title='stop'>Stop</button>
+                  <span> / </span>
+                  <button name="state_sim" title='simulate'>Sim</button>
+                  <span> / </span>
+                  <button name="state_abandon" title='abandon'>Abandon</button>
+                </td>
               </tr>
               <tr>
                 <td>Continue:</td>

data/cockpit/js/instance.js

@@ -75,6 +75,10 @@ function cockpit() { //{{{
   $("button[name=loadmodeltype]").click(function(e){new CustomMenu(e).menu($('#modeltypes'),load_modeltype, $("button[name=loadmodeltype]")); });
   $("button[name=savetestset]").click(function(){ save_testset(); });
   $("button[name=savesvg]").click(function(){ save_svg(); });
+  $("button[name=state_start]").click(function(){ $(this).attr("disabled","disabled");start_instance(); });
+  $("button[name=state_stop]").click(function(){ $(this).attr("disabled","disabled");stop_instance(); });
+  $("button[name=state_simulate]").click(function(){ $(this).attr("disabled","disabled");sim_instance(); });
+  $("button[name=state_abandon]").click(function(){ aba_instance(); });
   $("input[name=votecontinue]").click(check_subscription);
   $("input[name=testsetfile]").change(load_testsetfile_after);
   $("input[name=modelfile]").change(load_modelfile_after);
@@ -543,9 +547,6 @@ function monitor_instance_state_change(notification) { //{{{
   if (notification != save['state']) {
     save['state'] = notification;
 
-    var ctv = $("#state");
-    ctv.empty();
-
     if (notification == "stopped") {
       monitor_instance_pos();
     }
@@ -555,9 +556,15 @@ function monitor_instance_state_change(notification) { //{{{
 
     var but = "";
     if (notification == "ready" || notification == "stopped") {
-      but = " ⇒ <button onclick='$(this).attr(\"disabled\",\"disabled\");start_instance();' title='start'>⏵</button> / <button onclick='$(this).attr(\"disabled\",\"disabled\");sim_instance();' title='simulate'>🎜</button> / <button onclick='aba_instance();' title='abandon'>⛌</button>";
+      $("button[name=state_start]").show();
+      $("button[name=state_stop]").hide();
+      $("button[name=state_sim]").show();
+      $("button[name=state_abandon]").show();
     } else if (notification == "running") {
-      but = " ⇒ <button onclick='$(this).attr(\"disabled\",\"disabled\");stop_instance();' title='stop'>⏸</button>";
+      $("button[name=state_start]").hide();
+      $("button[name=state_stop]").show();
+      $("button[name=state_sim]").hide();
+      $("button[name=state_abandon]").hide();
     }
 
     // disable all input, also check themes
@@ -573,7 +580,7 @@ function monitor_instance_state_change(notification) { //{{{
       $('#parameters .tabbehind button').show();
     }
 
-    ctv.append(notification + but);
+    $("#state_text").text(notification);
   }
 }   //}}}
 function monitor_instance_pos_change(notification) {// {{{

data/cockpit/track.html

@@ -62,7 +62,40 @@
     <div id="trackfull">
       <div id='graphcolumn'>
         <div id="usage">
-          <span id="title"></span> | <span id='state'></span>
+          <span id="title"></span> | <span id='state'>
+            <span id="state_text"></span>
+            <span> ⇒ </span>
+            <button name="state_start" title='start'>
+              <svg viewBox="0 -1.5 7 12" width="10" height="16">
+                <path
+                  style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                  d="M 1.1000001e-6,1.0403124e-6 5.0000006e-7,10.583335 6.6145841,5.2916677 Z"/>
+              </svg>
+            </button>
+            <button name="state_stop" title='stop'>
+              <svg viewBox="0 -1.5 7 12" width="10" height="16">
+                <path
+                  style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                  d="m 3.9687505,1.3375769 1e-6,7.9374995 2.645832,1e-6 V 1.3375772 Z m -3.96875,0 v 7.9375005 h 2.645833 V 1.3375769 Z"/>
+              </svg>
+            </button>
+            <span> / </span>
+            <button name="state_sim" title='simulate'>
+              <svg viewBox="0 -1.5 7 12" width="10" height="16">
+                <path
+                  style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                  d="M 0,7.0741552 1.598154,6.8788136 q 0.144277,1.0115903 0.58266,1.4859901 0.443932,0.474402 1.193067,0.474402 0.793528,0 1.193066,-0.418589 0.405089,-0.4255654 0.405089,-0.990661 0,-0.362777 -0.172025,-0.6139303 Q 4.633538,6.5578953 4.211802,6.3695302 3.923247,6.2439536 2.896654,5.9230353 1.575957,5.5114228 1.04324,4.911445 0.294105,4.0672905 0.294105,2.8533821 q 0,-0.7813662 0.349596,-1.4580852 Q 0.998846,0.7116014 1.659195,0.3558006 2.325092,0 3.262898,0 4.794462,0 5.565794,0.8441546 6.342674,1.6883092 6.381518,3.0975591 L 4.73897,3.1882531 Q 4.633538,2.3999106 4.283941,2.0580629 3.939894,1.7092386 3.246251,1.7092386 q -0.71584,0 -1.120927,0.3697537 -0.260811,0.2372006 -0.260811,0.6348602 0,0.3627771 0.244164,0.6209071 0.31075,0.3278947 1.509366,0.6836954 1.198616,0.3558008 1.770178,0.7395073 0.577111,0.3767302 0.898962,1.0394962 0.327399,0.6557896 0.327399,1.6255215 0,0.8790367 -0.388439,1.6464517 -0.388442,0.767412 -1.098732,1.1441413 -0.710291,0.369755 -1.770178,0.369755 -1.542663,0 -2.369485,-0.8929903 Q 0.160924,8.7903717 0,7.0741552 Z"/>
+              </svg>
+            </button>
+            <span> / </span>
+            <button name="state_abandon" title='abandon'>
+              <svg viewBox="0 -1.5 7 12" width="10" height="16">
+                <path
+                  style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                  d="m 5e-7,1.3229172 h 2.645833 V 5.0000007e-7 h 1.322917 V 1.3229172 h 2.645833 V 2.6458339 H 5e-7 Z m 2.645833,2.6458332 v 3.96875 l 1.322917,10e-8 v -3.96875 z M 5e-7,10.583333 l 6.614584,1e-6 -1e-6,-6.6145835 h -1.322916 v 5.2916667 h -3.96875 V 3.9687505 H 5e-7 Z"/>
+              </svg>
+            </button>
+          </span>
         </div>
         <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
       </div>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.4.29"
+  s.version          = "1.4.30"
   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"
@@ -26,5 +26,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'savon', '~> 2'
   s.add_runtime_dependency 'highline', '~> 1.6'
   s.add_runtime_dependency 'json', '~>2.1'
+  s.add_runtime_dependency 'opca', '~>0', '>= 0.13'
   s.add_runtime_dependency 'rubyzip', '~>1.2'
 end

data/server/handlerwrappers/default.rb

@@ -12,6 +12,8 @@
 # CPEE (file COPYING in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+require 'opcua/client'
+
 class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   def self::inform_state_change(arguments,newstate) # {{{
     controller = arguments[0]
@@ -51,54 +53,105 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @sensors = parameters[:sensors]
     @controller.notify("activity/calling", :instance => @controller.instance, :instance_uuid => @controller.uuid, :label => @label, :instance_name => @controller.info, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
     if passthrough.to_s.empty?
-      params = []
-      callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
-      (parameters[:arguments] || []).each do |s|
-        if s.respond_to?(:mimetype)
-          params <<  Riddl::Parameter::Complex.new(s.name.to_s,v.mimetype,v.value)
-        else
-          if s.name.to_s =~ /__$/
-            params <<  Riddl::Parameter::Simple.new(s.name.to_s.chop.chop,CPEE::ValueHelper::generate(s.value),:query)
+      if @handler_endpoint.start_with?('opc.tcp')
+        if @handler_endpoint =~ /^opc.tcp.read:\/\/([^\/]+)\/(\d+)\/(.+)/
+          nid = $3 == $3.to_i.to_s ? $3.to_i : $3
+          ns  = $2
+          url = 'opc.tcp://' + $1
+          client = OPCUA::Client.new(url)
+          if (node = client.get ns.to_i, nid)
+            result = node.value
           else
-            params <<  Riddl::Parameter::Simple.new(s.name.to_s,CPEE::ValueHelper::generate(s.value))
+            raise 'invalid nodeid'
+          end
+          client.disconnect
+          callback [Riddl::Parameter::Simple.new('value',result)], {}
+        elsif @handler_endpoint =~ /^opc.tcp.write:\/\/([^\/]+)\/(\d+)\/([^\?]+)(\?value=(.*))?/
+          nid = $3 == $3.to_i.to_s ? $3.to_i : $3
+          ns  = $2
+          par = $5
+          url = 'opc.tcp://' + $1
+          client = OPCUA::Client.new(url)
+          if (node = client.get ns.to_i, nid)
+            (parameters[:arguments] || [→(:name => 'value', :value => par)] || []).each do |ele|
+              what = CPEE::ValueHelper::parse(ele.value)
+              node.value = what
+              result = what
+            end
+          else
+            raise 'invalid nodeid'
+          end
+          client.disconnect
+          callback [Riddl::Parameter::Simple.new('value',result)], {}
+        elsif @handler_endpoint =~ /^opc.tcp.execute:\/\/([^\/]+)\/(\d+)\/([^\?]+)(\?value=(.*))?/
+          nid = $3 == $3.to_i.to_s ? $3.to_i : $3
+          ns  = $2
+          par = $5
+          url = 'opc.tcp://' + $1
+          client = OPCUA::Client.new(url)
+          if (node = client.get ns.to_i, nid)
+            params = []
+            (parameters[:arguments] || []).each do |ele|
+              what = CPEE::ValueHelper::parse(ele.value)
+              params << what
+            end
+            result = node.call *params
+          else
+            raise 'invalid nodeid'
+          end
+          client.disconnect
+          callback [Riddl::Parameter::Simple.new('value',result)], {}
+        end
+      else
+        params = []
+        callback = Digest::MD5.hexdigest(Kernel::rand().to_s)
+        (parameters[:arguments] || []).each do |s|
+          if s.respond_to?(:mimetype)
+            params <<  Riddl::Parameter::Complex.new(s.name.to_s,v.mimetype,v.value)
+          else
+            if s.name.to_s =~ /__$/
+              params <<  Riddl::Parameter::Simple.new(s.name.to_s.chop.chop,CPEE::ValueHelper::generate(s.value),:query)
+            else
+              params <<  Riddl::Parameter::Simple.new(s.name.to_s,CPEE::ValueHelper::generate(s.value))
+            end
           end
         end
-      end
 
-      params << Riddl::Header.new("CPEE-BASE",@controller.base_url)
-      params << Riddl::Header.new("CPEE-INSTANCE",@controller.instance)
-      params << Riddl::Header.new("CPEE-INSTANCE-URL",@controller.instance_url)
-      params << Riddl::Header.new("CPEE-INSTANCE-UUID",@controller.uuid)
-      params << Riddl::Header.new("CPEE-CALLBACK",@controller.instance_url + '/callbacks/' + callback)
-      params << Riddl::Header.new("CPEE-CALLBACK-ID",callback)
-      params << Riddl::Header.new("CPEE-ACTIVITY",@handler_position)
-      params << Riddl::Header.new("CPEE-LABEL",parameters[:label]||'')
-      @controller.attributes.each do |key,value|
-        params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
-      end
+        params << Riddl::Header.new("CPEE-BASE",@controller.base_url)
+        params << Riddl::Header.new("CPEE-INSTANCE",@controller.instance)
+        params << Riddl::Header.new("CPEE-INSTANCE-URL",@controller.instance_url)
+        params << Riddl::Header.new("CPEE-INSTANCE-UUID",@controller.uuid)
+        params << Riddl::Header.new("CPEE-CALLBACK",@controller.instance_url + '/callbacks/' + callback)
+        params << Riddl::Header.new("CPEE-CALLBACK-ID",callback)
+        params << Riddl::Header.new("CPEE-ACTIVITY",@handler_position)
+        params << Riddl::Header.new("CPEE-LABEL",parameters[:label]||'')
+        @controller.attributes.each do |key,value|
+          params << Riddl::Header.new("CPEE-ATTR-#{key.to_s.gsub(/_/,'-')}",value)
+        end
 
-      tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
-      type = $2 || parameters[:method] || 'post'
+        tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
+        type = $2 || parameters[:method] || 'post'
 
-      client = Riddl::Client.new(tendpoint)
+        client = Riddl::Client.new(tendpoint)
 
-      @controller.callbacks[callback] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
-      @handler_passthrough = callback
+        @controller.callbacks[callback] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
+        @handler_passthrough = callback
 
-      status, result, headers = client.request type => params
+        status, result, headers = client.request type => params
 
-      raise "Could not #{type || 'post'} #{tendpoint} - status: #{status}: #{result&.dig(0)&.value&.read}" if status < 200 || status >= 300
+        raise "Could not #{type || 'post'} #{tendpoint} - status: #{status}: #{result&.dig(0)&.value&.read}" if status < 200 || status >= 300
 
-      if headers['CPEE_INSTANTIATION']
-        @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
-      end
-      if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
-        headers['CPEE_UPDATE'] = true
-        callback result, headers
-      elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
-        # do nothing, later on things will happend
-      else
-        callback result
+        if headers['CPEE_INSTANTIATION']
+          @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+        end
+        if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
+          headers['CPEE_UPDATE'] = true
+          callback result, headers
+        elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
+          # do nothing, later on things will happend
+        else
+          callback result
+        end
       end
     else
       @controller.callbacks[passthrough] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)

data/server/resources/transformation_dslx.xsl

@@ -445,7 +445,7 @@
     <xsl:param name="myspace"/>
     <xsl:if test="text()">
       <xsl:for-each select="str:tokenize(text(), '&#x0A;')">
-        <xsl:value-of select="concat('&#x0A;',concat(str:padding($myspace+$myspacemultiplier+$myspacemultiplier),str:replace(str:replace(string(.),'\','\\'),'&quot;','\&quot;')))" />
+        <xsl:value-of select="concat('&#x0A;',concat(str:padding($myspace+$myspacemultiplier+$myspacemultiplier),str:replace(str:replace(str:replace(string(.),'\','\\'),'&quot;','\&quot;'),'#','\#')))" />
       </xsl:for-each>
       <xsl:call-template name="print-newline"/>
       <xsl:call-template name="print-space">
@@ -474,7 +474,7 @@
         </xsl:otherwise>
       </xsl:choose>
       <xsl:for-each select="str:tokenize(text(), '&#x0A;')">
-        <xsl:value-of select="concat('&#x0A;',concat(str:padding($myspace+$myspacemultiplier+$myspacemultiplier),str:replace(str:replace(string(.),'\','\\'),'&quot;','\&quot;')))" />
+        <xsl:value-of select="concat('&#x0A;',concat(str:padding($myspace+$myspacemultiplier+$myspacemultiplier),str:replace(str:replace(str:replace(string(.),'\','\\'),'&quot;','\&quot;'),'#','\#')))" />
       </xsl:for-each>
       <xsl:call-template name="print-newline"/>
       <xsl:call-template name="print-space">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.4.29
+  version: 1.4.30
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -83,6 +83,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: opca
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement