cpee 2.1.97 → 2.1.98

data/server/executionhandlers/eval/dsl_to_dslx.xsl

@@ -52,6 +52,9 @@
       <xsl:text>, parameters: { </xsl:text>
       <xsl:apply-templates select="d:parameters"/>
       <xsl:text> }</xsl:text>
+      <xsl:if test="d:code/d:signal[text()='on']">
+        <xsl:text>, signal: true</xsl:text>
+      </xsl:if>
       <xsl:if test="(d:finalize or d:code/d:finalize) and (d:finalize/text() or d:code/d:finalize/text())">
         <xsl:text>, finalize: &lt;&lt;-END</xsl:text>
       </xsl:if>
@@ -120,6 +123,20 @@
       <xsl:value-of select="@id"/>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
+    <xsl:if test="name()='wait_for_signal'">
+      <xsl:call-template name="print-space">
+        <xsl:with-param name="i">1</xsl:with-param>
+        <xsl:with-param name="count">
+          <xsl:value-of select="$myspace+$myspacemultiplier"/>
+        </xsl:with-param>
+      </xsl:call-template>
+      <xsl:text>wait_for_signal :</xsl:text>
+      <xsl:value-of select="@id"/>
+      <xsl:text>, "</xsl:text>
+      <xsl:value-of select="str:replace(str:replace(d:label/text(),'\','\\'),'&quot;','\&quot;')"/>
+      <xsl:text>"</xsl:text>
+      <xsl:call-template name="print-newline"/>
+    </xsl:if>
     <xsl:if test="name()='escape'">
       <xsl:call-template name="print-space">
         <xsl:with-param name="i">1</xsl:with-param>
@@ -453,7 +470,7 @@
   </xsl:template>
   <xsl:template match="d:parameters">
     <xsl:apply-templates select="d:label" mode="parameter"/>
-    <xsl:apply-templates select="d:*[not(name()='label')]" mode="parameter"/>
+    <xsl:apply-templates select="d:*[not(name()='label') and not(name()='color')]" mode="parameter"/>
     <xsl:if test="count(*) &gt; 0">, </xsl:if>
     <xsl:apply-templates select="../d:annotations" mode="annotations"/>
   </xsl:template>
@@ -519,7 +536,9 @@
       <xsl:otherwise>
         <xsl:choose>
           <xsl:when test="substring(text(),1,1) = '!'">
-            <xsl:value-of select="substring(text(),2)"/>
+            <xsl:text>🠊("</xsl:text>
+            <xsl:value-of select="str:replace(str:replace(substring(text(),2),'\','\\'),'&quot;','\&quot;')"/>
+            <xsl:text>")</xsl:text>
           </xsl:when>
           <xsl:otherwise>
             <xsl:text>"</xsl:text>
@@ -548,7 +567,9 @@
       <xsl:otherwise>
         <xsl:choose>
           <xsl:when test="substring(text(),1,1) = '!'">
-            <xsl:value-of select="substring(text(),2)"/>
+            <xsl:text>🠊("</xsl:text>
+            <xsl:value-of select="str:replace(str:replace(substring(text(),2),'\','\\'),'&quot;','\&quot;')"/>
+            <xsl:text>")</xsl:text>
           </xsl:when>
           <xsl:otherwise>
             <xsl:text>"</xsl:text>
@@ -577,7 +598,9 @@
       <xsl:otherwise>
         <xsl:choose>
           <xsl:when test="substring(text(),1,1) = '!'">
-            <xsl:value-of select="substring(text(),2)"/>
+            <xsl:text>🠊("</xsl:text>
+            <xsl:value-of select="str:replace(str:replace(substring(text(),2),'\','\\'),'&quot;','\&quot;')"/>
+            <xsl:text>")</xsl:text>
           </xsl:when>
           <xsl:otherwise>
             <xsl:text>"</xsl:text>
@@ -631,14 +654,14 @@
           <!-- FUUUU, there is probably much more TODO. Updated Matthias und Juergen, we tested for ing-opcua/execute -->
           <xsl:choose>
             <xsl:when test="child::* and name(child::*)=concat(name(.),'_item') and count(child::*[not(name()=name(../child::*[1]))])=0">
-              <xsl:text>"[ </xsl:text>
+              <xsl:text>[ </xsl:text>
               <xsl:apply-templates select="*" mode="JSONArrayItem"/>
-              <xsl:text>]"</xsl:text>
+              <xsl:text>]</xsl:text>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:text>"{ </xsl:text>
+              <xsl:text>{ </xsl:text>
               <xsl:apply-templates select="*" mode="JSONSUB"/>
-              <xsl:text>}"</xsl:text>
+              <xsl:text>}</xsl:text>
             </xsl:otherwise>
           </xsl:choose>
         </xsl:when>
@@ -695,7 +718,7 @@
   </xsl:template>
   <xsl:template name="print-mcontent">
     <xsl:param name="myspace"/>
-    <xsl:if test="text()">
+    <xsl:if test="d:code/text()">
       <xsl:choose>
         <xsl:when test="@language='application/x-ruby'">
           <xsl:text> do </xsl:text>
@@ -709,7 +732,7 @@
           <xsl:text>, &lt;&lt;-END</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
-      <xsl:for-each select="str:tokenize(text(), '&#x0A;')">
+      <xsl:for-each select="str:tokenize(d:code/text(), '&#x0A;')">
         <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"/>
@@ -759,9 +782,9 @@
   </xsl:template>
 
   <xsl:template match="*" mode="JSONSUB">
-    <xsl:text>\"</xsl:text>
+    <xsl:text>"</xsl:text>
     <xsl:value-of select="name()"/>
-    <xsl:text>\": </xsl:text>
+    <xsl:text>": </xsl:text>
     <xsl:call-template name="JSONProperties">
       <xsl:with-param name="parent" select="'Yes'"></xsl:with-param>
     </xsl:call-template>
@@ -804,49 +827,49 @@
               <xsl:otherwise>
                 <xsl:choose>
                   <xsl:when test="substring(.,1,1) = '!'">
-                    <xsl:text>#{(</xsl:text>
-                    <xsl:value-of select="substring(.,2)"/>
-                    <xsl:text>).to_json}</xsl:text>
+                    <xsl:text>🠊("</xsl:text>
+                    <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\&quot;')"/>
+                    <xsl:text>")</xsl:text>
                   </xsl:when>
                   <xsl:otherwise>
-                    <xsl:text>\"</xsl:text>
-                    <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
-                    <xsl:text>\"</xsl:text>
+                    <xsl:text>"</xsl:text>
+                    <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\&quot;')"/>
+                    <xsl:text>"</xsl:text>
                   </xsl:otherwise>
                 </xsl:choose>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:text>\"</xsl:text>
+            <xsl:text>"</xsl:text>
             <xsl:value-of select="name()"/>
-            <xsl:text>\": </xsl:text>
+            <xsl:text>": </xsl:text>
             <xsl:choose>
               <xsl:when test="string(number(.)) = .">
                 <xsl:value-of select="."/>
               </xsl:when>
               <xsl:otherwise>
-                <xsl:text>\"</xsl:text>
+                <xsl:text>"</xsl:text>
                 <xsl:choose>
                   <xsl:when test="substring(.,1,1) = '!'">
-                    <xsl:text>#{</xsl:text>
-                    <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
-                    <xsl:text>}</xsl:text>
+                    <xsl:text>>🠊("</xsl:text>
+                    <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\&quot;')"/>
+                    <xsl:text>")</xsl:text>
                   </xsl:when>
                   <xsl:otherwise>
-                    <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+                    <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\&quot;')"/>
                   </xsl:otherwise>
                 </xsl:choose>
-                <xsl:text>\"</xsl:text>
+                <xsl:text>"</xsl:text>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:when test="count(*[name()=$childName]) > 1">
-        <xsl:text>{ \"</xsl:text>
+        <xsl:text>{ "</xsl:text>
         <xsl:value-of select="$childName"/>
-        <xsl:text>\": [ </xsl:text>
+        <xsl:text>": [ </xsl:text>
         <xsl:apply-templates select="*" mode="JSONArrayElement"/>
         <xsl:text>] }</xsl:text>
       </xsl:when>
@@ -860,18 +883,18 @@
         <xsl:text>}</xsl:text>
         <xsl:if test="text()[normalize-space(.)]">
           <xsl:text>, </xsl:text>
-          <xsl:text>\"</xsl:text>
+          <xsl:text>"</xsl:text>
           <xsl:choose>
             <xsl:when test="substring(.,1,1) = '!'">
-              <xsl:text>#{</xsl:text>
-              <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
-              <xsl:text>}</xsl:text>
+              <xsl:text>>🠊("</xsl:text>
+              <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\&quot;')"/>
+              <xsl:text>")</xsl:text>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+              <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\&quot;')"/>
             </xsl:otherwise>
           </xsl:choose>
-          <xsl:text>\"</xsl:text>
+          <xsl:text>"</xsl:text>
           <xsl:text>]</xsl:text>
         </xsl:if>
       </xsl:otherwise>
@@ -880,26 +903,26 @@
 
   <!-- JSON Attribute Property -->
   <xsl:template match="@*" mode="JSONSUB">
-    <xsl:text>\"@</xsl:text>
+    <xsl:text>"@</xsl:text>
     <xsl:value-of select="name()"/>
-    <xsl:text>\": </xsl:text>
+    <xsl:text>": </xsl:text>
     <xsl:choose>
       <xsl:when test="number(.) = .">
         <xsl:value-of select="."/>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:text>\"</xsl:text>
+        <xsl:text>"</xsl:text>
         <xsl:choose>
           <xsl:when test="substring(.,1,1) = '!'">
-            <xsl:text>#{</xsl:text>
-            <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
-            <xsl:text>}</xsl:text>
+            <xsl:text>>🠊("</xsl:text>
+            <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\&quot;')"/>
+            <xsl:text>")</xsl:text>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\\\&quot;')"/>
+            <xsl:value-of select="str:replace(str:replace(.,'\','\\'),'&quot;','\&quot;')"/>
           </xsl:otherwise>
         </xsl:choose>
-        <xsl:text>\"</xsl:text>
+        <xsl:text>"</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
     <xsl:choose>

data/server/executionhandlers/eval/execution.rb

@@ -18,9 +18,9 @@ module CPEE
 
     module Eval
       BACKEND_INSTANCE = 'instance.rb'
-      BACKEND_OPTS     = 'opts.yaml'
       DSL_TO_DSLX_XSL  = File.expand_path(File.join(__dir__,'dsl_to_dslx.xsl'))
-      BACKEND_RUN      = File.expand_path(File.join(__dir__,'backend','run'))
+      BACKEND_RUN      = File.expand_path(File.join(__dir__,'backend','run.rb'))
+      BACKEND_OPTS     = File.expand_path(File.join(__dir__,'backend','opts.yaml'))
       BACKEND_TEMPLATE = File.expand_path(File.join(__dir__,'backend','instance.template'))
 
       def self::dslx_to_dsl(dslx,ep) # transpile
@@ -39,18 +39,19 @@ module CPEE
         positions.map! do |k, v|
           [ k, v, CPEE::Persistence::extract_item(id,opts,File.join('positions',k,'@passthrough')) ]
         end
-        File.open(File.join(opts[:instances],id.to_s,ExecutionHandler::Eval::BACKEND_OPTS),'w') do |f|
-          YAML::dump({
-            :host => opts[:host],
-            :url => opts[:url],
-            :redis_url => opts[:redis_url],
-            :redis_path => File.join(opts[:basepath],opts[:redis_path]),
-            :redis_db => opts[:redis_db],
-            :workers => opts[:workers],
-            :global_executionhandlers => opts[:global_executionhandlers],
-            :executionhandlers => opts[:executionhandlers],
-            :executionhandler => hw
-          },f)
+        iopts = YAML::load_file(ExecutionHandler::Eval::BACKEND_OPTS)
+        iopts[:host] = opts[:host]
+        iopts[:url] = opts[:url]
+        iopts[:redis_url] = opts[:redis_url]
+        iopts[:redis_path] = File.join(opts[:basepath],opts[:redis_path])
+        iopts[:redis_db] = opts[:redis_db]
+        iopts[:workers] = opts[:workers]
+        iopts[:global_executionhandlers] = opts[:global_executionhandlers]
+        iopts[:executionhandlers] = opts[:executionhandlers]
+        iopts[:executionhandler] = hw
+
+        File.open(File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Eval::BACKEND_OPTS)),'w') do |f|
+          YAML::dump(iopts,f)
         end
         template = ERB.new(File.read(ExecutionHandler::Eval::BACKEND_TEMPLATE), trim_mode: '-')
         res = template.result_with_hash(dsl: dsl, dataelements: dataelements, endpoints: endpoints, positions: positions)
@@ -59,7 +60,7 @@ module CPEE
 
       def self::run(id,opts)
         exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Eval::BACKEND_RUN))
-        pid = Kernel.spawn(exe , :pgroup => true, :in => '/dev/null', :out => exe + '.out', :err => exe + '.err')
+        pid = Kernel.spawn(opts[:libs_preloaderrun] + ' ' + exe , :pgroup => true, :in => '/dev/null', :out => exe + '.out', :err => exe + '.err')
         Process.detach pid
         File.write(exe + '.pid',pid)
       end

data/server/executionhandlers/ruby/connection.rb

@@ -432,6 +432,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
     recv = 'false' unless recv
     recv = (recv == 'false' || recv == 'null' || recv == 'nil' || recv == false ? false : true)
+
     @controller.notify("gateway/decide", :ecid => Thread.current.__id__, :instance_uuid => @controller.uuid, :code => code, :condition => recv)
     @controller.notify("gateway/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => {})
     recv

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.97
+  version: 2.1.98
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -232,7 +232,6 @@ files:
 - cockpit/js/track.js
 - cockpit/js/ui.js
 - cockpit/js/wfadaptor.js
-- cockpit/js_libs.zip
 - cockpit/llm.html
 - cockpit/llm_alternative.html
 - cockpit/model.html
@@ -625,6 +624,7 @@ files:
 - cockpit/themes/model/rngs/scripts.rng
 - cockpit/themes/model/rngs/stop.rng
 - cockpit/themes/model/rngs/terminate.rng
+- cockpit/themes/model/rngs/wait_for_signal.rng
 - cockpit/themes/model/symbols/alternative.svg
 - cockpit/themes/model/symbols/arrow.svg
 - cockpit/themes/model/symbols/call.svg
@@ -1031,7 +1031,7 @@ files:
 - server/executionhandlers/eval/backend/README.md
 - server/executionhandlers/eval/backend/instance.template
 - server/executionhandlers/eval/backend/opts.yaml
-- server/executionhandlers/eval/backend/run
+- server/executionhandlers/eval/backend/run.rb
 - server/executionhandlers/eval/connection.rb
 - server/executionhandlers/eval/controller.rb
 - server/executionhandlers/eval/dsl_to_dslx.xsl