zoomq 0.1.1 → 0.2.0

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'zmachine', path: '../zmachine'

data/lib/zoomq/cli.rb

@@ -73,7 +73,7 @@ module ZooMQ
         "lib/#{name}/client.rb"          => "client.rb",
         "lib/#{name}/console.rb"         => "console.rb",
         "#{name}/server.rb"              => "server.rb",
-        "#{name}/server/ping_request.rb" => "ping_request.rb",
+        "#{name}/protocol/ping_request.rb" => "ping_request.rb",
       }.each do |dest, source|
         puts "  * #{dest}"
         source = File.join(@root, 'templates', "#{source}.tt")

data/lib/zoomq/client/connection.rb

@@ -0,0 +1,18 @@
+module ZooMQ
+  class Client
+    class Connection < ZMachine::Connection
+
+      attr_accessor :client
+
+      def receive_data(msg)
+        msg.unwrap # strip origin
+        # TODO: unwrap data to string from bytes to_i wtf
+        request_id = String.from_java_bytes(msg.unwrap.data).to_i
+        cls = String.from_java_bytes(msg.pop.data).constantize
+        obj = cls.parse(String.from_java_bytes(msg.pop.data))
+        @client.response(request_id, obj)
+      end
+
+    end
+  end
+end

data/lib/zoomq/client.rb

@@ -1,25 +1,28 @@
 # encoding: utf-8
 
-require 'zoomq/jeromq-0.3.0-20130721.175323-20.jar'
-java_import org.zeromq.ZMQ
-java_import org.zeromq.ZContext
-java_import org.zeromq.ZMsg
-java_import org.zeromq.ZFrame
+require 'zmachine'
 
 require 'zoomq/zookeeper'
+require 'zoomq/client/connection'
+
+java_import org.zeromq.ZFrame
+java_import java.util.concurrent.atomic.AtomicInteger
 
 module ZooMQ
-  class ServerUnavailable < StandardError; end
+  class ServerUnavailableError < StandardError; end
+  class TimeoutError < StandardError; end
 
   class Client
 
     attr_reader :servers
 
-    def initialize(service_name, zookeeper_uri, log)
-      @zk = Zookeeper.new("#{zookeeper_uri}/#{service_name}")
-      @ctx = ZContext.new
-      @socket = @ctx.create_socket(ZMQ::ROUTER)
-      @socket.identity = SecureRandom.uuid.to_java_bytes
+    def initialize
+      @requests = {}
+      @request_id = AtomicInteger.new
+      @zk = Zookeeper.new(service_name)
+      @channel = ZMachine.connect(nil, ZMQ::ROUTER, Connection) do |connection|
+        connection.client = self
+      end
       watch
       refresh
     end
@@ -31,27 +34,36 @@ module ZooMQ
     def refresh
       @servers = @zk.servers
       @servers.each do |server|
-        @socket.connect("tcp://#{server}")
+        $log.debug("#{service_name}:connect", server: server)
+        @channel.connect("tcp://#{server}")
         sleep(0.1)
       end
       @cycle = @servers.cycle
     end
 
-    def handle(request)
+    def request(obj)
       if @servers.empty?
-        raise ServerUnavailable.new("no servers are online, please try again later")
+        raise ServerUnavailableError.new("no servers are online, please try again later")
       end
 
       server = @cycle.next
 
-      msg = ZMsg.new_string_msg(request.class.to_s, request.to_s)
+      deferred = ZMachine::DefaultDeferrable.new
+      deferred.callback { |result| yield result } if block_given?
+
+      request_id = @request_id.increment_and_get
+      msg = ZMsg.new_string_msg(obj.class.to_s, obj.to_s)
+      msg.wrap(ZFrame.new(request_id.to_s))
       msg.wrap(ZFrame.new(server))
-      msg.send(@socket)
+      $log.debug("#{service_name}:request", id: request_id, obj: obj.inspect)
+      @channel.send_data(msg)
+
+      @requests[request_id] = deferred
+    end
 
-      msg = ZMsg.recvMsg(@socket)
-      msg.unwrap
-      cls = String.from_java_bytes(msg.pop.data).constantize
-      cls.parse(String.from_java_bytes(msg.pop.data))
+    def response(request_id, obj)
+      $log.debug("#{service_name}:response", id: request_id, obj: obj.inspect)
+      @requests[request_id].succeed(obj)
     end
 
   end

data/lib/zoomq/console.rb

@@ -0,0 +1,34 @@
+require 'ap'
+require 'irb'
+require 'ripl'
+
+Ripl::Shell.class_eval do
+  def format_result(result)
+    ap(result)
+  end
+end
+
+module ZooMQ
+  class Console
+    def initialize
+      $log.level = :info
+      Thread.new { zmachine }
+      Ripl.start(binding: binding)
+    end
+
+    def zmachine
+      ZMachine.run { client }
+    end
+
+    def method_missing(name, *args, &block)
+      result = nil
+      df = @client.send(name, *args, &block)
+      df.callback { |response| result = response }
+      df.errback { |error| result = error }
+      while result.nil?
+        sleep(0.1)
+      end
+      result
+    end
+  end
+end

data/lib/zoomq/server/{request_handler.rb → connection.rb}

@@ -1,24 +1,23 @@
 java_import org.zeromq.ZMsg
 
-require 'zoomq/handler'
+require 'zmachine/connection'
 
 module ZooMQ
   class Server
-    class RequestHandler < Handler
-      def handle(zloop, poller, worker)
-        @server = worker.server
-        origin, msg = recv_msg(poller.socket)
+    class Connection < ZMachine::Connection
+
+      attr_accessor :server
+
+      def receive_data(msg)
+        origin = msg.unwrap
+        request_id = msg.unwrap
         result = handle_msg(msg)
+        result.wrap(request_id)
         result.wrap(origin)
-        result.send(poller.socket)
+        send_data(result)
         return 0
       end
 
-      def recv_msg(socket)
-        msg = ZMsg.recvMsg(socket)
-        [msg.unwrap, msg]
-      end
-
       def handle_msg(msg)
         cls = String.from_java_bytes(msg.pop.data).constantize
         request = cls.parse(String.from_java_bytes(msg.pop.data))

data/lib/zoomq/server/worker.rb

@@ -1,8 +1,7 @@
 java_import org.zeromq.ZMQ
-java_import org.zeromq.ZContext
-java_import org.zeromq.ZLoop
 
-require 'zoomq/server/request_handler'
+require 'zmachine'
+require 'zoomq/server/connection'
 
 module ZooMQ
   class Server
@@ -12,23 +11,22 @@ module ZooMQ
 
       def initialize(server)
         @server = server
-        @zloop = ZLoop.new
-        @zloop.verbose(true)
-        initialize_socket
       end
 
-      def initialize_socket
-        @socket = @server.create_socket(ZMQ::ROUTER)
-        @port = @socket.bind("tcp://*:*")
-        RequestHandler.new(@socket).register(@zloop, self)
-        Thread.current.name = "#{@server.fqdn}:#{@port}"
-        @socket.identity = Thread.current[:name].to_java_bytes
+      def run
+        ZMachine.run { initialize_socket }
       end
 
-      def run
-        @server.log.info("pubdater:worker", run: true, announce: @socket.identity)
-        @server.announce(@socket.identity)
-        @zloop.start
+      def initialize_socket
+        $log.info("zoomq:server:worker", bind: "tcp://*:*")
+        ZMachine.start_server("tcp://*:*", ZMQ::ROUTER, Connection) do |handler|
+          identity = "#{@server.fqdn}:#{handler.channel.port}"
+          $log.info("zoomq:server:worker", announce: identity)
+          Thread.current.name = "ZMQ::Server::Worker (#{identity})"
+          handler.channel.identity = identity
+          handler.server = @server
+          @server.announce(identity)
+        end
       end
 
     end

data/lib/zoomq/server.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
 
-require 'zoomq/jeromq-0.3.0-20130721.175323-20.jar'
-java_import org.zeromq.ZMQ
-
 require 'forwardable'
+require 'socket'
+require 'zmachine'
 
 require 'zoomq/zookeeper'
 require 'zoomq/server/worker'
@@ -13,25 +12,29 @@ module ZooMQ
 
     extend Forwardable
     def_delegators :@zk, :globals, :locals, :announce
-    def_delegators :@ctx, :create_socket
 
-    attr_reader :log, :fqdn, :port
+    attr_reader :fqdn, :port
+
+    def initialize
+      $log.info("#{service_name}:initialize #{RUBY_DESCRIPTION}")
+      $log.info("#{service_name}:initialize", {
+        env: Env.mode,
+      })
 
-    def initialize(service_name, zookeeper_uri, log)
       Signal.register_shutdown_handler { shutdown }
-      @log = log
-      @zk = Zookeeper.new("#{zookeeper_uri}/#{service_name}")
-      @ctx = ZContext.new
-      @fqdn = Socket.gethostbyname(Socket.gethostname).first
+      @fqdn = ::Socket.gethostbyname(::Socket.gethostname).first
+      @zk = Zookeeper.new(service_name)
     end
 
     def run
+      # TODO: make it multi-threaded
+      $log.info("#{service_name}:run", workers: 1)
       Worker.new(self).run
     end
 
     def shutdown
-      @ctx.destroy if @ctx
       @zk.close if @zk
+      ZMachine.stop_event_loop
     end
 
   end

data/lib/zoomq/socket.rb

@@ -0,0 +1,43 @@
+java_import org.zeromq.ZMQ
+
+require 'zmachine/connection'
+
+module ZooMQ
+  class Socket < ZMachine::Connection
+    READABLES = [ ZMQ::SUB, ZMQ::PULL, ZMQ::ROUTER, ZMQ::DEALER, ZMQ::REP, ZMQ::REQ, ZMQ::PAIR ]
+    WRITABLES = [ ZMQ::PUB, ZMQ::PUSH, ZMQ::ROUTER, ZMQ::DEALER, ZMQ::REP, ZMQ::REQ, ZMQ::PAIR ]
+
+    def initialize(socket, socket_type, server)
+      @socket, @socket_type, @server = socket, socket_type, server
+      self.notify_readable = true if READABLES.include?(socket_type)
+      #self.notify_writable = true if WRITABLES.include?(socket_type)
+    end
+
+    def notify_readable
+      # Not sure if this is actually necessary. I suppose it prevents us
+      # from having to to instantiate a ZMQ::Message unnecessarily.
+      # I'm leaving this in because its in the docs, but it could probably
+      # be taken out.
+      return unless readable?
+      handle_readable
+    end
+
+    #def notify_writable
+    #  return unless writable?
+
+    #  # once a writable event is successfully received the socket
+    #  # should be accepting messages again so stop triggering
+    #  # write events
+    #  self.notify_writable = false
+    #  handle_writable
+    #end
+
+    def readable?
+      (@socket.events & ZMQ::Poller::POLLIN) == ZMQ::Poller::POLLIN
+    end
+
+    def writable?
+      (@socket.events & ZMQ::Poller::POLLOUT) == ZMQ::Poller::POLLOUT
+    end
+  end
+end

data/lib/zoomq/zookeeper.rb

@@ -7,8 +7,8 @@ module ZooMQ
     attr_reader :globals
     attr_reader :locals
 
-    def initialize(uri)
-      @zk = ZK.new(uri)
+    def initialize(service_name)
+      @zk = ZK.new("#{$conf.zookeeper}/#{service_name}")
       @zk.mkdir_p("/alive")
       @globals = KeySpace.new(:global, @zk)
     end

data/templates/client.rb.tt

@@ -1,24 +1,18 @@
 # encoding: utf-8
 
-require 'forwardable'
 require 'zoomq/client'
 
 require '<%=config[:name]%>/protocol'
 
 module <%=config[:constant_name]%>
-  class Client
+  class Client < ZooMQ::Client
 
-    extend Forwardable
-
-    def initialize(zookeeper, log)
-      @client = ZooMQ::Client.new(<%=config[:name].inspect%>, zookeeper, log)
+    def service_name
+      <%=config[:name].inspect%>
     end
 
-    def_delegators :@client, :servers
-
     def ping
-      request = PingRequest.new
-      @client.handle(request)
+      request(PingRequest.new)
     end
 
   end

data/templates/console.rb.tt

@@ -1,29 +1,10 @@
-require 'ap'
-require 'irb'
-require 'ripl'
-require 'forwardable'
-
+require 'zoomq/console'
 require '<%=config[:name]%>/client'
 
-Ripl::Shell.class_eval do
-  def format_result(result)
-    ap(result)
-  end
-end
-
 module <%=config[:constant_name]%>
-  class Console
-
-    extend Forwardable
-    def initialize
-      $log.level = :info
-      @client = Client.new($conf.zookeeper, $log)
-      Ripl.start(binding: binding)
-    end
-
-    def method_missing(name, *args, &block)
-      @client.__send__(name, *args, &block)
+  class Console < ZooMQ::Console
+    def client
+      @client = Client.new
     end
-
   end
 end

data/templates/ping_request.rb.tt

@@ -1,9 +1,11 @@
 require '<%=config[:name]%>/protocol'
 
 module <%=config[:constant_name]%>
-  class PingRequest
-    def handle(server)
-      PingResponse.new
+  module Protocol
+    class PingRequest
+      def handle(server)
+        PingResponse.new
+      end
     end
   end
 end

data/templates/protocol.proto.tt

@@ -1,4 +1,4 @@
-package <%=config[:name]%>;
+package <%=config[:name]%>.protocol;
 
 message PingRequest {
 }

data/templates/server.rb.tt

@@ -9,18 +9,8 @@ end
 module <%=config[:constant_name]%>
   class Server
 
-    def initialize
-      $log.info("<%=config[:name]%>:initialize #{RUBY_DESCRIPTION}")
-      $log.info("<%=config[:name]%>:initialize", {
-        env: Env.mode,
-      })
-
-      @server = ZooMQ::Server.new(<%=config[:name].inspect%>, $conf.zookeeper, $log)
-    end
-
-    def run
-      $log.info("<%=config[:name]%>:run")
-      @server.run
+    def service_name
+      <%=config[:name].inspect%>
     end
 
   end

data/zoomq.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "zoomq"
-  spec.version       = "0.1.1"
+  spec.version       = "0.2.0"
   spec.authors       = ["madvertise Mobile Advertising GmbH"]
   spec.email         = ["tech@madvertise.com"]
   spec.description   = %q{ØMQ ROUTER/ROUTER coordinated by Zookeeper}
@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "multi_json"
   spec.add_dependency "ruby-protocol-buffers"
   spec.add_dependency "zk"
+  spec.add_dependency "zmachine"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zoomq
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -107,6 +107,22 @@ dependencies:
     none: false
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: zmachine
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :runtime
 description: ØMQ ROUTER/ROUTER coordinated by Zookeeper
 email:
 - tech@madvertise.com
@@ -123,11 +139,12 @@ files:
 - bin/zoomq
 - lib/zoomq/cli.rb
 - lib/zoomq/client.rb
-- lib/zoomq/handler.rb
-- lib/zoomq/jeromq-0.3.0-20130721.175323-20.jar
+- lib/zoomq/client/connection.rb
+- lib/zoomq/console.rb
 - lib/zoomq/server.rb
-- lib/zoomq/server/request_handler.rb
+- lib/zoomq/server/connection.rb
 - lib/zoomq/server/worker.rb
+- lib/zoomq/socket.rb
 - lib/zoomq/zookeeper.rb
 - templates/Gemfile.tt
 - templates/LICENSE.txt.tt

data/lib/zoomq/handler.rb

@@ -1,13 +0,0 @@
-java_import org.zeromq.ZMQ
-
-module ZooMQ
-  class Handler
-    def initialize(socket, flags=ZMQ::Poller::POLLIN)
-      @poller = ZMQ::PollItem.new(socket, flags)
-    end
-
-    def register(zloop, opts)
-      zloop.add_poller(@poller, self, opts)
-    end
-  end
-end