onedrb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1715575559f96238261a54678e475a056223491a3ff7c610a5df823001fe454c
-  data.tar.gz: 66acb7de842732715d02c287c753d1221d2963631b6bc2edd3ca842eecd88665
+  metadata.gz: e484349df963bdb3ab1dafb85fa5697dc9460c330d1f863e8ed723ca941e8fcc
+  data.tar.gz: c58a17ce4eddc48d611115ae13d5dbd97fddd983c3e2ca537b478f4029f663d3
 SHA512:
-  metadata.gz: befc1ab68c1a9ede94f24415faeeb3fbbfcfc044edd3e73cdda361f3fa8cf77d309158804aecc5c2b1f995ee81b7bd382dbe359f798c24bfa222f9422479cff3
-  data.tar.gz: a83d5eb21b2270e5e51c1c8918fffe1b510c43237076f137dbe8d788a5e6394f964bbd10db08d3be4abde3f8e0551766b280c3ba27e6cb94b03fcb579cb03723
+  metadata.gz: 96d256270dbc280f69f0e9873787c608132f9ebf45cf20bd06be1a69a2845080e2bd2177d8b35fdce8ca344d6e0edb50c5bf5e3893c6941600c6ec1a3de1fe09
+  data.tar.gz: 4c119540720a72be369dec14c3156fa9f96c849b93df6c49229c14d838cb93846058496d53621a64242b72176ecf8ce800f657339f11c8221affa4f3fc0e373d

data/lib/onedrb.rb

@@ -6,6 +6,215 @@
 
 require 'drb'
 require 'c32'
+require 'app-mgr'
+
+
+# Note: The Server object can also use a default ServiceMgr object.
+#       Which allows multiple services (user-defined objects) to be
+#       hosted dynamically.
+# OneDrb recommended port: 57844 (as this port is recognised by the RSC gem)
+#
+class ServiceMgr < AppMgr
+
+  def initialize(rsf: nil, debug: false)
+    super(rsf: rsf, type: 'service', debug: debug)
+    @services = @app
+  end
+
+
+  def call(service, methodname, *a)
+
+    return @services[service.to_sym][:running] unless methodname
+    proc1 = @services[service.to_sym][:running].method(methodname.to_sym)
+    a.last.is_a?(Hash) ? proc1.call(*a[0..-2], **a.last) : proc1.call(*a)
+
+  end
+
+
+  # OneDRb version 2; Allows multiple user-defined objects to be
+  #                   served from 1 DRb service
+  #
+  # not used by any client, but may be in future
+  #
+  #def odrb2?()
+  #  true
+  #end
+
+  def services()
+    @services.map do |key, object|
+      next unless object[:running]
+      [key, object[:running].public_methods - Object.public_methods]
+    end.compact
+  end
+
+  def stop(service)
+    super(service).sub('app', 'service')
+  end
+
+  def unload(service)
+    super(service).sub('app', 'service')
+  end
+
+  def method_missing(sym, *args)
+    #puts 'servicemgr sym: ' + sym.inspect
+    #puts 'args: ' + args.inspect
+  end
+end
+
+
+class OneDrbError < Exception
+end
+
+
+module OneDrb
+
+  class Server
+    using ColouredText
+
+    def initialize(host: '127.0.0.1', port: (49152..65535).to_a.sample.to_s,
+                    obj: nil, log: nil)
+
+      log.info self.class.to_s + '/initialize: active' if log
+
+      @host, @port, @log = host, port, log
+
+      if obj then
+        @obj = obj
+      else
+        msg = "No object supplied!".error
+        puts msg
+        raise OneDrbError, msg
+      end
+
+      log.info self.class.to_s +'/initialize: completed' if log
+
+    end
+
+    def start()
+
+      @log.info self.class.to_s +'/start: active' if @log
+      puts (self.class.to_s + " running on port " + @port).info
+      DRb.start_service "druby://#{@host}:#{@port}", @obj
+      DRb.thread.join
+
+    end
+
+  end
+
+
+  class Client
+    using ColouredText
+
+    def initialize(host: '127.0.0.1', port: nil)
+
+      DRb.start_service
+
+      puts 'no port supplied'.error unless port
+
+      puts ('client connecting to port ' + port).info
+      @obj = DRbObject.new_with_uri("druby://#{host}:#{port}")
+      parent = self
+      @obj&.services.each do |name, methods|
+
+        make_class(name, methods)
+
+      end
+
+    end
+
+    # Makes a remote call in 1 line of code using a URI
+    # Only available when using the ServiceMgr as the server object;
+    #
+    # e.g. OneDrb::Client.call 'odrb://clara.home/fun/go?arg=James&age=49'
+    #
+    def self.call(s, port: nil)
+
+      r = s.match(/^odrb:\/\/([^\/]+)\/([^\/]+)\/([^\?]+)\??(.*)/).captures
+
+      rawhostname, service, methodname, rawargs = r
+      hostname, rawport = rawhostname.split(':',2)
+      port ||= rawport
+
+      rawargs2 = rawargs&.split('&').map {|x| x.split('=')}
+
+      a1, a2 = rawargs2.partition do |field, value|
+        field.downcase.to_sym == :arg
+      end
+
+      h = a2.map {|k,v| [k.to_sym, v]}.to_h
+      a = a1.map(&:last)
+
+      client = OneDrb::Client.new host: hostname, port: port
+
+      if h.any? then
+
+        if a.any? then
+          client.call service.to_sym, methodname.to_sym, *a, **h
+        else
+          client.call service.to_sym, methodname.to_sym, **h
+        end
+
+      elsif a.any?
+
+        client.call service.to_sym, methodname.to_sym, *a
+
+      else
+
+        client.call service.to_sym, methodname.to_sym
+
+      end
+
+    end
+
+    def remote()
+      @obj
+    end
+
+    def restart(service)
+
+      return unless @obj.respond_to? :services
+
+      @obj.restart(service)
+      found = @obj.services.assoc(service)
+      make_class(*found) if found.any?
+    end
+
+    def method_missing(sym, *args)
+
+      if args.last.is_a?(Hash) then
+        @obj.send(sym, *args[0..-2], **args.last)
+      else
+        @obj.send(sym, *args)
+      end
+
+    end
+
+    private
+
+    def make_class(name, methods)
+
+      class_name = name.capitalize
+      klass = Object.const_set(class_name,Class.new)
+
+      klass.class_eval do
+        methods.each do |method_name|
+          define_method method_name do |*args|
+            parent.call name, method_name, *args
+          end
+        end
+      end
+
+      define_singleton_method name do
+        klass.new
+      end
+
+    end
+
+  end
+
+end
+
+
 
 # Note: The Server object can also use a default ServiceMgr object.
 #       Which allows multiple services (user-defined objects) to be

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onedrb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   lK7OtCGPauDHVuIWDW0EnHb+MMBt6F5SqC+PSy9iOzs4zAWkJMFp86MOEK2yrfnO
   /ghrVtneK08DqmYOaive8I6P
   -----END CERTIFICATE-----
-date: 2022-04-23 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32
@@ -57,6 +57,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: app-mgr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 description: 
 email: digital.robertson@gmail.com
 executables: []