review connection / alive / sync, started ownership

hxd/net/LocalHost.hx

@@ -47,6 +47,14 @@ class LocalClient extends NetworkClient {
 		socket.out.flush();
 	}
 
+	override function stop() {
+		super.stop();
+		if( socket != null ) {
+			socket.close();
+			socket = null;
+		}
+	}
+
 }
 
 class LocalHost extends NetworkHost {
@@ -68,7 +76,7 @@ class LocalHost extends NetworkHost {
 		connected = false;
 	}
 
-	public function connect( host : String, port : Int, onConnect : Bool -> Void ) {
+	public function connect( host : String, port : Int, ?onConnect : Bool -> Void ) {
 		close();
 		isAuth = false;
 		socket = new Socket();
@@ -79,23 +87,23 @@ class LocalHost extends NetworkHost {
 			} else
 				throw msg;
 		};
-		var me = new LocalClient(this, socket);
+		self = new LocalClient(this, socket);
 		socket.connect(host, port, function() {
 			connected = true;
 			if( host == "127.0.0.1" ) enableSound = false;
-			clients = [me];
+			clients = [self];
 			onConnect(true);
 		});
 	}
 
-	public function wait( host : String, port : Int, onClient : NetworkClient -> Void ) {
+	public function wait( host : String, port : Int, ?onConnected : NetworkClient -> Void ) {
 		close();
 		isAuth = false;
 		socket = new Socket();
 		socket.bind(host, port, function(s) {
 			var c = new LocalClient(this, s);
-			clients.push(c);
-			onClient(c);
+			pendingClients.push(c);
+			if( onConnected != null ) onConnected(c);
 		});
 		isAuth = true;
 	}

hxd/net/Macros.hx

@@ -41,6 +41,7 @@ enum PropTypeDesc {
 typedef PropType = {
 	var d : PropTypeDesc;
 	var t : ComplexType;
+	@:optional var isProxy : Bool;
 	@:optional var isNull : Bool;
 	@:optional var increment : Float;
 }
@@ -218,7 +219,7 @@ class Macros {
 
 	static function serializeExpr( ctx : Expr, v : Expr, t : PropType, skipCheck = false ) {
 
-		if( needProxy(t) && !skipCheck )
+		if( t.isProxy && !skipCheck )
 			return serializeExpr(ctx, { expr : EField(v, "__value"), pos : v.pos }, t, true);
 
 		if( t.isNull && !skipCheck ) {
@@ -614,7 +615,7 @@ class Macros {
 	}
 
 	static function toProxy( p : PropType ) {
-		if( !needProxy(p) )
+		if( !p.isProxy )
 			return p.t;
 		var pt = p.t;
 		return macro : hxd.net.NetworkSerializable.Proxy<$pt>;
@@ -732,22 +733,25 @@ class Macros {
 				@:noCompletion public var __host : hxd.net.NetworkHost;
 				@:noCompletion public var __bits : Int = 0;
 				@:noCompletion public var __next : hxd.net.NetworkSerializable;
-				@:noCompletion public function setNetworkBit( b : Int ) {
-					if( __host != null ) {
-						if( __bits == 0 ) @:privateAccess __host.mark(this);
+				@:noCompletion public inline function networkSetBit( b : Int ) {
+					if( __host != null && (__bits != 0 || @:privateAccess __host.mark(this)) )
 						__bits |= 1 << b;
-					}
 				}
 				public var enableReplication(get, set) : Bool;
 				inline function get_enableReplication() return __host != null;
 				function set_enableReplication(b) {
-					hxd.net.NetworkHost.enableReplication(this, b);
+					@:privateAccess hxd.net.NetworkHost.enableReplication(this, b);
 					return b;
 				}
 				public inline function networkCancelProperty( props : hxd.net.NetworkSerializable.Property ) {
 					__bits &= ~props.toInt();
 				}
 			}).fields);
+
+			if( !Lambda.exists(fields, function(f) return f.name == "networkGetOwner") )
+				fields = fields.concat((macro class {
+					public function networkGetOwner() : hxd.net.NetworkSerializable { return null; }
+				}).fields);
 		}
 
 		var flushExpr = [];
@@ -791,11 +795,7 @@ class Macros {
 				throw "assert";
 			}
 
-			var markExpr = macro if( __host != null ) {
-				if( !__host.isAuth ) throw "Client can't set "+$v{fname};
-				if( this.__bits == 0 ) @:privateAccess __host.mark(this);
-				this.__bits |= 1 << $v{ bitID };
-			};
+			var markExpr = macro networkSetBit($v{ bitID });
 			markExpr = makeMarkExpr(fields, fname, ftype, markExpr);
 
 			var setExpr = macro
@@ -894,7 +894,7 @@ class Macros {
 				}
 
 				var forwardRPC = macro {
-					var __ctx = __host.beginRPC(this,$v{id},$resultCall);
+					var __ctx = @:privateAccess __host.beginRPC(this,$v{id},$resultCall);
 					$b{[
 						for( a in f.args )
 							macro hxd.net.Macros.serializeValue(__ctx,$i{a.name})
@@ -1073,8 +1073,8 @@ class Macros {
 					var bit : Int;
 					@:noCompletion public var __value(get, never) : $pt;
 					inline function get___value() : $pt return cast this;
-					inline function mark() if( obj != null ) obj.setNetworkBit(bit);
-					@:noCompletion public function setNetworkBit(_) mark();
+					inline function mark() if( obj != null ) obj.networkSetBit(bit);
+					@:noCompletion public function networkSetBit(_) mark();
 					@:noCompletion public function bindHost(obj, bit) { this.obj = obj; this.bit = bit; }
 					@:noCompletion public function unbindHost() this.obj = null;
 				}).fields;

hxd/net/NetworkHost.hx

@@ -4,29 +4,22 @@ class NetworkClient {
 
 	var host : NetworkHost;
 	var resultID : Int;
+	public var ownerObject : NetworkSerializable;
 
 	public function new(h) {
 		this.host = h;
 	}
 
-	public function send(bytes : haxe.io.Bytes) {
+	public function sync() {
+		host.fullSync(this);
 	}
 
-	public function fullSync( obj : Serializable ) {
-		var ctx = host.ctx;
-		var refs = ctx.refs;
-		ctx.begin();
-		ctx.addByte(NetworkHost.FULLSYNC);
-		ctx.addAnyRef(obj);
-		for( o in refs )
-			if( o != null )
-				ctx.addAnyRef(o);
-		ctx.addAnyRef(null);
-		@:privateAccess {
-			var bytes = ctx.out.getBytes();
-			ctx.out = new haxe.io.BytesBuffer();
-			send(bytes);
-		}
+	@:allow(hxd.net.NetworkHost)
+	function send(bytes : haxe.io.Bytes) {
+	}
+
+	public function sendMessage( msg : Dynamic ) {
+		host.sendMessage(msg, this);
 	}
 
 	function error( msg : String ) {
@@ -48,7 +41,7 @@ class NetworkClient {
 		case NetworkHost.REG:
 			var o : hxd.net.NetworkSerializable = cast ctx.getAnyRef();
 			o.__host = host;
-			if( host.isAlive ) host.makeAlive();
+			host.makeAlive();
 		case NetworkHost.UNREG:
 			var o : hxd.net.NetworkSerializable = cast ctx.refs[ctx.getInt()];
 			o.enableReplication = false;
@@ -56,12 +49,11 @@ class NetworkClient {
 		case NetworkHost.FULLSYNC:
 			ctx.refs = [];
 			@:privateAccess ctx.newObjects = [];
-			var obj = ctx.getAnyRef();
 			while( true ) {
 				var o = ctx.getAnyRef();
 				if( o == null ) break;
 			}
-			host.onSync(obj);
+			host.makeAlive();
 		case NetworkHost.RPC:
 			var o : hxd.net.NetworkSerializable = cast ctx.refs[ctx.getInt()];
 			var fid = ctx.getByte();
@@ -97,6 +89,10 @@ class NetworkClient {
 			host.rpcWaits.remove(resultID);
 			callb(ctx);
 
+		case NetworkHost.MSG:
+			var msg = haxe.Unserializer.run(ctx.getString());
+			host.onMessage(this, msg);
+
 		case x:
 			error("Unknown message code " + x);
 		}
@@ -104,12 +100,20 @@ class NetworkClient {
 	}
 
 	function beginRPCResult() {
-		var ctx = host.ctx;
 		host.flush();
+		var ctx = host.ctx;
 		host.hasData = true;
 		host.targetClient = this;
 		ctx.addByte(NetworkHost.RPC_RESULT);
 		ctx.addInt(resultID);
+		// after that RPC will add result value then return
+	}
+
+	public function stop() {
+		if( host == null ) return;
+		host.clients.remove(this);
+		host.pendingClients.remove(this);
+		host = null;
 	}
 
 }
@@ -124,6 +128,7 @@ class NetworkHost {
 	static inline var RPC 		= 5;
 	static inline var RPC_WITH_RESULT = 6;
 	static inline var RPC_RESULT = 7;
+	static inline var MSG		 = 8;
 
 	public static var current : NetworkHost = null;
 
@@ -136,18 +141,20 @@ class NetworkHost {
 	var lastSentBytes = 0;
 	var markHead : NetworkSerializable;
 	var ctx : Serializer;
+	var pendingClients : Array<NetworkClient>;
 	var clients : Array<NetworkClient>;
-	var isAlive = false;
 	var logger : String -> Void;
 	var hasData = false;
 	var rpcUID = Std.random(0x1000000);
 	var rpcWaits = new Map<Int,Serializer->Void>();
 	var targetClient : NetworkClient;
+	public var self(default,null) : NetworkClient;
 
 	public function new() {
 		current = this;
 		isAuth = true;
 		clients = [];
+		pendingClients = [];
 		ctx = new Serializer();
 		@:privateAccess ctx.newObjects = [];
 		ctx.begin();
@@ -164,12 +171,32 @@ class NetworkHost {
 		return ctx.getKnownRef(c);
 	}
 
-	inline function mark(o:NetworkSerializable) {
+	function mark(o:NetworkSerializable) {
+		if( !isAuth ) {
+			var owner = o.networkGetOwner();
+			if( owner == null || clients[0].ownerObject != owner )
+				throw "Client can't set property on " + o + " without ownership ("+owner + " should be "+clients[0].ownerObject+")";
+			// allow to modify the property localy but don't send it to server
+			return false;
+		}
 		o.__next = markHead;
 		markHead = o;
+		return true;
+	}
+
+	public dynamic function onMessage( from : NetworkClient, msg : Dynamic ) {
+	}
+
+	public function sendMessage( msg : Dynamic, ?to : NetworkClient ) {
+		flush();
+		targetClient = to;
+		ctx.addByte(MSG);
+		ctx.addString(haxe.Serializer.run(msg));
+		doSend();
+		targetClient = null;
 	}
 
-	public function beginRPC(o:NetworkSerializable, id:Int, onResult:Serializer->Void) {
+	function beginRPC(o:NetworkSerializable, id:Int, onResult:Serializer->Void) {
 		flushProps();
 		hasData = true;
 		if( ctx.refs[o.__uid] == null )
@@ -188,6 +215,23 @@ class NetworkHost {
 		return ctx;
 	}
 
+	function fullSync( c : NetworkClient ) {
+		if( !pendingClients.remove(c) )
+			return;
+		flush();
+		clients.push(c);
+		var refs = ctx.refs;
+		ctx.begin();
+		ctx.addByte(NetworkHost.FULLSYNC);
+		for( o in refs )
+			if( o != null )
+				ctx.addAnyRef(o);
+		ctx.addAnyRef(null);
+		targetClient = c;
+		doSend();
+		targetClient = null;
+	}
+
 	public function defaultLogger( ?filter : String -> Bool ) {
 		setLogger(function(str) {
 			if( filter != null && !filter(str) ) return;
@@ -198,7 +242,6 @@ class NetworkHost {
 	}
 
 	public function makeAlive() {
-		isAlive = true;
 		var objs = @:privateAccess ctx.newObjects;
 		if( objs.length == 0 )
 			return;
@@ -259,10 +302,6 @@ class NetworkHost {
 		}
 	}
 
-	public dynamic function onSync( obj : Serializable ) {
-		trace("SYNC " + obj);
-	}
-
 	function flushProps() {
 		var o = markHead;
 		while( o != null ) {
@@ -296,7 +335,7 @@ class NetworkHost {
 		lastSentBytes = totalSentBytes;
 	}
 
-	public static function enableReplication( o : NetworkSerializable, b : Bool ) {
+	static function enableReplication( o : NetworkSerializable, b : Bool ) {
 		if( b ) {
 			if( o.__host != null ) return;
 			if( current == null ) throw "No NetworkHost defined";

hxd/net/NetworkSerializable.hx

@@ -1,7 +1,7 @@
 package hxd.net;
 
 interface ProxyHost {
-	public function setNetworkBit( bit : Int ) : Void;
+	public function networkSetBit( bit : Int ) : Void;
 }
 
 interface ProxyChild {
@@ -15,10 +15,12 @@ interface NetworkSerializable extends Serializable extends ProxyHost {
 	public var __bits : Int;
 	public var __next : NetworkSerializable;
 	public var enableReplication(get, set) : Bool;
+	public function alive() : Void; // user defined
+
 	public function networkFlush( ctx : Serializer ) : Void;
 	public function networkSync( ctx : Serializer ) : Void;
 	public function networkRPC( ctx : Serializer, rpcID : Int, clientResult : NetworkHost.NetworkClient ) : Void;
-	public function alive() : Void;
+	public function networkGetOwner() : NetworkSerializable;
 }
 
 @:genericBuild(hxd.net.Macros.buildSerializableProxy())
@@ -28,11 +30,11 @@ class Proxy<T> {
 class BaseProxy implements ProxyHost implements ProxyChild {
 	public var obj : ProxyHost;
 	public var bit : Int;
-	public inline function setNetworkBit(_) {
+	public inline function networkSetBit(_) {
 		mark();
 	}
 	public inline function mark() {
-		if( obj != null ) obj.setNetworkBit(bit);
+		if( obj != null ) obj.networkSetBit(bit);
 	}
 	public inline function bindHost(o, bit) {
 		this.obj = o;