phprpc 3.0.4 → 3.0.5

data/examples/client.rb

@@ -6,12 +6,22 @@ client.encryptmode = 2
 client.keylength = 256
 
 starttime = Time.now
+
 10.times {
+  # synchronous invoke
   puts client.add(1, 2)
   puts client.hello('Ma Bingyao')
   puts client.sub(1, 2)
   puts client.use_session('Hello')
   puts client.use_session(' andot')
+
+  # asynchronous invoke
+  client.add(1, 2) { |result| puts result }
+  client.hello('Ma Bingyao') { |result| puts result }
+  client.sub(1, 2) { |result| puts result }
+  client.use_session('Hello') { |result| puts result }
+  client.use_session(' andot') { |result| puts result }
 }
+Thread.list.each { |t| t.join if t != Thread.main }
 endtime = Time.now
-puts endtime - starttime
+puts endtime - starttime

data/lib/crypt/xxtea.rb

@@ -4,8 +4,8 @@
 #                                                          #
 # xxtea.rb                                                 #
 #                                                          #
-# Release 3.0.4                                            #
-# Copyright (c) 2005-2008 by Team-PHPRPC                   #
+# Release 3.0.5                                            #
+# Copyright by Team-PHPRPC                                 #
 #                                                          #
 # WebSite:  http://www.phprpc.org/                         #
 #           http://www.phprpc.net/                         #
@@ -23,7 +23,7 @@
 #
 # XXTEA encryption arithmetic library.
 #
-# Copyright (C) 2005-2008 Ma Bingyao <andot@ujn.edu.cn>
+# Copyright: Ma Bingyao <andot@ujn.edu.cn>
 # Version: 1.0
 # LastModified: Sep 30, 2008
 # This library is free.  You can redistribute it and/or modify it.

data/lib/php/formator.rb

@@ -4,8 +4,8 @@
 #                                                          #
 # formator.rb                                              #
 #                                                          #
-# Release 3.0.4                                            #
-# Copyright (c) 2005-2008 by Team-PHPRPC                   #
+# Release 3.0.5                                            #
+# Copyright by Team-PHPRPC                                 #
 #                                                          #
 # WebSite:  http://www.phprpc.org/                         #
 #           http://www.phprpc.net/                         #
@@ -23,37 +23,37 @@
 #
 # PHP serialize/unserialize library.
 #
-# Copyright (C) 2005-2008 Ma Bingyao <andot@ujn.edu.cn>
+# Copyright: Ma Bingyao <andot@ujn.edu.cn>
 # Version: 1.3
-# LastModified: Jan 18, 2009
+# LastModified: Feb 27, 2009
 # This library is free.  You can redistribute it and/or modify it.
- 
+
 require 'stringio'
 
 module PHP
-  
+
   class Formator
-    
+
     class << self
-      
+
       public
-      
+
       def serialize(obj)
         _serialize(obj, Array.new(1, nil))
       end
-      
+
       def unserialize(str)
         _unserialize(StringIO.new(str), Array.new)
       end
-      
+
       private
-      
+
       @@classCache = Hash.new
-      
+
       def serialize_int(i)
-        (-2147483648..2147483647) === i ? "i:#{i};": "d:#{i};"
+        (-2147483648..2147483647) === i ? "i:#{i};": serialize_string(i.to_s)
       end
-      
+
       def serialize_double(d)
         case d.infinite?
         when -1 then 'd:-INF;'
@@ -61,11 +61,11 @@ module PHP
         else d.nan? ? 'd:NAN;' : "d:#{d};"
         end
       end
-      
+
       def serialize_string(s)
         "s:#{s.length}:\"#{s}\";"
       end
-      
+
       def serialize_time(time, obj_container)
         obj_container.push(nil, nil, nil, nil, nil, nil, nil)
         s = 'O:11:"PHPRPC_Date":7:{'
@@ -78,7 +78,7 @@ module PHP
         s << serialize_string('millisecond') << serialize_int(time.usec / 1000)
         s << '}'
       end
-      
+
       def serialize_array(a, obj_container)
         s = "a:#{a.size}:{"
         a.each_with_index { |item, index|
@@ -86,7 +86,7 @@ module PHP
         }
         s << '}'
       end
-      
+
       def serialize_hash(h, obj_container)
         s = "a:#{h.size}:{"
         h.each { |key, value|
@@ -98,7 +98,7 @@ module PHP
         }
         s << '}'
       end
-      
+
       def serialize_struct(obj, obj_container)
         classname = obj.class.to_s
         classname['Struct::'] = ''
@@ -108,9 +108,9 @@ module PHP
         members.each { |member|
           s << "#{serialize_string(member)}#{_serialize(obj[member], obj_container)}"
         }
-        s << '}'        
+        s << '}'
       end
-      
+
       def serialize_object(obj, obj_container)
         classname = obj.class.to_s.split('::').join('_')
         @@classCache[classname] = obj.class
@@ -142,7 +142,7 @@ module PHP
           end
         end
       end
-      
+
       def _serialize(obj, obj_container = nil)
         obj_id = obj_container.size
         obj_container.push(nil)
@@ -205,15 +205,15 @@ module PHP
           end
         end
       end
-      
+
       def get_class(name)
         begin
-          name.split('.').inject(Object) {|x,y| x.const_get(y) }       
+          name.split('.').inject(Object) {|x,y| x.const_get(y) }
         rescue
           nil
-        end        
+        end
       end
-      
+
       def get_class2(name, ps, i, c)
         if i < ps.size then
           p = ps[i]
@@ -227,7 +227,7 @@ module PHP
           get_class(name)
         end
       end
-      
+
       def get_class_by_alias(name)
         if @@classCache.has_key?(name) then
           @@classCache[name]
@@ -249,7 +249,7 @@ module PHP
           end
         end
       end
-      
+
       def read_number(string)
         num = ''
         loop do
@@ -259,7 +259,7 @@ module PHP
         end
         num
       end
-      
+
       def unserialize_boolean(string)
         string.read(1)
         result = (string.read(1) == true)
@@ -282,36 +282,36 @@ module PHP
         else (d.delete('.eE') == d) ? d.to_i : d.to_f
         end
       end
-      
+
       def unserialize_string(string)
         len = unserialize_int(string)
         string.read(len + 3)[1...-2]
       end
-      
+
       def unserialize_escaped_string(string)
         len = unserialize_int(string)
         s = ''
         string.read(1)
-        len.times { 
+        len.times {
           c = string.read(1)
           s << (c == "\\" ? string.read(2).to_i(16).chr : c)
         }
         string.read(2)
         return s
       end
-      
+
       def unserialize_unicode_string(string)
         len = unserialize_int(string)
         s = ''
         string.read(1)
-        len.times { 
+        len.times {
           c = string.read(1)
           s << (c == "\\" ? [string.read(4).to_i(16)].pack("U") : c)
         }
         string.read(2)
         return s
       end
-      
+
       def unserialize_hash(string, obj_container)
         count = unserialize_int(string)
         obj = Hash.new
@@ -334,7 +334,7 @@ module PHP
         string.read(1)
         return obj
       end
-      
+
       def unserialize_key(string)
         tag = string.read(1)
         if tag.nil? then
@@ -344,10 +344,10 @@ module PHP
         when 's' then unserialize_string(string)
         when 'S' then unserialize_escaped_string(string)
         when 'U' then unserialize_unicode_string(string)
-        else raise 'Unexpected Tag: "' + tag + '".' 
+        else raise 'Unexpected Tag: "' + tag + '".'
         end
       end
-      
+
       def unserialize_date(string, obj_container)
         obj_id = obj_container.size
         obj_container.push(nil)
@@ -362,7 +362,7 @@ module PHP
         time = Time.mktime(h['year'], h['month'], h['day'], h['hour'], h['minute'], h['second'], h['millisecond'] * 1000)
         obj_container[obj_id] = time
       end
-      
+
       def unserialize_object(string, obj_container)
         classname = unserialize_string(string)
         string.pos -= 1
@@ -397,7 +397,7 @@ module PHP
           obj
         end
       end
-      
+
       def unserialize_custom_object(string, obj_container)
         classname = unserialize_string(string)
         string.pos -= 1
@@ -415,7 +415,7 @@ module PHP
         obj.unserialize(str)
         obj
       end
-      
+
       def _unserialize(string, obj_container)
         tag = string.read(1)
         if tag.nil? then
@@ -460,9 +460,9 @@ module PHP
         end
         obj
       end
-      
+
     end # class self
-    
+
   end # class Formator
-  
+
 end # module PHP

data/lib/phprpc.rb

@@ -4,8 +4,8 @@
 #                                                          #
 # phprpc.rb                                                #
 #                                                          #
-# Release 3.0.4                                            #
-# Copyright (c) 2005-2008 by Team-PHPRPC                   #
+# Release 3.0.5                                            #
+# Copyright by Team-PHPRPC                                 #
 #                                                          #
 # WebSite:  http://www.phprpc.org/                         #
 #           http://www.phprpc.net/                         #
@@ -23,7 +23,7 @@
 #
 # PHPRPC library.
 #
-# Copyright (C) 2005-2008 Ma Bingyao <andot@ujn.edu.cn>
+# Copyright: Ma Bingyao <andot@ujn.edu.cn>
 # Version: 3.0
 # LastModified: Sep 13, 2008
 # This library is free.  You can redistribute it and/or modify it.

data/lib/phprpc/base_server.rb

@@ -4,8 +4,8 @@
 #                                                          #
 # base_server.rb                                           #
 #                                                          #
-# Release 3.0.4                                            #
-# Copyright (c) 2005-2008 by Team-PHPRPC                   #
+# Release 3.0.5                                            #
+# Copyright by Team-PHPRPC                                 #
 #                                                          #
 # WebSite:  http://www.phprpc.org/                         #
 #           http://www.phprpc.net/                         #
@@ -23,9 +23,9 @@
 #
 # PHPRPC BaseServer library.
 #
-# Copyright (C) 2005-2008 Ma Bingyao <andot@ujn.edu.cn>
+# Copyright: Ma Bingyao <andot@ujn.edu.cn>
 # Version: 3.0
-# LastModified: Dec 19, 2008
+# LastModified: Mar 8, 2009
 # This library is free.  You can redistribute it and/or modify it.
 
 require "digest/md5"
@@ -34,7 +34,8 @@ require "crypt/xxtea"
 require "powmod"
 require "cgi"
 require "cgi/session"
-require 'optparse'
+require "optparse"
+require "thread"
 
 module PHPRPC
 
@@ -46,7 +47,7 @@ module PHPRPC
 
   # Standard internet newline sequence
   EOL = CR + LF
-  
+
   class BaseServer
 
     attr_accessor :charset, :debug
@@ -55,6 +56,7 @@ module PHPRPC
       @methods = {}
       @charset = 'utf-8'
       @debug = $DEBUG
+      @mutex = Mutex.new
     end
 
     def add(methodname, obj = nil, aliasname = nil, &block)
@@ -84,54 +86,56 @@ module PHPRPC
       body = ''
       callback = ''
       encode = true
-      session = (env['rack.session'].is_a?(Hash) ? env['rack.session'] : CGI::Session.new(request))
-      begin
-        params = request.params
-        callback = get_base64('phprpc_callback', params)
-        encode = get_boolean('phprpc_encode', params)
-        encrypt = get_encrypt(params)
-        cid = "phprpc_#{(params.key?('phprpc_id') ? params['phprpc_id'][0] : '0')}"
-        if params.key?('phprpc_func') then
-          func = params['phprpc_func'][0].downcase
-          if @methods.key?(func) then
-            hash = get_session(session, cid)
-            if hash.key?('key') then
-              key = hash['key']
-            elsif encrypt > 0 then
-              encrypt = 0
-              raise "Can't find the key for decryption."
-            end
-            ref = get_boolean('phprpc_ref', params)
-            args = get_args(params, key, encrypt)
-            result = encode_string(encrypt_string(PHP::Formator.serialize(invoke(func, args, session)), key, 2, encrypt), encode)
-            body << 'phprpc_result="' << result << '";' << EOL
-            if ref then
-              args = encode_string(encrypt_string(PHP::Formator.serialize(args), key, 1, encrypt), encode)
-              body << 'phprpc_args="' << args << '";' << EOL
+      @mutex.synchronize {
+        session = (env['rack.session'].is_a?(Hash) ? env['rack.session'] : CGI::Session.new(request))
+        begin
+          params = request.params
+          callback = get_base64('phprpc_callback', params)
+          encode = get_boolean('phprpc_encode', params)
+          encrypt = get_encrypt(params)
+          cid = "phprpc_#{(params.key?('phprpc_id') ? params['phprpc_id'][0] : '0')}"
+          if params.key?('phprpc_func') then
+            func = params['phprpc_func'][0].downcase
+            if @methods.key?(func) then
+              hash = get_session(session, cid)
+              if hash.key?('key') then
+                key = hash['key']
+              elsif encrypt > 0 then
+                encrypt = 0
+                raise "Can't find the key for decryption."
+              end
+              ref = get_boolean('phprpc_ref', params)
+              args = get_args(params, key, encrypt)
+              result = encode_string(encrypt_string(PHP::Formator.serialize(invoke(func, args, session)), key, 2, encrypt), encode)
+              body << 'phprpc_result="' << result << '";' << EOL
+              if ref then
+                args = encode_string(encrypt_string(PHP::Formator.serialize(args), key, 1, encrypt), encode)
+                body << 'phprpc_args="' << args << '";' << EOL
+              end
+            else
+              raise "Can't find this function #{func}()."
             end
+            write_error(body, 0, '', callback, encode)
+          elsif (encrypt != false) and (encrypt != 0) then
+            hash = get_session(session, cid)
+            keylen = get_keylength(params, hash)
+            key_exchange(body, env, request, hash, callback, encode, encrypt, keylen)
+            set_session(session, cid, hash)
           else
-            raise "Can't find this function #{func}()."
+            write_functions(body, callback, encode)
           end
-          write_error(body, 0, '', callback, encode)
-        elsif (encrypt != false) and (encrypt != 0) then
-          hash = get_session(session, cid)
-          keylen = get_keylength(params, hash)
-          key_exchange(body, env, request, hash, callback, encode, encrypt, keylen)
-          set_session(session, cid, hash)
-        else
-          write_functions(body, callback, encode)          
-        end
-      rescue Exception => e
-        body = ''
-        if @debug then
-          write_error(body, 1, e.backtrace.unshift(e.message).join(EOL), callback, encode)
-        else
-          write_error(body, 1, e.message, callback, encode)
+        rescue Exception => e
+          body = ''
+          if @debug then
+            write_error(body, 1, e.backtrace.unshift(e.message).join(EOL), callback, encode)
+          else
+            write_error(body, 1, e.message, callback, encode)
+          end
+        ensure
+          session.close if session.respond_to?(:close)
+          return [header(request, body), body]
         end
-      ensure
-        session.close if session.respond_to?(:close)        
-        return [header(request, body), body]
-      end
+      }
     end
 
     private
@@ -158,7 +162,7 @@ module PHPRPC
     end
 
     def encode_string(str, encode = true, flag = true)
-      return str if str == '' 
+      return str if str == ''
       encode ? [str].pack('m').delete!("\n") : add_js_slashes(str, flag)
     end
 
@@ -169,7 +173,7 @@ module PHPRPC
     def decrypt_string(str, key, level, encrypt)
       (encrypt >= level) ? Crypt::XXTEA.decrypt(str, key) : str
     end
-    
+
     def header(request, body)
       h = {
         'X-Powered-By' => 'PHPRPC Server/3.0',
@@ -181,12 +185,12 @@ module PHPRPC
       }
       output_cookies = request.instance_variable_get(:@output_cookies)
       if not output_cookies.nil? then
-        h["Set-Cookie"] = output_cookies[0].to_s 
+        h["Set-Cookie"] = output_cookies[0].to_s
         request.instance_variable_set(:@output_cookies, nil)
       end
       return h
     end
-    
+
     def write_url(body, env, request, encode)
       output_hidden = request.instance_variable_get(:@output_hidden)
       output_hidden = { env['rack.session.options'][:id] => env['rack.session.options'][:key] } if env['rack.session.options'].is_a?(Hash)
@@ -205,7 +209,7 @@ module PHPRPC
         }
         params = request.params
         if (params.size > 0) then
-          params.each { |key, values| 
+          params.each { |key, values|
             values.each { |value|
               url << "#{key}=#{CGI::escape(value)}&"
             } if not key.index(/^phprpc_/i)
@@ -220,14 +224,14 @@ module PHPRPC
       body << 'phprpc_functions="' << encode_string(PHP::Formator.serialize(@methods.keys), encode) << '";' << EOL
       body << callback
     end
- 
+
     def write_error(body, errno, errstr, callback, encode)
       body << 'phprpc_errno="' << errno.to_s << '";' << EOL
       body << 'phprpc_errstr="' << encode_string(errstr, encode, false) << '";' << EOL
       body << 'phprpc_output="";' << EOL
       body << callback
     end
-    
+
     def get_boolean(name, params)
       (params.key?(name) ? (params[name][0].downcase != "false") : true)
     end
@@ -235,7 +239,7 @@ module PHPRPC
     def get_base64(name, params)
       (params.key?(name) ? params[name][0].unpack('m')[0] : '')
     end
-    
+
     def get_encrypt(params)
       if params.key?('phprpc_encrypt') then
         encrypt = params['phprpc_encrypt'][0].downcase
@@ -248,7 +252,7 @@ module PHPRPC
         0
       end
     end
-    
+
     def get_args(params, key, encrypt)
       args = []
       if params.key?('phprpc_args') then
@@ -259,7 +263,7 @@ module PHPRPC
       end
       return args
     end
-    
+
     def set_session(session, cid, hash)
       session[cid] = PHP::Formator.serialize(hash)
     end
@@ -272,7 +276,7 @@ module PHPRPC
         {}
       end
     end
-    
+
     def get_keylength(params, hash)
       (params.key?('phprpc_keylen') ? params['phprpc_keylen'][0].to_i : ((hash.key?('keylen')) ? hash['keylen'] : 128))
     end
@@ -297,18 +301,18 @@ module PHPRPC
       end
       body << callback
     end
-    
+
   end # class BaseServer
 
   class Request
 
     attr_accessor :cookies
     attr :params
-      
+
     def initialize(env)
       @params = env["QUERY_STRING"] ? CGI::parse(env["QUERY_STRING"].to_s) : {}
       if (env['REQUEST_METHOD'] == 'POST' and
-      (env['CONTENT_TYPE'].nil? or 
+      (env['CONTENT_TYPE'].nil? or
        env['CONTENT_TYPE'].split(/\s*[;,]\s*/, 2)[0].downcase ==
        'application/x-www-form-urlencoded')) then
         # fix ebb bug, the read method of ebb can't return all bytes from the I/O stream
@@ -321,7 +325,7 @@ module PHPRPC
         end
         @params.update(CGI::parse(input_body))
       end
-      @cookies = if env["HTTP_COOKIE"] then CGI::Cookie::parse(env["HTTP_COOKIE"].to_s) else {} end 
+      @cookies = if env["HTTP_COOKIE"] then CGI::Cookie::parse(env["HTTP_COOKIE"].to_s) else {} end
       @output_cookies = nil
       @output_hidden = nil
     end
@@ -332,19 +336,19 @@ module PHPRPC
       value = params[0]
       if value then value else "" end
     end
-      
+
     def []=(key, val)
       @params[key] = val
     end
-      
+
     def keys
       @params.keys
     end
-      
+
     def has_key?(key)
       @params.has_key?(key)
     end
-      
+
     alias key? has_key?
 
     alias include? has_key?
@@ -353,15 +357,15 @@ module PHPRPC
 
 
   class DHParams
-    
+
     class << self
-      
+
       def get(length)
         length = get_nearest(length)
         dhparams = @dhparams_gen[length]
         [length, dhparams[rand(dhparams.size)]]
       end
-      
+
       private
 
       def init
@@ -385,9 +389,9 @@ module PHPRPC
         }
         return @lengths[j]
       end
-    
+
     end # class self
-    
+
   end # class DHParams
 
 end # module PHPRPC