simple-rpc 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a137ff202514944b12a1080628bdff8999fe4e74f14cda4252b0e4d0dd306c77
-  data.tar.gz: f96d2183deb3dd97132469a6d70f17c18c74404679974cac1948b1dd1dac96fb
+  metadata.gz: c97c4c362a8cdc9cd7d8dab1152525995fc9956d6b864fa9992bd4bb0901fcf1
+  data.tar.gz: d32bcd8aa8c120c6da3c449cc869284e40a72a53be0535f885e9ac2ff1c931ab
 SHA512:
-  metadata.gz: 3efcd6a877f4514a9c6bf2289dba4d8b03b1235333e88a619ce1f37092290c0b904874b443ba6b2c0f713283f09af27afddda8b0e5d2123fb5cd06e213fc605e
-  data.tar.gz: 886ce3111ff8616033e658d5562b30d2b8ed84667fed6db8188a00baa14cf033e77448947700847fb7314aca956436b9f1f1fbd2f4eb4d4f97b07e907d471ae9
+  metadata.gz: ac67dd97f74ccabe5e7b3408bc061c8840f90bcfa68f2d966fc161e46dbe5db79633f2a304a6538c142b8db99082c10cb2f9ddb9ec3759f2d4df9c4d2ffcb3a2
+  data.tar.gz: b82bc3f7c87e601a5ba3b45a6c5e68c2f912c42b06445d3ae2af514c1255ccb8b846d844bbad65964e1ab839644fd8355fb28e7f2fd1abe207f3fac8aa6c2af2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-rpc (1.0.4)
+    simple-rpc (1.0.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -24,17 +24,17 @@ You can clone this repository and open two different console windows and run:
 
 Console 1
 
-`CHANNEL=/tmp/asdf ./test.rb `
+`CHANNEL=/tmp/asdf ./client1.rb `
 
 Console 2
 
-`CHANNEL=/tmp/asdf CHILD=1 ./test.rb`
+`CHANNEL=/tmp/asdf CHILD=1 ./client2.rb`
 
 
 The `CHILD=1` env var flips the channels in the second process so that they the two processes can send and receive on two local unix sockets as defined by the `CHANNEL` env var.
 
 
-Here's the contents of ./test.rb
+Here's the contents of ./client1.rb
 
 ```
 
@@ -46,56 +46,69 @@ require 'simple-rpc'
 
 class Client
 
-  def say_hello(adjective, sender)
-    puts "hello #{adjective} #{sender}"
+  def initialize
+    @rpc = SimpleRPC::RPC.new(self)
+    @rpc.add_listener(SimpleRPC::Events::CONNECTION_CHANGED, method(:connection_changed))
+    @rpc.connect
   end
 
-  def test_hash(some_hash)
-    puts "hash = #{some_hash}"
+  def connection_changed(status)
+    puts "status = #{status}"
+    if status == SimpleRPC::Status::CONNECTED
+      test_all
+    end
   end
 
-  def test_class(test_class)
-    puts "test_class = #{test_class}"
+  def test_all
+    @rpc.send_msg("say_hello", "awesome", "dude")
+    @rpc.send_msg("test_hash", {test:"asdf"})
   end
 
 end
 
-class TestClass
-  def initialize(a, b)
-    @a = a
-    @b = b
-  end
+Client.new
+while true
+  sleep 1
+end
 
-  def to_json(options = {})
-    {'a' => @a, 'b' => @b}.to_json
-  end
+```
+
+and here are the contents of ./client2.rb
+
+```
+
+#! /usr/bin/env ruby
+
+$:.unshift(File.join(File.dirname(__FILE__), '/lib'))
+
+require 'simple-rpc'
 
-  def self.from_json string
-    data = JSON.load string
-    self.new data['a'], data['b']
+class Client
+
+  def initialize
+    @rpc = SimpleRPC::RPC.new(self)
+    @rpc.connect
   end
-end
 
-client = Client.new
-@rpc = SimpleRPC.new(client)
+  def say_hello(adjective, sender)
+    puts "hello #{adjective} #{sender}"
+  end
 
-loop do
-  puts "Press enter to test strings"
-  $stdin.gets.chomp
-  @rpc.send_msg("say_hello", "awesome", "dude")
+  def test_hash(data)
+    puts "hash = #{data}"
+  end
 
-  puts "Press enter to test hashes"
-  $stdin.gets.chomp
-  @rpc.send_msg("test_hash", {test:"asdf"})
+end
 
-  puts "Press enter to test class instance"
-  $stdin.gets.chomp
-  @rpc.send_msg("test_class", TestClass.new('asdf1', 'asdf2'))
+Client.new
+while true
+  sleep 1
 end
 
 
 ```
 
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/client1.rb

@@ -0,0 +1,40 @@
+#! /usr/bin/env ruby
+
+$:.unshift(File.join(File.dirname(__FILE__), '/lib'))
+
+require 'simple-rpc'
+
+class Client
+
+  def initialize
+    @rpc = SimpleRPC::RPC.new(self)
+    @rpc.add_listener(SimpleRPC::Events::CONNECTION_CHANGED, method(:connection_changed))
+    @rpc.connect
+  end
+
+  def connection_changed(status)
+    puts "status = #{status}"
+    if status == SimpleRPC::Status::CONNECTED
+      test_all
+    end
+  end
+
+  def test_all
+    @rpc.send_msg("say_hello", "awesome", "dude")
+    @rpc.send_msg("test_hash", {test:"asdf"})
+    @rpc.send_msg("test_callback", {test:"asdf"}, "some_method")
+  end
+
+  def some_method(data)
+    puts "some_method called with #{data}"
+  end
+
+end
+
+client = Client.new
+puts "Press enter to send again:"
+while true
+  gets.chomp
+  client.test_all
+  sleep 1
+end

data/client2.rb

@@ -0,0 +1,32 @@
+#! /usr/bin/env ruby
+
+$:.unshift(File.join(File.dirname(__FILE__), '/lib'))
+
+require 'simple-rpc'
+
+class Client
+
+  def initialize
+    @rpc = SimpleRPC::RPC.new(self)
+    @rpc.connect
+  end
+
+  def say_hello(adjective, sender)
+    puts "hello #{adjective} #{sender}"
+  end
+
+  def test_hash(data)
+    puts "hash = #{data}"
+  end
+
+  def test_callback(data, callback)
+    puts "calling #{callback} with #{data}"
+    @rpc.send_msg callback, data
+  end
+
+end
+
+Client.new
+while true
+  sleep 1
+end

data/lib/local_socket.rb

@@ -1,81 +1,102 @@
+require 'local_socket_events'
+require 'local_socket_status'
+require 'set'
 require 'socket'
 
-class LocalSocket
-  attr_reader :connected
-  CONNECTION_TEST = "connection_test"
+module SimpleRPC
 
-  def initialize(receive_channel, send_channel, max_message_size=5000, thread_sleep=0.1)
-    @receive_channel = receive_channel
-    @send_channel = send_channel
-    @max_message_size = max_message_size
-    @thread_sleep = thread_sleep
-    @last_connected_status = nil
-    @connected = false
-    @receiver_thread = nil
-    @connection_thread = nil
-    bind
-  end
+  class LocalSocket
+    attr_reader :status
+    
+    CONNECTION_TEST = "connection_test"
 
-  def send_msg(msg)
-    flag = false
-    begin
-      @socket.sendmsg_nonblock(msg, 0, @snd_addrInfo)
-      flag = true
-    rescue => e
-      puts "Error: #{e}" unless "#{e}".include? "Connection refused" or "#{e}".include? "No such file"
-      flag = false
+    def initialize(receive_channel, send_channel, max_message_size=5000, thread_sleep=0.1)
+      @receive_channel = receive_channel
+      @send_channel = send_channel
+      @max_message_size = max_message_size
+      @thread_sleep = thread_sleep
+      @last_status = nil
+      @status = false
+      @receiver_thread = nil
+      @_thread = nil
+      @listeners = {}
     end
-    return flag
-  end
 
-  def bind
-    begin
-      File.unlink @receive_channel
-    rescue => e
-      puts "#{e}" unless "#{e}".include? "No such file"
+    def send_msg(msg)
+      flag = false
+      begin
+        @socket.sendmsg_nonblock(msg, 0, @snd_addrInfo)
+        flag = true
+      rescue => e
+        puts "Error: #{e}" unless "#{e}".include? "Connection refused" or "#{e}".include? "No such file"
+        flag = false
+      end
+      return flag
     end
-    @socket = Socket.new(:UNIX, :DGRAM, 0)
-    @snd_addrInfo = Addrinfo.unix(@send_channel)
-    @rcv_addrInfo = Addrinfo.unix(@receive_channel)
-    @socket.bind(@rcv_addrInfo)
-  end
 
-  def join
-    @receiver_thread.join
-  end
+    def connect
+      bind
+      setup_receiver_thread
+      setup_status_thread
+    end
 
+    def bind
+      begin
+        File.unlink @receive_channel
+      rescue => e
+        puts "#{e}" unless "#{e}".include? "No such file"
+      end
+      @socket = Socket.new(:UNIX, :DGRAM, 0)
+      @snd_addrInfo = Addrinfo.unix(@send_channel)
+      @rcv_addrInfo = Addrinfo.unix(@receive_channel)
+      @socket.bind(@rcv_addrInfo)
+    end
 
-  def message_received
-    @receiver_thread = Thread.new do
-      loop do
-        begin
-          result = @socket.recv_nonblock(@max_message_size)
-          if result != CONNECTION_TEST
-            yield result
+    def setup_receiver_thread
+      @receiver_thread = Thread.new do
+        loop do
+          begin
+            result = @socket.recv_nonblock(@max_message_size)
+            if result != CONNECTION_TEST
+              notify(Events::MESSAGE_RECEIVED, result)
+            end
+          rescue => e
+            puts "#{e}" unless "#{e}".include? "would block"
           end
-        rescue => e
-          puts "#{e}" unless "#{e}".include? "would block"
+          sleep @thread_sleep
         end
-        sleep @thread_sleep
       end
     end
-  end
 
-  def connection_changed
-    @connection_thread = Thread.new do
-      loop do
-        if send_msg(CONNECTION_TEST) 
-          @connected = true
-        else
-          @connected = false
-        end
-        if @last_connected_status != @connected
-          yield @connected
+    def setup_status_thread
+      @status_thread = Thread.new do
+        # todo:clintmod implement timeout
+        loop do
+          if send_msg(CONNECTION_TEST) 
+            @status = Status::CONNECTED
+          else
+            @status = Status::DISCONNECTED
+          end
+          if @last_status != @status
+            notify(Events::CONNECTION_CHANGED, @status)
+          end
+          @last_status = @status
+          sleep @thread_sleep
         end
-        @last_connected_status = @connected
-        sleep @thread_sleep
       end
     end
+
+    def add_listener(event, listener)
+      @listeners[event] ||= Set.new
+      @listeners[event] << listener
+    end
+
+    def notify(event, data)
+      @listeners[event] && @listeners[event].each do |listener|
+        listener.call data
+      end
+    end
+
   end
 
 end

data/lib/local_socket_events.rb

@@ -0,0 +1,10 @@
+module SimpleRPC
+
+  module Events
+
+    MESSAGE_RECEIVED = "MESSAGE_RECEIVED"
+    CONNECTION_CHANGED = "CONNECTION_CHANGED"
+    
+  end
+
+end

data/lib/local_socket_status.rb

@@ -0,0 +1,12 @@
+module SimpleRPC
+
+  module Status
+
+    CONNECTED     = "CONNECTED"
+    CONNECTING    = "CONNECTING"
+    DISCONNECTED  = "DISCONNECTED"
+    TIMED_OUT     = "TIMED_OUT"
+    
+  end
+
+end

data/lib/simple-rpc.rb

@@ -1,29 +1,43 @@
 require 'json'
 require 'local_socket'
 
-class SimpleRPC
-
-  def initialize(client)
-    @client = client
-    is_child = ENV['CHILD'] ? true : false
-    parent_channel = ENV['CHANNEL'] + '_parent'
-    child_channel = ENV['CHANNEL'] + '_child'
-    receive_channel = is_child ? parent_channel : child_channel
-    send_channel = is_child ? child_channel : parent_channel
-    @socket = LocalSocket.new(receive_channel, send_channel)
-
-    @socket.message_received do | json_array_string |
+module SimpleRPC
+
+  class RPC
+
+    def initialize(client)
+      @client = client
+      is_child = ENV['CHILD'] ? true : false
+      parent_channel = ENV['CHANNEL'] + '_parent'
+      child_channel = ENV['CHANNEL'] + '_child'
+      receive_channel = is_child ? parent_channel : child_channel
+      send_channel = is_child ? child_channel : parent_channel
+      @socket = LocalSocket.new(receive_channel, send_channel)
+      @socket.add_listener(Events::MESSAGE_RECEIVED, method(:message_received))
+    end
+
+    def message_received json_array_string
       array = JSON.parse(json_array_string)
       @client.send(*array)
     end
-    @socket.connection_changed do |connected|
-      puts "Connection changed: connected = #{connected}"
+
+    def connect
+      @socket.connect
+    end
+
+    def send_msg(*args)
+      msg = JSON.generate(args)
+      @socket.send_msg msg
+    end
+
+    def status_changed
+      @socket.status_changed
+    end
+
+    def add_listener(event, listener)
+      @socket.add_listener event, listener
     end
-  end
 
-  def send_msg(*args)
-    msg = JSON.generate(args)
-    @socket.send_msg msg
   end
 
 end

data/simple-ruby-rpc.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "simple-rpc"
-  spec.version       = "1.0.4"
+  spec.version       = "1.0.5"
   spec.authors       = ["Clint M"]
   spec.email         = ["cmodien@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-rpc
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Clint M
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,10 +52,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- client1.rb
+- client2.rb
 - lib/local_socket.rb
+- lib/local_socket_events.rb
+- lib/local_socket_status.rb
 - lib/simple-rpc.rb
 - simple-ruby-rpc.gemspec
-- test.rb
 homepage: https://github.com/clintmod/simple-rpc
 licenses: []
 metadata: {}

data/test.rb

@@ -1,54 +0,0 @@
-#! /usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '/lib'))
-
-require 'simple-rpc'
-
-class Client
-
-  def say_hello(adjective, sender)
-    puts "hello #{adjective} #{sender}"
-  end
-
-  def test_hash(some_hash)
-    puts "hash = #{some_hash}"
-  end
-
-  def test_class(test_class)
-    puts "test_class = #{test_class}"
-  end
-
-end
-
-class TestClass
-  def initialize(a, b)
-    @a = a
-    @b = b
-  end
-
-  def to_json(options = {})
-    {'a' => @a, 'b' => @b}.to_json
-  end
-
-  def self.from_json string
-    data = JSON.load string
-    self.new data['a'], data['b']
-  end
-end
-
-client = Client.new
-@rpc = SimpleRPC.new(client)
-
-loop do
-  puts "Press enter to test strings"
-  $stdin.gets.chomp
-  @rpc.send_msg("say_hello", "awesome", "dude")
-
-  puts "Press enter to test hashes"
-  $stdin.gets.chomp
-  @rpc.send_msg("test_hash", {test:"asdf"})
-
-  puts "Press enter to test class instance"
-  $stdin.gets.chomp
-  @rpc.send_msg("test_class", TestClass.new('asdf1', 'asdf2'))
-end