sfu update

fast disable SFU

SFU/config.js

@@ -11,7 +11,7 @@ for(let arg of process.argv){
 }
 
 const config = {
-  signallingURL: "ws://localhost:8889",
+  signallingURL: "ws://localhost:0000",
 
   mediasoup: {
     worker: {
@@ -25,7 +25,7 @@ const config = {
         "rtp",
         "srtp",
         "rtcp",
-        "sctp"
+        "sctp",
         // 'rtx',
         // 'bwe',
         // 'score',

SFU/package-lock.json

@@ -10,6 +10,7 @@
       "dependencies": {
         "mediasoup_prebuilt": "^3.8.4",
         "mediasoup-sdp-bridge": "file:mediasoup-sdp-bridge",
+        "run-script-os": "^1.1.6",
         "ws": "^7.1.2"
       }
     },
@@ -176,6 +177,15 @@
       "resolved": "https://registry.npmjs.org/random-number/-/random-number-0.0.9.tgz",
       "integrity": "sha512-ipG3kRCREi/YQpi2A5QGcvDz1KemohovWmH6qGfboVyyGdR2t/7zQz0vFxrfxpbHQgPPdtVlUDaks3aikD1Ljw=="
     },
+    "node_modules/run-script-os": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
+      "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==",
+      "bin": {
+        "run-os": "index.js",
+        "run-script-os": "index.js"
+      }
+    },
     "node_modules/sdp-transform": {
       "version": "2.14.1",
       "resolved": "https://registry.npmjs.org/sdp-transform/-/sdp-transform-2.14.1.tgz",
@@ -346,6 +356,11 @@
       "resolved": "https://registry.npmjs.org/random-number/-/random-number-0.0.9.tgz",
       "integrity": "sha512-ipG3kRCREi/YQpi2A5QGcvDz1KemohovWmH6qGfboVyyGdR2t/7zQz0vFxrfxpbHQgPPdtVlUDaks3aikD1Ljw=="
     },
+    "run-script-os": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
+      "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw=="
+    },
     "sdp-transform": {
       "version": "2.14.1",
       "resolved": "https://registry.npmjs.org/sdp-transform/-/sdp-transform-2.14.1.tgz",

SFU/sfu_server.js

@@ -1,4 +1,18 @@
+var server_settings = process.argv.slice(2)
+if (!server_settings) {
+  console.log('not enough arguments, exit()')
+	process.exit(1)
+}
+
+try {
+	server_settings = JSON.parse(server_settings)
+} catch (err) {
+	console.log('can not process arguments, exit()')
+	process.exit(1)
+}
+
 const config = require('./config');
+config.signallingURL = 'ws://127.0.0.1:' + server_settings.sfu_port
 const WebSocket = require('ws');
 const mediasoup = require('mediasoup_prebuilt');
 const mediasoupSdp = require('mediasoup-sdp-bridge');
@@ -70,7 +84,7 @@ function getNextStreamerSCTPId() {
 }
 
 function onStreamerDisconnected() {
-  console.log("Streamer disconnected");
+  console.log("Streamer disconnected from SFU");
   disconnectAllPeers();
 
   if (streamer != null) {

SignallingWebServer/Public/Play.svg

@@ -0,0 +1,3 @@
+<svg width="72" height="72" viewBox="0 0 72 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M54 35.9999L27.0001 53.9999L27.0001 18L54 35.9999Z" fill="white" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

SignallingWebServer/Public/playbutton.svg

@@ -0,0 +1,3 @@
+<svg width="106" height="106" viewBox="0 0 106 106" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="53" cy="53" r="53" fill="#454545"/>
+</svg>

SignallingWebServer/Public/player.css

@@ -1,20 +1,69 @@
 /*Copyright Epic Games, Inc. All Rights Reserved.*/
+@import url(./fonts/fonts.css);
+
 :root {
 	/*Using colour scheme https://color.adobe.com/TD-Colors---Option-3-color-theme-10394433/*/
-	--colour1:#000000;
-	--colour2:#FFFFFF;
-	--colour3:#0585fe;
-	--colour4:#35b350;
-	--colour5:#ffab00;
-	--colour6:#1e1d22;
-	--colour7:#3c3b40;
+	--colour1: #151619;
+	;
+	--colour2: #FFFFFF;
+	--colour3: #0585fe;
+	--colour4: #35b350;
+	--colour5: #ffab00;
+	--colour6: #1e1d22;
+	--colour7: #3c3b40;
 }
 
-body{
-    margin: 0px;
-    background-color: black;
+#loader {
+	width: 106px;
+	height: 106px;
+	border-radius: 50%;
+	display: inline-block;
+	position: relative;
+	background: conic-gradient(from 135deg at 50% 50%,
+			rgba(255, 255, 255, 0) -6.26deg,
+			#ffffff 314.83deg,
+			rgba(255, 255, 255, 0) 353.74deg,
+			#ffffff 674.83deg);
+	box-sizing: border-box;
+	animation: rotation 1s linear infinite;
+}
+
+
+@keyframes rotation {
+	0% {
+		transform: rotate(0deg);
+
+	}
+
+	100% {
+		transform: rotate(360deg);
+	}
+
+}
+
+#loader::after {
+	content: "";
+	box-sizing: border-box;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	width: 100px;
+	height: 100px;
+	border-radius: 50%;
+	background: #151619;
+}
+
+body {
+	margin: 0px;
+	background-color: #151619;
+
 	font-family: 'Montserrat', sans-serif;
-}	
+}
+
+h2 {
+	font-family: "GilroyWebRegular";
+}
 
 #playerUI {
 	width: 100%;
@@ -22,8 +71,8 @@ body{
 }
 
 canvas {
-    image-rendering: crisp-edges;
-    position: absolute;
+	image-rendering: crisp-edges;
+	position: absolute;
 }
 
 video {
@@ -32,14 +81,13 @@ video {
 	height: 100%;
 }
 
-#player{
+#player {
 	width: 100%;
 	height: 100%;
 	position: absolute;
-	background-color: #000;
 }
 
-#videoPlayOverlay{
+#videoPlayOverlay {
 	position: absolute;
 	font-size: 1.8em;
 	width: 100%;
@@ -48,15 +96,14 @@ video {
 }
 
 /* State for element to be clickable */
-.clickableState{
+.clickableState {
 	align-items: center;
 	justify-content: center;
 	display: flex;
-	cursor: pointer;
 }
 
 /* State for element to show text, this is for informational use*/
-.textDisplayState{
+.textDisplayState {
 	align-items: center;
 	justify-content: center;
 	display: flex;
@@ -64,21 +111,108 @@ video {
 }
 
 /* State to hide overlay, WebRTC communication is in progress and or is playing */
-.hiddenState{
+.hiddenState {
 	display: none;
 }
 
-#playButton{
-	display: inline-block;
-	height: auto;
+#playButton {
+	display: block;
+	width: 88px;
+	height: 88px;
 	z-index: 30;
+	backdrop-filter: blur(10px);
+	border-radius: 112px;
+	cursor: pointer;
 }
 
-img#playButton{
-	max-width: 241px;
-	width: 10%;
+
+
+#container {
+	width: 400px;
+	height: 100%;
+	justify-content: center;
+	/* Background */
+	background: transparent;
+	/* Button_1 */
+	border-width: 0px 2px;
+	border-style: solid;
+	border-color: #23242A;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	gap: 40px;
+	padding: 40px 56px;
+	box-sizing: border-box;
 }
 
+@media screen and (max-width: 500px) {
+	#container {
+		width: 100%;
+		border: none;
+	}
+
+}
+
+
+
+
+
+#playButton:hover {
+	background: linear-gradient(180deg, #BC75FF 0%, #798FFF 100%);
+	backdrop-filter: blur(10px)
+}
+
+#title {
+	font-style: normal;
+	font-weight: 400;
+	font-size: 38px;
+	line-height: 100%;
+	/* or 38px */
+	/* White */
+	color: #F2F2F2;
+	margin: 0 0 16px 0;
+}
+
+#caption {
+	font-family: 'Inter';
+	font-style: normal;
+	font-weight: 400;
+	font-size: 16px;
+	line-height: 140%;
+	/* or 22px */
+	text-align: center;
+	/* Inactive */
+	color: #C5C7CE;
+	margin: 0;
+	text-align: left;
+
+}
+
+#link {
+	font-family: 'Inter';
+	cursor: pointer;
+	background: #1C1D21;
+	border-radius: 4px;
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	text-decoration: none;
+	padding: 8px 16px;
+	box-sizing: border-box;
+	font-weight: 400;
+	font-size: 12px;
+	line-height: 130%;
+	/* identical to box height, or 16px */
+	/* Inactive */
+	color: #C5C7CE;
+}
+
+#link:hover {
+	background: #23242A;
+}
+
+
 #freezeFrameOverlay {
 	background-color: transparent;
 }
@@ -117,14 +251,14 @@ img#playButton{
 	border: 3px solid var(--colour3);
 	transition: 0.25s ease;
 	padding-left: 0.55rem;
-    padding-top: 0.55rem;
+	padding-top: 0.55rem;
 }
 
 #overlay button:active {
 	border: 3px solid var(--colour3);
 	background-color: var(--colour7);
 	padding-left: 0.55rem;
-    padding-top: 0.55rem;
+	padding-top: 0.55rem;
 }
 
 #overlay img {
@@ -146,7 +280,7 @@ img#playButton{
 	position: absolute;
 	top: 0;
 	transform: translateY(25%);
-  	left: 125%;
+	left: 125%;
 	z-index: 20;
 }
 
@@ -158,19 +292,19 @@ img#playButton{
 #connection .tooltiptext {
 	top: 125%;
 	transform: translateX(-25%);
-  	left: 0;
+	left: 0;
 	z-index: 20;
 	padding: 5px 10px;
 }
 
 #settings-panel .tooltiptext {
 	display: block;
-    top: 125%;
-    transform: translateX(-50%);
-    left: 0;
-    z-index: 20;
-    padding: 5px 10px;
-    border: 3px solid var(--colour5);
+	top: 125%;
+	transform: translateX(-50%);
+	left: 0;
+	z-index: 20;
+	padding: 5px 10px;
+	border: 3px solid var(--colour5);
 	width: max-content;
 }
 
@@ -180,10 +314,10 @@ img#playButton{
 	left: 1%;
 	font-family: 'Michroma', sans-serif;
 	pointer-events: all;
-	display: block;
+	display: none;
 }
 
-#controls > * {
+#controls>* {
 	margin-bottom: 0.5rem;
 	border-radius: 50%;
 	display: block;
@@ -203,6 +337,7 @@ img#playButton{
 	right: 10%;
 	font-family: 'Michroma', sans-serif;
 	pointer-events: all;
+	visibility: hidden;
 	width: min-content;
 }
 
@@ -218,16 +353,23 @@ img#playButton{
 	font-family: 'Michroma', sans-serif;
 	height: 3rem;
 	width: 3rem;
-	pointer-events: all;
+	pointer-events: none;
+	visibility: hidden;
 }
 
 .noselect {
-	-webkit-touch-callout: none; /* iOS Safari */
-	  -webkit-user-select: none; /* Safari */
-	   -khtml-user-select: none; /* Konqueror HTML */
-		 -moz-user-select: none; /* Old versions of Firefox */
-		  -ms-user-select: none; /* Internet Explorer/Edge */
-			  user-select: none; /* Non-prefixed version, currently
+	-webkit-touch-callout: none;
+	/* iOS Safari */
+	-webkit-user-select: none;
+	/* Safari */
+	-khtml-user-select: none;
+	/* Konqueror HTML */
+	-moz-user-select: none;
+	/* Old versions of Firefox */
+	-ms-user-select: none;
+	/* Internet Explorer/Edge */
+	user-select: none;
+	/* Non-prefixed version, currently
 									supported by Chrome, Edge, Opera and Firefox */
 }
 
@@ -261,10 +403,10 @@ img#playButton{
 #heading {
 	display: inline-block;
 	font-size: 2em;
-    margin-block-start: 0.67em;
-    margin-block-end: 0.67em;
-    margin-inline-start: 0px;
-    margin-inline-end: 0px;
+	margin-block-start: 0.67em;
+	margin-block-end: 0.67em;
+	margin-inline-start: 0px;
+	margin-inline-end: 0px;
 	position: relative;
 	padding: 0 0 0 2rem;
 }
@@ -281,7 +423,8 @@ img#playButton{
 #close:after {
 	padding-left: 0.5rem;
 	display: inline-block;
-	content: "\00d7"; /* This will render the 'X' */
+	content: "\00d7";
+	/* This will render the 'X' */
 }
 
 #close:hover {
@@ -301,7 +444,7 @@ img#playButton{
 	margin: 0.5rem 0;
 }
 
-.settings-text{
+.settings-text {
 	margin-right: 2rem;
 	display: flex;
 }
@@ -310,24 +453,44 @@ img#playButton{
 .tgl-switch {
 	vertical-align: middle;
 	display: inline-block;
-  }
-  
-  .tgl-switch .tgl {
-	  display:none;
-  }
-  
-  .tgl, .tgl:after, .tgl:before, .tgl *, .tgl *:after, .tgl *:before, .tgl + .tgl-slider {
+}
+
+.tgl-switch .tgl {
+	display: none;
+}
+
+.tgl,
+.tgl:after,
+.tgl:before,
+.tgl *,
+.tgl *:after,
+.tgl *:before,
+.tgl+.tgl-slider {
 	-webkit-box-sizing: border-box;
-			box-sizing: border-box;
-  }
-  .tgl::-moz-selection, .tgl:after::-moz-selection, .tgl:before::-moz-selection, .tgl *::-moz-selection, .tgl *:after::-moz-selection, .tgl *:before::-moz-selection, .tgl + .tgl-slider::-moz-selection {
+	box-sizing: border-box;
+}
+
+.tgl::-moz-selection,
+.tgl:after::-moz-selection,
+.tgl:before::-moz-selection,
+.tgl *::-moz-selection,
+.tgl *:after::-moz-selection,
+.tgl *:before::-moz-selection,
+.tgl+.tgl-slider::-moz-selection {
 	background: none;
-  }
-  .tgl::selection, .tgl:after::selection, .tgl:before::selection, .tgl *::selection, .tgl *:after::selection, .tgl *:before::selection, .tgl + .tgl-slider::selection {
+}
+
+.tgl::selection,
+.tgl:after::selection,
+.tgl:before::selection,
+.tgl *::selection,
+.tgl *:after::selection,
+.tgl *:before::selection,
+.tgl+.tgl-slider::selection {
 	background: none;
-  }
-  
-  .tgl + .tgl-slider {
+}
+
+.tgl+.tgl-slider {
 	outline: 0;
 	display: block;
 	width: 40px;
@@ -335,50 +498,53 @@ img#playButton{
 	position: relative;
 	cursor: pointer;
 	-webkit-user-select: none;
-	   -moz-user-select: none;
-		-ms-user-select: none;
-			user-select: none;
-  }
-  
-  .tgl + .tgl-slider:after, .tgl + .tgl-slider:before {
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+
+.tgl+.tgl-slider:after,
+.tgl+.tgl-slider:before {
 	position: relative;
 	display: block;
 	content: "";
 	width: 50%;
 	height: 100%;
-  }
-  .tgl + .tgl-slider:after {
+}
+
+.tgl+.tgl-slider:after {
 	left: 0;
-  }
-  .tgl + .tgl-slider:before {
+}
+
+.tgl+.tgl-slider:before {
 	display: none;
-  }
-  
-  .tgl-flat + .tgl-slider {
+}
+
+.tgl-flat+.tgl-slider {
 	padding: 2px;
 	-webkit-transition: all .2s ease;
 	transition: all .2s ease;
 	background: var(--colour6);
 	border: 3px solid var(--colour7);
 	border-radius: 2em;
-  }
-  
-  .tgl-flat + .tgl-slider:after {
+}
+
+.tgl-flat+.tgl-slider:after {
 	-webkit-transition: all .2s ease;
 	transition: all .2s ease;
 	background: var(--colour7);
 	content: "";
 	border-radius: 1em;
-  }
-  
-  .tgl-flat:checked + .tgl-slider {
+}
+
+.tgl-flat:checked+.tgl-slider {
 	border: 3px solid var(--colour3);
-  }
-  
-  .tgl-flat:checked + .tgl-slider:after {
+}
+
+.tgl-flat:checked+.tgl-slider:after {
 	left: 50%;
 	background: var(--colour3);
-  }
+}
 
 .subtitle-text {
 	margin: 0 0 0 1rem;
@@ -411,7 +577,8 @@ img#playButton{
 
 #hiddenInput {
 	position: absolute;
-	left: -10%;   /* Although invisible, push off-screen to prevent user interaction. */
+	left: -10%;
+	/* Although invisible, push off-screen to prevent user interaction. */
 	width: 0px;
 	opacity: 0;
 }
@@ -428,47 +595,50 @@ img#playButton{
 }
 
 input {
-	text-align: right; 
+	text-align: right;
 }
 
 .warning {
-    box-sizing: border-box;
-    position: relative;
-    transform: scale(var(--ggs,1));
-    width: 20px;
-    height: 20px;
-    border: 2px solid;
-    border-radius: 40px;
+	box-sizing: border-box;
+	position: relative;
+	transform: scale(var(--ggs, 1));
+	width: 20px;
+	height: 20px;
+	border: 2px solid;
+	border-radius: 40px;
 	display: none;
 }
+
 .warning::after,
 .warning::before {
-    content: "";
-    display: block;
-    box-sizing: border-box;
-    position: absolute;
-    border-radius: 3px;
-    width: 2px;
-    background: currentColor;
-    left: 7px
+	content: "";
+	display: block;
+	box-sizing: border-box;
+	position: absolute;
+	border-radius: 3px;
+	width: 2px;
+	background: currentColor;
+	left: 7px
 }
+
 .warning::after {
-    top: 2px;
-    height: 8px
+	top: 2px;
+	height: 8px
 }
+
 .warning::before {
-    height: 2px;
-    bottom: 2px
+	height: 2px;
+	bottom: 2px
 }
 
 /* Flat buttons */
 input[type="button"] {
 	background-color: transparent;
-    color: var(--colour2);
-    font-family: 'Montserrat';
-    border: 3px solid var(--colour3);
-    border-radius: 1rem;
-    font-size: 0.75rem;
+	color: var(--colour2);
+	font-family: 'Montserrat';
+	border: 3px solid var(--colour3);
+	border-radius: 1rem;
+	font-size: 0.75rem;
 	padding-left: 0.5rem;
 	padding-right: 0.5rem;
 }
@@ -477,6 +647,7 @@ input[type="button"]:hover {
 	background-color: var(--colour3);
 	transition: ease 0.3s;
 }
+
 input[type="button"]:active {
 	background-color: transparent;
 }
@@ -489,11 +660,11 @@ input[type="button"]:active {
 select,
 input[type="number"] {
 	background-color: var(--colour7);
-    color: var(--colour2);
-    border: 1px solid var(--colour6);
-    padding: 0.25rem;
-    font-family: 'Montserrat';
-    border-radius: 0.25rem;
+	color: var(--colour2);
+	border: 1px solid var(--colour6);
+	padding: 0.25rem;
+	font-family: 'Montserrat';
+	border-radius: 0.25rem;
 }
 
 input[type=number]::-webkit-inner-spin-button {
@@ -543,17 +714,17 @@ object {
 
 #afkOverlay {
 	z-index: 999;
-    background-color: rgba(30, 29, 34, 0.5);
-    display: inline-block;
-    height: 100vh;
-    width: 100vw;
-    line-height: 100vh;
-    text-align: center;
+	background-color: rgba(30, 29, 34, 0.5);
+	display: inline-block;
+	height: 100vh;
+	width: 100vw;
+	line-height: 100vh;
+	text-align: center;
 	overflow: hidden;
 }
 
 #afkOverlay center {
 	display: inline-block;
-    line-height: 1.5;
-    height: 100vh;
+	line-height: 1.5;
+	height: 100vh;
 }

SignallingWebServer/Public/player.html

@@ -9,7 +9,7 @@
 	<link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png">
 	<link rel="preconnect" href="https://fonts.googleapis.com">
 	<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-	<link href="https://fonts.googleapis.com/css2?family=Michroma&family=Montserrat:wght@600&display=swap" rel="stylesheet">
+	<link href="https://fonts.googleapis.com/css2?family=Inter&display=swap" rel="stylesheet">
 	<link type="text/css" rel="stylesheet" href="player.css">
 	<script type="text/javascript">
 		// This horrible hack is to make Fippo's adapter-latest.js work with Firefox when not on https
@@ -27,6 +27,10 @@
 	<script type="text/javascript" src="https://webrtc.github.io/adapter/adapter-latest.js"></script>
 	<script type="text/javascript" src="scripts/webRtcPlayer.js"></script>
 	<script type="text/javascript" src="scripts/app.js"></script>
+	<script>
+		inputOptions.controlScheme = ControlSchemeType.HoveringMouse;
+		inputOptions.fakeMouseWithTouches = true; 
+	</script>
 </head>
 
 <body onload="load()">
@@ -47,35 +51,39 @@
 					<object data="images/Info.svg" type="image/svg+xml"></object>
 					<span class="tooltiptext">Information</span>
 				</button>
-				
+
 			</div>
 			<div id="unrealengine">
 				<p></p>
 				<svg viewBox="0 0 1204.105 74.011" xmlns="http://www.w3.org/2000/svg">
-					<g id="svgGroup" stroke-linecap="round" fill-rule="evenodd" font-size="9pt" stroke="#ffffff" stroke-width="0.25mm" fill="#ffffff" style="stroke:#ffffff;stroke-width:0.25mm;fill:#ffffff">
-						<path d="M 894.605 74.006 L 921.305 74.006 C 942.427 74.006 953.413 73.292 956.313 60.527 A 37.848 37.848 0 0 0 957.105 52.206 L 957.105 31.606 L 907.305 31.606 L 907.305 46.606 L 934.905 46.606 L 934.905 48.706 C 934.905 53.442 932.251 55.385 928.738 56.147 A 26.156 26.156 0 0 1 923.305 56.606 L 899.605 56.606 A 39.408 39.408 0 0 1 894.638 56.344 C 888.593 55.565 886.231 52.853 885.654 45.747 A 52.88 52.88 0 0 1 885.505 41.506 L 885.505 32.506 A 48.028 48.028 0 0 1 885.738 27.377 C 886.556 19.865 889.695 17.689 897.793 17.433 A 57.321 57.321 0 0 1 899.605 17.406 L 923.705 17.406 A 38.323 38.323 0 0 1 927.889 17.588 C 932.328 18.085 934.835 19.818 934.904 25.273 A 18.461 18.461 0 0 1 934.905 25.506 L 956.705 25.506 L 956.705 23.206 A 36.235 36.235 0 0 0 955.47 12.587 C 953.178 5.214 946.987 0.624 931.363 0.064 A 93.813 93.813 0 0 0 928.005 0.006 L 894.605 0.006 C 874.839 0.006 862.985 4.89 862.71 25.469 A 55.259 55.259 0 0 0 862.705 26.206 L 862.705 47.806 A 39.6 39.6 0 0 0 863.741 57.358 C 866.906 70.059 877.192 73.722 892.685 73.99 A 111.289 111.289 0 0 0 894.605 74.006 Z M 323.405 73.206 L 403.905 73.206 L 403.905 55.806 L 345.605 55.806 L 345.605 44.206 L 399.605 44.206 L 399.605 29.206 L 345.605 29.206 L 345.605 17.606 L 402.605 17.606 L 402.605 0.806 L 323.405 0.806 L 323.405 73.206 Z M 656.905 73.206 L 737.405 73.206 L 737.405 55.806 L 679.105 55.806 L 679.105 44.206 L 733.105 44.206 L 733.105 29.206 L 679.105 29.206 L 679.105 17.606 L 736.105 17.606 L 736.105 0.806 L 656.905 0.806 L 656.905 73.206 Z M 1123.605 73.206 L 1204.105 73.206 L 1204.105 55.806 L 1145.805 55.806 L 1145.805 44.206 L 1199.805 44.206 L 1199.805 29.206 L 1145.805 29.206 L 1145.805 17.606 L 1202.805 17.606 L 1202.805 0.806 L 1123.605 0.806 L 1123.605 73.206 Z M 106.205 73.206 L 128.405 73.206 L 128.405 20.606 L 128.605 20.606 L 170.305 73.206 L 204.705 73.206 L 204.705 0.806 L 182.505 0.806 L 182.505 53.406 L 182.305 53.406 L 140.605 0.806 L 106.205 0.806 L 106.205 73.206 Z M 750.805 73.206 L 773.005 73.206 L 773.005 20.606 L 773.205 20.606 L 814.905 73.206 L 849.305 73.206 L 849.305 0.806 L 827.105 0.806 L 827.105 53.406 L 826.905 53.406 L 785.205 0.806 L 750.805 0.806 L 750.805 73.206 Z M 1010.105 73.206 L 1032.305 73.206 L 1032.305 20.606 L 1032.505 20.606 L 1074.205 73.206 L 1108.605 73.206 L 1108.605 0.806 L 1086.405 0.806 L 1086.405 53.406 L 1086.205 53.406 L 1044.505 0.806 L 1010.105 0.806 L 1010.105 73.206 Z M 29.705 74.006 L 61.505 74.006 A 51.732 51.732 0 0 0 72.484 72.955 C 82.691 70.728 88.531 64.939 90.473 55.381 A 40.134 40.134 0 0 0 91.205 47.406 L 91.205 0.806 L 69.005 0.806 L 69.005 42.606 C 69.005 51.405 65.987 55.082 57.762 55.385 A 31.364 31.364 0 0 1 56.605 55.406 L 34.605 55.406 A 22.943 22.943 0 0 1 30.082 55.013 C 24.736 53.93 22.488 50.538 22.231 43.95 A 34.441 34.441 0 0 1 22.205 42.606 L 22.205 0.806 L 0.005 0.806 L 0.005 47.406 C 0.005 64.841 8.73 73.457 27.816 73.981 A 68.853 68.853 0 0 0 29.705 74.006 Z M 219.705 73.206 L 241.905 73.206 L 241.905 54.406 L 276.805 54.406 A 18.122 18.122 0 0 1 280.084 54.663 C 284.425 55.469 285.905 58.272 285.905 64.506 L 285.905 73.206 L 308.105 73.206 L 308.105 60.906 C 308.105 49.006 302.605 46.106 296.005 44.906 L 296.005 44.706 A 22.978 22.978 0 0 0 300.937 43.003 C 305.503 40.745 307.44 37.183 308.108 32.151 A 40.124 40.124 0 0 0 308.405 26.906 L 308.405 22.306 A 33.46 33.46 0 0 0 307.248 12.853 C 305.018 5.341 299.196 0.806 286.705 0.806 L 219.705 0.806 L 219.705 73.206 Z M 410.205 73.206 L 435.005 73.206 L 441.505 60.406 L 486.505 60.406 L 493.405 73.206 L 518.105 73.206 L 478.305 0.806 L 449.405 0.806 L 410.205 73.206 Z M 526.005 73.206 L 598.105 73.206 L 598.105 54.606 L 548.205 54.606 L 548.205 0.806 L 526.005 0.806 L 526.005 73.206 Z M 971.705 73.206 L 993.905 73.206 L 993.905 0.806 L 971.705 0.806 L 971.705 73.206 Z M 241.905 18.806 L 276.605 18.806 A 34.237 34.237 0 0 1 280.146 18.959 C 283.795 19.344 285.876 20.558 286.556 23.711 A 12.861 12.861 0 0 1 286.805 26.406 L 286.805 28.806 A 12.128 12.128 0 0 1 286.485 31.774 C 285.685 34.926 283.316 36.406 278.605 36.406 L 241.905 36.406 L 241.905 18.806 Z M 463.805 17.606 L 478.205 44.806 L 449.805 44.806 L 463.805 17.606 Z"/>
+					<g id="svgGroup" stroke-linecap="round" fill-rule="evenodd" font-size="9pt" stroke="#ffffff"
+						stroke-width="0.25mm" fill="#ffffff" style="stroke:#ffffff;stroke-width:0.25mm;fill:#ffffff">
+						<path
+							d="M 894.605 74.006 L 921.305 74.006 C 942.427 74.006 953.413 73.292 956.313 60.527 A 37.848 37.848 0 0 0 957.105 52.206 L 957.105 31.606 L 907.305 31.606 L 907.305 46.606 L 934.905 46.606 L 934.905 48.706 C 934.905 53.442 932.251 55.385 928.738 56.147 A 26.156 26.156 0 0 1 923.305 56.606 L 899.605 56.606 A 39.408 39.408 0 0 1 894.638 56.344 C 888.593 55.565 886.231 52.853 885.654 45.747 A 52.88 52.88 0 0 1 885.505 41.506 L 885.505 32.506 A 48.028 48.028 0 0 1 885.738 27.377 C 886.556 19.865 889.695 17.689 897.793 17.433 A 57.321 57.321 0 0 1 899.605 17.406 L 923.705 17.406 A 38.323 38.323 0 0 1 927.889 17.588 C 932.328 18.085 934.835 19.818 934.904 25.273 A 18.461 18.461 0 0 1 934.905 25.506 L 956.705 25.506 L 956.705 23.206 A 36.235 36.235 0 0 0 955.47 12.587 C 953.178 5.214 946.987 0.624 931.363 0.064 A 93.813 93.813 0 0 0 928.005 0.006 L 894.605 0.006 C 874.839 0.006 862.985 4.89 862.71 25.469 A 55.259 55.259 0 0 0 862.705 26.206 L 862.705 47.806 A 39.6 39.6 0 0 0 863.741 57.358 C 866.906 70.059 877.192 73.722 892.685 73.99 A 111.289 111.289 0 0 0 894.605 74.006 Z M 323.405 73.206 L 403.905 73.206 L 403.905 55.806 L 345.605 55.806 L 345.605 44.206 L 399.605 44.206 L 399.605 29.206 L 345.605 29.206 L 345.605 17.606 L 402.605 17.606 L 402.605 0.806 L 323.405 0.806 L 323.405 73.206 Z M 656.905 73.206 L 737.405 73.206 L 737.405 55.806 L 679.105 55.806 L 679.105 44.206 L 733.105 44.206 L 733.105 29.206 L 679.105 29.206 L 679.105 17.606 L 736.105 17.606 L 736.105 0.806 L 656.905 0.806 L 656.905 73.206 Z M 1123.605 73.206 L 1204.105 73.206 L 1204.105 55.806 L 1145.805 55.806 L 1145.805 44.206 L 1199.805 44.206 L 1199.805 29.206 L 1145.805 29.206 L 1145.805 17.606 L 1202.805 17.606 L 1202.805 0.806 L 1123.605 0.806 L 1123.605 73.206 Z M 106.205 73.206 L 128.405 73.206 L 128.405 20.606 L 128.605 20.606 L 170.305 73.206 L 204.705 73.206 L 204.705 0.806 L 182.505 0.806 L 182.505 53.406 L 182.305 53.406 L 140.605 0.806 L 106.205 0.806 L 106.205 73.206 Z M 750.805 73.206 L 773.005 73.206 L 773.005 20.606 L 773.205 20.606 L 814.905 73.206 L 849.305 73.206 L 849.305 0.806 L 827.105 0.806 L 827.105 53.406 L 826.905 53.406 L 785.205 0.806 L 750.805 0.806 L 750.805 73.206 Z M 1010.105 73.206 L 1032.305 73.206 L 1032.305 20.606 L 1032.505 20.606 L 1074.205 73.206 L 1108.605 73.206 L 1108.605 0.806 L 1086.405 0.806 L 1086.405 53.406 L 1086.205 53.406 L 1044.505 0.806 L 1010.105 0.806 L 1010.105 73.206 Z M 29.705 74.006 L 61.505 74.006 A 51.732 51.732 0 0 0 72.484 72.955 C 82.691 70.728 88.531 64.939 90.473 55.381 A 40.134 40.134 0 0 0 91.205 47.406 L 91.205 0.806 L 69.005 0.806 L 69.005 42.606 C 69.005 51.405 65.987 55.082 57.762 55.385 A 31.364 31.364 0 0 1 56.605 55.406 L 34.605 55.406 A 22.943 22.943 0 0 1 30.082 55.013 C 24.736 53.93 22.488 50.538 22.231 43.95 A 34.441 34.441 0 0 1 22.205 42.606 L 22.205 0.806 L 0.005 0.806 L 0.005 47.406 C 0.005 64.841 8.73 73.457 27.816 73.981 A 68.853 68.853 0 0 0 29.705 74.006 Z M 219.705 73.206 L 241.905 73.206 L 241.905 54.406 L 276.805 54.406 A 18.122 18.122 0 0 1 280.084 54.663 C 284.425 55.469 285.905 58.272 285.905 64.506 L 285.905 73.206 L 308.105 73.206 L 308.105 60.906 C 308.105 49.006 302.605 46.106 296.005 44.906 L 296.005 44.706 A 22.978 22.978 0 0 0 300.937 43.003 C 305.503 40.745 307.44 37.183 308.108 32.151 A 40.124 40.124 0 0 0 308.405 26.906 L 308.405 22.306 A 33.46 33.46 0 0 0 307.248 12.853 C 305.018 5.341 299.196 0.806 286.705 0.806 L 219.705 0.806 L 219.705 73.206 Z M 410.205 73.206 L 435.005 73.206 L 441.505 60.406 L 486.505 60.406 L 493.405 73.206 L 518.105 73.206 L 478.305 0.806 L 449.405 0.806 L 410.205 73.206 Z M 526.005 73.206 L 598.105 73.206 L 598.105 54.606 L 548.205 54.606 L 548.205 0.806 L 526.005 0.806 L 526.005 73.206 Z M 971.705 73.206 L 993.905 73.206 L 993.905 0.806 L 971.705 0.806 L 971.705 73.206 Z M 241.905 18.806 L 276.605 18.806 A 34.237 34.237 0 0 1 280.146 18.959 C 283.795 19.344 285.876 20.558 286.556 23.711 A 12.861 12.861 0 0 1 286.805 26.406 L 286.805 28.806 A 12.128 12.128 0 0 1 286.485 31.774 C 285.685 34.926 283.316 36.406 278.605 36.406 L 241.905 36.406 L 241.905 18.806 Z M 463.805 17.606 L 478.205 44.806 L 449.805 44.806 L 463.805 17.606 Z" />
 					</g>
 				</svg>
 			</div>
 			<div id="connection" class="tooltip">
-				<svg version="1.1" id="connectionStrength" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 				viewBox="0 0 494.45 494.45" style="enable-background:new 0 0 494.45 494.45;" xml:space="preserve">
-					<circle id="dot" cx="247.125" cy="398.925" r="35.3"/>
+				<svg version="1.1" id="connectionStrength" xmlns="http://www.w3.org/2000/svg"
+					xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 494.45 494.45"
+					style="enable-background:new 0 0 494.45 494.45;" xml:space="preserve">
+					<circle id="dot" cx="247.125" cy="398.925" r="35.3" />
 
-					<path id="middle" d="M395.225,277.325c-6.8,0-13.5-2.6-18.7-7.8c-71.4-71.3-187.4-71.3-258.8,0c-10.3,10.3-27.1,10.3-37.4,0
-						s-10.3-27.1,0-37.4c92-92,241.6-92,333.6,0c10.3,10.3,10.3,27.1,0,37.4C408.725,274.725,401.925,277.325,395.225,277.325z"/>
+					<path id="middle"
+						d="M395.225,277.325c-6.8,0-13.5-2.6-18.7-7.8c-71.4-71.3-187.4-71.3-258.8,0c-10.3,10.3-27.1,10.3-37.4,0
+						s-10.3-27.1,0-37.4c92-92,241.6-92,333.6,0c10.3,10.3,10.3,27.1,0,37.4C408.725,274.725,401.925,277.325,395.225,277.325z" />
 
 					<path id="outer" d="M467.925,204.625c-6.8,0-13.5-2.6-18.7-7.8c-111.5-111.4-292.7-111.4-404.1,0c-10.3,10.3-27.1,10.3-37.4,0
 						s-10.3-27.1,0-37.4c64-64,149-99.2,239.5-99.2s175.5,35.2,239.5,99.2c10.3,10.3,10.3,27.1,0,37.4
-						C481.425,202.025,474.625,204.625,467.925,204.625z"/>
+						C481.425,202.025,474.625,204.625,467.925,204.625z" />
 
 					<path id="inner" d="M323.625,348.825c-6.8,0-13.5-2.6-18.7-7.8c-15.4-15.4-36-23.9-57.8-23.9s-42.4,8.5-57.8,23.9
 						c-10.3,10.3-27.1,10.3-37.4,0c-10.3-10.3-10.3-27.1,0-37.4c25.4-25.4,59.2-39.4,95.2-39.4s69.8,14,95.2,39.5
-						c10.3,10.3,10.3,27.1,0,37.4C337.225,346.225,330.425,348.825,323.625,348.825z"/>
+						c10.3,10.3,10.3,27.1,0,37.4C337.225,346.225,330.425,348.825,323.625,348.825z" />
+
+
 
-					
 
-					
 				</svg>
 				<span class="tooltiptext" id="qualityText">Not connected</span>
 			</div>
@@ -158,19 +166,19 @@
 									<div class="tgl-slider"></div>
 								</label>
 							</label>
-						</div>	
+						</div>
 						<div id="showFPS" class="setting">
 							<div class="settings-text">Show FPS</div>
 							<label class="btn-overlay">
 								<input type="button" id="show-fps-button" class="overlay-button btn-flat" value="Toggle">
 							</label>
-						</div>	
+						</div>
 						<div id="keyframeRequest" class="setting">
 							<div class="settings-text">Request KeyFrame</div>
 							<label class="btn-overlay">
 								<input type="button" id="request-keyframe-button" class="overlay-button btn-flat" value="Request">
 							</label>
-						</div>	
+						</div>
 						<section id="encoderSettings">
 							<div id="encoderSettingsHeader" class="settings-text">
 								<div>Encoder Settings</div>
@@ -189,7 +197,7 @@
 								</div>
 							</div>
 						</section>
-		
+
 						<section id="webRTCSettings">
 							<div id="webRTCSettingsHeader" class="settings-text">
 								<div>WebRTC Settings</div>
@@ -211,7 +219,7 @@
 								</div>
 							</div>
 						</section>
-		
+
 						<section id="streamSettings">
 							<div id="streamSettingsHeader" class="settings-text">
 								<div>Stream Settings</div>
@@ -238,7 +246,7 @@
 									</label>
 								</div>
 							</div>
-						</section>		
+						</section>
 					</div>
 				</div>
 			</div>
@@ -246,7 +254,7 @@
 				<div class="panel">
 					<div id="heading">Information</div>
 					<div id="close" onclick="statsClicked()"></div>
-					<div id="content">		
+					<div id="content">
 						<section id="statsPanel">
 							<div class="setting settings-text">
 								<div>Session Stats</div>

SignallingWebServer/cirrus.js

@@ -1,7 +1,5 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-
-
 //-- Server side logic. Serves pixel streaming WebRTC-based page, proxies data back to Streamer --//
 var server_settings = process.argv.slice(2)
 if (!server_settings) {
@@ -23,6 +21,7 @@ const path = require('path');
 const querystring = require('querystring');
 const bodyParser = require('body-parser');
 const logging = require('./modules/logging.js');
+var request = require('request')
 logging.RegisterConsoleLogger();
 
 // Command line argument --configFile needs to be checked before loading the config, all other command line arguments are dealt with through the config object
@@ -54,7 +53,10 @@ const config = require('./modules/config.js').init(configFile, defaultConfig);
 
 config.StreamerPort = server_settings.app_port
 config.HttpPort = server_settings.webrtc_port
-config.SFUPort = 0
+config.SFUPort = server_settings.sfu_port
+const session_server_url = server_settings.session_server_url
+const session_id = server_settings.session_id
+const useSFU = true // sfu disabled
 
 if (config.LogToFile) {
 	logging.RegisterFileLogger('./logs/');
@@ -275,9 +277,13 @@ if(config.EnableWebserver) {
 }
 
 //Setup http and https servers
-http.listen(httpPort, function () {
-	console.logColor(logging.Green, 'Http listening on *: ' + httpPort);
-});
+var isHttpWorking = false
+
+// http listen moved to streamer connection because webrtc server starts liten after application running
+
+// http.listen(httpPort, function () {
+// 	console.logColor(logging.Green, 'Http listening on *: ' + httpPort);
+// });
 
 if (config.UseHTTPS) {
 	https.listen(httpsPort, function () {
@@ -343,6 +349,7 @@ function sendMessageToPlayer(playerId, msg) {
 
 let WebSocket = require('ws');
 const { URL } = require('url');
+const { exit } = require('process')
 
 console.logColor(logging.Green, `WebSocket listening for Streamer connections on :${streamerPort}`)
 let streamerServer = new WebSocket.Server({ port: streamerPort, backlog: 1 });
@@ -359,9 +366,17 @@ streamerServer.on('connection', function (ws, req) {
 	console.logColor(logging.Green, `Streamer connected: ${req.connection.remoteAddress}`);
 	sendStreamerConnectedToMatchmaker();
 
+	if (!isHttpWorking) {
+		isHttpWorking = true
+		http.listen(httpPort, function () {
+			console.logColor(logging.Green, 'Http listening on *: ' + httpPort);
+		});
+	}
+
 	ws.on('message', (msgRaw) => {
 
 		var msg;
+		
 		try {
 			msg = JSON.parse(msgRaw);
 		} catch(err) {
@@ -526,9 +541,82 @@ sfuServer.on('connection', function (ws, req) {
 
 let playerCount = 0;
 
+const get_time_in_seconds = () => {
+	return new Date().getTime() / 1000;
+}
+
+var session_start_time =  get_time_in_seconds()
+
+// timeouts
+const first_connection_timeout = 40
+const player_reconnection_timeout = 30
+
+// players connection detection
+var has_player_ever_connected = false
+var last_player_connection_time
+
+const update_users_count = async () => {
+	try {
+		request.post(
+			session_server_url + '/cirrus/update_users_count',
+			{ json: { session_id: session_id, users_count: playerCount } },
+			function (error, response, body) {
+				// if (!error && response.statusCode == 200) {
+				// 	console.log(body);
+				// }
+				if (error) {
+					console.log(error)
+				}
+			}
+		)
+	} catch (e) {
+		console.log(e)
+	}
+}
+
+const check_players = () => {
+	// update player count on session server
+	//update_users_count()
+
+
+	// if first player connection timeout reached destory session
+	if (!has_player_ever_connected) {
+		has_player_ever_connected = playerCount > 0
+
+		// if player never connected and timeout reached destroy session by exit
+		console.log('first connection time: ', (get_time_in_seconds() - session_start_time))
+		if ((get_time_in_seconds() - session_start_time) > first_connection_timeout) {
+			exit()
+		}
+		// if player never connected skip everything
+		return
+	}
+	// if player not connected in reconnection timeout destory session
+	if (playerCount) {
+		last_player_connection_time = get_time_in_seconds()
+	} else {
+		if (!last_player_connection_time) {
+			last_player_connection_time = get_time_in_seconds()
+		}
+		console.log('reconnection time: ', (get_time_in_seconds() - last_player_connection_time))
+		if ((get_time_in_seconds() - last_player_connection_time) > player_reconnection_timeout) {
+			//console.log('should exit, but wont for debug')
+			exit()
+		}
+	}
+}
+
+const start_players_check = () => {
+	check_players()
+	setTimeout(() => start_players_check(), 1000)
+}
+
+start_players_check()
+
 console.logColor(logging.Green, `WebSocket listening for Players connections on :${httpPort}`);
 let playerServer = new WebSocket.Server({ server: config.UseHTTPS ? https : http});
 playerServer.on('connection', function (ws, req) {
+	
 	// Reject connection if streamer is not connected
 	if (!streamer || streamer.readyState != 1 /* OPEN */) {
 		ws.close(1013 /* Try again later */, 'Streamer is not connected');
@@ -538,7 +626,7 @@ playerServer.on('connection', function (ws, req) {
 	var url = require('url');
 	const parsedUrl = url.parse(req.url);
 	const urlParams = new URLSearchParams(parsedUrl.search);
-	const preferSFU = urlParams.has('preferSFU') && urlParams.get('preferSFU') !== 'false';
+	const preferSFU = useSFU//urlParams.has('preferSFU') && urlParams.get('preferSFU') !== 'false';
 	const skipSFU = !preferSFU;
 	const skipStreamer = preferSFU && sfu;
 
@@ -554,6 +642,7 @@ playerServer.on('connection', function (ws, req) {
 	}
 
 	++playerCount;
+	update_users_count()
 	let playerId = (++nextPlayerId).toString();
 	console.logColor(logging.Green, `player ${playerId} (${req.connection.remoteAddress}) connected`);
 	players.set(playerId, { ws: ws, id: playerId });
@@ -564,6 +653,13 @@ playerServer.on('connection', function (ws, req) {
 			p.ws.send(playerCountMsg);
 		}
 	}
+
+	function sendPlayersLastInputTime() {
+		let playerCountMsg = JSON.stringify({ type: 'lastOtherPlayerInput'});
+		for (let p of players.values()) {
+			p.ws.send(playerCountMsg);
+		}
+	}
 	
 	ws.on('message', (msgRaw) =>{
 
@@ -601,6 +697,9 @@ playerServer.on('connection', function (ws, req) {
 		} else if (msg.type == "peerDataChannelsReady") {
 			msg.playerId = playerId;
 			sendMessageToController(msg, skipSFU, true);
+		} else if (msg.type == "playerInput") {
+			//msg.playerId = playerId;
+			sendPlayersLastInputTime();
 		}
 		else {
 			console.error(`player ${playerId}: unsupported message type: ${msg.type}`);
@@ -612,6 +711,7 @@ playerServer.on('connection', function (ws, req) {
 	function onPlayerDisconnected() {
 		try {
 			--playerCount;
+			update_users_count()
 			const player = players.get(playerId);
 			if (player.datachannel) {
 				// have to notify the streamer that the datachannel can be closed

SignallingWebServer/config.json

@@ -0,0 +1,21 @@
+{
+	"UseFrontend": false,
+	"UseMatchmaker": false,
+	"UseHTTPS": false,
+	"UseAuthentication": false,
+	"LogToFile": true,
+	"LogVerbose": true,
+	"HomepageFile": "player.html",
+	"AdditionalRoutes": {},
+	"EnableWebserver": true,
+	"MatchmakerAddress": "",
+	"MatchmakerPort": "9999",
+	"PublicIp": "localhost",
+	"HttpPort": 47500,
+	"HttpsPort": 443,
+	"StreamerPort": 8888,
+	"SFUPort": 8889,
+	"MaxPlayerCount": -1,
+	"peerConnectionOptions": "{\"iceServers\": [{\"urls\": [\"stun:stun1.l.google.com:19302\",\"stun:stun2.l.google.com:19302\",\"stun:stun3.l.google.com:19302\",\"stun:stun4.l.google.com:19302\"]},{\"urls\":[\"turn:13.250.13.83:3478?transport=udp\"],\"username\":\"YzYNCouZM1mhqhmseWk6\",\"credential\":\"YzYNCouZM1mhqhmseWk6\"},{\"urls\": [\"turn:192.158.29.39:3478?transport=tcp\"],\"credential\": \"JZEOEt2V3Qb0y27GRntt2u2PAYA=\",\"username\": \"28224511:1379330808\"}]}"
+
+}

SignallingWebServer/fonts/fonts.css

@@ -0,0 +1,54 @@
+@font-face {
+	font-family: 'Inter';
+	src:
+		url('./inter-v12-latin_cyrillic-regular.woff2') format('woff2'),
+		url('./inter-v12-latin_cyrillic-regular.woff') format('woff');
+	font-weight: 400;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: 'Inter';
+	src:
+		url('./inter-v12-latin_cyrillic-300.woff2') format('woff2'),
+		url('./inter-v12-latin_cyrillic-300.woff') format('woff');
+	font-weight: 300;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: 'Inter';
+	src:
+		url('./inter-v12-latin_cyrillic-500.woff2') format('woff2'),
+		url('./inter-v12-latin_cyrillic-500.woff') format('woff');
+	font-weight: 500;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: 'Inter';
+	src:
+		url('./inter-v12-latin_cyrillic-600.woff2') format('woff2'),
+		url('./inter-v12-latin_cyrillic-600.woff') format('woff');
+	font-weight: 600;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: 'Inter';
+	src:
+		url('./inter-v12-latin_cyrillic-700.woff2') format('woff2'),
+		url('./inter-v12-latin_cyrillic-700.woff') format('woff');
+	font-weight: 700;
+	font-style: normal;
+}
+
+
+@font-face {
+	font-family: 'GilroyWebRegular';
+	src: url('./Gilroy_Regular.woff'),
+		url('./Gilroy_Regular.woff2');
+	font-weight: 400;
+	font-style: normal;
+
+}

SignallingWebServer/package-lock.json

@@ -12,8 +12,9 @@
         "express": "^4.16.2",
         "express-session": "^1.15.6",
         "helmet": "^3.21.3",
-        "passport": "^0.6.0",
+        "passport": "^0.4.0",
         "passport-local": "^1.0.0",
+        "run-script-os": "^1.1.6",
         "ws": "^7.1.2",
         "y18n": "^5.0.5",
         "yargs": "^15.3.0"
@@ -676,13 +677,12 @@
       }
     },
     "node_modules/passport": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz",
-      "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz",
+      "integrity": "sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==",
       "dependencies": {
         "passport-strategy": "1.x.x",
-        "pause": "0.0.1",
-        "utils-merge": "^1.0.1"
+        "pause": "0.0.1"
       },
       "engines": {
         "node": ">= 0.4.0"
@@ -796,6 +796,15 @@
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
     },
+    "node_modules/run-script-os": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
+      "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==",
+      "bin": {
+        "run-os": "index.js",
+        "run-script-os": "index.js"
+      }
+    },
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -1526,9 +1535,9 @@
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
     },
     "passport": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz",
-      "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz",
+      "integrity": "sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==",
       "requires": {
         "passport-strategy": "1.x.x",
         "pause": "0.0.1"
@@ -1612,6 +1621,11 @@
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
     },
+    "run-script-os": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
+      "integrity": "sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw=="
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",