hprose 1.4.2 → 1.4.3

data/examples/client.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'hprose'
 
-client = HproseHttpClient.new('http://localhost:3000/')
+client = HproseClient.new('http://localhost:3000/')
 def error(name, e)
   puts name
   puts e

data/examples/tcpclient.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'hprose'
+
+client = HproseClient.new('tcp://127.0.0.1:4321/')
+def error(name, e)
+  puts name
+  puts e
+end
+client.onerror = :error
+
+puts(client.hello('World'))

data/lib/hprose/client.rb

@@ -14,19 +14,37 @@
 #                                                          #
 # hprose client for ruby                                   #
 #                                                          #
-# LastModified: Mar 8, 2014                                #
+# LastModified: Mar 10, 2014                               #
 # Author: Ma Bingyao <andot@hprose.com>                    #
 #                                                          #
 ############################################################
 
 require "hprose/common"
 require "hprose/io"
+require "uri"
 
 module Hprose
   class Client
-    include Tags
-    include ResultMode
+    class << self
+      alias :__new__ :new
+      def inherited(subclass)
+        class << subclass
+          alias :new :__new__
+        end
+      end
+    end
     public
+    def self.new(uri)
+      u = URI.parse(uri)
+      case u.scheme
+      when 'http', 'https' then
+        return HttpClient.new(uri)
+      when 'tcp', 'tcp4', 'tcp6' then
+        return TcpClient.new(uri)
+      else
+        raise Exception.exception("The " << u.scheme << " client isn't implemented.")
+      end
+    end
     def initialize(uri = nil)
       @onerror = nil
       @filter = Filter.new
@@ -82,6 +100,8 @@ module Hprose
       raise NotImplementedError.new("#{self.class.name}#send_and_receive is an abstract method")
     end
     private
+    include Tags
+    include ResultMode
     def do_output(methodname, args, byref, simple)
       stream = StringIO.new
       writer = Writer.new(stream, simple)

data/lib/hprose/httpclient.rb

@@ -14,7 +14,7 @@
 #                                                          #
 # hprose http client for ruby                              #
 #                                                          #
-# LastModified: Mar 8, 2014                                #
+# LastModified: Mar 10, 2014                               #
 # Author: Ma Bingyao <andot@hprose.com>                    #
 #                                                          #
 ############################################################
@@ -26,9 +26,6 @@ require "uri"
 
 module Hprose
   class HttpClient < Client
-    include Tags
-    @@cookie_manager = {}
-    @@cookie_manager_mutex = Mutex.new
     public
     def initialize(uri = nil)
       super
@@ -87,6 +84,8 @@ module Hprose
       end
     end
     private
+    @@cookie_manager = {}
+    @@cookie_manager_mutex = Mutex.new
     def _set_cookie(cookielist, host)
       @@cookie_manager_mutex.synchronize do
         cookielist.each do |cookies|

data/lib/hprose/tcpclient.rb

@@ -0,0 +1,127 @@
+############################################################
+#                                                          #
+#                          hprose                          #
+#                                                          #
+# Official WebSite: http://www.hprose.com/                 #
+#                   http://www.hprose.net/                 #
+#                   http://www.hprose.org/                 #
+#                                                          #
+############################################################
+
+############################################################
+#                                                          #
+# hprose/tcpclient.rb                                      #
+#                                                          #
+# hprose tcp client for ruby                               #
+#                                                          #
+# LastModified: Mar 10, 2014                               #
+# Author: Ma Bingyao <andot@hprose.com>                    #
+#                                                          #
+############################################################
+
+require "hprose/client"
+require "socket"
+
+module Hprose
+  class TcpClient < Client
+    private
+      module TcpConnStatus
+        Free = 0
+        Using = 1
+        Closing = 2
+      end
+      class TcpConnEntry
+        def initialize(uri)
+          @uri = uri
+          @status = TcpConnStatus::Using
+          @socket = nil
+        end
+        attr_accessor :uri, :status, :socket
+      end
+      class TcpConnPool
+        def initialize
+          @pool = []
+          @mutex = Mutex.new
+        end
+        def get(uri)
+          @mutex.synchronize do
+            @pool.each do |entry|
+              if entry.status == TcpConnStatus::Free then
+                if not entry.uri.nil? and entry.uri == uri then
+                  entry.status = TcpConnStatus::Using
+                  return entry
+                elsif entry.uri.nil? then
+                  entry.status = TcpConnStatus::Using
+                  entry.uri = uri
+                  return entry
+                end
+              end
+            end
+            entry = TcpConnEntry.new(uri)
+            @pool << entry
+            return entry
+          end
+        end
+        def close(uri)
+          sockets = []
+          @mutex.synchronize do
+            @pool.each do |entry|
+              if not entry.uri.nil? and entry.uri == uri then
+                if entry.status == TcpConnStatus::Free then
+                  sockets << entry.socket
+                  entry.socket = nil
+                  entry.uri = nil
+                else
+                  entry.status = TcpConnStatus::Closing
+                end
+              end
+            end
+          end
+          freeSockets(sockets)
+        end
+        def free(entry)
+          if entry.status == TcpConnStatus::Closing then
+            if not entry.socket.nil? then
+              entry.socket.close
+              entry.socket = nil
+            end
+            entry.uri = nil
+          end
+          entry.status = TcpConnStatus::Free
+        end
+        private
+        def freeSockets(sockets)
+          Thread.start do
+            sockets.each do |socket|
+              socket.close
+            end
+          end
+        end
+      end
+    public
+    def initialize(uri = nil)
+      super
+      @pool = TcpConnPool.new
+    end
+    protected
+    def send_and_receive(data)
+      entry = @pool.get(@uri)
+      if entry.socket.nil? then
+        entry.socket = TCPSocket.new(@uri.host, @uri.port)
+      end
+      begin
+        n = data.size
+        entry.socket.send("" << (n >> 24 & 0xff) << (n >> 16 & 0xff) << (n >> 8 & 0xff) << (n & 0xff) << data, 0)
+        buf = entry.socket.recv(4, 0)
+        n = buf[0].ord << 24 | buf[1].ord << 16 | buf[2].ord << 8 | buf[3].ord
+        data = entry.socket.recv(n, 0)
+      rescue
+        entry.status = TcpConnStatus::Closing
+        raise
+      ensure
+        @pool.free(entry)
+      end
+      return data
+    end
+  end # class TcpClient
+end # module Hprose

data/lib/hprose.rb

@@ -14,7 +14,7 @@
 #                                                          #
 # hprose for ruby                                          #
 #                                                          #
-# LastModified: Mar 8, 2014                                #
+# LastModified: Mar 10, 2014                                #
 # Author: Ma Bingyao <andot@hprose.com>                    #
 #                                                          #
 ############################################################
@@ -31,6 +31,7 @@ module Hprose
   autoload :Formatter, 'hprose/io'
   autoload :Client, 'hprose/client'
   autoload :HttpClient, 'hprose/httpclient'
+  autoload :TcpClient, 'hprose/tcpclient'
   autoload :Service, 'hprose/service'
   autoload :HttpService, 'hprose/httpservice'
 end
@@ -46,5 +47,6 @@ Object.const_set(:HproseWriter, Hprose.const_get(:Writer))
 Object.const_set(:HproseFormatter, Hprose.const_get(:Formatter))
 Object.const_set(:HproseClient, Hprose.const_get(:Client))
 Object.const_set(:HproseHttpClient, Hprose.const_get(:HttpClient))
+Object.const_set(:HproseTcpClient, Hprose.const_get(:TcpClient))
 Object.const_set(:HproseService, Hprose.const_get(:Service))
 Object.const_set(:HproseHttpService, Hprose.const_get(:HttpService))

data/lib/hproseclient.rb

@@ -14,7 +14,7 @@
 #                                                          #
 # hprose client for ruby                                   #
 #                                                          #
-# LastModified: May 19, 2010                               #
+# LastModified: Mar 10, 2014                               #
 # Author: Ma Bingyao <andot@hprose.com>                    #
 #                                                          #
 ############################################################
@@ -22,7 +22,9 @@
 module Hprose
   autoload :Client, 'hprose/client'
   autoload :HttpClient, 'hprose/httpclient'
+  autoload :TcpClient, 'hprose/tcpclient'
 end
 
 Object.const_set(:HproseClient, Hprose.const_get(:Client))
-Object.const_set(:HproseHttpClient, Hprose.const_get(:HttpClient))
+Object.const_set(:HproseHttpClient, Hprose.const_get(:HttpClient))
+Object.const_set(:HproseTcpClient, Hprose.const_get(:TcpClient))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hprose
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: andot@hprose.com
@@ -19,12 +19,14 @@ extra_rdoc_files: []
 files:
 - examples/client.rb
 - examples/server.rb
+- examples/tcpclient.rb
 - lib/hprose/client.rb
 - lib/hprose/common.rb
 - lib/hprose/httpclient.rb
 - lib/hprose/httpservice.rb
 - lib/hprose/io.rb
 - lib/hprose/service.rb
+- lib/hprose/tcpclient.rb
 - lib/hprose.rb
 - lib/hproseclient.rb
 - lib/hprosecommon.rb