cpee-logging-xes-yaml 1.0.5 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 897f6d719b02a41bbec8577cbcc0cfb0c21d45e4c82a569903a9d2260ec95ce6
-  data.tar.gz: 52a03e45692b299d2548a132c5549787f04dc935268b467fb9c47dd777a26ac5
+  metadata.gz: 99c79d272d96fc0194b782ae5f93492b7a50f5daac07cb60da447d2be314cbc8
+  data.tar.gz: ceb9ac1ca98aa9bae3fc4fb15c3e617ec306fa00bc62e8f627888169ee8ca703
 SHA512:
-  metadata.gz: 4dbab93362de5702354db2b62ccbe6fe5a2bf4d8305f87b9ccef877d542a62e62dc5804cae5b9d059c7930fdc1e2063dcce2d132fcf8a2e2b6418c7146e6db5c
-  data.tar.gz: f1412da8132c5f8b7f67643ab8226a09262cef99f34b78f9de9a8941a5a3b947340acb85967b5f645c812853dd3c1740f5a4c34ea53040c34b1f3433d230d714
+  metadata.gz: fe2f39dad68c6a86308811d25df6a1e41e9133984c1c67c6512240128abce5fa57727f915615cbe2fae21ef61bead8ab20b36e5c8bbab43181d7a9a38d116459
+  data.tar.gz: 94fa1197bc3e2b820464c947204aaa3ec376c13d90a87f3f371c11c39548aee98c4ec6fc71de28969ef319e07df780eb024db674e5777e33796cfc8a62b9dc51

data/cpee-logging-xes-yaml.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.0.5"
+  s.version          = "1.3.2"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"

data/lib/cpee-logging-xes-yaml/logging.rb

@@ -1,16 +1,16 @@
 # This file is part of CPEE-LOGGING-XES-YAML.
 #
 # CPEE-LOGGING-XES-YAML is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the Free
+# under the terms of the GNU Lesser General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option) any
 # later version.
 #
 # CPEE-LOGGING-XES-YAML is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
 # more details.
 #
-# You should have received a copy of the GNU General Public License along with
+# You should have received a copy of the GNU Lesser General Public License along with
 # CPEE-LOGGING-XES-YAML (file LICENSE in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
@@ -21,95 +21,121 @@ require 'yaml'
 require 'riddl/server'
 require 'time'
 
+require_relative 'tools'
+
 module CPEE
   module Logging
 
     SERVER = File.expand_path(File.join(__dir__,'logging.xml'))
 
-    class Handler < Riddl::Implementation #{{{
-      def doc(topic,event_name,log_dir,template,notification)
-        instance = notification['instance-uuid']
-        return unless instance
-
-        instancenr = notification['instance']
-        content = notification['content']
-        activity = content['activity']
-        parameters = content['parameters']
-        receiving = content['received']
-
-        log = YAML::load(File.read(template))
-        log["log"]["trace"]["concept:name"] ||= instancenr
-        log["log"]["trace"]["cpee:name"] ||= notification['instance-name'] if notification['instance-name']
-        log["log"]["trace"]["cpee:instance"] ||= instance
-        File.open(File.join(log_dir,instance+'.xes.yaml'),'w'){|f| f.puts log.to_yaml} unless File.exists? File.join(log_dir,instance+'.xes.yaml')
-        event = {}
-        event["concept:instance"] = instancenr
-        event["concept:name"] = content["label"] if content["label"]
-        if content["endpoint"]
-          event["concept:endpoint"] = content["endpoint"]
-        end
-        event["id:id"] = (activity.nil? || activity == "") ? 'external' : activity
-        event["cpee:activity"] = event["id:id"]
-        event["cpee:activity_uuid"] = content['activity-uuid'] if content['activity-uuid']
-        event["cpee:instance"] = instance
-        case event_name
-          when 'receiving', 'change', 'instantiation'
-            event["lifecycle:transition"] = "unknown"
-          when 'done'
-            event["lifecycle:transition"] = "complete"
-          else
-            event["lifecycle:transition"] = "start"
+    class Handler < Riddl::Implementation
+      def response
+        opts       = @a[0]
+        type       = @p[0].value
+        topic      = @p[1].value
+        event_name = @p[2].value
+        payload    = @p[3].value.read
+        EM.defer do
+          CPEE::Logging::forward opts, topic, event_name, payload
+        end if type == 'event'
+        EM.defer do
+          CPEE::Logging::doc opts, topic, event_name, payload
         end
-        event["cpee:lifecycle:transition"] = "#{topic}/#{event_name}"
-        event["cpee:state"] = content['state'] if content['state']
-        event["cpee:description"] = content['dslx'] if content['dslx']
-        data_send = ((parameters["arguments"].nil? ? [] : parameters["arguments"]) rescue [])
-        event["data"] = {"data_send" => data_send} unless data_send.empty?
-        if content['changed']&.any?
-          if event.has_key? "data"
-            event["data"]["data_changed"] ||= content['changed']
-          else
-            event["data"] = {"data_changer" => content['changed']}
-          end
+        nil
+      end
+    end
+
+    class Overview < Riddl::Implementation #{{{
+      def response
+        Riddl::Parameter::Complex.new("overview","text/xml") do
+          <<-END
+            <overview xmlns='http://riddl.org/ns/common-patterns/notifications-producer/2.0'>
+              <topics/>
+              <subscriptions/>
+            </overview>
+          END
         end
-        if content['values']&.any?
-          if event.has_key? "data"
-            event["data"]["data_values"] ||= content['values']
-          else
-            event["data"] = {"data_values" => content['values']}
-          end
+      end
+    end #}}}
+
+    class Topics < Riddl::Implementation #{{{
+      def response
+        opts = @a[0]
+        Riddl::Parameter::Complex.new("overview","text/xml") do
+          File.read(opts[:topics])
         end
-        if receiving && !receiving.empty?
-          if event.has_key? "data"
-            event["data"]["data_received"] ||= receiving
-          else
-            event["data"] = {"data_receiver" => receiving}
+      end
+    end #}}}
+
+    class Subscriptions < Riddl::Implementation #{{{
+      def response
+        opts = @a[0]
+        Riddl::Parameter::Complex.new("subscriptions","text/xml") do
+          ret = XML::Smart::string <<-END
+            <subscriptions xmlns='http://riddl.org/ns/common-patterns/notifications-producer/2.0'/>
+          END
+          Dir.glob(File.join(opts[:notifications_dir],'*','subscription.xml')).each do |f|
+            ret.root.add('subscription').tap do |n|
+              n.attributes['id'] = File.basename(File.dirname(f))
+              XML::Smart.open_unprotected(f) do |doc|
+                n.attributes['url'] =  doc.root.attributes['url']
+              end
+            end
           end
+          ret.to_s
         end
-        event["time:timestamp"]= event['cpee:timestamp'] || Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z")
-        File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
-          f << {'event' => event}.to_yaml
-        end
-        nil
       end
+    end #}}}
 
+    class Subscription < Riddl::Implementation #{{{
       def response
-        topic         = @p[1].value
-        event_name    = @p[2].value
-        log_dir       = @a[0]
-        template      = @a[1]
-        notification  = JSON.parse(@p[3].value.read)
-        doc topic, event_name, log_dir, template, notification
+        opts = @a[0]
+        id = @r[-1]
+        doc = XML::Smart::open_unprotected(File.join(opts[:notifications_dir],id,'subscription.xml'))
+        doc.root.attributes['id'] = id
+        Riddl::Parameter::Complex.new("subscriptions","text/xml",doc.to_s)
       end
     end #}}}
 
     def self::implementation(opts)
-      opts[:log_dir] ||= File.join(__dir__,'logs')
-      opts[:template] ||= File.join(__dir__,'template.xes_yaml')
+      opts[:log_dir]           ||= File.expand_path(File.join(__dir__,'logs'))
+      opts[:notifications_dir] ||= File.expand_path(File.join(__dir__,'notifications'))
+      opts[:template]          ||= File.expand_path(File.join(__dir__,'template.xes_yaml'))
+      opts[:topics]            ||= File.expand_path(File.join(__dir__,'topics.xml'))
+      opts[:subscriptions]     =  {}
+
+      Dir.glob(File.join(opts[:notifications_dir],'*','subscription.xml')).each do |f|
+        XML::Smart::open_unprotected(f) do |doc|
+          doc.register_namespace :p, 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
+          doc.find('/p:subscription/p:topic').each do |t|
+            t.find('p:event').each do |e|
+              opts[:subscriptions][t.attributes['id']+'/'+e.text] ||= []
+              opts[:subscriptions][t.attributes['id']+'/'+e.text] << doc.root.attributes['url']
+            end
+          end
+        end
+      end
 
       Proc.new do
         interface 'events' do
-          run Handler, opts[:log_dir], opts[:template] if post 'event'
+          run Handler, opts if post 'event'
+        end
+        interface 'notifications' do
+          on resource "notifications" do
+            run Overview if get
+            on resource "topics" do
+              run Topics, opts if get
+            end
+            on resource "subscriptions" do
+              run Subscriptions, opts if get
+              run CreateSubscription, opts if post 'create_subscription'
+              on resource do
+                run Subscription, opts if get
+                run UpdateSubscription, opts if put 'change_subscription'
+                run DeleteSubscription, opts if delete
+              end
+            end
+          end
         end
       end
     end

data/lib/cpee-logging-xes-yaml/logging.xml

@@ -1,13 +1,38 @@
+<!--
+  This file is part of CPEE-LOGGING-XES-YAML.
+
+  CPEE-LOGGING-XES-YAML is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by the Free
+  Software Foundation, either version 3 of the License, or (at your option) any
+  later version.
+
+  CPEE-LOGGING-XES-YAML is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+  more details.
+
+  You should have received a copy of the GNU Lesser General Public License along with
+  CPEE-LOGGING-XES-YAML (file LICENSE in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+
 <declaration xmlns="http://riddl.org/ns/declaration/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
   <interface name="events">
     <xi:include href="http://www.riddl.org/ns/common-patterns/notifications-consumer/2.0/consumer.xml"/>
   </interface>
+  <interface name="notifications">
+    <xi:include href="http://www.riddl.org/ns/common-patterns/notifications-producer/2.0/producer.xml"/>
+  </interface>
 
   <facade>
     <tile>
       <layer name="events">
         <apply-to>/</apply-to>
       </layer>
+      <layer name="notifications">
+        <apply-to>/</apply-to>
+        <block method="sse">/notifications/subscriptions/{}/sse</block>
+      </layer>
     </tile>
   </facade>
 </declaration>

data/lib/cpee-logging-xes-yaml/template.xes_yaml

@@ -1,11 +1,19 @@
 ---
 log:
+  namespaces:
+    stream: https://cpee.org/datastream/
+    ssn: http://www.w3.org/ns/ssn/
+    sosa: http://www.w3.org/ns/sosa/
+  xes:
+    creator: cpee.org
+    features: nested-attributes
   extension:
     time: http://www.xes-standard.org/time.xesext
     concept: http://www.xes-standard.org/concept.xesext
-    organisational: http://www.xes-standard.org/org.xesext
+    id: http://www.xes-standard.org/identity.xesext
     lifecycle: http://www.xes-standard.org/lifecycle.xesext
     cpee: http://cpee.org/cpee.xesext
+    stream: https://cpee.org/datastream/datastream.xesext
   global:
     trace:
       concept:name: __INVALID__
@@ -19,10 +27,4 @@ log:
       lifecycle:transition: complete
       cpee:lifecycle:transition: activity/calling
       time:timestamp: ''
-  classifier:
-    Data: data_send data_received data_changed data_values
-    Data_Received: data_receiver
-    Data_Send: data_send
-    Data_Changed: data_changer
-    Data_Values: data_values
   trace: {}

data/lib/cpee-logging-xes-yaml/tools.rb

@@ -0,0 +1,359 @@
+# This file is part of CPEE-LOGGING-XES-YAML.
+#
+# CPEE-LOGGING-XES-YAML is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# CPEE-LOGGING-XES-YAML is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+# more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along with
+# CPEE-LOGGING-XES-YAML (file LICENSE in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
+require 'weel'
+require 'digest/sha1'
+
+class StreamPoint
+  attr_accessor :value, :timestamp, :source, :meta
+  attr_reader :id
+
+  def initialize(id)
+    @id = id
+    @value = nil
+    @timestamp = Time.now
+    @source = nil
+    @meta = nil
+  end
+
+  def to_h
+    tp = { }
+    tp['stream:id'] = @id
+    tp['stream:value'] = @value
+    tp['stream:timestamp'] = @timestamp
+    tp['stream:source'] = @source unless @source.nil?
+    tp['stream:meta'] = @meta unless @meta.nil?
+    tp
+  end
+end
+class Stream
+  attr_accessor :id, :source, :meta
+  attr_reader :name
+
+  def initialize(name)
+    @name = name
+    @id = nil
+    @source = nil
+    @meta = nil
+    @values = []
+  end
+
+  def <<(val)
+    @values << val
+  end
+
+  def to_list
+    tp = []
+    tp << {'stream:name' => @name}
+    tp << {'stream:id' => @id} unless @id.nil?
+    tp << {'stream:source' => @source} unless @source.nil?
+    tp << {'stream:meta' => @meta} unless @meta.nil?
+    @values.each do |e|
+      if e.is_a? Stream
+        e.source = @source if e.source.nil? && !@source.nil?
+        tp << { 'stream:datastream' => e.to_list }
+      elsif e.is_a? StreamPoint
+        e.source = @source if e.source.nil? && !@source.nil?
+        tp << { 'stream:point' => e.to_h }
+      end
+    end
+    tp
+  end
+end
+
+module CPEE
+  module Logging
+
+    def self::notify(opts,topic,event_name,payload)
+      opts[:subscriptions].each do |e,urls|
+        if e == topic + '/' + event_name
+          urls.each do |url|
+            client = Riddl::Client.new(url)
+            client.post [
+              Riddl::Parameter::Simple::new('type','event'),
+              Riddl::Parameter::Simple::new('topic',topic),
+              Riddl::Parameter::Simple::new('event',event_name),
+              Riddl::Parameter::Complex::new('notification','application/json',payload)
+            ]
+          end
+        end
+      end
+    end
+
+    def self::val_merge(target,val,tid,tso)
+      if val.is_a? Stream
+        val.source = tso if val.source.nil?
+        target.push *val.to_list
+      else
+        tp = nil
+        if val.is_a? StreamPoint
+          tp = val
+          tp.source = tso if tp.source.nil?
+        else
+          tp = StreamPoint.new(tid)
+          tp.source =  tso
+          tp.value = val
+        end
+        target << { 'stream:point' => tp.to_h }
+      end
+    end
+
+    def self::extract_probes(where,xml)
+      XML::Smart::string(xml) do |doc|
+        doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
+        doc.find('//d:call').each do |c|
+          File.unlink(where + '_' + c.attributes['id'] + '.probe') rescue nil
+          c.find('d:annotations/d:_context_data_analysis/d:probes[d:probe]').each do |p|
+            File.write(where + '_' + c.attributes['id'] + '.probe', p.dump)
+          end
+        end
+      end
+    end
+    def self::extract_annotations(where,xml)
+      ret = {}
+      XML::Smart::string(xml) do |doc|
+        doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
+        doc.find('/d:description | //d:call').each do |c|
+          tid = c.attributes['id'] || 'start'
+          fname = where + '_' + tid + '.anno'
+          nset = if tid == 'start'
+            c.find('d:*[starts-with(name(),"_")]')
+          else
+            c.find('d:annotations')
+          end
+          nset.each do |p|
+            anno = p.dump
+            ret[tid] ||= []
+            ret[tid] << anno
+          end
+          if ret[tid]
+            if ret[tid].length > 1
+              ret[tid] = "<annotations xmlns=\"http://cpee.org/ns/description/1.0\">\n" +
+                ret[tid].join("\n") + "\n" +
+                "</annotations>"
+            else
+              ret[tid] = ret[tid][0]
+            end
+            hash = Digest::SHA1.hexdigest(ret[tid])
+            if !File.exist?(fname) || (File.exist?(fname) && File.read(fname) !=  hash)
+              File.write(fname,hash)
+            end
+          end
+        end
+      end
+      ret
+    end
+
+    def self::extract_result(result)
+      ret = result.map do |res|
+        if res['mimetype'].nil?
+          res['value']
+        elsif res['mimetype'] == 'application/json'
+          JSON::parse(res['data'])
+        elsif res['mimetype'] == 'application/xml' || res['mimetype'] == 'text/xml'
+          XML::Smart::string(res['data']) rescue nil
+        elsif res['mimetype'] == 'text/yaml'
+          YAML::load(res['data']) rescue nil
+        elsif res['mimetype'] == 'text/plain'
+          t = res['data']
+          if t.start_with?("<?xml version=")
+            t = XML::Smart::string(t)
+          else
+            t = t.to_f if t == t.to_f.to_s
+            t = t.to_i if t == t.to_i.to_s
+          end
+          t
+        elsif res['mimetype'] == 'text/html'
+          t = res['data']
+          t = t.to_f if t == t.to_f.to_s
+          t = t.to_i if t == t.to_i.to_s
+          t
+        else
+          res['data']
+        end
+      end
+      ret.length == 1 ? ret[0] : ret
+    end
+
+    def self::extract_sensor(rs,code,pid,result)
+      rs.instance_eval(code,'probe',1)
+    rescue => e
+      e.backtrace[0].gsub(/(\w+):(\d+):in.*/,'Probe ' + pid + ' Line \2: ') + e.message
+    end
+
+    def self::persist_values(where,values)
+      unless File.exist?(where)
+        File.write(where,'{}')
+      end
+      f = File.open(where,'r+')
+      f.flock(File::LOCK_EX)
+      json = JSON::load(f) || {}
+      json.merge!(values)
+      f.rewind
+      f.truncate(0)
+      f.write(JSON.generate(json))
+      f.close
+    end
+
+    def self::forward(opts,topic,event_name,payload)
+      if topic == 'state' && event_name == 'change'
+        self::notify(opts,topic,event_name,payload)
+      elsif topic == 'state' && event_name == 'change'
+        self::notify(opts,topic,event_name,payload)
+      elsif topic == 'gateway' && event_name == 'join'
+        self::notify(opts,topic,event_name,payload)
+      end
+    end
+
+    def self::doc(opts,topic,event_name,payload)
+      notification = JSON.parse(payload)
+      instance = notification['instance-uuid']
+      return unless instance
+
+      log_dir = opts[:log_dir]
+      template = opts[:template]
+
+      instancenr = notification['instance']
+      content = notification['content']
+      activity = content['activity']
+      parameters = content['parameters']
+      receiving = content['received']
+
+      if content['dslx']
+        CPEE::Logging::extract_probes(File.join(log_dir,instance),content['dslx'])
+        CPEE::Logging::extract_annotations(File.join(log_dir,instance),content['dslx']).each do |k,v|
+          so = Marshal.load(Marshal.dump(notification))
+          so['content'].delete('dslx')
+          so['content'].delete('dsl')
+          so['content'].delete('description')
+          so['content']['annotation'] = v
+          so['content']['activity'] = k
+          so['topic'] = 'annotation'
+          so['name'] = 'change'
+          EM.defer do
+            self::notify(opts,'annotation','change',so.to_json)
+          end
+        end
+      end
+
+      if topic == 'dataelements' && event_name == 'change'
+        if content['changed']&.any?
+          CPEE::Logging::persist_values(File.join(log_dir,instance + '.data.json'),content['values'])
+        end
+      end
+
+      log = YAML::load(File.read(template))
+      log["log"]["trace"]["concept:name"] ||= instancenr
+      log["log"]["trace"]["cpee:name"] ||= notification['instance-name'] if notification['instance-name']
+      log["log"]["trace"]["cpee:instance"] ||= instance
+      File.open(File.join(log_dir,instance+'.xes.yaml'),'w'){|f| f.puts log.to_yaml} unless File.exist? File.join(log_dir,instance+'.xes.yaml')
+      event = {}
+      event["concept:instance"] = instancenr
+      event["concept:name"] = content["label"] if content["label"]
+      if content["endpoint"]
+        event["concept:endpoint"] = content["endpoint"]
+      end
+      event["id:id"] = (activity.nil? || activity == "") ? 'external' : activity
+      event["cpee:activity"] = event["id:id"]
+      event["cpee:activity_uuid"] = content['activity-uuid'] if content['activity-uuid']
+      event["cpee:instance"] = instance
+      case event_name
+        when 'receiving', 'change', 'instantiation'
+          event["lifecycle:transition"] = "unknown"
+        when 'done'
+          event["lifecycle:transition"] = "complete"
+        else
+          event["lifecycle:transition"] = "start"
+      end
+      event["cpee:lifecycle:transition"] = "#{topic}/#{event_name}"
+      event["cpee:state"] = content['state'] if content['state']
+      event["cpee:description"] = content['dslx'] if content['dslx']
+      unless parameters["arguments"]&.nil?
+        event["data"] = parameters["arguments"]
+      end if parameters
+      if content['changed']&.any?
+        event["data"] = content['values'].map do |k,v|
+          { 'name' => k, 'value' => v }
+        end
+
+        fname = File.join(log_dir,instance + '_' + event["id:id"] + '.probe')
+        dname = File.join(log_dir,instance + '.data.json')
+
+        if File.exist?(fname)
+          rs = WEEL::ReadStructure.new(File.exist?(dname) ? JSON::load(File::open(dname)) : {},{},{},{})
+          XML::Smart::open_unprotected(fname) do |doc|
+            doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
+            doc.find('//d:probe[d:extractor_type="intrinsic"]').each do |p|
+              pid = p.find('string(d:id)')
+              event['stream:datastream'] ||= []
+              val = CPEE::Logging::extract_sensor(rs,p.find('string(d:extractor_code)'),pid,nil) rescue nil
+              CPEE::Logging::val_merge(event['stream:datastream'],val,pid,p.find('string(d:source)'))
+            end
+          end
+          notification['datastream'] = event['stream:datastream']
+          EM.defer do
+            notification['topic'] = 'stream'
+            notification['name'] = 'extraction'
+            self::notify(opts,'stream','extraction',notification.to_json)
+          end
+        end
+      end
+      if topic == 'activity' && event_name == 'receiving' && receiving && !receiving.empty?
+        fname = File.join(log_dir,instance + '_' + event["id:id"] + '.probe')
+        dname = File.join(log_dir,instance + '.data.json')
+
+        if File.exist?(fname)
+          te = event.dup
+
+          rs = WEEL::ReadStructure.new(File.exist?(dname) ? JSON::load(File::open(dname)) : {},{},{},{})
+          XML::Smart::open_unprotected(fname) do |doc|
+            doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
+            if doc.find('//d:probe/d:extractor_type[.="extrinsic"]').any?
+              rc = CPEE::Logging::extract_result(receiving)
+              doc.find('//d:probe[d:extractor_type="extrinsic"]').each do |p|
+                pid = p.find('string(d:id)')
+                te['stream:datastream'] ||= []
+                val = CPEE::Logging::extract_sensor(rs,p.find('string(d:extractor_code)'),pid,rc) rescue nil
+                CPEE::Logging::val_merge(te['stream:datastream'],val,pid,p.find('string(d:source)'))
+              end
+            end
+          end
+          if te['stream:datastream']
+            te["cpee:lifecycle:transition"] = "stream/data"
+            File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
+              f << {'event' => te}.to_yaml
+            end
+            notification['datastream'] = te['stream:datastream']
+            EM.defer do
+              notification['topic'] = 'stream'
+              notification['name'] = 'extraction'
+              self::notify(opts,'stream','extraction',notification.to_json)
+            end
+          end
+        end
+      end
+      if receiving && !receiving.empty?
+        event["raw"] = receiving
+      end
+      event["time:timestamp"]= notification['timestamp'] || Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z")
+      File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
+        f << {'event' => event}.to_yaml
+      end
+    end
+
+  end
+end
+

data/lib/cpee-logging-xes-yaml/topics.xml

@@ -0,0 +1,36 @@
+<!--
+  This file is part of CPEE-LOGGING-XES-YAML.
+
+  CPEE-LOGGING-XES-YAML is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by the Free
+  Software Foundation, either version 3 of the License, or (at your option) any
+  later version.
+
+  CPEE-LOGGING-XES-YAML is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+  more details.
+
+  You should have received a copy of the GNU Lesser General Public License along with
+  CPEE-LOGGING-XES-YAML (file LICENSE in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+
+<topics xmlns='http://riddl.org/ns/common-patterns/notifications-producer/2.0'>
+  <topic id='annotation'>
+    <event>change</event>
+  </topic>
+  <topic id='stream'>
+    <event>extraction</event>
+  </topic>
+  <topic id='gateway'>
+    <event>decide</event>
+    <event>join</event>
+  </topic>
+  <topic id='state'>
+    <event>change</event>
+  </topic>
+  <topic id='task'>
+    <event>instantiation</event>
+  </topic>
+</topics>

data/server/log

@@ -1,4 +1,21 @@
 #!/usr/bin/ruby
+#
+# This file is part of CPEE-LOGGING-XES-YAML.
+#
+# CPEE-LOGGING-XES-YAML is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# CPEE-LOGGING-XES-YAML is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+# more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along with
+# CPEE-LOGGING-XES-YAML (file LICENSE in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
 require 'rubygems'
 require 'cpee-logging-xes-yaml/logging'
 
@@ -13,6 +30,7 @@ Riddl::Server.new(CPEE::Logging::SERVER, options) do
   cross_site_xhr true
 
   @riddl_opts[:log_dir] ||= File.join(__dir__,'logs')
+  @riddl_opts[:subscriptions_dir] ||= File.join(__dir__,'subscriptions')
 
   use CPEE::Logging::implementation(@riddl_opts)
 end.loop!

data/tools/cpee-logging-xes-yaml

@@ -1,4 +1,21 @@
 #!/usr/bin/ruby
+#
+# This file is part of CPEE-LOGGING-XES-YAML.
+#
+# CPEE-LOGGING-XES-YAML is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# CPEE-LOGGING-XES-YAML is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+# more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along with
+# CPEE-LOGGING-XES-YAML (file LICENSE in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
 curpath = __dir__
 require 'rubygems'
 require 'optparse'
@@ -27,16 +44,21 @@ def wrap(s, width=78, indent=18, extra_indent=4)
 end
 
 def follow(fname,io,copy,deep=0)
+  tname = if fname =~ /\.xes\.shift\.yaml/
+    File.basename(fname,'.xes.shift.yaml')
+  elsif fname =~ /\.xes\.yaml/
+    File.basename(fname,'.xes.yaml')
+  end
   if copy
-    File.write(File.basename(fname,'.xes.yaml') + '.xes.yaml',io.read)
+    File.write(File.basename(fname),io.read)
     io.rewind
   end
   YAML.load_stream(io) do |e|
     if name = e.dig('log','trace','cpee:name')
-      puts " " * deep + name + " (#{File.basename(fname,'.xes.yaml')}) - #{e.dig('log','trace','concept:name')}"
+      puts " " * deep + name + " (#{tname}) - #{e.dig('log','trace','concept:name')}"
     end
     if e.dig('event','cpee:lifecycle:transition') == 'task/instantiation'
-      base = e.dig('event','data','data_receiver')
+      base = e.dig('event','raw')
       val = base.dig('CPEE-INSTANCE') rescue nil
       if val.nil?
         val = File.basename(base)
@@ -62,7 +84,7 @@ def react(name,copy=false,deep=0)
       file.close
       file.unlink
     end
-  elsif File.exists? name
+  elsif File.exist? name
     follow name, File.open(name), copy, deep
   else
     help
@@ -94,7 +116,7 @@ else
 end
 
 if command == 'new'
-  if !File.exists?(dir)
+  if !File.exist?(dir)
     FileUtils.cp_r(File.join(curpath,'..','server'),dir)
     FileUtils.mkdir(File.join(dir,'logs')) rescue nil
   else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.3.2
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -75,6 +75,8 @@ files:
 - lib/cpee-logging-xes-yaml/logging.rb
 - lib/cpee-logging-xes-yaml/logging.xml
 - lib/cpee-logging-xes-yaml/template.xes_yaml
+- lib/cpee-logging-xes-yaml/tools.rb
+- lib/cpee-logging-xes-yaml/topics.xml
 - server/log
 - tools/cpee-logging-xes-yaml
 homepage: http://cpee.org/
@@ -96,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Logging for the cloud process execution engine (cpee.org)