cpee-instantiation 1.0.16 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d556a9e76088551f9335eb97aa22db0b851198d4d5f58f78035841513a43ac80
-  data.tar.gz: 4d11049fba6354acad20244af8300859c21d293e3d41ba87253628a4d332fff7
+  metadata.gz: e8e16d204b34a37277bd75a4971eb72716af21f4c6792f6f4281d15c61d53bd6
+  data.tar.gz: 1e34b02335ca3242cc7c915ccceb8422b0653e057877afd385ad20717ce08785
 SHA512:
-  metadata.gz: 697a43f1f77571d08284745129b3645be9050155dcb0abfa88a62755111278cd6a18271bfc27379286ae8f44ba17e7b8954bc260c1593459c567e7641dab05a7
-  data.tar.gz: 9b1e2bc53ed83ea3fd9b6042b710fd1d69ee6676aa5b56716c59bf6507cab432ff2ff0d8bb8206873ca0d5047fbdb3f8ce609cb52942bb454a5b1cde97c89f12
+  metadata.gz: 26b3f9c3f8cabc8fca64353fc267a6b6a5cfd0249a7f10f63d863f621b098e8809c231819fa44aba5083cccaae2a7158c7e950314f93ee84b3d8c7e735e8d449
+  data.tar.gz: 659bd9d0d59e35f75fe7b2e7d762322870ac934f1a3769b9e89a1185936531adfdd6ddf82bfe12c7f4e51eaaa5d4cfc826c2d866d126e64b6a97273f81f4beff

data/AUTHORS

@@ -1 +1,2 @@
 Jürgen Mangler <juergen.mangler@gmail.com>
+Heinrich Fenkart <hnrch02@gmail.com>

data/README.md

@@ -4,7 +4,7 @@ To install the instatiation service go to the commandline
 
 ```bash
  gem install cpee-instantiation
- cpee-instantiation instantiation
+ cpee-instantiation new instantiation
  cd instantiation
  ./instantiation start
 ```

data/cpee-instantiation.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.0.16"
+  s.version          = "1.1.5"
   s.platform         = Gem::Platform::RUBY
-  s.license          = "LGPL-3.0"
+  s.license          = "LGPL-3.0-or-later"
   s.summary          = "Subprocess instantiation service for the cloud process execution engine (cpee.org)"
 
   s.description      = "see http://cpee.org"
@@ -15,13 +15,13 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>=2.4.0'
 
-  s.authors          = ['Juergen eTM Mangler']
+  s.authors          = ['Juergen eTM Mangler', 'Heinrich Fenkart']
 
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
-  s.add_runtime_dependency 'riddl', '~> 0.99'
+  s.add_runtime_dependency 'riddl', '~> 1.0'
   s.add_runtime_dependency 'json', '~> 2.1'
-  s.add_runtime_dependency 'redis', '~> 4.1'
-  s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.4'
+  s.add_runtime_dependency 'redis', '~> 5.0'
+  s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.74'
 end

data/lib/cpee-instantiation/instantiation.rb

@@ -1,21 +1,22 @@
 # This file is part of CPEE-INSTANTIATION.
 #
 # CPEE-INSTANTIATION 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.
+# 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-INSTANTIATION 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.
+# 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
-# CPEE-INSTANTIATION (file LICENSE in the main directory).  If not, see
-# <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with CPEE-INSTANTIATION (file LICENSE in the main directory).  If not,
+# see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
 require 'cpee/value_helper'
+require 'cpee/redis'
 require 'xml/smart'
 require 'riddl/server'
 require 'securerandom'
@@ -24,27 +25,36 @@ require 'uri'
 require 'redis'
 require 'json'
 
+require_relative 'utils'
+
 module CPEE
   module Instantiation
 
     SERVER = File.expand_path(File.join(__dir__,'instantiation.xml'))
 
     module Helpers #{{{
-      def add_to_testset(tdoc,what,data)
+
+      def add_to_testset(tdoc,what,data) #{{{
         if data && !data.empty?
-          JSON::parse(data).each do |k,v|
+          data = JSON::parse(data) if data.is_a? String
+          data.each do |k,v|
             ele = tdoc.find("/*/prop:#{what}/prop:#{k}")
             if ele.any?
               ele.first.text = CPEE::ValueHelper::generate(v)
             else
               ele = tdoc.find("/*/prop:#{what}")
-              ele.first.add(k,CPEE::ValueHelper::generate(v)) if ele.any?
+              ele = if ele.any?
+                ele.first
+              else
+                tdoc.root.add("prop:#{what}")
+              end
+              ele.add(k,CPEE::ValueHelper::generate(v))
             end
           end
         end
-      end
+      end #}}}
 
-      def augment_testset(tdoc,p)
+      def augment_testset(tdoc,p,h) #{{{
         tdoc = XML::Smart.string(tdoc)
         tdoc.register_namespace 'desc', 'http://cpee.org/ns/description/1.0'
         tdoc.register_namespace 'prop', 'http://cpee.org/ns/properties/2.0'
@@ -59,20 +69,17 @@ module CPEE
         if data = p.find{ |e| e.name == 'attributes' }&.value
           add_to_testset(tdoc,'attributes',data)
         end
+        data = {}
+        data['parent_instance']            = h['CPEE_INSTANCE']      if h['CPEE_INSTANCE']
+        data['parent_instance_uuid']       = h['CPEE_INSTANCE_UUID'] if h['CPEE_INSTANCE_UUID']
+        data['parent_instance_model']      = h['CPEE_ATTR_INFO']     if h['CPEE_ATTR_INFO']
+        data['parent_instance_task_id']    = h['CPEE_ACTIVITY']      if h['CPEE_ACTIVITY']
+        data['parent_instance_task_label'] = h['CPEE_LABEL']         if h['CPEE_LABEL']
+        add_to_testset(tdoc,'attributes',data)
         tdoc
-      end
-
-      def load_testset(doc,cpee,name=nil,customization=nil) #{{{
-        ins = -1
-        uuid = nil
+      end #}}}
 
-        srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
-        res = srv.resource('/')
-        if name
-          doc.find('/*/prop:attributes/prop:info').each do |e|
-            e.text = name
-          end
-        end
+      def customize_testset(customization,doc) #{{{
         if customization && !customization.empty?
           JSON.parse(customization).each do |e|
             begin
@@ -90,125 +97,78 @@ module CPEE
             end
           end
         end
+      end   #}}}
 
-        status, response, headers = res.post Riddl::Parameter::Simple.new('info',doc.find('string(/*/prop:attributes/prop:info)'))
-
-        if status == 200
-          ins = response.first.value
-          uuid = headers['CPEE_INSTANCE_UUID']
+      def add_waiting_to_testset(behavior,cb,doc,selfurl) #{{{
+        ckb = nil
+        if behavior =~ /^wait/
+          condition = behavior.match(/_([^_]+)_/)&.[](1) || 'finished'
 
-          inp = XML::Smart::string('<properties xmlns="http://cpee.org/ns/properties/2.0"/>')
-          inp.register_namespace 'prop', 'http://cpee.org/ns/properties/2.0'
-          %w{executionhandler positions dataelements endpoints attributes description transformation}.each do |item|
-            ele = doc.find("/*/prop:#{item}")
-            inp.root.add(ele.first) if ele.any?
+          if cb
+            cbk = 'instantiation_' + Digest::MD5.hexdigest(Kernel::rand().to_s)
+            n = doc.find('/*/sub:subscriptions') rescue []
+            if (n.empty?)
+              n = doc.root.add('subscriptions')
+              n.namespaces.add(nil,'http://riddl.org/ns/common-patterns/notifications-producer/2.0')
+            else
+              n = n.first
+            end
+            n.append('subscription', :id => cbk, :url => File.join(selfurl,'callback',cbk))
+             .append('topic', :id => 'state')
+             .append('event','change')
           end
+        end
+        [cbk, condition]
+      end   #}}}
 
-          res = srv.resource("/#{ins}/properties").put Riddl::Parameter::Complex.new('properties','application/xml',inp.to_s)
-          # TODO new versions
-          doc.find('/*/sub:subscriptions/sub:subscription').each do |s|
-            parts = []
-            if id = s.attributes['id']
-              parts << Riddl::Parameter::Simple.new('id', id)
-            end
-            parts << Riddl::Parameter::Simple.new('url', s.attributes['url'])
-            s.find('sub:topic').each do |t|
-              if (evs = t.find('sub:event').map{ |e| e.text }.join(',')).length > 0
-                parts <<  Riddl::Parameter::Simple.new('topic', t.attributes['id'])
-                parts <<  Riddl::Parameter::Simple.new('events', evs)
-              end
-              if (vos = t.find('sub:vote').map{ |e| e.text }.join(',')).length > 0
-                parts <<  Riddl::Parameter::Simple.new('topic', t.attributes['id'])
-                parts <<  Riddl::Parameter::Simple.new('votes', vos)
-              end
-            end
-            status,body = Riddl::Client::new(cpee+ins+'/notifications/subscriptions/').post parts
-          end rescue nil # in case just no subs are there
+      def add_running_to_testset(behavior,doc) #{{{
+        if behavior =~ /_running$/
+          if ((doc.find('/*/prop:state')).empty?)
+            doc.root.append('prop:state','running')
+          else
+            doc.find('/*/prop:state').first.text = 'running'
+          end
         end
-        [ins, uuid]
-      end #}}}
-      private :load_testset
-      def handle_waiting(cpee,instance,uuid,behavior,selfurl,cblist) #{{{
-        if behavior =~ /^wait/
-          condition = behavior.match(/_([^_]+)_/)&.[](1) || 'finished'
-          cb = @h['CPEE_CALLBACK']
+      end   #}}}
 
-          if cb
-            cbk = SecureRandom.uuid
-            srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
-            status, response = srv.resource("/#{instance}/notifications/subscriptions/").post [
-              Riddl::Parameter::Simple.new('url',File.join(selfurl,'callback',cbk)),
-              Riddl::Parameter::Simple.new('topic','state'),
-              Riddl::Parameter::Simple.new('events','change')
-            ]
+      def instantiate_testset(cpee,doc,behavior,cblist,cbk,cb,condition) #{{{
+        status, res, headers = Riddl::Client.new(cpee).post Riddl::Parameter::Complex.new('testset', 'application/xml', doc.to_s)
+        if status == 200
+          instance = res.first.value
+          uuid = headers['CPEE_INSTANCE_UUID']
+
+          if cbk
             cblist.rpush(cbk, cb)
             cblist.rpush(cbk, condition)
             cblist.rpush(cbk, instance)
             cblist.rpush(cbk, uuid)
             cblist.rpush(cbk, File.join(cpee,instance))
+            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
           end
+
+          send = {
+            'CPEE-INSTANCE' => instance,
+            'CPEE-INSTANCE-URL' => File.join(cpee,instance),
+            'CPEE-INSTANCE-UUID' => uuid,
+            'CPEE-BEHAVIOR' => behavior
+          }
+          @headers << Riddl::Header.new('CPEE-INSTANTIATION',JSON::generate(send))
+          Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
+        else
+          @status = 500
         end
       end #}}}
-      private :handle_waiting
-      def handle_starting(cpee,instance,behavior) #{{{
-        if behavior =~ /_running$/
-          sleep 0.5
-          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
-          res = srv.resource("/#{instance}/properties/state")
-          status, response = res.put [
-            Riddl::Parameter::Simple.new('value','running')
-          ]
-        end
-      end #}}}
-      private :handle_starting
-      def handle_data(cpee,instance,data) #{{{
-        if data && !data.empty?
-          content = XML::Smart.string('<dataelements xmlns="http://cpee.org/ns/properties/2.0"/>')
-          JSON::parse(data).each do |k,v|
-            content.root.add(k,CPEE::ValueHelper::generate(v))
-          end
-          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
-          res = srv.resource("/#{instance}/properties/dataelements/")
-          status, response = res.patch [
-            Riddl::Parameter::Complex.new('dataelements','text/xml',content.to_s)
-          ]
-        end rescue nil
-      end #}}}
-      def handle_endpoints(cpee,instance,data) #{{{
-        if data && !data.empty?
-          content = XML::Smart.string('<endpoints xmlns="http://cpee.org/ns/properties/2.0"/>')
-          JSON::parse(data).each do |k,v|
-            content.root.add(k,v)
-          end
-          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
-          res = srv.resource("/#{instance}/properties/endpoints/")
-          status, response = res.patch [
-            Riddl::Parameter::Complex.new('endpoints','text/xml',content.to_s)
-          ]
-        end rescue nil
-      end #}}}
-      def handle_attributes(cpee,instance,data) #{{{
-        if data && !data.empty?
-          content = XML::Smart.string('<attributes xmlns="http://cpee.org/ns/properties/2.0"/>')
-          JSON::parse(data).each do |k,v|
-            content.root.add(k,v)
-          end
-          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
-          res = srv.resource("/#{instance}/properties/attributes/")
-          status, response = res.patch [
-            Riddl::Parameter::Complex.new('attributes','text/xml',content.to_s)
-          ]
-        end rescue nil
-      end #}}}
+
     end #}}}
 
     class InstantiateGit < Riddl::Implementation #{{{
       include Helpers
 
       def response
-        cpee = @h['X_CPEE'] || @a[0]
-        selfurl = @a[1]
-        cblist = @a[2]
+        cpee     = @h['X_CPEE'] || @a[0]
+        selfurl  = @a[1]
+        cblist   = @a[2]
+        behavior = @p[0].value
 
         status, res = Riddl::Client.new(File.join(@p[1].value,'raw',@p[2].value,@p[3].value).gsub(/ /,'%20')).get
         tdoc = if status >= 200 && status < 300
@@ -218,27 +178,12 @@ module CPEE
         end
         customization = @p.find{ |e| e.name == 'customization' }&.value
 
-        tdoc = augment_testset(tdoc,@p)
-        if (instance, uuid = load_testset(tdoc,cpee,nil,customization)).first == -1
-          @status = 500
-        else
-          EM.defer do
-            handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
-            handle_starting cpee, instance, @p[0].value
-          end
+        doc = augment_testset(tdoc,@p,@h)
+        customize_testset(customization,doc)
+        cbk, condition = add_waiting_to_testset(behavior,@h['CPEE_CALLBACK'],doc,selfurl)
+        add_running_to_testset(behavior,doc)
 
-          send = {
-            'CPEE-INSTANCE' => instance,
-            'CPEE-INSTANCE-URL' => File.join(cpee,instance),
-            'CPEE-INSTANCE-UUID' => uuid,
-            'CPEE-BEHAVIOR' => @p[0].value
-          }
-          if @p[0].value =~ /^wait/
-            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
-          end
-          @headers << Riddl::Header.new('CPEE-INSTANTIATION',JSON::generate(send))
-          Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
-        end
+        instantiate_testset(cpee,doc,@p[0].value,cblist,cbk,@h['CPEE_CALLBACK'],condition)
       end
     end  #}}}
 
@@ -246,10 +191,11 @@ module CPEE
       include Helpers
 
       def response
-        cpee    = @h['X_CPEE'] || @a[0]
-        selfurl = @a[1]
-        cblist  = @a[2]
-        name    = @a[3] ? @p.shift.value : nil
+        cpee     = @h['X_CPEE'] || @a[0]
+        selfurl  = @a[1]
+        cblist   = @a[2]
+        name     = @a[3] ? @p.shift.value : nil
+        behavior = @p[0].value
 
         status, res = Riddl::Client.new(@p[1].value.gsub(/ /,'%20')).get
         tdoc = if status >= 200 && status < 300
@@ -259,29 +205,14 @@ module CPEE
         end
         customization = @p.find{ |e| e.name == 'customization' }&.value
 
-        tdoc = augment_testset(tdoc,@p)
-        if (instance, uuid = load_testset(tdoc,cpee,name,customization)).first == -1
-          @status = 500
-        else
-          EM.defer do
-            handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
-            handle_starting cpee, instance, @p[0].value
-          end
+        doc = augment_testset(tdoc,@p,@h)
+        customize_testset(customization,doc)
+        cbk, condition = add_waiting_to_testset(behavior,@h['CPEE_CALLBACK'],doc,selfurl)
+        add_running_to_testset(behavior,doc)
 
-          send = {
-            'CPEE-INSTANCE' => instance,
-            'CPEE-INSTANCE-URL' => File.join(cpee,instance),
-            'CPEE-INSTANCE-UUID' => uuid,
-            'CPEE-BEHAVIOR' => @p[0].value
-          }
-          if @p[0].value =~ /^wait/
-            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
-          end
-          @headers << Riddl::Header.new('CPEE-INSTANTIATION',JSON::generate(send))
-          Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
-        end
+        instantiate_testset(cpee,doc,@p[0].value,cblist,cbk,@h['CPEE_CALLBACK'],condition)
       end
-    end  #}}}
+     end  #}}}
 
     class InstantiateXML < Riddl::Implementation #{{{
       include Helpers
@@ -298,62 +229,11 @@ module CPEE
           @p[data].value.read
         end
 
-        tdoc = augment_testset(tdoc,@p)
-        if (instance, uuid = load_testset(tdoc,cpee)).first == -1
-          @status = 500
-        else
-          EM.defer do
-            handle_waiting cpee, instance, uuid, behavior, selfurl, cblist
-            handle_starting cpee, instance, behavior
-          end
-
-          send = {
-            'CPEE-INSTANCE' => instance,
-            'CPEE-INSTANCE-URL' => File.join(cpee,instance),
-            'CPEE-INSTANCE-UUID' => uuid,
-            'CPEE-BEHAVIOR' => behavior
-          }
-          if @p[0].value =~ /^wait/
-            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
-          end
-          Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
-        end
-      end
-    end #}}}
-
-    class HandleInstance < Riddl::Implementation #{{{
-      include Helpers
-
-      def response
-        cpee     = @h['X_CPEE'] || @a[0]
-        selfurl  = @a[1]
-        cblist   = @a[2]
-        instance = @p[1].value
-
-        srv = Riddl::Client.new(cpee)
-        res = srv.resource("/#{instance}/properties/attributes/uuid/")
-        status, response = res.get
+        doc = augment_testset(tdoc,@p,@h)
+        cbk, condition = add_waiting_to_testset(behavior,@h['CPEE_CALLBACK'],doc,selfurl)
+        add_running_to_testset(behavior,doc)
 
-        if status >= 200 && status < 300
-          uuid = response.first.value
-          handle_data cpee, instance, @p[2]&.value
-          handle_waiting cpee, instance, uuid, @p[0].value, selfurl, cblist
-          handle_starting cpee, instance, @p[0].value
-
-          send = {
-            'CPEE-INSTANCE' => instance,
-            'CPEE-INSTANCE-URL' => File.join(cpee,instance),
-            'CPEE-INSTANCE-UUID' => uuid,
-            'CPEE-BEHAVIOR' => @p[0].value
-          }
-
-          if @p[0].value =~ /^wait/
-            @headers << Riddl::Header.new('CPEE-CALLBACK','true')
-          end
-          Riddl::Parameter::Complex.new('instance','application/json',JSON::generate(send))
-        else
-          @status = 500
-        end
+        instantiate_testset(cpee,doc,@p[0].value,cblist,cbk,@h['CPEE_CALLBACK'],condition)
       end
     end #}}}
 
@@ -371,6 +251,8 @@ module CPEE
         key = @r.last
         cb, condition, instance, uuid, instance_url = cblist.lrange(key,0,-1)
 
+        return if cb.nil?
+
         cpee = File.dirname(instance_url)
 
         send = {
@@ -382,7 +264,7 @@ module CPEE
 
         if notification['content']['state'] == condition
           cblist.del(key)
-          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
+          srv = Riddl::Client.new(cpee)
           res = srv.resource("/#{instance}/properties/dataelements")
           status, response = res.get
           if status >= 200 && status < 300
@@ -400,33 +282,51 @@ module CPEE
           ]
         end
       end
+
     end #}}}
 
     def self::implementation(opts)
       opts[:cpee]       ||= 'http://localhost:9298/'
-      opts[:redis_path] ||= '/tmp/redis.sock'
-      opts[:redis_db]   ||= 14
       opts[:self]       ||= "http#{opts[:secure] ? 's' : ''}://#{opts[:host]}:#{opts[:port]}/"
-      opts[:cblist]       = Redis.new(path: opts[:redis_path], db: opts[:redis_db])
+
+      opts[:watchdog_frequency]         ||= 7
+      opts[:watchdog_start_off]         ||= false
+
+      ### set redis_cmd to nil if you want to do global
+      ### at least redis_path or redis_url and redis_db have to be set if you do global
+      opts[:redis_path]                 ||= 'redis.sock' # use e.g. /tmp/redis.sock for global stuff. Look it up in your redis config
+      opts[:redis_db]                   ||= 0
+      ### optional redis stuff
+      opts[:redis_url]                  ||= nil
+      opts[:redis_cmd]                  ||= 'redis-server --port 0 --unixsocket #redis_path# --unixsocketperm 600 --pidfile #redis_pid# --dir #redis_db_dir# --dbfilename #redis_db_name# --databases 1 --save 900 1 --save 300 10 --save 60 10000 --rdbcompression yes --daemonize yes'
+      opts[:redis_pid]                  ||= 'redis.pid' # use e.g. /var/run/redis.pid if you do global. Look it up in your redis config
+      opts[:redis_db_name]              ||= 'redis.rdb' # use e.g. /var/lib/redis.rdb for global stuff. Look it up in your redis config
+
+      CPEE::redis_connect opts, 'Instantiation'
+
       Proc.new do
+        parallel do
+          CPEE::Instantiation::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db])
+          EM.add_periodic_timer(opts[:watchdog_frequency]) do ### start services
+            CPEE::Instantiation::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db])
+          end
+        end
+
         on resource do
           run InstantiateXML, opts[:cpee], true if post 'xmlsimple'
           on resource 'xml' do
             run InstantiateXML, opts[:cpee], false if post 'xml'
           end
           on resource 'url' do
-            run InstantiateUrl, opts[:cpee], opts[:self], opts[:cblist], false if post 'url'
-            run InstantiateUrl, opts[:cpee], opts[:self], opts[:cblist], true  if post 'url_info'
+            run InstantiateUrl, opts[:cpee], opts[:self], opts[:redis], false if post 'url'
+            run InstantiateUrl, opts[:cpee], opts[:self], opts[:redis], true  if post 'url_info'
           end
           on resource 'git' do
-            run InstantiateGit, opts[:cpee], opts[:self], opts[:cblist] if post 'git'
-          end
-          on resource 'instance' do
-            run HandleInstance, opts[:cpee], opts[:self], opts[:cblist] if post 'instance'
+            run InstantiateGit, opts[:cpee], opts[:self], opts[:redis] if post 'git'
           end
           on resource 'callback' do
             on resource do
-              run ContinueTask, opts[:cpee], opts[:cblist] if post
+              run ContinueTask, opts[:cpee], opts[:redis] if post
             end
           end
         end

data/lib/cpee-instantiation/instantiation.xml

@@ -1,3 +1,21 @@
+<!--
+  This file is part of CPEE-INSTANTIATION.
+
+  CPEE-INSTANTIATION 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-INSTANTIATION 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-INSTANTIATION (file LICENSE in the main directory).  If not,
+  see <http://www.gnu.org/licenses/>.
+-->
+
 <description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
   <message name="xmlsimple">
     <parameter name="xml" mimetype="*/xml"/>
@@ -118,6 +136,9 @@
       <post in="url" out="result"/>
       <post in="url_info" out="result"/>
     </resource>
+    <resource relative="nurl">
+      <post in="url" out="result"/>
+    </resource>
     <resource relative="git">
       <post in="git" out="result"/>
     </resource>

data/lib/cpee-instantiation/utils.rb

@@ -0,0 +1,52 @@
+# This file is part of CPEE-INSTANTIATION
+#
+# CPEE-INSTANTIATION 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-INSTANTIATION 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-INSTANTIATION (file LICENSE in the main directory). If not, see
+# <http://www.gnu.org/licenses/>.
+
+module CPEE
+  module Instantiation
+
+    def self::watch_services(watchdog_start_off,url,path,db)
+      return if watchdog_start_off
+      EM.defer do
+        Dir[File.join(__dir__,'routing','*.rb')].each do |s|
+          s = s.sub(/\.rb$/,'')
+          pid = (File.read(s + '.pid').to_i rescue nil)
+          cmd = if url.nil?
+            "-p \"#{path}\" -d #{db} restart"
+          else
+            "-u \"#{url}\" -d #{db} restart"
+          end
+          if (pid.nil? || !(Process.kill(0, pid) rescue false)) && !File.exist?(s + '.lock')
+            system "#{s}.rb " + cmd + " 1>/dev/null 2>&1"
+            puts "➡ Service #{File.basename(s)} (-v #{cmd}) started ..."
+          end
+        end
+      end
+    end
+
+    def self::cleanup_services(watchdog_start_off)
+      return if watchdog_start_off
+      Dir[File.join(__dir__,'routing','*.rb')].each do |s|
+        s = s.sub(/\.rb$/,'')
+        pid = (File.read(s + '.pid').to_i rescue nil)
+        if !pid.nil? || (Process.kill(0, pid) rescue false)
+          system "#{s}.rb stop 1>/dev/null 2>&1"
+          puts "➡ Service #{File.basename(s,'.rb')} stopped ..."
+        end
+      end
+    end
+
+  end
+end

data/server/instantiation

@@ -1,4 +1,21 @@
 #!/usr/bin/ruby
+#
+# This file is part of CPEE-INSTANTIATION.
+#
+# CPEE-INSTANTIATION 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-INSTANTIATION 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-INSTANTIATION (file LICENSE in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
 require 'rubygems'
 require 'cpee-instantiation/instantiation'
 

data/tools/cpee-instantiation

@@ -1,4 +1,21 @@
 #!/usr/bin/ruby
+#
+# This file is part of CPEE-INSTANTIATION.
+#
+# CPEE-INSTANTIATION 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-INSTANTIATION 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-INSTANTIATION (file LICENSE in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
 curpath = __dir__
 require 'rubygems'
 require 'optparse'
@@ -26,24 +43,28 @@ end
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
   opt.summary_width = 15
-  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [DIR]\n"
+  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] new DIR\n"
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
 	opt.on("")
-  opt.on(wrap("[DIR]             scaffolds a sample instantiation service. Post a testset to a model to keep going in one operation."))
+  opt.on(wrap("[new DIR]         scaffolds a sample instantiation service. Post a testset to a model to keep going in one operation."))
   opt.parse!
 }
-if (ARGV.length != 1)
+if (ARGV.length <  2) ||
+   (ARGV.length == 2  && !(%w(new).include?(ARGV[0]))) ||
+   (ARGV.length >  2)
   puts ARGV.options
   exit
-else
-  p1 = ARGV[0]
 end
+command = ARGV[0]
+p1      = ARGV[1]
 
-insta = "#{curpath}/../server/"
-if !File.exist?(p1)
-  FileUtils.cp_r(insta,p1)
-else
-  FileUtils.cp_r(Dir.glob(File.join(insta,'*')).delete_if{|e| e =~ /\.conf/ },p1,remove_destination: true)
-  puts 'Directory already exists, updating ...'
+if command == 'new'
+  insta = "#{curpath}/../server/"
+  if !File.exist?(p1)
+    FileUtils.cp_r(insta,p1)
+  else
+    FileUtils.cp_r(Dir.glob(File.join(insta,'*')).delete_if{|e| e =~ /\.conf/ },p1,remove_destination: true)
+    puts 'Directory already exists, updating ...'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.1.5
 platform: ruby
 authors:
 - Juergen eTM Mangler
-autorequire:
+- Heinrich Fenkart
 bindir: tools
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: cpee
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.74
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.74
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -87,13 +87,13 @@ files:
 - cpee-instantiation.gemspec
 - lib/cpee-instantiation/instantiation.rb
 - lib/cpee-instantiation/instantiation.xml
+- lib/cpee-instantiation/utils.rb
 - server/instantiation
 - tools/cpee-instantiation
 homepage: http://cpee.org/
 licenses:
-- LGPL-3.0
+- LGPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Subprocess instantiation service for the cloud process execution engine (cpee.org)
 test_files: []