@supraio/client-daemon-js 1.0.0 → 1.1.0

package/supra-client-daemon.js

@@ -5462,7 +5462,7 @@ $packages["internal/race"] = (function() {
 	return $pkg;
 })();
 $packages["sync/atomic"] = (function() {
-	var $pkg = {}, $init, js, Value, ptrType$5, CompareAndSwapInt32, CompareAndSwapUint32, CompareAndSwapUint64, CompareAndSwapPointer, AddInt32, LoadInt32, LoadUint32, LoadUint64, LoadPointer, StoreInt32, StoreUint32, StoreUint64, StorePointer, sameType;
+	var $pkg = {}, $init, js, Value, Bool, Int64, noCopy, align64, ptrType, ptrType$2, ptrType$5, ptrType$6, ptrType$8, ptrType$12, b32, SwapInt64, SwapUint32, CompareAndSwapInt32, CompareAndSwapInt64, CompareAndSwapUint32, CompareAndSwapUint64, CompareAndSwapPointer, AddInt32, AddInt64, LoadInt32, LoadInt64, LoadUint32, LoadUint64, LoadPointer, StoreInt32, StoreInt64, StoreUint32, StoreUint64, StorePointer, sameType;
 	js = $packages["github.com/gopherjs/gopherjs/js"];
 	Value = $pkg.Value = $newType(0, $kindStruct, "atomic.Value", true, "sync/atomic", true, function(v_) {
 		this.$val = this;
@@ -5472,7 +5472,137 @@ $packages["sync/atomic"] = (function() {
 		}
 		this.v = v_;
 	});
+	Bool = $pkg.Bool = $newType(0, $kindStruct, "atomic.Bool", true, "sync/atomic", true, function(_$0_, v_) {
+		this.$val = this;
+		if (arguments.length === 0) {
+			this._$0 = new noCopy.ptr();
+			this.v = 0;
+			return;
+		}
+		this._$0 = _$0_;
+		this.v = v_;
+	});
+	Int64 = $pkg.Int64 = $newType(0, $kindStruct, "atomic.Int64", true, "sync/atomic", true, function(_$0_, _$1_, v_) {
+		this.$val = this;
+		if (arguments.length === 0) {
+			this._$0 = new noCopy.ptr();
+			this._$1 = new align64.ptr();
+			this.v = new $Int64(0, 0);
+			return;
+		}
+		this._$0 = _$0_;
+		this._$1 = _$1_;
+		this.v = v_;
+	});
+	noCopy = $pkg.noCopy = $newType(0, $kindStruct, "atomic.noCopy", true, "sync/atomic", false, function() {
+		this.$val = this;
+		if (arguments.length === 0) {
+			return;
+		}
+	});
+	align64 = $pkg.align64 = $newType(0, $kindStruct, "atomic.align64", true, "sync/atomic", false, function() {
+		this.$val = this;
+		if (arguments.length === 0) {
+			return;
+		}
+	});
+	ptrType = $ptrType($Uint32);
+	ptrType$2 = $ptrType($Int64);
 	ptrType$5 = $ptrType(Value);
+	ptrType$6 = $ptrType(Bool);
+	ptrType$8 = $ptrType(Int64);
+	ptrType$12 = $ptrType(noCopy);
+	Bool.ptr.prototype.Load = function() {
+		var x;
+		x = this;
+		return !((LoadUint32((x.$ptr_v || (x.$ptr_v = new ptrType(function() { return this.$target.v; }, function($v) { this.$target.v = $v; }, x)))) === 0));
+	};
+	Bool.prototype.Load = function() { return this.$val.Load(); };
+	Bool.ptr.prototype.Store = function(val) {
+		var val, x;
+		x = this;
+		StoreUint32((x.$ptr_v || (x.$ptr_v = new ptrType(function() { return this.$target.v; }, function($v) { this.$target.v = $v; }, x))), b32(val));
+	};
+	Bool.prototype.Store = function(val) { return this.$val.Store(val); };
+	Bool.ptr.prototype.Swap = function(new$1) {
+		var new$1, old, x;
+		old = false;
+		x = this;
+		old = !((SwapUint32((x.$ptr_v || (x.$ptr_v = new ptrType(function() { return this.$target.v; }, function($v) { this.$target.v = $v; }, x))), b32(new$1)) === 0));
+		return old;
+	};
+	Bool.prototype.Swap = function(new$1) { return this.$val.Swap(new$1); };
+	Bool.ptr.prototype.CompareAndSwap = function(old, new$1) {
+		var new$1, old, swapped, x;
+		swapped = false;
+		x = this;
+		swapped = CompareAndSwapUint32((x.$ptr_v || (x.$ptr_v = new ptrType(function() { return this.$target.v; }, function($v) { this.$target.v = $v; }, x))), b32(old), b32(new$1));
+		return swapped;
+	};
+	Bool.prototype.CompareAndSwap = function(old, new$1) { return this.$val.CompareAndSwap(old, new$1); };
+	b32 = function(b) {
+		var b;
+		if (b) {
+			return 1;
+		}
+		return 0;
+	};
+	Int64.ptr.prototype.Load = function() {
+		var x;
+		x = this;
+		return LoadInt64((x.$ptr_v || (x.$ptr_v = new ptrType$2(function() { return this.$target.v; }, function($v) { this.$target.v = $v; }, x))));
+	};
+	Int64.prototype.Load = function() { return this.$val.Load(); };
+	Int64.ptr.prototype.Store = function(val) {
+		var val, x;
+		x = this;
+		StoreInt64((x.$ptr_v || (x.$ptr_v = new ptrType$2(function() { return this.$target.v; }, function($v) { this.$target.v = $v; }, x))), val);
+	};
+	Int64.prototype.Store = function(val) { return this.$val.Store(val); };
+	Int64.ptr.prototype.Swap = function(new$1) {
+		var new$1, old, x;
+		old = new $Int64(0, 0);
+		x = this;
+		old = SwapInt64((x.$ptr_v || (x.$ptr_v = new ptrType$2(function() { return this.$target.v; }, function($v) { this.$target.v = $v; }, x))), new$1);
+		return old;
+	};
+	Int64.prototype.Swap = function(new$1) { return this.$val.Swap(new$1); };
+	Int64.ptr.prototype.CompareAndSwap = function(old, new$1) {
+		var new$1, old, swapped, x;
+		swapped = false;
+		x = this;
+		swapped = CompareAndSwapInt64((x.$ptr_v || (x.$ptr_v = new ptrType$2(function() { return this.$target.v; }, function($v) { this.$target.v = $v; }, x))), old, new$1);
+		return swapped;
+	};
+	Int64.prototype.CompareAndSwap = function(old, new$1) { return this.$val.CompareAndSwap(old, new$1); };
+	Int64.ptr.prototype.Add = function(delta) {
+		var delta, new$1, x;
+		new$1 = new $Int64(0, 0);
+		x = this;
+		new$1 = AddInt64((x.$ptr_v || (x.$ptr_v = new ptrType$2(function() { return this.$target.v; }, function($v) { this.$target.v = $v; }, x))), delta);
+		return new$1;
+	};
+	Int64.prototype.Add = function(delta) { return this.$val.Add(delta); };
+	noCopy.ptr.prototype.Lock = function() {
+	};
+	noCopy.prototype.Lock = function() { return this.$val.Lock(); };
+	noCopy.ptr.prototype.Unlock = function() {
+	};
+	noCopy.prototype.Unlock = function() { return this.$val.Unlock(); };
+	SwapInt64 = function(addr, new$1) {
+		var addr, new$1, old;
+		old = addr.$get();
+		addr.$set(new$1);
+		return old;
+	};
+	$pkg.SwapInt64 = SwapInt64;
+	SwapUint32 = function(addr, new$1) {
+		var addr, new$1, old;
+		old = addr.$get();
+		addr.$set(new$1);
+		return old;
+	};
+	$pkg.SwapUint32 = SwapUint32;
 	CompareAndSwapInt32 = function(addr, old, new$1) {
 		var addr, new$1, old;
 		if (addr.$get() === old) {
@@ -5482,6 +5612,15 @@ $packages["sync/atomic"] = (function() {
 		return false;
 	};
 	$pkg.CompareAndSwapInt32 = CompareAndSwapInt32;
+	CompareAndSwapInt64 = function(addr, old, new$1) {
+		var addr, new$1, old, x;
+		if ((x = addr.$get(), (x.$high === old.$high && x.$low === old.$low))) {
+			addr.$set(new$1);
+			return true;
+		}
+		return false;
+	};
+	$pkg.CompareAndSwapInt64 = CompareAndSwapInt64;
 	CompareAndSwapUint32 = function(addr, old, new$1) {
 		var addr, new$1, old;
 		if (addr.$get() === old) {
@@ -5516,11 +5655,23 @@ $packages["sync/atomic"] = (function() {
 		return new$1;
 	};
 	$pkg.AddInt32 = AddInt32;
+	AddInt64 = function(addr, delta) {
+		var addr, delta, new$1, x;
+		new$1 = (x = addr.$get(), new $Int64(x.$high + delta.$high, x.$low + delta.$low));
+		addr.$set(new$1);
+		return new$1;
+	};
+	$pkg.AddInt64 = AddInt64;
 	LoadInt32 = function(addr) {
 		var addr;
 		return addr.$get();
 	};
 	$pkg.LoadInt32 = LoadInt32;
+	LoadInt64 = function(addr) {
+		var addr;
+		return addr.$get();
+	};
+	$pkg.LoadInt64 = LoadInt64;
 	LoadUint32 = function(addr) {
 		var addr;
 		return addr.$get();
@@ -5541,6 +5692,11 @@ $packages["sync/atomic"] = (function() {
 		addr.$set(val);
 	};
 	$pkg.StoreInt32 = StoreInt32;
+	StoreInt64 = function(addr, val) {
+		var addr, val;
+		addr.$set(val);
+	};
+	$pkg.StoreInt64 = StoreInt64;
 	StoreUint32 = function(addr, val) {
 		var addr, val;
 		addr.$set(val);
@@ -5617,7 +5773,14 @@ $packages["sync/atomic"] = (function() {
 		return x.constructor === y.constructor;
 	};
 	ptrType$5.methods = [{prop: "Load", name: "Load", pkg: "", typ: $funcType([], [$emptyInterface], false)}, {prop: "Store", name: "Store", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "Swap", name: "Swap", pkg: "", typ: $funcType([$emptyInterface], [$emptyInterface], false)}, {prop: "CompareAndSwap", name: "CompareAndSwap", pkg: "", typ: $funcType([$emptyInterface, $emptyInterface], [$Bool], false)}, {prop: "checkNew", name: "checkNew", pkg: "sync/atomic", typ: $funcType([$String, $emptyInterface], [], false)}];
+	ptrType$6.methods = [{prop: "Load", name: "Load", pkg: "", typ: $funcType([], [$Bool], false)}, {prop: "Store", name: "Store", pkg: "", typ: $funcType([$Bool], [], false)}, {prop: "Swap", name: "Swap", pkg: "", typ: $funcType([$Bool], [$Bool], false)}, {prop: "CompareAndSwap", name: "CompareAndSwap", pkg: "", typ: $funcType([$Bool, $Bool], [$Bool], false)}];
+	ptrType$8.methods = [{prop: "Load", name: "Load", pkg: "", typ: $funcType([], [$Int64], false)}, {prop: "Store", name: "Store", pkg: "", typ: $funcType([$Int64], [], false)}, {prop: "Swap", name: "Swap", pkg: "", typ: $funcType([$Int64], [$Int64], false)}, {prop: "CompareAndSwap", name: "CompareAndSwap", pkg: "", typ: $funcType([$Int64, $Int64], [$Bool], false)}, {prop: "Add", name: "Add", pkg: "", typ: $funcType([$Int64], [$Int64], false)}];
+	ptrType$12.methods = [{prop: "Lock", name: "Lock", pkg: "", typ: $funcType([], [], false)}, {prop: "Unlock", name: "Unlock", pkg: "", typ: $funcType([], [], false)}];
 	Value.init("sync/atomic", [{prop: "v", name: "v", embedded: false, exported: false, typ: $emptyInterface, tag: ""}]);
+	Bool.init("sync/atomic", [{prop: "_$0", name: "_", embedded: false, exported: false, typ: noCopy, tag: ""}, {prop: "v", name: "v", embedded: false, exported: false, typ: $Uint32, tag: ""}]);
+	Int64.init("sync/atomic", [{prop: "_$0", name: "_", embedded: false, exported: false, typ: noCopy, tag: ""}, {prop: "_$1", name: "_", embedded: false, exported: false, typ: align64, tag: ""}, {prop: "v", name: "v", embedded: false, exported: false, typ: $Int64, tag: ""}]);
+	noCopy.init("", []);
+	align64.init("", []);
 	$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:
@@ -17749,7 +17912,7 @@ $packages["math/bits"] = (function() {
 	return $pkg;
 })();
 $packages["math"] = (function() {
-	var $pkg = {}, $init, js, bits, arrayType, arrayType$1, arrayType$2, structType, math, _zero, posInf, negInf, nan, buf, log2, Exp, Frexp, Inf, IsInf, IsNaN, Log, Log2, NaN, init, Float32bits, Float32frombits, Float64bits, Float64frombits, frexp, Round, normalize, Abs;
+	var $pkg = {}, $init, js, bits, arrayType, arrayType$1, arrayType$2, structType, math, _zero, posInf, negInf, nan, buf, log2, Exp, Frexp, Inf, IsInf, IsNaN, Log, Log2, NaN, init, Float32bits, Float32frombits, Float64bits, Float64frombits, frexp, normalize, Abs;
 	js = $packages["github.com/gopherjs/gopherjs/js"];
 	bits = $packages["math/bits"];
 	arrayType = $arrayType($Uint32, 2);
@@ -17884,23 +18047,6 @@ $packages["math"] = (function() {
 		frac = Float64frombits(x);
 		return [frac, exp$1];
 	};
-	Round = function(x) {
-		var bits$1, e, x, x$1, x$2, x$3, x$4;
-		bits$1 = Float64bits(x);
-		e = ((($shiftRightUint64(bits$1, 52).$low >>> 0)) & 2047) >>> 0;
-		if (e < 1023) {
-			bits$1 = (x$1 = new $Uint64(2147483648, 0), new $Uint64(bits$1.$high & x$1.$high, (bits$1.$low & x$1.$low) >>> 0));
-			if (e === 1022) {
-				bits$1 = (x$2 = new $Uint64(1072693248, 0), new $Uint64(bits$1.$high | x$2.$high, (bits$1.$low | x$2.$low) >>> 0));
-			}
-		} else if (e < 1075) {
-			e = e - (1023) >>> 0;
-			bits$1 = (x$3 = $shiftRightUint64(new $Uint64(524288, 0), e), new $Uint64(bits$1.$high + x$3.$high, bits$1.$low + x$3.$low));
-			bits$1 = (x$4 = $shiftRightUint64(new $Uint64(1048575, 4294967295), e), new $Uint64(bits$1.$high & ~x$4.$high, (bits$1.$low & ~x$4.$low) >>> 0));
-		}
-		return Float64frombits(bits$1);
-	};
-	$pkg.Round = Round;
 	normalize = function(x) {
 		var _tmp, _tmp$1, _tmp$2, _tmp$3, exp$1, x, y;
 		y = 0;
@@ -48708,7 +48854,7 @@ $packages["github.com/supraio/client-daemon/pkg/helper"] = (function() {
 		_r$4 = $recv(signalChannel[0]); /* */ $s = 1; case 1: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
 		sig = _r$4[0];
 		$r = log.Printf("Signal %s received (emulated after 1 week).\n", new sliceType$1([sig])); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$s = -1; return;
+		$s = -1; return sig;
 		/* */ } return; } var $f = {$blk: WaitOnStopSignal, $c: true, $r, _r$4, sig, signalChannel, $s};return $f;
 	};
 	$pkg.WaitOnStopSignal = WaitOnStopSignal;
@@ -48746,9 +48892,6 @@ $packages["github.com/coder/websocket/internal/bpool"] = (function() {
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		_r = bpool.Get(); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		b = _r;
-		if ($interfaceIsEqual(b, $ifaceNil)) {
-			$s = -1; return new bytes.Buffer.ptr(sliceType$1.nil, 0, 0);
-		}
 		$s = -1; return $assertType(b, ptrType);
 		/* */ } return; } var $f = {$blk: Get, $c: true, $r, _r, b, $s};return $f;
 	};
@@ -48764,7 +48907,9 @@ $packages["github.com/coder/websocket/internal/bpool"] = (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:
 		$r = bytes.$init(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$r = sync.$init(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		bpool = new sync.Pool.ptr(sliceType.nil, $throwNilPointerError);
+		bpool = new sync.Pool.ptr(sliceType.nil, (function() {
+			return new bytes.Buffer.ptr(sliceType$1.nil, 0, 0);
+		}));
 		/* */ } return; } if ($f === undefined) { $f = { $blk: $init }; } $f.$s = $s; $f.$r = $r; return $f;
 	};
 	$pkg.$init = $init;
@@ -48996,6 +49141,21 @@ $packages["github.com/coder/websocket/internal/wsjs"] = (function() {
 		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if (!$curGoroutine.asleep) { return  err[0]; } if($curGoroutine.asleep) { var $f = {$blk: WebSocket.ptr.prototype.Close, $c: true, $r, $24r, _r, c, code, err, reason, $s, $deferred};return $f; } }
 	};
 	WebSocket.prototype.Close = function(code, reason) { return this.$val.Close(code, reason); };
+	WebSocket.ptr.prototype.CloseNow = function() {
+		var {$24r, _r, c, 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);
+		err = [err];
+		err[0] = $ifaceNil;
+		c = this;
+		$deferred.push([handleJSError, [(err.$ptr || (err.$ptr = new ptrType(function() { return this.$target[0]; }, function($v) { this.$target[0] = $v; }, err))), $throwNilPointerError]]);
+		_r = $clone(c.v, js.Value).Call("close", sliceType.nil); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_r;
+		err[0] = err[0];
+		$24r = err[0];
+		$s = 2; case 2: return $24r;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if (!$curGoroutine.asleep) { return  err[0]; } if($curGoroutine.asleep) { var $f = {$blk: WebSocket.ptr.prototype.CloseNow, $c: true, $r, $24r, _r, c, err, $s, $deferred};return $f; } }
+	};
+	WebSocket.prototype.CloseNow = function() { return this.$val.CloseNow(); };
 	WebSocket.ptr.prototype.SendText = function(v) {
 		var {$24r, _r, c, err, v, $s, $deferred, $r, $c} = $restore(this, {v});
 		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
@@ -49028,6 +49188,12 @@ $packages["github.com/coder/websocket/internal/wsjs"] = (function() {
 		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if (!$curGoroutine.asleep) { return  err[0]; } if($curGoroutine.asleep) { var $f = {$blk: WebSocket.ptr.prototype.SendBytes, $c: true, $r, $24r, _arg, _r, _r$1, c, err, v, x, $s, $deferred};return $f; } }
 	};
 	WebSocket.prototype.SendBytes = function(v) { return this.$val.SendBytes(v); };
+	WebSocket.ptr.prototype.BufferedAmount = function() {
+		var c;
+		c = this;
+		return (new $Uint64(0, $clone($clone(c.v, js.Value).Get("bufferedAmount"), js.Value).Int()));
+	};
+	WebSocket.prototype.BufferedAmount = function() { return this.$val.BufferedAmount(); };
 	extractArrayBuffer = function(arrayBuffer) {
 		var {_r, arrayBuffer, dst, uint8Array$1, $s, $r, $c} = $restore(this, {arrayBuffer});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -49047,7 +49213,7 @@ $packages["github.com/coder/websocket/internal/wsjs"] = (function() {
 		$s = -1; return uint8Array$1;
 		/* */ } return; } var $f = {$blk: uint8Array, $c: true, $r, _r, src, uint8Array$1, $s};return $f;
 	};
-	WebSocket.methods = [{prop: "setBinaryType", name: "setBinaryType", pkg: "github.com/coder/websocket/internal/wsjs", typ: $funcType([$String], [], false)}, {prop: "addEventListener", name: "addEventListener", pkg: "github.com/coder/websocket/internal/wsjs", typ: $funcType([$String, funcType$1], [funcType], false)}, {prop: "OnClose", name: "OnClose", pkg: "", typ: $funcType([funcType$2], [funcType], false)}, {prop: "OnError", name: "OnError", pkg: "", typ: $funcType([funcType$1], [funcType], false)}, {prop: "OnMessage", name: "OnMessage", pkg: "", typ: $funcType([funcType$3], [funcType], false)}, {prop: "Subprotocol", name: "Subprotocol", pkg: "", typ: $funcType([], [$String], false)}, {prop: "OnOpen", name: "OnOpen", pkg: "", typ: $funcType([funcType$1], [funcType], false)}, {prop: "Close", name: "Close", pkg: "", typ: $funcType([$Int, $String], [$error], false)}, {prop: "SendText", name: "SendText", pkg: "", typ: $funcType([$String], [$error], false)}, {prop: "SendBytes", name: "SendBytes", pkg: "", typ: $funcType([sliceType$1], [$error], false)}];
+	WebSocket.methods = [{prop: "setBinaryType", name: "setBinaryType", pkg: "github.com/coder/websocket/internal/wsjs", typ: $funcType([$String], [], false)}, {prop: "addEventListener", name: "addEventListener", pkg: "github.com/coder/websocket/internal/wsjs", typ: $funcType([$String, funcType$1], [funcType], false)}, {prop: "OnClose", name: "OnClose", pkg: "", typ: $funcType([funcType$2], [funcType], false)}, {prop: "OnError", name: "OnError", pkg: "", typ: $funcType([funcType$1], [funcType], false)}, {prop: "OnMessage", name: "OnMessage", pkg: "", typ: $funcType([funcType$3], [funcType], false)}, {prop: "Subprotocol", name: "Subprotocol", pkg: "", typ: $funcType([], [$String], false)}, {prop: "OnOpen", name: "OnOpen", pkg: "", typ: $funcType([funcType$1], [funcType], false)}, {prop: "Close", name: "Close", pkg: "", typ: $funcType([$Int, $String], [$error], false)}, {prop: "CloseNow", name: "CloseNow", pkg: "", typ: $funcType([], [$error], false)}, {prop: "SendText", name: "SendText", pkg: "", typ: $funcType([$String], [$error], false)}, {prop: "SendBytes", name: "SendBytes", pkg: "", typ: $funcType([sliceType$1], [$error], false)}, {prop: "BufferedAmount", name: "BufferedAmount", pkg: "", typ: $funcType([], [$Uint64], false)}];
 	WebSocket.init("github.com/coder/websocket/internal/wsjs", [{prop: "v", name: "v", embedded: false, exported: false, typ: js.Value, tag: ""}]);
 	CloseEvent.init("", [{prop: "Code", name: "Code", embedded: false, exported: true, typ: $Uint16, tag: ""}, {prop: "Reason", name: "Reason", embedded: false, exported: true, typ: $String, tag: ""}, {prop: "WasClean", name: "WasClean", embedded: false, exported: true, typ: $Bool, tag: ""}]);
 	MessageEvent.init("", [{prop: "Data", name: "Data", embedded: false, exported: true, typ: $emptyInterface, tag: ""}]);
@@ -49060,71 +49226,6 @@ $packages["github.com/coder/websocket/internal/wsjs"] = (function() {
 	$pkg.$init = $init;
 	return $pkg;
 })();
-$packages["runtime/debug"] = (function() {
-	var $pkg = {}, $init, fmt, os, runtime, sort, strconv, strings, time;
-	fmt = $packages["fmt"];
-	os = $packages["os"];
-	runtime = $packages["runtime"];
-	sort = $packages["sort"];
-	strconv = $packages["strconv"];
-	strings = $packages["strings"];
-	time = $packages["time"];
-	$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:
-		$r = fmt.$init(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = os.$init(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = runtime.$init(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = sort.$init(); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = strconv.$init(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = strings.$init(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = time.$init(); /* */ $s = 7; case 7: 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;
-	return $pkg;
-})();
-$packages["github.com/coder/websocket/internal/xsync"] = (function() {
-	var $pkg = {}, $init, fmt, debug, atomic, Int64, ptrType;
-	fmt = $packages["fmt"];
-	debug = $packages["runtime/debug"];
-	atomic = $packages["sync/atomic"];
-	Int64 = $pkg.Int64 = $newType(0, $kindStruct, "xsync.Int64", true, "github.com/coder/websocket/internal/xsync", true, function(i_) {
-		this.$val = this;
-		if (arguments.length === 0) {
-			this.i = new atomic.Value.ptr($ifaceNil);
-			return;
-		}
-		this.i = i_;
-	});
-	ptrType = $ptrType(Int64);
-	Int64.ptr.prototype.Load = function() {
-		var _tuple, i, v;
-		v = this;
-		_tuple = $assertType(v.i.Load(), $Int64, true);
-		i = _tuple[0];
-		return i;
-	};
-	Int64.prototype.Load = function() { return this.$val.Load(); };
-	Int64.ptr.prototype.Store = function(i) {
-		var i, v;
-		v = this;
-		v.i.Store(i);
-	};
-	Int64.prototype.Store = function(i) { return this.$val.Store(i); };
-	ptrType.methods = [{prop: "Load", name: "Load", pkg: "", typ: $funcType([], [$Int64], false)}, {prop: "Store", name: "Store", pkg: "", typ: $funcType([$Int64], [], false)}];
-	Int64.init("github.com/coder/websocket/internal/xsync", [{prop: "i", name: "i", embedded: false, exported: false, typ: atomic.Value, 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:
-		$r = fmt.$init(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = debug.$init(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = atomic.$init(); /* */ $s = 3; case 3: 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;
-	return $pkg;
-})();
 $packages["internal/nettrace"] = (function() {
 	var $pkg = {}, $init, TraceKey, LookupIPAltResolverKey, Trace, funcType, sliceType, funcType$1, funcType$2, funcType$3;
 	TraceKey = $pkg.TraceKey = $newType(0, $kindStruct, "nettrace.TraceKey", true, "internal/nettrace", true, function() {
@@ -159887,7 +159988,7 @@ $packages["net/http"] = (function() {
 	return $pkg;
 })();
 $packages["github.com/coder/websocket"] = (function() {
-	var $pkg = {}, $init, bytes, context, binary, errors, fmt, bpool, wsjs, xsync, io, math, bits, net, http, reflect, runtime, strconv, strings, sync, atomic, js, time, Conn, DialOptions, writer, StatusCode, CloseError, MessageType, noCopy, ptrType, sliceType, structType, funcType, sliceType$1, ptrType$3, ptrType$4, sliceType$2, funcType$1, arrayType, sliceType$3, ptrType$5, ptrType$6, ptrType$7, chanType, ptrType$9, ptrType$10, _MessageType_index, _StatusCode_index, Dial, dial;
+	var $pkg = {}, $init, bytes, context, binary, errors, fmt, bpool, wsjs, io, math, bits, net, http, reflect, runtime, strconv, strings, sync, atomic, js, time, Conn, DialOptions, writer, StatusCode, CloseError, MessageType, noCopy, ptrType, sliceType, structType, funcType, sliceType$1, ptrType$3, ptrType$4, sliceType$2, funcType$1, arrayType, sliceType$3, ptrType$5, ptrType$6, ptrType$7, chanType, ptrType$8, ptrType$9, _MessageType_index, _StatusCode_index, Dial, dial;
 	bytes = $packages["bytes"];
 	context = $packages["context"];
 	binary = $packages["encoding/binary"];
@@ -159895,7 +159996,6 @@ $packages["github.com/coder/websocket"] = (function() {
 	fmt = $packages["fmt"];
 	bpool = $packages["github.com/coder/websocket/internal/bpool"];
 	wsjs = $packages["github.com/coder/websocket/internal/wsjs"];
-	xsync = $packages["github.com/coder/websocket/internal/xsync"];
 	io = $packages["io"];
 	math = $packages["math"];
 	bits = $packages["math/bits"];
@@ -159909,12 +160009,12 @@ $packages["github.com/coder/websocket"] = (function() {
 	atomic = $packages["sync/atomic"];
 	js = $packages["syscall/js"];
 	time = $packages["time"];
-	Conn = $pkg.Conn = $newType(0, $kindStruct, "websocket.Conn", true, "github.com/coder/websocket", true, function(noCopy_, ws_, msgReadLimit_, closeReadMu_, closeReadCtx_, closingMu_, closeOnce_, closed_, closeErrOnce_, closeErr_, closeWasClean_, releaseOnClose_, releaseOnError_, releaseOnMessage_, readSignal_, readBufMu_, readBuf_) {
+	Conn = $pkg.Conn = $newType(0, $kindStruct, "websocket.Conn", true, "github.com/coder/websocket", true, function(noCopy_, ws_, msgReadLimit_, closeReadMu_, closeReadCtx_, closingMu_, closeOnce_, closed_, closeErrOnce_, closeErr_, closeWasClean_, releaseOnce_, releaseOnClose_, releaseOnError_, releaseOnMessage_, readSignal_, readBufMu_, readBuf_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.noCopy = new noCopy.ptr();
 			this.ws = new wsjs.WebSocket.ptr(new js.Value.ptr(null, false, arrayType.zero()));
-			this.msgReadLimit = new xsync.Int64.ptr(new atomic.Value.ptr($ifaceNil));
+			this.msgReadLimit = new atomic.Int64.ptr(new atomic.noCopy.ptr(), new atomic.align64.ptr(), new $Int64(0, 0));
 			this.closeReadMu = new sync.Mutex.ptr(0, 0);
 			this.closeReadCtx = $ifaceNil;
 			this.closingMu = new sync.Mutex.ptr(0, 0);
@@ -159923,6 +160023,7 @@ $packages["github.com/coder/websocket"] = (function() {
 			this.closeErrOnce = new sync.Once.ptr(0, new sync.Mutex.ptr(0, 0));
 			this.closeErr = $ifaceNil;
 			this.closeWasClean = false;
+			this.releaseOnce = new sync.Once.ptr(0, new sync.Mutex.ptr(0, 0));
 			this.releaseOnClose = $throwNilPointerError;
 			this.releaseOnError = $throwNilPointerError;
 			this.releaseOnMessage = $throwNilPointerError;
@@ -159942,6 +160043,7 @@ $packages["github.com/coder/websocket"] = (function() {
 		this.closeErrOnce = closeErrOnce_;
 		this.closeErr = closeErr_;
 		this.closeWasClean = closeWasClean_;
+		this.releaseOnce = releaseOnce_;
 		this.releaseOnClose = releaseOnClose_;
 		this.releaseOnError = releaseOnError_;
 		this.releaseOnMessage = releaseOnMessage_;
@@ -160006,8 +160108,8 @@ $packages["github.com/coder/websocket"] = (function() {
 	ptrType$6 = $ptrType($packages["crypto/tls"].ConnectionState);
 	ptrType$7 = $ptrType(bytes.Buffer);
 	chanType = $chanType(structType, false, false);
-	ptrType$9 = $ptrType(writer);
-	ptrType$10 = $ptrType(noCopy);
+	ptrType$8 = $ptrType(writer);
+	ptrType$9 = $ptrType(noCopy);
 	Conn.ptr.prototype.close = function(err, wasClean) {
 		var {c, err, wasClean, $s, $r, $c} = $restore(this, {err, wasClean});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -160048,9 +160150,7 @@ $packages["github.com/coder/websocket"] = (function() {
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 			err = new CloseError.ptr(((e.Code >> 0)), e.Reason);
 			$r = c[0].close(new err.constructor.elem(err), e.WasClean); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-			$r = c[0].releaseOnClose(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-			$r = c[0].releaseOnError(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-			$r = c[0].releaseOnMessage(); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$r = c[0].releaseEventHandlers(); /* */ $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, e, err, $s};return $f;
 		}; })(c)); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
@@ -160058,8 +160158,7 @@ $packages["github.com/coder/websocket"] = (function() {
 		_r$1 = $clone(c[0].ws, wsjs.WebSocket).OnError((function(c) { return function $b(v) {
 			var {v, $s, $r, $c} = $restore(this, {v});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
-			$r = c[0].setCloseErr(errors.New($clone($clone(v, js.Value).Get("message"), js.Value).String())); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-			$r = c[0].closeWithInternal(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$r = c[0].abort(errors.New($clone($clone(v, js.Value).Get("message"), js.Value).String())); /* */ $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, v, $s};return $f;
 		}; })(c)); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
@@ -160090,18 +160189,47 @@ $packages["github.com/coder/websocket"] = (function() {
 		/* */ } return; } var $f = {$blk: Conn.ptr.prototype.init, $c: true, $r, _r, _r$1, _r$2, c, $s};return $f;
 	};
 	Conn.prototype.init = function() { return this.$val.init(); };
+	Conn.ptr.prototype.releaseEventHandlers = function() {
+		var {c, $s, $r, $c} = $restore(this, {});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		c = [c];
+		c[0] = this;
+		$r = c[0].releaseOnce.Do((function(c) { return function $b() {
+			var {$s, $r, $c} = $restore(this, {});
+			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+			$r = c[0].releaseOnClose(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$r = c[0].releaseOnError(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$r = c[0].releaseOnMessage(); /* */ $s = 3; case 3: 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;
+		}; })(c)); /* */ $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: Conn.ptr.prototype.releaseEventHandlers, $c: true, $r, c, $s};return $f;
+	};
+	Conn.prototype.releaseEventHandlers = function() { return this.$val.releaseEventHandlers(); };
+	Conn.ptr.prototype.abort = function(err) {
+		var {_r, c, err, $s, $r, $c} = $restore(this, {err});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		c = this;
+		$r = c.close(err, false); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = c.releaseEventHandlers(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		_r = $clone(c.ws, wsjs.WebSocket).CloseNow(); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		$unused(_r);
+		$s = -1; return;
+		/* */ } return; } var $f = {$blk: Conn.ptr.prototype.abort, $c: true, $r, _r, c, err, $s};return $f;
+	};
+	Conn.prototype.abort = function(err) { return this.$val.abort(err); };
 	Conn.ptr.prototype.closeWithInternal = function() {
-		var {_r, c, $s, $r, $c} = $restore(this, {});
+		var {c, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		c = this;
-		_r = c.Close(1011, "something went wrong"); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-		_r;
+		$r = c.abort(errors.New("something went wrong")); /* */ $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: Conn.ptr.prototype.closeWithInternal, $c: true, $r, _r, c, $s};return $f;
+		/* */ } return; } var $f = {$blk: Conn.ptr.prototype.closeWithInternal, $c: true, $r, c, $s};return $f;
 	};
 	Conn.prototype.closeWithInternal = function() { return this.$val.closeWithInternal(); };
 	Conn.ptr.prototype.Read = function(ctx) {
-		var {$24r, _arg, _r, _r$1, _r$2, _r$3, _r$4, _tuple, c, closedRead, ctx, err, err$1, p, readLimit, typ, x, $s, $r, $c} = $restore(this, {ctx});
+		var {$24r, $24r$1, _arg, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, c, closedRead, ctx, err, p, readLimit, reason, typ, x, $s, $r, $c} = $restore(this, {ctx});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		c = this;
 		$r = c.closeReadMu.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
@@ -160126,16 +160254,18 @@ $packages["github.com/coder/websocket"] = (function() {
 		/* */ if ((readLimit.$high > 0 || (readLimit.$high === 0 && readLimit.$low >= 0)) && (x = (new $Int64(0, p.$length)), (x.$high > readLimit.$high || (x.$high === readLimit.$high && x.$low > readLimit.$low)))) { $s = 8; continue; }
 		/* */ $s = 9; continue;
 		/* if ((readLimit.$high > 0 || (readLimit.$high === 0 && readLimit.$low >= 0)) && (x = (new $Int64(0, p.$length)), (x.$high > readLimit.$high || (x.$high === readLimit.$high && x.$low > readLimit.$low)))) { */ case 8:
-			_r$2 = fmt.Errorf("read limited at %v bytes", new sliceType([c.msgReadLimit.Load()])); /* */ $s = 10; case 10: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
-			err$1 = _r$2;
-			_r$3 = err$1.Error(); /* */ $s = 11; case 11: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+			_r$2 = fmt.Errorf("read limited at %d bytes", new sliceType([c.msgReadLimit.Load()])); /* */ $s = 10; case 10: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			reason = _r$2;
+			_r$3 = reason.Error(); /* */ $s = 11; case 11: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
 			_arg = _r$3;
 			_r$4 = c.Close(1009, _arg); /* */ $s = 12; case 12: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
 			_r$4;
-			$s = -1; return [0, sliceType$1.nil, err$1];
+			_r$5 = fmt.Errorf("%w: %v", new sliceType([$pkg.ErrMessageTooBig, reason])); /* */ $s = 13; case 13: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
+			$24r$1 = [0, sliceType$1.nil, _r$5];
+			$s = 14; case 14: return $24r$1;
 		/* } */ case 9:
 		$s = -1; return [typ, p, $ifaceNil];
-		/* */ } return; } var $f = {$blk: Conn.ptr.prototype.Read, $c: true, $r, $24r, _arg, _r, _r$1, _r$2, _r$3, _r$4, _tuple, c, closedRead, ctx, err, err$1, p, readLimit, typ, x, $s};return $f;
+		/* */ } return; } var $f = {$blk: Conn.ptr.prototype.Read, $c: true, $r, $24r, $24r$1, _arg, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, c, closedRead, ctx, err, p, readLimit, reason, typ, x, $s};return $f;
 	};
 	Conn.prototype.Read = function(ctx) { return this.$val.Read(ctx); };
 	Conn.ptr.prototype.read = function(ctx) {
@@ -160205,7 +160335,7 @@ $packages["github.com/coder/websocket"] = (function() {
 		var {_r, _r$1, c, ctx, err, err$1, p, typ, $s, $r, $c} = $restore(this, {ctx, typ, p});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		c = this;
-		_r = c.write(ctx, typ, p); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_r = c.write(typ, p); /* */ $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;
@@ -160220,8 +160350,8 @@ $packages["github.com/coder/websocket"] = (function() {
 		/* */ } return; } var $f = {$blk: Conn.ptr.prototype.Write, $c: true, $r, _r, _r$1, c, ctx, err, err$1, p, typ, $s};return $f;
 	};
 	Conn.prototype.Write = function(ctx, typ, p) { return this.$val.Write(ctx, typ, p); };
-	Conn.ptr.prototype.write = function(ctx, typ, p) {
-		var {$24r, $24r$1, $24r$2, _1, _r, _r$1, _r$2, c, ctx, p, typ, $s, $r, $c} = $restore(this, {ctx, typ, p});
+	Conn.ptr.prototype.write = function(typ, p) {
+		var {$24r, $24r$1, $24r$2, _1, _r, _r$1, _r$2, c, p, typ, $s, $r, $c} = $restore(this, {typ, p});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		c = this;
 		if (c.isClosed()) {
@@ -160246,9 +160376,9 @@ $packages["github.com/coder/websocket"] = (function() {
 			/* } */ case 5:
 		case 1:
 		$s = -1; return $ifaceNil;
-		/* */ } return; } var $f = {$blk: Conn.ptr.prototype.write, $c: true, $r, $24r, $24r$1, $24r$2, _1, _r, _r$1, _r$2, c, ctx, p, typ, $s};return $f;
+		/* */ } return; } var $f = {$blk: Conn.ptr.prototype.write, $c: true, $r, $24r, $24r$1, $24r$2, _1, _r, _r$1, _r$2, c, p, typ, $s};return $f;
 	};
-	Conn.prototype.write = function(ctx, typ, p) { return this.$val.write(ctx, typ, p); };
+	Conn.prototype.write = function(typ, p) { return this.$val.write(typ, p); };
 	Conn.ptr.prototype.Close = function(code, reason) {
 		var {$24r, _r, _r$1, c, code, err, reason, $s, $r, $c} = $restore(this, {code, reason});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -160267,13 +160397,16 @@ $packages["github.com/coder/websocket"] = (function() {
 	};
 	Conn.prototype.Close = function(code, reason) { return this.$val.Close(code, reason); };
 	Conn.ptr.prototype.CloseNow = function() {
-		var {$24r, _r, c, $s, $r, $c} = $restore(this, {});
+		var {_r, c, x, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		c = this;
-		_r = c.Close(1001, ""); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-		$24r = _r;
-		$s = 2; case 2: return $24r;
-		/* */ } return; } var $f = {$blk: Conn.ptr.prototype.CloseNow, $c: true, $r, $24r, _r, c, $s};return $f;
+		if (c.isClosed()) {
+			$s = -1; return net.ErrClosed;
+		}
+		_r = fmt.Errorf("sent close: %w", new sliceType([(x = new CloseError.ptr(1001, ""), new x.constructor.elem(x))])); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		$r = c.abort(_r); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$s = -1; return $ifaceNil;
+		/* */ } return; } var $f = {$blk: Conn.ptr.prototype.CloseNow, $c: true, $r, _r, c, x, $s};return $f;
 	};
 	Conn.prototype.CloseNow = function() { return this.$val.CloseNow(); };
 	Conn.ptr.prototype.exportedClose = function(code, reason) {
@@ -160296,19 +160429,20 @@ $packages["github.com/coder/websocket"] = (function() {
 		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 8; continue; }
 		/* */ $s = 9; continue;
 		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 8:
+			$r = c.abort(ce); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$24r$1 = err;
-			$s = 10; case 10: return $24r$1;
+			$s = 11; case 11: return $24r$1;
 		/* } */ case 9:
-		_r$2 = $recv(c.closed); /* */ $s = 11; case 11: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+		_r$2 = $recv(c.closed); /* */ $s = 12; case 12: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
 		_r$2[0];
-		/* */ if (!c.closeWasClean) { $s = 12; continue; }
-		/* */ $s = 13; continue;
-		/* if (!c.closeWasClean) { */ case 12:
+		/* */ if (!c.closeWasClean) { $s = 13; continue; }
+		/* */ $s = 14; continue;
+		/* if (!c.closeWasClean) { */ case 13:
 			$24r$2 = c.closeErr;
-			$s = 14; case 14: return $24r$2;
-		/* } */ case 13:
+			$s = 15; case 15: return $24r$2;
+		/* } */ case 14:
 		$24r$3 = $ifaceNil;
-		$s = 15; case 15: return $24r$3;
+		$s = 16; case 16: return $24r$3;
 		/* */ } return; } } catch(err) { $err = err; $s = -1; return $ifaceNil; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: Conn.ptr.prototype.exportedClose, $c: true, $r, $24r, $24r$1, $24r$2, $24r$3, _r, _r$1, _r$2, c, ce, code, err, reason, x, $s, $deferred};return $f; } }
 	};
 	Conn.prototype.exportedClose = function(code, reason) { return this.$val.exportedClose(code, reason); };
@@ -160356,12 +160490,15 @@ $packages["github.com/coder/websocket"] = (function() {
 			$24r = [ptrType.nil, ptrType$3.nil, err];
 			$s = 4; case 4: return $24r;
 		/* } */ case 3:
-		c = new Conn.ptr(new noCopy.ptr(), $clone(ws, wsjs.WebSocket), new xsync.Int64.ptr(new atomic.Value.ptr($ifaceNil)), new sync.Mutex.ptr(0, 0), $ifaceNil, new sync.Mutex.ptr(0, 0), new sync.Once.ptr(0, new sync.Mutex.ptr(0, 0)), $chanNil, new sync.Once.ptr(0, new sync.Mutex.ptr(0, 0)), $ifaceNil, false, $throwNilPointerError, $throwNilPointerError, $throwNilPointerError, $chanNil, new sync.Mutex.ptr(0, 0), sliceType$3.nil);
+		c = new Conn.ptr(new noCopy.ptr(), $clone(ws, wsjs.WebSocket), new atomic.Int64.ptr(new atomic.noCopy.ptr(), new atomic.align64.ptr(), new $Int64(0, 0)), new sync.Mutex.ptr(0, 0), $ifaceNil, new sync.Mutex.ptr(0, 0), new sync.Once.ptr(0, new sync.Mutex.ptr(0, 0)), $chanNil, new sync.Once.ptr(0, new sync.Mutex.ptr(0, 0)), $ifaceNil, false, new sync.Once.ptr(0, new sync.Mutex.ptr(0, 0)), $throwNilPointerError, $throwNilPointerError, $throwNilPointerError, $chanNil, new sync.Mutex.ptr(0, 0), sliceType$3.nil);
 		$r = c.init(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		opench[0] = new $Chan(structType, 0);
-		_r$1 = $clone(ws, wsjs.WebSocket).OnOpen((function(opench) { return function(e) {
-			var e;
-			$close(opench[0]);
+		_r$1 = $clone(ws, wsjs.WebSocket).OnOpen((function(opench) { return function $b(e) {
+			var {e, $s, $r, $c} = $restore(this, {e});
+			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+			$r = $send(opench[0], $clone($clone(new structType.ptr(), structType), structType)); /* */ $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, e, $s};return $f;
 		}; })(opench)); /* */ $s = 6; case 6: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 		releaseOpen = _r$1;
 		$deferred.push([releaseOpen, []]);
@@ -160373,17 +160510,17 @@ $packages["github.com/coder/websocket"] = (function() {
 		/* */ if (_selection[0] === 2) { $s = 11; continue; }
 		/* */ $s = 12; continue;
 		/* if (_selection[0] === 0) { */ case 9:
-			_r$4 = c.Close(1008, "dial timed out"); /* */ $s = 13; case 13: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
-			_r$4;
-			_r$5 = ctx.Err(); /* */ $s = 14; case 14: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
+			_r$4 = ctx.Err(); /* */ $s = 13; case 13: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+			$r = c.abort(_r$4); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$5 = ctx.Err(); /* */ $s = 15; case 15: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
 			$24r$1 = [ptrType.nil, ptrType$3.nil, _r$5];
-			$s = 15; case 15: return $24r$1;
+			$s = 16; case 16: return $24r$1;
 		/* } else if (_selection[0] === 1) { */ case 10:
 			$24r$2 = [c, new http.Response.ptr("", 101, "", 0, 0, false, $ifaceNil, new $Int64(0, 0), sliceType$2.nil, false, false, false, ptrType$5.nil, ptrType$6.nil), $ifaceNil];
-			$s = 16; case 16: return $24r$2;
+			$s = 17; case 17: return $24r$2;
 		/* } else if (_selection[0] === 2) { */ case 11:
 			$24r$3 = [ptrType.nil, ptrType$3.nil, net.ErrClosed];
-			$s = 17; case 17: return $24r$3;
+			$s = 18; case 18: return $24r$3;
 		/* } */ case 12:
 		$s = -1; return [ptrType.nil, ptrType$3.nil, $ifaceNil];
 		/* */ } return; } } catch(err) { $err = err; $s = -1; return [ptrType.nil, ptrType$3.nil, $ifaceNil]; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: dial, $c: true, $r, $24r, $24r$1, $24r$2, $24r$3, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _selection, _tuple, c, ctx, err, opench, opts, releaseOpen, url, ws, $s, $deferred};return $f; } }
@@ -160510,6 +160647,12 @@ $packages["github.com/coder/websocket"] = (function() {
 		c.msgReadLimit.Store(n);
 	};
 	Conn.prototype.SetReadLimit = function(n) { return this.$val.SetReadLimit(n); };
+	Conn.ptr.prototype.BufferedAmount = function() {
+		var c;
+		c = this;
+		return $clone(c.ws, wsjs.WebSocket).BufferedAmount();
+	};
+	Conn.prototype.BufferedAmount = function() { return this.$val.BufferedAmount(); };
 	Conn.ptr.prototype.setCloseErr = function(err) {
 		var {c, err, $s, $r, $c} = $restore(this, {err});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -160572,13 +160715,13 @@ $packages["github.com/coder/websocket"] = (function() {
 		return $substring("StatusNormalClosureStatusGoingAwayStatusProtocolErrorStatusUnsupportedDatastatusReservedStatusNoStatusRcvdStatusAbnormalClosureStatusInvalidFramePayloadDataStatusPolicyViolationStatusMessageTooBigStatusMandatoryExtensionStatusInternalErrorStatusServiceRestartStatusTryAgainLaterStatusBadGatewayStatusTLSHandshake", ((i < 0 || i >= _StatusCode_index.length) ? ($throwRuntimeError("index out of range"), undefined) : _StatusCode_index[i]), (x = i + 1 >> 0, ((x < 0 || x >= _StatusCode_index.length) ? ($throwRuntimeError("index out of range"), undefined) : _StatusCode_index[x])));
 	};
 	$ptrType(StatusCode).prototype.String = function() { return new StatusCode(this.$get()).String(); };
-	ptrType.methods = [{prop: "close", name: "close", pkg: "github.com/coder/websocket", typ: $funcType([$error, $Bool], [], false)}, {prop: "init", name: "init", pkg: "github.com/coder/websocket", typ: $funcType([], [], false)}, {prop: "closeWithInternal", name: "closeWithInternal", pkg: "github.com/coder/websocket", typ: $funcType([], [], false)}, {prop: "Read", name: "Read", pkg: "", typ: $funcType([context.Context], [MessageType, sliceType$1, $error], false)}, {prop: "read", name: "read", pkg: "github.com/coder/websocket", typ: $funcType([context.Context], [MessageType, sliceType$1, $error], false)}, {prop: "Ping", name: "Ping", pkg: "", typ: $funcType([context.Context], [$error], false)}, {prop: "Write", name: "Write", pkg: "", typ: $funcType([context.Context, MessageType, sliceType$1], [$error], false)}, {prop: "write", name: "write", pkg: "github.com/coder/websocket", typ: $funcType([context.Context, MessageType, sliceType$1], [$error], false)}, {prop: "Close", name: "Close", pkg: "", typ: $funcType([StatusCode, $String], [$error], false)}, {prop: "CloseNow", name: "CloseNow", pkg: "", typ: $funcType([], [$error], false)}, {prop: "exportedClose", name: "exportedClose", pkg: "github.com/coder/websocket", typ: $funcType([StatusCode, $String], [$error], false)}, {prop: "Subprotocol", name: "Subprotocol", pkg: "", typ: $funcType([], [$String], false)}, {prop: "Reader", name: "Reader", pkg: "", typ: $funcType([context.Context], [MessageType, io.Reader, $error], false)}, {prop: "Writer", name: "Writer", pkg: "", typ: $funcType([context.Context, MessageType], [io.WriteCloser, $error], false)}, {prop: "CloseRead", name: "CloseRead", pkg: "", typ: $funcType([context.Context], [context.Context], false)}, {prop: "SetReadLimit", name: "SetReadLimit", pkg: "", typ: $funcType([$Int64], [], false)}, {prop: "setCloseErr", name: "setCloseErr", pkg: "github.com/coder/websocket", typ: $funcType([$error], [], false)}, {prop: "isClosed", name: "isClosed", pkg: "github.com/coder/websocket", typ: $funcType([], [$Bool], false)}];
-	ptrType$9.methods = [{prop: "Write", name: "Write", pkg: "", typ: $funcType([sliceType$1], [$Int, $error], false)}, {prop: "Close", name: "Close", pkg: "", typ: $funcType([], [$error], false)}];
+	ptrType.methods = [{prop: "close", name: "close", pkg: "github.com/coder/websocket", typ: $funcType([$error, $Bool], [], false)}, {prop: "init", name: "init", pkg: "github.com/coder/websocket", typ: $funcType([], [], false)}, {prop: "releaseEventHandlers", name: "releaseEventHandlers", pkg: "github.com/coder/websocket", typ: $funcType([], [], false)}, {prop: "abort", name: "abort", pkg: "github.com/coder/websocket", typ: $funcType([$error], [], false)}, {prop: "closeWithInternal", name: "closeWithInternal", pkg: "github.com/coder/websocket", typ: $funcType([], [], false)}, {prop: "Read", name: "Read", pkg: "", typ: $funcType([context.Context], [MessageType, sliceType$1, $error], false)}, {prop: "read", name: "read", pkg: "github.com/coder/websocket", typ: $funcType([context.Context], [MessageType, sliceType$1, $error], false)}, {prop: "Ping", name: "Ping", pkg: "", typ: $funcType([context.Context], [$error], false)}, {prop: "Write", name: "Write", pkg: "", typ: $funcType([context.Context, MessageType, sliceType$1], [$error], false)}, {prop: "write", name: "write", pkg: "github.com/coder/websocket", typ: $funcType([MessageType, sliceType$1], [$error], false)}, {prop: "Close", name: "Close", pkg: "", typ: $funcType([StatusCode, $String], [$error], false)}, {prop: "CloseNow", name: "CloseNow", pkg: "", typ: $funcType([], [$error], false)}, {prop: "exportedClose", name: "exportedClose", pkg: "github.com/coder/websocket", typ: $funcType([StatusCode, $String], [$error], false)}, {prop: "Subprotocol", name: "Subprotocol", pkg: "", typ: $funcType([], [$String], false)}, {prop: "Reader", name: "Reader", pkg: "", typ: $funcType([context.Context], [MessageType, io.Reader, $error], false)}, {prop: "Writer", name: "Writer", pkg: "", typ: $funcType([context.Context, MessageType], [io.WriteCloser, $error], false)}, {prop: "CloseRead", name: "CloseRead", pkg: "", typ: $funcType([context.Context], [context.Context], false)}, {prop: "SetReadLimit", name: "SetReadLimit", pkg: "", typ: $funcType([$Int64], [], false)}, {prop: "BufferedAmount", name: "BufferedAmount", pkg: "", typ: $funcType([], [$Uint64], false)}, {prop: "setCloseErr", name: "setCloseErr", pkg: "github.com/coder/websocket", typ: $funcType([$error], [], false)}, {prop: "isClosed", name: "isClosed", pkg: "github.com/coder/websocket", typ: $funcType([], [$Bool], false)}];
+	ptrType$8.methods = [{prop: "Write", name: "Write", pkg: "", typ: $funcType([sliceType$1], [$Int, $error], false)}, {prop: "Close", name: "Close", pkg: "", typ: $funcType([], [$error], false)}];
 	StatusCode.methods = [{prop: "String", name: "String", pkg: "", typ: $funcType([], [$String], false)}];
 	CloseError.methods = [{prop: "Error", name: "Error", pkg: "", typ: $funcType([], [$String], false)}];
 	MessageType.methods = [{prop: "String", name: "String", pkg: "", typ: $funcType([], [$String], false)}];
-	ptrType$10.methods = [{prop: "Lock", name: "Lock", pkg: "", typ: $funcType([], [], false)}];
-	Conn.init("github.com/coder/websocket", [{prop: "noCopy", name: "noCopy", embedded: false, exported: false, typ: noCopy, tag: ""}, {prop: "ws", name: "ws", embedded: false, exported: false, typ: wsjs.WebSocket, tag: ""}, {prop: "msgReadLimit", name: "msgReadLimit", embedded: false, exported: false, typ: xsync.Int64, tag: ""}, {prop: "closeReadMu", name: "closeReadMu", embedded: false, exported: false, typ: sync.Mutex, tag: ""}, {prop: "closeReadCtx", name: "closeReadCtx", embedded: false, exported: false, typ: context.Context, tag: ""}, {prop: "closingMu", name: "closingMu", embedded: false, exported: false, typ: sync.Mutex, tag: ""}, {prop: "closeOnce", name: "closeOnce", embedded: false, exported: false, typ: sync.Once, tag: ""}, {prop: "closed", name: "closed", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "closeErrOnce", name: "closeErrOnce", embedded: false, exported: false, typ: sync.Once, tag: ""}, {prop: "closeErr", name: "closeErr", embedded: false, exported: false, typ: $error, tag: ""}, {prop: "closeWasClean", name: "closeWasClean", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "releaseOnClose", name: "releaseOnClose", embedded: false, exported: false, typ: funcType$1, tag: ""}, {prop: "releaseOnError", name: "releaseOnError", embedded: false, exported: false, typ: funcType$1, tag: ""}, {prop: "releaseOnMessage", name: "releaseOnMessage", embedded: false, exported: false, typ: funcType$1, tag: ""}, {prop: "readSignal", name: "readSignal", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "readBufMu", name: "readBufMu", embedded: false, exported: false, typ: sync.Mutex, tag: ""}, {prop: "readBuf", name: "readBuf", embedded: false, exported: false, typ: sliceType$3, tag: ""}]);
+	ptrType$9.methods = [{prop: "Lock", name: "Lock", pkg: "", typ: $funcType([], [], false)}];
+	Conn.init("github.com/coder/websocket", [{prop: "noCopy", name: "noCopy", embedded: false, exported: false, typ: noCopy, tag: ""}, {prop: "ws", name: "ws", embedded: false, exported: false, typ: wsjs.WebSocket, tag: ""}, {prop: "msgReadLimit", name: "msgReadLimit", embedded: false, exported: false, typ: atomic.Int64, tag: ""}, {prop: "closeReadMu", name: "closeReadMu", embedded: false, exported: false, typ: sync.Mutex, tag: ""}, {prop: "closeReadCtx", name: "closeReadCtx", embedded: false, exported: false, typ: context.Context, tag: ""}, {prop: "closingMu", name: "closingMu", embedded: false, exported: false, typ: sync.Mutex, tag: ""}, {prop: "closeOnce", name: "closeOnce", embedded: false, exported: false, typ: sync.Once, tag: ""}, {prop: "closed", name: "closed", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "closeErrOnce", name: "closeErrOnce", embedded: false, exported: false, typ: sync.Once, tag: ""}, {prop: "closeErr", name: "closeErr", embedded: false, exported: false, typ: $error, tag: ""}, {prop: "closeWasClean", name: "closeWasClean", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "releaseOnce", name: "releaseOnce", embedded: false, exported: false, typ: sync.Once, tag: ""}, {prop: "releaseOnClose", name: "releaseOnClose", embedded: false, exported: false, typ: funcType$1, tag: ""}, {prop: "releaseOnError", name: "releaseOnError", embedded: false, exported: false, typ: funcType$1, tag: ""}, {prop: "releaseOnMessage", name: "releaseOnMessage", embedded: false, exported: false, typ: funcType$1, tag: ""}, {prop: "readSignal", name: "readSignal", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "readBufMu", name: "readBufMu", embedded: false, exported: false, typ: sync.Mutex, tag: ""}, {prop: "readBuf", name: "readBuf", embedded: false, exported: false, typ: sliceType$3, tag: ""}]);
 	DialOptions.init("", [{prop: "Subprotocols", name: "Subprotocols", embedded: false, exported: true, typ: sliceType$2, tag: ""}]);
 	writer.init("github.com/coder/websocket", [{prop: "closed", name: "closed", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "c", name: "c", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "ctx", name: "ctx", embedded: false, exported: false, typ: context.Context, tag: ""}, {prop: "typ", name: "typ", embedded: false, exported: false, typ: MessageType, tag: ""}, {prop: "b", name: "b", embedded: false, exported: false, typ: ptrType$7, tag: ""}]);
 	CloseError.init("", [{prop: "Code", name: "Code", embedded: false, exported: true, typ: StatusCode, tag: ""}, {prop: "Reason", name: "Reason", embedded: false, exported: true, typ: $String, tag: ""}]);
@@ -160593,34 +160736,34 @@ $packages["github.com/coder/websocket"] = (function() {
 		$r = fmt.$init(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$r = bpool.$init(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$r = wsjs.$init(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = xsync.$init(); /* */ $s = 8; case 8: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = io.$init(); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = math.$init(); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = bits.$init(); /* */ $s = 11; case 11: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = net.$init(); /* */ $s = 12; case 12: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = http.$init(); /* */ $s = 13; case 13: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = reflect.$init(); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = runtime.$init(); /* */ $s = 15; case 15: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = strconv.$init(); /* */ $s = 16; case 16: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = strings.$init(); /* */ $s = 17; case 17: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = sync.$init(); /* */ $s = 18; case 18: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = atomic.$init(); /* */ $s = 19; case 19: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = js.$init(); /* */ $s = 20; case 20: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = time.$init(); /* */ $s = 21; case 21: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = io.$init(); /* */ $s = 8; case 8: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = math.$init(); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = bits.$init(); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = net.$init(); /* */ $s = 11; case 11: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = http.$init(); /* */ $s = 12; case 12: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = reflect.$init(); /* */ $s = 13; case 13: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = runtime.$init(); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = strconv.$init(); /* */ $s = 15; case 15: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = strings.$init(); /* */ $s = 16; case 16: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = sync.$init(); /* */ $s = 17; case 17: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = atomic.$init(); /* */ $s = 18; case 18: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = js.$init(); /* */ $s = 19; case 19: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = time.$init(); /* */ $s = 20; case 20: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		_MessageType_index = $toNativeArray($kindUint8, [0, 11, 24]);
 		_StatusCode_index = $toNativeArray($kindUint16, [0, 19, 34, 53, 74, 88, 106, 127, 156, 177, 196, 220, 239, 259, 278, 294, 312]);
+		$pkg.ErrMessageTooBig = errors.New("websocket: message too big");
 		/* */ } return; } if ($f === undefined) { $f = { $blk: $init }; } $f.$s = $s; $f.$r = $r; return $f;
 	};
 	$pkg.$init = $init;
 	return $pkg;
 })();
 $packages["github.com/supraio/client-daemon/pkg/jshelper"] = (function() {
-	var $pkg = {}, $init, errs, log, js, ptrType, sliceType, GetError, Await;
+	var $pkg = {}, $init, errs, js, ptrType, sliceType, mapType, GetError, Await, AwaitWithCancel;
 	errs = $packages["github.com/supraio/client-daemon/pkg/errs"];
-	log = $packages["log"];
 	js = $packages["syscall/js"];
 	ptrType = $ptrType(js.Value);
 	sliceType = $sliceType($emptyInterface);
+	mapType = $mapType($String, $emptyInterface);
 	GetError = function(err) {
 		var {$24r, $24r$1, $24r$2, $24r$3, _r, _r$1, _r$2, _r$3, err, $s, $r, $c} = $restore(this, {err});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -160652,77 +160795,82 @@ $packages["github.com/supraio/client-daemon/pkg/jshelper"] = (function() {
 	};
 	$pkg.GetError = GetError;
 	Await = function(awaitable) {
-		var {$24r, $24r$1, _r, _r$1, _r$2, _selection, awaitable, catch$1, catchFunc, err, result, then, thenFunc, $s, $deferred, $r, $c} = $restore(this, {awaitable});
+		var {_r, _tuple, awaitable, err, result, $s, $r, $c} = $restore(this, {awaitable});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		_r = AwaitWithCancel($clone(awaitable, js.Value), $chanNil); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_tuple = _r;
+		result = _tuple[0];
+		err = _tuple[1];
+		$s = -1; return [result, err];
+		/* */ } return; } var $f = {$blk: Await, $c: true, $r, _r, _tuple, awaitable, err, result, $s};return $f;
+	};
+	$pkg.Await = Await;
+	AwaitWithCancel = function(awaitable, cancel) {
+		var {$24r, $24r$1, $24r$2, _r, _r$1, _r$2, _r$3, _r$4, _selection, awaitable, cancel, catch$1, catchFunc, err, facades, result, state, then, thenFunc, x, x$1, $s, $deferred, $r, $c} = $restore(this, {awaitable, cancel});
 		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
 		catch$1 = [catch$1];
+		catchFunc = [catchFunc];
+		state = [state];
 		then = [then];
-		then[0] = new $Chan(ptrType, 0);
-		$deferred.push([(function(catch$1, then) { return function() {
-			$close(then[0]);
-			then[0] = $chanNil;
-		}; })(catch$1, then), []]);
-		thenFunc = $clone(js.FuncOf((function(catch$1, then) { return function $b(this$1, args) {
+		thenFunc = [thenFunc];
+		then[0] = new $Chan(ptrType, 1);
+		thenFunc[0] = $clone(js.FuncOf((function(catch$1, catchFunc, state, then, thenFunc) { return function $b(this$1, args) {
 			var {args, this$1, $s, $r, $c} = $restore(this, {this$1, args});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
-			/* */ if (then[0] === $chanNil) { $s = 1; continue; }
-			/* */ $s = 2; continue;
-			/* if (then[0] === $chanNil) { */ case 1:
-				$r = log.Printf("Promise already resolved cannot resolve again: %v\n", new sliceType([(0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0])])); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-				$s = -1; return $ifaceNil;
-			/* } */ case 2:
-			$r = $send(then[0], (0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0])); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$r = $send(then[0], (0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0])); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$s = -1; return $ifaceNil;
 			/* */ } return; } var $f = {$blk: $b, $c: true, $r, args, this$1, $s};return $f;
-		}; })(catch$1, then)), js.Func);
-		$deferred.push([$methodVal($clone(thenFunc, js.Func), "Release"), []]);
-		catch$1[0] = new $Chan(ptrType, 0);
-		$deferred.push([(function(catch$1, then) { return function() {
-			$close(catch$1[0]);
-			catch$1[0] = $chanNil;
-		}; })(catch$1, then), []]);
-		catchFunc = $clone(js.FuncOf((function(catch$1, then) { return function $b(this$1, args) {
-			var {_arg, _r, args, this$1, $s, $r, $c} = $restore(this, {this$1, args});
+		}; })(catch$1, catchFunc, state, then, thenFunc)), js.Func);
+		catch$1[0] = new $Chan(ptrType, 1);
+		catchFunc[0] = $clone(js.FuncOf((function(catch$1, catchFunc, state, then, thenFunc) { return function $b(this$1, args) {
+			var {args, this$1, $s, $r, $c} = $restore(this, {this$1, args});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
-			/* */ if (catch$1[0] === $chanNil) { $s = 1; continue; }
-			/* */ $s = 2; continue;
-			/* if (catch$1[0] === $chanNil) { */ case 1:
-				_r = GetError((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0])); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-				_arg = _r;
-				$r = errs.Print("Promise already resolved cannot be rejected", _arg); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-				$s = -1; return $ifaceNil;
-			/* } */ case 2:
-			$r = $send(catch$1[0], (0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0])); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$r = $send(catch$1[0], (0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0])); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$s = -1; return $ifaceNil;
-			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _arg, _r, args, this$1, $s};return $f;
-		}; })(catch$1, then)), js.Func);
-		$deferred.push([$methodVal($clone(catchFunc, js.Func), "Release"), []]);
-		_r = $clone(awaitable, js.Value).Call("then", new sliceType([new thenFunc.constructor.elem(thenFunc)])); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-		_r$1 = $clone(_r, js.Value).Call("catch", new sliceType([new catchFunc.constructor.elem(catchFunc)])); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
-		_r$1;
-		_r$2 = $select([[then[0]], [catch$1[0]]]); /* */ $s = 3; case 3: 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 = 4; continue; }
-		/* */ if (_selection[0] === 1) { $s = 5; continue; }
-		/* */ $s = 6; continue;
-		/* if (_selection[0] === 0) { */ case 4:
+			/* */ } return; } var $f = {$blk: $b, $c: true, $r, args, this$1, $s};return $f;
+		}; })(catch$1, catchFunc, state, then, thenFunc)), js.Func);
+		state[0] = $clone(js.ValueOf(new mapType($makeMap($String.keyFor, [{ k: "active", v: new $Bool(true) }, { k: "resolve", v: new thenFunc[0].constructor.elem(thenFunc[0]) }, { k: "reject", v: new catchFunc[0].constructor.elem(catchFunc[0]) }]))), js.Value);
+		_r = $clone($clone(js.Global(), js.Value).Get("Function"), js.Value).New(new sliceType([new $String("state"), new $String("return {\n\t\t\tresolve: function(value) {\n\t\t\t\tif (state.active) return state.resolve(value);\n\t\t\t},\n\t\t\treject: function(error) {\n\t\t\t\tif (state.active) return state.reject(error);\n\t\t\t}\n\t\t};")])); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_r$1 = $clone(_r, js.Value).Invoke(new sliceType([new state[0].constructor.elem(state[0])])); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		facades = $clone(_r$1, js.Value);
+		_r$2 = $clone(awaitable, js.Value).Call("then", new sliceType([(x = $clone(facades, js.Value).Get("resolve"), new x.constructor.elem(x))])); /* */ $s = 3; case 3: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+		_r$3 = $clone(_r$2, js.Value).Call("catch", new sliceType([(x$1 = $clone(facades, js.Value).Get("reject"), new x$1.constructor.elem(x$1))])); /* */ $s = 4; case 4: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+		_r$3;
+		$deferred.push([(function(catch$1, catchFunc, state, then, thenFunc) { return function() {
+			var x$2, x$3;
+			$clone(state[0], js.Value).Set("active", new $Bool(false));
+			$clone(state[0], js.Value).Set("resolve", (x$2 = js.Undefined(), new x$2.constructor.elem(x$2)));
+			$clone(state[0], js.Value).Set("reject", (x$3 = js.Undefined(), new x$3.constructor.elem(x$3)));
+			$clone(thenFunc[0], js.Func).Release();
+			$clone(catchFunc[0], js.Func).Release();
+		}; })(catch$1, catchFunc, state, then, thenFunc), []]);
+		_r$4 = $select([[then[0]], [catch$1[0]], [cancel]]); /* */ $s = 5; case 5: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+		_selection = _r$4;
+		/* */ if (_selection[0] === 0) { $s = 6; continue; }
+		/* */ if (_selection[0] === 1) { $s = 7; continue; }
+		/* */ if (_selection[0] === 2) { $s = 8; continue; }
+		/* */ $s = 9; continue;
+		/* if (_selection[0] === 0) { */ case 6:
 			result = _selection[1][0];
-			$24r = [result, ptrType.nil];
-			$s = 7; case 7: return $24r;
-		/* } else if (_selection[0] === 1) { */ case 5:
+			$24r = [result, ptrType.nil, false];
+			$s = 10; case 10: return $24r;
+		/* } else if (_selection[0] === 1) { */ case 7:
 			err = _selection[1][0];
-			$24r$1 = [ptrType.nil, err];
-			$s = 8; case 8: return $24r$1;
-		/* } */ case 6:
-		$s = -1; return [ptrType.nil, ptrType.nil];
-		/* */ } return; } } catch(err) { $err = err; $s = -1; return [ptrType.nil, ptrType.nil]; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: Await, $c: true, $r, $24r, $24r$1, _r, _r$1, _r$2, _selection, awaitable, catch$1, catchFunc, err, result, then, thenFunc, $s, $deferred};return $f; } }
+			$24r$1 = [ptrType.nil, err, false];
+			$s = 11; case 11: return $24r$1;
+		/* } else if (_selection[0] === 2) { */ case 8:
+			$24r$2 = [ptrType.nil, ptrType.nil, true];
+			$s = 12; case 12: return $24r$2;
+		/* } */ case 9:
+		$s = -1; return [ptrType.nil, ptrType.nil, false];
+		/* */ } return; } } catch(err) { $err = err; $s = -1; return [ptrType.nil, ptrType.nil, false]; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: AwaitWithCancel, $c: true, $r, $24r, $24r$1, $24r$2, _r, _r$1, _r$2, _r$3, _r$4, _selection, awaitable, cancel, catch$1, catchFunc, err, facades, result, state, then, thenFunc, x, x$1, $s, $deferred};return $f; } }
 	};
-	$pkg.Await = Await;
+	$pkg.AwaitWithCancel = AwaitWithCancel;
 	$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:
 		$r = errs.$init(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = log.$init(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = js.$init(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = js.$init(); /* */ $s = 2; case 2: 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;
@@ -160777,13 +160925,15 @@ $packages["github.com/supraio/client-daemon/pkg/netsamsungwasmtcp"] = (function(
 	return $pkg;
 })();
 $packages["github.com/supraio/client-daemon/pkg/netstream"] = (function() {
-	var $pkg = {}, $init, context, websocket, errs, jshelper, netnacltcp, netsamsungwasmtcp, js, time, SamsungWasmTCPConn, NaClTCPConn, JsWebsocketConn, ReaderWriter, ReaderWriterCloser, Driver, sliceType, ptrType, mapType, sliceType$1, sliceType$2, ptrType$1, ptrType$2, ptrType$3, ptrType$4, connects, init, ConnectSamsungWasmTCP, init$1, ConnectNaClTCP, init$2, ConnectJsWebsocket, Create;
+	var $pkg = {}, $init, context, errors, websocket, errs, jshelper, netnacltcp, netsamsungwasmtcp, net, js, time, SamsungWasmTCPConn, NaClTCPConn, JsWebsocketConn, ReaderWriter, ReaderWriterCloser, Driver, sliceType, ptrType, mapType, sliceType$1, sliceType$2, ptrType$1, ptrType$2, ptrType$3, ptrType$4, connects, init, ConnectSamsungWasmTCP, init$1, ConnectNaClTCP, init$2, ConnectJsWebsocket, Create;
 	context = $packages["context"];
+	errors = $packages["errors"];
 	websocket = $packages["github.com/coder/websocket"];
 	errs = $packages["github.com/supraio/client-daemon/pkg/errs"];
 	jshelper = $packages["github.com/supraio/client-daemon/pkg/jshelper"];
 	netnacltcp = $packages["github.com/supraio/client-daemon/pkg/netnacltcp"];
 	netsamsungwasmtcp = $packages["github.com/supraio/client-daemon/pkg/netsamsungwasmtcp"];
+	net = $packages["net"];
 	js = $packages["syscall/js"];
 	time = $packages["time"];
 	SamsungWasmTCPConn = $pkg.SamsungWasmTCPConn = $newType(0, $kindStruct, "netstream.SamsungWasmTCPConn", true, "github.com/supraio/client-daemon/pkg/netstream", true, function(conn_) {
@@ -161098,13 +161248,21 @@ $packages["github.com/supraio/client-daemon/pkg/netstream"] = (function() {
 	};
 	JsWebsocketConn.prototype.Read = function(data) { return this.$val.Read(data); };
 	JsWebsocketConn.ptr.prototype.Close = function() {
-		var {$24r, _r, c, $s, $r, $c} = $restore(this, {});
+		var {_r, _r$1, _v, c, err, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		c = this;
-		_r = c.conn.Close(1000, "Closed by client"); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-		$24r = _r;
-		$s = 2; case 2: return $24r;
-		/* */ } return; } var $f = {$blk: JsWebsocketConn.ptr.prototype.Close, $c: true, $r, $24r, _r, c, $s};return $f;
+		_r = c.conn.CloseNow(); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		err = _r;
+		if (!(!($interfaceIsEqual(err, $ifaceNil)))) { _v = false; $s = 4; continue s; }
+		_r$1 = errors.Is(err, net.ErrClosed); /* */ $s = 5; case 5: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		_v = !_r$1; case 4:
+		/* */ if (_v) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (_v) { */ case 2:
+			$s = -1; return err;
+		/* } */ case 3:
+		$s = -1; return $ifaceNil;
+		/* */ } return; } var $f = {$blk: JsWebsocketConn.ptr.prototype.Close, $c: true, $r, _r, _r$1, _v, c, err, $s};return $f;
 	};
 	JsWebsocketConn.prototype.Close = function() { return this.$val.Close(); };
 	ConnectJsWebsocket = function(host, timeout, secure) {
@@ -161161,13 +161319,15 @@ $packages["github.com/supraio/client-daemon/pkg/netstream"] = (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:
 		$r = context.$init(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = websocket.$init(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = errs.$init(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = jshelper.$init(); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = netnacltcp.$init(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = netsamsungwasmtcp.$init(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = js.$init(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = time.$init(); /* */ $s = 8; case 8: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = errors.$init(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = websocket.$init(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = errs.$init(); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = jshelper.$init(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = netnacltcp.$init(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = netsamsungwasmtcp.$init(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = net.$init(); /* */ $s = 8; case 8: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = js.$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; }
 		connects = $makeMap(Driver.keyFor, []);
 		init();
 		init$1();
@@ -161178,7 +161338,7 @@ $packages["github.com/supraio/client-daemon/pkg/netstream"] = (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, 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, _r, NewPinger, NewMetadataServer, NewMetadataResponsiveSender, NewMetadataMessageSender, NewMetadataClient, NewFramer, splitFrames;
+	var $pkg = {}, $init, bufio, base64, fmt, errs, helper, message, netstream, io, log, sync, atomic, time, Pinger, messageCallback, MetadataServer, response, MetadataResponsiveSender, MetadataMessageSender, MetadataClient, 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, funcType$4, ptrType$4, chanType$1, mapType, ptrType$5, ptrType$6, _r, NewPinger, NewMetadataServer, NewMetadataResponsiveSender, NewMetadataMessageSender, NewMetadataClient, NewFramer, splitFrames;
 	bufio = $packages["bufio"];
 	base64 = $packages["encoding/base64"];
 	fmt = $packages["fmt"];
@@ -161189,16 +161349,29 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 	io = $packages["io"];
 	log = $packages["log"];
 	sync = $packages["sync"];
+	atomic = $packages["sync/atomic"];
 	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_, closeMu_, done_, stopped_, beforeSend_, afterSend_, onClose_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.messageSender = $ifaceNil;
 			this.closed = false;
+			this.closeMu = new sync.Mutex.ptr(0, 0);
+			this.done = $chanNil;
+			this.stopped = $chanNil;
+			this.beforeSend = $throwNilPointerError;
+			this.afterSend = $throwNilPointerError;
+			this.onClose = $throwNilPointerError;
 			return;
 		}
 		this.messageSender = messageSender_;
 		this.closed = closed_;
+		this.closeMu = closeMu_;
+		this.done = done_;
+		this.stopped = stopped_;
+		this.beforeSend = beforeSend_;
+		this.afterSend = afterSend_;
+		this.onClose = onClose_;
 	});
 	messageCallback = $pkg.messageCallback = $newType(0, $kindStruct, "netclient.messageCallback", true, "github.com/supraio/client-daemon/pkg/netclient", false, function(id_, callback_) {
 		this.$val = this;
@@ -161215,7 +161388,7 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 		if (arguments.length === 0) {
 			this.framer = ptrType.nil;
 			this.closeClient = $throwNilPointerError;
-			this.closed = false;
+			this.closed = new atomic.Bool.ptr(new atomic.noCopy.ptr(), 0);
 			this.onClose = sliceType$2.nil;
 			this.onMessage = sliceType$3.nil;
 			this.nextMessageID = 0;
@@ -161293,6 +161466,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);
@@ -161303,77 +161477,156 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 	sliceType$4 = $sliceType(funcType$1);
 	ptrType$2 = $ptrType(bufio.Scanner);
 	ptrType$3 = $ptrType(Pinger);
-	funcType$2 = $funcType([message.MsgType, sliceType$1], [], false);
-	funcType$3 = $funcType([], [$error], false);
+	chanType = $chanType(structType, false, false);
+	funcType$2 = $funcType([], [], false);
+	funcType$3 = $funcType([message.MsgType, sliceType$1], [], false);
+	funcType$4 = $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);
 	NewPinger = function(messageSender) {
 		var messageSender;
-		return new Pinger.ptr(messageSender, true);
+		return new Pinger.ptr(messageSender, true, new sync.Mutex.ptr(0, 0), new $Chan(structType, 0), new $Chan(structType, 0), $throwNilPointerError, $throwNilPointerError, $throwNilPointerError);
 	};
 	$pkg.NewPinger = NewPinger;
 	Pinger.ptr.prototype.Start = function() {
-		var h;
+		var {h, $s, $r, $c} = $restore(this, {});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		h = this;
+		$r = h.closeMu.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		h.closed = false;
+		$r = h.closeMu.Unlock(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$go($methodVal(h, "startPinging"), []);
+		$s = -1; return;
+		/* */ } return; } var $f = {$blk: Pinger.ptr.prototype.Start, $c: true, $r, h, $s};return $f;
 	};
 	Pinger.prototype.Start = function() { return this.$val.Start(); };
 	Pinger.ptr.prototype.Close = function() {
-		var h;
+		var {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;
+		$r = h.closeMu.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$deferred.push([$methodVal(h.closeMu, "Unlock"), []]);
+		/* */ if (h.closed) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (h.closed) { */ case 2:
+			$s = 4; case 4: return;
+		/* } */ case 3:
 		h.closed = true;
+		$close(h.done);
+		/* */ if (!(h.onClose === $throwNilPointerError)) { $s = 5; continue; }
+		/* */ $s = 6; continue;
+		/* if (!(h.onClose === $throwNilPointerError)) { */ case 5:
+			$r = h.onClose(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* } */ case 6:
+		$s = -1; return;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: Pinger.ptr.prototype.Close, $c: true, $r, h, $s, $deferred};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, {});
+	Pinger.ptr.prototype.Wait = function(timeout) {
+		var {_r$1, _r$2, _selection, h, timeout, $s, $r, $c} = $restore(this, {timeout});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		h = this;
+		_r$1 = time.After(timeout); /* */ $s = 1; case 1: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		_r$2 = $select([[h.stopped], [_r$1]]); /* */ $s = 2; case 2: 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 = 3; continue; }
+		/* */ if (_selection[0] === 1) { $s = 4; continue; }
+		/* */ $s = 5; continue;
+		/* if (_selection[0] === 0) { */ case 3:
+			$s = -1; return true;
+		/* } else if (_selection[0] === 1) { */ case 4:
+			$s = -1; return false;
+		/* } */ case 5:
+		$s = -1; return false;
+		/* */ } return; } var $f = {$blk: Pinger.ptr.prototype.Wait, $c: true, $r, _r$1, _r$2, _selection, h, timeout, $s};return $f;
+	};
+	Pinger.prototype.Wait = function(timeout) { return this.$val.Wait(timeout); };
+	Pinger.ptr.prototype.startPinging = function() {
+		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; }
+			/* */ if (!(h.beforeSend === $throwNilPointerError)) { $s = 3; continue; }
+			/* */ $s = 4; continue;
+			/* if (!(h.beforeSend === $throwNilPointerError)) { */ case 3:
+				$r = h.beforeSend(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			/* } */ case 4:
+			_r$1 = h.messageSender.Send(2, new sliceType$1([])); /* */ $s = 6; case 6: 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 = 4; continue; }
-			/* */ $s = 5; continue;
-			/* 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; }
+			/* */ if (!(h.afterSend === $throwNilPointerError)) { $s = 7; continue; }
+			/* */ $s = 8; continue;
+			/* if (!(h.afterSend === $throwNilPointerError)) { */ case 7:
+				$r = h.afterSend(); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			/* } */ case 8:
+			/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 10; continue; }
+			/* */ $s = 11; continue;
+			/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 10:
+				$r = errs.Print("Ping error", err); /* */ $s = 12; case 12: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			/* } */ case 11:
+			_r$2 = time.After(new time.Duration(0, 1000000000)); /* */ $s = 13; case 13: 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 = 14; case 14: 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 = 15; continue; }
+			/* */ if (_selection[0] === 1) { $s = 16; continue; }
+			/* */ $s = 17; continue;
+			/* if (_selection[0] === 0) { */ case 15:
+				$s = 17; continue;
+			/* } else if (_selection[0] === 1) { */ case 16:
+				$s = 18; case 18: return;
+			/* } */ case 17:
 		$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) {
 		var closeClient, framer;
-		return new MetadataServer.ptr(framer, closeClient, false, sliceType$2.nil, sliceType$3.nil, 0);
+		return new MetadataServer.ptr(framer, closeClient, new atomic.Bool.ptr(new atomic.noCopy.ptr(), 0), sliceType$2.nil, sliceType$3.nil, 0);
 	};
 	$pkg.NewMetadataServer = NewMetadataServer;
 	MetadataServer.ptr.prototype.start = function() {
-		var pinger, s;
+		var {$24r, _r$1, pinger, s, $s, $r, $c} = $restore(this, {});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		s = this;
 		pinger = NewPinger(NewMetadataMessageSender(s));
-		pinger.Start();
-		s.OnClose((function(reason) {
-			var reason;
-			pinger.Close();
-		}));
-		$go($methodVal(s, "handleData"), []);
+		_r$1 = s.startPinger(pinger); /* */ $s = 1; case 1: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		$24r = _r$1;
+		$s = 2; case 2: return $24r;
+		/* */ } return; } var $f = {$blk: MetadataServer.ptr.prototype.start, $c: true, $r, $24r, _r$1, pinger, s, $s};return $f;
 	};
 	MetadataServer.prototype.start = function() { return this.$val.start(); };
+	MetadataServer.ptr.prototype.startPinger = function(pinger) {
+		var {pinger, s, $s, $r, $c} = $restore(this, {pinger});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		pinger = [pinger];
+		s = this;
+		s.OnClose((function(pinger) { return function $b(reason) {
+			var {reason, $s, $r, $c} = $restore(this, {reason});
+			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+			$r = pinger[0].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;
+		}; })(pinger));
+		$r = pinger[0].Start(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$go($methodVal(s, "handleData"), []);
+		$s = -1; return pinger[0];
+		/* */ } return; } var $f = {$blk: MetadataServer.ptr.prototype.startPinger, $c: true, $r, pinger, s, $s};return $f;
+	};
+	MetadataServer.prototype.startPinger = function(pinger) { return this.$val.startPinger(pinger); };
 	MetadataServer.ptr.prototype.Send = function(data) {
 		var {$24r, _r$1, _r$2, _r$3, _tmp, _tmp$1, _tmp$2, _tmp$3, _tmp$4, _tmp$5, _tuple, closeErr, data, err, s, writtenLength, $s, $r, $c} = $restore(this, {data});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		writtenLength = 0;
 		err = $ifaceNil;
 		s = this;
-		/* */ if (s.closed) { $s = 1; continue; }
+		/* */ if (s.closed.Load()) { $s = 1; continue; }
 		/* */ $s = 2; continue;
-		/* if (s.closed) { */ case 1:
+		/* if (s.closed.Load()) { */ case 1:
 			_tmp = 0;
 			_r$1 = errs.Errorf("Client is already closed", sliceType.nil); /* */ $s = 3; case 3: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 			_tmp$1 = _r$1;
@@ -161396,9 +161649,9 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 			/* if (!($interfaceIsEqual(closeErr, $ifaceNil))) { */ case 9:
 				$r = errs.Print("Close error", closeErr); /* */ $s = 11; case 11: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			/* } */ case 10:
-			/* */ if (!($interfaceIsEqual(err, io.EOF)) && !s.closed) { $s = 12; continue; }
+			/* */ if (!($interfaceIsEqual(err, io.EOF)) && !s.closed.Load()) { $s = 12; continue; }
 			/* */ $s = 13; continue;
-			/* if (!($interfaceIsEqual(err, io.EOF)) && !s.closed) { */ case 12:
+			/* if (!($interfaceIsEqual(err, io.EOF)) && !s.closed.Load()) { */ case 12:
 				$r = errs.Print("Data error", err); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			/* } */ case 13:
 			_tmp$2 = 0;
@@ -161459,10 +161712,9 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		s = this;
 		$r = log.Printf("Metadata server is closing. Reason: %s", new sliceType([new $String(reason)])); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		if (s.closed) {
+		if (s.closed.Swap(true)) {
 			$s = -1; return $ifaceNil;
 		}
-		s.closed = true;
 		_r$1 = s.closeClient(); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 		err = _r$1;
 		_ref = s.onClose;
@@ -161483,7 +161735,7 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		s = this;
 		/* while (true) { */ case 1:
-			/* if (!(!s.closed)) { break; } */ if(!(!s.closed)) { $s = 2; continue; }
+			/* if (!(!s.closed.Load())) { break; } */ if(!(!s.closed.Load())) { $s = 2; continue; }
 			_r$1 = s.framer.Receive(); /* */ $s = 3; case 3: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 			_tuple = _r$1;
 			dataBuffer = _tuple[0];
@@ -161499,9 +161751,9 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 				/* if (!($interfaceIsEqual(closeErr, $ifaceNil))) { */ case 8:
 					$r = errs.Print("Close error", closeErr); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 				/* } */ case 9:
-				/* */ if (!($interfaceIsEqual(err, io.EOF)) && !s.closed) { $s = 11; continue; }
+				/* */ if (!($interfaceIsEqual(err, io.EOF)) && !s.closed.Load()) { $s = 11; continue; }
 				/* */ $s = 12; continue;
-				/* if (!($interfaceIsEqual(err, io.EOF)) && !s.closed) { */ case 11:
+				/* if (!($interfaceIsEqual(err, io.EOF)) && !s.closed.Load()) { */ case 11:
 					$r = errs.Print("Data error", err); /* */ $s = 13; case 13: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 				/* } */ case 12:
 				$s = -1; return;
@@ -161661,7 +161913,7 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 	};
 	$pkg.NewMetadataClient = NewMetadataClient;
 	MetadataClient.ptr.prototype.Connect = function() {
-		var {$24r, $24r$1, _r$1, _r$2, _r$3, _r$4, _r$5, _tmp, _tmp$1, _tmp$2, _tmp$3, _tmp$4, _tmp$5, _tmp$6, _tmp$7, _tmp$8, _tmp$9, _tuple, _tuple$1, c, err, framer, readyBuffer, readyMsg, server, $s, $r, $c} = $restore(this, {});
+		var {$24r, $24r$1, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _tmp, _tmp$1, _tmp$2, _tmp$3, _tmp$4, _tmp$5, _tmp$6, _tmp$7, _tmp$8, _tmp$9, _tuple, _tuple$1, c, err, framer, readyBuffer, readyMsg, server, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		c = [c];
 		server = ptrType$1.nil;
@@ -161725,13 +161977,14 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 			$24r$1 = [server, err];
 			$s = 14; case 14: return $24r$1;
 		/* } */ case 8:
-		server.start();
+		_r$6 = server.start(); /* */ $s = 15; case 15: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
+		_r$6;
 		_tmp$8 = server;
 		_tmp$9 = $ifaceNil;
 		server = _tmp$8;
 		err = _tmp$9;
 		$s = -1; return [server, err];
-		/* */ } return; } var $f = {$blk: MetadataClient.ptr.prototype.Connect, $c: true, $r, $24r, $24r$1, _r$1, _r$2, _r$3, _r$4, _r$5, _tmp, _tmp$1, _tmp$2, _tmp$3, _tmp$4, _tmp$5, _tmp$6, _tmp$7, _tmp$8, _tmp$9, _tuple, _tuple$1, c, err, framer, readyBuffer, readyMsg, server, $s};return $f;
+		/* */ } return; } var $f = {$blk: MetadataClient.ptr.prototype.Connect, $c: true, $r, $24r, $24r$1, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _tmp, _tmp$1, _tmp$2, _tmp$3, _tmp$4, _tmp$5, _tmp$6, _tmp$7, _tmp$8, _tmp$9, _tuple, _tuple$1, c, err, framer, readyBuffer, readyMsg, server, $s};return $f;
 	};
 	MetadataClient.prototype.Connect = function() { return this.$val.Connect(); };
 	NewFramer = function(readerWriter) {
@@ -161818,15 +162071,15 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 		/* */ } return; } var $f = {$blk: Framer.ptr.prototype.Receive, $c: true, $r, $24r, _r$1, _r$2, _tuple, decodedFrame, err, err$1, f, frame, $s};return $f;
 	};
 	Framer.prototype.Receive = function() { return this.$val.Receive(); };
-	ptrType$3.methods = [{prop: "Start", name: "Start", pkg: "", typ: $funcType([], [], false)}, {prop: "Close", name: "Close", pkg: "", typ: $funcType([], [], false)}, {prop: "startPinging", name: "startPinging", pkg: "github.com/supraio/client-daemon/pkg/netclient", typ: $funcType([], [], false)}];
-	ptrType$1.methods = [{prop: "start", name: "start", pkg: "github.com/supraio/client-daemon/pkg/netclient", typ: $funcType([], [], false)}, {prop: "Send", name: "Send", pkg: "", typ: $funcType([sliceType$1], [$Int, $error], false)}, {prop: "OnClose", name: "OnClose", pkg: "", typ: $funcType([funcType], [], false)}, {prop: "OnMessage", name: "OnMessage", pkg: "", typ: $funcType([funcType$2], [$Int], false)}, {prop: "OffMessage", name: "OffMessage", pkg: "", typ: $funcType([$Int], [], false)}, {prop: "Close", name: "Close", pkg: "", typ: $funcType([$String], [$error], false)}, {prop: "handleData", name: "handleData", pkg: "github.com/supraio/client-daemon/pkg/netclient", typ: $funcType([], [], false)}];
+	ptrType$3.methods = [{prop: "Start", name: "Start", pkg: "", typ: $funcType([], [], false)}, {prop: "Close", name: "Close", pkg: "", typ: $funcType([], [], false)}, {prop: "Wait", name: "Wait", pkg: "", typ: $funcType([time.Duration], [$Bool], false)}, {prop: "startPinging", name: "startPinging", pkg: "github.com/supraio/client-daemon/pkg/netclient", typ: $funcType([], [], false)}];
+	ptrType$1.methods = [{prop: "start", name: "start", pkg: "github.com/supraio/client-daemon/pkg/netclient", typ: $funcType([], [ptrType$3], false)}, {prop: "startPinger", name: "startPinger", pkg: "github.com/supraio/client-daemon/pkg/netclient", typ: $funcType([ptrType$3], [ptrType$3], false)}, {prop: "Send", name: "Send", pkg: "", typ: $funcType([sliceType$1], [$Int, $error], false)}, {prop: "OnClose", name: "OnClose", pkg: "", typ: $funcType([funcType], [], false)}, {prop: "OnMessage", name: "OnMessage", pkg: "", typ: $funcType([funcType$3], [$Int], false)}, {prop: "OffMessage", name: "OffMessage", pkg: "", typ: $funcType([$Int], [], false)}, {prop: "Close", name: "Close", pkg: "", typ: $funcType([$String], [$error], false)}, {prop: "handleData", name: "handleData", pkg: "github.com/supraio/client-daemon/pkg/netclient", typ: $funcType([], [], false)}];
 	ptrType$4.methods = [{prop: "Close", name: "Close", pkg: "", typ: $funcType([], [], false)}, {prop: "SendServerWaitResponse", name: "SendServerWaitResponse", pkg: "", typ: $funcType([message.MsgType, sliceType$1], [sliceType$1, $error], false)}, {prop: "handleServerData", name: "handleServerData", pkg: "github.com/supraio/client-daemon/pkg/netclient", typ: $funcType([message.MsgType, sliceType$1], [], false)}];
 	ptrType$5.methods = [{prop: "Send", name: "Send", pkg: "", typ: $funcType([message.MsgType, sliceType$1], [$error], false)}];
 	ptrType$6.methods = [{prop: "Connect", name: "Connect", pkg: "", typ: $funcType([], [ptrType$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: ""}]);
-	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: ""}]);
+	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: "closeMu", name: "closeMu", embedded: false, exported: false, typ: sync.Mutex, tag: ""}, {prop: "done", name: "done", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "stopped", name: "stopped", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "beforeSend", name: "beforeSend", embedded: false, exported: false, typ: funcType$2, tag: ""}, {prop: "afterSend", name: "afterSend", embedded: false, exported: false, typ: funcType$2, tag: ""}, {prop: "onClose", name: "onClose", embedded: false, exported: false, typ: funcType$2, 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$3, 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$4, tag: ""}, {prop: "closed", name: "closed", embedded: false, exported: false, typ: atomic.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: ""}]);
 	MetadataResponsiveSender.init("github.com/supraio/client-daemon/pkg/netclient", [{prop: "metadataServer", name: "metadataServer", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "timeoutDuration", name: "timeoutDuration", embedded: false, exported: false, typ: time.Duration, tag: ""}, {prop: "requests", name: "requests", embedded: false, exported: false, typ: mapType, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: sync.Mutex, tag: ""}, {prop: "callbackID", name: "callbackID", embedded: false, exported: false, typ: $Int, tag: ""}]);
 	MetadataMessageSender.init("github.com/supraio/client-daemon/pkg/netclient", [{prop: "metadataServer", name: "metadataServer", embedded: false, exported: false, typ: ptrType$1, tag: ""}]);
@@ -161845,8 +162098,9 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 		$r = io.$init(); /* */ $s = 8; case 8: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$r = log.$init(); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$r = sync.$init(); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = time.$init(); /* */ $s = 11; case 11: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		_r = fmt.Errorf("frame size exceeded maximum of %d bytes", new sliceType([new $Int(1048576)])); /* */ $s = 12; case 12: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		$r = atomic.$init(); /* */ $s = 11; case 11: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = time.$init(); /* */ $s = 12; case 12: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		_r = fmt.Errorf("frame size exceeded maximum of %d bytes", new sliceType([new $Int(1048576)])); /* */ $s = 13; case 13: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		$pkg.ErrFrameTooLarge = _r;
 		/* */ } return; } if ($f === undefined) { $f = { $blk: $init }; } $f.$s = $s; $f.$r = $r; return $f;
 	};
@@ -161854,13 +162108,16 @@ $packages["github.com/supraio/client-daemon/pkg/netclient"] = (function() {
 	return $pkg;
 })();
 $packages["github.com/supraio/client-daemon/pkg/netpacket"] = (function() {
-	var $pkg = {}, $init, context, websocket, errs, jshelper, netnacltcp, netsamsungwasmtcp, js, time, SamsungWasmTCPConn, NaClTCPConn, JsWebsocketConn, JsWebsocketWorkerConn, Driver, sliceType, ptrType, mapType, funcType, arrayType, sliceType$1, sliceType$2, ptrType$1, ptrType$2, ptrType$3, ptrType$4, ptrType$5, connects, maxPacketSizes, init, ConnectSamsungWasmTCP, init$1, ConnectNaClTCP, init$2, getPerformanceTimestamp, ConnectJsWebsocket;
+	var $pkg = {}, $init, context, errors, websocket, errs, jshelper, netnacltcp, netsamsungwasmtcp, net, strings, js, time, SamsungWasmTCPConn, NaClTCPConn, JsWebsocketConn, JsWebsocketWorkerConn, Driver, sliceType, ptrType, mapType, funcType, arrayType, sliceType$1, sliceType$2, ptrType$1, ptrType$2, ptrType$3, ptrType$4, ptrType$5, connects, maxPacketSizes, init, ConnectSamsungWasmTCP, init$1, ConnectNaClTCP, init$2, getPerformanceTimestamp, ConnectJsWebsocket;
 	context = $packages["context"];
+	errors = $packages["errors"];
 	websocket = $packages["github.com/coder/websocket"];
 	errs = $packages["github.com/supraio/client-daemon/pkg/errs"];
 	jshelper = $packages["github.com/supraio/client-daemon/pkg/jshelper"];
 	netnacltcp = $packages["github.com/supraio/client-daemon/pkg/netnacltcp"];
 	netsamsungwasmtcp = $packages["github.com/supraio/client-daemon/pkg/netsamsungwasmtcp"];
+	net = $packages["net"];
+	strings = $packages["strings"];
 	js = $packages["syscall/js"];
 	time = $packages["time"];
 	SamsungWasmTCPConn = $pkg.SamsungWasmTCPConn = $newType(0, $kindStruct, "netpacket.SamsungWasmTCPConn", true, "github.com/supraio/client-daemon/pkg/netpacket", true, function(conn_) {
@@ -162187,13 +162444,28 @@ $packages["github.com/supraio/client-daemon/pkg/netpacket"] = (function() {
 	};
 	JsWebsocketConn.prototype.Read = function(data) { return this.$val.Read(data); };
 	JsWebsocketConn.ptr.prototype.Close = function() {
-		var {$24r, _r, c, $s, $r, $c} = $restore(this, {});
+		var {_r, _r$1, _r$2, _r$3, _v, c, err, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		c = this;
-		_r = c.conn.Close(1000, "Closed by client"); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-		$24r = _r;
-		$s = 2; case 2: return $24r;
-		/* */ } return; } var $f = {$blk: JsWebsocketConn.ptr.prototype.Close, $c: true, $r, $24r, _r, c, $s};return $f;
+		_r = c.conn.CloseNow(); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		err = _r;
+		if (!(!($interfaceIsEqual(err, $ifaceNil)))) { _v = false; $s = 4; continue s; }
+		_r$1 = errors.Is(err, net.ErrClosed); /* */ $s = 5; case 5: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		_v = !_r$1; case 4:
+		/* */ if (_v) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (_v) { */ case 2:
+			_r$2 = err.Error(); /* */ $s = 8; case 8: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			_r$3 = strings.Contains(_r$2, "close code"); /* */ $s = 9; case 9: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+			/* */ if (_r$3) { $s = 6; continue; }
+			/* */ $s = 7; continue;
+			/* if (_r$3) { */ case 6:
+				$s = -1; return $ifaceNil;
+			/* } */ case 7:
+			$s = -1; return err;
+		/* } */ case 3:
+		$s = -1; return $ifaceNil;
+		/* */ } return; } var $f = {$blk: JsWebsocketConn.ptr.prototype.Close, $c: true, $r, _r, _r$1, _r$2, _r$3, _v, c, err, $s};return $f;
 	};
 	JsWebsocketConn.prototype.Close = function() { return this.$val.Close(); };
 	JsWebsocketWorkerConn.ptr.prototype.Write = function(data) {
@@ -162358,13 +162630,16 @@ $packages["github.com/supraio/client-daemon/pkg/netpacket"] = (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:
 		$r = context.$init(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = websocket.$init(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = errs.$init(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = jshelper.$init(); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = netnacltcp.$init(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = netsamsungwasmtcp.$init(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = js.$init(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = time.$init(); /* */ $s = 8; case 8: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = errors.$init(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = websocket.$init(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = errs.$init(); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = jshelper.$init(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = netnacltcp.$init(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = netsamsungwasmtcp.$init(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = net.$init(); /* */ $s = 8; case 8: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = strings.$init(); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = js.$init(); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = time.$init(); /* */ $s = 11; case 11: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		connects = $makeMap(Driver.keyFor, []);
 		maxPacketSizes = $makeMap(Driver.keyFor, []);
 		init();
@@ -183246,7 +183521,7 @@ $packages["golang.org/x/mobile/event/touch"] = (function() {
 	return $pkg;
 })();
 $packages["golang.org/x/exp/shiny/driver/util/dom"] = (function() {
-	var $pkg = {}, $init, focus, key, mouse, size, touch, geom, math, strings, js, DomEvents, sliceType, funcType, sliceType$1, sliceType$2, chanType, ptrType, keyCodesMap, keyCodesByKeyMap, GetDocWidth, GetDocHeight, GetScreenWidth, GetScreenHeight, GetBrowserZoomRatio, SetWindowWidth, SetWindowHeight, GetOrientation, NewDomEvents, getMouseDirection, getWheelButton, getMouseButton, getEventModifiers, isFocusIn, getKeyRune, getKeyDirection, getKeyCode;
+	var $pkg = {}, $init, focus, key, mouse, size, touch, geom, math, strings, js, DomEvents, sliceType, funcType, arrayType, sliceType$1, sliceType$2, chanType, ptrType, keyCodesMap, keyCodesByKeyMap, GetDocWidth, GetDocHeight, GetScreenWidth, GetScreenHeight, SetWindowWidth, SetWindowHeight, GetOrientation, NewDomEventsForTarget, getMouseDirection, getWheelButton, getMouseButton, getEventModifiers, isFocusIn, getKeyRune, getKeyDirection, getKeyCode;
 	focus = $packages["golang.org/x/mobile/event/focus"];
 	key = $packages["golang.org/x/mobile/event/key"];
 	mouse = $packages["golang.org/x/mobile/event/mouse"];
@@ -183256,18 +183531,21 @@ $packages["golang.org/x/exp/shiny/driver/util/dom"] = (function() {
 	math = $packages["math"];
 	strings = $packages["strings"];
 	js = $packages["syscall/js"];
-	DomEvents = $pkg.DomEvents = $newType(0, $kindStruct, "dom.DomEvents", true, "golang.org/x/exp/shiny/driver/util/dom", true, function(eventChan_, releases_) {
+	DomEvents = $pkg.DomEvents = $newType(0, $kindStruct, "dom.DomEvents", true, "golang.org/x/exp/shiny/driver/util/dom", true, function(eventChan_, inputTarget_, releases_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.eventChan = $chanNil;
+			this.inputTarget = new js.Value.ptr(null, false, arrayType.zero());
 			this.releases = sliceType$1.nil;
 			return;
 		}
 		this.eventChan = eventChan_;
+		this.inputTarget = inputTarget_;
 		this.releases = releases_;
 	});
 	sliceType = $sliceType($emptyInterface);
 	funcType = $funcType([], [], false);
+	arrayType = $arrayType(funcType, 0);
 	sliceType$1 = $sliceType(funcType);
 	sliceType$2 = $sliceType($Int32);
 	chanType = $chanType($emptyInterface, false, false);
@@ -183288,20 +183566,6 @@ $packages["golang.org/x/exp/shiny/driver/util/dom"] = (function() {
 		return $clone($clone($clone(js.Global(), js.Value).Get("screen"), js.Value).Get("height"), js.Value).Int();
 	};
 	$pkg.GetScreenHeight = GetScreenHeight;
-	GetBrowserZoomRatio = function() {
-		var chromeZoom1, chromeZoom2, chromeZoom3, docElClientWidth, scrollerWidthInNoZoom, scrollerWidthInZoom1, scrollerWidthInZoom2, windowInnerWidth, windowOuterWidth;
-		windowInnerWidth = $clone($clone(js.Global(), js.Value).Get("innerWidth"), js.Value).Float();
-		windowOuterWidth = $clone($clone(js.Global(), js.Value).Get("outerWidth"), js.Value).Float();
-		docElClientWidth = $clone($clone($clone($clone(js.Global(), js.Value).Get("document"), js.Value).Get("documentElement"), js.Value).Get("clientWidth"), js.Value).Float();
-		scrollerWidthInNoZoom = windowInnerWidth - docElClientWidth;
-		chromeZoom1 = (windowOuterWidth - scrollerWidthInNoZoom) / windowInnerWidth;
-		scrollerWidthInZoom1 = math.Round(scrollerWidthInNoZoom * chromeZoom1);
-		chromeZoom2 = (windowOuterWidth - scrollerWidthInZoom1) / windowInnerWidth;
-		scrollerWidthInZoom2 = math.Round(scrollerWidthInNoZoom * chromeZoom2);
-		chromeZoom3 = (windowOuterWidth - scrollerWidthInZoom2) / windowInnerWidth;
-		return chromeZoom3;
-	};
-	$pkg.GetBrowserZoomRatio = GetBrowserZoomRatio;
 	SetWindowWidth = function(newInnerWidth) {
 		var {_r, innerWidth, newInnerWidth, newOuterWidth, outerHeight, outerWidth, screenWidth, $s, $r, $c} = $restore(this, {newInnerWidth});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -183367,10 +183631,11 @@ $packages["golang.org/x/exp/shiny/driver/util/dom"] = (function() {
 		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if (!$curGoroutine.asleep) { return  orientation[0]; } if($curGoroutine.asleep) { var $f = {$blk: GetOrientation, $c: true, $r, $24r, $24r$1, $24r$2, orientation, orientationType, $s, $deferred};return $f; } }
 	};
 	$pkg.GetOrientation = GetOrientation;
-	NewDomEvents = function() {
-		return new DomEvents.ptr(new $Chan($emptyInterface, 256), $makeSlice(sliceType$1, 0));
+	NewDomEventsForTarget = function(inputTarget) {
+		var inputTarget;
+		return new DomEvents.ptr(new $Chan($emptyInterface, 256), $clone(inputTarget, js.Value), $makeSlice(sliceType$1, 0));
 	};
-	$pkg.NewDomEvents = NewDomEvents;
+	$pkg.NewDomEventsForTarget = NewDomEventsForTarget;
 	DomEvents.ptr.prototype.GetEventChan = function() {
 		var d;
 		d = this;
@@ -183450,6 +183715,22 @@ $packages["golang.org/x/exp/shiny/driver/util/dom"] = (function() {
 		/* */ } return; } var $f = {$blk: DomEvents.ptr.prototype.emitSizeEvent, $c: true, $r, _q, _q$1, _r, d, height, orientation, pixelsPerPt, width, x, $s};return $f;
 	};
 	DomEvents.prototype.emitSizeEvent = function() { return this.$val.emitSizeEvent(); };
+	DomEvents.ptr.prototype.inputPosition = function(ev) {
+		var {_r, d, ev, getBoundingClientRect, rect, $s, $r, $c} = $restore(this, {ev});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		d = this;
+		getBoundingClientRect = $clone($clone(d.inputTarget, js.Value).Get("getBoundingClientRect"), js.Value);
+		/* */ if ($clone(getBoundingClientRect, js.Value).Type() === 7) { $s = 1; continue; }
+		/* */ $s = 2; continue;
+		/* if ($clone(getBoundingClientRect, js.Value).Type() === 7) { */ case 1:
+			_r = $clone(d.inputTarget, js.Value).Call("getBoundingClientRect", sliceType.nil); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+			rect = $clone(_r, js.Value);
+			$s = -1; return [($fround($clone($clone(ev, js.Value).Get("clientX"), js.Value).Float() - $clone($clone(rect, js.Value).Get("left"), js.Value).Float())), ($fround($clone($clone(ev, js.Value).Get("clientY"), js.Value).Float() - $clone($clone(rect, js.Value).Get("top"), js.Value).Float()))];
+		/* } */ case 2:
+		$s = -1; return [($fround($clone($clone(ev, js.Value).Get("offsetX"), js.Value).Float())), ($fround($clone($clone(ev, js.Value).Get("offsetY"), js.Value).Float()))];
+		/* */ } return; } var $f = {$blk: DomEvents.ptr.prototype.inputPosition, $c: true, $r, _r, d, ev, getBoundingClientRect, rect, $s};return $f;
+	};
+	DomEvents.prototype.inputPosition = function(ev) { return this.$val.inputPosition(ev); };
 	DomEvents.ptr.prototype.bindMouseEvents = function() {
 		var {_r, _r$1, _r$2, _r$3, d, onClick, onMove, onWheel, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -183459,48 +183740,60 @@ $packages["golang.org/x/exp/shiny/driver/util/dom"] = (function() {
 		onWheel = [onWheel];
 		d[0] = this;
 		onMove[0] = $clone(js.FuncOf((function(d, onClick, onMove, onWheel) { return function $b(this$1, args) {
-			var {_r, args, this$1, x, $s, $r, $c} = $restore(this, {this$1, args});
+			var {_r, _r$1, _tuple, args, this$1, x, x$1, y, $s, $r, $c} = $restore(this, {this$1, args});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 			_r = $clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value).Call("preventDefault", sliceType.nil); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 			_r;
-			$r = $send(d[0].eventChan, (x = new mouse.Event.ptr(($fround($clone($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value).Get("offsetX"), js.Value).Float())), ($fround($clone($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value).Get("offsetY"), js.Value).Float())), 0, getEventModifiers($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)), 0), new x.constructor.elem(x))); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$1 = d[0].inputPosition($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)); /* */ $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;
+			x = _tuple[0];
+			y = _tuple[1];
+			$r = $send(d[0].eventChan, (x$1 = new mouse.Event.ptr(x, y, 0, getEventModifiers($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)), 0), new x$1.constructor.elem(x$1))); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$s = -1; return $ifaceNil;
-			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r, args, this$1, x, $s};return $f;
+			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r, _r$1, _tuple, args, this$1, x, x$1, y, $s};return $f;
 		}; })(d, onClick, onMove, onWheel)), js.Func);
-		_r = $clone(js.Global(), js.Value).Call("addEventListener", new sliceType([new $String("mousemove"), new onMove[0].constructor.elem(onMove[0])])); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_r = $clone(d[0].inputTarget, js.Value).Call("addEventListener", new sliceType([new $String("mousemove"), new onMove[0].constructor.elem(onMove[0])])); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		_r;
 		onClick[0] = $clone(js.FuncOf((function(d, onClick, onMove, onWheel) { return function $b(this$1, args) {
-			var {_r$1, args, this$1, x, $s, $r, $c} = $restore(this, {this$1, args});
+			var {_r$1, _r$2, _tuple, args, this$1, x, x$1, y, $s, $r, $c} = $restore(this, {this$1, args});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 			_r$1 = $clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value).Call("preventDefault", sliceType.nil); /* */ $s = 1; case 1: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 			_r$1;
-			$r = $send(d[0].eventChan, (x = new mouse.Event.ptr(($fround($clone($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value).Get("offsetX"), js.Value).Float())), ($fround($clone($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value).Get("offsetY"), js.Value).Float())), getMouseButton($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)), getEventModifiers($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)), getMouseDirection($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value))), new x.constructor.elem(x))); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$2 = d[0].inputPosition($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)); /* */ $s = 2; case 2: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			_tuple = _r$2;
+			x = _tuple[0];
+			y = _tuple[1];
+			$r = $send(d[0].eventChan, (x$1 = new mouse.Event.ptr(x, y, getMouseButton($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)), getEventModifiers($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)), getMouseDirection($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value))), new x$1.constructor.elem(x$1))); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$s = -1; return $ifaceNil;
-			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r$1, args, this$1, x, $s};return $f;
+			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r$1, _r$2, _tuple, args, this$1, x, x$1, y, $s};return $f;
 		}; })(d, onClick, onMove, onWheel)), js.Func);
-		_r$1 = $clone(js.Global(), js.Value).Call("addEventListener", new sliceType([new $String("mousedown"), new onClick[0].constructor.elem(onClick[0])])); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		_r$1 = $clone(d[0].inputTarget, js.Value).Call("addEventListener", new sliceType([new $String("mousedown"), new onClick[0].constructor.elem(onClick[0])])); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 		_r$1;
-		_r$2 = $clone(js.Global(), js.Value).Call("addEventListener", new sliceType([new $String("mouseup"), new onClick[0].constructor.elem(onClick[0])])); /* */ $s = 3; case 3: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+		_r$2 = $clone(d[0].inputTarget, js.Value).Call("addEventListener", new sliceType([new $String("mouseup"), new onClick[0].constructor.elem(onClick[0])])); /* */ $s = 3; case 3: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
 		_r$2;
 		onWheel[0] = $clone(js.FuncOf((function(d, onClick, onMove, onWheel) { return function $b(this$1, args) {
-			var {args, this$1, x, $s, $r, $c} = $restore(this, {this$1, args});
+			var {_r$3, _tuple, args, this$1, x, x$1, y, $s, $r, $c} = $restore(this, {this$1, args});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
-			$r = $send(d[0].eventChan, (x = new mouse.Event.ptr(($fround($clone($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value).Get("offsetX"), js.Value).Float())), ($fround($clone($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value).Get("offsetY"), js.Value).Float())), getWheelButton($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)), getEventModifiers($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)), 3), new x.constructor.elem(x))); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$3 = d[0].inputPosition($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)); /* */ $s = 1; case 1: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+			_tuple = _r$3;
+			x = _tuple[0];
+			y = _tuple[1];
+			$r = $send(d[0].eventChan, (x$1 = new mouse.Event.ptr(x, y, getWheelButton($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)), getEventModifiers($clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value)), 3), new x$1.constructor.elem(x$1))); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$s = -1; return $ifaceNil;
-			/* */ } return; } var $f = {$blk: $b, $c: true, $r, args, this$1, x, $s};return $f;
+			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r$3, _tuple, args, this$1, x, x$1, y, $s};return $f;
 		}; })(d, onClick, onMove, onWheel)), js.Func);
-		_r$3 = $clone(js.Global(), js.Value).Call("addEventListener", new sliceType([new $String("wheel"), new onWheel[0].constructor.elem(onWheel[0])])); /* */ $s = 4; case 4: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+		_r$3 = $clone(d[0].inputTarget, js.Value).Call("addEventListener", new sliceType([new $String("wheel"), new onWheel[0].constructor.elem(onWheel[0])])); /* */ $s = 4; case 4: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
 		_r$3;
 		d[0].releases = $append(d[0].releases, (function(d, onClick, onMove, onWheel) { return function $b() {
 			var {_r$4, _r$5, _r$6, _r$7, $s, $r, $c} = $restore(this, {});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
-			_r$4 = $clone(js.Global(), js.Value).Call("removeEventListener", new sliceType([new $String("mousemove"), new onMove[0].constructor.elem(onMove[0])])); /* */ $s = 1; case 1: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+			_r$4 = $clone(d[0].inputTarget, js.Value).Call("removeEventListener", new sliceType([new $String("mousemove"), new onMove[0].constructor.elem(onMove[0])])); /* */ $s = 1; case 1: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
 			_r$4;
-			_r$5 = $clone(js.Global(), js.Value).Call("removeEventListener", new sliceType([new $String("mousedown"), new onClick[0].constructor.elem(onClick[0])])); /* */ $s = 2; case 2: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
+			_r$5 = $clone(d[0].inputTarget, js.Value).Call("removeEventListener", new sliceType([new $String("mousedown"), new onClick[0].constructor.elem(onClick[0])])); /* */ $s = 2; case 2: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
 			_r$5;
-			_r$6 = $clone(js.Global(), js.Value).Call("removeEventListener", new sliceType([new $String("mouseup"), new onClick[0].constructor.elem(onClick[0])])); /* */ $s = 3; case 3: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
+			_r$6 = $clone(d[0].inputTarget, js.Value).Call("removeEventListener", new sliceType([new $String("mouseup"), new onClick[0].constructor.elem(onClick[0])])); /* */ $s = 3; case 3: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
 			_r$6;
-			_r$7 = $clone(js.Global(), js.Value).Call("removeEventListener", new sliceType([new $String("wheel"), new onWheel[0].constructor.elem(onWheel[0])])); /* */ $s = 4; case 4: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
+			_r$7 = $clone(d[0].inputTarget, js.Value).Call("removeEventListener", new sliceType([new $String("wheel"), new onWheel[0].constructor.elem(onWheel[0])])); /* */ $s = 4; case 4: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
 			_r$7;
 			$clone(onMove[0], js.Func).Release();
 			$clone(onClick[0], js.Func).Release();
@@ -183696,30 +183989,38 @@ $packages["golang.org/x/exp/shiny/driver/util/dom"] = (function() {
 		handler = [handler];
 		opts = [opts];
 		d[0] = this;
-		handler[0] = $clone(js.FuncOf((function(d, eventName, eventType, handler, opts) { return function(this$1, args) {
-			var args, changedTouches, ev, t, this$1;
+		handler[0] = $clone(js.FuncOf((function(d, eventName, eventType, handler, opts) { return function $b(this$1, args) {
+			var {_r, _r$1, _tuple, args, changedTouches, ev, t, this$1, x, y, $s, $r, $c} = $restore(this, {this$1, args});
+			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 			if (args.$length === 0) {
-				return $ifaceNil;
+				$s = -1; return $ifaceNil;
 			}
 			ev = $clone((0 >= args.$length ? ($throwRuntimeError("index out of range"), undefined) : args.$array[args.$offset + 0]), js.Value);
+			_r = $clone(ev, js.Value).Call("preventDefault", sliceType.nil); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+			_r;
 			changedTouches = $clone($clone(ev, js.Value).Get("changedTouches"), js.Value);
 			if ($clone(changedTouches, js.Value).IsUndefined() || $clone(changedTouches, js.Value).IsNull() || ($clone(changedTouches, js.Value).Length() === 0)) {
-				return $ifaceNil;
+				$s = -1; return $ifaceNil;
 			}
 			t = $clone($clone(changedTouches, js.Value).Index(0), js.Value);
-			d[0].emitTouchEvent($clone(new touch.Event.ptr(($fround($clone($clone(t, js.Value).Get("clientX"), js.Value).Float())), ($fround($clone($clone(t, js.Value).Get("clientY"), js.Value).Float())), (new touch.Sequence(0, $clone($clone(t, js.Value).Get("identifier"), js.Value).Int())), eventType[0]), touch.Event));
-			return $ifaceNil;
+			_r$1 = d[0].inputPosition($clone(t, js.Value)); /* */ $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;
+			x = _tuple[0];
+			y = _tuple[1];
+			d[0].emitTouchEvent($clone(new touch.Event.ptr(x, y, (new touch.Sequence(0, $clone($clone(t, js.Value).Get("identifier"), js.Value).Int())), eventType[0]), touch.Event));
+			$s = -1; return $ifaceNil;
+			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r, _r$1, _tuple, args, changedTouches, ev, t, this$1, x, y, $s};return $f;
 		}; })(d, eventName, eventType, handler, opts)), js.Func);
 		_r = $clone($clone(js.Global(), js.Value).Get("Object"), js.Value).New(sliceType.nil); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		opts[0] = $clone(_r, js.Value);
-		$clone(opts[0], js.Value).Set("passive", new $Bool(true));
+		$clone(opts[0], js.Value).Set("passive", new $Bool(false));
 		$clone(opts[0], js.Value).Set("capture", new $Bool(false));
-		_r$1 = $clone(js.Global(), js.Value).Call("addEventListener", new sliceType([new $String(eventName[0]), new handler[0].constructor.elem(handler[0]), new opts[0].constructor.elem(opts[0])])); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		_r$1 = $clone(d[0].inputTarget, js.Value).Call("addEventListener", new sliceType([new $String(eventName[0]), new handler[0].constructor.elem(handler[0]), new opts[0].constructor.elem(opts[0])])); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 		_r$1;
 		d[0].releases = $append(d[0].releases, (function(d, eventName, eventType, handler, opts) { return function $b() {
 			var {_r$2, $s, $r, $c} = $restore(this, {});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
-			_r$2 = $clone(js.Global(), js.Value).Call("removeEventListener", new sliceType([new $String(eventName[0]), new handler[0].constructor.elem(handler[0]), new opts[0].constructor.elem(opts[0])])); /* */ $s = 1; case 1: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			_r$2 = $clone(d[0].inputTarget, js.Value).Call("removeEventListener", new sliceType([new $String(eventName[0]), new handler[0].constructor.elem(handler[0]), new opts[0].constructor.elem(opts[0])])); /* */ $s = 1; case 1: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
 			_r$2;
 			$clone(handler[0], js.Func).Release();
 			$s = -1; return;
@@ -183760,8 +184061,8 @@ $packages["golang.org/x/exp/shiny/driver/util/dom"] = (function() {
 		/* */ } return; } var $f = {$blk: DomEvents.ptr.prototype.bindTouchEvents, $c: true, $r, d, $s};return $f;
 	};
 	DomEvents.prototype.bindTouchEvents = function() { return this.$val.bindTouchEvents(); };
-	ptrType.methods = [{prop: "GetEventChan", name: "GetEventChan", pkg: "", typ: $funcType([], [chanType], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "BindEvents", name: "BindEvents", pkg: "", typ: $funcType([], [], false)}, {prop: "bindSizeEvents", name: "bindSizeEvents", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}, {prop: "emitSizeEvent", name: "emitSizeEvent", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}, {prop: "bindMouseEvents", name: "bindMouseEvents", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}, {prop: "bindFocusEvents", name: "bindFocusEvents", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}, {prop: "bindKeyEvents", name: "bindKeyEvents", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}, {prop: "addTouchListener", name: "addTouchListener", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([$String, touch.Type], [], false)}, {prop: "emitTouchEvent", name: "emitTouchEvent", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([touch.Event], [], false)}, {prop: "bindTouchEvents", name: "bindTouchEvents", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}];
-	DomEvents.init("golang.org/x/exp/shiny/driver/util/dom", [{prop: "eventChan", name: "eventChan", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "releases", name: "releases", embedded: false, exported: false, typ: sliceType$1, tag: ""}]);
+	ptrType.methods = [{prop: "GetEventChan", name: "GetEventChan", pkg: "", typ: $funcType([], [chanType], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "BindEvents", name: "BindEvents", pkg: "", typ: $funcType([], [], false)}, {prop: "bindSizeEvents", name: "bindSizeEvents", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}, {prop: "emitSizeEvent", name: "emitSizeEvent", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}, {prop: "inputPosition", name: "inputPosition", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([js.Value], [$Float32, $Float32], false)}, {prop: "bindMouseEvents", name: "bindMouseEvents", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}, {prop: "bindFocusEvents", name: "bindFocusEvents", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}, {prop: "bindKeyEvents", name: "bindKeyEvents", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}, {prop: "addTouchListener", name: "addTouchListener", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([$String, touch.Type], [], false)}, {prop: "emitTouchEvent", name: "emitTouchEvent", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([touch.Event], [], false)}, {prop: "bindTouchEvents", name: "bindTouchEvents", pkg: "golang.org/x/exp/shiny/driver/util/dom", typ: $funcType([], [], false)}];
+	DomEvents.init("golang.org/x/exp/shiny/driver/util/dom", [{prop: "eventChan", name: "eventChan", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "inputTarget", name: "inputTarget", embedded: false, exported: false, typ: js.Value, tag: ""}, {prop: "releases", name: "releases", embedded: false, exported: false, typ: sliceType$1, 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:
@@ -185779,14 +186080,18 @@ $packages["golang.org/x/exp/shiny/screen"] = (function() {
 		}
 		this.BackBufferPreserved = BackBufferPreserved_;
 	});
-	NewWindowOptions = $pkg.NewWindowOptions = $newType(0, $kindStruct, "screen.NewWindowOptions", true, "golang.org/x/exp/shiny/screen", true, function(Width_, Height_, Title_) {
+	NewWindowOptions = $pkg.NewWindowOptions = $newType(0, $kindStruct, "screen.NewWindowOptions", true, "golang.org/x/exp/shiny/screen", true, function(X_, Y_, Width_, Height_, Title_) {
 		this.$val = this;
 		if (arguments.length === 0) {
+			this.X = 0;
+			this.Y = 0;
 			this.Width = 0;
 			this.Height = 0;
 			this.Title = "";
 			return;
 		}
+		this.X = X_;
+		this.Y = Y_;
 		this.Width = Width_;
 		this.Height = Height_;
 		this.Title = Title_;
@@ -185833,7 +186138,7 @@ $packages["golang.org/x/exp/shiny/screen"] = (function() {
 	Texture.init([{prop: "Bounds", name: "Bounds", pkg: "", typ: $funcType([], [image.Rectangle], false)}, {prop: "Fill", name: "Fill", pkg: "", typ: $funcType([image.Rectangle, color.Color, draw.Op], [], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "Size", name: "Size", pkg: "", typ: $funcType([], [image.Point], false)}, {prop: "Upload", name: "Upload", pkg: "", typ: $funcType([image.Point, Buffer, image.Rectangle], [], false)}, {prop: "UploadYCbCr", name: "UploadYCbCr", pkg: "", typ: $funcType([image.Point, Buffer, image.Rectangle], [], false)}]);
 	Window.init([{prop: "Copy", name: "Copy", pkg: "", typ: $funcType([image.Point, Texture, image.Rectangle, draw.Op, ptrType$3], [], false)}, {prop: "Draw", name: "Draw", pkg: "", typ: $funcType([f64.Aff3, Texture, image.Rectangle, draw.Op, ptrType$3], [], false)}, {prop: "DrawUniform", name: "DrawUniform", pkg: "", typ: $funcType([f64.Aff3, color.Color, image.Rectangle, draw.Op, ptrType$3], [], false)}, {prop: "Fill", name: "Fill", pkg: "", typ: $funcType([image.Rectangle, color.Color, draw.Op], [], false)}, {prop: "NextEvent", name: "NextEvent", pkg: "", typ: $funcType([], [$emptyInterface], false)}, {prop: "Publish", name: "Publish", pkg: "", typ: $funcType([], [PublishResult], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "Scale", name: "Scale", pkg: "", typ: $funcType([image.Rectangle, Texture, image.Rectangle, draw.Op, ptrType$3], [], false)}, {prop: "Send", name: "Send", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "SendFirst", name: "SendFirst", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "Upload", name: "Upload", pkg: "", typ: $funcType([image.Point, Buffer, image.Rectangle], [], false)}, {prop: "UploadYCbCr", name: "UploadYCbCr", pkg: "", typ: $funcType([image.Point, Buffer, image.Rectangle], [], false)}]);
 	PublishResult.init("", [{prop: "BackBufferPreserved", name: "BackBufferPreserved", embedded: false, exported: true, typ: $Bool, tag: ""}]);
-	NewWindowOptions.init("", [{prop: "Width", name: "Width", embedded: false, exported: true, typ: $Int, tag: ""}, {prop: "Height", name: "Height", embedded: false, exported: true, typ: $Int, tag: ""}, {prop: "Title", name: "Title", embedded: false, exported: true, typ: $String, tag: ""}]);
+	NewWindowOptions.init("", [{prop: "X", name: "X", embedded: false, exported: true, typ: $Int, tag: ""}, {prop: "Y", name: "Y", embedded: false, exported: true, typ: $Int, tag: ""}, {prop: "Width", name: "Width", embedded: false, exported: true, typ: $Int, tag: ""}, {prop: "Height", name: "Height", embedded: false, exported: true, typ: $Int, tag: ""}, {prop: "Title", name: "Title", embedded: false, exported: true, typ: $String, tag: ""}]);
 	DrawOptions.init("", []);
 	$init = function() {
 		$pkg.$init = function() {};
@@ -185849,7 +186154,7 @@ $packages["golang.org/x/exp/shiny/screen"] = (function() {
 	return $pkg;
 })();
 $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver"] = (function() {
-	var $pkg = {}, $init, jsdecoder, errs, jshelper, dom, screen, f64, image, color, draw, log, sync, js, windowImpl, screenImpl, BufferImpl, sliceType, ptrType, ptrType$1, ptrType$2, ptrType$3, ptrType$4, funcType, arrayType, ptrType$5, sliceType$1, ptrType$6, ptrType$7, ptrType$8, ptrType$9, newWindow, newScreenImpl, main, newBuffer;
+	var $pkg = {}, $init, jsdecoder, errs, jshelper, dom, screen, f64, image, color, draw, log, sync, js, windowImpl, screenImpl, BufferImpl, sliceType, ptrType, ptrType$1, ptrType$2, structType, ptrType$3, ptrType$4, funcType, arrayType, ptrType$5, sliceType$1, ptrType$6, ptrType$7, chanType, ptrType$8, ptrType$9, newWindow, newScreenImpl, main, newBuffer;
 	jsdecoder = $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/jsdecoder"];
 	errs = $packages["github.com/supraio/client-daemon/pkg/errs"];
 	jshelper = $packages["github.com/supraio/client-daemon/pkg/jshelper"];
@@ -185862,19 +186167,21 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver"]
 	log = $packages["log"];
 	sync = $packages["sync"];
 	js = $packages["syscall/js"];
-	windowImpl = $pkg.windowImpl = $newType(0, $kindStruct, "nacldriver.windowImpl", true, "github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver", false, function(screen_, mutex_, domEvents_, released_) {
+	windowImpl = $pkg.windowImpl = $newType(0, $kindStruct, "nacldriver.windowImpl", true, "github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver", false, function(screen_, mutex_, domEvents_, released_, renderDone_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.screen = ptrType.nil;
 			this.mutex = ptrType$1.nil;
 			this.domEvents = ptrType$2.nil;
 			this.released = false;
+			this.renderDone = $chanNil;
 			return;
 		}
 		this.screen = screen_;
 		this.mutex = mutex_;
 		this.domEvents = domEvents_;
 		this.released = released_;
+		this.renderDone = renderDone_;
 	});
 	screenImpl = $pkg.screenImpl = $newType(0, $kindStruct, "nacldriver.screenImpl", true, "github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver", false, function(doc_) {
 		this.$val = this;
@@ -185900,6 +186207,7 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver"]
 	ptrType = $ptrType(screenImpl);
 	ptrType$1 = $ptrType(sync.Mutex);
 	ptrType$2 = $ptrType(dom.DomEvents);
+	structType = $structType("", []);
 	ptrType$3 = $ptrType(js.Value);
 	ptrType$4 = $ptrType(BufferImpl);
 	funcType = $funcType([], [], false);
@@ -185908,10 +186216,11 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver"]
 	sliceType$1 = $sliceType($Uint8);
 	ptrType$6 = $ptrType(screen.DrawOptions);
 	ptrType$7 = $ptrType(windowImpl);
+	chanType = $chanType(structType, false, false);
 	ptrType$8 = $ptrType(screen.NewWindowOptions);
 	ptrType$9 = $ptrType(image.YCbCr);
 	newWindow = function(screen$1, opts) {
-		var {_r, _r$1, domEvents, opts, screen$1, w, $s, $r, $c} = $restore(this, {screen$1, opts});
+		var {_r, _r$1, _r$2, domEvents, inputTarget, opts, screen$1, w, $s, $r, $c} = $restore(this, {screen$1, opts});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		/* */ if (!(opts.Title === "")) { $s = 1; continue; }
 		/* */ $s = 2; continue;
@@ -185920,13 +186229,38 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver"]
 			_r$1 = $clone(_r, js.Value).Call("item", new sliceType([new $Int(0)])); /* */ $s = 4; case 4: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 			$r = $clone(_r$1, js.Value).Set("innerHTML", new $String(opts.Title)); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		/* } */ case 2:
-		domEvents = dom.NewDomEvents();
-		w = new windowImpl.ptr(screen$1, new sync.Mutex.ptr(0, 0), domEvents, false);
-		$r = domEvents.BindEvents(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		_r$2 = $clone(screen$1.doc, js.Value).Call("getElementById", new sliceType([new $String("nacl_module")])); /* */ $s = 6; case 6: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+		inputTarget = $clone(_r$2, js.Value);
+		if ($clone(inputTarget, js.Value).IsNull() || $clone(inputTarget, js.Value).IsUndefined()) {
+			$panic(new $String("NaCl renderer input target not found"));
+		}
+		$clone($clone(inputTarget, js.Value).Get("style"), js.Value).Set("touchAction", new $String("none"));
+		domEvents = dom.NewDomEventsForTarget($clone(inputTarget, js.Value));
+		w = new windowImpl.ptr(screen$1, new sync.Mutex.ptr(0, 0), domEvents, false, new $Chan(structType, 0));
+		$r = domEvents.BindEvents(); /* */ $s = 7; case 7: 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, _r, _r$1, domEvents, opts, screen$1, w, $s};return $f;
+		/* */ } return; } var $f = {$blk: newWindow, $c: true, $r, _r, _r$1, _r$2, domEvents, inputTarget, opts, screen$1, w, $s};return $f;
 	};
 	windowImpl.ptr.prototype.Release = function() {
+		var {w, $s, $r, $c} = $restore(this, {});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		w = this;
+		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* */ if (w.released) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.released) { */ case 2:
+			$r = w.mutex.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.released = true;
+		$close(w.renderDone);
+		$r = w.mutex.Unlock(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = w.domEvents.Release(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$s = -1; return;
+		/* */ } return; } var $f = {$blk: windowImpl.ptr.prototype.Release, $c: true, $r, w, $s};return $f;
+	};
+	windowImpl.prototype.Release = function() { return this.$val.Release(); };
+	windowImpl.ptr.prototype.CancelPendingUploads = function() {
 		var {w, $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);
 		w = this;
@@ -185937,12 +186271,12 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver"]
 		/* if (w.released) { */ case 2:
 			$s = 4; case 4: return;
 		/* } */ case 3:
-		$r = w.domEvents.Release(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		w.released = true;
+		$close(w.renderDone);
+		w.renderDone = new $Chan(structType, 0);
 		$s = -1; return;
-		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.Release, $c: true, $r, w, $s, $deferred};return $f; } }
+		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.CancelPendingUploads, $c: true, $r, w, $s, $deferred};return $f; } }
 	};
-	windowImpl.prototype.Release = function() { return this.$val.Release(); };
+	windowImpl.prototype.CancelPendingUploads = function() { return this.$val.CancelPendingUploads(); };
 	windowImpl.ptr.prototype.Publish = function() {
 		var w;
 		w = this;
@@ -185953,21 +186287,55 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver"]
 	};
 	windowImpl.prototype.Publish = function() { return this.$val.Publish(); };
 	windowImpl.ptr.prototype.Send = function(event) {
-		var event, w;
+		var {event, w, $s, $deferred, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
 		w = this;
-		if (w.released) {
-			return;
-		}
-		$panic(new $String("Not implemented"));
+		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$deferred.push([$methodVal(w.mutex, "Unlock"), []]);
+		/* */ if (w.released) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.released) { */ case 2:
+			$s = 4; case 4: return;
+		/* } */ case 3:
+		$r = $send(w.domEvents.GetEventChan(), event); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$s = -1; return;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.Send, $c: true, $r, event, w, $s, $deferred};return $f; } }
 	};
 	windowImpl.prototype.Send = function(event) { return this.$val.Send(event); };
+	windowImpl.ptr.prototype.SendNonBlocking = function(event) {
+		var {$24r, $24r$1, $24r$2, _selection, event, w, $s, $deferred, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
+		w = this;
+		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$deferred.push([$methodVal(w.mutex, "Unlock"), []]);
+		/* */ if (w.released) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.released) { */ case 2:
+			$24r = false;
+			$s = 4; case 4: return $24r;
+		/* } */ case 3:
+		_selection = $select([[w.domEvents.GetEventChan(), event], []]);
+		/* */ if (_selection[0] === 0) { $s = 5; continue; }
+		/* */ if (_selection[0] === 1) { $s = 6; continue; }
+		/* */ $s = 7; continue;
+		/* if (_selection[0] === 0) { */ case 5:
+			$24r$1 = true;
+			$s = 8; case 8: return $24r$1;
+		/* } else if (_selection[0] === 1) { */ case 6:
+			$24r$2 = false;
+			$s = 9; case 9: return $24r$2;
+		/* } */ case 7:
+		$s = -1; return false;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; return false; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.SendNonBlocking, $c: true, $r, $24r, $24r$1, $24r$2, _selection, event, w, $s, $deferred};return $f; } }
+	};
+	windowImpl.prototype.SendNonBlocking = function(event) { return this.$val.SendNonBlocking(event); };
 	windowImpl.ptr.prototype.SendFirst = function(event) {
-		var event, w;
+		var {event, w, $s, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		w = this;
-		if (w.released) {
-			return;
-		}
-		$panic(new $String("Not implemented"));
+		$r = w.Send(event); /* */ $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: windowImpl.ptr.prototype.SendFirst, $c: true, $r, event, w, $s};return $f;
 	};
 	windowImpl.prototype.SendFirst = function(event) { return this.$val.SendFirst(event); };
 	windowImpl.ptr.prototype.NextEvent = function() {
@@ -185994,12 +186362,9 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver"]
 	};
 	windowImpl.prototype.Upload = function(dp, src, sr) { return this.$val.Upload(dp, src, sr); };
 	windowImpl.ptr.prototype.UploadYCbCr = function(dp, src, sr) {
-		var {_arg, _r, _r$1, _r$2, _tuple, dp, err, jsNaClDecoder, picture, renderPromise, renderResult, sr, src, w, x, $s, $r, $c} = $restore(this, {dp, src, sr});
+		var {_arg, _r, _r$1, _r$2, _tuple, canceled, dp, err, jsNaClDecoder, picture, renderDone, renderPromise, renderResult, sr, src, w, x, $s, $r, $c} = $restore(this, {dp, src, sr});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		w = this;
-		if (w.released) {
-			$s = -1; return;
-		}
 		/* */ if (jsdecoder.ShouldResetOnNextDecode()) { $s = 1; continue; }
 		/* */ $s = 2; continue;
 		/* if (jsdecoder.ShouldResetOnNextDecode()) { */ case 1:
@@ -186018,29 +186383,40 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver"]
 			$s = -1; return;
 		}
 		$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; }
+		/* */ if (w.released) { $s = 8; continue; }
+		/* */ $s = 9; continue;
+		/* if (w.released) { */ case 8:
+			$r = w.mutex.Unlock(); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$s = -1; return;
+		/* } */ case 9:
+		_r = $clone(jsNaClDecoder, js.Value).Call("render", new sliceType([(x = picture, new x.constructor.elem(x))])); /* */ $s = 11; case 11: 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; }
+		renderDone = w.renderDone;
+		$r = w.mutex.Unlock(); /* */ $s = 12; case 12: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		_r$1 = jshelper.AwaitWithCancel($clone(renderPromise, js.Value), renderDone); /* */ $s = 13; case 13: 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:
-			_r$2 = jshelper.GetError(err); /* */ $s = 13; case 13: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+		canceled = _tuple[2];
+		if (canceled) {
+			$s = -1; return;
+		}
+		/* */ if (!(err === ptrType$3.nil)) { $s = 14; continue; }
+		/* */ $s = 15; continue;
+		/* if (!(err === ptrType$3.nil)) { */ case 14:
+			_r$2 = jshelper.GetError(err); /* */ $s = 16; case 16: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
 			_arg = _r$2;
-			$r = errs.Print("Failed to render frame: %s", _arg); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$r = errs.Print("Failed to render frame: %s", _arg); /* */ $s = 17; case 17: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$s = -1; return;
-		/* } */ case 12:
-		/* */ if (!(($clone(renderResult, js.Value).Float() === 0))) { $s = 15; continue; }
-		/* */ $s = 16; continue;
-		/* if (!(($clone(renderResult, js.Value).Float() === 0))) { */ case 15:
-			$r = log.Printf("Failed to render frame with code: %f\n", new sliceType([new $Float64($clone(renderResult, js.Value).Float())])); /* */ $s = 17; case 17: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* } */ case 15:
+		/* */ if (!(($clone(renderResult, js.Value).Float() === 0))) { $s = 18; continue; }
+		/* */ $s = 19; continue;
+		/* if (!(($clone(renderResult, js.Value).Float() === 0))) { */ case 18:
+			$r = log.Printf("Failed to render frame with code: %f\n", new sliceType([new $Float64($clone(renderResult, js.Value).Float())])); /* */ $s = 20; case 20: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$s = -1; return;
-		/* } */ case 16:
+		/* } */ case 19:
 		$s = -1; return;
-		/* */ } return; } var $f = {$blk: windowImpl.ptr.prototype.UploadYCbCr, $c: true, $r, _arg, _r, _r$1, _r$2, _tuple, dp, err, jsNaClDecoder, picture, renderPromise, renderResult, sr, src, w, x, $s};return $f;
+		/* */ } return; } var $f = {$blk: windowImpl.ptr.prototype.UploadYCbCr, $c: true, $r, _arg, _r, _r$1, _r$2, _tuple, canceled, dp, err, jsNaClDecoder, picture, renderDone, renderPromise, renderResult, sr, src, w, x, $s};return $f;
 	};
 	windowImpl.prototype.UploadYCbCr = function(dp, src, sr) { return this.$val.UploadYCbCr(dp, src, sr); };
 	windowImpl.ptr.prototype.Fill = function(dr, src, op) {
@@ -186174,10 +186550,10 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver"]
 		b = this;
 	};
 	BufferImpl.prototype.Release = function() { return this.$val.Release(); };
-	ptrType$7.methods = [{prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "Publish", name: "Publish", pkg: "", typ: $funcType([], [screen.PublishResult], false)}, {prop: "Send", name: "Send", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "SendFirst", name: "SendFirst", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "NextEvent", name: "NextEvent", pkg: "", typ: $funcType([], [$emptyInterface], false)}, {prop: "Upload", name: "Upload", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "UploadYCbCr", name: "UploadYCbCr", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "Fill", name: "Fill", pkg: "", typ: $funcType([image.Rectangle, color.Color, draw.Op], [], false)}, {prop: "Draw", name: "Draw", pkg: "", typ: $funcType([f64.Aff3, screen.Texture, image.Rectangle, draw.Op, ptrType$6], [], false)}, {prop: "DrawUniform", name: "DrawUniform", pkg: "", typ: $funcType([f64.Aff3, color.Color, image.Rectangle, draw.Op, ptrType$6], [], false)}, {prop: "Copy", name: "Copy", pkg: "", typ: $funcType([image.Point, screen.Texture, image.Rectangle, draw.Op, ptrType$6], [], false)}, {prop: "Scale", name: "Scale", pkg: "", typ: $funcType([image.Rectangle, screen.Texture, image.Rectangle, draw.Op, ptrType$6], [], false)}];
+	ptrType$7.methods = [{prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "CancelPendingUploads", name: "CancelPendingUploads", pkg: "", typ: $funcType([], [], false)}, {prop: "Publish", name: "Publish", pkg: "", typ: $funcType([], [screen.PublishResult], false)}, {prop: "Send", name: "Send", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "SendNonBlocking", name: "SendNonBlocking", pkg: "", typ: $funcType([$emptyInterface], [$Bool], false)}, {prop: "SendFirst", name: "SendFirst", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "NextEvent", name: "NextEvent", pkg: "", typ: $funcType([], [$emptyInterface], false)}, {prop: "Upload", name: "Upload", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "UploadYCbCr", name: "UploadYCbCr", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "Fill", name: "Fill", pkg: "", typ: $funcType([image.Rectangle, color.Color, draw.Op], [], false)}, {prop: "Draw", name: "Draw", pkg: "", typ: $funcType([f64.Aff3, screen.Texture, image.Rectangle, draw.Op, ptrType$6], [], false)}, {prop: "DrawUniform", name: "DrawUniform", pkg: "", typ: $funcType([f64.Aff3, color.Color, image.Rectangle, draw.Op, ptrType$6], [], false)}, {prop: "Copy", name: "Copy", pkg: "", typ: $funcType([image.Point, screen.Texture, image.Rectangle, draw.Op, ptrType$6], [], false)}, {prop: "Scale", name: "Scale", pkg: "", typ: $funcType([image.Rectangle, screen.Texture, image.Rectangle, draw.Op, ptrType$6], [], false)}];
 	ptrType.methods = [{prop: "NewBuffer", name: "NewBuffer", pkg: "", typ: $funcType([image.Point], [screen.Buffer, $error], false)}, {prop: "NewTexture", name: "NewTexture", pkg: "", typ: $funcType([image.Point], [screen.Texture, $error], false)}, {prop: "NewWindow", name: "NewWindow", pkg: "", typ: $funcType([ptrType$8], [screen.Window, $error], false)}];
 	ptrType$4.methods = [{prop: "Size", name: "Size", pkg: "", typ: $funcType([], [image.Point], false)}, {prop: "Bounds", name: "Bounds", pkg: "", typ: $funcType([], [image.Rectangle], false)}, {prop: "RGBA", name: "RGBA", pkg: "", typ: $funcType([], [ptrType$5], false)}, {prop: "YCbCr", name: "YCbCr", pkg: "", typ: $funcType([], [ptrType$9], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}];
-	windowImpl.init("github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "domEvents", name: "domEvents", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}]);
+	windowImpl.init("github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "domEvents", name: "domEvents", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "renderDone", name: "renderDone", embedded: false, exported: false, typ: chanType, tag: ""}]);
 	screenImpl.init("github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver", [{prop: "doc", name: "doc", embedded: false, exported: false, typ: js.Value, tag: ""}]);
 	BufferImpl.init("github.com/supraio/client-daemon/pkg/decoder/nacldecoder/nacldriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "size", name: "size", embedded: false, exported: false, typ: image.Point, tag: ""}, {prop: "Picture", name: "Picture", embedded: false, exported: true, typ: ptrType$3, tag: ""}]);
 	$init = function() {
@@ -191065,7 +191441,7 @@ $packages["golang.org/x/exp/shiny/driver/internal/errscreen"] = (function() {
 	return $pkg;
 })();
 $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
-	var $pkg = {}, $init, fmt, errscreen, dom, screen, f64, image, color, draw, sync, js, windowImpl, screenImpl, YCbCrJS, BufferImpl, sliceType, ptrType, ptrType$1, funcType, arrayType, ptrType$2, ptrType$3, sliceType$1, ptrType$4, ptrType$5, ptrType$6, ptrType$7, ptrType$8, ptrType$9, ptrType$10, newWindow, newScreenImpl, main, newBuffer;
+	var $pkg = {}, $init, fmt, errscreen, dom, screen, f64, image, color, draw, sync, js, windowImpl, screenImpl, YCbCrJS, BufferImpl, sliceType, ptrType, ptrType$1, ptrType$2, funcType, arrayType, ptrType$3, structType, ptrType$4, sliceType$1, ptrType$5, ptrType$6, ptrType$7, ptrType$8, chanType, ptrType$9, ptrType$10, newWindow, newScreenImpl, main, newBuffer;
 	fmt = $packages["fmt"];
 	errscreen = $packages["golang.org/x/exp/shiny/driver/internal/errscreen"];
 	dom = $packages["golang.org/x/exp/shiny/driver/util/dom"];
@@ -191076,16 +191452,19 @@ $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
 	draw = $packages["image/draw"];
 	sync = $packages["sync"];
 	js = $packages["syscall/js"];
-	windowImpl = $pkg.windowImpl = $newType(0, $kindStruct, "canvasdriver.windowImpl", true, "golang.org/x/exp/shiny/driver/canvasdriver", false, function(screen_, mutex_, canvasEl_, ctx2d_, released_, domEvents_, resizeCallback_) {
+	windowImpl = $pkg.windowImpl = $newType(0, $kindStruct, "canvasdriver.windowImpl", true, "golang.org/x/exp/shiny/driver/canvasdriver", false, function(screen_, mutex_, canvasEl_, ctx2d_, released_, domEvents_, resizeCallback_, frontEvents_, backEvents_, eventWake_) {
 		this.$val = this;
 		if (arguments.length === 0) {
-			this.screen = ptrType.nil;
-			this.mutex = ptrType$1.nil;
+			this.screen = ptrType$1.nil;
+			this.mutex = ptrType$2.nil;
 			this.canvasEl = new js.Value.ptr(null, false, arrayType.zero());
 			this.ctx2d = new js.Value.ptr(null, false, arrayType.zero());
 			this.released = false;
-			this.domEvents = ptrType$2.nil;
+			this.domEvents = ptrType$3.nil;
 			this.resizeCallback = new js.Func.ptr(new js.Value.ptr(null, false, arrayType.zero()));
+			this.frontEvents = sliceType.nil;
+			this.backEvents = sliceType.nil;
+			this.eventWake = $chanNil;
 			return;
 		}
 		this.screen = screen_;
@@ -191095,6 +191474,9 @@ $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
 		this.released = released_;
 		this.domEvents = domEvents_;
 		this.resizeCallback = resizeCallback_;
+		this.frontEvents = frontEvents_;
+		this.backEvents = backEvents_;
+		this.eventWake = eventWake_;
 	});
 	screenImpl = $pkg.screenImpl = $newType(0, $kindStruct, "canvasdriver.screenImpl", true, "golang.org/x/exp/shiny/driver/canvasdriver", false, function(doc_) {
 		this.$val = this;
@@ -191107,7 +191489,7 @@ $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
 	YCbCrJS = $pkg.YCbCrJS = $newType(0, $kindStruct, "canvasdriver.YCbCrJS", true, "golang.org/x/exp/shiny/driver/canvasdriver", true, function(CanvasImageSource_) {
 		this.$val = this;
 		if (arguments.length === 0) {
-			this.CanvasImageSource = ptrType$5.nil;
+			this.CanvasImageSource = ptrType$6.nil;
 			return;
 		}
 		this.CanvasImageSource = CanvasImageSource_;
@@ -191115,13 +191497,13 @@ $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
 	BufferImpl = $pkg.BufferImpl = $newType(0, $kindStruct, "canvasdriver.BufferImpl", true, "golang.org/x/exp/shiny/driver/canvasdriver", true, function(screen_, size_, mutex_, released_, rgba_, ycbcr_, ycbcrJS_) {
 		this.$val = this;
 		if (arguments.length === 0) {
-			this.screen = ptrType.nil;
+			this.screen = ptrType$1.nil;
 			this.size = new image.Point.ptr(0, 0);
-			this.mutex = ptrType$1.nil;
+			this.mutex = ptrType$2.nil;
 			this.released = false;
 			this.rgba = new image.RGBA.ptr(sliceType$1.nil, 0, new image.Rectangle.ptr(new image.Point.ptr(0, 0), new image.Point.ptr(0, 0)));
 			this.ycbcr = new image.YCbCr.ptr(sliceType$1.nil, sliceType$1.nil, sliceType$1.nil, 0, 0, 0, new image.Rectangle.ptr(new image.Point.ptr(0, 0), new image.Point.ptr(0, 0)));
-			this.ycbcrJS = ptrType$4.nil;
+			this.ycbcrJS = ptrType$5.nil;
 			return;
 		}
 		this.screen = screen_;
@@ -191133,81 +191515,101 @@ $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
 		this.ycbcrJS = ycbcrJS_;
 	});
 	sliceType = $sliceType($emptyInterface);
-	ptrType = $ptrType(screenImpl);
-	ptrType$1 = $ptrType(sync.Mutex);
+	ptrType = $ptrType(screen.NewWindowOptions);
+	ptrType$1 = $ptrType(screenImpl);
+	ptrType$2 = $ptrType(sync.Mutex);
 	funcType = $funcType([], [], false);
 	arrayType = $arrayType(funcType, 0);
-	ptrType$2 = $ptrType(dom.DomEvents);
-	ptrType$3 = $ptrType(BufferImpl);
+	ptrType$3 = $ptrType(dom.DomEvents);
+	structType = $structType("", []);
+	ptrType$4 = $ptrType(BufferImpl);
 	sliceType$1 = $sliceType($Uint8);
-	ptrType$4 = $ptrType(YCbCrJS);
-	ptrType$5 = $ptrType(js.Value);
-	ptrType$6 = $ptrType(screen.DrawOptions);
-	ptrType$7 = $ptrType(windowImpl);
-	ptrType$8 = $ptrType(screen.NewWindowOptions);
+	ptrType$5 = $ptrType(YCbCrJS);
+	ptrType$6 = $ptrType(js.Value);
+	ptrType$7 = $ptrType(screen.DrawOptions);
+	ptrType$8 = $ptrType(windowImpl);
+	chanType = $chanType(structType, false, false);
 	ptrType$9 = $ptrType(image.RGBA);
 	ptrType$10 = $ptrType(image.YCbCr);
 	newWindow = function(screen$1, opts) {
-		var {_r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, adaptCanvas, canvasEl, ctx2d, domEvents, opts, resizeCallback, screen$1, w, $s, $r, $c} = $restore(this, {screen$1, opts});
+		var {_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, $r, $c} = $restore(this, {screen$1, opts});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		adaptCanvas = [adaptCanvas];
 		canvasEl = [canvasEl];
+		hasGeometry = [hasGeometry];
 		_r = $clone(screen$1.doc, js.Value).Call("createElement", new sliceType([new $String("canvas")])); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		canvasEl[0] = $clone(_r, js.Value);
 		_r$1 = $clone($clone(screen$1.doc, js.Value).Get("body"), js.Value).Call("appendChild", new sliceType([new canvasEl[0].constructor.elem(canvasEl[0])])); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 		_r$1;
-		adaptCanvas[0] = (function(adaptCanvas, canvasEl) { return function() {
-			var height, scale, width;
-			scale = dom.GetBrowserZoomRatio();
-			width = (((dom.GetDocWidth()) / scale >> 0));
+		hasGeometry[0] = !(opts === ptrType.nil) && opts.Width > 0 && opts.Height > 0;
+		/* */ if (hasGeometry[0]) { $s = 3; continue; }
+		/* */ $s = 4; continue;
+		/* if (hasGeometry[0]) { */ case 3:
+			style = $clone($clone(canvasEl[0], js.Value).Get("style"), js.Value);
+			$clone(style, js.Value).Set("position", new $String("absolute"));
+			_r$2 = fmt.Sprintf("%dpx", new sliceType([new $Int(opts.X)])); /* */ $s = 5; case 5: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			_arg = new $String(_r$2);
+			$r = $clone(style, js.Value).Set("left", _arg); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$3 = fmt.Sprintf("%dpx", new sliceType([new $Int(opts.Y)])); /* */ $s = 7; case 7: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+			_arg$1 = new $String(_r$3);
+			$r = $clone(style, js.Value).Set("top", _arg$1); /* */ $s = 8; case 8: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$clone(canvasEl[0], js.Value).Set("width", new $Int(opts.Width));
+			$clone(canvasEl[0], js.Value).Set("height", new $Int(opts.Height));
+		/* } */ case 4:
+		adaptCanvas[0] = (function(adaptCanvas, canvasEl, hasGeometry) { return function() {
+			var height, width;
+			if (hasGeometry[0]) {
+				return;
+			}
+			width = dom.GetDocWidth();
 			if (!(($clone($clone(canvasEl[0], js.Value).Get("width"), js.Value).Int() === width))) {
 				$clone(canvasEl[0], js.Value).Set("width", new $Int(width));
 			}
-			height = (((dom.GetDocHeight()) / scale >> 0));
+			height = dom.GetDocHeight();
 			if (!(($clone($clone(canvasEl[0], js.Value).Get("height"), js.Value).Int() === height))) {
 				$clone(canvasEl[0], js.Value).Set("height", new $Int(height));
 			}
-		}; })(adaptCanvas, canvasEl);
-		$r = adaptCanvas[0](); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		resizeCallback = $clone(js.FuncOf((function(adaptCanvas, canvasEl) { return function $b(this$1, args) {
+		}; })(adaptCanvas, canvasEl, hasGeometry);
+		$r = adaptCanvas[0](); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		resizeCallback = $clone(js.FuncOf((function(adaptCanvas, canvasEl, hasGeometry) { return function $b(this$1, args) {
 			var {args, this$1, $s, $r, $c} = $restore(this, {this$1, args});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 			$r = adaptCanvas[0](); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$s = -1; return $ifaceNil;
 			/* */ } return; } var $f = {$blk: $b, $c: true, $r, args, this$1, $s};return $f;
-		}; })(adaptCanvas, canvasEl)), js.Func);
-		_r$2 = $clone(js.Global(), js.Value).Call("addEventListener", new sliceType([new $String("resize"), new resizeCallback.constructor.elem(resizeCallback)])); /* */ $s = 4; case 4: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
-		_r$2;
-		/* */ if (!((opts.Width === 0))) { $s = 5; continue; }
-		/* */ $s = 6; continue;
-		/* if (!((opts.Width === 0))) { */ case 5:
-			$r = dom.SetWindowWidth(opts.Width); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		/* } */ case 6:
-		/* */ if (!((opts.Height === 0))) { $s = 8; continue; }
-		/* */ $s = 9; continue;
-		/* if (!((opts.Height === 0))) { */ case 8:
-			$r = dom.SetWindowHeight(opts.Height); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		/* } */ case 9:
-		/* */ if (!(opts.Title === "")) { $s = 11; continue; }
+		}; })(adaptCanvas, canvasEl, hasGeometry)), js.Func);
+		_r$4 = $clone(js.Global(), js.Value).Call("addEventListener", new sliceType([new $String("resize"), new resizeCallback.constructor.elem(resizeCallback)])); /* */ $s = 10; case 10: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+		_r$4;
+		/* */ if (!((opts.Width === 0))) { $s = 11; continue; }
 		/* */ $s = 12; continue;
-		/* if (!(opts.Title === "")) { */ case 11:
-			_r$3 = $clone($clone(screen$1.doc, js.Value).Get("head"), js.Value).Call("getElementsByTagName", new sliceType([new $String("title")])); /* */ $s = 13; case 13: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
-			_r$4 = $clone(_r$3, js.Value).Call("item", new sliceType([new $Int(0)])); /* */ $s = 14; case 14: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
-			$r = $clone(_r$4, js.Value).Set("innerHTML", new $String(opts.Title)); /* */ $s = 15; case 15: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* if (!((opts.Width === 0))) { */ case 11:
+			$r = dom.SetWindowWidth(opts.Width); /* */ $s = 13; case 13: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		/* } */ case 12:
-		_r$5 = $clone(canvasEl[0], js.Value).Call("getContext", new sliceType([new $String("2d")])); /* */ $s = 16; case 16: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
-		ctx2d = $clone(_r$5, js.Value);
-		/* */ if ($clone(ctx2d, js.Value).IsUndefined() || $clone(ctx2d, js.Value).IsNull()) { $s = 17; continue; }
+		/* */ if (!((opts.Height === 0))) { $s = 14; continue; }
+		/* */ $s = 15; continue;
+		/* if (!((opts.Height === 0))) { */ case 14:
+			$r = dom.SetWindowHeight(opts.Height); /* */ $s = 16; case 16: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* } */ case 15:
+		/* */ if (!(opts.Title === "")) { $s = 17; continue; }
 		/* */ $s = 18; continue;
-		/* if ($clone(ctx2d, js.Value).IsUndefined() || $clone(ctx2d, js.Value).IsNull()) { */ case 17:
-			_r$6 = fmt.Errorf("Cannot get 2d context of canvas", sliceType.nil); /* */ $s = 19; case 19: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
-			$panic(_r$6);
+		/* if (!(opts.Title === "")) { */ case 17:
+			_r$5 = $clone($clone(screen$1.doc, js.Value).Get("head"), js.Value).Call("getElementsByTagName", new sliceType([new $String("title")])); /* */ $s = 19; case 19: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
+			_r$6 = $clone(_r$5, js.Value).Call("item", new sliceType([new $Int(0)])); /* */ $s = 20; case 20: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
+			$r = $clone(_r$6, js.Value).Set("innerHTML", new $String(opts.Title)); /* */ $s = 21; case 21: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		/* } */ case 18:
-		domEvents = dom.NewDomEvents();
-		w = new windowImpl.ptr(screen$1, ptrType$1.nil, $clone(canvasEl[0], js.Value), $clone(ctx2d, js.Value), false, domEvents, $clone(resizeCallback, js.Func));
-		$r = domEvents.BindEvents(); /* */ $s = 20; case 20: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		_r$7 = $clone(canvasEl[0], js.Value).Call("getContext", new sliceType([new $String("2d")])); /* */ $s = 22; case 22: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
+		ctx2d = $clone(_r$7, js.Value);
+		/* */ if ($clone(ctx2d, js.Value).IsUndefined() || $clone(ctx2d, js.Value).IsNull()) { $s = 23; continue; }
+		/* */ $s = 24; continue;
+		/* if ($clone(ctx2d, js.Value).IsUndefined() || $clone(ctx2d, js.Value).IsNull()) { */ case 23:
+			_r$8 = fmt.Errorf("Cannot get 2d context of canvas", sliceType.nil); /* */ $s = 25; case 25: if($c) { $c = false; _r$8 = _r$8.$blk(); } if (_r$8 && _r$8.$blk !== undefined) { break s; }
+			$panic(_r$8);
+		/* } */ case 24:
+		domEvents = dom.NewDomEventsForTarget($clone(canvasEl[0], js.Value));
+		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), sliceType.nil, sliceType.nil, new $Chan(structType, 1));
+		$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, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, adaptCanvas, canvasEl, ctx2d, domEvents, opts, resizeCallback, screen$1, w, $s};return $f;
+		/* */ } 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;
 	};
 	windowImpl.ptr.prototype.Release = function() {
 		var {_r, _r$1, w, x, $s, $deferred, $r, $c} = $restore(this, {});
@@ -191241,33 +191643,126 @@ $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
 	};
 	windowImpl.prototype.Publish = function() { return this.$val.Publish(); };
 	windowImpl.ptr.prototype.Send = function(event) {
-		var event, w;
+		var {event, eventChan, w, $s, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		w = this;
-		if (w.released) {
-			return;
-		}
-		$panic(new $String("Not implemented"));
+		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* */ if (w.released) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.released) { */ case 2:
+			$r = w.mutex.Unlock(); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$s = -1; return;
+		/* } */ case 3:
+		eventChan = w.domEvents.GetEventChan();
+		$r = w.mutex.Unlock(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = $send(eventChan, event); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$s = -1; return;
+		/* */ } return; } var $f = {$blk: windowImpl.ptr.prototype.Send, $c: true, $r, event, eventChan, w, $s};return $f;
 	};
 	windowImpl.prototype.Send = function(event) { return this.$val.Send(event); };
+	windowImpl.ptr.prototype.SendNonBlocking = function(event) {
+		var {$24r, $24r$1, $24r$2, _selection, event, w, $s, $deferred, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
+		w = this;
+		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$deferred.push([$methodVal(w.mutex, "Unlock"), []]);
+		/* */ if (w.released) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.released) { */ case 2:
+			$24r = false;
+			$s = 4; case 4: return $24r;
+		/* } */ case 3:
+		_selection = $select([[w.domEvents.GetEventChan(), event], []]);
+		/* */ if (_selection[0] === 0) { $s = 5; continue; }
+		/* */ if (_selection[0] === 1) { $s = 6; continue; }
+		/* */ $s = 7; continue;
+		/* if (_selection[0] === 0) { */ case 5:
+			$24r$1 = true;
+			$s = 8; case 8: return $24r$1;
+		/* } else if (_selection[0] === 1) { */ case 6:
+			$24r$2 = false;
+			$s = 9; case 9: return $24r$2;
+		/* } */ case 7:
+		$s = -1; return false;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; return false; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.SendNonBlocking, $c: true, $r, $24r, $24r$1, $24r$2, _selection, event, w, $s, $deferred};return $f; } }
+	};
+	windowImpl.prototype.SendNonBlocking = function(event) { return this.$val.SendNonBlocking(event); };
 	windowImpl.ptr.prototype.SendFirst = function(event) {
-		var event, w;
+		var {_selection, event, w, $s, $deferred, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
 		w = this;
-		if (w.released) {
-			return;
+		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$deferred.push([$methodVal(w.mutex, "Unlock"), []]);
+		/* */ if (w.released) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.released) { */ case 2:
+			$s = 4; case 4: return;
+		/* } */ case 3:
+		w.frontEvents = $append(w.frontEvents, event);
+		_selection = $select([[w.eventWake, $clone(new structType.ptr(), structType)], []]);
+		if (_selection[0] === 0) {
+		} else if (_selection[0] === 1) {
 		}
-		$panic(new $String("Not implemented"));
+		$s = -1; return;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.SendFirst, $c: true, $r, _selection, event, w, $s, $deferred};return $f; } }
 	};
 	windowImpl.prototype.SendFirst = function(event) { return this.$val.SendFirst(event); };
 	windowImpl.ptr.prototype.NextEvent = function() {
-		var {_r, ev, w, $s, $r, $c} = $restore(this, {});
+		var {_r, _selection, _tuple, event, event$1, ok, w, x, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		w = this;
-		_r = $recv(w.domEvents.GetEventChan()); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-		ev = _r[0];
-		$s = -1; return ev;
-		/* */ } return; } var $f = {$blk: windowImpl.ptr.prototype.NextEvent, $c: true, $r, _r, ev, w, $s};return $f;
+		/* while (true) { */ case 1:
+			$r = w.mutex.Lock(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_tuple = w.nextQueuedEvent();
+			event = _tuple[0];
+			ok = _tuple[1];
+			/* */ if (ok) { $s = 4; continue; }
+			/* */ $s = 5; continue;
+			/* if (ok) { */ case 4:
+				$r = w.mutex.Unlock(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+				$s = -1; return event;
+			/* } */ case 5:
+			$r = w.mutex.Unlock(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r = $select([[w.domEvents.GetEventChan()], [w.eventWake]]); /* */ $s = 8; case 8: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+			_selection = _r;
+			/* */ if (_selection[0] === 0) { $s = 9; continue; }
+			/* */ if (_selection[0] === 1) { $s = 10; continue; }
+			/* */ $s = 11; continue;
+			/* if (_selection[0] === 0) { */ case 9:
+				event$1 = _selection[1][0];
+				$r = w.mutex.Lock(); /* */ $s = 12; case 12: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+				w.backEvents = $append(w.backEvents, $ifaceNil);
+				$copySlice($subslice(w.backEvents, 1), $subslice(w.backEvents, 0, (w.backEvents.$length - 1 >> 0)));
+				(x = w.backEvents, (0 >= x.$length ? ($throwRuntimeError("index out of range"), undefined) : x.$array[x.$offset + 0] = event$1));
+				$r = w.mutex.Unlock(); /* */ $s = 13; case 13: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+				$s = 11; continue;
+			/* } else if (_selection[0] === 1) { */ case 10:
+			/* } */ case 11:
+		$s = 1; continue;
+		case 2:
+		$s = -1; return $ifaceNil;
+		/* */ } return; } var $f = {$blk: windowImpl.ptr.prototype.NextEvent, $c: true, $r, _r, _selection, _tuple, event, event$1, ok, w, x, $s};return $f;
 	};
 	windowImpl.prototype.NextEvent = function() { return this.$val.NextEvent(); };
+	windowImpl.ptr.prototype.nextQueuedEvent = function() {
+		var event, event$1, last, w, x, x$1, x$2, x$3;
+		w = this;
+		last = w.frontEvents.$length - 1 >> 0;
+		if (last >= 0) {
+			event = (x = w.frontEvents, ((last < 0 || last >= x.$length) ? ($throwRuntimeError("index out of range"), undefined) : x.$array[x.$offset + last]));
+			(x$1 = w.frontEvents, ((last < 0 || last >= x$1.$length) ? ($throwRuntimeError("index out of range"), undefined) : x$1.$array[x$1.$offset + last] = $ifaceNil));
+			w.frontEvents = $subslice(w.frontEvents, 0, last);
+			return [event, true];
+		}
+		if (w.backEvents.$length > 0) {
+			event$1 = (x$2 = w.backEvents, (0 >= x$2.$length ? ($throwRuntimeError("index out of range"), undefined) : x$2.$array[x$2.$offset + 0]));
+			(x$3 = w.backEvents, (0 >= x$3.$length ? ($throwRuntimeError("index out of range"), undefined) : x$3.$array[x$3.$offset + 0] = $ifaceNil));
+			w.backEvents = $subslice(w.backEvents, 1);
+			return [event$1, true];
+		}
+		return [$ifaceNil, false];
+	};
+	windowImpl.prototype.nextQueuedEvent = function() { return this.$val.nextQueuedEvent(); };
 	windowImpl.ptr.prototype.Upload = function(dp, src, sr) {
 		var {_r, dp, sr, src, w, $s, $r, $c} = $restore(this, {dp, src, sr});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -191289,9 +191784,9 @@ $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
 			$s = -1; return;
 		}
 		_ref = src;
-		/* */ if ($assertType(_ref, ptrType$3, true)[1]) { $s = 1; continue; }
+		/* */ if ($assertType(_ref, ptrType$4, true)[1]) { $s = 1; continue; }
 		/* */ $s = 2; continue;
-		/* if ($assertType(_ref, ptrType$3, true)[1]) { */ case 1:
+		/* if ($assertType(_ref, ptrType$4, true)[1]) { */ case 1:
 			jsSrc = _ref.$val;
 			_r = $clone(w.ctx2d, js.Value).Call("drawImage", new sliceType([(x = jsSrc.YCbCrJS().CanvasImageSource, new x.constructor.elem(x)), new $Int(0), new $Int(0)])); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 			_r;
@@ -191399,7 +191894,7 @@ $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
 	newBuffer = function(screen$1, size) {
 		var _q, _q$1, _q$2, b, rect, screen$1, size;
 		rect = new image.Rectangle.ptr(new image.Point.ptr(0, 0), $clone(size, image.Point));
-		b = new BufferImpl.ptr(screen$1, $clone(size, image.Point), new sync.Mutex.ptr(0, 0), false, $clone(new image.RGBA.ptr($makeSlice(sliceType$1, ($imul(($imul(4, size.X)), size.Y))), $imul(4, size.X), $clone(rect, image.Rectangle)), image.RGBA), $clone(new image.YCbCr.ptr($makeSlice(sliceType$1, ($imul(size.X, size.Y))), $makeSlice(sliceType$1, (_q$1 = ($imul(size.X, size.Y)) / 4, (_q$1 === _q$1 && _q$1 !== 1/0 && _q$1 !== -1/0) ? _q$1 >> 0 : $throwRuntimeError("integer divide by zero"))), $makeSlice(sliceType$1, (_q$2 = ($imul(size.X, size.Y)) / 4, (_q$2 === _q$2 && _q$2 !== 1/0 && _q$2 !== -1/0) ? _q$2 >> 0 : $throwRuntimeError("integer divide by zero"))), size.X, (_q = size.X / 2, (_q === _q && _q !== 1/0 && _q !== -1/0) ? _q >> 0 : $throwRuntimeError("integer divide by zero")), 2, $clone(rect, image.Rectangle)), image.YCbCr), ptrType$4.nil);
+		b = new BufferImpl.ptr(screen$1, $clone(size, image.Point), new sync.Mutex.ptr(0, 0), false, $clone(new image.RGBA.ptr($makeSlice(sliceType$1, ($imul(($imul(4, size.X)), size.Y))), $imul(4, size.X), $clone(rect, image.Rectangle)), image.RGBA), $clone(new image.YCbCr.ptr($makeSlice(sliceType$1, ($imul(size.X, size.Y))), $makeSlice(sliceType$1, (_q$1 = ($imul(size.X, size.Y)) / 4, (_q$1 === _q$1 && _q$1 !== 1/0 && _q$1 !== -1/0) ? _q$1 >> 0 : $throwRuntimeError("integer divide by zero"))), $makeSlice(sliceType$1, (_q$2 = ($imul(size.X, size.Y)) / 4, (_q$2 === _q$2 && _q$2 !== 1/0 && _q$2 !== -1/0) ? _q$2 >> 0 : $throwRuntimeError("integer divide by zero"))), size.X, (_q = size.X / 2, (_q === _q && _q !== 1/0 && _q !== -1/0) ? _q >> 0 : $throwRuntimeError("integer divide by zero")), 2, $clone(rect, image.Rectangle)), image.YCbCr), ptrType$5.nil);
 		return b;
 	};
 	BufferImpl.ptr.prototype.Size = function() {
@@ -191429,8 +191924,8 @@ $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
 	BufferImpl.ptr.prototype.YCbCrJS = function() {
 		var b;
 		b = this;
-		if (b.ycbcrJS === ptrType$4.nil) {
-			b.ycbcrJS = new YCbCrJS.ptr(ptrType$5.nil);
+		if (b.ycbcrJS === ptrType$5.nil) {
+			b.ycbcrJS = new YCbCrJS.ptr(ptrType$6.nil);
 		}
 		return b.ycbcrJS;
 	};
@@ -191451,13 +191946,13 @@ $packages["golang.org/x/exp/shiny/driver/canvasdriver"] = (function() {
 		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: BufferImpl.ptr.prototype.Release, $c: true, $r, b, $s, $deferred};return $f; } }
 	};
 	BufferImpl.prototype.Release = function() { return this.$val.Release(); };
-	ptrType$7.methods = [{prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "Publish", name: "Publish", pkg: "", typ: $funcType([], [screen.PublishResult], false)}, {prop: "Send", name: "Send", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "SendFirst", name: "SendFirst", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "NextEvent", name: "NextEvent", pkg: "", typ: $funcType([], [$emptyInterface], false)}, {prop: "Upload", name: "Upload", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "UploadYCbCr", name: "UploadYCbCr", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "Fill", name: "Fill", pkg: "", typ: $funcType([image.Rectangle, color.Color, draw.Op], [], false)}, {prop: "Draw", name: "Draw", pkg: "", typ: $funcType([f64.Aff3, screen.Texture, image.Rectangle, draw.Op, ptrType$6], [], false)}, {prop: "DrawUniform", name: "DrawUniform", pkg: "", typ: $funcType([f64.Aff3, color.Color, image.Rectangle, draw.Op, ptrType$6], [], false)}, {prop: "Copy", name: "Copy", pkg: "", typ: $funcType([image.Point, screen.Texture, image.Rectangle, draw.Op, ptrType$6], [], false)}, {prop: "Scale", name: "Scale", pkg: "", typ: $funcType([image.Rectangle, screen.Texture, image.Rectangle, draw.Op, ptrType$6], [], false)}];
-	ptrType.methods = [{prop: "NewBuffer", name: "NewBuffer", pkg: "", typ: $funcType([image.Point], [screen.Buffer, $error], false)}, {prop: "NewTexture", name: "NewTexture", pkg: "", typ: $funcType([image.Point], [screen.Texture, $error], false)}, {prop: "NewWindow", name: "NewWindow", pkg: "", typ: $funcType([ptrType$8], [screen.Window, $error], false)}];
-	ptrType$3.methods = [{prop: "Size", name: "Size", pkg: "", typ: $funcType([], [image.Point], false)}, {prop: "Bounds", name: "Bounds", pkg: "", typ: $funcType([], [image.Rectangle], false)}, {prop: "RGBA", name: "RGBA", pkg: "", typ: $funcType([], [ptrType$9], false)}, {prop: "YCbCr", name: "YCbCr", pkg: "", typ: $funcType([], [ptrType$10], false)}, {prop: "YCbCrJS", name: "YCbCrJS", pkg: "", typ: $funcType([], [ptrType$4], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}];
-	windowImpl.init("golang.org/x/exp/shiny/driver/canvasdriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "canvasEl", name: "canvasEl", embedded: false, exported: false, typ: js.Value, tag: ""}, {prop: "ctx2d", name: "ctx2d", embedded: false, exported: false, typ: js.Value, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "domEvents", name: "domEvents", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "resizeCallback", name: "resizeCallback", embedded: false, exported: false, typ: js.Func, tag: ""}]);
+	ptrType$8.methods = [{prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "Publish", name: "Publish", pkg: "", typ: $funcType([], [screen.PublishResult], false)}, {prop: "Send", name: "Send", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "SendNonBlocking", name: "SendNonBlocking", pkg: "", typ: $funcType([$emptyInterface], [$Bool], false)}, {prop: "SendFirst", name: "SendFirst", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "NextEvent", name: "NextEvent", pkg: "", typ: $funcType([], [$emptyInterface], false)}, {prop: "nextQueuedEvent", name: "nextQueuedEvent", pkg: "golang.org/x/exp/shiny/driver/canvasdriver", typ: $funcType([], [$emptyInterface, $Bool], false)}, {prop: "Upload", name: "Upload", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "UploadYCbCr", name: "UploadYCbCr", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "Fill", name: "Fill", pkg: "", typ: $funcType([image.Rectangle, color.Color, draw.Op], [], false)}, {prop: "Draw", name: "Draw", pkg: "", typ: $funcType([f64.Aff3, screen.Texture, image.Rectangle, draw.Op, ptrType$7], [], false)}, {prop: "DrawUniform", name: "DrawUniform", pkg: "", typ: $funcType([f64.Aff3, color.Color, image.Rectangle, draw.Op, ptrType$7], [], false)}, {prop: "Copy", name: "Copy", pkg: "", typ: $funcType([image.Point, screen.Texture, image.Rectangle, draw.Op, ptrType$7], [], false)}, {prop: "Scale", name: "Scale", pkg: "", typ: $funcType([image.Rectangle, screen.Texture, image.Rectangle, draw.Op, ptrType$7], [], false)}];
+	ptrType$1.methods = [{prop: "NewBuffer", name: "NewBuffer", pkg: "", typ: $funcType([image.Point], [screen.Buffer, $error], false)}, {prop: "NewTexture", name: "NewTexture", pkg: "", typ: $funcType([image.Point], [screen.Texture, $error], false)}, {prop: "NewWindow", name: "NewWindow", pkg: "", typ: $funcType([ptrType], [screen.Window, $error], false)}];
+	ptrType$4.methods = [{prop: "Size", name: "Size", pkg: "", typ: $funcType([], [image.Point], false)}, {prop: "Bounds", name: "Bounds", pkg: "", typ: $funcType([], [image.Rectangle], false)}, {prop: "RGBA", name: "RGBA", pkg: "", typ: $funcType([], [ptrType$9], false)}, {prop: "YCbCr", name: "YCbCr", pkg: "", typ: $funcType([], [ptrType$10], false)}, {prop: "YCbCrJS", name: "YCbCrJS", pkg: "", typ: $funcType([], [ptrType$5], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}];
+	windowImpl.init("golang.org/x/exp/shiny/driver/canvasdriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "canvasEl", name: "canvasEl", embedded: false, exported: false, typ: js.Value, tag: ""}, {prop: "ctx2d", name: "ctx2d", embedded: false, exported: false, typ: js.Value, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "domEvents", name: "domEvents", embedded: false, exported: false, typ: ptrType$3, tag: ""}, {prop: "resizeCallback", name: "resizeCallback", embedded: false, exported: false, typ: js.Func, tag: ""}, {prop: "frontEvents", name: "frontEvents", embedded: false, exported: false, typ: sliceType, tag: ""}, {prop: "backEvents", name: "backEvents", embedded: false, exported: false, typ: sliceType, tag: ""}, {prop: "eventWake", name: "eventWake", embedded: false, exported: false, typ: chanType, tag: ""}]);
 	screenImpl.init("golang.org/x/exp/shiny/driver/canvasdriver", [{prop: "doc", name: "doc", embedded: false, exported: false, typ: js.Value, tag: ""}]);
-	YCbCrJS.init("", [{prop: "CanvasImageSource", name: "CanvasImageSource", embedded: false, exported: true, typ: ptrType$5, tag: ""}]);
-	BufferImpl.init("golang.org/x/exp/shiny/driver/canvasdriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "size", name: "size", embedded: false, exported: false, typ: image.Point, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "rgba", name: "rgba", embedded: false, exported: false, typ: image.RGBA, tag: ""}, {prop: "ycbcr", name: "ycbcr", embedded: false, exported: false, typ: image.YCbCr, tag: ""}, {prop: "ycbcrJS", name: "ycbcrJS", embedded: false, exported: false, typ: ptrType$4, tag: ""}]);
+	YCbCrJS.init("", [{prop: "CanvasImageSource", name: "CanvasImageSource", embedded: false, exported: true, typ: ptrType$6, tag: ""}]);
+	BufferImpl.init("golang.org/x/exp/shiny/driver/canvasdriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "size", name: "size", embedded: false, exported: false, typ: image.Point, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "rgba", name: "rgba", embedded: false, exported: false, typ: image.RGBA, tag: ""}, {prop: "ycbcr", name: "ycbcr", embedded: false, exported: false, typ: image.YCbCr, tag: ""}, {prop: "ycbcrJS", name: "ycbcrJS", embedded: false, exported: false, typ: ptrType$5, 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:
@@ -191673,7 +192168,7 @@ $packages["golang.org/x/exp/shiny/imageutil"] = (function() {
 	return $pkg;
 })();
 $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
-	var $pkg = {}, $init, fmt, webgl, types, errscreen, dom, imageutil, screen, f64, image, color, draw, sync, js, windowImpl, screenImpl, ArrayBufferSlice, YCbCrJS, BufferImpl, sliceType, sliceType$1, sliceType$2, ptrType, ptrType$1, funcType, arrayType, ptrType$2, ptrType$3, ptrType$4, ptrType$5, ptrType$6, ptrType$7, sliceType$3, ptrType$8, ptrType$9, ptrType$10, ptrType$11, ptrType$12, ptrType$13, ptrType$14, texCoordsVertices, elementsIndices, newWindow, main, newScreenImpl, newBuffer;
+	var $pkg = {}, $init, fmt, webgl, types, errscreen, dom, imageutil, screen, f64, image, color, draw, sync, js, windowImpl, screenImpl, ArrayBufferSlice, YCbCrJS, BufferImpl, sliceType, sliceType$1, sliceType$2, ptrType, ptrType$1, ptrType$2, funcType, arrayType, ptrType$3, ptrType$4, ptrType$5, ptrType$6, ptrType$7, structType, ptrType$8, sliceType$3, ptrType$9, ptrType$10, ptrType$11, chanType, ptrType$12, ptrType$13, ptrType$14, texCoordsVertices, elementsIndices, newWindow, main, newScreenImpl, newBuffer;
 	fmt = $packages["fmt"];
 	webgl = $packages["github.com/nuberu/webgl"];
 	types = $packages["github.com/nuberu/webgl/types"];
@@ -191687,22 +192182,25 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 	draw = $packages["image/draw"];
 	sync = $packages["sync"];
 	js = $packages["syscall/js"];
-	windowImpl = $pkg.windowImpl = $newType(0, $kindStruct, "webgldriver.windowImpl", true, "golang.org/x/exp/shiny/driver/webgldriver", false, function(screen_, mutex_, canvasEl_, gl_, programRGBA_, imageTexRGBA_, programYUV420_, imageTexY_, imageTexU_, imageTexV_, vertexArray_, released_, domEvents_, width_, height_) {
+	windowImpl = $pkg.windowImpl = $newType(0, $kindStruct, "webgldriver.windowImpl", true, "golang.org/x/exp/shiny/driver/webgldriver", false, function(screen_, mutex_, canvasEl_, gl_, programRGBA_, imageTexRGBA_, programYUV420_, imageTexY_, imageTexU_, imageTexV_, vertexArray_, released_, domEvents_, frontEvents_, backEvents_, eventWake_, width_, height_) {
 		this.$val = this;
 		if (arguments.length === 0) {
-			this.screen = ptrType.nil;
-			this.mutex = ptrType$1.nil;
+			this.screen = ptrType$1.nil;
+			this.mutex = ptrType$2.nil;
 			this.canvasEl = new js.Value.ptr(null, false, arrayType.zero());
-			this.gl = ptrType$2.nil;
-			this.programRGBA = ptrType$3.nil;
-			this.imageTexRGBA = ptrType$4.nil;
-			this.programYUV420 = ptrType$3.nil;
-			this.imageTexY = ptrType$4.nil;
-			this.imageTexU = ptrType$4.nil;
-			this.imageTexV = ptrType$4.nil;
-			this.vertexArray = ptrType$5.nil;
+			this.gl = ptrType$3.nil;
+			this.programRGBA = ptrType$4.nil;
+			this.imageTexRGBA = ptrType$5.nil;
+			this.programYUV420 = ptrType$4.nil;
+			this.imageTexY = ptrType$5.nil;
+			this.imageTexU = ptrType$5.nil;
+			this.imageTexV = ptrType$5.nil;
+			this.vertexArray = ptrType$6.nil;
 			this.released = false;
-			this.domEvents = ptrType$6.nil;
+			this.domEvents = ptrType$7.nil;
+			this.frontEvents = sliceType$2.nil;
+			this.backEvents = sliceType$2.nil;
+			this.eventWake = $chanNil;
 			this.width = 0;
 			this.height = 0;
 			return;
@@ -191720,6 +192218,9 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 		this.vertexArray = vertexArray_;
 		this.released = released_;
 		this.domEvents = domEvents_;
+		this.frontEvents = frontEvents_;
+		this.backEvents = backEvents_;
+		this.eventWake = eventWake_;
 		this.width = width_;
 		this.height = height_;
 	});
@@ -191768,13 +192269,13 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 	BufferImpl = $pkg.BufferImpl = $newType(0, $kindStruct, "webgldriver.BufferImpl", true, "golang.org/x/exp/shiny/driver/webgldriver", true, function(screen_, size_, mutex_, released_, rgba_, ycbcr_, ycbcrJS_) {
 		this.$val = this;
 		if (arguments.length === 0) {
-			this.screen = ptrType.nil;
+			this.screen = ptrType$1.nil;
 			this.size = new image.Point.ptr(0, 0);
-			this.mutex = ptrType$1.nil;
+			this.mutex = ptrType$2.nil;
 			this.released = false;
 			this.rgba = new image.RGBA.ptr(sliceType$3.nil, 0, new image.Rectangle.ptr(new image.Point.ptr(0, 0), new image.Point.ptr(0, 0)));
 			this.ycbcr = new image.YCbCr.ptr(sliceType$3.nil, sliceType$3.nil, sliceType$3.nil, 0, 0, 0, new image.Rectangle.ptr(new image.Point.ptr(0, 0), new image.Point.ptr(0, 0)));
-			this.ycbcrJS = ptrType$8.nil;
+			this.ycbcrJS = ptrType$9.nil;
 			return;
 		}
 		this.screen = screen_;
@@ -191788,62 +192289,82 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 	sliceType = $sliceType($Float32);
 	sliceType$1 = $sliceType($Uint16);
 	sliceType$2 = $sliceType($emptyInterface);
-	ptrType = $ptrType(screenImpl);
-	ptrType$1 = $ptrType(sync.Mutex);
+	ptrType = $ptrType(screen.NewWindowOptions);
+	ptrType$1 = $ptrType(screenImpl);
+	ptrType$2 = $ptrType(sync.Mutex);
 	funcType = $funcType([], [], false);
 	arrayType = $arrayType(funcType, 0);
-	ptrType$2 = $ptrType(webgl.RenderingContext);
-	ptrType$3 = $ptrType(types.Program);
-	ptrType$4 = $ptrType(types.Texture);
-	ptrType$5 = $ptrType(types.VertexArray);
-	ptrType$6 = $ptrType(dom.DomEvents);
-	ptrType$7 = $ptrType(BufferImpl);
+	ptrType$3 = $ptrType(webgl.RenderingContext);
+	ptrType$4 = $ptrType(types.Program);
+	ptrType$5 = $ptrType(types.Texture);
+	ptrType$6 = $ptrType(types.VertexArray);
+	ptrType$7 = $ptrType(dom.DomEvents);
+	structType = $structType("", []);
+	ptrType$8 = $ptrType(BufferImpl);
 	sliceType$3 = $sliceType($Uint8);
-	ptrType$8 = $ptrType(YCbCrJS);
-	ptrType$9 = $ptrType(screen.DrawOptions);
-	ptrType$10 = $ptrType(windowImpl);
-	ptrType$11 = $ptrType(screen.NewWindowOptions);
+	ptrType$9 = $ptrType(YCbCrJS);
+	ptrType$10 = $ptrType(screen.DrawOptions);
+	ptrType$11 = $ptrType(windowImpl);
+	chanType = $chanType(structType, false, false);
 	ptrType$12 = $ptrType(ArrayBufferSlice);
 	ptrType$13 = $ptrType(image.RGBA);
 	ptrType$14 = $ptrType(image.YCbCr);
 	newWindow = function(screen$1, opts) {
-		var {_r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, canvasEl, domEvents, err, gl, opts, screen$1, w, $s, $r, $c} = $restore(this, {screen$1, opts});
+		var {_arg, _arg$1, _arg$2, _arg$3, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _r$8, _r$9, _tuple, canvasEl, domEvents, err, gl, opts, screen$1, style, w, $s, $r, $c} = $restore(this, {screen$1, opts});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		_r = $clone(screen$1.doc, js.Value).Call("createElement", new sliceType$2([new $String("canvas")])); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		canvasEl = $clone(_r, js.Value);
 		_r$1 = $clone($clone(screen$1.doc, js.Value).Get("body"), js.Value).Call("appendChild", new sliceType$2([new canvasEl.constructor.elem(canvasEl)])); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 		_r$1;
-		_r$2 = webgl.FromCanvas($clone(canvasEl, js.Value)); /* */ $s = 3; case 3: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
-		_tuple = _r$2;
+		/* */ if (!(opts === ptrType.nil) && opts.Width > 0 && opts.Height > 0) { $s = 3; continue; }
+		/* */ $s = 4; continue;
+		/* if (!(opts === ptrType.nil) && opts.Width > 0 && opts.Height > 0) { */ case 3:
+			style = $clone($clone(canvasEl, js.Value).Get("style"), js.Value);
+			$clone(style, js.Value).Set("position", new $String("absolute"));
+			_r$2 = fmt.Sprintf("%dpx", new sliceType$2([new $Int(opts.X)])); /* */ $s = 5; case 5: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			_arg = new $String(_r$2);
+			$r = $clone(style, js.Value).Set("left", _arg); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$3 = fmt.Sprintf("%dpx", new sliceType$2([new $Int(opts.Y)])); /* */ $s = 7; case 7: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+			_arg$1 = new $String(_r$3);
+			$r = $clone(style, js.Value).Set("top", _arg$1); /* */ $s = 8; case 8: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$4 = fmt.Sprintf("%dpx", new sliceType$2([new $Int(opts.Width)])); /* */ $s = 9; case 9: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+			_arg$2 = new $String(_r$4);
+			$r = $clone(style, js.Value).Set("width", _arg$2); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$5 = fmt.Sprintf("%dpx", new sliceType$2([new $Int(opts.Height)])); /* */ $s = 11; case 11: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
+			_arg$3 = new $String(_r$5);
+			$r = $clone(style, js.Value).Set("height", _arg$3); /* */ $s = 12; case 12: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* } */ case 4:
+		_r$6 = webgl.FromCanvas($clone(canvasEl, js.Value)); /* */ $s = 13; case 13: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
+		_tuple = _r$6;
 		gl = _tuple[0];
 		err = _tuple[1];
 		if (!($interfaceIsEqual(err, $ifaceNil))) {
 			$panic(err);
 		}
-		domEvents = dom.NewDomEvents();
-		w = new windowImpl.ptr(screen$1, ptrType$1.nil, $clone(canvasEl, js.Value), gl, ptrType$3.nil, ptrType$4.nil, ptrType$3.nil, ptrType$4.nil, ptrType$4.nil, ptrType$4.nil, ptrType$5.nil, false, domEvents, 0, 0);
-		/* */ if (!((opts.Width === 0))) { $s = 4; continue; }
-		/* */ $s = 5; continue;
-		/* if (!((opts.Width === 0))) { */ case 4:
-			$r = dom.SetWindowWidth(opts.Width); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		/* } */ case 5:
-		/* */ if (!((opts.Height === 0))) { $s = 7; continue; }
-		/* */ $s = 8; continue;
-		/* if (!((opts.Height === 0))) { */ case 7:
-			$r = dom.SetWindowHeight(opts.Height); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		/* } */ case 8:
-		/* */ if (!(opts.Title === "")) { $s = 10; continue; }
-		/* */ $s = 11; continue;
-		/* if (!(opts.Title === "")) { */ case 10:
-			_r$3 = $clone($clone(screen$1.doc, js.Value).Get("head"), js.Value).Call("getElementsByTagName", new sliceType$2([new $String("title")])); /* */ $s = 12; case 12: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
-			_r$4 = $clone(_r$3, js.Value).Call("item", new sliceType$2([new $Int(0)])); /* */ $s = 13; case 13: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
-			$r = $clone(_r$4, js.Value).Set("innerHTML", new $String(opts.Title)); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		/* } */ case 11:
-		_r$5 = w.createBuffers(); /* */ $s = 15; case 15: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
-		w.vertexArray = _r$5;
-		$r = domEvents.BindEvents(); /* */ $s = 16; case 16: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		domEvents = dom.NewDomEventsForTarget($clone(canvasEl, js.Value));
+		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, sliceType$2.nil, sliceType$2.nil, new $Chan(structType, 1), 0, 0);
+		/* */ if (!((opts.Width === 0))) { $s = 14; continue; }
+		/* */ $s = 15; continue;
+		/* if (!((opts.Width === 0))) { */ case 14:
+			$r = dom.SetWindowWidth(opts.Width); /* */ $s = 16; case 16: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* } */ case 15:
+		/* */ if (!((opts.Height === 0))) { $s = 17; continue; }
+		/* */ $s = 18; continue;
+		/* if (!((opts.Height === 0))) { */ case 17:
+			$r = dom.SetWindowHeight(opts.Height); /* */ $s = 19; case 19: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* } */ case 18:
+		/* */ if (!(opts.Title === "")) { $s = 20; continue; }
+		/* */ $s = 21; continue;
+		/* if (!(opts.Title === "")) { */ case 20:
+			_r$7 = $clone($clone(screen$1.doc, js.Value).Get("head"), js.Value).Call("getElementsByTagName", new sliceType$2([new $String("title")])); /* */ $s = 22; case 22: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
+			_r$8 = $clone(_r$7, js.Value).Call("item", new sliceType$2([new $Int(0)])); /* */ $s = 23; case 23: if($c) { $c = false; _r$8 = _r$8.$blk(); } if (_r$8 && _r$8.$blk !== undefined) { break s; }
+			$r = $clone(_r$8, js.Value).Set("innerHTML", new $String(opts.Title)); /* */ $s = 24; case 24: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* } */ case 21:
+		_r$9 = w.createBuffers(); /* */ $s = 25; case 25: if($c) { $c = false; _r$9 = _r$9.$blk(); } if (_r$9 && _r$9.$blk !== undefined) { break s; }
+		w.vertexArray = _r$9;
+		$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, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, canvasEl, domEvents, err, gl, opts, screen$1, w, $s};return $f;
+		/* */ } return; } var $f = {$blk: newWindow, $c: true, $r, _arg, _arg$1, _arg$2, _arg$3, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _r$8, _r$9, _tuple, canvasEl, domEvents, err, gl, opts, screen$1, style, w, $s};return $f;
 	};
 	windowImpl.ptr.prototype.ensureCanvasSize = function(width, height) {
 		var height, w, width;
@@ -191895,33 +192416,126 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 	};
 	windowImpl.prototype.Publish = function() { return this.$val.Publish(); };
 	windowImpl.ptr.prototype.Send = function(event) {
-		var event, w;
+		var {event, eventChan, w, $s, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		w = this;
-		if (w.released) {
-			return;
-		}
-		$panic(new $String("Not implemented"));
+		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* */ if (w.released) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.released) { */ case 2:
+			$r = w.mutex.Unlock(); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$s = -1; return;
+		/* } */ case 3:
+		eventChan = w.domEvents.GetEventChan();
+		$r = w.mutex.Unlock(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = $send(eventChan, event); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$s = -1; return;
+		/* */ } return; } var $f = {$blk: windowImpl.ptr.prototype.Send, $c: true, $r, event, eventChan, w, $s};return $f;
 	};
 	windowImpl.prototype.Send = function(event) { return this.$val.Send(event); };
+	windowImpl.ptr.prototype.SendNonBlocking = function(event) {
+		var {$24r, $24r$1, $24r$2, _selection, event, w, $s, $deferred, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
+		w = this;
+		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$deferred.push([$methodVal(w.mutex, "Unlock"), []]);
+		/* */ if (w.released) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.released) { */ case 2:
+			$24r = false;
+			$s = 4; case 4: return $24r;
+		/* } */ case 3:
+		_selection = $select([[w.domEvents.GetEventChan(), event], []]);
+		/* */ if (_selection[0] === 0) { $s = 5; continue; }
+		/* */ if (_selection[0] === 1) { $s = 6; continue; }
+		/* */ $s = 7; continue;
+		/* if (_selection[0] === 0) { */ case 5:
+			$24r$1 = true;
+			$s = 8; case 8: return $24r$1;
+		/* } else if (_selection[0] === 1) { */ case 6:
+			$24r$2 = false;
+			$s = 9; case 9: return $24r$2;
+		/* } */ case 7:
+		$s = -1; return false;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; return false; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.SendNonBlocking, $c: true, $r, $24r, $24r$1, $24r$2, _selection, event, w, $s, $deferred};return $f; } }
+	};
+	windowImpl.prototype.SendNonBlocking = function(event) { return this.$val.SendNonBlocking(event); };
 	windowImpl.ptr.prototype.SendFirst = function(event) {
-		var event, w;
+		var {_selection, event, w, $s, $deferred, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
 		w = this;
-		if (w.released) {
-			return;
+		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$deferred.push([$methodVal(w.mutex, "Unlock"), []]);
+		/* */ if (w.released) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.released) { */ case 2:
+			$s = 4; case 4: return;
+		/* } */ case 3:
+		w.frontEvents = $append(w.frontEvents, event);
+		_selection = $select([[w.eventWake, $clone(new structType.ptr(), structType)], []]);
+		if (_selection[0] === 0) {
+		} else if (_selection[0] === 1) {
 		}
-		$panic(new $String("Not implemented"));
+		$s = -1; return;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.SendFirst, $c: true, $r, _selection, event, w, $s, $deferred};return $f; } }
 	};
 	windowImpl.prototype.SendFirst = function(event) { return this.$val.SendFirst(event); };
 	windowImpl.ptr.prototype.NextEvent = function() {
-		var {_r, ev, w, $s, $r, $c} = $restore(this, {});
+		var {_r, _selection, _tuple, event, event$1, ok, w, x, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		w = this;
-		_r = $recv(w.domEvents.GetEventChan()); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
-		ev = _r[0];
-		$s = -1; return ev;
-		/* */ } return; } var $f = {$blk: windowImpl.ptr.prototype.NextEvent, $c: true, $r, _r, ev, w, $s};return $f;
+		/* while (true) { */ case 1:
+			$r = w.mutex.Lock(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_tuple = w.nextQueuedEvent();
+			event = _tuple[0];
+			ok = _tuple[1];
+			/* */ if (ok) { $s = 4; continue; }
+			/* */ $s = 5; continue;
+			/* if (ok) { */ case 4:
+				$r = w.mutex.Unlock(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+				$s = -1; return event;
+			/* } */ case 5:
+			$r = w.mutex.Unlock(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r = $select([[w.domEvents.GetEventChan()], [w.eventWake]]); /* */ $s = 8; case 8: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+			_selection = _r;
+			/* */ if (_selection[0] === 0) { $s = 9; continue; }
+			/* */ if (_selection[0] === 1) { $s = 10; continue; }
+			/* */ $s = 11; continue;
+			/* if (_selection[0] === 0) { */ case 9:
+				event$1 = _selection[1][0];
+				$r = w.mutex.Lock(); /* */ $s = 12; case 12: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+				w.backEvents = $append(w.backEvents, $ifaceNil);
+				$copySlice($subslice(w.backEvents, 1), $subslice(w.backEvents, 0, (w.backEvents.$length - 1 >> 0)));
+				(x = w.backEvents, (0 >= x.$length ? ($throwRuntimeError("index out of range"), undefined) : x.$array[x.$offset + 0] = event$1));
+				$r = w.mutex.Unlock(); /* */ $s = 13; case 13: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+				$s = 11; continue;
+			/* } else if (_selection[0] === 1) { */ case 10:
+			/* } */ case 11:
+		$s = 1; continue;
+		case 2:
+		$s = -1; return $ifaceNil;
+		/* */ } return; } var $f = {$blk: windowImpl.ptr.prototype.NextEvent, $c: true, $r, _r, _selection, _tuple, event, event$1, ok, w, x, $s};return $f;
 	};
 	windowImpl.prototype.NextEvent = function() { return this.$val.NextEvent(); };
+	windowImpl.ptr.prototype.nextQueuedEvent = function() {
+		var event, event$1, last, w, x, x$1, x$2, x$3;
+		w = this;
+		last = w.frontEvents.$length - 1 >> 0;
+		if (last >= 0) {
+			event = (x = w.frontEvents, ((last < 0 || last >= x.$length) ? ($throwRuntimeError("index out of range"), undefined) : x.$array[x.$offset + last]));
+			(x$1 = w.frontEvents, ((last < 0 || last >= x$1.$length) ? ($throwRuntimeError("index out of range"), undefined) : x$1.$array[x$1.$offset + last] = $ifaceNil));
+			w.frontEvents = $subslice(w.frontEvents, 0, last);
+			return [event, true];
+		}
+		if (w.backEvents.$length > 0) {
+			event$1 = (x$2 = w.backEvents, (0 >= x$2.$length ? ($throwRuntimeError("index out of range"), undefined) : x$2.$array[x$2.$offset + 0]));
+			(x$3 = w.backEvents, (0 >= x$3.$length ? ($throwRuntimeError("index out of range"), undefined) : x$3.$array[x$3.$offset + 0] = $ifaceNil));
+			w.backEvents = $subslice(w.backEvents, 1);
+			return [event$1, true];
+		}
+		return [$ifaceNil, false];
+	};
+	windowImpl.prototype.nextQueuedEvent = function() { return this.$val.nextQueuedEvent(); };
 	windowImpl.ptr.prototype.Upload = function(dp, src, sr) {
 		var {dp, sr, src, w, $s, $r, $c} = $restore(this, {dp, src, sr});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -191942,9 +192556,9 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 			$s = -1; return;
 		}
 		_ref = src;
-		/* */ if ($assertType(_ref, ptrType$7, true)[1]) { $s = 1; continue; }
+		/* */ if ($assertType(_ref, ptrType$8, true)[1]) { $s = 1; continue; }
 		/* */ $s = 2; continue;
-		/* if ($assertType(_ref, ptrType$7, true)[1]) { */ case 1:
+		/* if ($assertType(_ref, ptrType$8, true)[1]) { */ case 1:
 			jsSrc = _ref.$val;
 			_r = jsSrc.YCbCrJS(); /* */ $s = 5; case 5: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 			/* */ if (_r.Use) { $s = 3; continue; }
@@ -192113,9 +192727,9 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 		var {_q, _q$1, _q$2, _q$3, _r, _r$1, _r$2, _r$3, _tuple, err, height, w, width, $s, $r, $c} = $restore(this, {width, height});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		w = this;
-		/* */ if (w.programYUV420 === ptrType$3.nil) { $s = 1; continue; }
+		/* */ if (w.programYUV420 === ptrType$4.nil) { $s = 1; continue; }
 		/* */ $s = 2; continue;
-		/* if (w.programYUV420 === ptrType$3.nil) { */ case 1:
+		/* if (w.programYUV420 === ptrType$4.nil) { */ case 1:
 			err = $ifaceNil;
 			_r = w.createAndLinkProgramYUV420(); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 			_tuple = _r;
@@ -192153,12 +192767,12 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 		_r$1 = w.createAndAttachVertexShader(shaderProgram); /* */ $s = 2; case 2: 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 = -1; return [ptrType$3.nil, err];
+			$s = -1; return [ptrType$4.nil, err];
 		}
 		_r$2 = w.createAndAttachFragmentShader(shaderProgram, "\nprecision mediump float;\nvarying vec2 v_texCoord;\nuniform sampler2D u_imageY;\nuniform sampler2D u_imageU;\nuniform sampler2D u_imageV;\n\nvoid main(void) {\n\tfloat yChannel = texture2D(u_imageY, v_texCoord).x;\n\tfloat uChannel = texture2D(u_imageU, v_texCoord).x;\n\tfloat vChannel = texture2D(u_imageV, v_texCoord).x;\n\n\t// This does the colorspace conversion from Y'UV to RGB as a matrix\n\t// multiply.  It also does the offset of the U and V channels from\n\t// [0,1] to [-.5,.5] as part of the transform.\n\tvec4 channels = vec4(yChannel, uChannel, vChannel, 1.0);\n\n\tmat4 conversion = mat4(1.0,  0.0,    1.402, -0.701,\n\t\t\t\t\t\t\t1.0, -0.344, -0.714,  0.529,\n\t\t\t\t\t\t\t1.0,  1.772,  0.0,   -0.886,\n\t\t\t\t\t\t\t0, 0, 0, 0);\n\tvec3 rgb = (channels * conversion).xyz;\n\n\t// This is another Y'UV transform that can be used, but it doesn't\n\t// accurately transform my source image.  Your images may well fare\n\t// better with it, however, considering they come from a different\n\t// source, and because I'm not sure that my original was converted\n\t// to Y'UV420p with the same RGB->YUV (or YCrCb) conversion as\n\t// yours.\n\t//\n\t// vec4 channels = vec4(yChannel, uChannel, vChannel, 1.0);\n\t// float3x4 conversion = float3x4(1.0,  0.0,      1.13983, -0.569915,\n\t//                                1.0, -0.39465, -0.58060,  0.487625,\n\t//                                1.0,  2.03211,  0.0,     -1.016055);\n\t// float3 rgb = mul(conversion, channels);\n\tgl_FragColor = vec4(rgb, 1.0);\n}\n"); /* */ $s = 3; case 3: 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 = -1; return [ptrType$3.nil, err];
+			$s = -1; return [ptrType$4.nil, err];
 		}
 		$r = w.gl.LinkProgram(shaderProgram); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		_r$3 = w.gl.GetProgramParameterLinkStatus(shaderProgram); /* */ $s = 7; case 7: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
@@ -192168,7 +192782,7 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 			_r$4 = w.gl.GetProgramInfoLog(shaderProgram); /* */ $s = 8; case 8: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
 			_arg = new $String(_r$4);
 			_r$5 = fmt.Errorf("Program: %s", new sliceType$2([_arg])); /* */ $s = 9; case 9: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
-			$24r = [ptrType$3.nil, _r$5];
+			$24r = [ptrType$4.nil, _r$5];
 			$s = 10; case 10: return $24r;
 		/* } */ case 6:
 		$r = w.gl.UseProgram(shaderProgram); /* */ $s = 11; case 11: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
@@ -192227,9 +192841,9 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 		var {_r, _r$1, _tuple, err, height, w, width, $s, $r, $c} = $restore(this, {width, height});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		w = this;
-		/* */ if (w.programRGBA === ptrType$3.nil) { $s = 1; continue; }
+		/* */ if (w.programRGBA === ptrType$4.nil) { $s = 1; continue; }
 		/* */ $s = 2; continue;
-		/* if (w.programRGBA === ptrType$3.nil) { */ case 1:
+		/* if (w.programRGBA === ptrType$4.nil) { */ case 1:
 			err = $ifaceNil;
 			_r = w.createAndLinkProgramRGBA(); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 			_tuple = _r;
@@ -192263,12 +192877,12 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 		_r$1 = w.createAndAttachVertexShader(shaderProgram); /* */ $s = 2; case 2: 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 = -1; return [ptrType$3.nil, err];
+			$s = -1; return [ptrType$4.nil, err];
 		}
 		_r$2 = w.createAndAttachFragmentShader(shaderProgram, "\nprecision mediump float;\nvarying vec2 v_texCoord;\nuniform sampler2D u_image;\n\nvoid main(void) {\n\tgl_FragColor = texture2D(u_image, v_texCoord);\n}\n"); /* */ $s = 3; case 3: 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 = -1; return [ptrType$3.nil, err];
+			$s = -1; return [ptrType$4.nil, err];
 		}
 		$r = w.gl.LinkProgram(shaderProgram); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		_r$3 = w.gl.GetProgramParameterLinkStatus(shaderProgram); /* */ $s = 7; case 7: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
@@ -192278,7 +192892,7 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 			_r$4 = w.gl.GetProgramInfoLog(shaderProgram); /* */ $s = 8; case 8: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
 			_arg = new $String(_r$4);
 			_r$5 = fmt.Errorf("Program: %s", new sliceType$2([_arg])); /* */ $s = 9; case 9: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
-			$24r = [ptrType$3.nil, _r$5];
+			$24r = [ptrType$4.nil, _r$5];
 			$s = 10; case 10: return $24r;
 		/* } */ case 6:
 		$r = w.gl.UseProgram(shaderProgram); /* */ $s = 11; case 11: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
@@ -192389,7 +193003,7 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 	newBuffer = function(screen$1, size) {
 		var _q, _q$1, _q$2, b, rect, screen$1, size;
 		rect = new image.Rectangle.ptr(new image.Point.ptr(0, 0), $clone(size, image.Point));
-		b = new BufferImpl.ptr(screen$1, $clone(size, image.Point), new sync.Mutex.ptr(0, 0), false, $clone(new image.RGBA.ptr($makeSlice(sliceType$3, ($imul(($imul(4, size.X)), size.Y))), $imul(4, size.X), $clone(rect, image.Rectangle)), image.RGBA), $clone(new image.YCbCr.ptr($makeSlice(sliceType$3, ($imul(size.X, size.Y))), $makeSlice(sliceType$3, (_q$1 = ($imul(size.X, size.Y)) / 4, (_q$1 === _q$1 && _q$1 !== 1/0 && _q$1 !== -1/0) ? _q$1 >> 0 : $throwRuntimeError("integer divide by zero"))), $makeSlice(sliceType$3, (_q$2 = ($imul(size.X, size.Y)) / 4, (_q$2 === _q$2 && _q$2 !== 1/0 && _q$2 !== -1/0) ? _q$2 >> 0 : $throwRuntimeError("integer divide by zero"))), size.X, (_q = size.X / 2, (_q === _q && _q !== 1/0 && _q !== -1/0) ? _q >> 0 : $throwRuntimeError("integer divide by zero")), 2, $clone(rect, image.Rectangle)), image.YCbCr), ptrType$8.nil);
+		b = new BufferImpl.ptr(screen$1, $clone(size, image.Point), new sync.Mutex.ptr(0, 0), false, $clone(new image.RGBA.ptr($makeSlice(sliceType$3, ($imul(($imul(4, size.X)), size.Y))), $imul(4, size.X), $clone(rect, image.Rectangle)), image.RGBA), $clone(new image.YCbCr.ptr($makeSlice(sliceType$3, ($imul(size.X, size.Y))), $makeSlice(sliceType$3, (_q$1 = ($imul(size.X, size.Y)) / 4, (_q$1 === _q$1 && _q$1 !== 1/0 && _q$1 !== -1/0) ? _q$1 >> 0 : $throwRuntimeError("integer divide by zero"))), $makeSlice(sliceType$3, (_q$2 = ($imul(size.X, size.Y)) / 4, (_q$2 === _q$2 && _q$2 !== 1/0 && _q$2 !== -1/0) ? _q$2 >> 0 : $throwRuntimeError("integer divide by zero"))), size.X, (_q = size.X / 2, (_q === _q && _q !== 1/0 && _q !== -1/0) ? _q >> 0 : $throwRuntimeError("integer divide by zero")), 2, $clone(rect, image.Rectangle)), image.YCbCr), ptrType$9.nil);
 		return b;
 	};
 	BufferImpl.ptr.prototype.Size = function() {
@@ -192420,9 +193034,9 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 		var {_r, b, emptyBuffer, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		b = this;
-		/* */ if (b.ycbcrJS === ptrType$8.nil) { $s = 1; continue; }
+		/* */ if (b.ycbcrJS === ptrType$9.nil) { $s = 1; continue; }
 		/* */ $s = 2; continue;
-		/* if (b.ycbcrJS === ptrType$8.nil) { */ case 1:
+		/* if (b.ycbcrJS === ptrType$9.nil) { */ case 1:
 			_r = $clone($clone(js.Global(), js.Value).Get("ArrayBuffer"), js.Value).New(sliceType$2.nil); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 			emptyBuffer = $clone(_r, js.Value);
 			b.ycbcrJS = new YCbCrJS.ptr($clone(new ArrayBufferSlice.ptr($clone(emptyBuffer, js.Value), 0, 0), ArrayBufferSlice), $clone(new ArrayBufferSlice.ptr($clone(emptyBuffer, js.Value), 0, 0), ArrayBufferSlice), $clone(new ArrayBufferSlice.ptr($clone(emptyBuffer, js.Value), 0, 0), ArrayBufferSlice), b.ycbcr.YStride, b.ycbcr.CStride, 2, $clone(b.ycbcr.Rect, image.Rectangle), false);
@@ -192447,15 +193061,15 @@ $packages["golang.org/x/exp/shiny/driver/webgldriver"] = (function() {
 		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: BufferImpl.ptr.prototype.Release, $c: true, $r, b, $s, $deferred};return $f; } }
 	};
 	BufferImpl.prototype.Release = function() { return this.$val.Release(); };
-	ptrType$10.methods = [{prop: "ensureCanvasSize", name: "ensureCanvasSize", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([$Int, $Int], [], false)}, {prop: "clear", name: "clear", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([], [], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "Publish", name: "Publish", pkg: "", typ: $funcType([], [screen.PublishResult], false)}, {prop: "Send", name: "Send", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "SendFirst", name: "SendFirst", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "NextEvent", name: "NextEvent", pkg: "", typ: $funcType([], [$emptyInterface], false)}, {prop: "Upload", name: "Upload", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "UploadYCbCr", name: "UploadYCbCr", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "Fill", name: "Fill", pkg: "", typ: $funcType([image.Rectangle, color.Color, draw.Op], [], false)}, {prop: "Draw", name: "Draw", pkg: "", typ: $funcType([f64.Aff3, screen.Texture, image.Rectangle, draw.Op, ptrType$9], [], false)}, {prop: "DrawUniform", name: "DrawUniform", pkg: "", typ: $funcType([f64.Aff3, color.Color, image.Rectangle, draw.Op, ptrType$9], [], false)}, {prop: "Copy", name: "Copy", pkg: "", typ: $funcType([image.Point, screen.Texture, image.Rectangle, draw.Op, ptrType$9], [], false)}, {prop: "Scale", name: "Scale", pkg: "", typ: $funcType([image.Rectangle, screen.Texture, image.Rectangle, draw.Op, ptrType$9], [], false)}, {prop: "createAndAttachVertexShader", name: "createAndAttachVertexShader", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([ptrType$3], [$error], false)}, {prop: "ensureYUV420Textures", name: "ensureYUV420Textures", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([$Int, $Int], [], false)}, {prop: "createAndLinkProgramYUV420", name: "createAndLinkProgramYUV420", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([], [ptrType$3, $error], false)}, {prop: "drawBufferYUV420", name: "drawBufferYUV420", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "drawBufferYUV420JSArrayBuffers", name: "drawBufferYUV420JSArrayBuffers", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([image.Point, js.Value, js.Value, js.Value, image.Rectangle], [], false)}, {prop: "ensureRGBATextures", name: "ensureRGBATextures", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([$Int, $Int], [], false)}, {prop: "createAndLinkProgramRGBA", name: "createAndLinkProgramRGBA", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([], [ptrType$3, $error], false)}, {prop: "drawBufferRGBA", name: "drawBufferRGBA", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "createBuffers", name: "createBuffers", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([], [ptrType$5], false)}, {prop: "createAndAttachFragmentShader", name: "createAndAttachFragmentShader", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([ptrType$3, $String], [$error], false)}, {prop: "createTexture", name: "createTexture", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([types.GLEnum, types.GLEnum, $Int, $Int], [ptrType$4], false)}];
-	ptrType.methods = [{prop: "NewBuffer", name: "NewBuffer", pkg: "", typ: $funcType([image.Point], [screen.Buffer, $error], false)}, {prop: "NewTexture", name: "NewTexture", pkg: "", typ: $funcType([image.Point], [screen.Texture, $error], false)}, {prop: "NewWindow", name: "NewWindow", pkg: "", typ: $funcType([ptrType$11], [screen.Window, $error], false)}];
+	ptrType$11.methods = [{prop: "ensureCanvasSize", name: "ensureCanvasSize", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([$Int, $Int], [], false)}, {prop: "clear", name: "clear", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([], [], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "Publish", name: "Publish", pkg: "", typ: $funcType([], [screen.PublishResult], false)}, {prop: "Send", name: "Send", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "SendNonBlocking", name: "SendNonBlocking", pkg: "", typ: $funcType([$emptyInterface], [$Bool], false)}, {prop: "SendFirst", name: "SendFirst", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "NextEvent", name: "NextEvent", pkg: "", typ: $funcType([], [$emptyInterface], false)}, {prop: "nextQueuedEvent", name: "nextQueuedEvent", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([], [$emptyInterface, $Bool], false)}, {prop: "Upload", name: "Upload", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "UploadYCbCr", name: "UploadYCbCr", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "Fill", name: "Fill", pkg: "", typ: $funcType([image.Rectangle, color.Color, draw.Op], [], false)}, {prop: "Draw", name: "Draw", pkg: "", typ: $funcType([f64.Aff3, screen.Texture, image.Rectangle, draw.Op, ptrType$10], [], false)}, {prop: "DrawUniform", name: "DrawUniform", pkg: "", typ: $funcType([f64.Aff3, color.Color, image.Rectangle, draw.Op, ptrType$10], [], false)}, {prop: "Copy", name: "Copy", pkg: "", typ: $funcType([image.Point, screen.Texture, image.Rectangle, draw.Op, ptrType$10], [], false)}, {prop: "Scale", name: "Scale", pkg: "", typ: $funcType([image.Rectangle, screen.Texture, image.Rectangle, draw.Op, ptrType$10], [], false)}, {prop: "createAndAttachVertexShader", name: "createAndAttachVertexShader", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([ptrType$4], [$error], false)}, {prop: "ensureYUV420Textures", name: "ensureYUV420Textures", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([$Int, $Int], [], false)}, {prop: "createAndLinkProgramYUV420", name: "createAndLinkProgramYUV420", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([], [ptrType$4, $error], false)}, {prop: "drawBufferYUV420", name: "drawBufferYUV420", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "drawBufferYUV420JSArrayBuffers", name: "drawBufferYUV420JSArrayBuffers", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([image.Point, js.Value, js.Value, js.Value, image.Rectangle], [], false)}, {prop: "ensureRGBATextures", name: "ensureRGBATextures", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([$Int, $Int], [], false)}, {prop: "createAndLinkProgramRGBA", name: "createAndLinkProgramRGBA", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([], [ptrType$4, $error], false)}, {prop: "drawBufferRGBA", name: "drawBufferRGBA", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "createBuffers", name: "createBuffers", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([], [ptrType$6], false)}, {prop: "createAndAttachFragmentShader", name: "createAndAttachFragmentShader", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([ptrType$4, $String], [$error], false)}, {prop: "createTexture", name: "createTexture", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([types.GLEnum, types.GLEnum, $Int, $Int], [ptrType$5], false)}];
+	ptrType$1.methods = [{prop: "NewBuffer", name: "NewBuffer", pkg: "", typ: $funcType([image.Point], [screen.Buffer, $error], false)}, {prop: "NewTexture", name: "NewTexture", pkg: "", typ: $funcType([image.Point], [screen.Texture, $error], false)}, {prop: "NewWindow", name: "NewWindow", pkg: "", typ: $funcType([ptrType], [screen.Window, $error], false)}];
 	ptrType$12.methods = [{prop: "slice", name: "slice", pkg: "golang.org/x/exp/shiny/driver/webgldriver", typ: $funcType([], [js.Value], false)}];
-	ptrType$7.methods = [{prop: "Size", name: "Size", pkg: "", typ: $funcType([], [image.Point], false)}, {prop: "Bounds", name: "Bounds", pkg: "", typ: $funcType([], [image.Rectangle], false)}, {prop: "RGBA", name: "RGBA", pkg: "", typ: $funcType([], [ptrType$13], false)}, {prop: "YCbCr", name: "YCbCr", pkg: "", typ: $funcType([], [ptrType$14], false)}, {prop: "YCbCrJS", name: "YCbCrJS", pkg: "", typ: $funcType([], [ptrType$8], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}];
-	windowImpl.init("golang.org/x/exp/shiny/driver/webgldriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "canvasEl", name: "canvasEl", embedded: false, exported: false, typ: js.Value, tag: ""}, {prop: "gl", name: "gl", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "programRGBA", name: "programRGBA", embedded: false, exported: false, typ: ptrType$3, tag: ""}, {prop: "imageTexRGBA", name: "imageTexRGBA", embedded: false, exported: false, typ: ptrType$4, tag: ""}, {prop: "programYUV420", name: "programYUV420", embedded: false, exported: false, typ: ptrType$3, tag: ""}, {prop: "imageTexY", name: "imageTexY", embedded: false, exported: false, typ: ptrType$4, tag: ""}, {prop: "imageTexU", name: "imageTexU", embedded: false, exported: false, typ: ptrType$4, tag: ""}, {prop: "imageTexV", name: "imageTexV", embedded: false, exported: false, typ: ptrType$4, tag: ""}, {prop: "vertexArray", name: "vertexArray", embedded: false, exported: false, typ: ptrType$5, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "domEvents", name: "domEvents", embedded: false, exported: false, typ: ptrType$6, tag: ""}, {prop: "width", name: "width", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "height", name: "height", embedded: false, exported: false, typ: $Int, tag: ""}]);
+	ptrType$8.methods = [{prop: "Size", name: "Size", pkg: "", typ: $funcType([], [image.Point], false)}, {prop: "Bounds", name: "Bounds", pkg: "", typ: $funcType([], [image.Rectangle], false)}, {prop: "RGBA", name: "RGBA", pkg: "", typ: $funcType([], [ptrType$13], false)}, {prop: "YCbCr", name: "YCbCr", pkg: "", typ: $funcType([], [ptrType$14], false)}, {prop: "YCbCrJS", name: "YCbCrJS", pkg: "", typ: $funcType([], [ptrType$9], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}];
+	windowImpl.init("golang.org/x/exp/shiny/driver/webgldriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "canvasEl", name: "canvasEl", embedded: false, exported: false, typ: js.Value, tag: ""}, {prop: "gl", name: "gl", embedded: false, exported: false, typ: ptrType$3, tag: ""}, {prop: "programRGBA", name: "programRGBA", embedded: false, exported: false, typ: ptrType$4, tag: ""}, {prop: "imageTexRGBA", name: "imageTexRGBA", embedded: false, exported: false, typ: ptrType$5, tag: ""}, {prop: "programYUV420", name: "programYUV420", embedded: false, exported: false, typ: ptrType$4, tag: ""}, {prop: "imageTexY", name: "imageTexY", embedded: false, exported: false, typ: ptrType$5, tag: ""}, {prop: "imageTexU", name: "imageTexU", embedded: false, exported: false, typ: ptrType$5, tag: ""}, {prop: "imageTexV", name: "imageTexV", embedded: false, exported: false, typ: ptrType$5, tag: ""}, {prop: "vertexArray", name: "vertexArray", embedded: false, exported: false, typ: ptrType$6, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "domEvents", name: "domEvents", embedded: false, exported: false, typ: ptrType$7, tag: ""}, {prop: "frontEvents", name: "frontEvents", embedded: false, exported: false, typ: sliceType$2, tag: ""}, {prop: "backEvents", name: "backEvents", embedded: false, exported: false, typ: sliceType$2, tag: ""}, {prop: "eventWake", name: "eventWake", embedded: false, exported: false, typ: chanType, tag: ""}, {prop: "width", name: "width", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "height", name: "height", embedded: false, exported: false, typ: $Int, tag: ""}]);
 	screenImpl.init("golang.org/x/exp/shiny/driver/webgldriver", [{prop: "doc", name: "doc", embedded: false, exported: false, typ: js.Value, tag: ""}]);
 	ArrayBufferSlice.init("", [{prop: "ArrayBuffer", name: "ArrayBuffer", embedded: false, exported: true, typ: js.Value, tag: ""}, {prop: "Offset", name: "Offset", embedded: false, exported: true, typ: $Int, tag: ""}, {prop: "Length", name: "Length", embedded: false, exported: true, typ: $Int, tag: ""}]);
 	YCbCrJS.init("", [{prop: "Y", name: "Y", embedded: false, exported: true, typ: ArrayBufferSlice, tag: ""}, {prop: "Cb", name: "Cb", embedded: false, exported: true, typ: ArrayBufferSlice, tag: ""}, {prop: "Cr", name: "Cr", embedded: false, exported: true, typ: ArrayBufferSlice, tag: ""}, {prop: "YStride", name: "YStride", embedded: false, exported: true, typ: $Int, tag: ""}, {prop: "CStride", name: "CStride", embedded: false, exported: true, typ: $Int, tag: ""}, {prop: "SubsampleRatio", name: "SubsampleRatio", embedded: false, exported: true, typ: image.YCbCrSubsampleRatio, tag: ""}, {prop: "Rect", name: "Rect", embedded: false, exported: true, typ: image.Rectangle, tag: ""}, {prop: "Use", name: "Use", embedded: false, exported: true, typ: $Bool, tag: ""}]);
-	BufferImpl.init("golang.org/x/exp/shiny/driver/webgldriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "size", name: "size", embedded: false, exported: false, typ: image.Point, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "rgba", name: "rgba", embedded: false, exported: false, typ: image.RGBA, tag: ""}, {prop: "ycbcr", name: "ycbcr", embedded: false, exported: false, typ: image.YCbCr, tag: ""}, {prop: "ycbcrJS", name: "ycbcrJS", embedded: false, exported: false, typ: ptrType$8, tag: ""}]);
+	BufferImpl.init("golang.org/x/exp/shiny/driver/webgldriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "size", name: "size", embedded: false, exported: false, typ: image.Point, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "rgba", name: "rgba", embedded: false, exported: false, typ: image.RGBA, tag: ""}, {prop: "ycbcr", name: "ycbcr", embedded: false, exported: false, typ: image.YCbCr, tag: ""}, {prop: "ycbcrJS", name: "ycbcrJS", embedded: false, exported: false, typ: ptrType$9, 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:
@@ -192522,7 +193136,7 @@ $packages["github.com/supraio/client-daemon/pkg/videostream"] = (function() {
 	return $pkg;
 })();
 $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function() {
-	var $pkg = {}, $init, fmt, general, errs, jshelper, frame, videostream, js, SOSVideoStreamer, funcType, arrayType, sliceType, ptrType, ptrType$1, init;
+	var $pkg = {}, $init, fmt, general, errs, jshelper, frame, videostream, js, SOSVideoStreamer, streamGeometry, funcType, arrayType, sliceType, ptrType, ptrType$1, init, getStreamGeometry;
 	fmt = $packages["fmt"];
 	general = $packages["github.com/supraio/client-daemon/pkg/decoder/general"];
 	errs = $packages["github.com/supraio/client-daemon/pkg/errs"];
@@ -192540,6 +193154,20 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 		this.sos = sos_;
 		this.started = started_;
 	});
+	streamGeometry = $pkg.streamGeometry = $newType(0, $kindStruct, "sosstream.streamGeometry", true, "github.com/supraio/client-daemon/pkg/decoder/sosstream", false, function(x_, y_, width_, height_) {
+		this.$val = this;
+		if (arguments.length === 0) {
+			this.x = 0;
+			this.y = 0;
+			this.width = 0;
+			this.height = 0;
+			return;
+		}
+		this.x = x_;
+		this.y = y_;
+		this.width = width_;
+		this.height = height_;
+	});
 	funcType = $funcType([], [], false);
 	arrayType = $arrayType(funcType, 0);
 	sliceType = $sliceType($emptyInterface);
@@ -192557,7 +193185,7 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 	};
 	SOSVideoStreamer.prototype.IsAvailable = function() { return this.$val.IsAvailable(); };
 	SOSVideoStreamer.ptr.prototype.Play = function() {
-		var {$24r, $24r$1, _arg, _arg$1, _r, _r$1, _r$10, _r$11, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _r$8, _r$9, _tuple, _tuple$1, err, height, hostname, m, options, playStream, port, preparePromise, protocol, sosProtocol, url, urlProtocol, width, $s, $r, $c} = $restore(this, {});
+		var {$24r, $24r$1, _arg, _arg$1, _r, _r$1, _r$10, _r$11, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _r$8, _r$9, _tuple, _tuple$1, err, geometry, hostname, m, options, playStream, port, preparePromise, protocol, sosProtocol, url, urlProtocol, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		m = this;
 		/* */ if (!m.started) { $s = 1; continue; }
@@ -192570,14 +193198,13 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 			sosProtocol = m.getSOSProtocol(protocol);
 			_r = fmt.Sprintf("%s://%s:%d", new sliceType([new $String(urlProtocol), new $String(hostname), new $Uint16(port)])); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 			url = _r;
-			width = $clone($clone($clone(js.Global(), js.Value).Get("screen"), js.Value).Get("width"), js.Value).Int();
-			height = $clone($clone($clone(js.Global(), js.Value).Get("screen"), js.Value).Get("height"), js.Value).Int();
+			geometry = $clone(getStreamGeometry(), streamGeometry);
 			_r$1 = $clone($clone(js.Global(), js.Value).Get("Object"), js.Value).New(sliceType.nil); /* */ $s = 4; case 4: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 			options = $clone(_r$1, js.Value);
 			$clone(options, js.Value).Set("background", new $Bool(true));
 			$clone(options, js.Value).Set("protocol", new $String(sosProtocol));
 			$clone(options, js.Value).Set("lowLatency", new $Bool(true));
-			_r$2 = $clone($clone(m.sos, js.Value).Get("stream"), js.Value).Call("prepare", new sliceType([new $String(url), new $Int(0), new $Int(0), new $Int(width), new $Int(height), new options.constructor.elem(options)])); /* */ $s = 5; case 5: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			_r$2 = $clone($clone(m.sos, js.Value).Get("stream"), js.Value).Call("prepare", new sliceType([new $String(url), new $Int(geometry.x), new $Int(geometry.y), new $Int(geometry.width), new $Int(geometry.height), new options.constructor.elem(options)])); /* */ $s = 5; case 5: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
 			preparePromise = $clone(_r$2, js.Value);
 			_r$3 = jshelper.Await($clone(preparePromise, js.Value)); /* */ $s = 6; case 6: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
 			_tuple = _r$3;
@@ -192592,7 +193219,7 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 				$24r = _r$6;
 				$s = 12; case 12: return $24r;
 			/* } */ case 8:
-			_r$7 = $clone($clone(m.sos, js.Value).Get("stream"), js.Value).Call("play", new sliceType([new $String(url), new $Int(0), new $Int(0), new $Int(width), new $Int(height), new options.constructor.elem(options)])); /* */ $s = 13; case 13: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
+			_r$7 = $clone($clone(m.sos, js.Value).Get("stream"), js.Value).Call("play", new sliceType([new $String(url), new $Int(geometry.x), new $Int(geometry.y), new $Int(geometry.width), new $Int(geometry.height), new options.constructor.elem(options)])); /* */ $s = 13; case 13: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
 			playStream = $clone(_r$7, js.Value);
 			_r$8 = jshelper.Await($clone(playStream, js.Value)); /* */ $s = 14; case 14: if($c) { $c = false; _r$8 = _r$8.$blk(); } if (_r$8 && _r$8.$blk !== undefined) { break s; }
 			_tuple$1 = _r$8;
@@ -192610,11 +193237,11 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 			m.started = true;
 		/* } */ case 2:
 		$s = -1; return $ifaceNil;
-		/* */ } return; } var $f = {$blk: SOSVideoStreamer.ptr.prototype.Play, $c: true, $r, $24r, $24r$1, _arg, _arg$1, _r, _r$1, _r$10, _r$11, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _r$8, _r$9, _tuple, _tuple$1, err, height, hostname, m, options, playStream, port, preparePromise, protocol, sosProtocol, url, urlProtocol, width, $s};return $f;
+		/* */ } return; } var $f = {$blk: SOSVideoStreamer.ptr.prototype.Play, $c: true, $r, $24r, $24r$1, _arg, _arg$1, _r, _r$1, _r$10, _r$11, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _r$8, _r$9, _tuple, _tuple$1, err, geometry, hostname, m, options, playStream, port, preparePromise, protocol, sosProtocol, url, urlProtocol, $s};return $f;
 	};
 	SOSVideoStreamer.prototype.Play = function() { return this.$val.Play(); };
 	SOSVideoStreamer.ptr.prototype.Stop = function() {
-		var {$24r, _arg, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, err, height, hostname, m, port, protocol, stopPromise, url, urlProtocol, width, $s, $r, $c} = $restore(this, {});
+		var {$24r, _arg, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, err, geometry, hostname, m, port, protocol, stopPromise, url, urlProtocol, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		m = this;
 		/* */ if (m.started) { $s = 1; continue; }
@@ -192626,9 +193253,8 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 			urlProtocol = m.getURLProtocol(protocol);
 			_r = fmt.Sprintf("%s://%s:%d", new sliceType([new $String(urlProtocol), new $String(hostname), new $Uint16(port)])); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 			url = _r;
-			width = $clone($clone($clone(js.Global(), js.Value).Get("screen"), js.Value).Get("width"), js.Value).Int();
-			height = $clone($clone($clone(js.Global(), js.Value).Get("screen"), js.Value).Get("height"), js.Value).Int();
-			_r$1 = $clone($clone(m.sos, js.Value).Get("stream"), js.Value).Call("stop", new sliceType([new $String(url), new $Int(0), new $Int(0), new $Int(width), new $Int(height)])); /* */ $s = 4; case 4: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+			geometry = $clone(getStreamGeometry(), streamGeometry);
+			_r$1 = $clone($clone(m.sos, js.Value).Get("stream"), js.Value).Call("stop", new sliceType([new $String(url), new $Int(geometry.x), new $Int(geometry.y), new $Int(geometry.width), new $Int(geometry.height)])); /* */ $s = 4; case 4: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 			stopPromise = $clone(_r$1, js.Value);
 			_r$2 = jshelper.Await($clone(stopPromise, js.Value)); /* */ $s = 5; case 5: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
 			_tuple = _r$2;
@@ -192646,9 +193272,22 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 			m.started = false;
 		/* } */ case 2:
 		$s = -1; return $ifaceNil;
-		/* */ } return; } var $f = {$blk: SOSVideoStreamer.ptr.prototype.Stop, $c: true, $r, $24r, _arg, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, err, height, hostname, m, port, protocol, stopPromise, url, urlProtocol, width, $s};return $f;
+		/* */ } return; } var $f = {$blk: SOSVideoStreamer.ptr.prototype.Stop, $c: true, $r, $24r, _arg, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, err, geometry, hostname, m, port, protocol, stopPromise, url, urlProtocol, $s};return $f;
 	};
 	SOSVideoStreamer.prototype.Stop = function() { return this.$val.Stop(); };
+	getStreamGeometry = function() {
+		var configuredGeometry, geometry;
+		geometry = new streamGeometry.ptr(0, 0, $clone($clone($clone(js.Global(), js.Value).Get("screen"), js.Value).Get("width"), js.Value).Int(), $clone($clone($clone(js.Global(), js.Value).Get("screen"), js.Value).Get("height"), js.Value).Int());
+		configuredGeometry = $clone($clone($clone(js.Global(), js.Value).Get("__supra"), js.Value).Get("geometry"), js.Value);
+		if ($clone(configuredGeometry, js.Value).IsUndefined() || $clone(configuredGeometry, js.Value).IsNull()) {
+			return geometry;
+		}
+		geometry.x = $clone($clone(configuredGeometry, js.Value).Get("x"), js.Value).Int();
+		geometry.y = $clone($clone(configuredGeometry, js.Value).Get("y"), js.Value).Int();
+		geometry.width = $clone($clone(configuredGeometry, js.Value).Get("width"), js.Value).Int();
+		geometry.height = $clone($clone(configuredGeometry, js.Value).Get("height"), js.Value).Int();
+		return geometry;
+	};
 	SOSVideoStreamer.ptr.prototype.GetProtocol = function() {
 		var _1, m, protocol, protocolValue;
 		m = this;
@@ -192753,6 +193392,7 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 	SOSVideoStreamer.prototype.getSOSProtocol = function(protocol) { return this.$val.getSOSProtocol(protocol); };
 	ptrType$1.methods = [{prop: "IsAvailable", name: "IsAvailable", pkg: "", typ: $funcType([], [$Bool], false)}, {prop: "Play", name: "Play", pkg: "", typ: $funcType([], [$error], false)}, {prop: "Stop", name: "Stop", pkg: "", typ: $funcType([], [$error], false)}, {prop: "GetProtocol", name: "GetProtocol", pkg: "", typ: $funcType([], [videostream.Protocol], false)}, {prop: "GetPort", name: "GetPort", pkg: "", typ: $funcType([], [$Uint16], false)}, {prop: "GetHostname", name: "GetHostname", pkg: "", typ: $funcType([], [$String], false)}, {prop: "getServerHostname", name: "getServerHostname", pkg: "github.com/supraio/client-daemon/pkg/decoder/sosstream", typ: $funcType([], [$String], false)}, {prop: "getStreamHostname", name: "getStreamHostname", pkg: "github.com/supraio/client-daemon/pkg/decoder/sosstream", typ: $funcType([videostream.Protocol], [$String], false)}, {prop: "getURLProtocol", name: "getURLProtocol", pkg: "github.com/supraio/client-daemon/pkg/decoder/sosstream", typ: $funcType([videostream.Protocol], [$String], false)}, {prop: "getSOSProtocol", name: "getSOSProtocol", pkg: "github.com/supraio/client-daemon/pkg/decoder/sosstream", typ: $funcType([videostream.Protocol], [$String], false)}];
 	SOSVideoStreamer.init("github.com/supraio/client-daemon/pkg/decoder/sosstream", [{prop: "sos", name: "sos", embedded: false, exported: false, typ: js.Value, tag: ""}, {prop: "started", name: "started", embedded: false, exported: false, typ: $Bool, tag: ""}]);
+	streamGeometry.init("github.com/supraio/client-daemon/pkg/decoder/sosstream", [{prop: "x", name: "x", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "y", name: "y", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "width", name: "width", embedded: false, exported: false, typ: $Int, tag: ""}, {prop: "height", name: "height", embedded: false, exported: false, typ: $Int, 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:
@@ -192851,7 +193491,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;
+	var $pkg = {}, $init, decoder, errs, frame, netframe, screenbuffer, stats, screen, image, sync, time;
 	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"];
@@ -192860,6 +193500,7 @@ $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"];
 	$init = function() {
 		$pkg.$init = function() {};
@@ -192872,14 +193513,16 @@ $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;
 	return $pkg;
 })();
 $packages["github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver"] = (function() {
-	var $pkg = {}, $init, errs, dom, screen, f64, image, color, draw, sync, js, windowImpl, screenImpl, BufferImpl, sliceType, ptrType, ptrType$1, ptrType$2, funcType, arrayType, ptrType$3, sliceType$1, ptrType$4, ptrType$5, ptrType$6, ptrType$7, ptrType$8, newWindow, newScreenImpl, main, newBuffer;
+	var $pkg = {}, $init, fmt, errs, dom, screen, f64, image, color, draw, sync, js, windowImpl, screenImpl, BufferImpl, sliceType, ptrType, ptrType$1, ptrType$2, funcType, arrayType, ptrType$3, sliceType$1, ptrType$4, ptrType$5, ptrType$6, ptrType$7, ptrType$8, newWindow, overlayDimension, newScreenImpl, main, newBuffer;
+	fmt = $packages["fmt"];
 	errs = $packages["github.com/supraio/client-daemon/pkg/errs"];
 	dom = $packages["golang.org/x/exp/shiny/driver/util/dom"];
 	screen = $packages["golang.org/x/exp/shiny/screen"];
@@ -192889,13 +193532,15 @@ $packages["github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver"] = (
 	draw = $packages["image/draw"];
 	sync = $packages["sync"];
 	js = $packages["syscall/js"];
-	windowImpl = $pkg.windowImpl = $newType(0, $kindStruct, "overlaydriver.windowImpl", true, "github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver", false, function(screen_, mutex_, renderingInProgress_, domEvents_, released_) {
+	windowImpl = $pkg.windowImpl = $newType(0, $kindStruct, "overlaydriver.windowImpl", true, "github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver", false, function(screen_, mutex_, renderingInProgress_, domEvents_, inputTarget_, ownsInputTarget_, released_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.screen = ptrType.nil;
 			this.mutex = ptrType$1.nil;
 			this.renderingInProgress = false;
 			this.domEvents = ptrType$2.nil;
+			this.inputTarget = new js.Value.ptr(null, false, arrayType.zero());
+			this.ownsInputTarget = false;
 			this.released = false;
 			return;
 		}
@@ -192903,15 +193548,19 @@ $packages["github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver"] = (
 		this.mutex = mutex_;
 		this.renderingInProgress = renderingInProgress_;
 		this.domEvents = domEvents_;
+		this.inputTarget = inputTarget_;
+		this.ownsInputTarget = ownsInputTarget_;
 		this.released = released_;
 	});
-	screenImpl = $pkg.screenImpl = $newType(0, $kindStruct, "overlaydriver.screenImpl", true, "github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver", false, function(doc_) {
+	screenImpl = $pkg.screenImpl = $newType(0, $kindStruct, "overlaydriver.screenImpl", true, "github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver", false, function(doc_, inputTarget_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.doc = new js.Value.ptr(null, false, arrayType.zero());
+			this.inputTarget = new js.Value.ptr(null, false, arrayType.zero());
 			return;
 		}
 		this.doc = doc_;
+		this.inputTarget = inputTarget_;
 	});
 	BufferImpl = $pkg.BufferImpl = $newType(0, $kindStruct, "overlaydriver.BufferImpl", true, "github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver", true, function(screen_, size_) {
 		this.$val = this;
@@ -192937,7 +193586,7 @@ $packages["github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver"] = (
 	ptrType$7 = $ptrType(image.YCbCr);
 	ptrType$8 = $ptrType(BufferImpl);
 	newWindow = function(screen$1, opts) {
-		var {_r, _r$1, domEvents, opts, screen$1, w, $s, $r, $c} = $restore(this, {screen$1, opts});
+		var {_arg, _arg$1, _arg$2, _arg$3, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, domEvents, inputTarget, opts, ownsInputTarget, screen$1, style, w, $s, $r, $c} = $restore(this, {screen$1, opts});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		/* */ if (!(opts.Title === "")) { $s = 1; continue; }
 		/* */ $s = 2; continue;
@@ -192946,14 +193595,52 @@ $packages["github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver"] = (
 			_r$1 = $clone(_r, js.Value).Call("item", new sliceType([new $Int(0)])); /* */ $s = 4; case 4: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
 			$r = $clone(_r$1, js.Value).Set("innerHTML", new $String(opts.Title)); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		/* } */ case 2:
-		domEvents = dom.NewDomEvents();
-		w = new windowImpl.ptr(screen$1, new sync.Mutex.ptr(0, 0), false, domEvents, false);
-		$r = domEvents.BindEvents(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		inputTarget = $clone(screen$1.inputTarget, js.Value);
+		ownsInputTarget = false;
+		/* */ if ($clone(inputTarget, js.Value).IsNull() || $clone(inputTarget, js.Value).IsUndefined()) { $s = 6; continue; }
+		/* */ $s = 7; continue;
+		/* if ($clone(inputTarget, js.Value).IsNull() || $clone(inputTarget, js.Value).IsUndefined()) { */ case 6:
+			_r$2 = $clone(screen$1.doc, js.Value).Call("createElement", new sliceType([new $String("div")])); /* */ $s = 8; case 8: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			js.Value.copy(inputTarget, _r$2);
+			style = $clone($clone(inputTarget, js.Value).Get("style"), js.Value);
+			$clone(style, js.Value).Set("position", new $String("fixed"));
+			_r$3 = fmt.Sprintf("%dpx", new sliceType([new $Int(opts.X)])); /* */ $s = 9; case 9: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+			_arg = new $String(_r$3);
+			$r = $clone(style, js.Value).Set("left", _arg); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$4 = fmt.Sprintf("%dpx", new sliceType([new $Int(opts.Y)])); /* */ $s = 11; case 11: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+			_arg$1 = new $String(_r$4);
+			$r = $clone(style, js.Value).Set("top", _arg$1); /* */ $s = 12; case 12: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$5 = overlayDimension(opts.Width, $clone($clone($clone(screen$1.doc, js.Value).Get("documentElement"), js.Value).Get("clientWidth"), js.Value)); /* */ $s = 13; case 13: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
+			_arg$2 = new $String(_r$5);
+			$r = $clone(style, js.Value).Set("width", _arg$2); /* */ $s = 14; case 14: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			_r$6 = overlayDimension(opts.Height, $clone($clone($clone(screen$1.doc, js.Value).Get("documentElement"), js.Value).Get("clientHeight"), js.Value)); /* */ $s = 15; case 15: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
+			_arg$3 = new $String(_r$6);
+			$r = $clone(style, js.Value).Set("height", _arg$3); /* */ $s = 16; case 16: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$clone(style, js.Value).Set("zIndex", new $String("2147483647"));
+			_r$7 = $clone($clone(screen$1.doc, js.Value).Get("body"), js.Value).Call("appendChild", new sliceType([new inputTarget.constructor.elem(inputTarget)])); /* */ $s = 17; case 17: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
+			_r$7;
+			ownsInputTarget = true;
+		/* } */ case 7:
+		$clone($clone(inputTarget, js.Value).Get("style"), js.Value).Set("touchAction", new $String("none"));
+		domEvents = dom.NewDomEventsForTarget($clone(inputTarget, js.Value));
+		w = new windowImpl.ptr(screen$1, new sync.Mutex.ptr(0, 0), false, domEvents, $clone(inputTarget, js.Value), ownsInputTarget, false);
+		$r = domEvents.BindEvents(); /* */ $s = 18; case 18: 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, _r, _r$1, domEvents, opts, screen$1, w, $s};return $f;
+		/* */ } return; } var $f = {$blk: newWindow, $c: true, $r, _arg, _arg$1, _arg$2, _arg$3, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, domEvents, inputTarget, opts, ownsInputTarget, screen$1, style, w, $s};return $f;
+	};
+	overlayDimension = function(size, fallback) {
+		var {$24r, _r, fallback, size, $s, $r, $c} = $restore(this, {size, fallback});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		if (size <= 0) {
+			size = $clone(fallback, js.Value).Int();
+		}
+		_r = fmt.Sprintf("%dpx", new sliceType([new $Int(size)])); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		$24r = _r;
+		$s = 2; case 2: return $24r;
+		/* */ } return; } var $f = {$blk: overlayDimension, $c: true, $r, $24r, _r, fallback, size, $s};return $f;
 	};
 	windowImpl.ptr.prototype.Release = function() {
-		var {w, $s, $deferred, $r, $c} = $restore(this, {});
+		var {_r, parent, w, x, $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);
 		w = this;
 		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
@@ -192964,9 +193651,20 @@ $packages["github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver"] = (
 			$s = 4; case 4: return;
 		/* } */ case 3:
 		$r = w.domEvents.Release(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* */ if (w.ownsInputTarget) { $s = 6; continue; }
+		/* */ $s = 7; continue;
+		/* if (w.ownsInputTarget) { */ case 6:
+			parent = $clone($clone(w.inputTarget, js.Value).Get("parentNode"), js.Value);
+			/* */ if (!$clone(parent, js.Value).IsNull() && !$clone(parent, js.Value).IsUndefined()) { $s = 8; continue; }
+			/* */ $s = 9; continue;
+			/* if (!$clone(parent, js.Value).IsNull() && !$clone(parent, js.Value).IsUndefined()) { */ case 8:
+				_r = $clone(parent, js.Value).Call("removeChild", new sliceType([(x = w.inputTarget, new x.constructor.elem(x))])); /* */ $s = 10; case 10: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+				_r;
+			/* } */ case 9:
+		/* } */ case 7:
 		w.released = true;
 		$s = -1; return;
-		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.Release, $c: true, $r, w, $s, $deferred};return $f; } }
+		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.Release, $c: true, $r, _r, parent, w, x, $s, $deferred};return $f; } }
 	};
 	windowImpl.prototype.Release = function() { return this.$val.Release(); };
 	windowImpl.ptr.prototype.Publish = function() {
@@ -192979,21 +193677,55 @@ $packages["github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver"] = (
 	};
 	windowImpl.prototype.Publish = function() { return this.$val.Publish(); };
 	windowImpl.ptr.prototype.Send = function(event) {
-		var event, w;
+		var {event, w, $s, $deferred, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
 		w = this;
-		if (w.released) {
-			return;
-		}
-		$panic(new $String("Not implemented"));
+		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$deferred.push([$methodVal(w.mutex, "Unlock"), []]);
+		/* */ if (w.released) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.released) { */ case 2:
+			$s = 4; case 4: return;
+		/* } */ case 3:
+		$r = $send(w.domEvents.GetEventChan(), event); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$s = -1; return;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.Send, $c: true, $r, event, w, $s, $deferred};return $f; } }
 	};
 	windowImpl.prototype.Send = function(event) { return this.$val.Send(event); };
+	windowImpl.ptr.prototype.SendNonBlocking = function(event) {
+		var {$24r, $24r$1, $24r$2, _selection, event, w, $s, $deferred, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
+		w = this;
+		$r = w.mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$deferred.push([$methodVal(w.mutex, "Unlock"), []]);
+		/* */ if (w.released) { $s = 2; continue; }
+		/* */ $s = 3; continue;
+		/* if (w.released) { */ case 2:
+			$24r = false;
+			$s = 4; case 4: return $24r;
+		/* } */ case 3:
+		_selection = $select([[w.domEvents.GetEventChan(), event], []]);
+		/* */ if (_selection[0] === 0) { $s = 5; continue; }
+		/* */ if (_selection[0] === 1) { $s = 6; continue; }
+		/* */ $s = 7; continue;
+		/* if (_selection[0] === 0) { */ case 5:
+			$24r$1 = true;
+			$s = 8; case 8: return $24r$1;
+		/* } else if (_selection[0] === 1) { */ case 6:
+			$24r$2 = false;
+			$s = 9; case 9: return $24r$2;
+		/* } */ case 7:
+		$s = -1; return false;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; return false; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: windowImpl.ptr.prototype.SendNonBlocking, $c: true, $r, $24r, $24r$1, $24r$2, _selection, event, w, $s, $deferred};return $f; } }
+	};
+	windowImpl.prototype.SendNonBlocking = function(event) { return this.$val.SendNonBlocking(event); };
 	windowImpl.ptr.prototype.SendFirst = function(event) {
-		var event, w;
+		var {event, w, $s, $r, $c} = $restore(this, {event});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		w = this;
-		if (w.released) {
-			return;
-		}
-		$panic(new $String("Not implemented"));
+		$r = w.Send(event); /* */ $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: windowImpl.ptr.prototype.SendFirst, $c: true, $r, event, w, $s};return $f;
 	};
 	windowImpl.prototype.SendFirst = function(event) { return this.$val.SendFirst(event); };
 	windowImpl.ptr.prototype.NextEvent = function() {
@@ -193072,9 +193804,9 @@ $packages["github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver"] = (
 		$panic(new $String("Not implemented"));
 	};
 	windowImpl.prototype.Scale = function(dr, src, sr, op, opts) { return this.$val.Scale(dr, src, sr, op, opts); };
-	newScreenImpl = function() {
-		var s;
-		s = new screenImpl.ptr($clone($clone(js.Global(), js.Value).Get("document"), js.Value));
+	newScreenImpl = function(inputTarget) {
+		var inputTarget, s;
+		s = new screenImpl.ptr($clone($clone(js.Global(), js.Value).Get("document"), js.Value), $clone(inputTarget, js.Value));
 		return [s, $ifaceNil];
 	};
 	screenImpl.ptr.prototype.NewBuffer = function(size) {
@@ -193104,11 +193836,11 @@ $packages["github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver"] = (
 		/* */ } return; } var $f = {$blk: screenImpl.ptr.prototype.NewWindow, $c: true, $r, _r, opts, s, window, $s};return $f;
 	};
 	screenImpl.prototype.NewWindow = function(opts) { return this.$val.NewWindow(opts); };
-	main = function(f) {
-		var {_tuple, err, f, retErr, s, $s, $r, $c} = $restore(this, {f});
+	main = function(f, inputTarget) {
+		var {_tuple, err, f, inputTarget, retErr, s, $s, $r, $c} = $restore(this, {f, inputTarget});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		retErr = $ifaceNil;
-		_tuple = newScreenImpl();
+		_tuple = newScreenImpl($clone(inputTarget, js.Value));
 		s = _tuple[0];
 		err = _tuple[1];
 		if (!($interfaceIsEqual(err, $ifaceNil))) {
@@ -193118,7 +193850,7 @@ $packages["github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver"] = (
 		$r = f(s); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		retErr = $ifaceNil;
 		$s = -1; return retErr;
-		/* */ } return; } var $f = {$blk: main, $c: true, $r, _tuple, err, f, retErr, s, $s};return $f;
+		/* */ } return; } var $f = {$blk: main, $c: true, $r, _tuple, err, f, inputTarget, retErr, s, $s};return $f;
 	};
 	newBuffer = function(screen$1, size) {
 		var b, screen$1, size;
@@ -193158,24 +193890,25 @@ $packages["github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver"] = (
 		b = this;
 	};
 	BufferImpl.prototype.Release = function() { return this.$val.Release(); };
-	ptrType$5.methods = [{prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "Publish", name: "Publish", pkg: "", typ: $funcType([], [screen.PublishResult], false)}, {prop: "Send", name: "Send", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "SendFirst", name: "SendFirst", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "NextEvent", name: "NextEvent", pkg: "", typ: $funcType([], [$emptyInterface], false)}, {prop: "Upload", name: "Upload", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "UploadYCbCr", name: "UploadYCbCr", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "Fill", name: "Fill", pkg: "", typ: $funcType([image.Rectangle, color.Color, draw.Op], [], false)}, {prop: "Draw", name: "Draw", pkg: "", typ: $funcType([f64.Aff3, screen.Texture, image.Rectangle, draw.Op, ptrType$4], [], false)}, {prop: "DrawUniform", name: "DrawUniform", pkg: "", typ: $funcType([f64.Aff3, color.Color, image.Rectangle, draw.Op, ptrType$4], [], false)}, {prop: "Copy", name: "Copy", pkg: "", typ: $funcType([image.Point, screen.Texture, image.Rectangle, draw.Op, ptrType$4], [], false)}, {prop: "Scale", name: "Scale", pkg: "", typ: $funcType([image.Rectangle, screen.Texture, image.Rectangle, draw.Op, ptrType$4], [], false)}];
+	ptrType$5.methods = [{prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}, {prop: "Publish", name: "Publish", pkg: "", typ: $funcType([], [screen.PublishResult], false)}, {prop: "Send", name: "Send", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "SendNonBlocking", name: "SendNonBlocking", pkg: "", typ: $funcType([$emptyInterface], [$Bool], false)}, {prop: "SendFirst", name: "SendFirst", pkg: "", typ: $funcType([$emptyInterface], [], false)}, {prop: "NextEvent", name: "NextEvent", pkg: "", typ: $funcType([], [$emptyInterface], false)}, {prop: "Upload", name: "Upload", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "UploadYCbCr", name: "UploadYCbCr", pkg: "", typ: $funcType([image.Point, screen.Buffer, image.Rectangle], [], false)}, {prop: "Fill", name: "Fill", pkg: "", typ: $funcType([image.Rectangle, color.Color, draw.Op], [], false)}, {prop: "Draw", name: "Draw", pkg: "", typ: $funcType([f64.Aff3, screen.Texture, image.Rectangle, draw.Op, ptrType$4], [], false)}, {prop: "DrawUniform", name: "DrawUniform", pkg: "", typ: $funcType([f64.Aff3, color.Color, image.Rectangle, draw.Op, ptrType$4], [], false)}, {prop: "Copy", name: "Copy", pkg: "", typ: $funcType([image.Point, screen.Texture, image.Rectangle, draw.Op, ptrType$4], [], false)}, {prop: "Scale", name: "Scale", pkg: "", typ: $funcType([image.Rectangle, screen.Texture, image.Rectangle, draw.Op, ptrType$4], [], false)}];
 	ptrType.methods = [{prop: "NewBuffer", name: "NewBuffer", pkg: "", typ: $funcType([image.Point], [screen.Buffer, $error], false)}, {prop: "NewTexture", name: "NewTexture", pkg: "", typ: $funcType([image.Point], [screen.Texture, $error], false)}, {prop: "NewWindow", name: "NewWindow", pkg: "", typ: $funcType([ptrType$6], [screen.Window, $error], false)}];
 	ptrType$8.methods = [{prop: "Size", name: "Size", pkg: "", typ: $funcType([], [image.Point], false)}, {prop: "Bounds", name: "Bounds", pkg: "", typ: $funcType([], [image.Rectangle], false)}, {prop: "RGBA", name: "RGBA", pkg: "", typ: $funcType([], [ptrType$3], false)}, {prop: "YCbCr", name: "YCbCr", pkg: "", typ: $funcType([], [ptrType$7], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([], [], false)}];
-	windowImpl.init("github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "renderingInProgress", name: "renderingInProgress", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "domEvents", name: "domEvents", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}]);
-	screenImpl.init("github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver", [{prop: "doc", name: "doc", embedded: false, exported: false, typ: js.Value, tag: ""}]);
+	windowImpl.init("github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "mutex", name: "mutex", embedded: false, exported: false, typ: ptrType$1, tag: ""}, {prop: "renderingInProgress", name: "renderingInProgress", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "domEvents", name: "domEvents", embedded: false, exported: false, typ: ptrType$2, tag: ""}, {prop: "inputTarget", name: "inputTarget", embedded: false, exported: false, typ: js.Value, tag: ""}, {prop: "ownsInputTarget", name: "ownsInputTarget", embedded: false, exported: false, typ: $Bool, tag: ""}, {prop: "released", name: "released", embedded: false, exported: false, typ: $Bool, tag: ""}]);
+	screenImpl.init("github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver", [{prop: "doc", name: "doc", embedded: false, exported: false, typ: js.Value, tag: ""}, {prop: "inputTarget", name: "inputTarget", embedded: false, exported: false, typ: js.Value, tag: ""}]);
 	BufferImpl.init("github.com/supraio/client-daemon/pkg/shiny/driver/overlaydriver", [{prop: "screen", name: "screen", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "size", name: "size", embedded: false, exported: false, typ: image.Point, 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:
-		$r = errs.$init(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = dom.$init(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = screen.$init(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = f64.$init(); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = image.$init(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = color.$init(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = draw.$init(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = sync.$init(); /* */ $s = 8; case 8: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = js.$init(); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = fmt.$init(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = errs.$init(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = dom.$init(); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = screen.$init(); /* */ $s = 4; case 4: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = f64.$init(); /* */ $s = 5; case 5: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = image.$init(); /* */ $s = 6; case 6: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = color.$init(); /* */ $s = 7; case 7: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = draw.$init(); /* */ $s = 8; case 8: 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 = js.$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;
@@ -193216,7 +193949,7 @@ $packages["golang.org/x/mobile/event/lifecycle"] = (function() {
 	return $pkg;
 })();
 $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
-	var $pkg = {}, $init, binary, json, query, clientscreen, clipboard, nacldecoder, nacldriver, samsungwasmdecoder, webcodecs, errs, helper, input, message, netclient, netpacket, netstream, netframe, jswebsocketworker, player, overlaydriver, stats, videostream, window, canvasdriver, webgldriver, screen, focus, key, lifecycle, mouse, size, touch, geom, image, io, ioutil, log, os, path, strings, sync, js, time, screenParams, ScreenManager, ProcessInfo, ProcessInfoManager, sliceType, ptrType, funcType, sliceType$2, sliceType$4, arrayType, mapType, ptrType$15, onScreenWindowStarted, openScreenWindows, mutex, NewScreenManager, NewProcessInfoManager, init, registerJSBridge;
+	var $pkg = {}, $init, binary, json, query, clientscreen, clipboard, nacldecoder, nacldriver, samsungwasmdecoder, webcodecs, errs, helper, input, message, netclient, netpacket, netstream, netframe, jswebsocketworker, player, overlaydriver, stats, videostream, window, canvasdriver, webgldriver, screen, focus, key, lifecycle, mouse, size, touch, geom, image, io, ioutil, log, os, path, strconv, strings, sync, js, time, Geometry, screenParams, ScreenManager, ProcessInfo, ProcessInfoManager, sliceType, ptrType, funcType, ptrType$14, sliceType$2, sliceType$4, arrayType, mapType, ptrType$16, onScreenWindowStarted, openScreenWindows, mutex, waitForScreenLifecycleExit, NewScreenManager, NewProcessInfoManager, init, registerJSBridge, newJSBridgeFacades, geometryValue;
 	binary = $packages["encoding/binary"];
 	json = $packages["encoding/json"];
 	query = $packages["github.com/google/go-querystring/query"];
@@ -193256,10 +193989,25 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 	log = $packages["log"];
 	os = $packages["os"];
 	path = $packages["path"];
+	strconv = $packages["strconv"];
 	strings = $packages["strings"];
 	sync = $packages["sync"];
 	js = $packages["syscall/js"];
 	time = $packages["time"];
+	Geometry = $pkg.Geometry = $newType(0, $kindStruct, "render.Geometry", true, "github.com/supraio/client-daemon/pkg/render", true, function(X_, Y_, Width_, Height_) {
+		this.$val = this;
+		if (arguments.length === 0) {
+			this.X = 0;
+			this.Y = 0;
+			this.Width = 0;
+			this.Height = 0;
+			return;
+		}
+		this.X = X_;
+		this.Y = Y_;
+		this.Width = Width_;
+		this.Height = Height_;
+	});
 	screenParams = $pkg.screenParams = $newType(0, $kindStruct, "render.screenParams", true, "github.com/supraio/client-daemon/pkg/render", false, function(ScreenID_, ScreenDriver_, ScreenHost_, MetadataDriver_, MetadataHost_, ClientID_, ClientSecret_, Secure_) {
 		this.$val = this;
 		if (arguments.length === 0) {
@@ -193282,17 +194030,19 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 		this.ClientSecret = ClientSecret_;
 		this.Secure = Secure_;
 	});
-	ScreenManager = $pkg.ScreenManager = $newType(0, $kindStruct, "render.ScreenManager", true, "github.com/supraio/client-daemon/pkg/render", true, function(screenWindowCmd_, logDir_, processInfoManager_) {
+	ScreenManager = $pkg.ScreenManager = $newType(0, $kindStruct, "render.ScreenManager", true, "github.com/supraio/client-daemon/pkg/render", true, function(screenWindowCmd_, logDir_, processInfoManager_, processMu_) {
 		this.$val = this;
 		if (arguments.length === 0) {
 			this.screenWindowCmd = "";
 			this.logDir = "";
 			this.processInfoManager = ptrType.nil;
+			this.processMu = new sync.Mutex.ptr(0, 0);
 			return;
 		}
 		this.screenWindowCmd = screenWindowCmd_;
 		this.logDir = logDir_;
 		this.processInfoManager = processInfoManager_;
+		this.processMu = processMu_;
 	});
 	ProcessInfo = $pkg.ProcessInfo = $newType(0, $kindStruct, "render.ProcessInfo", true, "github.com/supraio/client-daemon/pkg/render", true, function(ScreenID_, Pid_) {
 		this.$val = this;
@@ -193317,36 +194067,39 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 	sliceType = $sliceType($Uint8);
 	ptrType = $ptrType(ProcessInfoManager);
 	funcType = $funcType([], [], false);
+	ptrType$14 = $ptrType(Geometry);
 	sliceType$2 = $sliceType($emptyInterface);
 	sliceType$4 = $sliceType($String);
 	arrayType = $arrayType(funcType, 0);
 	mapType = $mapType($String, $emptyInterface);
-	ptrType$15 = $ptrType(ScreenManager);
+	ptrType$16 = $ptrType(ScreenManager);
 	ScreenManager.ptr.prototype.StartScreen = function(screenID, screenDriver, screenHost, metadataDriver, metadataHost, clientID, clientSecret, secure) {
 		var {$24r, $24r$1, $24r$2, _key, _r, _r$1, _tuple, baseUrl, clientID, clientSecret, err, height, killScreen, left, m, metadataDriver, metadataHost, params, screenDriver, screenHost, screenID, screenWindow, secure, top, width, windowOpts, $s, $deferred, $r, $c} = $restore(this, {screenID, screenDriver, screenHost, metadataDriver, metadataHost, clientID, clientSecret, secure});
 		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
 		m = [m];
 		screenWindow = [screenWindow];
 		m[0] = this;
-		$r = mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = m[0].processMu.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$deferred.push([$methodVal(m[0].processMu, "Unlock"), []]);
+		$r = mutex.Lock(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$deferred.push([$methodVal(mutex, "Unlock"), []]);
 		width = $clone($clone($clone(js.Global(), js.Value).Get("screen"), js.Value).Get("width"), js.Value).Int();
 		height = $clone($clone($clone(js.Global(), js.Value).Get("screen"), js.Value).Get("height"), js.Value).Int();
 		left = 0;
 		top = 0;
-		windowOpts = new sliceType$4(["width=" + ($encodeRune(width)), "height=" + ($encodeRune(height)), "left=" + ($encodeRune(left)), "top=" + ($encodeRune(top)), "location=no", "menubar=no", "status=no", "titlebar=no", "toolbar=no"]);
+		windowOpts = new sliceType$4(["width=" + strconv.Itoa(width), "height=" + strconv.Itoa(height), "left=" + strconv.Itoa(left), "top=" + strconv.Itoa(top), "location=no", "menubar=no", "status=no", "titlebar=no", "toolbar=no"]);
 		params = new screenParams.ptr(screenID, (screenDriver), screenHost, (metadataDriver), metadataHost, clientID, clientSecret, secure);
 		baseUrl = $clone($clone($clone(js.Global(), js.Value).Get("location"), js.Value).Get("origin"), js.Value).String();
-		_r = m[0].openWindow(baseUrl, $clone(params, screenParams), windowOpts); /* */ $s = 2; case 2: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_r = m[0].openWindow(baseUrl, $clone(params, screenParams), windowOpts); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		_tuple = _r;
 		screenWindow[0] = $clone(_tuple[0], js.Value);
 		err = _tuple[1];
-		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 3; continue; }
-		/* */ $s = 4; continue;
-		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 3:
+		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 4; continue; }
+		/* */ $s = 5; continue;
+		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 4:
 			$24r = err;
-			$s = 5; case 5: return $24r;
-		/* } */ case 4:
+			$s = 6; case 6: return $24r;
+		/* } */ case 5:
 		killScreen = (function(m, screenWindow) { return function $b() {
 			var {_r$1, err$1, $s, $r, $c} = $restore(this, {});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -193360,18 +194113,18 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 			$s = -1; return;
 			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r$1, err$1, $s};return $f;
 		}; })(m, screenWindow);
-		_r$1 = m[0].processInfoManager.WaitProcess(screenID); /* */ $s = 6; case 6: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		_r$1 = m[0].processInfoManager.WaitProcess(screenID); /* */ $s = 7; case 7: 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 = 7; continue; }
-		/* */ $s = 8; continue;
-		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 7:
-			$r = killScreen(); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 8; continue; }
+		/* */ $s = 9; continue;
+		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 8:
+			$r = killScreen(); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 			$24r$1 = err;
-			$s = 10; case 10: return $24r$1;
-		/* } */ case 8:
+			$s = 11; case 11: return $24r$1;
+		/* } */ case 9:
 		_key = screenID; (openScreenWindows || $throwRuntimeError("assignment to entry in nil map")).set($String.keyFor(_key), { k: _key, v: $clone(screenWindow[0], js.Value) });
 		$24r$2 = $ifaceNil;
-		$s = 11; case 11: return $24r$2;
+		$s = 12; case 12: return $24r$2;
 		/* */ } return; } } catch(err) { $err = err; $s = -1; return $ifaceNil; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: ScreenManager.ptr.prototype.StartScreen, $c: true, $r, $24r, $24r$1, $24r$2, _key, _r, _r$1, _tuple, baseUrl, clientID, clientSecret, err, height, killScreen, left, m, metadataDriver, metadataHost, params, screenDriver, screenHost, screenID, screenWindow, secure, top, width, windowOpts, $s, $deferred};return $f; } }
 	};
 	ScreenManager.prototype.StartScreen = function(screenID, screenDriver, screenHost, metadataDriver, metadataHost, clientID, clientSecret, secure) { return this.$val.StartScreen(screenID, screenDriver, screenHost, metadataDriver, metadataHost, clientID, clientSecret, secure); };
@@ -193441,46 +194194,116 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 	};
 	ScreenManager.prototype.closeWindow = function(window$1) { return this.$val.closeWindow(window$1); };
 	ScreenManager.ptr.prototype.StopScreen = function(screenID) {
-		var {$24r, $24r$1, $24r$2, $24r$3, _entry, _r, _r$1, _tuple, _tuple$1, err, exists, m, screenID, screenWindow, $s, $deferred, $r, $c} = $restore(this, {screenID});
+		var {$24r, $24r$1, $24r$2, $24r$3, $24r$4, $24r$5, $24r$6, _entry, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _tuple, _tuple$1, bridge, deadline, err, err$1, err$2, exists, m, screenID, screenWindow, stopScreen, $s, $deferred, $r, $c} = $restore(this, {screenID});
 		/* */ $s = $s || 0; var $err = null; try { s: while (true) { switch ($s) { case 0: $deferred = []; $curGoroutine.deferStack.push($deferred);
+		bridge = [bridge];
 		m = this;
-		$r = mutex.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = m.processMu.Lock(); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$deferred.push([$methodVal(m.processMu, "Unlock"), []]);
+		$r = mutex.Lock(); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$deferred.push([$methodVal(mutex, "Unlock"), []]);
-		_r = m.processInfoManager.GetProcessInfo(screenID); /* */ $s = 2; case 2: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_r = m.processInfoManager.GetProcessInfo(screenID); /* */ $s = 3; case 3: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
 		_tuple = _r;
 		err = _tuple[1];
-		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 3; continue; }
-		/* */ $s = 4; continue;
-		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 3:
+		/* */ if (!($interfaceIsEqual(err, $ifaceNil))) { $s = 4; continue; }
+		/* */ $s = 5; continue;
+		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 4:
 			$24r = err;
-			$s = 5; case 5: return $24r;
-		/* } */ case 4:
+			$s = 6; case 6: return $24r;
+		/* } */ case 5:
 		_tuple$1 = (_entry = $mapIndex(openScreenWindows,$String.keyFor(screenID)), _entry !== undefined ? [_entry.v, true] : [new js.Value.ptr(null, false, arrayType.zero()), false]);
 		screenWindow = $clone(_tuple$1[0], js.Value);
 		exists = _tuple$1[1];
-		/* */ if (!exists) { $s = 6; continue; }
-		/* */ $s = 7; continue;
-		/* if (!exists) { */ case 6:
-			$24r$1 = err;
-			$s = 8; case 8: return $24r$1;
-		/* } */ case 7:
-		_r$1 = m.closeWindow($clone(screenWindow, js.Value)); /* */ $s = 9; case 9: 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 = 10; continue; }
-		/* */ $s = 11; continue;
-		/* if (!($interfaceIsEqual(err, $ifaceNil))) { */ case 10:
-			$24r$2 = err;
-			$s = 12; case 12: return $24r$2;
-		/* } */ case 11:
+		/* */ if (!exists) { $s = 7; continue; }
+		/* */ $s = 8; continue;
+		/* if (!exists) { */ case 7:
+			_r$1 = errs.Errorf("screen window %s is not open", new sliceType$2([new $String(screenID)])); /* */ $s = 9; case 9: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+			$24r$1 = _r$1;
+			$s = 10; case 10: return $24r$1;
+		/* } */ case 8:
+		bridge[0] = $clone($clone(screenWindow, js.Value).Get("__supra"), js.Value);
+		/* */ if (($clone(bridge[0], js.Value).Type() === 0) || ($clone(bridge[0], js.Value).Type() === 1)) { $s = 11; continue; }
+		/* */ $s = 12; continue;
+		/* if (($clone(bridge[0], js.Value).Type() === 0) || ($clone(bridge[0], js.Value).Type() === 1)) { */ case 11:
+			_r$2 = errs.Errorf("screen window %s control bridge is unavailable", new sliceType$2([new $String(screenID)])); /* */ $s = 13; case 13: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			$24r$2 = _r$2;
+			$s = 14; case 14: return $24r$2;
+		/* } */ case 12:
+		stopScreen = $clone($clone(bridge[0], js.Value).Get("stopScreen"), js.Value);
+		/* */ if (!(($clone(stopScreen, js.Value).Type() === 7))) { $s = 15; continue; }
+		/* */ $s = 16; continue;
+		/* if (!(($clone(stopScreen, js.Value).Type() === 7))) { */ case 15:
+			_r$3 = errs.Errorf("screen window %s control bridge is unavailable", new sliceType$2([new $String(screenID)])); /* */ $s = 17; case 17: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+			$24r$3 = _r$3;
+			$s = 18; case 18: return $24r$3;
+		/* } */ case 16:
+		$clone(stopScreen, js.Value).Invoke(sliceType$2.nil);
+		_r$4 = time.Now(); /* */ $s = 19; case 19: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+		_r$5 = $clone(_r$4, time.Time).Add(new time.Duration(6, 4230196224)); /* */ $s = 20; case 20: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
+		deadline = $clone(_r$5, time.Time);
+		_r$6 = waitForScreenLifecycleExit(screenID, (function(bridge) { return function(marker) {
+			var marker, value;
+			value = $clone($clone(bridge[0], js.Value).Get(marker), js.Value);
+			return ($clone(value, js.Value).Type() === 2) && $clone(value, js.Value).Bool();
+		}; })(bridge), $clone(deadline, time.Time)); /* */ $s = 21; case 21: 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 = 22; continue; }
+		/* */ $s = 23; continue;
+		/* if (!($interfaceIsEqual(err$1, $ifaceNil))) { */ case 22:
+			$24r$4 = err$1;
+			$s = 24; case 24: return $24r$4;
+		/* } */ case 23:
+		_r$7 = m.closeWindow($clone(screenWindow, js.Value)); /* */ $s = 25; case 25: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
+		err$2 = _r$7;
+		/* */ if (!($interfaceIsEqual(err$2, $ifaceNil))) { $s = 26; continue; }
+		/* */ $s = 27; continue;
+		/* if (!($interfaceIsEqual(err$2, $ifaceNil))) { */ case 26:
+			$24r$5 = err$2;
+			$s = 28; case 28: return $24r$5;
+		/* } */ case 27:
 		$mapDelete(openScreenWindows, $String.keyFor(screenID));
-		$24r$3 = $ifaceNil;
-		$s = 13; case 13: return $24r$3;
-		/* */ } return; } } catch(err) { $err = err; $s = -1; return $ifaceNil; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: ScreenManager.ptr.prototype.StopScreen, $c: true, $r, $24r, $24r$1, $24r$2, $24r$3, _entry, _r, _r$1, _tuple, _tuple$1, err, exists, m, screenID, screenWindow, $s, $deferred};return $f; } }
+		$24r$6 = $ifaceNil;
+		$s = 29; case 29: return $24r$6;
+		/* */ } return; } } catch(err) { $err = err; $s = -1; return $ifaceNil; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: ScreenManager.ptr.prototype.StopScreen, $c: true, $r, $24r, $24r$1, $24r$2, $24r$3, $24r$4, $24r$5, $24r$6, _entry, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _tuple, _tuple$1, bridge, deadline, err, err$1, err$2, exists, m, screenID, screenWindow, stopScreen, $s, $deferred};return $f; } }
 	};
 	ScreenManager.prototype.StopScreen = function(screenID) { return this.$val.StopScreen(screenID); };
+	waitForScreenLifecycleExit = function(screenID, markerSet, deadline) {
+		var {$24r, _r, _r$1, _r$2, _r$3, _r$4, _v, cleanupCompleted, deadline, markerSet, screenID, $s, $r, $c} = $restore(this, {screenID, markerSet, deadline});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		cleanupCompleted = false;
+		/* while (true) { */ case 1:
+			/* */ if (!cleanupCompleted) { $s = 3; continue; }
+			/* */ $s = 4; continue;
+			/* if (!cleanupCompleted) { */ case 3:
+				_r = markerSet("screenStopCompleted"); /* */ $s = 5; case 5: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+				cleanupCompleted = _r;
+			/* } */ case 4:
+			if (!(cleanupCompleted)) { _v = false; $s = 8; continue s; }
+			_r$1 = markerSet("screenLifecycleExited"); /* */ $s = 9; case 9: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+			_v = _r$1; case 8:
+			/* */ if (_v) { $s = 6; continue; }
+			/* */ $s = 7; continue;
+			/* if (_v) { */ case 6:
+				$s = -1; return $ifaceNil;
+			/* } */ case 7:
+			_r$2 = time.Now(); /* */ $s = 12; case 12: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			_r$3 = $clone(_r$2, time.Time).After($clone(deadline, time.Time)); /* */ $s = 13; case 13: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+			/* */ if (_r$3) { $s = 10; continue; }
+			/* */ $s = 11; continue;
+			/* if (_r$3) { */ case 10:
+				_r$4 = errs.Errorf("screen window %s stop timed out", new sliceType$2([new $String(screenID)])); /* */ $s = 14; case 14: if($c) { $c = false; _r$4 = _r$4.$blk(); } if (_r$4 && _r$4.$blk !== undefined) { break s; }
+				$24r = _r$4;
+				$s = 15; case 15: return $24r;
+			/* } */ case 11:
+			$r = time.Sleep(new time.Duration(0, 10000000)); /* */ $s = 16; case 16: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$s = 1; continue;
+		case 2:
+		$s = -1; return $ifaceNil;
+		/* */ } return; } var $f = {$blk: waitForScreenLifecycleExit, $c: true, $r, $24r, _r, _r$1, _r$2, _r$3, _r$4, _v, cleanupCompleted, deadline, markerSet, screenID, $s};return $f;
+	};
 	NewScreenManager = function(screenWindowCmd, logDir, processInfoManager) {
 		var logDir, processInfoManager, screenWindowCmd;
-		return new ScreenManager.ptr(screenWindowCmd, logDir, processInfoManager);
+		return new ScreenManager.ptr(screenWindowCmd, logDir, processInfoManager, new sync.Mutex.ptr(0, 0));
 	};
 	$pkg.NewScreenManager = NewScreenManager;
 	ScreenManager.ptr.prototype.ListScreens = function() {
@@ -193550,6 +194373,29 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 		/* */ } return; } var $f = {$blk: ProcessInfoManager.ptr.prototype.RemoveProcessInfo, $c: true, $r, _r, _r$1, err, m, screenID, userProcessDirPath, $s};return $f;
 	};
 	ProcessInfoManager.prototype.RemoveProcessInfo = function(screenID) { return this.$val.RemoveProcessInfo(screenID); };
+	ProcessInfoManager.ptr.prototype.RemoveProcessInfoByPid = function(screenID, pid) {
+		var {$24r, _r, _r$1, _tuple, err, m, pid, processInfo, screenID, $s, $r, $c} = $restore(this, {screenID, pid});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		m = this;
+		_r = m.GetProcessInfo(screenID); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_tuple = _r;
+		processInfo = $clone(_tuple[0], ProcessInfo);
+		err = _tuple[1];
+		if (os.IsNotExist(err)) {
+			$s = -1; return $ifaceNil;
+		}
+		if (!($interfaceIsEqual(err, $ifaceNil))) {
+			$s = -1; return err;
+		}
+		if (!((processInfo.Pid === pid))) {
+			$s = -1; return $ifaceNil;
+		}
+		_r$1 = m.RemoveProcessInfo(screenID); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		$24r = _r$1;
+		$s = 3; case 3: return $24r;
+		/* */ } return; } var $f = {$blk: ProcessInfoManager.ptr.prototype.RemoveProcessInfoByPid, $c: true, $r, $24r, _r, _r$1, _tuple, err, m, pid, processInfo, screenID, $s};return $f;
+	};
+	ProcessInfoManager.prototype.RemoveProcessInfoByPid = function(screenID, pid) { return this.$val.RemoveProcessInfoByPid(screenID, pid); };
 	ProcessInfoManager.ptr.prototype.WaitProcess = function(screenID) {
 		var {$24r, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, err, m, screenID, startTime, x, $s, $r, $c} = $restore(this, {screenID});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -193580,6 +194426,37 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 		/* */ } return; } var $f = {$blk: ProcessInfoManager.ptr.prototype.WaitProcess, $c: true, $r, $24r, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, err, m, screenID, startTime, x, $s};return $f;
 	};
 	ProcessInfoManager.prototype.WaitProcess = function(screenID) { return this.$val.WaitProcess(screenID); };
+	ProcessInfoManager.ptr.prototype.WaitProcessStopped = function(screenID, timeout) {
+		var {$24r, _r, _r$1, _r$2, _r$3, _tuple, err, m, screenID, startTime, timeout, x, $s, $r, $c} = $restore(this, {screenID, timeout});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		m = this;
+		_r = time.Now(); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		startTime = $clone(_r, time.Time);
+		/* while (true) { */ case 2:
+			_r$1 = m.GetProcessInfo(screenID); /* */ $s = 4; case 4: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+			_tuple = _r$1;
+			err = _tuple[1];
+			if (os.IsNotExist(err)) {
+				$s = -1; return $ifaceNil;
+			}
+			if (!($interfaceIsEqual(err, $ifaceNil))) {
+				$s = -1; return err;
+			}
+			_r$2 = time.Since($clone(startTime, time.Time)); /* */ $s = 7; case 7: if($c) { $c = false; _r$2 = _r$2.$blk(); } if (_r$2 && _r$2.$blk !== undefined) { break s; }
+			/* */ if ((x = _r$2, (x.$high > timeout.$high || (x.$high === timeout.$high && x.$low > timeout.$low)))) { $s = 5; continue; }
+			/* */ $s = 6; continue;
+			/* if ((x = _r$2, (x.$high > timeout.$high || (x.$high === timeout.$high && x.$low > timeout.$low)))) { */ case 5:
+				_r$3 = errs.Errorf("Waiting for process %s stop timed out", new sliceType$2([new $String(screenID)])); /* */ $s = 8; case 8: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
+				$24r = _r$3;
+				$s = 9; case 9: return $24r;
+			/* } */ case 6:
+			$r = time.Sleep(new time.Duration(0, 100000000)); /* */ $s = 10; case 10: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$s = 2; continue;
+		case 3:
+		$s = -1; return $ifaceNil;
+		/* */ } return; } var $f = {$blk: ProcessInfoManager.ptr.prototype.WaitProcessStopped, $c: true, $r, $24r, _r, _r$1, _r$2, _r$3, _tuple, err, m, screenID, startTime, timeout, x, $s};return $f;
+	};
+	ProcessInfoManager.prototype.WaitProcessStopped = function(screenID, timeout) { return this.$val.WaitProcessStopped(screenID, timeout); };
 	ProcessInfoManager.ptr.prototype.GetProcessInfo = function(screenID) {
 		var {_r, _r$1, _tmp, _tmp$1, _tmp$2, _tmp$3, _tmp$4, _tmp$5, _tuple, err, fileBuffer, m, processInfo, screenID, userProcessDirPath, $s, $r, $c} = $restore(this, {screenID});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
@@ -193671,10 +194548,16 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 		onScreenWindowStarted = registerJSBridge;
 	};
 	registerJSBridge = function(w) {
-		var {supraObj, w, x, x$1, x$2, $s, $r, $c} = $restore(this, {w});
+		var {_r, _tuple, deactivateFacades, facades, getCurrentStats, setEncodingPreferences, stopScreen, supraObj, supraValue, w, x, x$1, x$2, $s, $r, $c} = $restore(this, {w});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		deactivateFacades = [deactivateFacades];
+		getCurrentStats = [getCurrentStats];
+		setEncodingPreferences = [setEncodingPreferences];
+		stopScreen = [stopScreen];
+		supraValue = [supraValue];
 		w = [w];
-		supraObj = $makeMap($String.keyFor, [{ k: "setEncodingPreferences", v: (x = js.FuncOf((function(w) { return function $b(this$1, args) {
+		supraValue[0] = new js.Value.ptr(null, false, arrayType.zero());
+		setEncodingPreferences[0] = $clone(js.FuncOf((function(deactivateFacades, getCurrentStats, setEncodingPreferences, stopScreen, supraValue, 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];
@@ -193698,7 +194581,8 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 			w[0].SetEncodingPreferences($clone(prefs[0], stats.EncodingPreferences));
 			$s = -1; return $ifaceNil;
 			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r, args, err, jsonStr, prefs, this$1, $s};return $f;
-		}; })(w)), new x.constructor.elem(x)) }, { k: "getCurrentStats", v: (x$1 = js.FuncOf((function(w) { return function $b(this$1, args) {
+		}; })(deactivateFacades, getCurrentStats, setEncodingPreferences, stopScreen, supraValue, w)), js.Func);
+		getCurrentStats[0] = $clone(js.FuncOf((function(deactivateFacades, getCurrentStats, setEncodingPreferences, stopScreen, supraValue, w) { return function $b(this$1, args) {
 			var {_r, _tuple, args, clientStats, data, err, this$1, $s, $r, $c} = $restore(this, {this$1, args});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 			clientStats = w[0].stats.GetClientStats();
@@ -193714,16 +194598,70 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 			/* } */ case 3:
 			$s = -1; return new $String(($bytesToString(data)));
 			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r, _tuple, args, clientStats, data, err, this$1, $s};return $f;
-		}; })(w)), new x$1.constructor.elem(x$1)) }]);
-		$clone(js.Global(), js.Value).Set("__supra", (x$2 = js.ValueOf(new mapType(supraObj)), new x$2.constructor.elem(x$2)));
-		$r = log.Println(new sliceType$2([new $String("Registered window.__supra JS bridge")])); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		}; })(deactivateFacades, getCurrentStats, setEncodingPreferences, stopScreen, supraValue, w)), js.Func);
+		stopScreen[0] = $clone(js.FuncOf((function(deactivateFacades, getCurrentStats, setEncodingPreferences, stopScreen, supraValue, w) { return function $b(this$1, args) {
+			var {args, this$1, $s, $r, $c} = $restore(this, {this$1, args});
+			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+			$clone(supraValue[0], js.Value).Set("screenStopped", new $Bool(true));
+			$r = log.Println(new sliceType$2([new $String("Screen close lifecycle: JS bridge requested close")])); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$go($methodVal(w[0], "Close"), []);
+			$s = -1; return $ifaceNil;
+			/* */ } return; } var $f = {$blk: $b, $c: true, $r, args, this$1, $s};return $f;
+		}; })(deactivateFacades, getCurrentStats, setEncodingPreferences, stopScreen, supraValue, w)), js.Func);
+		_r = newJSBridgeFacades($clone(setEncodingPreferences[0], js.Func), $clone(getCurrentStats[0], js.Func), $clone(stopScreen[0], js.Func)); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_tuple = _r;
+		facades = $clone(_tuple[0], js.Value);
+		deactivateFacades[0] = _tuple[1];
+		supraObj = $makeMap($String.keyFor, [{ k: "geometry", v: geometryValue(w[0].Geometry()) }, { k: "screenStopped", v: new $Bool(false) }, { k: "screenStopCompleted", v: new $Bool(false) }, { k: "screenLifecycleExited", v: new $Bool(false) }, { k: "setEncodingPreferences", v: (x = $clone(facades, js.Value).Get("setEncodingPreferences"), new x.constructor.elem(x)) }, { k: "getCurrentStats", v: (x$1 = $clone(facades, js.Value).Get("getCurrentStats"), new x$1.constructor.elem(x$1)) }, { k: "stopScreen", v: (x$2 = $clone(facades, js.Value).Get("stopScreen"), new x$2.constructor.elem(x$2)) }]);
+		js.Value.copy(supraValue[0], js.ValueOf(new mapType(supraObj)));
+		$clone(js.Global(), js.Value).Set("__supra", new supraValue[0].constructor.elem(supraValue[0]));
+		$r = w[0].OnClose((function(deactivateFacades, getCurrentStats, setEncodingPreferences, stopScreen, supraValue, w) { return function $b() {
+			var {$s, $r, $c} = $restore(this, {});
+			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+			$r = deactivateFacades[0](); /* */ $s = 1; case 1: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$clone(setEncodingPreferences[0], js.Func).Release();
+			$clone(getCurrentStats[0], js.Func).Release();
+			$clone(stopScreen[0], js.Func).Release();
+			$r = log.Println(new sliceType$2([new $String("Screen close lifecycle: setting JS completion marker")])); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+			$clone(supraValue[0], js.Value).Set("screenStopCompleted", new $Bool(true));
+			$r = log.Println(new sliceType$2([new $String("Screen close lifecycle: JS completion marker set")])); /* */ $s = 3; case 3: 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;
+		}; })(deactivateFacades, getCurrentStats, setEncodingPreferences, stopScreen, supraValue, w)); /* */ $s = 2; case 2: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = log.Println(new sliceType$2([new $String("Registered window.__supra JS bridge")])); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$s = -1; return;
-		/* */ } return; } var $f = {$blk: registerJSBridge, $c: true, $r, supraObj, w, x, x$1, x$2, $s};return $f;
+		/* */ } return; } var $f = {$blk: registerJSBridge, $c: true, $r, _r, _tuple, deactivateFacades, facades, getCurrentStats, setEncodingPreferences, stopScreen, supraObj, supraValue, w, x, x$1, x$2, $s};return $f;
+	};
+	newJSBridgeFacades = function(setEncodingPreferences, getCurrentStats, stopScreen) {
+		var {_r, _r$1, deactivate, facades, getCurrentStats, setEncodingPreferences, state, stopScreen, $s, $r, $c} = $restore(this, {setEncodingPreferences, getCurrentStats, stopScreen});
+		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
+		state = [state];
+		state[0] = $clone(js.ValueOf(new mapType($makeMap($String.keyFor, [{ k: "active", v: new $Bool(true) }, { k: "setEncodingPreferences", v: new setEncodingPreferences.constructor.elem(setEncodingPreferences) }, { k: "getCurrentStats", v: new getCurrentStats.constructor.elem(getCurrentStats) }, { k: "stopScreen", v: new stopScreen.constructor.elem(stopScreen) }]))), js.Value);
+		_r = $clone($clone(js.Global(), js.Value).Get("Function"), js.Value).New(new sliceType$2([new $String("state"), new $String("return {\n\t\t\tsetEncodingPreferences: function(json) {\n\t\t\t\tif (state.active) return state.setEncodingPreferences(json);\n\t\t\t},\n\t\t\tgetCurrentStats: function() {\n\t\t\t\tif (state.active) return state.getCurrentStats();\n\t\t\t\treturn null;\n\t\t\t},\n\t\t\tstopScreen: function() {\n\t\t\t\tif (state.active) return state.stopScreen();\n\t\t\t}\n\t\t};")])); /* */ $s = 1; case 1: if($c) { $c = false; _r = _r.$blk(); } if (_r && _r.$blk !== undefined) { break s; }
+		_r$1 = $clone(_r, js.Value).Invoke(new sliceType$2([new state[0].constructor.elem(state[0])])); /* */ $s = 2; case 2: if($c) { $c = false; _r$1 = _r$1.$blk(); } if (_r$1 && _r$1.$blk !== undefined) { break s; }
+		facades = $clone(_r$1, js.Value);
+		deactivate = (function(state) { return function() {
+			var x, x$1, x$2;
+			$clone(state[0], js.Value).Set("active", new $Bool(false));
+			$clone(state[0], js.Value).Set("setEncodingPreferences", (x = js.Undefined(), new x.constructor.elem(x)));
+			$clone(state[0], js.Value).Set("getCurrentStats", (x$1 = js.Undefined(), new x$1.constructor.elem(x$1)));
+			$clone(state[0], js.Value).Set("stopScreen", (x$2 = js.Undefined(), new x$2.constructor.elem(x$2)));
+		}; })(state);
+		$s = -1; return [facades, deactivate];
+		/* */ } return; } var $f = {$blk: newJSBridgeFacades, $c: true, $r, _r, _r$1, deactivate, facades, getCurrentStats, setEncodingPreferences, state, stopScreen, $s};return $f;
+	};
+	geometryValue = function(g) {
+		var g;
+		if (g === ptrType$14.nil) {
+			return $ifaceNil;
+		}
+		return new mapType($makeMap($String.keyFor, [{ k: "x", v: new $Int(g.X) }, { k: "y", v: new $Int(g.Y) }, { k: "width", v: new $Int(g.Width) }, { k: "height", v: new $Int(g.Height) }]));
 	};
-	ptrType$15.methods = [{prop: "StartScreen", name: "StartScreen", pkg: "", typ: $funcType([$String, netpacket.Driver, $String, netstream.Driver, $String, $String, $String, $Bool], [$error], false)}, {prop: "openWindow", name: "openWindow", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([$String, screenParams, sliceType$4], [js.Value, $error], false)}, {prop: "closeWindow", name: "closeWindow", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([js.Value], [$error], false)}, {prop: "StopScreen", name: "StopScreen", pkg: "", typ: $funcType([$String], [$error], false)}, {prop: "pipeErrLog", name: "pipeErrLog", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([$String, io.Reader], [$error], false)}, {prop: "ListScreens", name: "ListScreens", pkg: "", typ: $funcType([], [sliceType$4, $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)}];
+	ptrType$16.methods = [{prop: "StartScreen", name: "StartScreen", pkg: "", typ: $funcType([$String, netpacket.Driver, $String, netstream.Driver, $String, $String, $String, $Bool], [$error], false)}, {prop: "openWindow", name: "openWindow", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([$String, screenParams, sliceType$4], [js.Value, $error], false)}, {prop: "closeWindow", name: "closeWindow", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([js.Value], [$error], false)}, {prop: "StopScreen", name: "StopScreen", pkg: "", typ: $funcType([$String], [$error], false)}, {prop: "pipeErrLog", name: "pipeErrLog", pkg: "github.com/supraio/client-daemon/pkg/render", typ: $funcType([$String, io.Reader], [$error], false)}, {prop: "ListScreens", name: "ListScreens", pkg: "", typ: $funcType([], [sliceType$4, $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: "RemoveProcessInfoByPid", name: "RemoveProcessInfoByPid", pkg: "", typ: $funcType([$String, $Int], [$error], false)}, {prop: "WaitProcess", name: "WaitProcess", pkg: "", typ: $funcType([$String], [$error], false)}, {prop: "WaitProcessStopped", name: "WaitProcessStopped", pkg: "", typ: $funcType([$String, time.Duration], [$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)}];
+	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\""}]);
 	screenParams.init("", [{prop: "ScreenID", name: "ScreenID", embedded: false, exported: true, typ: $String, tag: "url:\"screenID\""}, {prop: "ScreenDriver", name: "ScreenDriver", embedded: false, exported: true, typ: $String, tag: "url:\"screenDriver\""}, {prop: "ScreenHost", name: "ScreenHost", embedded: false, exported: true, typ: $String, tag: "url:\"screenHost\""}, {prop: "MetadataDriver", name: "MetadataDriver", embedded: false, exported: true, typ: $String, tag: "url:\"metadataDriver\""}, {prop: "MetadataHost", name: "MetadataHost", embedded: false, exported: true, typ: $String, tag: "url:\"metadataHost\""}, {prop: "ClientID", name: "ClientID", embedded: false, exported: true, typ: $String, tag: "url:\"clientID\""}, {prop: "ClientSecret", name: "ClientSecret", embedded: false, exported: true, typ: $String, tag: "url:\"clientSecret\""}, {prop: "Secure", name: "Secure", embedded: false, exported: true, typ: $Bool, tag: "url:\"secure\""}]);
-	ScreenManager.init("github.com/supraio/client-daemon/pkg/render", [{prop: "screenWindowCmd", name: "screenWindowCmd", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "logDir", name: "logDir", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "processInfoManager", name: "processInfoManager", embedded: false, exported: false, typ: ptrType, tag: ""}]);
+	ScreenManager.init("github.com/supraio/client-daemon/pkg/render", [{prop: "screenWindowCmd", name: "screenWindowCmd", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "logDir", name: "logDir", embedded: false, exported: false, typ: $String, tag: ""}, {prop: "processInfoManager", name: "processInfoManager", embedded: false, exported: false, typ: ptrType, tag: ""}, {prop: "processMu", name: "processMu", embedded: false, exported: false, typ: sync.Mutex, tag: ""}]);
 	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: ""}]);
 	$init = function() {
@@ -193768,10 +194706,11 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 		$r = log.$init(); /* */ $s = 37; case 37: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$r = os.$init(); /* */ $s = 38; case 38: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$r = path.$init(); /* */ $s = 39; case 39: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = strings.$init(); /* */ $s = 40; case 40: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = sync.$init(); /* */ $s = 41; case 41: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = js.$init(); /* */ $s = 42; case 42: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = time.$init(); /* */ $s = 43; case 43: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = strconv.$init(); /* */ $s = 40; case 40: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = strings.$init(); /* */ $s = 41; case 41: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = sync.$init(); /* */ $s = 42; case 42: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = js.$init(); /* */ $s = 43; case 43: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		$r = time.$init(); /* */ $s = 44; case 44: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		onScreenWindowStarted = $throwNilPointerError;
 		openScreenWindows = $makeMap($String.keyFor, []);
 		mutex = new sync.Mutex.ptr(0, 0);
@@ -193795,7 +194734,7 @@ $packages["main"] = (function() {
 	sliceType = $sliceType($String);
 	sliceType$1 = $sliceType($emptyInterface);
 	main = function() {
-		var {_arg, _arg$1, _r, _r$1, _r$2, _r$3, _r$4, _tuple, _tuple$1, cfg, commandHandler, err, err$1, logFile, processInfoManager, screenManager, signalChannel, $s, $deferred, $r, $c} = $restore(this, {});
+		var {_arg, _arg$1, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, _tuple$1, cfg, commandHandler, err, err$1, logFile, processInfoManager, screenManager, signalChannel, $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);
 		commandHandler = [commandHandler];
 		logFile = [logFile];
@@ -193863,10 +194802,11 @@ $packages["main"] = (function() {
 			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r$5, err$2, $s};return $f;
 		}; })(commandHandler, logFile), []]);
 		$r = log.Println(new sliceType$1([new $String("Supra client-daemon started")])); /* */ $s = 21; case 21: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-		$r = helper.WaitOnStopSignal(signalChannel); /* */ $s = 22; case 22: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
+		_r$5 = helper.WaitOnStopSignal(signalChannel); /* */ $s = 22; case 22: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
+		_r$5;
 		$r = log.Println(new sliceType$1([new $String("Supra client-daemon is stopping")])); /* */ $s = 23; case 23: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 		$s = -1; return;
-		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: main, $c: true, $r, _arg, _arg$1, _r, _r$1, _r$2, _r$3, _r$4, _tuple, _tuple$1, cfg, commandHandler, err, err$1, logFile, processInfoManager, screenManager, signalChannel, $s, $deferred};return $f; } }
+		/* */ } return; } } catch(err) { $err = err; $s = -1; } finally { $callDeferred($deferred, $err); if($curGoroutine.asleep) { var $f = {$blk: main, $c: true, $r, _arg, _arg$1, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tuple, _tuple$1, cfg, commandHandler, err, err$1, logFile, processInfoManager, screenManager, signalChannel, $s, $deferred};return $f; } }
 	};
 	$init = function() {
 		$pkg.$init = function() {};