@supraio/client-daemon-js 1.0.0-mzscreengeometry.449 → 1.0.0-mzscreengeometry.450

package/supra-client-screen.js

@@ -184609,11 +184609,11 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver"]
 		$r = w.mutex.Lock(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		_r = $clone(jsNaClDecoder, js.Value).Call("render", new sliceType([(x = picture, new x.constructor.elem(x))])); /* */ $s = 8; case 8: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		renderPromise = $clone(_r, js.Value);
-		_r$1 = jshelper.Await($clone(renderPromise, js.Value)); /* */ $s = 9; case 9: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		$r = w.mutex.Unlock(); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		_r$1 = jshelper.Await($clone(renderPromise, js.Value)); /* */ $s = 10; case 10: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 		_tuple = _r$1;
 		renderResult = _tuple[0];
 		err = _tuple[1];
-		$r = w.mutex.Unlock(); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		/* */ if (!(err === ptrType$3.nil)) { $s = 11; continue; }
 		/* */ $s = 12; continue;
 		/* if (!(err === ptrType$3.nil)) { */ case 11:
@@ -190566,7 +190566,7 @@ $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
 			$panic(_r$8);
 		/* } */ case 24:
 		domEvents = dom.NewDomEvents();
-		w = new windowImpl.ptr(screen$1, ptrType$2.nil, $clone(canvasEl[0], js.Value), $clone(ctx2d, js.Value), false, domEvents, $clone(resizeCallback, js.Func));
+		w = new windowImpl.ptr(screen$1, new sync.Mutex.ptr(0, 0), $clone(canvasEl[0], js.Value), $clone(ctx2d, js.Value), false, domEvents, $clone(resizeCallback, js.Func));
 		$r = domEvents.BindEvents(); /* */ $s = 26; case 26: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$s = -1; return w;
 		/* */ } return; } var $f = {$blk: newWindow, $c: true, $r, _arg, _arg$1, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _r$8, adaptCanvas, canvasEl, ctx2d, domEvents, hasGeometry, opts, resizeCallback, screen$1, style, w, $s};return $f;
@@ -192087,7 +192087,7 @@ $packages["github.com/supraio/client-daemon/pkg/input"] = (function() {
 	return $pkg;
 })();
 $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
-	var $pkg = {}, $init, bufio, base64, fmt, errs, helper, message, netstream, io, log, sync, time, Pinger, messageCallback, MetadataServer, response, MetadataResponsiveSender, MetadataMessageSender, MetadataClient, Writer, MessageSender, Framer, sliceType, sliceType$1, ptrType, funcType, sliceType$2, sliceType$3, ptrType$1, funcType$1, sliceType$4, ptrType$2, ptrType$3, funcType$2, funcType$3, ptrType$4, chanType, mapType, ptrType$5, ptrType$6, ptrType$7, _r, NewPinger, NewMetadataServer, NewMetadataResponsiveSender, NewMetadataMessageSender, NewScreenMetadataClient, NewMessageSender, NewFramer, splitFrames;
+	var $pkg = {}, $init, bufio, base64, fmt, errs, helper, message, netstream, io, log, sync, time, Pinger, messageCallback, MetadataServer, response, MetadataResponsiveSender, MetadataMessageSender, MetadataClient, Writer, MessageSender, Framer, sliceType, structType, sliceType$1, ptrType, funcType, sliceType$2, sliceType$3, ptrType$1, funcType$1, sliceType$4, ptrType$2, ptrType$3, chanType, funcType$2, funcType$3, ptrType$4, chanType$1, mapType, ptrType$5, ptrType$6, ptrType$7, _r, NewPinger, NewMetadataServer, NewMetadataResponsiveSender, NewMetadataMessageSender, NewScreenMetadataClient, NewMessageSender, NewFramer, splitFrames;
 	bufio = $packages["bufio"];
 	base64 = $packages["encoding/base64"];
 	fmt = $packages["fmt"];
@@ -192099,15 +192099,19 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 	log = $packages["log"];
 	sync = $packages["sync"];
 	time = $packages["time"];
-	Pinger = $pkg.Pinger = $newType(0, $kindStruct, "netclient.Pinger", true, "github.com/supraio/client-daemon/pkg/netclient", true, function(messageSender_, closed_) {
+	Pinger = $pkg.Pinger = $newType(0, $kindStruct, "netclient.Pinger", true, "github.com/supraio/client-daemon/pkg/netclient", true, function(messageSender_, closed_, done_, stopped_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.messageSender = $ifaceNil;
 			this.closed = false;
+			this.done = $chanNil;
+			this.stopped = $chanNil;
 			return;
 		}
 		this.messageSender = messageSender_;
 		this.closed = closed_;
+		this.done = done_;
+		this.stopped = stopped_;
 	});
 	messageCallback = $pkg.messageCallback = $newType(0, $kindStruct, "netclient.messageCallback", true, "github.com/supraio/client-daemon/pkg/netclient", false, function(id_, callback_) {
 		this.$val = this;
@@ -192211,6 +192215,7 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 		this.sendMu = sendMu_;
 	});
 	sliceType = $sliceType($emptyInterface);
+	structType = $structType("", []);
 	sliceType$1 = $sliceType($Uint8);
 	ptrType = $ptrType(Framer);
 	funcType = $funcType([$String], [], false);
@@ -192221,17 +192226,18 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 	sliceType$4 = $sliceType(funcType$1);
 	ptrType$2 = $ptrType(bufio.Scanner);
 	ptrType$3 = $ptrType(Pinger);
+	chanType = $chanType(structType, false, false);
 	funcType$2 = $funcType([message.MsgType, sliceType$1], [], false);
 	funcType$3 = $funcType([], [$error], false);
 	ptrType$4 = $ptrType(MetadataResponsiveSender);
-	chanType = $chanType(response, false, false);
-	mapType = $mapType($String, chanType);
+	chanType$1 = $chanType(response, false, false);
+	mapType = $mapType($String, chanType$1);
 	ptrType$5 = $ptrType(MetadataMessageSender);
 	ptrType$6 = $ptrType(MetadataClient);
 	ptrType$7 = $ptrType(MessageSender);
 	NewPinger = function(messageSender) {
 		var messageSender;
-		return new Pinger.ptr(messageSender, true);
+		return new Pinger.ptr(messageSender, true, new $Chan(structType, 0), new $Chan(structType, 0));
 	};
 	$pkg.NewPinger = NewPinger;
 	Pinger.ptr.prototype.Start = function() {
@@ -192242,15 +192248,26 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 	};
 	Pinger.prototype.Start = function() { return this.$val.Start(); };
 	Pinger.ptr.prototype.Close = function() {
-		var h;
+		var {_r$1, _selection, h, $s, $r, $c} = $restore(this, {});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		h = this;
 		h.closed = true;
+		_selection = $select([[h.done], []]);
+		if (_selection[0] === 0) {
+		} else if (_selection[0] === 1) {
+			$close(h.done);
+		}
+		_r$1 = $recv(h.stopped); /* */ $s = 1; case 1: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		_r$1[0];
+		$s = -1; return;
+		/* */ } return; } var $f = {$blk: Pinger.ptr.prototype.Close, $c: true, $r, _r$1, _selection, h, $s};return $f;
 	};
 	Pinger.prototype.Close = function() { return this.$val.Close(); };
 	Pinger.ptr.prototype.startPinging = function() {
-		var {_r$1, err, h, $s, $r, $c} = $restore(this, {});
-		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		var {_arg, _r$1, _r$2, _r$3, _selection, err, h, $s, $deferred, $r, $c} = $restore(this, {});
+		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
 		h = this;
+		$deferred.push([function(_arg) { $close(_arg); }, [h.stopped]]);
 		/* while (true) { */ case 1:
 			/* if (!(!h.closed)) { break; } */ if(!(!h.closed)) { $s = 2; continue; }
 			_r$1 = h.messageSender.Send(2, new sliceType$1([])); /* */ $s = 3; case 3: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
@@ -192260,11 +192277,21 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 			/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 4:
 				$r = errs.Print("Ping error", err); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			/* } */ case 5:
-			$r = time.Sleep(new time.Duration(0, 1000000000)); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$2 = time.After(new time.Duration(0, 1000000000)); /* */ $s = 7; case 7: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			_r$3 = $select([[_r$2], [h.done]]); /* */ $s = 8; case 8: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+			_selection = _r$3;
+			/* */ if (_selection[0] === 0) { $s = 9; continue; }
+			/* */ if (_selection[0] === 1) { $s = 10; continue; }
+			/* */ $s = 11; continue;
+			/* if (_selection[0] === 0) { */ case 9:
+				$s = 11; continue;
+			/* } else if (_selection[0] === 1) { */ case 10:
+				$s = 12; case 12: return;
+			/* } */ case 11:
 		$s = 1; continue;
 		case 2:
 		$s = -1; return;
-		/* */ } return; } var $f = {$blk: Pinger.ptr.prototype.startPinging, $c: true, $r, _r$1, err, h, $s};return $f;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: Pinger.ptr.prototype.startPinging, $c: true, $r, _arg, _r$1, _r$2, _r$3, _selection, err, h, $s, $deferred};return $f; } }
 	};
 	Pinger.prototype.startPinging = function() { return this.$val.startPinging(); };
 	NewMetadataServer = function(framer, closeClient) {
@@ -192277,9 +192304,12 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 		s = this;
 		pinger = NewPinger(NewMetadataMessageSender(s));
 		pinger.Start();
-		s.OnClose((function(reason) {
-			var reason;
-			pinger.Close();
+		s.OnClose((function $b(reason) {
+			var {reason, $s, $r, $c} = $restore(this, {reason});
+			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+			$r = pinger.Close(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$s = -1; return;
+			/* */ } return; } var $f = {$blk: $b, $c: true, $r, reason, $s};return $f;
 		}));
 		$go($methodVal(s, "handleData"), []);
 	};
@@ -192763,7 +192793,7 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 	ptrType$6.methods = [{prop: "Connect", name: "Connect", pkg: "", typ: $funcType([], [ptrType$1, $error], false)}];
 	ptrType$7.methods = [{prop: "Send", name: "Send", pkg: "", typ: $funcType([message.MsgType, sliceType$1], [$error], false)}];
 	ptrType.methods = [{prop: "Send", name: "Send", pkg: "", typ: $funcType([sliceType$1], [$Int, $error], false)}, {prop: "Receive", name: "Receive", pkg: "", typ: $funcType([], [sliceType$1, $error], false)}];
-	Pinger.init("github.com/supraio/client-daemon/pkg/netclient", [{prop: "messageSender", name: "messageSender", embedded: false, exported: false, typ: message.Sender, tag: ""}, {prop: "closed", name: "closed", embedded: false, exported: false, typ: $Bool, tag: ""}]);
+	Pinger.init("github.com/supraio/client-daemon/pkg/netclient", [{prop: "messageSender", name: "messageSender", embedded: false, exported: false, typ: message.Sender, tag: ""}, {prop: "closed", name: "closed", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "done", name: "done", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "stopped", name: "stopped", embedded: false, exported: false, typ: chanType, tag: ""}]);
 	messageCallback.init("github.com/supraio/client-daemon/pkg/netclient", [{prop: "id", name: "id", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "callback", name: "callback", embedded: false, exported: false, typ: funcType$2, tag: ""}]);
 	MetadataServer.init("github.com/supraio/client-daemon/pkg/netclient", [{prop: "framer", name: "framer", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "closeClient", name: "closeClient", embedded: false, exported: false, typ: funcType$3, tag: ""}, {prop: "closed", name: "closed", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "onClose", name: "onClose", embedded: false, exported: false, typ: sliceType$2, tag: ""}, {prop: "onMessage", name: "onMessage", embedded: false, exported: false, typ: sliceType$3, tag: ""}, {prop: "nextMessageID", name: "nextMessageID", embedded: false, exported: false, typ: $Int, tag: ""}]);
 	response.init("github.com/supraio/client-daemon/pkg/netclient", [{prop: "err", name: "err", embedded: false, exported: false, typ: sliceType$1, tag: ""}, {prop: "data", name: "data", embedded: false, exported: false, typ: sliceType$1, tag: ""}]);
@@ -193095,7 +193125,7 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 			$panic(err);
 		}
 		domEvents = dom.NewDomEvents();
-		w = new windowImpl.ptr(screen$1, ptrType$2.nil, $clone(canvasEl, js.Value), gl, ptrType$4.nil, ptrType$5.nil, ptrType$4.nil, ptrType$5.nil, ptrType$5.nil, ptrType$5.nil, ptrType$6.nil, false, domEvents, 0, 0);
+		w = new windowImpl.ptr(screen$1, new sync.Mutex.ptr(0, 0), $clone(canvasEl, js.Value), gl, ptrType$4.nil, ptrType$5.nil, ptrType$4.nil, ptrType$5.nil, ptrType$5.nil, ptrType$5.nil, ptrType$6.nil, false, domEvents, 0, 0);
 		/* */ if (!((opts.Width === 0))) { $s = 14; continue; }
 		/* */ $s = 15; continue;
 		/* if (!((opts.Width === 0))) { */ case 14:
@@ -194499,7 +194529,7 @@ $packages["github.com/supraio/client-daemon/pkg/render/screenbuffer"] = (functio
 	return $pkg;
 })();
 $packages["github.com/supraio/client-daemon/pkg/stats"] = (function() {
-	var $pkg = {}, $init, image, log, math, sync, time, Stopwatch, Frame, Stats, Metrics, EncodingPreferences, InputMetrics, ClientStats, ptrType, sliceType, ptrType$1, ptrType$2, sliceType$1, mapType, ptrType$3, ptrType$4, ptrType$5, mapType$1, NewStopwatch, NewStats, NewMetrics, average, variance;
+	var $pkg = {}, $init, image, log, math, sync, time, Stopwatch, Frame, Stats, Metrics, EncodingPreferences, InputMetrics, ClientStats, ptrType, sliceType, ptrType$1, ptrType$2, sliceType$1, structType, mapType, ptrType$3, ptrType$4, ptrType$5, chanType, mapType$1, NewStopwatch, NewStats, NewMetrics, average, variance;
 	image = $packages["image"];
 	log = $packages["log"];
 	math = $packages["math"];
@@ -194516,7 +194546,7 @@ $packages["github.com/supraio/client-daemon/pkg/stats"] = (function() {
 		this.groups = groups_;
 	});
 	Frame = $pkg.Frame = $newType(8, $kindInterface, "stats.Frame", true, "github.com/supraio/client-daemon/pkg/stats", true, null);
-	Stats = $pkg.Stats = $newType(0, $kindStruct, "stats.Stats", true, "github.com/supraio/client-daemon/pkg/stats", true, function(stopped_, lastFrameAt_, lastScreenPingAt_, stopwatch_, metrics_, latency_, serverTimestampAhead_, serverTimestampAheadBuffer_, currentFramesCount_, lastFrameRate_, totalFramesCount_, lastFramesLatencyAverage_, lastFramesLatencyVariance_, longTermFramesLatencyAverage_, longTermFramesLatencyVariance_, lastFramesCollectionAverage_, lastFramesCollectionVariance_, longTermFramesCollectionAverage_, longTermFramesCollectionVariance_, currentThrottledCollectionFramesCount_, lastThrottledCollectionFrameRate_, lastFramesDecodeWriteAverage_, lastFramesDecodeOutputAverage_, lastFramesDecodeWriteVariance_, lastFramesDecodeOutputVariance_, longTermFramesDecodeWriteAverage_, longTermFramesDecodeOutputAverage_, longTermFramesDecodeWriteVariance_, longTermFramesDecodeOutputVariance_, currentThrottledDecodeFramesCount_, lastThrottledDecodeFrameRate_, lastFramesRenderAverage_, lastFramesRenderVariance_, longTermFramesRenderAverage_, longTermFramesRenderVariance_, currentThrottledRenderFramesCount_, lastThrottledRenderFrameRate_, screenResolutionWidth_, screenResolutionHeight_, lastInteractionAt_, encodingPreferences_) {
+	Stats = $pkg.Stats = $newType(0, $kindStruct, "stats.Stats", true, "github.com/supraio/client-daemon/pkg/stats", true, function(stopped_, lastFrameAt_, lastScreenPingAt_, stopwatch_, metrics_, done_, calcStopped_, latency_, serverTimestampAhead_, serverTimestampAheadBuffer_, currentFramesCount_, lastFrameRate_, totalFramesCount_, lastFramesLatencyAverage_, lastFramesLatencyVariance_, longTermFramesLatencyAverage_, longTermFramesLatencyVariance_, lastFramesCollectionAverage_, lastFramesCollectionVariance_, longTermFramesCollectionAverage_, longTermFramesCollectionVariance_, currentThrottledCollectionFramesCount_, lastThrottledCollectionFrameRate_, lastFramesDecodeWriteAverage_, lastFramesDecodeOutputAverage_, lastFramesDecodeWriteVariance_, lastFramesDecodeOutputVariance_, longTermFramesDecodeWriteAverage_, longTermFramesDecodeOutputAverage_, longTermFramesDecodeWriteVariance_, longTermFramesDecodeOutputVariance_, currentThrottledDecodeFramesCount_, lastThrottledDecodeFrameRate_, lastFramesRenderAverage_, lastFramesRenderVariance_, longTermFramesRenderAverage_, longTermFramesRenderVariance_, currentThrottledRenderFramesCount_, lastThrottledRenderFrameRate_, screenResolutionWidth_, screenResolutionHeight_, lastInteractionAt_, encodingPreferences_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.stopped = false;
@@ -194524,6 +194554,8 @@ $packages["github.com/supraio/client-daemon/pkg/stats"] = (function() {
 			this.lastScreenPingAt = new time.Time.ptr(new $Uint64(0, 0), new $Int64(0, 0), ptrType.nil);
 			this.stopwatch = ptrType$1.nil;
 			this.metrics = ptrType$2.nil;
+			this.done = $chanNil;
+			this.calcStopped = $chanNil;
 			this.latency = new time.Duration(0, 0);
 			this.serverTimestampAhead = new time.Duration(0, 0);
 			this.serverTimestampAheadBuffer = sliceType$1.nil;
@@ -194567,6 +194599,8 @@ $packages["github.com/supraio/client-daemon/pkg/stats"] = (function() {
 		this.lastScreenPingAt = lastScreenPingAt_;
 		this.stopwatch = stopwatch_;
 		this.metrics = metrics_;
+		this.done = done_;
+		this.calcStopped = calcStopped_;
 		this.latency = latency_;
 		this.serverTimestampAhead = serverTimestampAhead_;
 		this.serverTimestampAheadBuffer = serverTimestampAheadBuffer_;
@@ -194735,10 +194769,12 @@ $packages["github.com/supraio/client-daemon/pkg/stats"] = (function() {
 	ptrType$1 = $ptrType(Stopwatch);
 	ptrType$2 = $ptrType(Metrics);
 	sliceType$1 = $sliceType(time.Duration);
+	structType = $structType("", []);
 	mapType = $mapType($String, time.Time);
 	ptrType$3 = $ptrType(ClientStats);
 	ptrType$4 = $ptrType(image.Point);
 	ptrType$5 = $ptrType(Stats);
+	chanType = $chanType(structType, false, false);
 	mapType$1 = $mapType($String, sliceType$1);
 	NewStopwatch = function() {
 		return new Stopwatch.ptr($clone(new sync.Mutex.ptr(0, 0), sync.Mutex), new $global.Map());
@@ -194791,12 +194827,28 @@ $packages["github.com/supraio/client-daemon/pkg/stats"] = (function() {
 		_r = time.Now(); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		_r$1 = time.Now(); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 		_r$2 = time.Now(); /* */ $s = 3; case 3: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
-		s = new Stats.ptr(false, $clone(_r, time.Time), $clone(_r$1, time.Time), NewStopwatch(), NewMetrics(), new time.Duration(0, 0), new time.Duration(0, 0), sliceType$1.nil, 0, 0, 0, new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), 0, 0, new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), 0, 0, new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), 0, 0, 0, 0, $clone(_r$2, time.Time), new EncodingPreferences.ptr(0, 0, "", "", ""));
+		s = new Stats.ptr(false, $clone(_r, time.Time), $clone(_r$1, time.Time), NewStopwatch(), NewMetrics(), new $Chan(structType, 0), new $Chan(structType, 0), new time.Duration(0, 0), new time.Duration(0, 0), sliceType$1.nil, 0, 0, 0, new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), 0, 0, new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), 0, 0, new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), new time.Duration(0, 0), 0, 0, 0, 0, $clone(_r$2, time.Time), new EncodingPreferences.ptr(0, 0, "", "", ""));
 		$go($methodVal(s, "startCalculations"), []);
 		$s = -1; return s;
 		/* */ } return; } var $f = {$blk: NewStats, $c: true, $r, _r, _r$1, _r$2, s, $s};return $f;
 	};
 	$pkg.NewStats = NewStats;
+	Stats.ptr.prototype.Stop = function() {
+		var {_r, _selection, s, $s, $r, $c} = $restore(this, {});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		s = this;
+		s.stopped = true;
+		_selection = $select([[s.done], []]);
+		if (_selection[0] === 0) {
+		} else if (_selection[0] === 1) {
+			$close(s.done);
+		}
+		_r = $recv(s.calcStopped); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_r[0];
+		$s = -1; return;
+		/* */ } return; } var $f = {$blk: Stats.ptr.prototype.Stop, $c: true, $r, _r, _selection, s, $s};return $f;
+	};
+	Stats.prototype.Stop = function() { return this.$val.Stop(); };
 	Stats.ptr.prototype.GetClientStats = function() {
 		var s;
 		s = this;
@@ -195003,9 +195055,10 @@ $packages["github.com/supraio/client-daemon/pkg/stats"] = (function() {
 	};
 	Stats.prototype.GetFrameRate = function() { return this.$val.GetFrameRate(); };
 	Stats.ptr.prototype.startCalculations = function() {
-		var {_r, _r$1, _r$10, _r$11, _r$12, _r$13, _r$14, _r$15, _r$16, _r$17, _r$18, _r$19, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _r$8, _r$9, s, $s, $r, $c} = $restore(this, {});
-		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		var {_arg, _r, _r$1, _r$10, _r$11, _r$12, _r$13, _r$14, _r$15, _r$16, _r$17, _r$18, _r$19, _r$2, _r$20, _r$21, _r$3, _r$4, _r$5, _r$6, _r$7, _r$8, _r$9, _selection, s, $s, $deferred, $r, $c} = $restore(this, {});
+		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
 		s = this;
+		$deferred.push([function(_arg) { $close(_arg); }, [s.calcStopped]]);
 		/* while (true) { */ case 1:
 			/* if (!(!s.stopped)) { break; } */ if(!(!s.stopped)) { $s = 2; continue; }
 			s.lastFrameRate = s.currentFramesCount;
@@ -195068,11 +195121,21 @@ $packages["github.com/supraio/client-daemon/pkg/stats"] = (function() {
 			_r$19 = s.metrics.GetVariance("frame_render_long_term"); /* */ $s = 32; case 32: if($c) { $c = false; _r$19 = _r$19.$blk(); } if (_r$19 && _r$19.$blk !== undefined) { break s; }
 			s.longTermFramesRenderVariance = _r$19;
 			$r = s.print(); /* */ $s = 33; case 33: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-			$r = time.Sleep(new time.Duration(0, 1000000000)); /* */ $s = 34; case 34: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$20 = time.After(new time.Duration(0, 1000000000)); /* */ $s = 34; case 34: if($c) { $c = false; _r$20 = _r$20.$blk(); } if (_r$20 && _r$20.$blk !== undefined) { break s; }
+			_r$21 = $select([[_r$20], [s.done]]); /* */ $s = 35; case 35: if($c) { $c = false; _r$21 = _r$21.$blk(); } if (_r$21 && _r$21.$blk !== undefined) { break s; }
+			_selection = _r$21;
+			/* */ if (_selection[0] === 0) { $s = 36; continue; }
+			/* */ if (_selection[0] === 1) { $s = 37; continue; }
+			/* */ $s = 38; continue;
+			/* if (_selection[0] === 0) { */ case 36:
+				$s = 38; continue;
+			/* } else if (_selection[0] === 1) { */ case 37:
+				$s = 39; case 39: return;
+			/* } */ case 38:
 		$s = 1; continue;
 		case 2:
 		$s = -1; return;
-		/* */ } return; } var $f = {$blk: Stats.ptr.prototype.startCalculations, $c: true, $r, _r, _r$1, _r$10, _r$11, _r$12, _r$13, _r$14, _r$15, _r$16, _r$17, _r$18, _r$19, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _r$8, _r$9, s, $s};return $f;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: Stats.ptr.prototype.startCalculations, $c: true, $r, _arg, _r, _r$1, _r$10, _r$11, _r$12, _r$13, _r$14, _r$15, _r$16, _r$17, _r$18, _r$19, _r$2, _r$20, _r$21, _r$3, _r$4, _r$5, _r$6, _r$7, _r$8, _r$9, _selection, s, $s, $deferred};return $f; } }
 	};
 	Stats.prototype.startCalculations = function() { return this.$val.startCalculations(); };
 	Stats.ptr.prototype.print = function() {
@@ -195273,11 +195336,11 @@ $packages["github.com/supraio/client-daemon/pkg/stats"] = (function() {
 		return (new time.Duration(0, math.Sqrt(($flatten64($div64(sum, (new time.Duration(0, values.$length)), false))))));
 	};
 	ptrType$1.methods = [{prop: "Start", name: "Start", pkg: "", typ: $funcType([$String], [], false)}, {prop: "Stop", name: "Stop", pkg: "", typ: $funcType([$String], [time.Duration], false)}];
-	ptrType$5.methods = [{prop: "GetClientStats", name: "GetClientStats", pkg: "", typ: $funcType([], [ptrType$3], false)}, {prop: "SetLatency", name: "SetLatency", pkg: "", typ: $funcType([time.Duration], [], false)}, {prop: "UpdateServerTimestampAhead", name: "UpdateServerTimestampAhead", pkg: "", typ: $funcType([time.Duration], [], false)}, {prop: "SetScreenResolution", name: "SetScreenResolution", pkg: "", typ: $funcType([ptrType$4], [], false)}, {prop: "NotifyFrame", name: "NotifyFrame", pkg: "", typ: $funcType([Frame], [], false)}, {prop: "NotifyScreenPing", name: "NotifyScreenPing", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameCollectionStarted", name: "NotifyFrameCollectionStarted", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameCollectionEnded", name: "NotifyFrameCollectionEnded", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameCollectionDuration", name: "NotifyFrameCollectionDuration", pkg: "", typ: $funcType([time.Duration], [], false)}, {prop: "NotifyThrottledCollectionFrame", name: "NotifyThrottledCollectionFrame", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameDecodeWriteStarted", name: "NotifyFrameDecodeWriteStarted", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameDecodeWriteEnded", name: "NotifyFrameDecodeWriteEnded", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameDecodeOutputStarted", name: "NotifyFrameDecodeOutputStarted", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameDecodeOutputEnded", name: "NotifyFrameDecodeOutputEnded", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyThrottledDecodeFrame", name: "NotifyThrottledDecodeFrame", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameRenderStarted", name: "NotifyFrameRenderStarted", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameRenderEnded", name: "NotifyFrameRenderEnded", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyThrottledRenderFrame", name: "NotifyThrottledRenderFrame", pkg: "", typ: $funcType([], [], false)}, {prop: "GetLastFrameAt", name: "GetLastFrameAt", pkg: "", typ: $funcType([], [time.Time], false)}, {prop: "GetLastScreenPingAt", name: "GetLastScreenPingAt", pkg: "", typ: $funcType([], [time.Time], false)}, {prop: "GetLastScreenImpulseAt", name: "GetLastScreenImpulseAt", pkg: "", typ: $funcType([], [time.Time], false)}, {prop: "GetFrameRate", name: "GetFrameRate", pkg: "", typ: $funcType([], [$Int], false)}, {prop: "startCalculations", name: "startCalculations", pkg: "github.com/supraio/client-daemon/pkg/stats", typ: $funcType([], [], false)}, {prop: "print", name: "print", pkg: "github.com/supraio/client-daemon/pkg/stats", typ: $funcType([], [], false)}, {prop: "GetServerTime", name: "GetServerTime", pkg: "", typ: $funcType([], [time.Time], false)}, {prop: "NotifyInteraction", name: "NotifyInteraction", pkg: "", typ: $funcType([], [], false)}, {prop: "GetInteractionWaitMultiplier", name: "GetInteractionWaitMultiplier", pkg: "", typ: $funcType([], [$Float64], false)}, {prop: "SetEncodingPreferences", name: "SetEncodingPreferences", pkg: "", typ: $funcType([EncodingPreferences], [], false)}];
+	ptrType$5.methods = [{prop: "Stop", name: "Stop", pkg: "", typ: $funcType([], [], false)}, {prop: "GetClientStats", name: "GetClientStats", pkg: "", typ: $funcType([], [ptrType$3], false)}, {prop: "SetLatency", name: "SetLatency", pkg: "", typ: $funcType([time.Duration], [], false)}, {prop: "UpdateServerTimestampAhead", name: "UpdateServerTimestampAhead", pkg: "", typ: $funcType([time.Duration], [], false)}, {prop: "SetScreenResolution", name: "SetScreenResolution", pkg: "", typ: $funcType([ptrType$4], [], false)}, {prop: "NotifyFrame", name: "NotifyFrame", pkg: "", typ: $funcType([Frame], [], false)}, {prop: "NotifyScreenPing", name: "NotifyScreenPing", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameCollectionStarted", name: "NotifyFrameCollectionStarted", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameCollectionEnded", name: "NotifyFrameCollectionEnded", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameCollectionDuration", name: "NotifyFrameCollectionDuration", pkg: "", typ: $funcType([time.Duration], [], false)}, {prop: "NotifyThrottledCollectionFrame", name: "NotifyThrottledCollectionFrame", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameDecodeWriteStarted", name: "NotifyFrameDecodeWriteStarted", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameDecodeWriteEnded", name: "NotifyFrameDecodeWriteEnded", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameDecodeOutputStarted", name: "NotifyFrameDecodeOutputStarted", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameDecodeOutputEnded", name: "NotifyFrameDecodeOutputEnded", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyThrottledDecodeFrame", name: "NotifyThrottledDecodeFrame", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameRenderStarted", name: "NotifyFrameRenderStarted", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyFrameRenderEnded", name: "NotifyFrameRenderEnded", pkg: "", typ: $funcType([], [], false)}, {prop: "NotifyThrottledRenderFrame", name: "NotifyThrottledRenderFrame", pkg: "", typ: $funcType([], [], false)}, {prop: "GetLastFrameAt", name: "GetLastFrameAt", pkg: "", typ: $funcType([], [time.Time], false)}, {prop: "GetLastScreenPingAt", name: "GetLastScreenPingAt", pkg: "", typ: $funcType([], [time.Time], false)}, {prop: "GetLastScreenImpulseAt", name: "GetLastScreenImpulseAt", pkg: "", typ: $funcType([], [time.Time], false)}, {prop: "GetFrameRate", name: "GetFrameRate", pkg: "", typ: $funcType([], [$Int], false)}, {prop: "startCalculations", name: "startCalculations", pkg: "github.com/supraio/client-daemon/pkg/stats", typ: $funcType([], [], false)}, {prop: "print", name: "print", pkg: "github.com/supraio/client-daemon/pkg/stats", typ: $funcType([], [], false)}, {prop: "GetServerTime", name: "GetServerTime", pkg: "", typ: $funcType([], [time.Time], false)}, {prop: "NotifyInteraction", name: "NotifyInteraction", pkg: "", typ: $funcType([], [], false)}, {prop: "GetInteractionWaitMultiplier", name: "GetInteractionWaitMultiplier", pkg: "", typ: $funcType([], [$Float64], false)}, {prop: "SetEncodingPreferences", name: "SetEncodingPreferences", pkg: "", typ: $funcType([EncodingPreferences], [], false)}];
 	ptrType$2.methods = [{prop: "AddSample", name: "AddSample", pkg: "", typ: $funcType([$String, sliceType$1], [], true)}, {prop: "GetCount", name: "GetCount", pkg: "", typ: $funcType([$String], [$Int], false)}, {prop: "GetAverage", name: "GetAverage", pkg: "", typ: $funcType([$String], [time.Duration], false)}, {prop: "GetVariance", name: "GetVariance", pkg: "", typ: $funcType([$String], [time.Duration], false)}, {prop: "RemoveOldest", name: "RemoveOldest", pkg: "", typ: $funcType([$String, $Int], [], false)}, {prop: "Reset", name: "Reset", pkg: "", typ: $funcType([$String], [], false)}];
 	Stopwatch.init("github.com/supraio/client-daemon/pkg/stats", [{prop: "mutex", name: "mutex", embedded: false, exported: false, typ: sync.Mutex, tag: ""}, {prop: "groups", name: "groups", embedded: false, exported: false, typ: mapType, tag: ""}]);
 	Frame.init([{prop: "GetTimestamp", name: "GetTimestamp", pkg: "", typ: $funcType([], [time.Time], false)}]);
-	Stats.init("github.com/supraio/client-daemon/pkg/stats", [{prop: "stopped", name: "stopped", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "lastFrameAt", name: "lastFrameAt", embedded: false, exported: false, typ: time.Time, tag: ""}, {prop: "lastScreenPingAt", name: "lastScreenPingAt", embedded: false, exported: false, typ: time.Time, tag: ""}, {prop: "stopwatch", name: "stopwatch", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "metrics", name: "metrics", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "latency", name: "latency", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "serverTimestampAhead", name: "serverTimestampAhead", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "serverTimestampAheadBuffer", name: "serverTimestampAheadBuffer", embedded: false, exported: false, typ: sliceType$1, tag: ""}, {prop: "currentFramesCount", name: "currentFramesCount", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastFrameRate", name: "lastFrameRate", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "totalFramesCount", name: "totalFramesCount", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastFramesLatencyAverage", name: "lastFramesLatencyAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesLatencyVariance", name: "lastFramesLatencyVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesLatencyAverage", name: "longTermFramesLatencyAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesLatencyVariance", name: "longTermFramesLatencyVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesCollectionAverage", name: "lastFramesCollectionAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesCollectionVariance", name: "lastFramesCollectionVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesCollectionAverage", name: "longTermFramesCollectionAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesCollectionVariance", name: "longTermFramesCollectionVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "currentThrottledCollectionFramesCount", name: "currentThrottledCollectionFramesCount", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastThrottledCollectionFrameRate", name: "lastThrottledCollectionFrameRate", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastFramesDecodeWriteAverage", name: "lastFramesDecodeWriteAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesDecodeOutputAverage", name: "lastFramesDecodeOutputAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesDecodeWriteVariance", name: "lastFramesDecodeWriteVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesDecodeOutputVariance", name: "lastFramesDecodeOutputVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesDecodeWriteAverage", name: "longTermFramesDecodeWriteAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesDecodeOutputAverage", name: "longTermFramesDecodeOutputAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesDecodeWriteVariance", name: "longTermFramesDecodeWriteVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesDecodeOutputVariance", name: "longTermFramesDecodeOutputVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "currentThrottledDecodeFramesCount", name: "currentThrottledDecodeFramesCount", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastThrottledDecodeFrameRate", name: "lastThrottledDecodeFrameRate", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastFramesRenderAverage", name: "lastFramesRenderAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesRenderVariance", name: "lastFramesRenderVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesRenderAverage", name: "longTermFramesRenderAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesRenderVariance", name: "longTermFramesRenderVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "currentThrottledRenderFramesCount", name: "currentThrottledRenderFramesCount", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastThrottledRenderFrameRate", name: "lastThrottledRenderFrameRate", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "screenResolutionWidth", name: "screenResolutionWidth", embedded: false, exported: false, typ: $Uint32, tag: ""}, {prop: "screenResolutionHeight", name: "screenResolutionHeight", embedded: false, exported: false, typ: $Uint32, tag: ""}, {prop: "lastInteractionAt", name: "lastInteractionAt", embedded: false, exported: false, typ: time.Time, tag: ""}, {prop: "encodingPreferences", name: "encodingPreferences", embedded: false, exported: false, typ: EncodingPreferences, tag: ""}]);
+	Stats.init("github.com/supraio/client-daemon/pkg/stats", [{prop: "stopped", name: "stopped", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "lastFrameAt", name: "lastFrameAt", embedded: false, exported: false, typ: time.Time, tag: ""}, {prop: "lastScreenPingAt", name: "lastScreenPingAt", embedded: false, exported: false, typ: time.Time, tag: ""}, {prop: "stopwatch", name: "stopwatch", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "metrics", name: "metrics", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "done", name: "done", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "calcStopped", name: "calcStopped", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "latency", name: "latency", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "serverTimestampAhead", name: "serverTimestampAhead", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "serverTimestampAheadBuffer", name: "serverTimestampAheadBuffer", embedded: false, exported: false, typ: sliceType$1, tag: ""}, {prop: "currentFramesCount", name: "currentFramesCount", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastFrameRate", name: "lastFrameRate", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "totalFramesCount", name: "totalFramesCount", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastFramesLatencyAverage", name: "lastFramesLatencyAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesLatencyVariance", name: "lastFramesLatencyVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesLatencyAverage", name: "longTermFramesLatencyAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesLatencyVariance", name: "longTermFramesLatencyVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesCollectionAverage", name: "lastFramesCollectionAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesCollectionVariance", name: "lastFramesCollectionVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesCollectionAverage", name: "longTermFramesCollectionAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesCollectionVariance", name: "longTermFramesCollectionVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "currentThrottledCollectionFramesCount", name: "currentThrottledCollectionFramesCount", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastThrottledCollectionFrameRate", name: "lastThrottledCollectionFrameRate", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastFramesDecodeWriteAverage", name: "lastFramesDecodeWriteAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesDecodeOutputAverage", name: "lastFramesDecodeOutputAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesDecodeWriteVariance", name: "lastFramesDecodeWriteVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesDecodeOutputVariance", name: "lastFramesDecodeOutputVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesDecodeWriteAverage", name: "longTermFramesDecodeWriteAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesDecodeOutputAverage", name: "longTermFramesDecodeOutputAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesDecodeWriteVariance", name: "longTermFramesDecodeWriteVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesDecodeOutputVariance", name: "longTermFramesDecodeOutputVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "currentThrottledDecodeFramesCount", name: "currentThrottledDecodeFramesCount", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastThrottledDecodeFrameRate", name: "lastThrottledDecodeFrameRate", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastFramesRenderAverage", name: "lastFramesRenderAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "lastFramesRenderVariance", name: "lastFramesRenderVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesRenderAverage", name: "longTermFramesRenderAverage", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "longTermFramesRenderVariance", name: "longTermFramesRenderVariance", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "currentThrottledRenderFramesCount", name: "currentThrottledRenderFramesCount", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "lastThrottledRenderFrameRate", name: "lastThrottledRenderFrameRate", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "screenResolutionWidth", name: "screenResolutionWidth", embedded: false, exported: false, typ: $Uint32, tag: ""}, {prop: "screenResolutionHeight", name: "screenResolutionHeight", embedded: false, exported: false, typ: $Uint32, tag: ""}, {prop: "lastInteractionAt", name: "lastInteractionAt", embedded: false, exported: false, typ: time.Time, tag: ""}, {prop: "encodingPreferences", name: "encodingPreferences", embedded: false, exported: false, typ: EncodingPreferences, tag: ""}]);
 	Metrics.init("github.com/supraio/client-daemon/pkg/stats", [{prop: "mutex", name: "mutex", embedded: false, exported: false, typ: sync.Mutex, tag: ""}, {prop: "groups", name: "groups", embedded: false, exported: false, typ: mapType$1, tag: ""}]);
 	EncodingPreferences.init("", [{prop: "PreferredQualityIndex", name: "PreferredQualityIndex", embedded: false, exported: true, typ: $Int, tag: "json:\"preferredQualityIndex\""}, {prop: "PreferredBitrateKbps", name: "PreferredBitrateKbps", embedded: false, exported: true, typ: $Int, tag: "json:\"preferredBitrateKbps\""}, {prop: "PreferredPreset", name: "PreferredPreset", embedded: false, exported: true, typ: $String, tag: "json:\"preferredPreset\""}, {prop: "PreferredTune", name: "PreferredTune", embedded: false, exported: true, typ: $String, tag: "json:\"preferredTune\""}, {prop: "PreferredProfile", name: "PreferredProfile", embedded: false, exported: true, typ: $String, tag: "json:\"preferredProfile\""}]);
 	InputMetrics.init("", [{prop: "MouseEventsReceived", name: "MouseEventsReceived", embedded: false, exported: true, typ: $Int, tag: "json:\"mouseEventsReceived\""}, {prop: "MouseEventsSent", name: "MouseEventsSent", embedded: false, exported: true, typ: $Int, tag: "json:\"mouseEventsSent\""}, {prop: "MouseBytesSent", name: "MouseBytesSent", embedded: false, exported: true, typ: $Int, tag: "json:\"mouseBytesSent\""}, {prop: "MouseSendAverageNano", name: "MouseSendAverageNano", embedded: false, exported: true, typ: $Int64, tag: "json:\"mouseSendAverageNano\""}, {prop: "MouseSendMaxNano", name: "MouseSendMaxNano", embedded: false, exported: true, typ: $Int64, tag: "json:\"mouseSendMaxNano\""}, {prop: "MouseWaitMaxNano", name: "MouseWaitMaxNano", embedded: false, exported: true, typ: $Int64, tag: "json:\"mouseWaitMaxNano\""}, {prop: "TouchEventsReceived", name: "TouchEventsReceived", embedded: false, exported: true, typ: $Int, tag: "json:\"touchEventsReceived\""}, {prop: "TouchEventsSent", name: "TouchEventsSent", embedded: false, exported: true, typ: $Int, tag: "json:\"touchEventsSent\""}, {prop: "TouchBytesSent", name: "TouchBytesSent", embedded: false, exported: true, typ: $Int, tag: "json:\"touchBytesSent\""}, {prop: "TouchSendAverageNano", name: "TouchSendAverageNano", embedded: false, exported: true, typ: $Int64, tag: "json:\"touchSendAverageNano\""}, {prop: "TouchSendMaxNano", name: "TouchSendMaxNano", embedded: false, exported: true, typ: $Int64, tag: "json:\"touchSendMaxNano\""}, {prop: "TouchMaxConcurrentSeq", name: "TouchMaxConcurrentSeq", embedded: false, exported: true, typ: $Int, tag: "json:\"touchMaxConcurrentSeq\""}, {prop: "TouchWaitMaxNano", name: "TouchWaitMaxNano", embedded: false, exported: true, typ: $Int64, tag: "json:\"touchWaitMaxNano\""}]);
@@ -195296,7 +195359,7 @@ $packages["github.com/supraio/client-daemon/pkg/stats"] = (function() {
 	return $pkg;
 })();
 $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
-	var $pkg = {}, $init, decoder, errs, frame, netframe, screenbuffer, stats, screen, image, time, RenderingLoop, DecodeResultProvider, DecodeResult, DecoderLoop, FrameProvider, CollectionLoop, ptrType, sliceType, ptrType$1, ptrType$2, ptrType$3, funcType, ptrType$4, chanType, chanType$1, ptrType$5, NewRenderingLoop, NewDecoderLoop, NewCollectionLoop;
+	var $pkg = {}, $init, decoder, errs, frame, netframe, screenbuffer, stats, screen, image, sync, time, RenderingLoop, DecodeResultProvider, DecodeResult, DecoderLoop, FrameProvider, CollectionLoop, ptrType, structType, sliceType, ptrType$1, ptrType$2, ptrType$3, chanType, funcType, ptrType$4, chanType$1, chanType$2, ptrType$5, NewRenderingLoop, NewDecoderLoop, NewCollectionLoop;
 	decoder = $packages["github.com/supraio/client-daemon/pkg/decoder"];
 	errs = $packages["github.com/supraio/client-daemon/pkg/errs"];
 	frame = $packages["github.com/supraio/client-daemon/pkg/render/frame"];
@@ -195305,8 +195368,9 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 	stats = $packages["github.com/supraio/client-daemon/pkg/stats"];
 	screen = $packages["golang.org/x/exp/shiny/screen"];
 	image = $packages["image"];
+	sync = $packages["sync"];
 	time = $packages["time"];
-	RenderingLoop = $pkg.RenderingLoop = $newType(0, $kindStruct, "player.RenderingLoop", true, "github.com/supraio/client-daemon/pkg/render/player", true, function(decodeResultProvider_, window_, stats_, started_, renderingInProgress_) {
+	RenderingLoop = $pkg.RenderingLoop = $newType(0, $kindStruct, "player.RenderingLoop", true, "github.com/supraio/client-daemon/pkg/render/player", true, function(decodeResultProvider_, window_, stats_, started_, renderingInProgress_, done_, stopped_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.decodeResultProvider = $ifaceNil;
@@ -195314,6 +195378,8 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 			this.stats = ptrType.nil;
 			this.started = false;
 			this.renderingInProgress = false;
+			this.done = $chanNil;
+			this.stopped = $chanNil;
 			return;
 		}
 		this.decodeResultProvider = decodeResultProvider_;
@@ -195321,6 +195387,8 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 		this.stats = stats_;
 		this.started = started_;
 		this.renderingInProgress = renderingInProgress_;
+		this.done = done_;
+		this.stopped = stopped_;
 	});
 	DecodeResultProvider = $pkg.DecodeResultProvider = $newType(8, $kindInterface, "player.DecodeResultProvider", true, "github.com/supraio/client-daemon/pkg/render/player", true, null);
 	DecodeResult = $pkg.DecodeResult = $newType(0, $kindStruct, "player.DecodeResult", true, "github.com/supraio/client-daemon/pkg/render/player", true, function(Frame_, Buffer_, Release_) {
@@ -195335,7 +195403,7 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 		this.Buffer = Buffer_;
 		this.Release = Release_;
 	});
-	DecoderLoop = $pkg.DecoderLoop = $newType(0, $kindStruct, "player.DecoderLoop", true, "github.com/supraio/client-daemon/pkg/render/player", true, function(frameProvider_, bufferPool_, stats_, decodeResultChan_, framesChan_, started_, decoder_) {
+	DecoderLoop = $pkg.DecoderLoop = $newType(0, $kindStruct, "player.DecoderLoop", true, "github.com/supraio/client-daemon/pkg/render/player", true, function(frameProvider_, bufferPool_, stats_, decodeResultChan_, framesChan_, done_, stopped_, started_, decoder_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.frameProvider = $ifaceNil;
@@ -195343,6 +195411,8 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 			this.stats = ptrType.nil;
 			this.decodeResultChan = $chanNil;
 			this.framesChan = $chanNil;
+			this.done = $chanNil;
+			this.stopped = $chanNil;
 			this.started = false;
 			this.decoder = $ifaceNil;
 			return;
@@ -195352,37 +195422,45 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 		this.stats = stats_;
 		this.decodeResultChan = decodeResultChan_;
 		this.framesChan = framesChan_;
+		this.done = done_;
+		this.stopped = stopped_;
 		this.started = started_;
 		this.decoder = decoder_;
 	});
 	FrameProvider = $pkg.FrameProvider = $newType(8, $kindInterface, "player.FrameProvider", true, "github.com/supraio/client-daemon/pkg/render/player", true, null);
-	CollectionLoop = $pkg.CollectionLoop = $newType(0, $kindStruct, "player.CollectionLoop", true, "github.com/supraio/client-daemon/pkg/render/player", true, function(frameCollector_, stats_, framesChan_, started_) {
+	CollectionLoop = $pkg.CollectionLoop = $newType(0, $kindStruct, "player.CollectionLoop", true, "github.com/supraio/client-daemon/pkg/render/player", true, function(frameCollector_, stats_, framesChan_, done_, stopped_, started_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.frameCollector = $ifaceNil;
 			this.stats = ptrType.nil;
 			this.framesChan = $chanNil;
+			this.done = $chanNil;
+			this.stopped = $chanNil;
 			this.started = false;
 			return;
 		}
 		this.frameCollector = frameCollector_;
 		this.stats = stats_;
 		this.framesChan = framesChan_;
+		this.done = done_;
+		this.stopped = stopped_;
 		this.started = started_;
 	});
 	ptrType = $ptrType(stats.Stats);
+	structType = $structType("", []);
 	sliceType = $sliceType($emptyInterface);
 	ptrType$1 = $ptrType(screenbuffer.BufferPool);
 	ptrType$2 = $ptrType(DecodeResult);
 	ptrType$3 = $ptrType(RenderingLoop);
+	chanType = $chanType(structType, false, false);
 	funcType = $funcType([], [], false);
 	ptrType$4 = $ptrType(DecoderLoop);
-	chanType = $chanType(ptrType$2, false, false);
-	chanType$1 = $chanType(frame.FrameInterface, false, false);
+	chanType$1 = $chanType(ptrType$2, false, false);
+	chanType$2 = $chanType(frame.FrameInterface, false, false);
 	ptrType$5 = $ptrType(CollectionLoop);
 	NewRenderingLoop = function(decodeResultProvider, window, stats$1) {
 		var decodeResultProvider, stats$1, window;
-		return new RenderingLoop.ptr(decodeResultProvider, window, stats$1, false, false);
+		return new RenderingLoop.ptr(decodeResultProvider, window, stats$1, false, false, new $Chan(structType, 0), new $Chan(structType, 0));
 	};
 	$pkg.NewRenderingLoop = NewRenderingLoop;
 	RenderingLoop.ptr.prototype.Start = function() {
@@ -195393,8 +195471,9 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 		}
 		dl.started = true;
 		$go((function $b() {
-			var {_r, err, $s, $r, $c} = $restore(this, {});
-			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+			var {_arg, _r, _r$1, _r$2, _selection, err, $s, $deferred, $r, $c} = $restore(this, {});
+			/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
+			$deferred.push([function(_arg) { $close(_arg); }, [dl.stopped]]);
 			/* while (true) { */ case 1:
 				/* if (!(dl.started)) { break; } */ if(!(dl.started)) { $s = 2; continue; }
 				_r = dl.renderBuffer(); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
@@ -195402,26 +195481,50 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 				/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 4; continue; }
 				/* */ $s = 5; continue;
 				/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 4:
-					$r = time.Sleep(new time.Duration(0, 100000000)); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-					/* */ if (dl.started) { $s = 7; continue; }
-					/* */ $s = 8; continue;
-					/* if (dl.started) { */ case 7:
-						$r = errs.Print("Frame render failed, dropping", err); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-					/* } */ case 8:
+					_r$1 = time.After(new time.Duration(0, 100000000)); /* */ $s = 6; case 6: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+					_r$2 = $select([[dl.done], [_r$1]]); /* */ $s = 7; case 7: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+					_selection = _r$2;
+					/* */ if (_selection[0] === 0) { $s = 8; continue; }
+					/* */ if (_selection[0] === 1) { $s = 9; continue; }
+					/* */ $s = 10; continue;
+					/* if (_selection[0] === 0) { */ case 8:
+						$s = 11; case 11: return;
+					/* } else if (_selection[0] === 1) { */ case 9:
+					/* } */ case 10:
+					/* */ if (dl.started) { $s = 12; continue; }
+					/* */ $s = 13; continue;
+					/* if (dl.started) { */ case 12:
+						$r = errs.Print("Frame render failed, dropping", err); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+					/* } */ case 13:
 				/* } */ case 5:
 			$s = 1; continue;
 			case 2:
 			$s = -1; return;
-			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r, err, $s};return $f;
+			/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: $b, $c: true, $r, _arg, _r, _r$1, _r$2, _selection, err, $s, $deferred};return $f; } }
 		}), []);
 	};
 	RenderingLoop.prototype.Start = function() { return this.$val.Start(); };
 	RenderingLoop.ptr.prototype.Stop = function() {
-		var dl;
+		var _selection, dl;
 		dl = this;
 		dl.started = false;
+		_selection = $select([[dl.done], []]);
+		if (_selection[0] === 0) {
+		} else if (_selection[0] === 1) {
+			$close(dl.done);
+		}
 	};
 	RenderingLoop.prototype.Stop = function() { return this.$val.Stop(); };
+	RenderingLoop.ptr.prototype.Wait = function() {
+		var {_r, dl, $s, $r, $c} = $restore(this, {});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		dl = this;
+		_r = $recv(dl.stopped); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_r[0];
+		$s = -1; return;
+		/* */ } return; } var $f = {$blk: RenderingLoop.ptr.prototype.Wait, $c: true, $r, _r, dl, $s};return $f;
+	};
+	RenderingLoop.prototype.Wait = function() { return this.$val.Wait(); };
 	RenderingLoop.ptr.prototype.renderBuffer = function() {
 		var {$24r, $24r$1, $24r$2, _arg, _arg$1, _arg$2, _r, _r$1, _r$2, _r$3, _tuple, decodeResult, dl, err, frame$1, screenBuffer, $s, $deferred, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
@@ -195466,7 +195569,7 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 	};
 	RenderingLoop.prototype.renderBuffer = function() { return this.$val.renderBuffer(); };
 	RenderingLoop.ptr.prototype.waitForRenderTime = function(frame$1) {
-		var {_r, _r$1, _r$2, _r$3, dl, frame$1, renderTime, serverTime, waitDuration, $s, $r, $c} = $restore(this, {frame$1});
+		var {_r, _r$1, _r$2, _r$3, _r$4, _r$5, _selection, dl, frame$1, renderTime, serverTime, waitDuration, $s, $r, $c} = $restore(this, {frame$1});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		dl = this;
 		_r = frame$1.GetTimestamp(); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
@@ -195479,25 +195582,45 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 		/* */ if ((waitDuration.$high > 0 || (waitDuration.$high === 0 && waitDuration.$low > 0))) { $s = 5; continue; }
 		/* */ $s = 6; continue;
 		/* if ((waitDuration.$high > 0 || (waitDuration.$high === 0 && waitDuration.$low > 0))) { */ case 5:
-			$r = time.Sleep(waitDuration); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$4 = time.After(waitDuration); /* */ $s = 7; case 7: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+			_r$5 = $select([[_r$4], [dl.done]]); /* */ $s = 8; case 8: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
+			_selection = _r$5;
+			/* */ if (_selection[0] === 0) { $s = 9; continue; }
+			/* */ if (_selection[0] === 1) { $s = 10; continue; }
+			/* */ $s = 11; continue;
+			/* if (_selection[0] === 0) { */ case 9:
+				$s = 11; continue;
+			/* } else if (_selection[0] === 1) { */ case 10:
+			/* } */ case 11:
 		/* } */ case 6:
 		$s = -1; return;
-		/* */ } return; } var $f = {$blk: RenderingLoop.ptr.prototype.waitForRenderTime, $c: true, $r, _r, _r$1, _r$2, _r$3, dl, frame$1, renderTime, serverTime, waitDuration, $s};return $f;
+		/* */ } return; } var $f = {$blk: RenderingLoop.ptr.prototype.waitForRenderTime, $c: true, $r, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _selection, dl, frame$1, renderTime, serverTime, waitDuration, $s};return $f;
 	};
 	RenderingLoop.prototype.waitForRenderTime = function(frame$1) { return this.$val.waitForRenderTime(frame$1); };
 	NewDecoderLoop = function(frameProvider, createBuffer, stats$1) {
 		var createBuffer, frameProvider, stats$1;
-		return new DecoderLoop.ptr(frameProvider, screenbuffer.NewBufferPool(createBuffer, 20), stats$1, new $Chan(ptrType$2, 50), new $Chan(frame.FrameInterface, 50), false, $ifaceNil);
+		return new DecoderLoop.ptr(frameProvider, screenbuffer.NewBufferPool(createBuffer, 20), stats$1, new $Chan(ptrType$2, 50), new $Chan(frame.FrameInterface, 50), new $Chan(structType, 0), new $Chan(structType, 0), false, $ifaceNil);
 	};
 	$pkg.NewDecoderLoop = NewDecoderLoop;
 	DecoderLoop.ptr.prototype.NextDecodedResult = function() {
-		var {_r, dl, result, $s, $r, $c} = $restore(this, {});
+		var {$24r, _r, _r$1, _selection, dl, result, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		dl = this;
-		_r = $recv(dl.decodeResultChan); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-		result = _r[0];
-		$s = -1; return [result, $ifaceNil];
-		/* */ } return; } var $f = {$blk: DecoderLoop.ptr.prototype.NextDecodedResult, $c: true, $r, _r, dl, result, $s};return $f;
+		_r = $select([[dl.decodeResultChan], [dl.done]]); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_selection = _r;
+		/* */ if (_selection[0] === 0) { $s = 2; continue; }
+		/* */ if (_selection[0] === 1) { $s = 3; continue; }
+		/* */ $s = 4; continue;
+		/* if (_selection[0] === 0) { */ case 2:
+			result = _selection[1][0];
+			$s = -1; return [result, $ifaceNil];
+		/* } else if (_selection[0] === 1) { */ case 3:
+			_r$1 = errs.Errorf("Decoder loop stopped", sliceType.nil); /* */ $s = 5; case 5: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+			$24r = [ptrType$2.nil, _r$1];
+			$s = 6; case 6: return $24r;
+		/* } */ case 4:
+		$s = -1; return [ptrType$2.nil, $ifaceNil];
+		/* */ } return; } var $f = {$blk: DecoderLoop.ptr.prototype.NextDecodedResult, $c: true, $r, $24r, _r, _r$1, _selection, dl, result, $s};return $f;
 	};
 	DecoderLoop.prototype.NextDecodedResult = function() { return this.$val.NextDecodedResult(); };
 	DecoderLoop.ptr.prototype.Start = function() {
@@ -195508,59 +195631,105 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 		}
 		dl.started = true;
 		$go((function $b() {
-			var {_r, err, $s, $r, $c} = $restore(this, {});
-			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
-			/* while (true) { */ case 1:
-				/* if (!(dl.started)) { break; } */ if(!(dl.started)) { $s = 2; continue; }
-				_r = dl.writeFrame(); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-				err = _r;
-				/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 4; continue; }
-				/* */ $s = 5; continue;
-				/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 4:
-					$r = time.Sleep(new time.Duration(0, 100000000)); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-					/* */ if (dl.started) { $s = 7; continue; }
-					/* */ $s = 8; continue;
-					/* if (dl.started) { */ case 7:
-						$r = errs.Print("Frame write failed, dropping", err); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-					/* } */ case 8:
-				/* } */ case 5:
-			$s = 1; continue;
-			case 2:
-			$s = -1; return;
-			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r, err, $s};return $f;
-		}), []);
-		$go((function $b() {
-			var {_r, err, $s, $r, $c} = $restore(this, {});
-			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
-			/* while (true) { */ case 1:
-				/* if (!(dl.started)) { break; } */ if(!(dl.started)) { $s = 2; continue; }
-				_r = dl.outputBuffer(); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-				err = _r;
-				/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 4; continue; }
-				/* */ $s = 5; continue;
-				/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 4:
-					$r = time.Sleep(new time.Duration(0, 100000000)); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-					/* */ if (dl.started) { $s = 7; continue; }
-					/* */ $s = 8; continue;
-					/* if (dl.started) { */ case 7:
-						$r = errs.Print("Frame output failed, dropping", err); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-					/* } */ case 8:
-				/* } */ case 5:
-			$s = 1; continue;
-			case 2:
+			var {_arg, wg, $s, $deferred, $r, $c} = $restore(this, {});
+			/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
+			wg = [wg];
+			$deferred.push([function(_arg) { $close(_arg); }, [dl.stopped]]);
+			wg[0] = new sync.WaitGroup.ptr(0, $chanNil, new $Uint64(0, 0), 0);
+			wg[0].Add(2);
+			$go((function(wg) { return function $b() {
+				var {_r, _r$1, _r$2, _selection, err, $s, $deferred, $r, $c} = $restore(this, {});
+				/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
+				$deferred.push([$methodVal(wg[0], "Done"), []]);
+				/* while (true) { */ case 1:
+					/* if (!(dl.started)) { break; } */ if(!(dl.started)) { $s = 2; continue; }
+					_r = dl.writeFrame(); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+					err = _r;
+					/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 4; continue; }
+					/* */ $s = 5; continue;
+					/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 4:
+						_r$1 = time.After(new time.Duration(0, 100000000)); /* */ $s = 6; case 6: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+						_r$2 = $select([[dl.done], [_r$1]]); /* */ $s = 7; case 7: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+						_selection = _r$2;
+						/* */ if (_selection[0] === 0) { $s = 8; continue; }
+						/* */ if (_selection[0] === 1) { $s = 9; continue; }
+						/* */ $s = 10; continue;
+						/* if (_selection[0] === 0) { */ case 8:
+							$s = 11; case 11: return;
+						/* } else if (_selection[0] === 1) { */ case 9:
+						/* } */ case 10:
+						/* */ if (dl.started) { $s = 12; continue; }
+						/* */ $s = 13; continue;
+						/* if (dl.started) { */ case 12:
+							$r = errs.Print("Frame write failed, dropping", err); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+						/* } */ case 13:
+					/* } */ case 5:
+				$s = 1; continue;
+				case 2:
+				$s = -1; return;
+				/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: $b, $c: true, $r, _r, _r$1, _r$2, _selection, err, $s, $deferred};return $f; } }
+			}; })(wg), []);
+			$go((function(wg) { return function $b() {
+				var {_r, _r$1, _r$2, _selection, err, $s, $deferred, $r, $c} = $restore(this, {});
+				/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
+				$deferred.push([$methodVal(wg[0], "Done"), []]);
+				/* while (true) { */ case 1:
+					/* if (!(dl.started)) { break; } */ if(!(dl.started)) { $s = 2; continue; }
+					_r = dl.outputBuffer(); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+					err = _r;
+					/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 4; continue; }
+					/* */ $s = 5; continue;
+					/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 4:
+						_r$1 = time.After(new time.Duration(0, 100000000)); /* */ $s = 6; case 6: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+						_r$2 = $select([[dl.done], [_r$1]]); /* */ $s = 7; case 7: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+						_selection = _r$2;
+						/* */ if (_selection[0] === 0) { $s = 8; continue; }
+						/* */ if (_selection[0] === 1) { $s = 9; continue; }
+						/* */ $s = 10; continue;
+						/* if (_selection[0] === 0) { */ case 8:
+							$s = 11; case 11: return;
+						/* } else if (_selection[0] === 1) { */ case 9:
+						/* } */ case 10:
+						/* */ if (dl.started) { $s = 12; continue; }
+						/* */ $s = 13; continue;
+						/* if (dl.started) { */ case 12:
+							$r = errs.Print("Frame output failed, dropping", err); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+						/* } */ case 13:
+					/* } */ case 5:
+				$s = 1; continue;
+				case 2:
+				$s = -1; return;
+				/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: $b, $c: true, $r, _r, _r$1, _r$2, _selection, err, $s, $deferred};return $f; } }
+			}; })(wg), []);
+			$r = wg[0].Wait(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$s = -1; return;
-			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r, err, $s};return $f;
+			/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: $b, $c: true, $r, _arg, wg, $s, $deferred};return $f; } }
 		}), []);
 	};
 	DecoderLoop.prototype.Start = function() { return this.$val.Start(); };
 	DecoderLoop.ptr.prototype.Stop = function() {
-		var dl;
+		var _selection, dl;
 		dl = this;
 		dl.started = false;
+		_selection = $select([[dl.done], []]);
+		if (_selection[0] === 0) {
+		} else if (_selection[0] === 1) {
+			$close(dl.done);
+		}
 	};
 	DecoderLoop.prototype.Stop = function() { return this.$val.Stop(); };
+	DecoderLoop.ptr.prototype.Wait = function() {
+		var {_r, dl, $s, $r, $c} = $restore(this, {});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		dl = this;
+		_r = $recv(dl.stopped); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_r[0];
+		$s = -1; return;
+		/* */ } return; } var $f = {$blk: DecoderLoop.ptr.prototype.Wait, $c: true, $r, _r, dl, $s};return $f;
+	};
+	DecoderLoop.prototype.Wait = function() { return this.$val.Wait(); };
 	DecoderLoop.ptr.prototype.writeFrame = function() {
-		var {$24r, $24r$1, $24r$2, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, _tuple$1, decoder$1, dl, err, frame$1, $s, $r, $c} = $restore(this, {});
+		var {$24r, $24r$1, $24r$2, $24r$3, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _selection, _tuple, _tuple$1, decoder$1, dl, err, frame$1, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		dl = this;
 		_r = dl.frameProvider.NextFrame(); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
@@ -195596,65 +195765,100 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 			$24r$2 = _r$5;
 			$s = 17; case 17: return $24r$2;
 		/* } */ case 15:
-		$r = $send(dl.framesChan, frame$1); /* */ $s = 18; case 18: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		_r$6 = $select([[dl.framesChan, frame$1], [dl.done]]); /* */ $s = 18; case 18: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
+		_selection = _r$6;
+		/* */ if (_selection[0] === 0) { $s = 19; continue; }
+		/* */ if (_selection[0] === 1) { $s = 20; continue; }
+		/* */ $s = 21; continue;
+		/* if (_selection[0] === 0) { */ case 19:
+			$s = 21; continue;
+		/* } else if (_selection[0] === 1) { */ case 20:
+			_r$7 = errs.Errorf("Decoder loop stopped", sliceType.nil); /* */ $s = 22; case 22: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
+			$24r$3 = _r$7;
+			$s = 23; case 23: return $24r$3;
+		/* } */ case 21:
 		$s = -1; return $ifaceNil;
-		/* */ } return; } var $f = {$blk: DecoderLoop.ptr.prototype.writeFrame, $c: true, $r, $24r, $24r$1, $24r$2, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, _tuple$1, decoder$1, dl, err, frame$1, $s};return $f;
+		/* */ } return; } var $f = {$blk: DecoderLoop.ptr.prototype.writeFrame, $c: true, $r, $24r, $24r$1, $24r$2, $24r$3, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _selection, _tuple, _tuple$1, decoder$1, dl, err, frame$1, $s};return $f;
 	};
 	DecoderLoop.prototype.writeFrame = function() { return this.$val.writeFrame(); };
 	DecoderLoop.ptr.prototype.outputBuffer = function() {
-		var {$24r, $24r$1, _r, _r$1, _r$2, _r$3, _r$4, _tuple, decodeResult, dl, err, frame$1, screenBuffer, $s, $r, $c} = $restore(this, {});
+		var {$24r, $24r$1, $24r$2, $24r$3, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _selection, _selection$1, _tuple, decodeResult, dl, err, frame$1, screenBuffer, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		dl = [dl];
 		screenBuffer = [screenBuffer];
 		dl[0] = this;
-		_r = $recv(dl[0].framesChan); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-		frame$1 = _r[0];
-		_r$1 = dl[0].bufferPool.Acquire(); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
-		_tuple = _r$1;
-		screenBuffer[0] = _tuple[0];
-		err = _tuple[1];
-		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 3; continue; }
+		frame$1 = $ifaceNil;
+		_r = $select([[dl[0].framesChan], [dl[0].done]]); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_selection = _r;
+		/* */ if (_selection[0] === 0) { $s = 2; continue; }
+		/* */ if (_selection[0] === 1) { $s = 3; continue; }
 		/* */ $s = 4; continue;
-		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 3:
-			_r$2 = errs.Errorf("Buffer cannot be acquired: %s", new sliceType([err])); /* */ $s = 5; case 5: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
-			$24r = _r$2;
+		/* if (_selection[0] === 0) { */ case 2:
+			frame$1 = _selection[1][0];
+			$s = 4; continue;
+		/* } else if (_selection[0] === 1) { */ case 3:
+			_r$1 = errs.Errorf("Decoder loop stopped", sliceType.nil); /* */ $s = 5; case 5: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+			$24r = _r$1;
 			$s = 6; case 6: return $24r;
 		/* } */ case 4:
-		$r = dl[0].stats.NotifyFrameDecodeOutputStarted(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		_r$3 = dl[0].decoder.NextOutput(screenBuffer[0]); /* */ $s = 8; case 8: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
-		err = _r$3;
-		$r = dl[0].stats.NotifyFrameDecodeOutputEnded(); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 10; continue; }
-		/* */ $s = 11; continue;
-		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 10:
-			_r$4 = errs.Errorf("Buffer cannot get next output: %s", new sliceType([err])); /* */ $s = 12; case 12: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
-			$24r$1 = _r$4;
-			$s = 13; case 13: return $24r$1;
-		/* } */ case 11:
-		/* */ if (dl[0].decodeResultChan.$buffer.length < 50) { $s = 14; continue; }
-		/* */ $s = 15; continue;
-		/* if (dl[0].decodeResultChan.$buffer.length < 50) { */ case 14:
+		_r$2 = dl[0].bufferPool.Acquire(); /* */ $s = 7; case 7: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+		_tuple = _r$2;
+		screenBuffer[0] = _tuple[0];
+		err = _tuple[1];
+		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 8; continue; }
+		/* */ $s = 9; continue;
+		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 8:
+			_r$3 = errs.Errorf("Buffer cannot be acquired: %s", new sliceType([err])); /* */ $s = 10; case 10: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+			$24r$1 = _r$3;
+			$s = 11; case 11: return $24r$1;
+		/* } */ case 9:
+		$r = dl[0].stats.NotifyFrameDecodeOutputStarted(); /* */ $s = 12; case 12: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		_r$4 = dl[0].decoder.NextOutput(screenBuffer[0]); /* */ $s = 13; case 13: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+		err = _r$4;
+		$r = dl[0].stats.NotifyFrameDecodeOutputEnded(); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 15; continue; }
+		/* */ $s = 16; continue;
+		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 15:
+			_r$5 = errs.Errorf("Buffer cannot get next output: %s", new sliceType([err])); /* */ $s = 17; case 17: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
+			$24r$2 = _r$5;
+			$s = 18; case 18: return $24r$2;
+		/* } */ case 16:
+		/* */ if (dl[0].decodeResultChan.$buffer.length < 50) { $s = 19; continue; }
+		/* */ $s = 20; continue;
+		/* if (dl[0].decodeResultChan.$buffer.length < 50) { */ case 19:
 			decodeResult = new DecodeResult.ptr(frame$1, screenBuffer[0], (function(dl, screenBuffer) { return function $b() {
-				var {_r$5, err$1, $s, $r, $c} = $restore(this, {});
+				var {_r$6, err$1, $s, $r, $c} = $restore(this, {});
 				/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 				$r = dl[0].decoder.Release(screenBuffer[0]); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-				_r$5 = dl[0].bufferPool.Release(screenBuffer[0]); /* */ $s = 2; case 2: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
-				err$1 = _r$5;
+				_r$6 = dl[0].bufferPool.Release(screenBuffer[0]); /* */ $s = 2; case 2: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
+				err$1 = _r$6;
 				/* */ if (!($interfaceIsEqual(err$1, $ifaceNil))) { $s = 3; continue; }
 				/* */ $s = 4; continue;
 				/* if (!($interfaceIsEqual(err$1, $ifaceNil))) { */ case 3:
 					$r = errs.Print("Buffer cannot be released", err$1); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 				/* } */ case 4:
 				$s = -1; return;
-				/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r$5, err$1, $s};return $f;
+				/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r$6, err$1, $s};return $f;
 			}; })(dl, screenBuffer));
-			$r = $send(dl[0].decodeResultChan, decodeResult); /* */ $s = 17; case 17: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-			$s = 16; continue;
-		/* } else { */ case 15:
+			_r$6 = $select([[dl[0].decodeResultChan, decodeResult], [dl[0].done]]); /* */ $s = 22; case 22: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
+			_selection$1 = _r$6;
+			/* */ if (_selection$1[0] === 0) { $s = 23; continue; }
+			/* */ if (_selection$1[0] === 1) { $s = 24; continue; }
+			/* */ $s = 25; continue;
+			/* if (_selection$1[0] === 0) { */ case 23:
+				$s = 25; continue;
+			/* } else if (_selection$1[0] === 1) { */ case 24:
+				$r = decodeResult.Release(); /* */ $s = 26; case 26: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+				_r$7 = errs.Errorf("Decoder loop stopped", sliceType.nil); /* */ $s = 27; case 27: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
+				$24r$3 = _r$7;
+				$s = 28; case 28: return $24r$3;
+			/* } */ case 25:
+			$s = 21; continue;
+		/* } else { */ case 20:
 			dl[0].stats.NotifyThrottledDecodeFrame();
-		/* } */ case 16:
+		/* } */ case 21:
 		$s = -1; return $ifaceNil;
-		/* */ } return; } var $f = {$blk: DecoderLoop.ptr.prototype.outputBuffer, $c: true, $r, $24r, $24r$1, _r, _r$1, _r$2, _r$3, _r$4, _tuple, decodeResult, dl, err, frame$1, screenBuffer, $s};return $f;
+		/* */ } return; } var $f = {$blk: DecoderLoop.ptr.prototype.outputBuffer, $c: true, $r, $24r, $24r$1, $24r$2, $24r$3, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _selection, _selection$1, _tuple, decodeResult, dl, err, frame$1, screenBuffer, $s};return $f;
 	};
 	DecoderLoop.prototype.outputBuffer = function() { return this.$val.outputBuffer(); };
 	DecoderLoop.ptr.prototype.ensureDecoder = function(frame$1) {
@@ -195684,17 +195888,28 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 	DecoderLoop.prototype.ensureDecoder = function(frame$1) { return this.$val.ensureDecoder(frame$1); };
 	NewCollectionLoop = function(frameCollector, stats$1) {
 		var frameCollector, stats$1;
-		return new CollectionLoop.ptr(frameCollector, stats$1, new $Chan(frame.FrameInterface, 50), false);
+		return new CollectionLoop.ptr(frameCollector, stats$1, new $Chan(frame.FrameInterface, 50), new $Chan(structType, 0), new $Chan(structType, 0), false);
 	};
 	$pkg.NewCollectionLoop = NewCollectionLoop;
 	CollectionLoop.ptr.prototype.NextFrame = function() {
-		var {_r, cl, collectedFrame, $s, $r, $c} = $restore(this, {});
+		var {$24r, _r, _r$1, _selection, cl, collectedFrame, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		cl = this;
-		_r = $recv(cl.framesChan); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-		collectedFrame = _r[0];
-		$s = -1; return [collectedFrame, $ifaceNil];
-		/* */ } return; } var $f = {$blk: CollectionLoop.ptr.prototype.NextFrame, $c: true, $r, _r, cl, collectedFrame, $s};return $f;
+		_r = $select([[cl.framesChan], [cl.done]]); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_selection = _r;
+		/* */ if (_selection[0] === 0) { $s = 2; continue; }
+		/* */ if (_selection[0] === 1) { $s = 3; continue; }
+		/* */ $s = 4; continue;
+		/* if (_selection[0] === 0) { */ case 2:
+			collectedFrame = _selection[1][0];
+			$s = -1; return [collectedFrame, $ifaceNil];
+		/* } else if (_selection[0] === 1) { */ case 3:
+			_r$1 = errs.Errorf("Collection loop stopped", sliceType.nil); /* */ $s = 5; case 5: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+			$24r = [$ifaceNil, _r$1];
+			$s = 6; case 6: return $24r;
+		/* } */ case 4:
+		$s = -1; return [$ifaceNil, $ifaceNil];
+		/* */ } return; } var $f = {$blk: CollectionLoop.ptr.prototype.NextFrame, $c: true, $r, $24r, _r, _r$1, _selection, cl, collectedFrame, $s};return $f;
 	};
 	CollectionLoop.prototype.NextFrame = function() { return this.$val.NextFrame(); };
 	CollectionLoop.ptr.prototype.Start = function() {
@@ -195705,8 +195920,9 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 		}
 		cl.started = true;
 		$go((function $b() {
-			var {_1, _r, _r$1, _tuple, collectedFrame, err, $s, $r, $c} = $restore(this, {});
-			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+			var {_1, _arg, _r, _r$1, _r$2, _r$3, _r$4, _selection, _selection$1, _tuple, collectedFrame, err, $s, $deferred, $r, $c} = $restore(this, {});
+			/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
+			$deferred.push([function(_arg) { $close(_arg); }, [cl.stopped]]);
 			/* while (true) { */ case 1:
 				/* if (!(cl.started)) { break; } */ if(!(cl.started)) { $s = 2; continue; }
 				_r = cl.frameCollector.CollectFrame($methodVal(cl.stats, "NotifyFrameCollectionStarted"), $methodVal(cl.stats, "NotifyFrameCollectionEnded"), $methodVal(cl.stats, "NotifyFrameCollectionDuration")); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
@@ -195716,55 +195932,88 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 				/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 4; continue; }
 				/* */ $s = 5; continue;
 				/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 4:
-					$r = time.Sleep(new time.Duration(0, 100000000)); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-					/* */ if (cl.started) { $s = 7; continue; }
-					/* */ $s = 8; continue;
-					/* if (cl.started) { */ case 7:
-						$r = errs.Print("Frame collection error, dropping", err); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-					/* } */ case 8:
+					_r$1 = time.After(new time.Duration(0, 100000000)); /* */ $s = 6; case 6: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+					_r$2 = $select([[cl.done], [_r$1]]); /* */ $s = 7; case 7: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+					_selection = _r$2;
+					/* */ if (_selection[0] === 0) { $s = 8; continue; }
+					/* */ if (_selection[0] === 1) { $s = 9; continue; }
+					/* */ $s = 10; continue;
+					/* if (_selection[0] === 0) { */ case 8:
+						$s = 11; case 11: return;
+					/* } else if (_selection[0] === 1) { */ case 9:
+					/* } */ case 10:
+					/* */ if (cl.started) { $s = 12; continue; }
+					/* */ $s = 13; continue;
+					/* if (cl.started) { */ case 12:
+						$r = errs.Print("Frame collection error, dropping", err); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+					/* } */ case 13:
 					/* continue; */ $s = 1; continue;
 				/* } */ case 5:
-				/* */ if (cl.framesChan.$buffer.length < 50) { $s = 10; continue; }
-				/* */ $s = 11; continue;
-				/* if (cl.framesChan.$buffer.length < 50) { */ case 10:
-						_r$1 = collectedFrame.FrameType(); /* */ $s = 14; case 14: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
-						_1 = _r$1;
-						/* */ if (_1 === (1)) { $s = 15; continue; }
-						/* */ if (_1 === (255)) { $s = 16; continue; }
-						/* */ $s = 17; continue;
-						/* if (_1 === (1)) { */ case 15:
-							$r = $send(cl.framesChan, collectedFrame); /* */ $s = 18; case 18: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-							$s = 17; continue;
-						/* } else if (_1 === (255)) { */ case 16:
-							$r = cl.stats.NotifyScreenPing(); /* */ $s = 19; case 19: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-						/* } */ case 17:
-					case 13:
-					$s = 12; continue;
-				/* } else { */ case 11:
+				/* */ if (cl.framesChan.$buffer.length < 50) { $s = 15; continue; }
+				/* */ $s = 16; continue;
+				/* if (cl.framesChan.$buffer.length < 50) { */ case 15:
+						_r$3 = collectedFrame.FrameType(); /* */ $s = 19; case 19: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+						_1 = _r$3;
+						/* */ if (_1 === (1)) { $s = 20; continue; }
+						/* */ if (_1 === (255)) { $s = 21; continue; }
+						/* */ $s = 22; continue;
+						/* if (_1 === (1)) { */ case 20:
+							_r$4 = $select([[cl.framesChan, collectedFrame], [cl.done]]); /* */ $s = 23; case 23: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+							_selection$1 = _r$4;
+							/* */ if (_selection$1[0] === 0) { $s = 24; continue; }
+							/* */ if (_selection$1[0] === 1) { $s = 25; continue; }
+							/* */ $s = 26; continue;
+							/* if (_selection$1[0] === 0) { */ case 24:
+								$s = 26; continue;
+							/* } else if (_selection$1[0] === 1) { */ case 25:
+								$s = 27; case 27: return;
+							/* } */ case 26:
+							$s = 22; continue;
+						/* } else if (_1 === (255)) { */ case 21:
+							$r = cl.stats.NotifyScreenPing(); /* */ $s = 28; case 28: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+						/* } */ case 22:
+					case 18:
+					$s = 17; continue;
+				/* } else { */ case 16:
 					cl.stats.NotifyThrottledCollectionFrame();
-				/* } */ case 12:
+				/* } */ case 17:
 			$s = 1; continue;
 			case 2:
 			$s = -1; return;
-			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _1, _r, _r$1, _tuple, collectedFrame, err, $s};return $f;
+			/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: $b, $c: true, $r, _1, _arg, _r, _r$1, _r$2, _r$3, _r$4, _selection, _selection$1, _tuple, collectedFrame, err, $s, $deferred};return $f; } }
 		}), []);
 	};
 	CollectionLoop.prototype.Start = function() { return this.$val.Start(); };
 	CollectionLoop.ptr.prototype.Stop = function() {
-		var cl;
+		var _selection, cl;
 		cl = this;
 		cl.started = false;
+		_selection = $select([[cl.done], []]);
+		if (_selection[0] === 0) {
+		} else if (_selection[0] === 1) {
+			$close(cl.done);
+		}
 	};
 	CollectionLoop.prototype.Stop = function() { return this.$val.Stop(); };
-	ptrType$3.methods = [{prop: "Start", name: "Start", pkg: "", typ: $funcType([], [], false)}, {prop: "Stop", name: "Stop", pkg: "", typ: $funcType([], [], false)}, {prop: "renderBuffer", name: "renderBuffer", pkg: "github.com/supraio/client-daemon/pkg/render/player", typ: $funcType([], [$error], false)}, {prop: "waitForRenderTime", name: "waitForRenderTime", pkg: "github.com/supraio/client-daemon/pkg/render/player", typ: $funcType([frame.FrameInterface], [], false)}];
-	ptrType$4.methods = [{prop: "NextDecodedResult", name: "NextDecodedResult", pkg: "", typ: $funcType([], [ptrType$2, $error], false)}, {prop: "Start", name: "Start", pkg: "", typ: $funcType([], [], false)}, {prop: "Stop", name: "Stop", pkg: "", typ: $funcType([], [], false)}, {prop: "writeFrame", name: "writeFrame", pkg: "github.com/supraio/client-daemon/pkg/render/player", typ: $funcType([], [$error], false)}, {prop: "outputBuffer", name: "outputBuffer", pkg: "github.com/supraio/client-daemon/pkg/render/player", typ: $funcType([], [$error], false)}, {prop: "ensureDecoder", name: "ensureDecoder", pkg: "github.com/supraio/client-daemon/pkg/render/player", typ: $funcType([frame.FrameInterface], [decoder.Decoder, $error], false)}];
-	ptrType$5.methods = [{prop: "NextFrame", name: "NextFrame", pkg: "", typ: $funcType([], [frame.FrameInterface, $error], false)}, {prop: "Start", name: "Start", pkg: "", typ: $funcType([], [], false)}, {prop: "Stop", name: "Stop", pkg: "", typ: $funcType([], [], false)}];
-	RenderingLoop.init("github.com/supraio/client-daemon/pkg/render/player", [{prop: "decodeResultProvider", name: "decodeResultProvider", embedded: false, exported: false, typ: DecodeResultProvider, tag: ""}, {prop: "window", name: "window", embedded: false, exported: false, typ: screen.Window, tag: ""}, {prop: "stats", name: "stats", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "started", name: "started", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "renderingInProgress", name: "renderingInProgress", embedded: false, exported: false, typ: $Bool, tag: ""}]);
+	CollectionLoop.ptr.prototype.Wait = function() {
+		var {_r, cl, $s, $r, $c} = $restore(this, {});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		cl = this;
+		_r = $recv(cl.stopped); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_r[0];
+		$s = -1; return;
+		/* */ } return; } var $f = {$blk: CollectionLoop.ptr.prototype.Wait, $c: true, $r, _r, cl, $s};return $f;
+	};
+	CollectionLoop.prototype.Wait = function() { return this.$val.Wait(); };
+	ptrType$3.methods = [{prop: "Start", name: "Start", pkg: "", typ: $funcType([], [], false)}, {prop: "Stop", name: "Stop", pkg: "", typ: $funcType([], [], false)}, {prop: "Wait", name: "Wait", pkg: "", typ: $funcType([], [], false)}, {prop: "renderBuffer", name: "renderBuffer", pkg: "github.com/supraio/client-daemon/pkg/render/player", typ: $funcType([], [$error], false)}, {prop: "waitForRenderTime", name: "waitForRenderTime", pkg: "github.com/supraio/client-daemon/pkg/render/player", typ: $funcType([frame.FrameInterface], [], false)}];
+	ptrType$4.methods = [{prop: "NextDecodedResult", name: "NextDecodedResult", pkg: "", typ: $funcType([], [ptrType$2, $error], false)}, {prop: "Start", name: "Start", pkg: "", typ: $funcType([], [], false)}, {prop: "Stop", name: "Stop", pkg: "", typ: $funcType([], [], false)}, {prop: "Wait", name: "Wait", pkg: "", typ: $funcType([], [], false)}, {prop: "writeFrame", name: "writeFrame", pkg: "github.com/supraio/client-daemon/pkg/render/player", typ: $funcType([], [$error], false)}, {prop: "outputBuffer", name: "outputBuffer", pkg: "github.com/supraio/client-daemon/pkg/render/player", typ: $funcType([], [$error], false)}, {prop: "ensureDecoder", name: "ensureDecoder", pkg: "github.com/supraio/client-daemon/pkg/render/player", typ: $funcType([frame.FrameInterface], [decoder.Decoder, $error], false)}];
+	ptrType$5.methods = [{prop: "NextFrame", name: "NextFrame", pkg: "", typ: $funcType([], [frame.FrameInterface, $error], false)}, {prop: "Start", name: "Start", pkg: "", typ: $funcType([], [], false)}, {prop: "Stop", name: "Stop", pkg: "", typ: $funcType([], [], false)}, {prop: "Wait", name: "Wait", pkg: "", typ: $funcType([], [], false)}];
+	RenderingLoop.init("github.com/supraio/client-daemon/pkg/render/player", [{prop: "decodeResultProvider", name: "decodeResultProvider", embedded: false, exported: false, typ: DecodeResultProvider, tag: ""}, {prop: "window", name: "window", embedded: false, exported: false, typ: screen.Window, tag: ""}, {prop: "stats", name: "stats", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "started", name: "started", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "renderingInProgress", name: "renderingInProgress", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "done", name: "done", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "stopped", name: "stopped", embedded: false, exported: false, typ: chanType, tag: ""}]);
 	DecodeResultProvider.init([{prop: "NextDecodedResult", name: "NextDecodedResult", pkg: "", typ: $funcType([], [ptrType$2, $error], false)}]);
 	DecodeResult.init("", [{prop: "Frame", name: "Frame", embedded: false, exported: true, typ: frame.FrameInterface, tag: ""}, {prop: "Buffer", name: "Buffer", embedded: false, exported: true, typ: screen.Buffer, tag: ""}, {prop: "Release", name: "Release", embedded: false, exported: true, typ: funcType, tag: ""}]);
-	DecoderLoop.init("github.com/supraio/client-daemon/pkg/render/player", [{prop: "frameProvider", name: "frameProvider", embedded: false, exported: false, typ: FrameProvider, tag: ""}, {prop: "bufferPool", name: "bufferPool", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "stats", name: "stats", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "decodeResultChan", name: "decodeResultChan", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "framesChan", name: "framesChan", embedded: false, exported: false, typ: chanType$1, tag: ""}, {prop: "started", name: "started", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "decoder", name: "decoder", embedded: false, exported: false, typ: decoder.Decoder, tag: ""}]);
+	DecoderLoop.init("github.com/supraio/client-daemon/pkg/render/player", [{prop: "frameProvider", name: "frameProvider", embedded: false, exported: false, typ: FrameProvider, tag: ""}, {prop: "bufferPool", name: "bufferPool", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "stats", name: "stats", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "decodeResultChan", name: "decodeResultChan", embedded: false, exported: false, typ: chanType$1, tag: ""}, {prop: "framesChan", name: "framesChan", embedded: false, exported: false, typ: chanType$2, tag: ""}, {prop: "done", name: "done", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "stopped", name: "stopped", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "started", name: "started", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "decoder", name: "decoder", embedded: false, exported: false, typ: decoder.Decoder, tag: ""}]);
 	FrameProvider.init([{prop: "NextFrame", name: "NextFrame", pkg: "", typ: $funcType([], [frame.FrameInterface, $error], false)}]);
-	CollectionLoop.init("github.com/supraio/client-daemon/pkg/render/player", [{prop: "frameCollector", name: "frameCollector", embedded: false, exported: false, typ: netframe.FrameCollectorInterface, tag: ""}, {prop: "stats", name: "stats", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "framesChan", name: "framesChan", embedded: false, exported: false, typ: chanType$1, tag: ""}, {prop: "started", name: "started", embedded: false, exported: false, typ: $Bool, tag: ""}]);
+	CollectionLoop.init("github.com/supraio/client-daemon/pkg/render/player", [{prop: "frameCollector", name: "frameCollector", embedded: false, exported: false, typ: netframe.FrameCollectorInterface, tag: ""}, {prop: "stats", name: "stats", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "framesChan", name: "framesChan", embedded: false, exported: false, typ: chanType$2, tag: ""}, {prop: "done", name: "done", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "stopped", name: "stopped", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "started", name: "started", embedded: false, exported: false, typ: $Bool, tag: ""}]);
 	$init = function() {
 		$pkg.$init = function() {};
 		/* */ var $f, $c = false, $s = 0, $r; if (this !== undefined && this.$blk !== undefined) { $f = this; $c = true; $s = $f.$s; $r = $f.$r; } s: while (true) { switch ($s) { case 0:
@@ -195776,7 +196025,8 @@ $packages["github.com/supraio/client-daemon/pkg/render/player"] = (function() {
 		$r = stats.$init(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$r = screen.$init(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$r = image.$init(); /* */ $s = 8; case 8: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = time.$init(); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = sync.$init(); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = time.$init(); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		/* */ } return; } if ($f === undefined) { $f = { $blk: $init }; } $f.$s = $s; $f.$r = $r; return $f;
 	};
 	$pkg.$init = $init;
@@ -196369,7 +196619,7 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 	sync = $packages["sync"];
 	js = $packages["syscall/js"];
 	time = $packages["time"];
-	ScreenWindow = $pkg.ScreenWindow = $newType(0, $kindStruct, "render.ScreenWindow", true, "github.com/supraio/client-daemon/pkg/render", true, function(processInfoManager_, screenDriver_, screenHost_, metadataDriver_, metadataHost_, clientID_, clientSecret_, screenID_, secure_, forceScreenSize_, timeoutDuration_, closed_, stats_, onClose_, window_, screen_, screenConn_, metadataServer_, responsiveSender_, collectionLoop_, decoderLoop_, renderingLoop_, sizeHandler_, touchHandler_, keyHandler_, mouseHandler_, eventMetrics_, pinger_, keyEventChan_, mouseEventChan_, sizeEventChan_, focusEventChan_, touchEventChan_, winCloseChannel_, windowSize_, geometry_) {
+	ScreenWindow = $pkg.ScreenWindow = $newType(0, $kindStruct, "render.ScreenWindow", true, "github.com/supraio/client-daemon/pkg/render", true, function(processInfoManager_, screenDriver_, screenHost_, metadataDriver_, metadataHost_, clientID_, clientSecret_, screenID_, secure_, forceScreenSize_, timeoutDuration_, closed_, closeMu_, stats_, onClose_, window_, screen_, screenConn_, metadataServer_, responsiveSender_, collectionLoop_, decoderLoop_, renderingLoop_, sizeHandler_, touchHandler_, keyHandler_, mouseHandler_, eventMetrics_, pinger_, keyEventChan_, mouseEventChan_, sizeEventChan_, focusEventChan_, touchEventChan_, winCloseChannel_, windowSize_, geometry_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.processInfoManager = ptrType.nil;
@@ -196384,6 +196634,7 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 			this.forceScreenSize = ptrType$1.nil;
 			this.timeoutDuration = new time.Duration(0, 0);
 			this.closed = false;
+			this.closeMu = new sync.Mutex.ptr(0, 0);
 			this.stats = ptrType$2.nil;
 			this.onClose = sliceType$1.nil;
 			this.window = $ifaceNil;
@@ -196422,6 +196673,7 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 		this.forceScreenSize = forceScreenSize_;
 		this.timeoutDuration = timeoutDuration_;
 		this.closed = closed_;
+		this.closeMu = closeMu_;
 		this.stats = stats_;
 		this.onClose = onClose_;
 		this.window = window_;
@@ -196588,7 +196840,7 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 		_r = stats.NewStats(); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		s = _r;
 		s.SetEncodingPreferences($clone(encodingPreferences, stats.EncodingPreferences));
-		$s = -1; return new ScreenWindow.ptr(processInfoManager, screenDriver, screenHost, metadataDriver, metadataHost, clientID, clientSecret, screenID, secure, forceScreenSize, timeoutDuration, true, s, sliceType$1.nil, $ifaceNil, $ifaceNil, $ifaceNil, ptrType$3.nil, ptrType$4.nil, ptrType$5.nil, ptrType$6.nil, ptrType$7.nil, ptrType$8.nil, ptrType$9.nil, ptrType$10.nil, ptrType$11.nil, input.NewEventMetrics(), ptrType$13.nil, new $Chan(key.Event, 50), new $Chan(mouse.Event, 50), new $Chan(size.Event, 50), new $Chan(focus.Event, 50), new $Chan(touch.Event, 50), new $Chan($emptyInterface, 0), new image.Point.ptr(0, 0), geometry);
+		$s = -1; return new ScreenWindow.ptr(processInfoManager, screenDriver, screenHost, metadataDriver, metadataHost, clientID, clientSecret, screenID, secure, forceScreenSize, timeoutDuration, true, new sync.Mutex.ptr(0, 0), s, sliceType$1.nil, $ifaceNil, $ifaceNil, $ifaceNil, ptrType$3.nil, ptrType$4.nil, ptrType$5.nil, ptrType$6.nil, ptrType$7.nil, ptrType$8.nil, ptrType$9.nil, ptrType$10.nil, ptrType$11.nil, input.NewEventMetrics(), ptrType$13.nil, new $Chan(key.Event, 50), new $Chan(mouse.Event, 50), new $Chan(size.Event, 50), new $Chan(focus.Event, 50), new $Chan(touch.Event, 50), new $Chan($emptyInterface, 0), new image.Point.ptr(0, 0), geometry);
 		/* */ } return; } var $f = {$blk: NewScreenWindow, $c: true, $r, _r, clientID, clientSecret, encodingPreferences, forceScreenSize, geometry, metadataDriver, metadataHost, processInfoManager, s, screenDriver, screenHost, screenID, secure, timeoutDuration, $s};return $f;
 	};
 	$pkg.NewScreenWindow = NewScreenWindow;
@@ -196644,48 +196896,42 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 	};
 	ScreenWindow.prototype.Start = function() { return this.$val.Start(); };
 	ScreenWindow.ptr.prototype.Close = function() {
-		var {_i, _r, _r$1, _r$2, _r$3, _ref, callback, err, w, x, $s, $r, $c} = $restore(this, {});
+		var {_i, _r, _r$1, _r$2, _ref, _selection, callback, err, w, x, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		w = this;
-		if (w.closed) {
+		$r = w.closeMu.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* */ if (w.closed) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.closed) { */ case 2:
+			$r = w.closeMu.Unlock(); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$s = -1; return;
-		}
+		/* } */ case 3:
 		w.closed = true;
-		$r = w.eventMetrics.Stop(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		_r = w.closeScreen(); /* */ $s = 2; case 2: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		$r = w.closeMu.Unlock(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = w.eventMetrics.Stop(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		_r = w.closeScreen(); /* */ $s = 7; case 7: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		err = _r;
-		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 3; continue; }
-		/* */ $s = 4; continue;
-		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 3:
-			$r = errs.Print("Cannot close screen", err); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		/* } */ case 4:
-		/* */ if (!(w.metadataServer === ptrType$3.nil)) { $s = 6; continue; }
-		/* */ $s = 7; continue;
-		/* if (!(w.metadataServer === ptrType$3.nil)) { */ case 6:
+		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 8; continue; }
+		/* */ $s = 9; continue;
+		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 8:
+			$r = errs.Print("Cannot close screen", err); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* } */ case 9:
+		$r = w.stats.Stop(); /* */ $s = 11; case 11: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* */ if (!(w.metadataServer === ptrType$3.nil)) { $s = 12; continue; }
+		/* */ $s = 13; continue;
+		/* if (!(w.metadataServer === ptrType$3.nil)) { */ case 12:
 			if (!(w.responsiveSender === ptrType$4.nil)) {
 				w.responsiveSender.Close();
 				w.responsiveSender = ptrType$4.nil;
 			}
-			_r$1 = w.metadataServer.Close("ScreenWindow closed"); /* */ $s = 8; case 8: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+			_r$1 = w.metadataServer.Close("ScreenWindow closed"); /* */ $s = 14; case 14: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 			err = _r$1;
-			/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 9; continue; }
-			/* */ $s = 10; continue;
-			/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 9:
-				$r = errs.Print("Cannot close metadata connection", err); /* */ $s = 11; case 11: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-			/* } */ case 10:
-			w.metadataServer = ptrType$3.nil;
-		/* } */ case 7:
-		/* */ if (!($interfaceIsEqual(w.screenConn, $ifaceNil))) { $s = 12; continue; }
-		/* */ $s = 13; continue;
-		/* if (!($interfaceIsEqual(w.screenConn, $ifaceNil))) { */ case 12:
-			_r$2 = w.screenConn.Close(); /* */ $s = 14; case 14: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
-			err = _r$2;
 			/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 15; continue; }
 			/* */ $s = 16; continue;
 			/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 15:
-				$r = errs.Print("Cannot close screen connection", err); /* */ $s = 17; case 17: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+				$r = errs.Print("Cannot close metadata connection", err); /* */ $s = 17; case 17: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			/* } */ case 16:
-			w.screenConn = $ifaceNil;
+			w.metadataServer = ptrType$3.nil;
 		/* } */ case 13:
 		/* */ if (!($interfaceIsEqual(w.window, $ifaceNil))) { $s = 18; continue; }
 		/* */ $s = 19; continue;
@@ -196693,26 +196939,29 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 			$r = w.window.Release(); /* */ $s = 20; case 20: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			w.window = $ifaceNil;
 		/* } */ case 19:
-		$r = $send(w.winCloseChannel, (x = new structType.ptr(), new x.constructor.elem(x))); /* */ $s = 21; case 21: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		_r$3 = w.processInfoManager.RemoveProcessInfo(w.screenID); /* */ $s = 22; case 22: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
-		err = _r$3;
-		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 23; continue; }
-		/* */ $s = 24; continue;
-		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 23:
-			$r = errs.Print("Cannot remove process info file", err); /* */ $s = 25; case 25: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		/* } */ case 24:
+		_selection = $select([[w.winCloseChannel, (x = new structType.ptr(), new x.constructor.elem(x))], []]);
+		if (_selection[0] === 0) {
+		} else if (_selection[0] === 1) {
+		}
+		_r$2 = w.processInfoManager.RemoveProcessInfo(w.screenID); /* */ $s = 21; case 21: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+		err = _r$2;
+		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 22; continue; }
+		/* */ $s = 23; continue;
+		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 22:
+			$r = errs.Print("Cannot remove process info file", err); /* */ $s = 24; case 24: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* } */ case 23:
 		w.screen = $ifaceNil;
 		_ref = w.onClose;
 		_i = 0;
-		/* while (true) { */ case 26:
-			/* if (!(_i < _ref.$length)) { break; } */ if(!(_i < _ref.$length)) { $s = 27; continue; }
+		/* while (true) { */ case 25:
+			/* if (!(_i < _ref.$length)) { break; } */ if(!(_i < _ref.$length)) { $s = 26; continue; }
 			callback = ((_i < 0 || _i >= _ref.$length) ? ($throwRuntimeError("index out of range"), undefined) : _ref.$array[_ref.$offset + _i]);
-			$r = callback(); /* */ $s = 28; case 28: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$r = callback(); /* */ $s = 27; case 27: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			_i++;
-		$s = 26; continue;
-		case 27:
+		$s = 25; continue;
+		case 26:
 		$s = -1; return;
-		/* */ } return; } var $f = {$blk: ScreenWindow.ptr.prototype.Close, $c: true, $r, _i, _r, _r$1, _r$2, _r$3, _ref, callback, err, w, x, $s};return $f;
+		/* */ } return; } var $f = {$blk: ScreenWindow.ptr.prototype.Close, $c: true, $r, _i, _r, _r$1, _r$2, _ref, _selection, callback, err, w, x, $s};return $f;
 	};
 	ScreenWindow.prototype.Close = function() { return this.$val.Close(); };
 	ScreenWindow.ptr.prototype.OnClose = function(callback) {
@@ -197243,52 +197492,74 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 		w = this;
 		if (!(w.collectionLoop === ptrType$5.nil)) {
 			w.collectionLoop.Stop();
-			w.collectionLoop = ptrType$5.nil;
 		}
 		if (!(w.decoderLoop === ptrType$6.nil)) {
 			w.decoderLoop.Stop();
-			w.decoderLoop = ptrType$6.nil;
 		}
 		if (!(w.renderingLoop === ptrType$7.nil)) {
 			w.renderingLoop.Stop();
-			w.renderingLoop = ptrType$7.nil;
 		}
-		if (!(w.pinger === ptrType$13.nil)) {
-			w.pinger.Close();
+		/* */ if (!(w.pinger === ptrType$13.nil)) { $s = 1; continue; }
+		/* */ $s = 2; continue;
+		/* if (!(w.pinger === ptrType$13.nil)) { */ case 1:
+			$r = w.pinger.Close(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			w.pinger = ptrType$13.nil;
-		}
+		/* } */ case 2:
 		errList = new sliceType$3([]);
-		screenSender = w.createScreenSender();
-		_r = UnregisterVideoStream(screenSender); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-		err = _r;
-		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 2; continue; }
-		/* */ $s = 3; continue;
-		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 2:
-			_r$1 = errs.Errorf("Could not unregister video stream: %s", new sliceType$2([err])); /* */ $s = 4; case 4: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
-			errList = $append(errList, _r$1);
-		/* } */ case 3:
-		_r$2 = screenSender.Send(3, new sliceType([])); /* */ $s = 5; case 5: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
-		err = _r$2;
-		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 6; continue; }
-		/* */ $s = 7; continue;
-		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 6:
-			_r$3 = errs.Errorf("Could not send disconnect msg to screen: %s", new sliceType$2([err])); /* */ $s = 8; case 8: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
-			errList = $append(errList, _r$3);
-		/* } */ case 7:
-		_r$4 = w.screenConn.Close(); /* */ $s = 9; case 9: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
-		err = _r$4;
-		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 10; continue; }
-		/* */ $s = 11; continue;
-		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 10:
-			_r$5 = errs.Errorf("Could not close screen connection: %s", new sliceType$2([err])); /* */ $s = 12; case 12: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
-			errList = $append(errList, _r$5);
-		/* } */ case 11:
+		/* */ if (!($interfaceIsEqual(w.screenConn, $ifaceNil))) { $s = 4; continue; }
+		/* */ $s = 5; continue;
+		/* if (!($interfaceIsEqual(w.screenConn, $ifaceNil))) { */ case 4:
+			screenSender = w.createScreenSender();
+			_r = UnregisterVideoStream(screenSender); /* */ $s = 6; case 6: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+			err = _r;
+			/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 7; continue; }
+			/* */ $s = 8; continue;
+			/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 7:
+				_r$1 = errs.Errorf("Could not unregister video stream: %s", new sliceType$2([err])); /* */ $s = 9; case 9: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+				errList = $append(errList, _r$1);
+			/* } */ case 8:
+			_r$2 = screenSender.Send(3, new sliceType([])); /* */ $s = 10; case 10: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			err = _r$2;
+			/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 11; continue; }
+			/* */ $s = 12; continue;
+			/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 11:
+				_r$3 = errs.Errorf("Could not send disconnect msg to screen: %s", new sliceType$2([err])); /* */ $s = 13; case 13: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+				errList = $append(errList, _r$3);
+			/* } */ case 12:
+			_r$4 = w.screenConn.Close(); /* */ $s = 14; case 14: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+			err = _r$4;
+			/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 15; continue; }
+			/* */ $s = 16; continue;
+			/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 15:
+				_r$5 = errs.Errorf("Could not close screen connection: %s", new sliceType$2([err])); /* */ $s = 17; case 17: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
+				errList = $append(errList, _r$5);
+			/* } */ case 16:
+			w.screenConn = $ifaceNil;
+		/* } */ case 5:
+		/* */ if (!(w.collectionLoop === ptrType$5.nil)) { $s = 18; continue; }
+		/* */ $s = 19; continue;
+		/* if (!(w.collectionLoop === ptrType$5.nil)) { */ case 18:
+			$r = w.collectionLoop.Wait(); /* */ $s = 20; case 20: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			w.collectionLoop = ptrType$5.nil;
+		/* } */ case 19:
+		/* */ if (!(w.decoderLoop === ptrType$6.nil)) { $s = 21; continue; }
+		/* */ $s = 22; continue;
+		/* if (!(w.decoderLoop === ptrType$6.nil)) { */ case 21:
+			$r = w.decoderLoop.Wait(); /* */ $s = 23; case 23: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			w.decoderLoop = ptrType$6.nil;
+		/* } */ case 22:
+		/* */ if (!(w.renderingLoop === ptrType$7.nil)) { $s = 24; continue; }
+		/* */ $s = 25; continue;
+		/* if (!(w.renderingLoop === ptrType$7.nil)) { */ case 24:
+			$r = w.renderingLoop.Wait(); /* */ $s = 26; case 26: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			w.renderingLoop = ptrType$7.nil;
+		/* } */ case 25:
 		if (errList.$length === 0) {
 			$s = -1; return $ifaceNil;
 		}
-		_r$6 = errs.CombineErrors(errList); /* */ $s = 13; case 13: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
+		_r$6 = errs.CombineErrors(errList); /* */ $s = 27; case 27: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
 		$24r = _r$6;
-		$s = 14; case 14: return $24r;
+		$s = 28; case 28: return $24r;
 		/* */ } return; } var $f = {$blk: ScreenWindow.ptr.prototype.closeScreen, $c: true, $r, $24r, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, err, errList, screenSender, w, $s};return $f;
 	};
 	ScreenWindow.prototype.closeScreen = function() { return this.$val.closeScreen(); };
@@ -197517,7 +197788,7 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 		var {supraObj, w, x, x$1, x$2, x$3, $s, $r, $c} = $restore(this, {w});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		w = [w];
-		supraObj = $makeMap($String.keyFor, [{ k: "geometry", v: geometryValue(w[0].Geometry()) }, { k: "screenStopped", v: new $Bool(false) }, { k: "setEncodingPreferences", v: (x = js.FuncOf((function(w) { return function $b(this$1, args) {
+		supraObj = $makeMap($String.keyFor, [{ k: "geometry", v: geometryValue(w[0].Geometry()) }, { k: "screenStopped", v: new $Bool(false) }, { k: "screenStopCompleted", v: new $Bool(false) }, { k: "setEncodingPreferences", v: (x = js.FuncOf((function(w) { return function $b(this$1, args) {
 			var {_r, args, err, jsonStr, prefs, this$1, $s, $r, $c} = $restore(this, {this$1, args});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 			prefs = [prefs];
@@ -197562,7 +197833,15 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 			$r = log.Println(new sliceType$2([new $String("__supra.stopScreen: stopping screen rendering")])); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$clone($clone(js.Global(), js.Value).Get("__supra"), js.Value).Set("screenStopped", new $Bool(true));
-			$go($methodVal(w[0], "Close"), []);
+			$go((function(w) { return function $b() {
+				var {$s, $r, $c} = $restore(this, {});
+				/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+				$r = w[0].Close(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+				$clone($clone(js.Global(), js.Value).Get("__supra"), js.Value).Set("screenStopCompleted", new $Bool(true));
+				$r = log.Println(new sliceType$2([new $String("__supra.stopScreen: screen rendering stopped")])); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+				$s = -1; return;
+				/* */ } return; } var $f = {$blk: $b, $c: true, $r, $s};return $f;
+			}; })(w), []);
 			$s = -1; return $ifaceNil;
 			/* */ } return; } var $f = {$blk: $b, $c: true, $r, args, this$1, $s};return $f;
 		}; })(w)), new x$2.constructor.elem(x$2)) }]);
@@ -197580,7 +197859,7 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 	};
 	ptrType$15.methods = [{prop: "Geometry", name: "Geometry", pkg: "", typ: $funcType([], [ptrType$14], false)}, {prop: "SetEncodingPreferences", name: "SetEncodingPreferences", pkg: "", typ: $funcType([stats.EncodingPreferences], [], false)}, {prop: "Start", name: "Start", pkg: "", typ: $funcType([], [$error], false)}, {prop: "Close", name: "Close", pkg: "", typ: $funcType([], [], false)}, {prop: "OnClose", name: "OnClose", pkg: "", typ: $funcType([funcType], [], false)}, {prop: "startWindow", name: "startWindow", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [$error], false)}, {prop: "startClipboard", name: "startClipboard", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [$error], false)}, {prop: "retriableOpen", name: "retriableOpen", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([$Int, funcType$1], [$error], false)}, {prop: "openMetadata", name: "openMetadata", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [$error], false)}, {prop: "createMetadataSender", name: "createMetadataSender", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [message.Sender], false)}, {prop: "createScreenSender", name: "createScreenSender", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [message.Sender], false)}, {prop: "getEventMultiplier", name: "getEventMultiplier", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [geom.Point], false)}, {prop: "startTimestampSyncing", name: "startTimestampSyncing", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [], false)}, {prop: "startStatsSyncing", name: "startStatsSyncing", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [], false)}, {prop: "sendStats", name: "sendStats", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [$error], false)}, {prop: "getFrameHealthCheckTimeout", name: "getFrameHealthCheckTimeout", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [time.Duration], false)}, {prop: "startScreenHealthChecking", name: "startScreenHealthChecking", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [], false)}, {prop: "openScreen", name: "openScreen", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [$error], false)}, {prop: "closeScreen", name: "closeScreen", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [$error], false)}, {prop: "createScreenBuffer", name: "createScreenBuffer", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [screen.Buffer, $error], false)}];
 	ptrType.methods = [{prop: "CreateProcessInfo", name: "CreateProcessInfo", pkg: "", typ: $funcType([$String, $Int], [$error], false)}, {prop: "RemoveProcessInfo", name: "RemoveProcessInfo", pkg: "", typ: $funcType([$String], [$error], false)}, {prop: "WaitProcess", name: "WaitProcess", pkg: "", typ: $funcType([$String], [$error], false)}, {prop: "GetProcessInfo", name: "GetProcessInfo", pkg: "", typ: $funcType([$String], [ProcessInfo, $error], false)}, {prop: "ListScreenIDs", name: "ListScreenIDs", pkg: "", typ: $funcType([], [sliceType$4, $error], false)}, {prop: "getUserProcessDirPath", name: "getUserProcessDirPath", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([], [$String], false)}];
-	ScreenWindow.init("github.com/supraio/client-daemon/pkg/render", [{prop: "processInfoManager", name: "processInfoManager", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "screenDriver", name: "screenDriver", embedded: false, exported: false, typ: netpacket.Driver, tag: ""}, {prop: "screenHost", name: "screenHost", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "metadataDriver", name: "metadataDriver", embedded: false, exported: false, typ: netstream.Driver, tag: ""}, {prop: "metadataHost", name: "metadataHost", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "clientID", name: "clientID", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "clientSecret", name: "clientSecret", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "screenID", name: "screenID", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "secure", name: "secure", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "forceScreenSize", name: "forceScreenSize", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "timeoutDuration", name: "timeoutDuration", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "closed", name: "closed", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "stats", name: "stats", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "onClose", name: "onClose", embedded: false, exported: false, typ: sliceType$1, tag: ""}, {prop: "window", name: "window", embedded: false, exported: false, typ: screen.Window, tag: ""}, {prop: "screen", name: "screen", embedded: false, exported: false, typ: screen.Screen, tag: ""}, {prop: "screenConn", name: "screenConn", embedded: false, exported: false, typ: netpacket.ReaderWriterCloser, tag: ""}, {prop: "metadataServer", name: "metadataServer", embedded: false, exported: false, typ: ptrType$3, tag: ""}, {prop: "responsiveSender", name: "responsiveSender", embedded: false, exported: false, typ: ptrType$4, tag: ""}, {prop: "collectionLoop", name: "collectionLoop", embedded: false, exported: false, typ: ptrType$5, tag: ""}, {prop: "decoderLoop", name: "decoderLoop", embedded: false, exported: false, typ: ptrType$6, tag: ""}, {prop: "renderingLoop", name: "renderingLoop", embedded: false, exported: false, typ: ptrType$7, tag: ""}, {prop: "sizeHandler", name: "sizeHandler", embedded: false, exported: false, typ: ptrType$8, tag: ""}, {prop: "touchHandler", name: "touchHandler", embedded: false, exported: false, typ: ptrType$9, tag: ""}, {prop: "keyHandler", name: "keyHandler", embedded: false, exported: false, typ: ptrType$10, tag: ""}, {prop: "mouseHandler", name: "mouseHandler", embedded: false, exported: false, typ: ptrType$11, tag: ""}, {prop: "eventMetrics", name: "eventMetrics", embedded: false, exported: false, typ: ptrType$12, tag: ""}, {prop: "pinger", name: "pinger", embedded: false, exported: false, typ: ptrType$13, tag: ""}, {prop: "keyEventChan", name: "keyEventChan", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "mouseEventChan", name: "mouseEventChan", embedded: false, exported: false, typ: chanType$1, tag: ""}, {prop: "sizeEventChan", name: "sizeEventChan", embedded: false, exported: false, typ: chanType$2, tag: ""}, {prop: "focusEventChan", name: "focusEventChan", embedded: false, exported: false, typ: chanType$3, tag: ""}, {prop: "touchEventChan", name: "touchEventChan", embedded: false, exported: false, typ: chanType$4, tag: ""}, {prop: "winCloseChannel", name: "winCloseChannel", embedded: false, exported: false, typ: chanType$5, tag: ""}, {prop: "windowSize", name: "windowSize", embedded: false, exported: false, typ: image.Point, tag: ""}, {prop: "geometry", name: "geometry", embedded: false, exported: false, typ: ptrType$14, tag: ""}]);
+	ScreenWindow.init("github.com/supraio/client-daemon/pkg/render", [{prop: "processInfoManager", name: "processInfoManager", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "screenDriver", name: "screenDriver", embedded: false, exported: false, typ: netpacket.Driver, tag: ""}, {prop: "screenHost", name: "screenHost", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "metadataDriver", name: "metadataDriver", embedded: false, exported: false, typ: netstream.Driver, tag: ""}, {prop: "metadataHost", name: "metadataHost", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "clientID", name: "clientID", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "clientSecret", name: "clientSecret", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "screenID", name: "screenID", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "secure", name: "secure", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "forceScreenSize", name: "forceScreenSize", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "timeoutDuration", name: "timeoutDuration", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "closed", name: "closed", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "closeMu", name: "closeMu", embedded: false, exported: false, typ: sync.Mutex, tag: ""}, {prop: "stats", name: "stats", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "onClose", name: "onClose", embedded: false, exported: false, typ: sliceType$1, tag: ""}, {prop: "window", name: "window", embedded: false, exported: false, typ: screen.Window, tag: ""}, {prop: "screen", name: "screen", embedded: false, exported: false, typ: screen.Screen, tag: ""}, {prop: "screenConn", name: "screenConn", embedded: false, exported: false, typ: netpacket.ReaderWriterCloser, tag: ""}, {prop: "metadataServer", name: "metadataServer", embedded: false, exported: false, typ: ptrType$3, tag: ""}, {prop: "responsiveSender", name: "responsiveSender", embedded: false, exported: false, typ: ptrType$4, tag: ""}, {prop: "collectionLoop", name: "collectionLoop", embedded: false, exported: false, typ: ptrType$5, tag: ""}, {prop: "decoderLoop", name: "decoderLoop", embedded: false, exported: false, typ: ptrType$6, tag: ""}, {prop: "renderingLoop", name: "renderingLoop", embedded: false, exported: false, typ: ptrType$7, tag: ""}, {prop: "sizeHandler", name: "sizeHandler", embedded: false, exported: false, typ: ptrType$8, tag: ""}, {prop: "touchHandler", name: "touchHandler", embedded: false, exported: false, typ: ptrType$9, tag: ""}, {prop: "keyHandler", name: "keyHandler", embedded: false, exported: false, typ: ptrType$10, tag: ""}, {prop: "mouseHandler", name: "mouseHandler", embedded: false, exported: false, typ: ptrType$11, tag: ""}, {prop: "eventMetrics", name: "eventMetrics", embedded: false, exported: false, typ: ptrType$12, tag: ""}, {prop: "pinger", name: "pinger", embedded: false, exported: false, typ: ptrType$13, tag: ""}, {prop: "keyEventChan", name: "keyEventChan", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "mouseEventChan", name: "mouseEventChan", embedded: false, exported: false, typ: chanType$1, tag: ""}, {prop: "sizeEventChan", name: "sizeEventChan", embedded: false, exported: false, typ: chanType$2, tag: ""}, {prop: "focusEventChan", name: "focusEventChan", embedded: false, exported: false, typ: chanType$3, tag: ""}, {prop: "touchEventChan", name: "touchEventChan", embedded: false, exported: false, typ: chanType$4, tag: ""}, {prop: "winCloseChannel", name: "winCloseChannel", embedded: false, exported: false, typ: chanType$5, tag: ""}, {prop: "windowSize", name: "windowSize", embedded: false, exported: false, typ: image.Point, tag: ""}, {prop: "geometry", name: "geometry", embedded: false, exported: false, typ: ptrType$14, tag: ""}]);
 	Geometry.init("", [{prop: "X", name: "X", embedded: false, exported: true, typ: $Int, tag: "json:\"x\""}, {prop: "Y", name: "Y", embedded: false, exported: true, typ: $Int, tag: "json:\"y\""}, {prop: "Width", name: "Width", embedded: false, exported: true, typ: $Int, tag: "json:\"width\""}, {prop: "Height", name: "Height", embedded: false, exported: true, typ: $Int, tag: "json:\"height\""}]);
 	ProcessInfo.init("", [{prop: "ScreenID", name: "ScreenID", embedded: false, exported: true, typ: $String, tag: ""}, {prop: "Pid", name: "Pid", embedded: false, exported: true, typ: $Int, tag: ""}]);
 	ProcessInfoManager.init("github.com/supraio/client-daemon/pkg/render", [{prop: "username", name: "username", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "processDir", name: "processDir", embedded: false, exported: false, typ: $String, tag: ""}]);