cpee 1.4.20 → 1.4.21

data/log/sic.rb

@@ -1,51 +1,61 @@
 #!/usr/bin/ruby
 require 'yaml'
 require 'typhoeus'
+require 'stringio'
 require 'xml/smart'
 
-# concept:endpoint: https://centurio.work/flow/start/url/
-# id:id: a17
-# cpee:uuid: bf93adcd-9421-495b-bafa-d34de608fc6c
-# lifecycle:transition: unknown
-# cpee:lifecycle:transition: activity/receiving
-# list:
-#   data_receiver:
-#   - name: dataelements
-#     mimetype: application/json
-#     data:
-#       CPEE-INSTANCE: https://centurio.work/flow/engine/547
-#       qr: "*269MFA466*TZHZE 000"
-#       queue: ''
-#       machine: MaxxTurn45
-#       program: _N_LOWERHOUSING2_MPF
-#       label: Lowerhousing Turn 2
-#       finished: no good
-# time:timestamp: '2019-01-16T11:24:41.162+01:00'
-
-def follow(fname,deep=0)
-  io = File.open(fname)
+def follow(fname,io,deep=0)
+  if ARGV[1] == 'copy'
+    File.write(File.basename(fname,'.xes.yaml') + '.xes.yaml',io.read)
+    io.rewind
+  end
   YAML.load_stream(io) do |e|
     if name = e.dig('log','trace','cpee:name')
-      FileUtils.cp(File.join(__dir__,'logs',File.basename(fname,'.xes.yaml') + '.xes.yaml'),'.') if ARGV[1] == 'copy'
-      puts " " * deep + name + " (#{File.basename(fname,'.xes.yaml')})"
+      puts " " * deep + name + " (#{File.basename(fname,'.xes.yaml')}) - #{e.dig('log','trace','concept:name')}"
     end
     if e.dig('event','concept:endpoint') == 'https://centurio.work/flow/start/url/' && e.dig('event','cpee:lifecycle:transition') == 'activity/receiving'
-      val = e.dig('event','list','data_receiver',0,'data','CPEE-INSTANCE')
-      res = Typhoeus.get(File.join(val,'/properties/values/attributes/uuid/'))
-      if res.success?
-        uuid = XML::Smart.string(res.body).find('string(/*)')
-        follow File.dirname(fname) + "/#{uuid}.xes.yaml",deep + 2
+      base = e.dig('event','list','data_receiver',0,'data')
+      val = base.dig('CPEE-INSTANCE') rescue nil
+      if val.nil?
+        val = File.basename(base)
+      end
+      uuid = base.dig('CPEE-INSTANCE-UUID') rescue nil
+      unless uuid
+        res = Typhoeus.get(File.join('https://centurio.work/flow/engine/',val,'/properties/values/attributes/uuid/'))
+        if res.success?
+          uuid = XML::Smart.string(res.body).find('string(/*)')
+        end
       end
+      next unless ((base.dig('CPEE-STATE') == 'running' || (base.dig('CPEE-FORKED') == 'true')) rescue true)
+
+      react File.dirname(fname) + "/#{uuid}.xes.yaml",deep + 2
     end
   end
 end
 
-fname =  File.join(__dir__,'logs',(ARGV[0].strip rescue '') + '.xes.yaml')
-if File.exists? fname
-  follow fname
-else
-  puts 'Copies log files tree to current directory.'
+def react(name,deep=0)
+  if name =~ /^https?:\/\//
+    res = Typhoeus.get(name)
+    if res.success?
+      file = Tempfile.new('sic')
+      file.write(res.body)
+      file.rewind
+      follow name, file, deep
+      file.close
+      file.unlink
+    end
+  elsif File.exists? name
+    follow name, File.open(name), deep
+  end
+end
+
+def help
+  puts 'Views or copies log file trees to current directory.'
   puts
-  puts '  Example: sic.rb UUID'
-  puts '  Example: sic.rb UUID copy'
+  puts '  View: sic.rb https://centurio.work/log/865916c6-2b18-4e9d-81d4-0fab0df248f4.xes.yaml'
+  puts '  Copy: sic.rb https://centurio.work/log/865916c6-2b18-4e9d-81d4-0fab0df248f4.xes.yaml copy'
+  puts '  Copy: sic.rb ~/Projects/cpee/log/logs/865916c6-2b18-4e9d-81d4-0fab0df248f4.xes.yaml copy'
+  puts '  View: sic.rb 865916c6-2b18-4e9d-81d4-0fab0df248f4.xes.yaml'
 end
+
+react(ARGV[0]) || help

data/log/template.xes_yaml

@@ -11,7 +11,7 @@ log:
       concept:name: __INVALID__
       cpee:name: __INVALID__
     event:
-      trace:id: -1
+      concept:instance: -1
       concept:name: __INVALID__
       concept:endpoint: ''
       id:id: ''

data/log/xes_yaml.pid

@@ -1 +1 @@
-27395
+7611

data/log/xes_yaml.rb

@@ -22,7 +22,7 @@ class Logging < Riddl::Implementation #{{{
     log["log"]["trace"]["cpee:uuid"] ||= notification['instance_uuid'] if notification["instance_uuid"]
     File.open(File.join(log_dir,uuid+'.xes.yaml'),'w'){|f| f.puts log.to_yaml} unless File.exists? File.join(log_dir,uuid+'.xes.yaml')
     event = {}
-    event["trace:id"] = instancenr
+    event["concept:instance"] = instancenr
     event["concept:name"] = notification["label"] if notification["label"]
     if notification["endpoint"]
       event["concept:endpoint"] = notification["endpoint"]
@@ -39,26 +39,26 @@ class Logging < Riddl::Implementation #{{{
     end
     event["cpee:lifecycle:transition"] = "#{topic}/#{event_name}"
     data_send = ((parameters["arguments"].nil? ? [] : parameters["arguments"]) rescue [])
-    event["list"] = {"data_send" => data_send} unless data_send.empty?
+    event["data"] = {"data_send" => data_send} unless data_send.empty?
     if notification['changed']&.any?
-      if event.has_key? "list"
-        event["list"]["data_changed"] ||= notification['changed']
+      if event.has_key? "data"
+        event["data"]["data_changed"] ||= notification['changed']
       else
-        event["list"] = {"data_changer" => notification['changed']}
+        event["data"] = {"data_changer" => notification['changed']}
       end
     end
     if notification['values']&.any?
-      if event.has_key? "list"
-        event["list"]["data_values"] ||= notification['values']
+      if event.has_key? "data"
+        event["data"]["data_values"] ||= notification['values']
       else
-        event["list"] = {"data_values" => notification['values']}
+        event["data"] = {"data_values" => notification['values']}
       end
     end
-    if receiving&.any?
-      if event.has_key? "list"
-        event["list"]["data_received"] ||= receiving
+    unless receiving&.empty?
+      if event.has_key? "data"
+        event["data"]["data_received"] ||= receiving
       else
-        event["list"] = {"data_receiver" => receiving}
+        event["data"] = {"data_receiver" => receiving}
       end
     end
     event["time:timestamp"]= event['cpee:timestamp'] || Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z")
@@ -69,12 +69,12 @@ class Logging < Riddl::Implementation #{{{
   end
 
   def response
-    topic        = @p[1].value
-    event_name   = @p[2].value
-    log_dir      = @a[0]
-    template     = @a[1]
-    instancenr   = @h['CPEE_INSTANCE_URL'].split('/').last
-    notification = JSON.parse(@p[3].value)
+    topic         = @p[1].value
+    event_name    = @p[2].value
+    log_dir       = @a[0]
+    template      = @a[1]
+    instancenr    = @h['CPEE_INSTANCE_URL'].split('/').last
+    notification  = JSON.parse(@p[3].value)
     doc topic, event_name, log_dir, template, instancenr, notification
   end
 end #}}}

data/server/handlerwrappers/default.rb

@@ -87,7 +87,10 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
       raise "Could not #{parameters[:method] || 'post'} #{@handler_endpoint} - status: #{status}: #{result&.dig(0)&.value&.read}" if status < 200 || status >= 300
 
-      unless headers["CPEE_CALLBACK"] && headers["CPEE_CALLBACK"] == 'true'
+      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
+      unless headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true'
         callback result
       end
     else
@@ -208,9 +211,6 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   def callback(result=nil,options={})
     @controller.notify("activity/receiving", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated, :sensors => @sensors)
     result = simplify_result(result)
-    if options['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 => structurize_result(result), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
-    end
     if options['CPEE_UPDATE']
       @handler_returnValue = result
       if options['CPEE_UPDATE_STATUS']

data/server/instances/15/notifications/logging/consumer-secret

@@ -0,0 +1 @@
+f7c77861ac613eeac8fb9829c9a545a2

data/server/instances/15/notifications/logging/producer-secret

@@ -0,0 +1 @@
+2a24d172b1aeb05fe94fdc5e095dec32

data/server/instances/15/notifications/logging/subscription.xml

@@ -0,0 +1,16 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9299/">
+  <topic id="activity">
+    <event>calling</event>
+    <event>receiving</event>
+    <event>done</event>
+  </topic>
+  <topic id="dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="attributes">
+    <event>change</event>
+  </topic>
+</subscription>

data/server/instances/15/properties.xml

@@ -0,0 +1,97 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <uuid>ad9f1f9c-b727-44cc-afce-e6c98815b639</uuid>
+    <info>Subprocess</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+    <customer>pilotfabrik</customer>
+    <status>development</status>
+  </attributes>
+  <state changed="2019-02-13T16:33:09+01:00">finished</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <instance>16</instance>
+    <res>{"CPEE-INSTANCE":"16","CPEE-INSTANCE-URL":"http://localhost:8298/16","CPEE-INSTANCE-UUID":"83f11c93-40b1-4cbd-846e-57dc20b91e2d","CPEE-STATE":"finished","a":17}</res>
+  </dataelements>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+    <instantiate>http://localhost:9296/url/</instantiate>
+  </endpoints>
+  <dsl>call :a1, :instantiate, parameters: { :label =&gt; "Take 5", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :info, :value =&gt; "Take Time"), ⭐(:name =&gt; :behavior, :value =&gt; "wait_running"), ⭐(:name =&gt; :url, :value =&gt; "http://localhost/testsets/Take_5.xml"), ⭐(:name =&gt; :init, :value =&gt; "{ \"a\": 3 }")] }, finalize: &lt;&lt;-END
+  data.instance = result['CPEE-INSTANCE']
+  data.res = result
+END
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="instantiate">
+        <parameters>
+          <label>Take 5</label>
+          <method>:post</method>
+          <arguments>
+            <info>Take Time</info>
+            <behavior>wait_running</behavior>
+            <url>http://localhost/testsets/Take_5.xml</url>
+            <init>
+              <a>3</a>
+            </init>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.instance = result['CPEE-INSTANCE']
+data.res = result</finalize>
+        <update output="result"/>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_notes_output/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="instantiate">
+        <parameters>
+          <label>Take 5</label>
+          <method>:post</method>
+          <arguments>
+            <info>Take Time</info>
+            <behavior>wait_running</behavior>
+            <url>http://localhost/testsets/Take_5.xml</url>
+            <init>
+              <a>3</a>
+            </init>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.instance = result['CPEE-INSTANCE']
+data.res = result</finalize>
+        <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>
+</properties>

data/server/instances/16/notifications/51f2da0a2b51743cd8f434eada2428c6/consumer-secret

@@ -0,0 +1 @@
+0dcbe562b94bc1e86c3c6089acbf1815

data/server/instances/16/notifications/51f2da0a2b51743cd8f434eada2428c6/producer-secret

@@ -0,0 +1 @@
+d54bd85058400d7d3bd9b1709052b91c

data/server/instances/16/notifications/51f2da0a2b51743cd8f434eada2428c6/subscription.xml

@@ -0,0 +1,5 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9296/callback/c87a2f56-5b96-4874-a545-a5367e4e1ac3">
+  <topic id="state">
+    <event>change</event>
+  </topic>
+</subscription>

data/server/instances/16/notifications/logging/consumer-secret

@@ -0,0 +1 @@
+f7c77861ac613eeac8fb9829c9a545a2

data/server/instances/16/notifications/logging/producer-secret

@@ -0,0 +1 @@
+2a24d172b1aeb05fe94fdc5e095dec32

data/server/instances/16/notifications/logging/subscription.xml

@@ -0,0 +1,16 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9299/">
+  <topic id="activity">
+    <event>calling</event>
+    <event>receiving</event>
+    <event>done</event>
+  </topic>
+  <topic id="dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="attributes">
+    <event>change</event>
+  </topic>
+</subscription>

data/server/instances/16/properties.xml

@@ -0,0 +1,80 @@
+<properties xmlns="http://riddl.org/ns/common-patterns/properties/1.0">
+  <attributes>
+    <uuid>83f11c93-40b1-4cbd-846e-57dc20b91e2d</uuid>
+    <info>Take Time</info>
+    <modeltype>CPEE</modeltype>
+    <theme>default</theme>
+    <customer>pilotfabrik</customer>
+    <status>development</status>
+  </attributes>
+  <state changed="2019-02-13T16:33:09+01:00">finished</state>
+  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <positions/>
+  <dataelements>
+    <a>17</a>
+  </dataelements>
+  <endpoints>
+    <timeout>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</timeout>
+  </endpoints>
+  <dsl>call :a1, :timeout, parameters: { :label =&gt; "", :method =&gt; :post, :arguments =&gt; [⭐(:name =&gt; :timeout, :value =&gt; "5")] }, finalize: &lt;&lt;-END
+  data.a = 17
+END
+</dsl>
+  <dslx>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments>
+            <timeout>5</timeout>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.a = 17</finalize>
+        <update output="result"/>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
+  </dslx>
+  <status>
+    <id>0</id>
+    <message>undefined</message>
+  </status>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="timeout">
+        <parameters>
+          <label/>
+          <method>:post</method>
+          <arguments>
+            <timeout>5</timeout>
+          </arguments>
+        </parameters>
+        <finalize output="result">data.a = 17</finalize>
+        <update output="result"/>
+        <_timing>
+          <_timing_min/>
+          <_timing_max/>
+          <_timing_avg/>
+        </_timing>
+        <_notes>
+          <_notes_general/>
+          <_attachments/>
+        </_notes>
+      </call>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+</properties>

data/server/instances/17/notifications/logging/consumer-secret

@@ -0,0 +1 @@
+f7c77861ac613eeac8fb9829c9a545a2

data/server/instances/17/notifications/logging/producer-secret

@@ -0,0 +1 @@
+2a24d172b1aeb05fe94fdc5e095dec32

data/server/instances/17/notifications/logging/subscription.xml

@@ -0,0 +1,16 @@
+<subscription xmlns="http://riddl.org/ns/common-patterns/notifications-producer/1.0" url="http://localhost:9299/">
+  <topic id="activity">
+    <event>calling</event>
+    <event>receiving</event>
+    <event>done</event>
+  </topic>
+  <topic id="dataelements">
+    <event>change</event>
+  </topic>
+  <topic id="endpoints">
+    <event>change</event>
+  </topic>
+  <topic id="attributes">
+    <event>change</event>
+  </topic>
+</subscription>