revent 0.2.2 → 0.2.3

data/lib/revent/Client.as

@@ -10,6 +10,7 @@
 		private static const TYPE_ERROR:int  = 2;
 
 		private var _socket:Socket;
+		private var _bytes:ByteArray;
 
 		public static function bytesToByteArray(bytes:Array):ByteArray {
 			var ba:ByteArray = new ByteArray();
@@ -37,6 +38,8 @@
 			_socket.addEventListener(IOErrorEvent.IO_ERROR, onIOError);
 			_socket.addEventListener(SecurityErrorEvent.SECURITY_ERROR, onSecurityError);
 			_socket.addEventListener(ProgressEvent.SOCKET_DATA, onData);
+
+			_bytes = new ByteArray();
 		}
 
 		public function connect(host:String, port:int):void {
@@ -85,9 +88,17 @@
 		}
 
 		private function onData(event:ProgressEvent):void {
+			var b:ByteArray = new ByteArray();
+			_socket.readBytes(b);
+
+			// Append
+			_bytes.position = _bytes.length;
+			_bytes.writeBytes(b);
+			_bytes.position = 0;
+
 			try {
 				while (true) {
-					var o:Array = _socket.readObject();
+					var o:Array = _bytes.readObject();
 					var type:int     = o[0];
 					var cmd:Object   = o[1];
 					var value:Object = o[2];
@@ -105,6 +116,12 @@
 						break;
 					}
 					dispatchEvent(e);
+
+					// Cleanup
+					if (_bytes.position == _bytes.length) {
+						_bytes = new ByteArray();
+						return;
+					}
 				}
 			} catch (e:Error) {
 			}

data/lib/revent/as_r.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'eventmachine'
 require 'zlib'
+require 'logger'
 require "#{File.dirname(__FILE__)}/amf3/amf3"
 
 # AS clients are not reliable. For security, we close the connection immediately

data/test/as_r/Document.as

@@ -1,15 +1,23 @@
 package {
 	import flash.display.Sprite;
+	import flash.events.MouseEvent;
+	import flash.utils.ByteArray;
+
 	import revent.Client;
 	import revent.CallEvent;
 
 	public class Document extends Sprite {
-		private static const CMD1:int = 0;
-		private static const CMD2:int = 1;
+		private static const HOST:String = "localhost";
+		private static const PORT:int    = 1935;
+
+		private static const CMD_TEST_BYTE_ARRAY:int = 0;
 
 		private var _client:Client;
+		private var _size:int;
 
 		public function Document():void {
+			_byteArrayBtn.addEventListener(MouseEvent.CLICK, onByteArrayBtnClick);
+
 			_client = new Client();
 			_client.addEventListener(CallEvent.CONNECT, onConnect);
 			_client.addEventListener(CallEvent.CLOSE, onClose);
@@ -18,46 +26,57 @@
 			_client.addEventListener(CallEvent.CALL, onCall);
 			_client.addEventListener(CallEvent.RESULT, onResult);
 			_client.addEventListener(CallEvent.ERROR, onError);
-			_client.connect("localhost", 1935);
+			_client.connect(HOST, PORT);
 		}
 
 		// ---------------------------------------------------------------------------
 
 		private function onConnect(event:CallEvent):void {
-			for (var i:int; i < 3; i++) {
-				_client.call(CMD1, ["1", 23, null]);
-				_client.call(CMD2, 99);
-			}
+			_status.text += "onConnect\n";
 		}
 
 		private function onClose(event:CallEvent):void {
-			trace("onClose");
+			_status.text += "onClose\n";
 		}
 
 		private function onIOError(event:CallEvent):void {
-			trace("onIOError");
+			_status.text += "onIOError\n";
 		}
 
 		private function onSecurityError(event:CallEvent):void {
-			trace("onSecurityError");
+			_status.text += "onSecurityError\n";
 		}
 
 		private function onCall(event:CallEvent):void {
-			trace("onCall");
-			trace(event.cmd);
-			trace(event.value);
+			_status.text += "onCall\n";
+			_status.text += "cmd:" + event.cmd;
+			_status.text += "value:" + event.value;
 		}
 
 		private function onResult(event:CallEvent):void {
-			trace("onResult");
-			trace(event.cmd);
-			trace(event.value);
+			_status.text += "onResult";
+			_status.text += "cmd:" + event.cmd;
+
+			var b:Array = event.value as Array;
+			//trace(b);
+			_status.text += "Received bytes: " + b.length;
+			_size += 1024;
+			_status.text += "Testing byte array with size: " + _size;
+			_client.call(CMD_TEST_BYTE_ARRAY, _size);
 		}
 
 		private function onError(event:CallEvent):void {
-			trace("onError");
-			trace(event.cmd);
-			trace(event.value);
+			_status.text += "onError";
+			_status.text += "cmd: " + event.cmd;
+			_status.text += "value: " + event.value;
+		}
+
+		// ---------------------------------------------------------------------------
+
+		private function onByteArrayBtnClick(event:MouseEvent):void {
+			_size = 1024;
+			_status.text += "Testing byte array with size: " + _size;
+			_client.call(CMD_TEST_BYTE_ARRAY, _size);
 		}
 	}
 }

data/test/as_r/server.rb

@@ -1,10 +1,12 @@
 require 'revent/as_r'
 
+HOST = 'localhost'
+PORT = 1935
+
 class Server
   include Revent::ASRServer
 
-  CMD1 = 0
-  CMD2 = 1
+  CMD_TEST_BYTE_ARRAY = 0
 
   def initialize(host, port)
     start_server(host, port)
@@ -21,11 +23,12 @@ class Server
   end
 
   def on_call(client, cmd, value)
-    puts "on_call:"
-    puts client.remote_ip
-    puts cmd
-    puts value
-    [cmd, value]
+    puts "on_call:", cmd, value
+    a = []
+    (0...value).each do |i|
+      a << i
+    end
+    client.result(CMD_TEST_BYTE_ARRAY, a)
   end
 
   def on_result(client, cmd, value)
@@ -44,5 +47,5 @@ class Server
 end
 
 EventMachine::run do
-  Server.new("localhost", 1935)
+  Server.new(HOST, PORT)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: revent
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Ngoc DAO Thanh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-09 00:00:00 +09:00
+date: 2008-02-17 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -24,10 +24,10 @@ extra_rdoc_files: []
 files: 
 - test
 - test/as_r
+- test/as_r/Document.as
 - test/as_r/client.fla
 - test/as_r/server.rb
 - test/as_r/client.swf
-- test/as_r/Document.as
 - test/r_r
 - test/r_r/client.rb
 - test/r_r/server.rb