opal-drb 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e13b968103c3abf0b12a8470ed92fd1752383cce
-  data.tar.gz: 12c63e4be210d0b344c4f0372194ad4032c89eab
+  metadata.gz: c71959cd30828a5ce4f4e195aa305cc6b39d0ee8
+  data.tar.gz: b92b60c638453174af654dfefa2a56a5f0e76971
 SHA512:
-  metadata.gz: 41caf09bea96de9e666a3471c12c08205d22e2f677d6e02a18d39731e1a3c107ec9ff21ef68b40489ae53ed75f8f0f8e75cf1f2fec4a5bc75286c400b991b324
-  data.tar.gz: f558277c7d4aa49f464167be145df963a2b47df57fc523060f9ed57c931c46da19f75f086a435f60fa9331b5d400058ed9fa79e0277db1ba8d97c2827985b6ea
+  metadata.gz: 6f0ddc332aba0a9625f3c2dd9ecfa625489c014f89eb3d79f8cef1256be277efe29cd43c1f89df6fffeaa557f8691891384001a9a5cabc3ec1bcb2e7eabda03e
+  data.tar.gz: a368f158fb6aec43bdf87ccd1bad0bf58c7b975d4825f24ba7b103b2f5330843a1260760c85e5579871f3a278ab8ee7594e6a4c5b18fbf7571f3012339cb71d6

data/README.md

@@ -2,3 +2,18 @@
 
 A dRuby implementation for Opal.
 
+## Installation
+
+    $ gem install opal-drb
+
+## How to run example
+
+    $ git clone https://github.com/youchan/opal-drb
+    $ cd opal-drb/example
+    $ bundle install
+    $ bundle exec rackup
+
+Open following url and watch development console.
+
+    http://localhost:1234
+    => ACK!

data/example/Gemfile

@@ -6,6 +6,7 @@ gem 'thin'
 
 gem 'opal', github: 'youchan/opal', branch: 'marshal-dump-bignum'
 gem 'opal-sprockets', github: 'opal/opal-sprockets'
+gem 'drb-websocket'
 
 gem 'rake'
 gem 'sass'

data/example/Gemfile.lock

@@ -1,5 +1,5 @@
 GIT
-  remote: git://github.com/opal/opal-sprockets.git
+  remote: https://github.com/opal/opal-sprockets.git
   revision: a063dffd884b495ed0c54b4c3b0b1cacc4abb322
   specs:
     opal-sprockets (0.4.1.0.11.0.rc1.3.1.beta2)
@@ -8,8 +8,8 @@ GIT
       tilt (>= 1.4)
 
 GIT
-  remote: git://github.com/youchan/opal.git
-  revision: 79998074a820fd1e651bce1e8661245949648285
+  remote: https://github.com/youchan/opal.git
+  revision: 1a5a59b66a0469c73c18e90c66591a7a66421de5
   branch: marshal-dump-bignum
   specs:
     opal (0.11.0.rc1)
@@ -25,7 +25,15 @@ GEM
     backports (3.8.0)
     concurrent-ruby (1.0.5)
     daemons (1.2.4)
-    eventmachine (1.2.3)
+    drb-websocket (0.2.0)
+      faye-websocket
+      rack
+      thin
+    eventmachine (1.2.5)
+    faye-websocket (0.10.7)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.5.1)
+    ffi (1.9.18)
     hike (1.2.3)
     multi_json (1.12.1)
     mustermann (1.0.0)
@@ -35,7 +43,14 @@ GEM
     rack-protection (2.0.0)
       rack
     rake (12.0.0)
-    sass (3.4.24)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sinatra (2.0.0)
       mustermann (~> 1.0)
       rack (~> 2.0)
@@ -52,16 +67,20 @@ GEM
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    thin (1.7.1)
+    thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    tilt (2.0.7)
+    tilt (2.0.8)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  drb-websocket
   opal!
   opal-sprockets!
   rake
@@ -71,4 +90,4 @@ DEPENDENCIES
   thin
 
 BUNDLED WITH
-   1.14.6
+   1.15.3

data/example/config.ru

@@ -1,12 +1,15 @@
 require 'bundler/setup'
 Bundler.require(:default)
 
+require 'drb/websocket/server'
+
 require_relative 'server'
 
 app = Rack::Builder.app do
   server = Server.new(host: 'localhost')
 
   map '/' do
+    use DRb::WebSocket::RackApp
     run server
   end
 
@@ -19,10 +22,12 @@ app = Rack::Builder.app do
   end
 end
 
+require_relative './drb_server'
+
 Rack::Server.start({
   app:    app,
   server: 'thin',
   Host:   '0.0.0.0',
-  Port:   9292,
+  Port:   1234,
   signals: false,
 })

data/example/drb_server.rb

@@ -0,0 +1,16 @@
+require 'drb/drb'
+require 'drb/websocket/server'
+
+class SampleObject
+  def test
+    "ACK!"
+  end
+end
+
+class SampleFactory
+  def self.get
+    DRbObject.new(SampleObject.new)
+  end
+end
+
+DRb.start_service("ws://127.0.0.1:1234", SampleFactory)

data/lib/opal/drb.rb

@@ -13,5 +13,7 @@ if RUBY_ENGINE == 'opal'
   require 'opal/drb/drb_conn'
   require 'opal/drb/drb_object'
   require 'opal/drb/drb_message'
+  require 'opal/drb/drb_server'
   require 'opal/drb/drb'
+  require 'opal/drb/invoke_method'
 end

data/lib/opal/drb/drb.rb

@@ -28,16 +28,6 @@ module DRb
     attr_reader :reason
   end
 
-  class DRbIdConv
-    def to_obj(ref)
-      ObjectSpace._id2ref(ref)
-    end
-
-    def to_id(obj)
-      obj.nil? ? nil : obj.__id__
-    end
-  end
-
   module DRbUndumped
     def _dump(dummy)
       raise TypeError, 'can\'t dump'
@@ -106,4 +96,26 @@ module DRb
     end
   end
 
+  def self.to_obj(ref)
+    DRb::DRbObject.id2ref[ref]
+  end
+
+  def self.to_id(obj)
+    obj.nil? ? nil : obj.__id__
+  end
+
+  def self.current_server
+    @callback_server
+  end
+
+  def self.start_service(uri)
+    @callback_server = DRbServer.new(uri, {})
+  end
+
+  def self.default_config
+    {
+      argc_limit: 256,
+      load_limit: 256 * 102400
+    }
+  end
 end

data/lib/opal/drb/drb_conn.rb

@@ -53,11 +53,4 @@ module DRb
       @protocol.alive?
     end
   end
-
-  def self.default_config
-    {
-      argc_limit: 256,
-      load_limit: 256 * 102400
-    }
-  end
 end

data/lib/opal/drb/drb_message.rb

@@ -1,6 +1,7 @@
 module DRb
   class DRbMessage
     def initialize(config)
+      config = DRb.default_config.merge(config || {})
       @load_limit = config[:load_limit]
       @argc_limit = config[:argc_limit]
     end

data/lib/opal/drb/drb_object.rb

@@ -30,8 +30,9 @@ module DRb
         @uri, option = DRbProtocol.uri_option(uri, DRb::default_config)
         @ref = DRbURIOption.new(option) unless option.nil?
       else
-        @uri = uri ? uri : nil
+        @uri = uri ? uri : DRb.current_server.uri
         @ref = obj ? DRb.to_id(obj) : nil
+        DRbObject.id2ref[@ref] = obj
       end
     end
 
@@ -46,6 +47,10 @@ module DRb
     undef :to_s
     undef :to_a if respond_to?(:to_a)
 
+    def self.id2ref
+      @id2ref ||= {}
+    end
+
     def respond_to?(msg_id, priv=false)
       case msg_id
       when :_dump

data/lib/opal/drb/drb_protocol.rb

@@ -9,7 +9,22 @@ module DRb
     end
     module_function :add_protocol
 
-    def open(uri, config, first=true)
+    def open_server(uri, config)
+      @protocol.each do |prot|
+        begin
+          return prot.open_server(uri, config)
+        rescue DRbBadScheme
+        rescue DRbConnError
+          raise($!)
+        rescue
+          raise(DRbConnError, "#{uri} - #{$!.inspect}")
+        end
+      end
+      raise DRbBadURI, 'can\'t parse uri:' + uri
+    end
+    module_function :open_server
+
+    def open(uri, config)
       @protocol.each do |prot|
         begin
           return prot.open(uri, config)
@@ -24,7 +39,7 @@ module DRb
     end
     module_function :open
 
-    def uri_option(uri, config, first=true)
+    def uri_option(uri, config)
       @protocol.each do |prot|
         begin
           uri, opt = prot.uri_option(uri, config)
@@ -32,10 +47,6 @@ module DRb
         rescue DRbBadScheme
         end
       end
-      if first && (config[:auto_load] != false)
-        auto_load(uri)
-        return uri_option(uri, config, false)
-      end
       raise DRbBadURI, 'can\'t parse uri:' + uri
     end
     module_function :uri_option

data/lib/opal/drb/drb_server.rb

@@ -0,0 +1,33 @@
+module DRb
+  class DRbServer
+    attr_reader :uri
+
+    def initialize(uri)
+      @uri = uri
+      @protocol = DRbProtocol.open_server(@uri)
+      run
+    end
+
+    def run
+      @protocol.accept do |client|
+        begin
+          succ = false
+          invoke_method = InvokeMethod.new(self, client)
+          succ, result = invoke_method.perform
+          print_error(result) unless succ
+          client.send_reply(succ, result)
+        rescue Exception => e
+          print_error(e)
+        ensure
+          client.close unless succ
+          break unless succ
+        end
+      end
+    end
+
+    def print_error(e)
+      puts e.message
+      p e.backtrace
+    end
+  end
+end

data/lib/opal/drb/invoke_method.rb

@@ -0,0 +1,85 @@
+class InvokeMethod
+  def initialize(drb_server, client)
+    @drb_server = drb_server
+    @client = client
+  end
+
+  def perform
+    @result = nil
+    @succ = false
+
+    setup_message
+
+    if @block
+      @result = perform_with_block
+    else
+      @result = perform_without_block
+    end
+
+    @succ = true
+    if @msg_id == :to_ary && @result.class == Array
+      @result = DRbArray.new(@result)
+    end
+    return @succ, @result
+  rescue StandardError, ScriptError, Interrupt
+    @result = $!
+    return @succ, @result
+  end
+
+  private
+  def init_with_client
+    obj, msg, argv, block = @client.recv_request
+    @obj = obj
+    @msg_id = msg.intern
+    @argv = argv
+    @block = block
+  end
+
+
+  def any_to_s(obj)
+    obj.to_s + ":#{obj.class}"
+  rescue
+    "#<#{obj.class}:0x#{obj.__id__.to_s(16)}>"
+  end
+
+  def check_insecure_method(obj, msg_id)
+    return true if Proc === obj && msg_id == :__drb_yield
+    raise(ArgumentError, "#{any_to_s(msg_id)} is not a symbol") unless Symbol == msg_id.class
+    raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id)
+
+    if obj.private_methods.include?(msg_id)
+      desc = any_to_s(obj)
+      raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
+    else
+      true
+    end
+  end
+
+  def setup_message
+    init_with_client
+    check_insecure_method(@obj, @msg_id)
+  end
+
+  def perform_without_block
+    if Proc === @obj && @msg_id == :__drb_yield
+      if @argv.size == 1
+        ary = @argv
+      else
+        ary = [@argv]
+      end
+      ary.collect(&@obj)[0]
+    else
+      @obj.__send__(@msg_id, *@argv)
+    end
+  end
+
+  INSECURE_METHOD = [
+    :__send__
+  ]
+
+  # Has a method been included in the list of insecure methods?
+  def insecure_method?(msg_id)
+    INSECURE_METHOD.include?(msg_id)
+  end
+end
+

data/lib/opal/drb/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module DRb
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/opal/drb/websocket.rb

@@ -75,19 +75,87 @@ module DRb
     end
 
     def self.open(uri, config)
-      unless uri =~ /^ws:\/\/(.*?):(\d+)(\?(.*))?$/
+      unless uri =~ /^ws:\/\/(.*?):(\d+)(\/(.*))?$/
         raise(DRbBadScheme, uri) unless uri =~ /^ws:/
         raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
       ClientSide.new(uri, config)
     end
 
+    def self.open_server(uri, config)
+      unless uri =~ /^ws:\/\/(.*?):(\d+)(\/(.*))?$/
+        raise(DRbBadScheme, uri) unless uri =~ /^ws:/
+        raise(DRbBadURI, 'can\'t parse uri:' + uri)
+      end
+      Server.new(uri, config)
+    end
+
+    class Server
+      attr_reader :uri
+
+      def initialize(uri, config)
+        @uri = uri
+        @config = config
+      end
+
+      def close
+        u = URI.parse(@uri)
+        RackApp.close("#{u.host}:#{u.port}")
+      end
+
+      def accept
+        ws = ::WebSocket.new(uri)
+        ws.onmessage do |event|
+          stream = StrStream.new(event.data.to_s)
+          server_side = ServerSide.new(stream, @config, uri)
+          yield server_side
+          ws.send(`new Uint8Array(#{server_side.reply.bytes.each_slice(2).map(&:first)}).buffer`)
+        end
+      end
+    end
+
+    class ServerSide
+      attr_reader :uri, :reply
+
+      def initialize(stream, config, uri)
+        @uri = uri
+        @config = config
+        @msg = DRbMessage.new(@config)
+        @req_stream = stream
+      end
+
+      def close
+      end
+
+      def alive?; false; end
+
+      def recv_request
+        begin
+          @msg.recv_request(@req_stream)
+        rescue
+          close
+          raise $!
+        end
+      end
+
+      def send_reply(succ, result)
+        begin
+          stream = StrStream.new
+          @msg.send_reply(stream, succ, result)
+          @reply = stream.buf
+        rescue
+          close
+          raise $!
+        end
+      end
+    end
+
     class ClientSide
       def initialize(uri, config)
         @uri = uri
         @res = nil
         @config = config
-        @msg = DRbMessage.new(config)
+        @msg = DRbMessage.new(@config)
         @proxy = ENV['HTTP_PROXY']
       end
 
@@ -101,7 +169,7 @@ module DRb
       def send_request(ref, msg_id, *arg, &b)
         stream = StrStream.new
         @msg.send_request(stream, ref, msg_id, *arg, &b)
-        post(@uri, stream.buf)
+        send(@uri, stream.buf)
       end
 
       def recv_reply(reply_stream)
@@ -109,7 +177,7 @@ module DRb
         @msg.recv_reply(reply_stream)
       end
 
-      def post(uri, data)
+      def send(uri, data)
         promise = Promise.new
         @ws = ::WebSocket.new(uri)
         @ws.onmessage do |event|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-drb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -87,6 +87,7 @@ files:
 - example/assets/css/application.scss
 - example/bin/console
 - example/config.ru
+- example/drb_server.rb
 - example/server.rb
 - example/views/index.erb
 - lib/opal/drb.rb
@@ -95,6 +96,8 @@ files:
 - lib/opal/drb/drb_message.rb
 - lib/opal/drb/drb_object.rb
 - lib/opal/drb/drb_protocol.rb
+- lib/opal/drb/drb_server.rb
+- lib/opal/drb/invoke_method.rb
 - lib/opal/drb/version.rb
 - lib/opal/drb/websocket.rb
 - opal-drb.gemspec