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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa68d461e9f05eea1ce584539c0c95768af07132
-  data.tar.gz: 5bfee2c6ca4801213fe7f830c35a3919ffe216c9
+  metadata.gz: a4a179f9745f3965fb70ae9220bdb64dec34a21c
+  data.tar.gz: 1c431053029bdbc7ecbb1ac8bd956aee17130253
 SHA512:
-  metadata.gz: f3ad88e6e67932af6646d1bb55ca2c3cd7f79d67de4856af22e264415026e522ebd61d9ef4a5d4b5025b676b559e6021a872fc5e16c3eda7cab8c2b2b5253ad6
-  data.tar.gz: a75ea0138edfa04f815d4a291321153e4b01c9fdb963211ee4de980897396445a0a1c36ecd29d64b9cbd7df4e454f338ae43f2bfcc68b6f9caa9fc3afd2cf287
+  metadata.gz: edecbd8db23a9f4966483fd7949734fe77a2b8baec126344275c468ba153cab8d73e01b0e001e4de8ea3f0c0a25651c521318b3477c6320b0586260a661e5a7d
+  data.tar.gz: 20b553e34d3323e86b9b21be2e4340e30e489393a9b871a8b7245ed0004a3a37884e80d3eae299f35f9e0943a3ee712a948a46f712dd61542feea56baefe19de

data/lib/cocaine/cocaine.rb

@@ -39,7 +39,15 @@ module Cocaine
         @port = port
       end
 
-      module_function :host, :host=, :port, :port=
+      def endpoints
+        @endpoints || ['::', 10053]
+      end
+
+      def endpoints=(endpoints)
+        @endpoints = endpoints
+      end
+
+      module_function :host, :host=, :port, :port=, :endpoints, :endpoints=
 
       API = {
           0 => [
@@ -56,7 +64,18 @@ module Cocaine
   end
 
   module RPC
-    HANDSHAKE, HEARTBEAT, TERMINATE, INVOKE, CHUNK, ERROR, CHOKE = (0..6).to_a
+    CONTROL_CHANNEL = 1
+
+    HANDSHAKE = 0
+
+    HEARTBEAT = 0
+    TERMINATE = 1
+
+    INVOKE = 0
+
+    CHUNK = 0
+    ERROR = 1
+    CHOKE = 2
 
     RXTREE = {
         CHUNK => ['write', nil, {}],
@@ -200,6 +219,7 @@ 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|
@@ -323,6 +343,13 @@ module Cocaine
       @endpoint = endpoint
       @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
+      end
     end
 
     def on(event, &block)
@@ -340,11 +367,11 @@ module Cocaine
     private
     def handshake
       LOG.debug '<- Handshake'
-      @socket.write MessagePack::pack([1, RPC::HANDSHAKE, [@uuid]])
+      @socket.write MessagePack::pack([RPC::CONTROL_CHANNEL, RPC::HANDSHAKE, [@uuid]])
     end
 
     def health
-      heartbeat = MessagePack::pack([1, RPC::HEARTBEAT, []])
+      heartbeat = MessagePack::pack([RPC::CONTROL_CHANNEL, RPC::HEARTBEAT, []])
       loop do
         LOG.debug '<- Heartbeat'
         @socket.write heartbeat
@@ -364,13 +391,49 @@ module Cocaine
 
     def received(session, id, payload)
       LOG.debug "-> Message(#{session}, #{id}, #{payload})"
+
+      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::HANDSHAKE
         when RPC::HEARTBEAT
+          @disown.reset
         when RPC::TERMINATE
           terminate *payload
-        when RPC::INVOKE
-          invoke session, *payload
+        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
@@ -411,6 +474,7 @@ module Cocaine
 
     def terminate(errno, reason)
       LOG.warn "Terminating [#{errno}]: #{reason}"
+      @socket.write MessagePack::pack([RPC::CONTROL_CHANNEL, RPC::TERMINATE, [errno, reason]])
       exit errno
     end
 
@@ -443,6 +507,10 @@ module Cocaine
         opts.on('--endpoint ENDPOINT', 'Worker endpoint') do |endpoint|
           options[:endpoint] = endpoint
         end
+
+        opts.on('--protocol VERSION', 'Worker protocol version') do |protocol|
+          options[:protocol] = protocol
+        end
       end.parse!
 
       Cocaine::LOG.debug "Options: #{options}"
@@ -452,10 +520,9 @@ module Cocaine
         exit 1
       end
 
-      Default::Locator.host, sep, Default::Locator.port = options[:locator].rpartition(':')
-      Default::Locator.port = Default::Locator::port.to_i
+      Default::Locator.endpoints = options[:locator].split(',')
 
-      Cocaine::LOG.debug "Setting default Locator endpoint to '#{Default::Locator.host}:#{Default::Locator.port}'"
+      Cocaine::LOG.debug "Setting default Locator endpoints to #{Default::Locator.endpoints}"
       return Worker.new(options[:app], options[:uuid], options[:endpoint])
     end
   end

data/lib/cocaine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocaine-framework
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre.rc15
+  version: 0.12.0.pre.rc21
 platform: ruby
 authors:
 - Evgeny Safronov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec