cocaine-framework 0.12.0.pre.rc21 → 0.12.0.pre.rc23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4a179f9745f3965fb70ae9220bdb64dec34a21c
-  data.tar.gz: 1c431053029bdbc7ecbb1ac8bd956aee17130253
+  metadata.gz: fad035dd2ae1a69642a32ea41d78d729ab8068e3
+  data.tar.gz: acf30fb66b54c84192b50424246790f12209c6f7
 SHA512:
-  metadata.gz: edecbd8db23a9f4966483fd7949734fe77a2b8baec126344275c468ba153cab8d73e01b0e001e4de8ea3f0c0a25651c521318b3477c6320b0586260a661e5a7d
-  data.tar.gz: 20b553e34d3323e86b9b21be2e4340e30e489393a9b871a8b7245ed0004a3a37884e80d3eae299f35f9e0943a3ee712a948a46f712dd61542feea56baefe19de
+  metadata.gz: b7d7691273798e932b95ed4b79a9373ffc7cc5a857cac5beb0a0de39a067985b7d1ffd6a9856c213b5059d11e47059104fdb71aa41362fcd78d9c3fb42902d8e
+  data.tar.gz: 219be3119f59aa609c83a1ab45eadae050e3fec4b6150138bd865d409c5a63791d76d31a655fc951502beb4cc05353c5ce38c52fecd7705096e3586b76bd5c6b

data/lib/cocaine/cocaine.rb

@@ -64,18 +64,62 @@ module Cocaine
   end
 
   module RPC
-    CONTROL_CHANNEL = 1
+    module Version1
+      CONTROL_CHANNEL = 1
 
-    HANDSHAKE = 0
+      module Messages
+        HANDSHAKE, HEARTBEAT, TERMINATE, INVOKE, CHUNK, ERROR, CHOKE = (0..6).to_a
+      end
+
+      class Dispatcher
+        def handshake(uuid)
+          [CONTROL_CHANNEL, 0, [uuid]]
+        end
+
+        def heartbeat
+          [CONTROL_CHANNEL, 1, []]
+        end
+
+        def terminate(errno, reason)
+          [CONTROL_CHANNEL, 2, [errno, reason]]
+        end
 
-    HEARTBEAT = 0
-    TERMINATE = 1
+        def process(span, id)
+          case id
+            when 1
+              :heartbeat
+            when 2
+              :terminate
+            when 3
+              :invoke
+            when 4
+              :chunk
+            when 5
+              :error
+            when 6
+              :choke
+            else
+              :unknown
+          end
+        end
+      end
+    end
 
-    INVOKE = 0
+    module Version2
+    end
 
-    CHUNK = 0
-    ERROR = 1
-    CHOKE = 2
+    def self.dispatcher(version)
+      case version
+        when 0
+          Version1::Dispatcher.new
+        else
+          raise Exception.new 'unsupported version number'
+      end
+    end
+
+    CHUNK = 4
+    ERROR = 5
+    CHOKE = 6
 
     RXTREE = {
         CHUNK => ['write', nil, {}],
@@ -203,7 +247,7 @@ module Cocaine
 
     def initialize(name, endpoints, dispatch)
       @name = name
-      @dispatch = dispatch
+      @framing = dispatch
       @counter = 1
       @sessions = Hash.new
 
@@ -219,11 +263,9 @@ module Cocaine
         end
       end
 
-      # TODO: I can check for common single-shot protocol here.
       dispatch.each do |id, (method, txtree, rxtree)|
         LOG.debug "Defined '#{method}' method for service #{self}"
         self.metaclass.send(:define_method, method) do |*args|
-          LOG.debug "Invoking #{@name}.#{method}(#{args})"
           return invoke(id, *args)
         end
       end
@@ -237,6 +279,7 @@ module Cocaine
     private
     def run
       LOG.debug "Service '#{@name}' is running"
+
       unpacker = MessagePack::Unpacker.new
       loop do
         data = @socket.readpartial(4096)
@@ -252,21 +295,21 @@ module Cocaine
       end
     end
 
-    def received(session, id, payload)
-      LOG.debug "-> [#{session}, #{id}, #{payload}]"
-      tx, rx = @sessions[session]
+    def received(span, id, payload, *extra)
+      LOG.debug "-> [#{span}, #{id}, #{payload}, #{extra}]"
+      tx, rx = @sessions[span]
       if rx
         rx.push id, payload
       else
-        LOG.warn "Received message to closed session: [#{session}, #{id}, #{payload}]"
+        LOG.warn "Received message to closed session: [#{span}, #{id}, #{payload}]"
       end
     end
 
     def invoke(id, *args)
       reinitialize if @socket.nil?
 
-      method, txtree, rxtree = @dispatch[id]
-      LOG.debug "Invoking #{@name}[#{id}=#{method}] with #{args}"
+      method, txtree, rxtree = @framing[id]
+      LOG.debug "Invoking #{@name} '#{method}' method with #{id} id and #{args} args"
 
       txchan = TxChannel.new txtree, @counter, @socket
       rxchan = RxChannel.new rxtree, @counter do |session|
@@ -284,18 +327,20 @@ module Cocaine
 
   # [API]
   class Locator < DefinedService
-    def initialize(host=nil, port=nil)
-      super :locator, [[host || Default::Locator.host, port || Default::Locator.port]], Default::Locator::API
+    def initialize(endpoints = nil)
+      endpoints ||= [[Default::Locator.host, Default::Locator.port]]
+
+      super :locator, endpoints, Default::Locator::API
     end
   end
 
   # [API]
-  # Service class. All you need is name and (optionally) locator endpoint.
+  # Service class. All you need is name and (optionally) locator endpoints.
   class Service < DefinedService
-    def initialize(name, host=nil, port=nil)
-      @options = { host: host, port: port }
+    def initialize(name, endpoints = nil)
+      @location = endpoints
 
-      locator = Locator.new host, port
+      locator = Locator.new @location
       tx, rx = locator.resolve name
       id, payload = rx.recv
       if id == :error
@@ -309,7 +354,7 @@ module Cocaine
 
     protected
     def reinitialize
-      initialize @name, @options[:host], @options[:port]
+      initialize @name
     end
   end
 
@@ -337,18 +382,22 @@ module Cocaine
     execute_block_on_receiver :on
     finalizer :finalize
 
-    def initialize(app, uuid, endpoint)
-      @app = app
-      @uuid = uuid
-      @endpoint = endpoint
+    def initialize(options)
+      @app      = options[:app]
+      @uuid     = options[:uuid]
+      @endpoint = options[:endpoint]
+
+      @framing = RPC::dispatcher options[:protocol]
+
       @actors = Hash.new
       @sessions = Hash.new
 
       timeout = 60.0
-      @disown = after(60.0) do
-        LOG.debug "Terminating due to disown timer expiration (#{timeout} sec)"
-        # TODO: Hardcoded errno.
-        exit 1
+
+      @disown = after timeout do
+        LOG.fatal "Terminating due to disown timer expiration (#{timeout} sec)"
+
+        exit Errno.ETIMEDOUT
       end
     end
 
@@ -358,7 +407,8 @@ module Cocaine
 
     def run
       LOG.debug "Starting worker '#{@app}' with uuid '#{@uuid}' at '#{@endpoint}'"
-      @socket = UNIXSocket.open(@endpoint)
+
+      @socket = UNIXSocket.open @endpoint
       async.handshake
       async.health
       async.serve
@@ -367,13 +417,16 @@ module Cocaine
     private
     def handshake
       LOG.debug '<- Handshake'
-      @socket.write MessagePack::pack([RPC::CONTROL_CHANNEL, RPC::HANDSHAKE, [@uuid]])
+
+      @socket.write MessagePack::pack @framing.handshake @uuid
     end
 
     def health
-      heartbeat = MessagePack::pack([RPC::CONTROL_CHANNEL, RPC::HEARTBEAT, []])
+      heartbeat = MessagePack::pack @framing.heartbeat
+
       loop do
         LOG.debug '<- Heartbeat'
+
         @socket.write heartbeat
         sleep 5.0
       end
@@ -381,6 +434,7 @@ module Cocaine
 
     def serve
       unpacker = MessagePack::Unpacker.new
+
       loop do
         data = @socket.readpartial 4096
         unpacker.feed_each data do |decoded|
@@ -389,62 +443,32 @@ module Cocaine
       end
     end
 
-    def received(session, id, payload)
-      LOG.debug "-> Message(#{session}, #{id}, #{payload})"
+    def received(span, id, payload, *extra)
+      LOG.debug "-> Message(#{span}, #{id}, #{payload}, #{extra})"
 
-      if session == RPC::CONTROL_CHANNEL
-        control session, id, payload
-      else
-        rpc session, id, payload
-      end
-    end
-
-    def control(session, id, payload)
-      LOG.debug "Processing control [#{session}, #{id}, #{payload}] message"
-
-      case id
-        when RPC::HEARTBEAT
+      case @framing.process span, id
+        when :heartbeat
           @disown.reset
-        when RPC::TERMINATE
+        when :terminate
           terminate *payload
+        when :invoke
+          invoke span, *payload
+        when :chunk
+          push span, id, *payload
+        when :error
+          push span, id, *payload
+          revoke span
+        when :choke
+          push span, id, []
+          revoke span
         else
-          LOG.warn "Received unknown message: [#{session}, #{id}, #{payload}]"
-      end
-    end
-
-    def rpc(session, id, payload)
-      LOG.debug "Processing RPC [#{session}, #{id}, #{payload}] message"
-
-      channels = @sessions.keys
-      if channels.empty?
-        min = max = 1
-      else
-        min, max = channels.min, channels.max
-      end
-
-      if session < min
-        LOG.debug "Dropping session #{session} as unexpected"
-        return
-      end
-
-      if session > max
-        LOG.debug "Invoking new channel #{session}"
-        invoke session, *payload
-        return
-      end
-
-      case id
-        when RPC::CHUNK, RPC::ERROR
-          push session, id, *payload
-        when RPC::CHOKE
-          LOG.debug "Closing #{session} session"
-          @sessions.delete session
-        else
-          LOG.warn "Received unknown message: [#{session}, #{id}, #{payload}]"
+          LOG.warn "Received unknown message: [#{span}, #{id}, #{payload}]"
       end
     end
 
     def invoke(session, event)
+      LOG.debug "Invoking new #{session} channel with #{event} event"
+
       actor = @actors[event]
       txchan = TxChannel.new RPC::TXTREE, session, @socket
       rxchan = RxChannel.new RPC::RXTREE, session do |session_|
@@ -472,9 +496,15 @@ module Cocaine
       end
     end
 
+    def revoke(span)
+      LOG.debug "Closing #{span} channel"
+      @sessions.delete span
+    end
+
     def terminate(errno, reason)
       LOG.warn "Terminating [#{errno}]: #{reason}"
-      @socket.write MessagePack::pack([RPC::CONTROL_CHANNEL, RPC::TERMINATE, [errno, reason]])
+
+      @socket.write MessagePack::pack @framing.terminate errno, reason
       exit errno
     end
 
@@ -489,6 +519,8 @@ module Cocaine
   class WorkerFactory
     def self.create
       options = {}
+      options[:protocol] = 0
+
       OptionParser.new do |opts|
         opts.banner = 'Usage: <worker.rb> --app NAME --locator ADDRESS --uuid UUID --endpoint ENDPOINT'
 
@@ -508,22 +540,27 @@ module Cocaine
           options[:endpoint] = endpoint
         end
 
-        opts.on('--protocol VERSION', 'Worker protocol version') do |protocol|
+        opts.on('--protocol VERSION', Integer, 'Worker protocol version') do |protocol|
           options[:protocol] = protocol
         end
+
+        opts.on_tail('--version', 'Show version the Framework version and exit') do
+          puts Cocaine::VERSION.join('.')
+          exit
+        end
       end.parse!
 
       Cocaine::LOG.debug "Options: #{options}"
       if options.empty? or options.any? { |option, value| value.nil? }
         Cocaine::LOG.error "Some options aren't specified, but should be. "\
         "Probably, you're trying to start your application manually. Try to restart your app using Cocaine."
-        exit 1
+        exit Errno::EINVAL
       end
 
       Default::Locator.endpoints = options[:locator].split(',')
 
       Cocaine::LOG.debug "Setting default Locator endpoints to #{Default::Locator.endpoints}"
-      return Worker.new(options[:app], options[:uuid], options[:endpoint])
+      return Worker.new(options)
     end
   end
 

data/lib/cocaine/version.rb

@@ -1,4 +1,4 @@
 module Cocaine
   # Versions 0.12.0-rc17 and higher are only compatible with Node v2.
-  VERSION = '0.12.0-rc21'
+  VERSION = '0.12.0-rc23'
 end

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: cocaine-framework
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre.rc21
+  version: 0.12.0.pre.rc23
 platform: ruby
 authors:
 - Evgeny Safronov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
+        version: '0.5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '0.16'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
+        version: '0.16'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
-  name: msgpack
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :runtime
+        version: '3.2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: celluloid-io
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :runtime
+        version: '1.7'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.7'
 description: |-
   Cocaine Framework is a framework for simplifying development both server-side and client-side
   applications.
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby/Cocaine library