cpee 1.5.20 → 2.0

data/lib/properties/arbitrary.rng

@@ -0,0 +1,26 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <define name="arbitrary" combine="choice">
+    <zeroOrMore>
+      <choice>
+        <text/>
+        <ref name="any"/>
+      </choice>
+    </zeroOrMore>
+  </define>
+  <define name="any" combine="choice">
+    <element>
+      <anyName/>
+      <zeroOrMore>
+        <attribute>
+          <anyName/>
+        </attribute>
+      </zeroOrMore>
+      <zeroOrMore>
+        <choice>
+          <text/>
+          <ref name="any"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+</grammar>

data/lib/properties/attributes.rng

@@ -0,0 +1,10 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="simple.rng"/>
+  <define name="attributes">
+    <element name="attributes" ns="http://cpee.org/ns/properties/2.0">
+      <zeroOrMore>
+        <ref name="simple"/>
+      </zeroOrMore>
+    </element>
+  </define>
+</grammar>

data/lib/properties/dataelements.rng

@@ -0,0 +1,10 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="simple.rng"/>
+  <define name="dataelements">
+    <element name="dataelements" ns="http://cpee.org/ns/properties/2.0">
+      <zeroOrMore>
+        <ref name="simple"/>
+      </zeroOrMore>
+    </element>
+  </define>
+</grammar>

data/lib/properties/description.rng

@@ -0,0 +1,8 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="arbitrary.rng"/>
+  <define name="description">
+    <element name="description" ns="http://cpee.org/ns/properties/2.0">
+      <ref name="arbitrary"/>
+    </element>
+  </define>
+</grammar>

data/lib/properties/dsl.rng

@@ -0,0 +1,7 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <define name="dsl">
+    <element name="dsl" ns="http://cpee.org/ns/properties/2.0">
+      <text/>
+    </element>
+  </define>
+</grammar>

data/lib/properties/dslx.rng

@@ -0,0 +1,8 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="arbitrary.rng"/>
+  <define name="dslx">
+    <element name="dslx" ns="http://cpee.org/ns/properties/2.0">
+      <ref name="arbitrary"/>
+    </element>
+  </define>
+</grammar>

data/lib/properties/endpoints.rng

@@ -0,0 +1,10 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="simple.rng"/>
+  <define name="endpoints">
+    <element name="endpoints" ns="http://cpee.org/ns/properties/2.0">
+      <zeroOrMore>
+        <ref name="simple"/>
+      </zeroOrMore>
+    </element>
+  </define>
+</grammar>

data/lib/properties/handlerwrapper.rng

@@ -0,0 +1,9 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <define name="handlerwrapper">
+    <element name="handlerwrapper" ns="http://cpee.org/ns/properties/2.0">
+      <data type="string">
+        <param name="pattern">[A-Z][a-zA-Z]*</param>
+      </data>
+    </element>
+  </define>
+</grammar>

data/lib/properties/position.rng

@@ -0,0 +1,15 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <define name="position">
+    <element ns="http://cpee.org/ns/properties/2.0">
+      <anyName/>
+      <optional>
+        <attribute name="passthrough">
+          <data type="string"/>
+        </attribute>
+      </optional>
+      <data type="string">
+        <param name="pattern">(at|after)</param>
+      </data>
+    </element>
+  </define>
+</grammar>

data/lib/properties/positions.rng

@@ -0,0 +1,10 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="position.rng"/>
+  <define name="positions">
+    <element name="positions" ns="http://cpee.org/ns/properties/2.0">
+      <zeroOrMore>
+        <ref name="position"/>
+      </zeroOrMore>
+    </element>
+  </define>
+</grammar>

data/lib/properties/properties.rng

@@ -0,0 +1,29 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="state.rng"/>
+  <include href="status.rng"/>
+  <include href="handlerwrapper.rng"/>
+  <include href="positions.rng"/>
+  <include href="dataelements.rng"/>
+  <include href="endpoints.rng"/>
+  <include href="attributes.rng"/>
+  <include href="dsl.rng"/>
+  <include href="dslx.rng"/>
+  <include href="description.rng"/>
+  <include href="transformation.rng"/>
+
+  <start>
+    <element name="properties" ns="http://cpee.org/ns/properties/2.0">
+      <ref name="state"/>
+      <ref name="status"/>
+      <ref name="handlerwrapper"/>
+      <ref name="positions"/>
+      <ref name="dataelements"/>
+      <ref name="endpoints"/>
+      <ref name="attributes"/>
+      <ref name="dsl"/>
+      <ref name="dslx"/>
+      <ref name="description"/>
+      <ref name="transformation"/>
+    </element>
+  </start>
+</grammar>

data/lib/properties/set-properties.rng

@@ -0,0 +1,25 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="state.rng"/>
+  <include href="status.rng"/>
+  <include href="handlerwrapper.rng"/>
+  <include href="positions.rng"/>
+  <include href="dataelements.rng"/>
+  <include href="endpoints.rng"/>
+  <include href="attributes.rng"/>
+  <include href="description.rng"/>
+  <include href="transformation.rng"/>
+
+  <start>
+    <element name="properties" ns="http://cpee.org/ns/properties/2.0">
+      <ref name="set-state"/>
+      <ref name="status"/>
+      <ref name="handlerwrapper"/>
+      <ref name="positions"/>
+      <ref name="dataelements"/>
+      <ref name="endpoints"/>
+      <ref name="attributes"/>
+      <ref name="description"/>
+      <ref name="transformation"/>
+    </element>
+  </start>
+</grammar>

data/lib/properties/set-some-properties.rng

@@ -0,0 +1,45 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="state.rng"/>
+  <include href="status.rng"/>
+  <include href="handlerwrapper.rng"/>
+  <include href="positions.rng"/>
+  <include href="dataelements.rng"/>
+  <include href="endpoints.rng"/>
+  <include href="attributes.rng"/>
+  <include href="description.rng"/>
+  <include href="transformation.rng"/>
+
+  <start>
+    <element name="properties" ns="http://cpee.org/ns/properties/2.0">
+      <interleave>
+        <optional>
+          <ref name="set-state"/>
+        </optional>
+        <optional>
+          <ref name="status"/>
+        </optional>
+        <optional>
+          <ref name="handlerwrapper"/>
+        </optional>
+        <optional>
+          <ref name="positions"/>
+        </optional>
+        <optional>
+          <ref name="dataelements"/>
+        </optional>
+        <optional>
+          <ref name="endpoints"/>
+        </optional>
+        <optional>
+          <ref name="attributes"/>
+        </optional>
+        <optional>
+          <ref name="description"/>
+        </optional>
+        <optional>
+          <ref name="transformation"/>
+        </optional>
+      </interleave>
+    </element>
+  </start>
+</grammar>

data/lib/properties/simple.rng

@@ -0,0 +1,8 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <define name="simple" combine="choice">
+    <element ns="http://cpee.org/ns/properties/2.0">
+      <anyName/>
+      <text/>
+    </element>
+  </define>
+</grammar>

data/lib/properties/state.rng

@@ -0,0 +1,33 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <define name="state">
+    <element name="state" ns="http://cpee.org/ns/properties/2.0">
+      <attribute name="changed">
+        <data type="dateTime"/>
+      </attribute>
+      <choice>
+        <value>ready</value>
+        <value>running</value>
+        <value>simulating</value>
+        <value>replaying</value>
+        <value>stopping</value>
+        <value>stopped</value>
+        <value>abandoned</value>
+        <value>finished</value>
+      </choice>
+    </element>
+  </define>
+  <define name="set-state">
+    <element name="state" ns="http://cpee.org/ns/properties/2.0">
+      <choice>
+        <value>ready</value>
+        <value>running</value>
+        <value>simulating</value>
+        <value>replaying</value>
+        <value>stopping</value>
+        <value>stopped</value>
+        <value>abandoned</value>
+        <value>finished</value>
+      </choice>
+    </element>
+  </define>
+</grammar>

data/lib/properties/status.rng

@@ -0,0 +1,12 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <define name="status">
+    <element name="status" ns="http://cpee.org/ns/properties/2.0">
+      <element name="id">
+        <data type="integer"/>
+      </element>
+      <element name="message">
+        <data type="string"/>
+      </element>
+    </element>
+  </define>
+</grammar>

data/lib/properties/t_attributes.rng

@@ -0,0 +1,7 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="attributes.rng"/>
+
+  <start>
+    <ref name="attributes"/>
+  </start>
+</grammar>

data/lib/properties/t_dataelements.rng

@@ -0,0 +1,7 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="dataelements.rng"/>
+
+  <start>
+    <ref name="dataelements"/>
+  </start>
+</grammar>

data/lib/properties/t_endpoints.rng

@@ -0,0 +1,7 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="endpoints.rng"/>
+
+  <start>
+    <ref name="endpoints"/>
+  </start>
+</grammar>

data/lib/properties/t_position.rng

@@ -0,0 +1,7 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="position.rng"/>
+
+  <start>
+    <ref name="position"/>
+  </start>
+</grammar>

data/lib/properties/t_positions.rng

@@ -0,0 +1,7 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="positions.rng"/>
+
+  <start>
+    <ref name="positions"/>
+  </start>
+</grammar>

data/lib/properties/t_simple.rng

@@ -0,0 +1,7 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="simple.rng"/>
+
+  <start>
+    <ref name="simple"/>
+  </start>
+</grammar>

data/lib/properties/t_status.rng

@@ -0,0 +1,7 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="status.rng"/>
+
+  <start>
+    <ref name="status"/>
+  </start>
+</grammar>

data/lib/properties/t_transformation.rng

@@ -0,0 +1,7 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="transformation.rng"/>
+
+  <start>
+    <ref name="transformation"/>
+  </start>
+</grammar>

data/lib/properties/transformation.rng

@@ -0,0 +1,40 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <define name="transformation">
+    <element name="transformation" ns="http://cpee.org/ns/properties/2.0">
+      <element name="description">
+        <attribute name="type">
+          <choice>
+            <value>copy</value>
+            <value>rest</value>
+            <value>xslt</value>
+            <value>clean</value>
+            <value>none</value>
+          </choice>
+        </attribute>
+        <data type="anyURI"/>
+      </element>
+      <element name="dataelements">
+        <attribute name="type">
+          <choice>
+            <value>rest</value>
+            <value>xslt</value>
+            <value>clean</value>
+            <value>none</value>
+          </choice>
+        </attribute>
+        <data type="anyURI"/>
+      </element>
+      <element name="endpoints">
+        <attribute name="type">
+          <choice>
+            <value>rest</value>
+            <value>xslt</value>
+            <value>clean</value>
+            <value>none</value>
+          </choice>
+        </attribute>
+        <data type="anyURI"/>
+      </element>
+    </element>
+  </define>
+</grammar>

data/server/dev.rb

@@ -28,6 +28,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/cpee/implementation')
 Riddl::Server.new(CPEE::SERVER, :port => 8298) do |opts|
   accessible_description true
   cross_site_xhr true
+  opts[:watchdog_start_off] true
 
   use CPEE::implementation(opts)
 end.loop!

data/server/handlerwrappers/default.rb

@@ -13,26 +13,35 @@
 # <http://www.gnu.org/licenses/>.
 
 class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
+  def self::loop_guard(arguments,id,count) # {{{
+    controller = arguments[0]
+    tsn = Time.now
+    tso = controller.loop_guard[id][:timestamp] rescue Time.now
+    controller.loop_guard[id] = { :count => count, :timestamp => tsn }
+    # if we have more than 100 loop iterations and the last one took less than 2 seconds, we slow the hell down
+    tso + 2 > tsn && count > 100
+  end # }}}
+
+  def self::inform_state_change(arguments,newstate) # {{{
+    controller = arguments[0]
+		controller.notify("state/change", :state => newstate, :timestamp => Time.now.xmlschema(3))
+  end # }}}
   def self::inform_state_change(arguments,newstate) # {{{
     controller = arguments[0]
-		controller.serialize_state!
-		controller.notify("state/change", :instance => controller.instance, :instance_uuid => controller.uuid, :state => newstate, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
-		controller.finalize_if_finished
+		controller.notify("state/change", :state => newstate, :timestamp => Time.now.xmlschema(3))
   end # }}}
   def self::inform_syntax_error(arguments,err,code)# {{{
     controller = arguments[0]
-    controller.notify("description/error", :instance => controller.instance, :instance_uuid => controller.uuid, :message => err.message, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+    controller.notify("description/error", :message => err.message)
   end# }}}
   def self::inform_handlerwrapper_error(arguments,err) # {{{
     controller = arguments[0]
-    controller.notify("handlerwrapper/error", :instance => controller.instance, :instance_uuid => controller.uuid, :message => err.message, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+    p err.message
+    p err.backtrace
+    controller.notify("handlerwrapper/error", :message => err.message)
   end # }}}
   def self::inform_position_change(arguments,ipc={}) # {{{
     controller = arguments[0]
-    controller.serialize_positions!
-    ipc[:instance] = controller.instance
-    ipc[:instance_uuid] = controller.uuid
-    ipc[:timestamp] = Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z")
     controller.notify("position/change", ipc)
   end # }}}
 
@@ -87,7 +96,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     end
 
     params << Riddl::Header.new("CPEE-BASE",@controller.base_url)
-    params << Riddl::Header.new("CPEE-INSTANCE",@controller.instance)
+    params << Riddl::Header.new("CPEE-INSTANCE",@controller.instance_id)
     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)
@@ -104,7 +113,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
     client = Riddl::Client.new(tendpoint)
 
-    @controller.callbacks[callback] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
+    @controller.callback(self,callback,:activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position)
     @handler_passthrough = callback
 
     status, result, headers = client.request type => params
@@ -115,7 +124,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
       callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => c }))) ], headers)
     else
       if headers['CPEE_INSTANTIATION']
-        @controller.notify("task/instantiation", :activity_uuid => @handler_activity_uuid, :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)
+        @controller.notify("task/instantiation", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']))
       end
       if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
         headers['CPEE_UPDATE'] = true
@@ -134,11 +143,11 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @sensors = parameters.dig(:stream,:sensors)
     @aggregators = parameters.dig(:stream,:aggregators)
     @costs = parameters.dig(:stream,:costs)
-    @controller.notify("activity/calling", :activity_uuid => @handler_activity_uuid, :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)
+    @controller.notify("activity/calling", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
     if passthrough.to_s.empty?
       proto_curl parameters
     else
-      @controller.callbacks[passthrough] = CPEE::Callback.new("callback activity: #{@handler_position}",self,:callback,nil,nil,:http)
+      @controller.callback(self,passthrough,:activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position)
       @handler_passthrough = passthrough
     end
   end # }}}
@@ -155,7 +164,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
   def activity_stop # {{{
     unless @handler_passthrough.nil?
-      @controller.callbacks.delete(@handler_passthrough)
+      @controller.cancel_callback(@handler_passthrough)
     end
   end # }}}
   def activity_passthrough_value # {{{
@@ -167,36 +176,33 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def inform_activity_done # {{{
-    @controller.notify("activity/done", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+    @controller.notify("activity/done", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
   end # }}}
   def inform_activity_manipulate # {{{
-    @controller.notify("activity/manipulating", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+    @controller.notify("activity/manipulating", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
   end # }}}
   def inform_activity_failed(err) # {{{
     puts err.message
     puts err.backtrace
-    @controller.notify("activity/failed", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1], :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+    @controller.notify("activity/failed", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
   end # }}}
   def inform_manipulate_change(status,changed_dataelements,changed_endpoints,dataelements,endpoints) # {{{
     unless status.nil?
-      @controller.serialize_status!
-      @controller.notify("status/change", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :id => status.id, :message => status.message, :attributes => @controller.attributes_translated, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+      @controller.notify("status/change", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :id => status.id, :message => status.message)
     end
     unless changed_dataelements.nil?
-      @controller.serialize_dataelements!
-      @controller.notify("dataelements/change", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_dataelements, :values => dataelements, :attributes => @controller.attributes_translated, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+      @controller.notify("dataelements/change", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => dataelements)
     end
     unless changed_endpoints.nil?
-      @controller.serialize_endpoints!
-      @controller.notify("endpoints/change", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints, :attributes => @controller.attributes_translated, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+      @controller.notify("endpoints/change", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints)
     end
   end # }}}
 
   def vote_sync_after # {{{
-    @controller.call_vote("activity/syncing_after", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+    @controller.vote("activity/syncing_after", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label)
   end # }}}
   def vote_sync_before(parameters=nil) # {{{
-    @controller.call_vote("activity/syncing_before", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :parameters => parameters, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+    @controller.vote("activity/syncing_before", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label, :parameters => parameters)
   end # }}}
 
   def simplify_result(result)
@@ -255,17 +261,17 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end
 
   def callback(result=nil,options={})
-    @controller.notify("activity/receiving", :activity_uuid => @handler_activity_uuid, :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, :aggregators => @aggregators, :costs => @costs)
+    @controller.notify("activity/receiving", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
     result = simplify_result(result)
     @handler_returnValue = result
     @handler_returnOptions = options
     if options['CPEE_UPDATE']
       if options['CPEE_UPDATE_STATUS']
-        @controller.notify("activity/status", :activity_uuid => @handler_activity_uuid, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'], :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+        @controller.notify("activity/status", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'])
       end
       @handler_continue.continue WEEL::Signal::Again
     else
-      @controller.callbacks.delete(@handler_passthrough)
+      @controller.cancel_callback(@handler_passthrough)
       @handler_passthrough = nil
       if options['CPEE_SALVAGE']
         @handler_continue.continue WEEL::Signal::Salvage
@@ -277,18 +283,18 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
   def test_condition(mr,code)
     res = mr.instance_eval(code)
-    @controller.notify("condition/eval", :instance => @controller.instance, :instance_uuid => @controller.uuid, :code => code, :condition => (res ? "true" : "false"), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+    @controller.notify("condition/eval", :instance_uuid => @controller.uuid, :code => code, :condition => (res ? "true" : "false"))
     res
   end
 
   def simulate(type,nesting,tid,parent,parameters={}) #{{{
     pp "#{type} - #{nesting} - #{tid} - #{parent} - #{parameters.inspect}"
 
-    @controller.call_vote("simulating/step",
-      :endpoint => @handler_endpoint,
-      :instance => @controller.instance,
-      :instance_uuid => @controller.uuid,
+    @controller.vote("simulating/step",
+      :activity_uuid => @handler_activity_uuid,
+      :label => @label,
       :activity => tid,
+      :endpoint => @handler_endpoint,
       :type => type,
       :nesting => nesting,
       :parent => parent,