onedrb 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eab24c21c8453a726e65959c8b47f6074d08bfee91d25860f23935b7c20831a0
-  data.tar.gz: c40e0aa09c94232e478c826a36df32585b17dc221c1a9ca5d860ff245f8c24b1
+  metadata.gz: e484349df963bdb3ab1dafb85fa5697dc9460c330d1f863e8ed723ca941e8fcc
+  data.tar.gz: c58a17ce4eddc48d611115ae13d5dbd97fddd983c3e2ca537b478f4029f663d3
 SHA512:
-  metadata.gz: 218e690d7e795f49fd2f09baa8fd86399bd0d6192cd14cce2db370657e5422066719fd18ea7cb0f1adfa7bfb5abaa4002c2b5b62be43ba3abc74cc07adb1ddbf
-  data.tar.gz: 5146e2915e49b03dede0d04b0ea84d426b7a5150b01d719ff65a6da0b48b857221c6dfdbb9a007146e7ae5d963f8d03485e5004db26d709806712f0f3d542dd8
+  metadata.gz: 96d256270dbc280f69f0e9873787c608132f9ebf45cf20bd06be1a69a2845080e2bd2177d8b35fdce8ca344d6e0edb50c5bf5e3893c6941600c6ec1a3de1fe09
+  data.tar.gz: 4c119540720a72be369dec14c3156fa9f96c849b93df6c49229c14d838cb93846058496d53621a64242b72176ecf8ce800f657339f11c8221affa4f3fc0e373d

data/lib/onedrb.rb

@@ -6,6 +6,60 @@
 
 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
@@ -17,21 +71,21 @@ module OneDrb
   class Server
     using ColouredText
 
-    def initialize(host: '127.0.0.1', port: (49152..65535).to_a.sample.to_s, 
+    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 
+        @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
@@ -50,7 +104,7 @@ module OneDrb
 
   class Client
     using ColouredText
-  
+
     def initialize(host: '127.0.0.1', port: nil)
 
       DRb.start_service
@@ -59,13 +113,284 @@ module OneDrb
 
       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)
-      @obj.send(sym, *args)
+
+      if args.last.is_a?(Hash) then
+        @obj.send(sym, *args[0..-2], **args.last)
+      else
+        @obj.send(sym, *args)
+      end
+
     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
+#       hosted dynamically.
+
+
+class ServiceMgr
+
+  def initialize()
+    @services = {}
+  end
+
+
+  def call(service, methodname, *a)
+
+    proc1 = @services[service.to_sym].method(methodname.to_sym)
+    a.last.is_a?(Hash) ? proc1.call(*a[0..-2], **a.last) : proc1.call(*a)
+
+  end
+
+  def [](key)
+    @services[key]
+  end
+
+  def []=(key, value)
+    @services[key] = value
+
+    define_singleton_method key do
+      @services[key]
+    end
+  end
+
+  def services()
+    @services.map do |key, object|
+      [key, object.public_methods - Object.public_methods]
+    end
+  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: ServiceMgr.new, 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|
+
+        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
+
+    # Makes a remote call in 1 line of code using a URI
+    # 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 method_missing(sym, *args)
+
+      puts '@obj.class: ' + @obj.class.inspect
+
+      if args.last.is_a?(Hash) then
+        @obj.send(sym, *args[0..-2], **args.last)
+      else
+        @obj.send(sym, *args)
+      end
+
+    end
+
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onedrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,54 +11,74 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwODEzMTkwMTM0WhcN
-  MjAwODEyMTkwMTM0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDwerdP
-  aVKeP5RVh9q4v/9L1K61jr2S4/uirJ64zby8+phkUyRSUj5qDKv3revhEqaxFg5I
-  ujs2zQNpwrVrNz5fl/adplygVNFF6Pa4KJq+IpnhafhRXCpCEBkmU7M+XzLVgipM
-  4AHbrRG3jCxevFK7bBSqEA+/snRhcBq9gPSnIv0opaVnugfH+KaCXc8S9CEkbqfW
-  Xm9nf1eQ4Vr0hkL/LsXfxs3WlNL3k/m1PZ+v0wCnyPYQDJfudGGvoK3c5fF/UzEW
-  hRjiby6zjBw4E2NutxAwvnCMcCQ2ASFoiu+TP9CVn9c7IxIQ4vo1R+HFeibG4qR6
-  +eJ6Z3g5EazzjnrT8qfnuJJ/zP/JNppKZHAhDjYMzW65q+oePHLcRw/VgX0tSLpC
-  pMYfcbi5UJGJR01wZ1RoE07ku+aG8Ke3oslkz/bCtNB69UISaascyxauSDuFIX8n
-  Ft4fk8jo8Y/2bBjYgXiCVcPpA6orR342+H/WEs8T2lWoJewr5GGzn2/T280CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUTQ8/qr6P
-  uacX1pIgbur6QRY1HTUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwNDIyMTkyNjA4WhcN
+  MjMwNDIyMTkyNjA4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDLwpuN
+  87Qes2zJkZyL5GageArGWLwP+X6ZK1sgfpoQiL9XoKDod45sOuRdnX+UckRngmGs
+  8/cCg1nlE7FzFefwi7SkTF1BdQkagiSAtwBja0ikad/LBICfcnX1QlvyK0B0knxI
+  1igPSFeUXOKg2Jf3GIgVnjjIq2L9cVBqveRU3ffuCsM3sh+dESExqx53ZsSK3K9B
+  UiRujNSXrZpfF1IrPyXKjH5vZ5cP4Rhb4G+Ml19F0R5Wf5WLNsiTosAooFi+ywYv
+  NzjA+p2TgNFCEjKvImMdD8uSFC3UaSGuG5RDFfluGyI9ogofdGMn/gXa2wGa008w
+  KZqxqi9naZdwrIbLt2gDKyUtbL7/ceUBHkJqhk5neBZM7TkfaJBcKwtB4FsdZ7MK
+  mBBAp7GW7k+ruQKPdZwJofO6T4TAJABNxDhVOlfQG/OpO4qY7MBiPUfBkmA4vjKf
+  xoFvE05KcGuZb0hWrSiM9urFs29GGR100duy4HmJTTBNvhYCsd33ykNTAxkCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUrh/OL4DZ
+  7kB+QntxOWXmDhPz/qgwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAnb2fmshYrAcUHgEUdqetowCWZJxJ9zzR8xslCAX4
-  zeJKOgOVgGWcoUUgsDotW5hK2pafZj8fU749CbaCTj1QqT6d4D22gKtP0TNzQ4/e
-  JLXwO40Ot4px4D4dSN318G8y6uoPv/4ArlbccXlIOlcddS2fYWSRfLQCqhWFMYj4
-  0wpw6Zjjmrb5PlF0hMDvm3Te2JgebdnAXG4I0IJkuMdMFIbDG+q65WpsMug4CpLu
-  DZT2BYXoaz72J9wLcN7BqLsOP7uL6GnaswpM4BUaq9sZWXS/B47KNE0PAZy4IT20
-  0n3EApJpibKRBZJR/L4WsuxyekLleMmVgWXS1bqgJUsmSIbUcjB+atazO/mx1beT
-  cu8vU4iTC0XJWbLmzTZt9FH9tbulje2nlE+Pt4MjVWAZivWRkXlRsfy8YFytzLZg
-  FbeYaP5rMZ9xxTvO5hDjh3BEOwHK9GXxMPsakyl7b4sUHJKEw5wtyjkYsMwrJmj9
-  XkF/ReqRKodw4HNu5DG4wj6O
+  BgkqhkiG9w0BAQsFAAOCAYEANcUl8rOFNRz6Pk3OarkDKv+0VAZtc+YR6rfFj7Ws
+  OH9f1eIEmyyDQBTN17VYXLvI3FlewJcbkr5u9DV62W80cbzkC27nSU6kicaAh7C3
+  cqgGd084jS7DF8+7RhVO5QBFKwmYCCr5yseUmIW5KtPcR0ey36X3PWHPQfHap1h5
+  vp6PdlpxEON8RhJ2UVUIPFFTr3Y8TYu0ya7Q0E7oPqor6tuJGtRsT3HMEGT5/KPd
+  ccHI65ygp/STtdROe5WVPmU+PafUoCRtGUHR6m5Petdsy7xDsPRW7HfGb95BFj6t
+  m/Wdnbmg9hmU6coqbogGGnS+4SvRuRlBRI6NeGB5/p6/zj7snat1hdAp9kPyakBm
+  jjhW5l95yuhsvvVMD684GS3sVVSbOTCtbZpvYDn9IoG0mutmqFU6Y2jMBHO/aZd9
+  lK7OtCGPauDHVuIWDW0EnHb+MMBt6F5SqC+PSy9iOzs4zAWkJMFp86MOEK2yrfnO
+  /ghrVtneK08DqmYOaive8I6P
   -----END CERTIFICATE-----
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: app-mgr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        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: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Makes it convenient to make an object remotely accessible.