@supraio/client-daemon-js 0.0.0-mzudpstream.306 → 0.0.0-mzudpstream.307

package/supra-client-screen.js

@@ -64090,7 +64090,7 @@ $packages["github.com/supraio/client-daemon/pkg/config"] = (function() {
 		defaultUsername = "unknown";
 	};
 	ParseConfig = function() {
-		var {_arg, _arg$1, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tmp, _tmp$1, _tmp$2, _tmp$3, _tmp$4, _tmp$5, _tuple, _tuple$1, _tuple$2, cfg, clientBaseDir, currentUser, err, err$1, homeDir, screenWindowCmd, $s, $r, $c} = $restore(this, {});
+		var {_arg, _arg$1, _r, _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, _tuple, _tuple$1, _tuple$2, cfg, clientBaseDir, currentUser, err, err$1, homeDir, screenWindowCmd, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		cfg = [cfg];
 		cfg[0] = new Config.ptr("", "", "", "", "", new time.Duration(0, 0), "");
@@ -64114,6 +64114,13 @@ $packages["github.com/supraio/client-daemon/pkg/config"] = (function() {
 		_arg$1 = _r$2;
 		_r$3 = _r$1.Load(_arg, _arg$1); /* */ $s = 4; case 4: if($c) { $c = false; _r$3 = _r$3.$blk(); } if (_r$3 && _r$3.$blk !== undefined) { break s; }
 		err = _r$3;
+		if (!($interfaceIsEqual(err, $ifaceNil))) {
+			_tmp$2 = $clone(cfg[0], Config);
+			_tmp$3 = err;
+			Config.copy(cfg[0], _tmp$2);
+			err = _tmp$3;
+			$s = -1; return [cfg[0], err];
+		}
 		if (cfg[0].RunDir === "") {
 			cfg[0].RunDir = clientBaseDir + "/run";
 		}
@@ -64148,10 +64155,10 @@ $packages["github.com/supraio/client-daemon/pkg/config"] = (function() {
 				currentUser = _tuple$1[0];
 				err$1 = _tuple$1[1];
 				if (!($interfaceIsEqual(err$1, $ifaceNil))) {
-					_tmp$2 = $clone(cfg[0], Config);
-					_tmp$3 = err$1;
-					Config.copy(cfg[0], _tmp$2);
-					err = _tmp$3;
+					_tmp$4 = $clone(cfg[0], Config);
+					_tmp$5 = err$1;
+					Config.copy(cfg[0], _tmp$4);
+					err = _tmp$5;
 					$s = -1; return [cfg[0], err];
 				}
 				cfg[0].Username = currentUser.Username;
@@ -64165,12 +64172,12 @@ $packages["github.com/supraio/client-daemon/pkg/config"] = (function() {
 		}
 		_r$5 = makeDirs($clone(cfg[0], Config)); /* */ $s = 11; case 11: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
 		err = _r$5;
-		_tmp$4 = $clone(cfg[0], Config);
-		_tmp$5 = err;
-		Config.copy(cfg[0], _tmp$4);
-		err = _tmp$5;
+		_tmp$6 = $clone(cfg[0], Config);
+		_tmp$7 = err;
+		Config.copy(cfg[0], _tmp$6);
+		err = _tmp$7;
 		$s = -1; return [cfg[0], err];
-		/* */ } return; } var $f = {$blk: ParseConfig, $c: true, $r, _arg, _arg$1, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _tmp, _tmp$1, _tmp$2, _tmp$3, _tmp$4, _tmp$5, _tuple, _tuple$1, _tuple$2, cfg, clientBaseDir, currentUser, err, err$1, homeDir, screenWindowCmd, $s};return $f;
+		/* */ } return; } var $f = {$blk: ParseConfig, $c: true, $r, _arg, _arg$1, _r, _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, _tuple, _tuple$1, _tuple$2, cfg, clientBaseDir, currentUser, err, err$1, homeDir, screenWindowCmd, $s};return $f;
 	};
 	$pkg.ParseConfig = ParseConfig;
 	getConfigFilePaths = function(clientBaseDir) {
@@ -191223,7 +191230,13 @@ $packages["github.com/supraio/client-daemon/pkg/videostream"] = (function() {
 		$panic(new $String("not implemented GetPort"));
 	};
 	UnavailableVideoStreamer.prototype.GetPort = function() { return this.$val.GetPort(); };
-	ptrType.methods = [{prop: "IsAvailable", name: "IsAvailable", pkg: "", typ: $funcType([], [$Bool], false)}, {prop: "GetProtocol", name: "GetProtocol", pkg: "", typ: $funcType([], [Protocol], false)}, {prop: "GetPort", name: "GetPort", pkg: "", typ: $funcType([], [$Uint16], false)}];
+	UnavailableVideoStreamer.ptr.prototype.GetHostname = function() {
+		var u;
+		u = this;
+		$panic(new $String("not implemented GetHostname"));
+	};
+	UnavailableVideoStreamer.prototype.GetHostname = function() { return this.$val.GetHostname(); };
+	ptrType.methods = [{prop: "IsAvailable", name: "IsAvailable", pkg: "", typ: $funcType([], [$Bool], false)}, {prop: "GetProtocol", name: "GetProtocol", pkg: "", typ: $funcType([], [Protocol], false)}, {prop: "GetPort", name: "GetPort", pkg: "", typ: $funcType([], [$Uint16], false)}, {prop: "GetHostname", name: "GetHostname", pkg: "", typ: $funcType([], [$String], false)}];
 	UnavailableVideoStreamer.init("", []);
 	$init = function() {
 		$pkg.$init = function() {};
@@ -191311,6 +191324,17 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 		return ((port << 16 >>> 16));
 	};
 	SOSVideoStreamer.prototype.GetPort = function() { return this.$val.GetPort(); };
+	SOSVideoStreamer.ptr.prototype.GetHostname = function() {
+		var hostname, hostnameValue, m;
+		m = this;
+		hostnameValue = $clone($clone($clone(m.sos, js.Value).Get("config"), js.Value).Get("streamHostname"), js.Value);
+		hostname = "";
+		if (!$clone(hostnameValue, js.Value).IsUndefined() && ($clone(hostnameValue, js.Value).Type() === 4)) {
+			hostname = $clone(hostnameValue, js.Value).String();
+		}
+		return hostname;
+	};
+	SOSVideoStreamer.prototype.GetHostname = function() { return this.$val.GetHostname(); };
 	NewDecoder = function(header) {
 		var header, sos;
 		sos = $clone($clone(js.Global(), js.Value).Get("sos"), js.Value);
@@ -191326,7 +191350,7 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 		/* if (!m.started) { */ case 1:
 			protocol = m.getProtocol();
 			port = m.getPort();
-			hostname = m.getHostname(protocol);
+			hostname = m.getStreamHostname(protocol);
 			urlProtocol = m.getURLProtocol(protocol);
 			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; }
@@ -191408,23 +191432,23 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 		return serverHostname;
 	};
 	SOSStreamDecoder.prototype.getServerHostname = function() { return this.$val.getServerHostname(); };
-	SOSStreamDecoder.ptr.prototype.getHostname = function(protocol) {
-		var _1, hostname, hostnameValue, m, protocol;
+	SOSStreamDecoder.ptr.prototype.getStreamHostname = function(protocol) {
+		var _1, hostname, m, protocol, videoStreamer;
 		m = this;
-		hostnameValue = $clone($clone($clone(m.sos, js.Value).Get("config"), js.Value).Get("streamHostname"), js.Value);
-		hostname = "";
+		videoStreamer = new SOSVideoStreamer.ptr($clone(m.sos, js.Value));
+		hostname = videoStreamer.GetHostname();
+		if (!(hostname === "")) {
+			return hostname;
+		}
 		_1 = protocol;
 		if ((_1 === (0)) || (_1 === (3))) {
 			hostname = "0.0.0.0";
 		} else if ((_1 === (1)) || (_1 === (2))) {
 			hostname = m.getServerHostname();
 		}
-		if (!$clone(hostnameValue, js.Value).IsUndefined() && ($clone(hostnameValue, js.Value).Type() === 4)) {
-			hostname = $clone(hostnameValue, js.Value).String();
-		}
 		return hostname;
 	};
-	SOSStreamDecoder.prototype.getHostname = function(protocol) { return this.$val.getHostname(protocol); };
+	SOSStreamDecoder.prototype.getStreamHostname = function(protocol) { return this.$val.getStreamHostname(protocol); };
 	SOSStreamDecoder.ptr.prototype.getURLProtocol = function(protocol) {
 		var _1, m, protocol;
 		m = this;
@@ -191455,8 +191479,8 @@ $packages["github.com/supraio/client-daemon/pkg/decoder/sosstream"] = (function(
 		}
 	};
 	SOSStreamDecoder.prototype.getSOSProtocol = function(protocol) { return this.$val.getSOSProtocol(protocol); };
-	ptrType$1.methods = [{prop: "IsAvailable", name: "IsAvailable", pkg: "", typ: $funcType([], [$Bool], false)}, {prop: "GetProtocol", name: "GetProtocol", pkg: "", typ: $funcType([], [videostream.Protocol], false)}, {prop: "GetPort", name: "GetPort", pkg: "", typ: $funcType([], [$Uint16], false)}];
-	ptrType$2.methods = [{prop: "Write", name: "Write", pkg: "", typ: $funcType([sliceType$1], [$error], false)}, {prop: "NextOutput", name: "NextOutput", pkg: "", typ: $funcType([general.OutputBuffer], [$error], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([general.OutputBuffer], [], false)}, {prop: "getProtocol", name: "getProtocol", pkg: "github.com/supraio/client-daemon/pkg/decoder/sosstream", typ: $funcType([], [videostream.Protocol], false)}, {prop: "getPort", name: "getPort", pkg: "github.com/supraio/client-daemon/pkg/decoder/sosstream", typ: $funcType([], [$Uint16], false)}, {prop: "getServerHostname", name: "getServerHostname", pkg: "github.com/supraio/client-daemon/pkg/decoder/sosstream", typ: $funcType([], [$String], false)}, {prop: "getHostname", name: "getHostname", 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)}];
+	ptrType$1.methods = [{prop: "IsAvailable", name: "IsAvailable", pkg: "", typ: $funcType([], [$Bool], 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)}];
+	ptrType$2.methods = [{prop: "Write", name: "Write", pkg: "", typ: $funcType([sliceType$1], [$error], false)}, {prop: "NextOutput", name: "NextOutput", pkg: "", typ: $funcType([general.OutputBuffer], [$error], false)}, {prop: "Release", name: "Release", pkg: "", typ: $funcType([general.OutputBuffer], [], false)}, {prop: "getProtocol", name: "getProtocol", pkg: "github.com/supraio/client-daemon/pkg/decoder/sosstream", typ: $funcType([], [videostream.Protocol], false)}, {prop: "getPort", name: "getPort", pkg: "github.com/supraio/client-daemon/pkg/decoder/sosstream", typ: $funcType([], [$Uint16], 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: ""}]);
 	SOSStreamDecoder.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: ""}]);
 	$init = function() {
@@ -194038,7 +194062,7 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 	};
 	ScreenWindow.prototype.getFrameHealthCheckTimeout = function() { return this.$val.getFrameHealthCheckTimeout(); };
 	ScreenWindow.ptr.prototype.openScreen = function() {
-		var {_arg, _arg$1, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _tuple, _tuple$1, conn, connect, data, err, frameCollector, maxPacketSize, msgData, screenSender, videoStreamer, w, $s, $r, $c} = $restore(this, {});
+		var {_arg, _arg$1, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _tuple, _tuple$1, conn, connect, data, err, frameCollector, maxPacketSize, msgData, screenSender, streamHostname, videoStreamer, w, $s, $r, $c} = $restore(this, {});
 		/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 		err = [err];
 		screenSender = [screenSender];
@@ -194089,23 +194113,28 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 			_r$5 = videoStreamer.GetPort(); /* */ $s = 8; case 8: if($c) { $c = false; _r$5 = _r$5.$blk(); } if (_r$5 && _r$5.$blk !== undefined) { break s; }
 			_arg$1 = (_r$5);
 			$r = $clone(binary.BigEndian, binary.bigEndian).PutUint16(_arg, _arg$1); /* */ $s = 9; case 9: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-			_r$6 = screenSender[0].Send(5, data); /* */ $s = 10; case 10: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
-			err[0] = _r$6;
+			_r$6 = videoStreamer.GetHostname(); /* */ $s = 10; case 10: if($c) { $c = false; _r$6 = _r$6.$blk(); } if (_r$6 && _r$6.$blk !== undefined) { break s; }
+			streamHostname = _r$6;
+			if (!(streamHostname === "")) {
+				data = $appendSlice(data, (new sliceType$2($stringToBytes(streamHostname))));
+			}
+			_r$7 = screenSender[0].Send(5, data); /* */ $s = 11; case 11: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
+			err[0] = _r$7;
 			if (!($interfaceIsEqual(err[0], $ifaceNil))) {
 				$s = -1; return err[0];
 			}
 		/* } */ case 5:
 		$go((function(err, screenSender, w) { return function $b() {
-			var {_r$10, _r$11, _r$7, _r$8, _r$9, err$1, $s, $r, $c} = $restore(this, {});
+			var {_r$10, _r$11, _r$12, _r$8, _r$9, err$1, $s, $r, $c} = $restore(this, {});
 			/* */ $s = $s || 0; s: while (true) { switch ($s) { case 0:
 			/* while (true) { */ case 1:
 				/* if (!(!w[0].closed)) { break; } */ if(!(!w[0].closed)) { $s = 2; continue; }
 				$r = time.Sleep(new time.Duration(0, 1000000000)); /* */ $s = 3; case 3: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
-				_r$7 = time.Now(); /* */ $s = 6; case 6: if($c) { $c = false; _r$7 = _r$7.$blk(); } if (_r$7 && _r$7.$blk !== undefined) { break s; }
-				_r$8 = $clone($clone(w[0].stats.GetLastFrameAt(), time.Time).Add(w[0].getFrameHealthCheckTimeout()), time.Time).Before($clone(_r$7, time.Time)); /* */ $s = 7; case 7: if($c) { $c = false; _r$8 = _r$8.$blk(); } if (_r$8 && _r$8.$blk !== undefined) { break s; }
-				/* */ if (_r$8) { $s = 4; continue; }
+				_r$8 = time.Now(); /* */ $s = 6; case 6: if($c) { $c = false; _r$8 = _r$8.$blk(); } if (_r$8 && _r$8.$blk !== undefined) { break s; }
+				_r$9 = $clone($clone(w[0].stats.GetLastFrameAt(), time.Time).Add(w[0].getFrameHealthCheckTimeout()), time.Time).Before($clone(_r$8, time.Time)); /* */ $s = 7; case 7: if($c) { $c = false; _r$9 = _r$9.$blk(); } if (_r$9 && _r$9.$blk !== undefined) { break s; }
+				/* */ if (_r$9) { $s = 4; continue; }
 				/* */ $s = 5; continue;
-				/* if (_r$8) { */ case 4:
+				/* if (_r$9) { */ case 4:
 					if (!(w[0].pinger === ptrType$9.nil)) {
 						w[0].pinger.Close();
 						w[0].pinger = ptrType$9.nil;
@@ -194122,22 +194151,22 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 						w[0].renderingLoop.Stop();
 						w[0].renderingLoop = ptrType$5.nil;
 					}
-					_r$9 = screenSender[0].Send(3, new sliceType$2([])); /* */ $s = 8; case 8: if($c) { $c = false; _r$9 = _r$9.$blk(); } if (_r$9 && _r$9.$blk !== undefined) { break s; }
-					err[0] = _r$9;
+					_r$10 = screenSender[0].Send(3, new sliceType$2([])); /* */ $s = 8; case 8: if($c) { $c = false; _r$10 = _r$10.$blk(); } if (_r$10 && _r$10.$blk !== undefined) { break s; }
+					err[0] = _r$10;
 					/* */ if (!($interfaceIsEqual(err[0], $ifaceNil))) { $s = 9; continue; }
 					/* */ $s = 10; continue;
 					/* if (!($interfaceIsEqual(err[0], $ifaceNil))) { */ case 9:
 						$r = errs.Print("Could not send disconnect msg to screen", err[0]); /* */ $s = 11; case 11: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 					/* } */ case 10:
-					_r$10 = w[0].screenConn.Close(); /* */ $s = 12; case 12: if($c) { $c = false; _r$10 = _r$10.$blk(); } if (_r$10 && _r$10.$blk !== undefined) { break s; }
-					err[0] = _r$10;
+					_r$11 = w[0].screenConn.Close(); /* */ $s = 12; case 12: if($c) { $c = false; _r$11 = _r$11.$blk(); } if (_r$11 && _r$11.$blk !== undefined) { break s; }
+					err[0] = _r$11;
 					/* */ if (!($interfaceIsEqual(err[0], $ifaceNil))) { $s = 13; continue; }
 					/* */ $s = 14; continue;
 					/* if (!($interfaceIsEqual(err[0], $ifaceNil))) { */ case 13:
 						$r = errs.Print("Could not disconnect screen", err[0]); /* */ $s = 15; case 15: if($c) { $c = false; $r = $r.$blk(); } if ($r && $r.$blk !== undefined) { break s; }
 					/* } */ case 14:
-					_r$11 = w[0].retriableOpen(-1, $methodVal(w[0], "openScreen")); /* */ $s = 16; case 16: if($c) { $c = false; _r$11 = _r$11.$blk(); } if (_r$11 && _r$11.$blk !== undefined) { break s; }
-					err$1 = _r$11;
+					_r$12 = w[0].retriableOpen(-1, $methodVal(w[0], "openScreen")); /* */ $s = 16; case 16: if($c) { $c = false; _r$12 = _r$12.$blk(); } if (_r$12 && _r$12.$blk !== undefined) { break s; }
+					err$1 = _r$12;
 					/* */ if (!($interfaceIsEqual(err$1, $ifaceNil))) { $s = 17; continue; }
 					/* */ $s = 18; continue;
 					/* if (!($interfaceIsEqual(err$1, $ifaceNil))) { */ case 17:
@@ -194148,10 +194177,10 @@ $packages["github.com/supraio/client-daemon/pkg/render"] = (function() {
 			$s = 1; continue;
 			case 2:
 			$s = -1; return;
-			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r$10, _r$11, _r$7, _r$8, _r$9, err$1, $s};return $f;
+			/* */ } return; } var $f = {$blk: $b, $c: true, $r, _r$10, _r$11, _r$12, _r$8, _r$9, err$1, $s};return $f;
 		}; })(err, screenSender, w), []);
 		$s = -1; return $ifaceNil;
-		/* */ } return; } var $f = {$blk: ScreenWindow.ptr.prototype.openScreen, $c: true, $r, _arg, _arg$1, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _tuple, _tuple$1, conn, connect, data, err, frameCollector, maxPacketSize, msgData, screenSender, videoStreamer, w, $s};return $f;
+		/* */ } return; } var $f = {$blk: ScreenWindow.ptr.prototype.openScreen, $c: true, $r, _arg, _arg$1, _r, _r$1, _r$2, _r$3, _r$4, _r$5, _r$6, _r$7, _tuple, _tuple$1, conn, connect, data, err, frameCollector, maxPacketSize, msgData, screenSender, streamHostname, videoStreamer, w, $s};return $f;
 	};
 	ScreenWindow.prototype.openScreen = function() { return this.$val.openScreen(); };
 	ScreenWindow.ptr.prototype.createScreenBuffer = function() {