diff options
Diffstat (limited to 'web/share/js')
| -rw-r--r-- | web/share/js/kvm/janus.js | 26 | ||||
| -rw-r--r-- | web/share/js/kvm/stream.js | 28 |
2 files changed, 23 insertions, 31 deletions
diff --git a/web/share/js/kvm/janus.js b/web/share/js/kvm/janus.js deleted file mode 100644 index 5ad7ae21..00000000 --- a/web/share/js/kvm/janus.js +++ /dev/null @@ -1,26 +0,0 @@ -/***************************************************************************** -# # -# KVMD - The main Pi-KVM daemon. # -# # -# Copyright (C) 2018-2021 Maxim Devaev <[email protected]> # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <https://www.gnu.org/licenses/>. # -# # -*****************************************************************************/ - - -"use strict"; - - -export var Janus = null; diff --git a/web/share/js/kvm/stream.js b/web/share/js/kvm/stream.js index 1008cb92..7371c2e5 100644 --- a/web/share/js/kvm/stream.js +++ b/web/share/js/kvm/stream.js @@ -25,10 +25,10 @@ import {tools, $} from "../tools.js"; import {wm} from "../wm.js"; -/*import {Janus} from "./janus.js"; +var _Janus = null; -function _JanusStreamer(set_active_callback, set_inactive_callback, set_info_callback) { +/*function _JanusStreamer(set_active_callback, set_inactive_callback, set_info_callback) { var self = this; var __janus = null; @@ -210,9 +210,27 @@ export function Streamer() { }; self.setJanusEnabled = function(enabled) { - __janus_enabled = (!!window.RTCPeerConnection && enabled); - tools.info("Stream: Janus WebRTC Gateway state:", __janus_enabled); - self.setState(__state); + let supported = !!window.RTCPeerConnection; + let set_enabled = function() { + __janus_enabled = (enabled && supported && _Janus !== null); + tools.info(`Stream: Janus WebRTC state: enabled=${enabled}, supported=${supported}, imported=${!!_Janus}`); + self.setState(__state); + }; + if (enabled && supported) { + if (_Janus === null) { + import("./janus.js").then((module) => { + _Janus = module.Janus; + set_enabled(); + }).catch((err) => { + tools.error("Can't import Janus module:", err); + set_enabled(); + }); + } else { + set_enabled(); + } + } else { + set_enabled(); + } }; self.setState = function(state) { |