GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 09:10:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Devaev Maxim 2021-04-06 07:43:51 +03:00
parent c253e1e9a2
commit 2a4e3c3a5c
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
web/share/js/kvm/stream.js
View File

@ -36,9 +36,9 @@ export function Streamer() {
var __size_factor = 1; var __size_factor = 1;
var __client_key = tools.makeId(); var __mjpeg_key = tools.makeId();
var __client_id = ""; var __mjpeg_id = "";
var __client_fps = -1; var __mjpeg_fps = -1;
var __state_for_invisible = null; var __state_for_invisible = null;
@ -132,15 +132,14 @@ export function Streamer() {
wm.setElementEnabled($("stream-resolution-selector"), true); wm.setElementEnabled($("stream-resolution-selector"), true);
} }
if (__ensureStream(state.streamer.stream.clients_stat)) { if (__ensureMjpegStream(state.streamer.stream.clients_stat)) {
$("stream-led").className = "led-green"; $("stream-led").className = "led-green";
$("stream-led").title = "Stream is active"; $("stream-led").title = "Stream is active";
wm.setElementEnabled($("stream-screenshot-button"), true); wm.setElementEnabled($("stream-screenshot-button"), true);
wm.setElementEnabled($("stream-reset-button"), true); wm.setElementEnabled($("stream-reset-button"), true);
$("stream-quality-slider").activated = false; $("stream-quality-slider").activated = false;
$("stream-desired-fps-slider").activated = false; $("stream-desired-fps-slider").activated = false;
tools.info("Stream [MJPEG]: active");
tools.info("Stream: active");
} }
__updateStreamWindow(true, state.streamer.source.online); __updateStreamWindow(true, state.streamer.source.online);
@ -162,33 +161,33 @@ export function Streamer() {
} }
}; };
var __ensureStream = function(clients_stat) { var __ensureMjpegStream = function(clients_stat) {
let stream_client = tools.getCookie("stream_client"); let stream_client = tools.getCookie("stream_client");
if (!__client_id && stream_client && stream_client.startsWith(__client_key + "/")) { if (!__mjpeg_id && stream_client && stream_client.startsWith(__mjpeg_key + "/")) {
tools.info("Stream: found acceptable stream_client cookie:", stream_client); tools.info("Stream [MJPEG]: found acceptable stream_client cookie:", stream_client);
__client_id = stream_client.slice(stream_client.indexOf("/") + 1); __mjpeg_id = stream_client.slice(stream_client.indexOf("/") + 1);
} }
if (__client_id && __client_id in clients_stat) { if (__mjpeg_id && __mjpeg_id in clients_stat) {
__client_fps = clients_stat[__client_id].fps; __mjpeg_fps = clients_stat[__mjpeg_id].fps;
return false; return false;
} else { } else {
__client_key = tools.makeId(); __mjpeg_key = tools.makeId();
__client_id = ""; __mjpeg_id = "";
__client_fps = -1; __mjpeg_fps = -1;
let path = `/streamer/stream?key=${__client_key}`; let path = `/streamer/stream?key=${__mjpeg_key}`;
if (tools.browser.is_safari || tools.browser.is_ios) { if (tools.browser.is_safari || tools.browser.is_ios) {
// uStreamer fix for WebKit // uStreamer fix for WebKit
tools.info("Stream: using dual_final_frames=1 to fix WebKit MJPG bugs"); tools.info("Stream [MJPEG]: using dual_final_frames=1 to fix WebKit bugs");
path += "&dual_final_frames=1"; path += "&dual_final_frames=1";
} else if (tools.browser.is_chrome || tools.browser.is_blink) { } else if (tools.browser.is_chrome || tools.browser.is_blink) {
// uStreamer fix for Blink https://bugs.chromium.org/p/chromium/issues/detail?id=527446 // uStreamer fix for Blink https://bugs.chromium.org/p/chromium/issues/detail?id=527446
tools.info("Stream: using advance_headers=1 to fix Blink MJPG bugs"); tools.info("Stream [MJPEG]: using advance_headers=1 to fix Blink bugs");
path += "&advance_headers=1"; path += "&advance_headers=1";
} }
tools.info("Stream: refreshing ..."); tools.info("Stream [MJPEG]: refreshing ...");
$("stream-image").src = path; $("stream-image").src = path;
return true; return true;
} }
@ -211,8 +210,8 @@ export function Streamer() {
title += "no signal / "; title += "no signal / ";
} }
title += __makeStringResolution(__resolution); title += __makeStringResolution(__resolution);
if (__client_fps >= 0) { if (__mjpeg_fps >= 0) {
title += ` / ${__client_fps} fps`; title += ` / ${__mjpeg_fps} fps`;
} }
el_grab.innerHTML = el_info.innerHTML = title; el_grab.innerHTML = el_info.innerHTML = title;
} else { } else {