cpee 2.0.27 → 2.1.2

data/lib/cpee/persistence.rb

@@ -15,33 +15,6 @@
 module CPEE
 
   module Persistence
-    def self::write_instance(id,opts) #{{{
-      Dir.mkdir(File.join(opts[:instances],id.to_s)) rescue nil
-      FileUtils.copy(opts[:backend_run],File.join(opts[:instances],id.to_s))
-      dsl = CPEE::Persistence::extract_item(id,opts,'dsl')
-      hw = CPEE::Persistence::extract_item(id,opts,'handlerwrapper')
-      endpoints = CPEE::Persistence::extract_list(id,opts,'endpoints')
-      dataelements = CPEE::Persistence::extract_list(id,opts,'dataelements')
-      positions = CPEE::Persistence::extract_set(id,opts,'positions')
-      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,opts[: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],
-          :global_handlerwrappers => opts[:global_handlerwrappers],
-          :handlerwrappers => opts[:handlerwrappers]
-        },f)
-      end
-      template = ERB.new(File.read(opts[:backend_template]), trim_mode: '-')
-      res = template.result_with_hash(dsl: dsl, handlerwrapper: hw, dataelements: dataelements, endpoints: endpoints, positions: positions)
-      File.write(File.join(opts[:instances],id.to_s,opts[:backend_instance]),res)
-    end #}}}
-
     def self::set_list(id,opts,item,values,deleted=[]) #{{{
       ah = AttributesHelper.new
       attributes = Persistence::extract_list(id,opts,'attributes').to_h

data/lib/cpee/statemachine.rb

@@ -1,3 +1,17 @@
+# This file is part of CPEE.
+#
+# CPEE 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 Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# CPEE 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 more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# CPEE (file COPYING in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
 module CPEE
 
   class StateMachine

data/lib/cpee/value_helper.rb

@@ -1,3 +1,17 @@
+# This file is part of CPEE.
+#
+# CPEE 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 Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# CPEE 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 more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# CPEE (file COPYING in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
 require 'json'
 require 'time'
 

data/lib/properties.xml

@@ -63,7 +63,7 @@
     <parameter name="value" type="string"/>
   </message> <!--}}}-->
 
-  <message name="handlerwrapper"> <!--{{{-->
+  <message name="executionhandler"> <!--{{{-->
     <parameter name="value" type="string">
       <param name="pattern">[A-Z][a-zA-Z]*</param>
     </parameter>
@@ -165,9 +165,9 @@
         <get out="string"/>
       </resource>
     </resource> <!--}}}-->
-    <resource relative="handlerwrapper"> <!--{{{-->
-      <put in="handlerwrapper"/>
-      <get out="handlerwrapper"/>
+    <resource relative="executionhandler"> <!--{{{-->
+      <put in="executionhandler"/>
+      <get out="executionhandler"/>
     </resource> <!--}}}-->
     <resource relative="positions"> <!--{{{-->
       <get out="positions"/>

data/lib/properties/{handlerwrapper.rng → executionhandler.rng}

@@ -1,8 +1,8 @@
 <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">
+  <define name="executionhandler">
+    <element name="executionhandler" ns="http://cpee.org/ns/properties/2.0">
       <data type="string">
-        <param name="pattern">[A-Z][a-zA-Z]*</param>
+        <param name="pattern">[a-zA-Z]+</param>
       </data>
     </element>
   </define>

data/lib/properties/properties.rng

@@ -1,7 +1,7 @@
 <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="executionhandler.rng"/>
   <include href="positions.rng"/>
   <include href="dataelements.rng"/>
   <include href="endpoints.rng"/>
@@ -15,7 +15,7 @@
     <element name="properties" ns="http://cpee.org/ns/properties/2.0">
       <ref name="state"/>
       <ref name="status"/>
-      <ref name="handlerwrapper"/>
+      <ref name="executionhandler"/>
       <ref name="positions"/>
       <ref name="dataelements"/>
       <ref name="endpoints"/>

data/lib/properties/set-properties.rng

@@ -1,7 +1,7 @@
 <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="executionhandler.rng"/>
   <include href="positions.rng"/>
   <include href="dataelements.rng"/>
   <include href="endpoints.rng"/>
@@ -13,7 +13,7 @@
     <element name="properties" ns="http://cpee.org/ns/properties/2.0">
       <ref name="set-state"/>
       <ref name="status"/>
-      <ref name="handlerwrapper"/>
+      <ref name="executionhandler"/>
       <ref name="positions"/>
       <ref name="dataelements"/>
       <ref name="endpoints"/>

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

@@ -1,7 +1,7 @@
 <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="executionhandler.rng"/>
   <include href="positions.rng"/>
   <include href="dataelements.rng"/>
   <include href="endpoints.rng"/>
@@ -19,7 +19,7 @@
           <ref name="status"/>
         </optional>
         <optional>
-          <ref name="handlerwrapper"/>
+          <ref name="executionhandler"/>
         </optional>
         <optional>
           <ref name="positions"/>

data/server/{resources → executionhandlers/ruby}/backend/instance.template

@@ -1,5 +1,5 @@
 class Instance < WEEL
-  handlerwrapper <%= handlerwrapper %>
+  connectionwrapper ConnectionWrapper
 
 <% for key, value in endpoints -%>
   endpoint :<%= key %> => <%=  CPEE::ValueHelper::parse(value).inspect %>
@@ -13,7 +13,5 @@ class Instance < WEEL
   search <% positions.each_with_index { |de,i| %><%= (i > 0 ? ', ' : '') %>Position.new(:<%= de[0] %>, :<%=de[1] %>, <%= de[2].nil? || de[2].strip.empty? ? 'nil' : '"' + de[2] + '"' %>)<% } %>
 <% end -%>
 
-  control flow do
-    <%= dsl.strip.gsub(/\n/,"\n    ") %>
-  end
+  <%= dsl.strip.gsub(/\n/,"\n  ") %>
 end

data/server/{resources → executionhandlers/ruby}/backend/opts.yaml

@@ -2,5 +2,5 @@
 :url: http://localhost:8298/
 :redis_path: /tmp/redis.sock
 :redis_db: 3
-:handlerwrappers: ../../handlerwrappers/
-
+:executionhandlers: ../../executionhandlers/
+:executionhandler: ruby

data/server/executionhandlers/ruby/backend/run

@@ -0,0 +1,37 @@
+#!/usr/bin/ruby
+require 'yaml'
+opts = YAML::load_file(File.join(__dir__,'opts.yaml'))
+opts[:pidf] = __FILE__ + '.pid'
+opts[:pid] = Process.pid
+
+global_controller = File.join(opts[:global_executionhandlers],opts[:executionhandler],'controller.rb')
+controller        = File.join(opts[:executionhandlers],       opts[:executionhandler],'controller.rb')
+if File.exists? global_controller
+  require global_controller
+elsif File.exists? controller
+  require controller
+end
+
+global_connectionhandler = File.join(opts[:global_executionhandlers],opts[:executionhandler],'connection.rb')
+connectionhandler        = File.join(opts[:executionhandlers],       opts[:executionhandler],'connection.rb')
+if File.exists? global_connectionhandler
+  require global_connectionhandler
+elsif File.exists? connectionhandler
+  require connectionhandler
+end
+
+require_relative 'instance'
+controller = Controller.new(File.basename(__dir__).to_i, __dir__, opts)
+controller.instance = Instance.new controller
+
+File.write(opts[:pidf],opts[:pid])
+
+%w{TERM HUP INT}.each do |sig|
+  Signal.trap(sig) do
+    puts "Caught #{sig}!"
+    controller.stop
+  end
+end
+
+controller.start
+File.unlink(opts[:pidf])

data/server/{handlerwrappers/default.rb → executionhandlers/ruby/connection.rb}

@@ -12,7 +12,7 @@
 # CPEE (file COPYING in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
-class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
+class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::loop_guard(arguments,id,count) # {{{
     controller = arguments[0]
     tsn = Time.now
@@ -30,11 +30,11 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     controller = arguments[0]
     controller.notify("description/error", :message => err.message)
   end# }}}
-  def self::inform_handlerwrapper_error(arguments,err) # {{{
+  def self::inform_connectionwrapper_error(arguments,err) # {{{
     controller = arguments[0]
     p err.message
     p err.backtrace
-    controller.notify("handlerwrapper/error", :message => err.message)
+    controller.notify("executionhandler/error", :message => err.message)
   end # }}}
   def self::inform_position_change(arguments,ipc={}) # {{{
     controller = arguments[0]
@@ -72,6 +72,10 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     params
   end #}}}
 
+  def additional #{{{
+    { :attributes => @controller.attributes }
+  end #}}}
+
   def proto_curl(parameters) #{{{
     params = []
     callback = Digest::MD5.hexdigest(Kernel::rand().to_s)

data/server/executionhandlers/ruby/controller.rb

@@ -0,0 +1,195 @@
+# This file is part of CPEE.
+#
+# CPEE 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 Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# CPEE 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 more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# CPEE (file COPYING in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
+require 'weel'
+require 'json'
+require 'redis'
+require 'securerandom'
+require 'riddl/client'
+require 'cpee/value_helper'
+require 'cpee/attributes_helper'
+require 'cpee/message'
+require 'cpee/redis'
+
+require 'ostruct'
+class ParaStruct < OpenStruct
+  def to_json(*a)
+    table.to_json
+  end
+end
+def →(a); ParaStruct.new(a); end
+def ⭐(a); ParaStruct.new(a); end
+
+class Controller
+  def initialize(id,dir,opts)
+    CPEE::redis_connect(opts)
+
+    @redis = opts[:redis]
+    @votes = []
+
+    @id = id
+
+    @attributes = {}
+    @redis.keys("instance:#{id}/attributes/*").each do |key|
+      @attributes[File.basename(key)] = @redis.get(key)
+    end
+
+    @attributes_helper = AttributesHelper.new
+    @thread = nil
+    @opts = opts
+    @instance = nil
+    @loop_guard = {}
+
+    @callback_keys = {}
+    @psredis = @opts[:redis_dyn].call
+
+    Thread.new do
+      @psredis.psubscribe('callback-response:*','callback-end:*') do |on|
+        on.pmessage do |pat, what, message|
+          if pat == 'callback-response:*' && @callback_keys.has_key?(what[18..-1])
+            index = message.index(' ')
+            mess = message[index+1..-1]
+            instance = message[0...index]
+            m = JSON.parse(mess)
+            resp = []
+            m['content']['values'].each do |e|
+              if e[1][0] == 'simple'
+                resp << Riddl::Parameter::Simple.new(e[0],e[1][1])
+              elsif e[1][0] == 'complex'
+                resp << Riddl::Parameter::Complex.new(e[0],e[1][1],File.open(e[1][2]))
+              end
+            end
+            @callback_keys[what[18..-1]].send(:callback,resp,m['content']['headers'])
+          end
+          if pat == 'callback-end:*'
+            @callback_keys.delete(what[13..-1])
+          end
+        end
+      end
+    end
+  end
+
+  attr_reader :id
+  attr_reader :attributes
+  attr_reader :loop_guard
+
+  def uuid
+    @attributes['uuid']
+  end
+
+  def attributes_translated
+    @attributes_helper.translate(attributes,dataelements,endpoints)
+  end
+
+  def host
+    @opts[:host]
+  end
+  def base_url
+    @opts[:url]
+  end
+  def instance_url
+    File.join(@opts[:url].to_s,@id.to_s)
+  end
+  def instance_id
+    @id
+  end
+  def base
+    base_url
+  end
+  def instance=(inst)
+    @instance = inst
+  end
+  def endpoints
+    @instance.endpoints
+  end
+  def dataelements
+    @instance.data
+  end
+
+  def start
+    if vote("state/change", :state => 'running')
+      @thread = @instance.start
+      @thread.join
+    else
+      @thread = @instance.stop
+      @thread.join
+    end
+  end
+
+  def stop
+    ### tell the instance to stop
+    @instance.stop
+    ### end all votes or it will not work
+    Thread.new do # doing stuff in trap context is a nono. but in a thread its fine :-)
+      @votes.each do |key|
+        CPEE::Message::send(:'vote-response',key,base,@id,uuid,info,true,@redis)
+      end
+    end
+    @thread.join if !@thread.nil? && @thread.alive?
+  end
+
+  def info
+    @attributes['info']
+  end
+
+  def notify(what,content={})
+    content[:attributes] = attributes_translated
+    CPEE::Message::send(:event,what,base,@id,uuid,info,content,@redis)
+  end
+
+  def vote(what,content={})
+    topic, name = what.split('/')
+    handler = File.join(topic,'vote',name)
+    votes = []
+    @redis.smembers("instance:#{id}/handlers/#{handler}").each do |client|
+      voteid = Digest::MD5.hexdigest(Kernel::rand().to_s)
+      content[:key] = voteid
+      content[:attributes] = attributes_translated
+      content[:subscription] = client
+      votes << voteid
+      CPEE::Message::send(:vote,what,base,@id,uuid,info,content,@redis)
+    end
+
+    if votes.length > 0
+      @votes += votes
+      psredis = @opts[:redis_dyn].call
+      collect = []
+      psredis.subscribe(votes.map{|e| ['vote-response:' + e.to_s] }.flatten) do |on|
+        on.message do |what, message|
+          index = message.index(' ')
+          mess = message[index+1..-1]
+          m = JSON.parse(mess)
+          collect << ((m['content'] == true || m['content'] == 'true') || false)
+          @votes.delete m['name']
+          cancel_callback m['name']
+          if collect.length >= votes.length
+            psredis.unsubscribe
+          end
+        end
+      end
+      !collect.include?(false)
+    else
+      true
+    end
+  end
+
+  def callback(hw,key,content)
+    CPEE::Message::send(:callback,'activity/content',base,@id,uuid,info,content.merge(:key => key),@redis)
+    @callback_keys[key] = hw
+  end
+
+  def cancel_callback(key)
+    CPEE::Message::send(:'callback-end',key,base,@id,uuid,info,{},@redis)
+  end
+end