jstp 1.2.0 → 1.3.0

data/lib/jstp/engine.rb

@@ -4,6 +4,7 @@ module JSTP
 
     def initialize test = false
       @config = Configuration.instance
+      @logger = @config.logger
       from.send @config.strategy.inbound unless test
     end
     
@@ -60,6 +61,10 @@ module JSTP
       @clients ||= {}
     end
 
+    def logger
+      @logger
+    end
+
     class NotPermittedError < RuntimeError; end
     class NotAControllerError < RuntimeError; end
     class ClientNotFoundError < RuntimeError; end

data/lib/jstp/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module JSTP
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/reader/jstp/engine.rb

@@ -39,20 +39,49 @@ module Reader
 
       # Start the server with the TCP strategy
       def tcp
-        @server = TCPServer.open @config.port.inbound
+        @server = TCPServer.new @config.port.inbound          
+
+        @config.logger.info "JSTP node running on TCP mode in port #{@config.port.inbound}"
         loop {
           Thread.start(@server.accept) { |client|
-            begin 
-              @source.clients[UUID.new.generate] = client
-              @message = ::JSTP::Dispatch.new client.gets
-              @source.dispatch @message, client
+            begin
+              # Opening routine
+              token = UUID.new.generate 
+              @source.clients[token] = client
+              if @source.respond_to? :open
+                begin
+                  @source.open client, token
+                rescue Exception => e
+                  @config.logger.error "On open hook: #{e.class}: #{e.message}"
+                  @config.logger.debug e.backtrace.to_s
+                end
+              end
+
+              # Message loop
+              while line = client.gets
+                begin
+                  @message = ::JSTP::Dispatch.new line
+                  @source.dispatch @message, client
+                rescue Exception => e
+                  log_exception e, @message
+                end
+              end
+
+              # Closing routine
               client.close
+              @source.clients.delete token
+              if @source.respond_to? :close
+                @source.close client, token
+              end
             rescue Exception => exception
-              log_exception exception, @message
+              @config.logger.error "Client #{token} is DOWN: #{exception.class}: #{exception.message}"
+              @config.logger.debug exception.backtrace.to_s
               client.close
             end
           }
         }
+      rescue Exception => e
+        @config.logger.fatal "Could not initialize TCP server on port #{@config.port.inbound}"
       end
 
       private

data/lib/writer/jstp/dispatch.rb

@@ -1,10 +1,12 @@
 module Writer
   module JSTP
     class Dispatch < Discoverer::Pattern
+      attr_accessor :pool
 
       def initialize source
         super source
         @config = ::JSTP::Configuration.instance
+        @pool = {}
       end
 
       # Dispatch this applying the websocket strategy
@@ -41,17 +43,22 @@ module Writer
         end
       end
 
-      # Dispatch thid applying the TCP strategy
+      # Dispatch applying the TCP strategy
       def tcp port = nil
-        if port.nil?
-          client = TCPSocket.open @source["resource"].first, @config.port.outbound
-        else
-          client = TCPSocket.open @source["resource"].first, port
+        port = @config.port.outbound if port.nil?
+        host = @source['resource'].first
+
+        @pool[host] ||= TCPSocket.new host, port
+
+        if @pool[host].closed?
+          @pool[host] = TCPSocket.new host, port
+        elsif not @pool[host].stat.readable?
+          @pool[host].close
+          @pool[host] = TCPSocket.new host, port
         end
 
-        client.puts @source.to.json
+        @pool[host].puts @source.to.json
         @config.logger.debug @source.to_s
-        client.close
       end
 
       def json

data/samples/hook-steroid.rb

@@ -0,0 +1,17 @@
+require 'jstp'
+
+class Eng < JSTP::Engine
+  def open client, token
+    logger.info "Open #{token}"
+  end
+
+  def close client, token
+    logger.warn "Close #{token}" 
+  end
+
+  class User < JSTP::Controller
+    def get
+      engine.logger.info query.first
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstp
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -172,6 +172,7 @@ files:
 - samples/api-2.0/middleware.rb
 - samples/api-2.0/references.rb
 - samples/diff.rb
+- samples/hook-steroid.rb
 - samples/hooks.rb
 - samples/micro.rb
 - samples/new_api.rb