mirror of
https://github.com/mofeng-git/One-KVM.git
synced 2026-01-29 00:51:53 +08:00
Add support for PiKVM Switch and related features
This commit introduces several new components and improvements: - Added Switch module with firmware update and configuration support - Implemented new media streaming capabilities - Updated various UI elements and CSS styles - Enhanced keyboard and mouse event handling - Added new validators and configuration options - Updated Python version support to 3.13 - Improved error handling and logging
This commit is contained in:
@@ -502,6 +502,37 @@ def _get_config_scheme() -> dict:
|
||||
"table": Option([], type=valid_ugpio_view_table),
|
||||
},
|
||||
},
|
||||
|
||||
"switch": {
|
||||
"device": Option("/dev/kvmd-switch", type=valid_abs_path, unpack_as="device_path"),
|
||||
"default_edid": Option("/etc/kvmd/switch-edid.hex", type=valid_abs_path, unpack_as="default_edid_path"),
|
||||
},
|
||||
},
|
||||
|
||||
"media": {
|
||||
"server": {
|
||||
"unix": Option("/run/kvmd/media.sock", type=valid_abs_path, unpack_as="unix_path"),
|
||||
"unix_rm": Option(True, type=valid_bool),
|
||||
"unix_mode": Option(0o660, type=valid_unix_mode),
|
||||
"heartbeat": Option(15.0, type=valid_float_f01),
|
||||
"access_log_format": Option("[%P / %{X-Real-IP}i] '%r' => %s; size=%b ---"
|
||||
" referer='%{Referer}i'; user_agent='%{User-Agent}i'"),
|
||||
},
|
||||
|
||||
"memsink": {
|
||||
"jpeg": {
|
||||
"sink": Option("", unpack_as="obj"),
|
||||
"lock_timeout": Option(1.0, type=valid_float_f01),
|
||||
"wait_timeout": Option(1.0, type=valid_float_f01),
|
||||
"drop_same_frames": Option(0.0, type=valid_float_f0),
|
||||
},
|
||||
"h264": {
|
||||
"sink": Option("", unpack_as="obj"),
|
||||
"lock_timeout": Option(1.0, type=valid_float_f01),
|
||||
"wait_timeout": Option(1.0, type=valid_float_f01),
|
||||
"drop_same_frames": Option(0.0, type=valid_float_f0),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
"pst": {
|
||||
@@ -532,11 +563,12 @@ def _get_config_scheme() -> dict:
|
||||
"device_version": Option(-1, type=functools.partial(valid_number, min=-1, max=0xFFFF)),
|
||||
"usb_version": Option(0x0200, type=valid_otg_id),
|
||||
"max_power": Option(250, type=functools.partial(valid_number, min=50, max=500)),
|
||||
"remote_wakeup": Option(False, type=valid_bool),
|
||||
"remote_wakeup": Option(True, type=valid_bool),
|
||||
|
||||
"gadget": Option("kvmd", type=valid_otg_gadget),
|
||||
"config": Option("PiKVM device", type=valid_stripped_string_not_empty),
|
||||
"udc": Option("", type=valid_stripped_string),
|
||||
"endpoints": Option(9, type=valid_int_f0),
|
||||
"init_delay": Option(3.0, type=valid_float_f01),
|
||||
|
||||
"user": Option("kvmd", type=valid_user),
|
||||
@@ -550,6 +582,9 @@ def _get_config_scheme() -> dict:
|
||||
"mouse": {
|
||||
"start": Option(True, type=valid_bool),
|
||||
},
|
||||
"mouse_alt": {
|
||||
"start": Option(True, type=valid_bool),
|
||||
},
|
||||
},
|
||||
|
||||
"msd": {
|
||||
@@ -560,6 +595,18 @@ def _get_config_scheme() -> dict:
|
||||
"rw": Option(False, type=valid_bool),
|
||||
"removable": Option(True, type=valid_bool),
|
||||
"fua": Option(True, type=valid_bool),
|
||||
"inquiry_string": {
|
||||
"cdrom": {
|
||||
"vendor": Option("PiKVM", type=valid_stripped_string),
|
||||
"product": Option("Optical Drive", type=valid_stripped_string),
|
||||
"revision": Option("1.00", type=valid_stripped_string),
|
||||
},
|
||||
"flash": {
|
||||
"vendor": Option("PiKVM", type=valid_stripped_string),
|
||||
"product": Option("Flash Drive", type=valid_stripped_string),
|
||||
"revision": Option("1.00", type=valid_stripped_string),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -576,6 +623,11 @@ def _get_config_scheme() -> dict:
|
||||
"kvm_mac": Option("", type=valid_mac, if_empty=""),
|
||||
},
|
||||
|
||||
"audio": {
|
||||
"enabled": Option(False, type=valid_bool),
|
||||
"start": Option(True, type=valid_bool),
|
||||
},
|
||||
|
||||
"drives": {
|
||||
"enabled": Option(False, type=valid_bool),
|
||||
"start": Option(True, type=valid_bool),
|
||||
@@ -586,6 +638,18 @@ def _get_config_scheme() -> dict:
|
||||
"rw": Option(True, type=valid_bool),
|
||||
"removable": Option(True, type=valid_bool),
|
||||
"fua": Option(True, type=valid_bool),
|
||||
"inquiry_string": {
|
||||
"cdrom": {
|
||||
"vendor": Option("PiKVM", type=valid_stripped_string),
|
||||
"product": Option("Optical Drive", type=valid_stripped_string),
|
||||
"revision": Option("1.00", type=valid_stripped_string),
|
||||
},
|
||||
"flash": {
|
||||
"vendor": Option("PiKVM", type=valid_stripped_string),
|
||||
"product": Option("Flash Drive", type=valid_stripped_string),
|
||||
"revision": Option("1.00", type=valid_stripped_string),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -35,6 +35,7 @@ from .ugpio import UserGpio
|
||||
from .streamer import Streamer
|
||||
from .snapshoter import Snapshoter
|
||||
from .ocr import Ocr
|
||||
from .switch import Switch
|
||||
from .server import KvmdServer
|
||||
|
||||
|
||||
@@ -90,6 +91,10 @@ def main(argv: (list[str] | None)=None) -> None:
|
||||
log_reader=(LogReader() if config.log_reader.enabled else None),
|
||||
user_gpio=UserGpio(config.gpio, global_config.otg),
|
||||
ocr=Ocr(**config.ocr._unpack()),
|
||||
switch=Switch(
|
||||
pst_unix_path=global_config.pst.server.unix,
|
||||
**config.switch._unpack(),
|
||||
),
|
||||
|
||||
hid=hid,
|
||||
atx=get_atx_class(config.atx.type)(**config.atx._unpack(ignore=["type"])),
|
||||
|
||||
@@ -66,7 +66,7 @@ class ExportApi:
|
||||
self.__append_prometheus_rows(rows, atx_state["leds"]["power"], "pikvm_atx_power") # type: ignore
|
||||
|
||||
for mode in sorted(UserGpioModes.ALL):
|
||||
for (channel, ch_state) in gpio_state[f"{mode}s"].items(): # type: ignore
|
||||
for (channel, ch_state) in gpio_state["state"][f"{mode}s"].items(): # type: ignore
|
||||
if not channel.startswith("__"): # Hide special GPIOs
|
||||
for key in ["online", "state"]:
|
||||
self.__append_prometheus_rows(rows, ch_state["state"], f"pikvm_gpio_{mode}_{key}_{channel}")
|
||||
|
||||
@@ -123,7 +123,8 @@ class HidApi:
|
||||
if limit > 0:
|
||||
text = text[:limit]
|
||||
symmap = self.__ensure_symmap(req.query.get("keymap", self.__default_keymap_name))
|
||||
self.__hid.send_key_events(text_to_web_keys(text, symmap), no_ignore_keys=True)
|
||||
slow = valid_bool(req.query.get("slow", False))
|
||||
await self.__hid.send_key_events(text_to_web_keys(text, symmap), no_ignore_keys=True, slow=slow)
|
||||
return make_json_response()
|
||||
|
||||
def __ensure_symmap(self, keymap_name: str) -> dict[int, dict[int, str]]:
|
||||
@@ -148,16 +149,17 @@ class HidApi:
|
||||
async def __ws_bin_key_handler(self, _: WsSession, data: bytes) -> None:
|
||||
try:
|
||||
key = valid_hid_key(data[1:].decode("ascii"))
|
||||
state = valid_bool(data[0])
|
||||
state = bool(data[0] & 0b01)
|
||||
finish = bool(data[0] & 0b10)
|
||||
except Exception:
|
||||
return
|
||||
self.__hid.send_key_event(key, state)
|
||||
self.__hid.send_key_event(key, state, finish)
|
||||
|
||||
@exposed_ws(2)
|
||||
async def __ws_bin_mouse_button_handler(self, _: WsSession, data: bytes) -> None:
|
||||
try:
|
||||
button = valid_hid_mouse_button(data[1:].decode("ascii"))
|
||||
state = valid_bool(data[0])
|
||||
state = bool(data[0] & 0b01)
|
||||
except Exception:
|
||||
return
|
||||
self.__hid.send_mouse_button_event(button, state)
|
||||
@@ -182,7 +184,7 @@ class HidApi:
|
||||
|
||||
def __process_ws_bin_delta_request(self, data: bytes, handler: Callable[[Iterable[tuple[int, int]], bool], None]) -> None:
|
||||
try:
|
||||
squash = valid_bool(data[0])
|
||||
squash = bool(data[0] & 0b01)
|
||||
data = data[1:]
|
||||
deltas: list[tuple[int, int]] = []
|
||||
for index in range(0, len(data), 2):
|
||||
@@ -199,9 +201,10 @@ class HidApi:
|
||||
try:
|
||||
key = valid_hid_key(event["key"])
|
||||
state = valid_bool(event["state"])
|
||||
finish = valid_bool(event.get("finish", False))
|
||||
except Exception:
|
||||
return
|
||||
self.__hid.send_key_event(key, state)
|
||||
self.__hid.send_key_event(key, state, finish)
|
||||
|
||||
@exposed_ws("mouse_button")
|
||||
async def __ws_mouse_button_handler(self, _: WsSession, event: dict) -> None:
|
||||
@@ -248,9 +251,10 @@ class HidApi:
|
||||
key = valid_hid_key(req.query.get("key"))
|
||||
if "state" in req.query:
|
||||
state = valid_bool(req.query["state"])
|
||||
self.__hid.send_key_event(key, state)
|
||||
finish = valid_bool(req.query.get("finish", False))
|
||||
self.__hid.send_key_event(key, state, finish)
|
||||
else:
|
||||
self.__hid.send_key_events([(key, True), (key, False)])
|
||||
self.__hid.send_key_event(key, True, True)
|
||||
return make_json_response()
|
||||
|
||||
@exposed_http("POST", "/hid/events/send_mouse_button")
|
||||
|
||||
@@ -63,11 +63,7 @@ class MsdApi:
|
||||
|
||||
@exposed_http("GET", "/msd")
|
||||
async def __state_handler(self, _: Request) -> Response:
|
||||
state = await self.__msd.get_state()
|
||||
if state["storage"] and state["storage"]["parts"]:
|
||||
state["storage"]["size"] = state["storage"]["parts"][""]["size"] # Legacy API
|
||||
state["storage"]["free"] = state["storage"]["parts"][""]["free"] # Legacy API
|
||||
return make_json_response(state)
|
||||
return make_json_response(await self.__msd.get_state())
|
||||
|
||||
@exposed_http("POST", "/msd/set_params")
|
||||
async def __set_params_handler(self, req: Request) -> Response:
|
||||
|
||||
164
kvmd/apps/kvmd/api/switch.py
Normal file
164
kvmd/apps/kvmd/api/switch.py
Normal file
@@ -0,0 +1,164 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
from aiohttp.web import Request
|
||||
from aiohttp.web import Response
|
||||
|
||||
from ....htserver import exposed_http
|
||||
from ....htserver import make_json_response
|
||||
|
||||
from ....validators.basic import valid_bool
|
||||
from ....validators.basic import valid_int_f0
|
||||
from ....validators.basic import valid_stripped_string_not_empty
|
||||
from ....validators.kvm import valid_atx_power_action
|
||||
from ....validators.kvm import valid_atx_button
|
||||
from ....validators.switch import valid_switch_port_name
|
||||
from ....validators.switch import valid_switch_edid_id
|
||||
from ....validators.switch import valid_switch_edid_data
|
||||
from ....validators.switch import valid_switch_color
|
||||
from ....validators.switch import valid_switch_atx_click_delay
|
||||
|
||||
from ..switch import Switch
|
||||
from ..switch import Colors
|
||||
|
||||
|
||||
# =====
|
||||
class SwitchApi:
|
||||
def __init__(self, switch: Switch) -> None:
|
||||
self.__switch = switch
|
||||
|
||||
# =====
|
||||
|
||||
@exposed_http("GET", "/switch")
|
||||
async def __state_handler(self, _: Request) -> Response:
|
||||
return make_json_response(await self.__switch.get_state())
|
||||
|
||||
@exposed_http("POST", "/switch/set_active")
|
||||
async def __set_active_port_handler(self, req: Request) -> Response:
|
||||
port = valid_int_f0(req.query.get("port"))
|
||||
await self.__switch.set_active_port(port)
|
||||
return make_json_response()
|
||||
|
||||
@exposed_http("POST", "/switch/set_beacon")
|
||||
async def __set_beacon_handler(self, req: Request) -> Response:
|
||||
on = valid_bool(req.query.get("state"))
|
||||
if "port" in req.query:
|
||||
port = valid_int_f0(req.query.get("port"))
|
||||
await self.__switch.set_port_beacon(port, on)
|
||||
elif "uplink" in req.query:
|
||||
unit = valid_int_f0(req.query.get("uplink"))
|
||||
await self.__switch.set_uplink_beacon(unit, on)
|
||||
else: # Downlink
|
||||
unit = valid_int_f0(req.query.get("downlink"))
|
||||
await self.__switch.set_downlink_beacon(unit, on)
|
||||
return make_json_response()
|
||||
|
||||
@exposed_http("POST", "/switch/set_port_params")
|
||||
async def __set_port_params(self, req: Request) -> Response:
|
||||
port = valid_int_f0(req.query.get("port"))
|
||||
params = {
|
||||
param: validator(req.query.get(param))
|
||||
for (param, validator) in [
|
||||
("edid_id", (lambda arg: valid_switch_edid_id(arg, allow_default=True))),
|
||||
("name", valid_switch_port_name),
|
||||
("atx_click_power_delay", valid_switch_atx_click_delay),
|
||||
("atx_click_power_long_delay", valid_switch_atx_click_delay),
|
||||
("atx_click_reset_delay", valid_switch_atx_click_delay),
|
||||
]
|
||||
if req.query.get(param) is not None
|
||||
}
|
||||
await self.__switch.set_port_params(port, **params) # type: ignore
|
||||
return make_json_response()
|
||||
|
||||
@exposed_http("POST", "/switch/set_colors")
|
||||
async def __set_colors(self, req: Request) -> Response:
|
||||
params = {
|
||||
param: valid_switch_color(req.query.get(param), allow_default=True)
|
||||
for param in Colors.ROLES
|
||||
if req.query.get(param) is not None
|
||||
}
|
||||
await self.__switch.set_colors(**params)
|
||||
return make_json_response()
|
||||
|
||||
# =====
|
||||
|
||||
@exposed_http("POST", "/switch/reset")
|
||||
async def __reset(self, req: Request) -> Response:
|
||||
unit = valid_int_f0(req.query.get("unit"))
|
||||
bootloader = valid_bool(req.query.get("bootloader", False))
|
||||
await self.__switch.reboot_unit(unit, bootloader)
|
||||
return make_json_response()
|
||||
|
||||
# =====
|
||||
|
||||
@exposed_http("POST", "/switch/edids/create")
|
||||
async def __create_edid(self, req: Request) -> Response:
|
||||
name = valid_stripped_string_not_empty(req.query.get("name"))
|
||||
data_hex = valid_switch_edid_data(req.query.get("data"))
|
||||
edid_id = await self.__switch.create_edid(name, data_hex)
|
||||
return make_json_response({"id": edid_id})
|
||||
|
||||
@exposed_http("POST", "/switch/edids/change")
|
||||
async def __change_edid(self, req: Request) -> Response:
|
||||
edid_id = valid_switch_edid_id(req.query.get("id"), allow_default=False)
|
||||
params = {
|
||||
param: validator(req.query.get(param))
|
||||
for (param, validator) in [
|
||||
("name", valid_switch_port_name),
|
||||
("data", valid_switch_edid_data),
|
||||
]
|
||||
if req.query.get(param) is not None
|
||||
}
|
||||
if params:
|
||||
await self.__switch.change_edid(edid_id, **params)
|
||||
return make_json_response()
|
||||
|
||||
@exposed_http("POST", "/switch/edids/remove")
|
||||
async def __remove_edid(self, req: Request) -> Response:
|
||||
edid_id = valid_switch_edid_id(req.query.get("id"), allow_default=False)
|
||||
await self.__switch.remove_edid(edid_id)
|
||||
return make_json_response()
|
||||
|
||||
# =====
|
||||
|
||||
@exposed_http("POST", "/switch/atx/power")
|
||||
async def __power_handler(self, req: Request) -> Response:
|
||||
port = valid_int_f0(req.query.get("port"))
|
||||
action = valid_atx_power_action(req.query.get("action"))
|
||||
await ({
|
||||
"on": self.__switch.atx_power_on,
|
||||
"off": self.__switch.atx_power_off,
|
||||
"off_hard": self.__switch.atx_power_off_hard,
|
||||
"reset_hard": self.__switch.atx_power_reset_hard,
|
||||
}[action])(port)
|
||||
return make_json_response()
|
||||
|
||||
@exposed_http("POST", "/switch/atx/click")
|
||||
async def __click_handler(self, req: Request) -> Response:
|
||||
port = valid_int_f0(req.query.get("port"))
|
||||
button = valid_atx_button(req.query.get("button"))
|
||||
await ({
|
||||
"power": self.__switch.atx_click_power,
|
||||
"power_long": self.__switch.atx_click_power_long,
|
||||
"reset": self.__switch.atx_click_reset,
|
||||
}[button])(port)
|
||||
return make_json_response()
|
||||
@@ -95,7 +95,7 @@ class AuthManager:
|
||||
secret = file.read().strip()
|
||||
if secret:
|
||||
code = passwd[-6:]
|
||||
if not pyotp.TOTP(secret).verify(code):
|
||||
if not pyotp.TOTP(secret).verify(code, valid_window=1):
|
||||
get_logger().error("Got access denied for user %r by TOTP", user)
|
||||
return False
|
||||
passwd = passwd[:-6]
|
||||
|
||||
@@ -66,6 +66,7 @@ from .ugpio import UserGpio
|
||||
from .streamer import Streamer
|
||||
from .snapshoter import Snapshoter
|
||||
from .ocr import Ocr
|
||||
from .switch import Switch
|
||||
|
||||
from .api.auth import AuthApi
|
||||
from .api.auth import check_request_auth
|
||||
@@ -77,6 +78,7 @@ from .api.hid import HidApi
|
||||
from .api.atx import AtxApi
|
||||
from .api.msd import MsdApi
|
||||
from .api.streamer import StreamerApi
|
||||
from .api.switch import SwitchApi
|
||||
from .api.export import ExportApi
|
||||
from .api.redfish import RedfishApi
|
||||
|
||||
@@ -125,18 +127,19 @@ class _Subsystem:
|
||||
cleanup=getattr(obj, "cleanup", None),
|
||||
trigger_state=getattr(obj, "trigger_state", None),
|
||||
poll_state=getattr(obj, "poll_state", None),
|
||||
|
||||
)
|
||||
|
||||
|
||||
class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-instance-attributes
|
||||
__EV_GPIO_STATE = "gpio_state"
|
||||
__EV_HID_STATE = "hid_state"
|
||||
__EV_ATX_STATE = "atx_state"
|
||||
__EV_MSD_STATE = "msd_state"
|
||||
__EV_STREAMER_STATE = "streamer_state"
|
||||
__EV_OCR_STATE = "ocr_state"
|
||||
__EV_INFO_STATE = "info_state"
|
||||
__EV_GPIO_STATE = "gpio"
|
||||
__EV_HID_STATE = "hid"
|
||||
__EV_HID_KEYMAPS_STATE = "hid_keymaps" # FIXME
|
||||
__EV_ATX_STATE = "atx"
|
||||
__EV_MSD_STATE = "msd"
|
||||
__EV_STREAMER_STATE = "streamer"
|
||||
__EV_OCR_STATE = "ocr"
|
||||
__EV_INFO_STATE = "info"
|
||||
__EV_SWITCH_STATE = "switch"
|
||||
|
||||
def __init__( # pylint: disable=too-many-arguments,too-many-locals
|
||||
self,
|
||||
@@ -145,6 +148,7 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins
|
||||
log_reader: (LogReader | None),
|
||||
user_gpio: UserGpio,
|
||||
ocr: Ocr,
|
||||
switch: Switch,
|
||||
|
||||
hid: BaseHid,
|
||||
atx: BaseAtx,
|
||||
@@ -177,6 +181,7 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins
|
||||
AtxApi(atx),
|
||||
MsdApi(msd),
|
||||
StreamerApi(streamer, ocr),
|
||||
SwitchApi(switch),
|
||||
ExportApi(info_manager, atx, user_gpio),
|
||||
RedfishApi(info_manager, atx),
|
||||
]
|
||||
@@ -189,6 +194,7 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins
|
||||
_Subsystem.make(streamer, "Streamer", self.__EV_STREAMER_STATE),
|
||||
_Subsystem.make(ocr, "OCR", self.__EV_OCR_STATE),
|
||||
_Subsystem.make(info_manager, "Info manager", self.__EV_INFO_STATE),
|
||||
_Subsystem.make(switch, "Switch", self.__EV_SWITCH_STATE),
|
||||
]
|
||||
|
||||
self.__streamer_notifier = aiotools.AioNotifier()
|
||||
@@ -229,8 +235,7 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins
|
||||
@exposed_http("GET", "/ws")
|
||||
async def __ws_handler(self, req: Request) -> WebSocketResponse:
|
||||
stream = valid_bool(req.query.get("stream", True))
|
||||
legacy = valid_bool(req.query.get("legacy", True))
|
||||
async with self._ws_session(req, stream=stream, legacy=legacy) as ws:
|
||||
async with self._ws_session(req, stream=stream) as ws:
|
||||
(major, minor) = __version__.split(".")
|
||||
await ws.send_event("loop", {
|
||||
"version": {
|
||||
@@ -242,7 +247,7 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins
|
||||
if sub.event_type:
|
||||
assert sub.trigger_state
|
||||
await sub.trigger_state()
|
||||
await self._broadcast_ws_event("hid_keymaps_state", await self.__hid_api.get_keymaps()) # FIXME
|
||||
await self._broadcast_ws_event(self.__EV_HID_KEYMAPS_STATE, await self.__hid_api.get_keymaps()) # FIXME
|
||||
return (await self._ws_loop(ws))
|
||||
|
||||
@exposed_ws("ping")
|
||||
@@ -293,10 +298,10 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins
|
||||
logger.exception("Cleanup error on %s", sub.name)
|
||||
logger.info("On-Cleanup complete")
|
||||
|
||||
async def _on_ws_opened(self) -> None:
|
||||
async def _on_ws_opened(self, _: WsSession) -> None:
|
||||
self.__streamer_notifier.notify()
|
||||
|
||||
async def _on_ws_closed(self) -> None:
|
||||
async def _on_ws_closed(self, _: WsSession) -> None:
|
||||
self.__hid.clear_events()
|
||||
self.__streamer_notifier.notify()
|
||||
|
||||
@@ -337,60 +342,5 @@ class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-ins
|
||||
)
|
||||
|
||||
async def __poll_state(self, event_type: str, poller: AsyncGenerator[dict, None]) -> None:
|
||||
match event_type:
|
||||
case self.__EV_GPIO_STATE:
|
||||
await self.__poll_gpio_state(poller)
|
||||
case self.__EV_INFO_STATE:
|
||||
await self.__poll_info_state(poller)
|
||||
case self.__EV_MSD_STATE:
|
||||
await self.__poll_msd_state(poller)
|
||||
case self.__EV_STREAMER_STATE:
|
||||
await self.__poll_streamer_state(poller)
|
||||
case self.__EV_OCR_STATE:
|
||||
await self.__poll_ocr_state(poller)
|
||||
case _:
|
||||
async for state in poller:
|
||||
await self._broadcast_ws_event(event_type, state)
|
||||
|
||||
async def __poll_gpio_state(self, poller: AsyncGenerator[dict, None]) -> None:
|
||||
prev: dict = {"state": {"inputs": {}, "outputs": {}}}
|
||||
async for state in poller:
|
||||
await self._broadcast_ws_event(self.__EV_GPIO_STATE, state, legacy=False)
|
||||
if "model" in state: # We have only "model"+"state" or "model" event
|
||||
prev = state
|
||||
await self._broadcast_ws_event("gpio_model_state", prev["model"], legacy=True)
|
||||
else:
|
||||
prev["state"]["inputs"].update(state["state"].get("inputs", {}))
|
||||
prev["state"]["outputs"].update(state["state"].get("outputs", {}))
|
||||
await self._broadcast_ws_event(self.__EV_GPIO_STATE, prev["state"], legacy=True)
|
||||
|
||||
async def __poll_info_state(self, poller: AsyncGenerator[dict, None]) -> None:
|
||||
async for state in poller:
|
||||
await self._broadcast_ws_event(self.__EV_INFO_STATE, state, legacy=False)
|
||||
for (key, value) in state.items():
|
||||
await self._broadcast_ws_event(f"info_{key}_state", value, legacy=True)
|
||||
|
||||
async def __poll_msd_state(self, poller: AsyncGenerator[dict, None]) -> None:
|
||||
prev: dict = {"storage": None}
|
||||
async for state in poller:
|
||||
await self._broadcast_ws_event(self.__EV_MSD_STATE, state, legacy=False)
|
||||
prev_storage = prev["storage"]
|
||||
prev.update(state)
|
||||
if prev["storage"] is not None and prev_storage is not None:
|
||||
prev_storage.update(prev["storage"])
|
||||
prev["storage"] = prev_storage
|
||||
if "online" in prev: # Complete/Full
|
||||
await self._broadcast_ws_event(self.__EV_MSD_STATE, prev, legacy=True)
|
||||
|
||||
async def __poll_streamer_state(self, poller: AsyncGenerator[dict, None]) -> None:
|
||||
prev: dict = {}
|
||||
async for state in poller:
|
||||
await self._broadcast_ws_event(self.__EV_STREAMER_STATE, state, legacy=False)
|
||||
prev.update(state)
|
||||
if "features" in prev: # Complete/Full
|
||||
await self._broadcast_ws_event(self.__EV_STREAMER_STATE, prev, legacy=True)
|
||||
|
||||
async def __poll_ocr_state(self, poller: AsyncGenerator[dict, None]) -> None:
|
||||
async for state in poller:
|
||||
await self._broadcast_ws_event(self.__EV_OCR_STATE, state, legacy=False)
|
||||
await self._broadcast_ws_event("streamer_ocr_state", {"ocr": state}, legacy=True)
|
||||
await self._broadcast_ws_event(event_type, state)
|
||||
|
||||
@@ -123,10 +123,10 @@ class Snapshoter: # pylint: disable=too-many-instance-attributes
|
||||
|
||||
if self.__wakeup_key:
|
||||
logger.info("Waking up using key %r ...", self.__wakeup_key)
|
||||
self.__hid.send_key_events([
|
||||
(self.__wakeup_key, True),
|
||||
(self.__wakeup_key, False),
|
||||
])
|
||||
await self.__hid.send_key_events(
|
||||
keys=[(self.__wakeup_key, True), (self.__wakeup_key, False)],
|
||||
no_ignore_keys=True,
|
||||
)
|
||||
|
||||
if self.__wakeup_move:
|
||||
logger.info("Waking up using mouse move for %d units ...", self.__wakeup_move)
|
||||
|
||||
400
kvmd/apps/kvmd/switch/__init__.py
Normal file
400
kvmd/apps/kvmd/switch/__init__.py
Normal file
@@ -0,0 +1,400 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
import os
|
||||
import asyncio
|
||||
|
||||
from typing import AsyncGenerator
|
||||
|
||||
from .lib import OperationError
|
||||
from .lib import get_logger
|
||||
from .lib import aiotools
|
||||
from .lib import Inotify
|
||||
|
||||
from .types import Edid
|
||||
from .types import Edids
|
||||
from .types import Color
|
||||
from .types import Colors
|
||||
from .types import PortNames
|
||||
from .types import AtxClickPowerDelays
|
||||
from .types import AtxClickPowerLongDelays
|
||||
from .types import AtxClickResetDelays
|
||||
|
||||
from .chain import DeviceFoundEvent
|
||||
from .chain import ChainTruncatedEvent
|
||||
from .chain import PortActivatedEvent
|
||||
from .chain import UnitStateEvent
|
||||
from .chain import UnitAtxLedsEvent
|
||||
from .chain import Chain
|
||||
|
||||
from .state import StateCache
|
||||
|
||||
from .storage import Storage
|
||||
|
||||
|
||||
# =====
|
||||
class SwitchError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class SwitchOperationError(OperationError, SwitchError):
|
||||
pass
|
||||
|
||||
|
||||
class SwitchUnknownEdidError(SwitchOperationError):
|
||||
def __init__(self) -> None:
|
||||
super().__init__("No specified EDID ID found")
|
||||
|
||||
|
||||
# =====
|
||||
class Switch: # pylint: disable=too-many-public-methods
|
||||
__X_EDIDS = "edids"
|
||||
__X_COLORS = "colors"
|
||||
__X_PORT_NAMES = "port_names"
|
||||
__X_ATX_CP_DELAYS = "atx_cp_delays"
|
||||
__X_ATX_CPL_DELAYS = "atx_cpl_delays"
|
||||
__X_ATX_CR_DELAYS = "atx_cr_delays"
|
||||
|
||||
__X_ALL = frozenset([
|
||||
__X_EDIDS, __X_COLORS, __X_PORT_NAMES,
|
||||
__X_ATX_CP_DELAYS, __X_ATX_CPL_DELAYS, __X_ATX_CR_DELAYS,
|
||||
])
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
device_path: str,
|
||||
default_edid_path: str,
|
||||
pst_unix_path: str,
|
||||
) -> None:
|
||||
|
||||
self.__default_edid_path = default_edid_path
|
||||
|
||||
self.__chain = Chain(device_path)
|
||||
self.__cache = StateCache()
|
||||
self.__storage = Storage(pst_unix_path)
|
||||
|
||||
self.__lock = asyncio.Lock()
|
||||
|
||||
self.__save_notifier = aiotools.AioNotifier()
|
||||
|
||||
# =====
|
||||
|
||||
def __x_set_edids(self, edids: Edids, save: bool=True) -> None:
|
||||
self.__chain.set_edids(edids)
|
||||
self.__cache.set_edids(edids)
|
||||
if save:
|
||||
self.__save_notifier.notify()
|
||||
|
||||
def __x_set_colors(self, colors: Colors, save: bool=True) -> None:
|
||||
self.__chain.set_colors(colors)
|
||||
self.__cache.set_colors(colors)
|
||||
if save:
|
||||
self.__save_notifier.notify()
|
||||
|
||||
def __x_set_port_names(self, port_names: PortNames, save: bool=True) -> None:
|
||||
self.__cache.set_port_names(port_names)
|
||||
if save:
|
||||
self.__save_notifier.notify()
|
||||
|
||||
def __x_set_atx_cp_delays(self, delays: AtxClickPowerDelays, save: bool=True) -> None:
|
||||
self.__cache.set_atx_cp_delays(delays)
|
||||
if save:
|
||||
self.__save_notifier.notify()
|
||||
|
||||
def __x_set_atx_cpl_delays(self, delays: AtxClickPowerLongDelays, save: bool=True) -> None:
|
||||
self.__cache.set_atx_cpl_delays(delays)
|
||||
if save:
|
||||
self.__save_notifier.notify()
|
||||
|
||||
def __x_set_atx_cr_delays(self, delays: AtxClickResetDelays, save: bool=True) -> None:
|
||||
self.__cache.set_atx_cr_delays(delays)
|
||||
if save:
|
||||
self.__save_notifier.notify()
|
||||
|
||||
# =====
|
||||
|
||||
async def set_active_port(self, port: int) -> None:
|
||||
self.__chain.set_active_port(port)
|
||||
|
||||
# =====
|
||||
|
||||
async def set_port_beacon(self, port: int, on: bool) -> None:
|
||||
self.__chain.set_port_beacon(port, on)
|
||||
|
||||
async def set_uplink_beacon(self, unit: int, on: bool) -> None:
|
||||
self.__chain.set_uplink_beacon(unit, on)
|
||||
|
||||
async def set_downlink_beacon(self, unit: int, on: bool) -> None:
|
||||
self.__chain.set_downlink_beacon(unit, on)
|
||||
|
||||
# =====
|
||||
|
||||
async def atx_power_on(self, port: int) -> None:
|
||||
self.__inner_atx_cp(port, False, self.__X_ATX_CP_DELAYS)
|
||||
|
||||
async def atx_power_off(self, port: int) -> None:
|
||||
self.__inner_atx_cp(port, True, self.__X_ATX_CP_DELAYS)
|
||||
|
||||
async def atx_power_off_hard(self, port: int) -> None:
|
||||
self.__inner_atx_cp(port, True, self.__X_ATX_CPL_DELAYS)
|
||||
|
||||
async def atx_power_reset_hard(self, port: int) -> None:
|
||||
self.__inner_atx_cr(port, True)
|
||||
|
||||
async def atx_click_power(self, port: int) -> None:
|
||||
self.__inner_atx_cp(port, None, self.__X_ATX_CP_DELAYS)
|
||||
|
||||
async def atx_click_power_long(self, port: int) -> None:
|
||||
self.__inner_atx_cp(port, None, self.__X_ATX_CPL_DELAYS)
|
||||
|
||||
async def atx_click_reset(self, port: int) -> None:
|
||||
self.__inner_atx_cr(port, None)
|
||||
|
||||
def __inner_atx_cp(self, port: int, if_powered: (bool | None), x_delay: str) -> None:
|
||||
assert x_delay in [self.__X_ATX_CP_DELAYS, self.__X_ATX_CPL_DELAYS]
|
||||
delay = getattr(self.__cache, f"get_{x_delay}")()[port]
|
||||
self.__chain.click_power(port, delay, if_powered)
|
||||
|
||||
def __inner_atx_cr(self, port: int, if_powered: (bool | None)) -> None:
|
||||
delay = self.__cache.get_atx_cr_delays()[port]
|
||||
self.__chain.click_reset(port, delay, if_powered)
|
||||
|
||||
# =====
|
||||
|
||||
async def create_edid(self, name: str, data_hex: str) -> str:
|
||||
async with self.__lock:
|
||||
edids = self.__cache.get_edids()
|
||||
edid_id = edids.add(Edid.from_data(name, data_hex))
|
||||
self.__x_set_edids(edids)
|
||||
return edid_id
|
||||
|
||||
async def change_edid(
|
||||
self,
|
||||
edid_id: str,
|
||||
name: (str | None)=None,
|
||||
data_hex: (str | None)=None,
|
||||
) -> None:
|
||||
|
||||
assert edid_id != Edids.DEFAULT_ID
|
||||
async with self.__lock:
|
||||
edids = self.__cache.get_edids()
|
||||
if not edids.has_id(edid_id):
|
||||
raise SwitchUnknownEdidError()
|
||||
old = edids.get(edid_id)
|
||||
name = (name or old.name)
|
||||
data_hex = (data_hex or old.as_text())
|
||||
edids.set(edid_id, Edid.from_data(name, data_hex))
|
||||
self.__x_set_edids(edids)
|
||||
|
||||
async def remove_edid(self, edid_id: str) -> None:
|
||||
assert edid_id != Edids.DEFAULT_ID
|
||||
async with self.__lock:
|
||||
edids = self.__cache.get_edids()
|
||||
if not edids.has_id(edid_id):
|
||||
raise SwitchUnknownEdidError()
|
||||
edids.remove(edid_id)
|
||||
self.__x_set_edids(edids)
|
||||
|
||||
# =====
|
||||
|
||||
async def set_colors(self, **values: str) -> None:
|
||||
async with self.__lock:
|
||||
old = self.__cache.get_colors()
|
||||
new = {}
|
||||
for role in Colors.ROLES:
|
||||
if role in values:
|
||||
if values[role] != "default":
|
||||
new[role] = Color.from_text(values[role])
|
||||
# else reset to default
|
||||
else:
|
||||
new[role] = getattr(old, role)
|
||||
self.__x_set_colors(Colors(**new)) # type: ignore
|
||||
|
||||
# =====
|
||||
|
||||
async def set_port_params(
|
||||
self,
|
||||
port: int,
|
||||
edid_id: (str | None)=None,
|
||||
name: (str | None)=None,
|
||||
atx_click_power_delay: (float | None)=None,
|
||||
atx_click_power_long_delay: (float | None)=None,
|
||||
atx_click_reset_delay: (float | None)=None,
|
||||
) -> None:
|
||||
|
||||
async with self.__lock:
|
||||
if edid_id is not None:
|
||||
edids = self.__cache.get_edids()
|
||||
if not edids.has_id(edid_id):
|
||||
raise SwitchUnknownEdidError()
|
||||
edids.assign(port, edid_id)
|
||||
self.__x_set_edids(edids)
|
||||
|
||||
for (key, value) in [
|
||||
(self.__X_PORT_NAMES, name),
|
||||
(self.__X_ATX_CP_DELAYS, atx_click_power_delay),
|
||||
(self.__X_ATX_CPL_DELAYS, atx_click_power_long_delay),
|
||||
(self.__X_ATX_CR_DELAYS, atx_click_reset_delay),
|
||||
]:
|
||||
if value is not None:
|
||||
new = getattr(self.__cache, f"get_{key}")()
|
||||
new[port] = (value or None) # None == reset to default
|
||||
getattr(self, f"_Switch__x_set_{key}")(new)
|
||||
|
||||
# =====
|
||||
|
||||
async def reboot_unit(self, unit: int, bootloader: bool) -> None:
|
||||
self.__chain.reboot_unit(unit, bootloader)
|
||||
|
||||
# =====
|
||||
|
||||
async def get_state(self) -> dict:
|
||||
return self.__cache.get_state()
|
||||
|
||||
async def trigger_state(self) -> None:
|
||||
await self.__cache.trigger_state()
|
||||
|
||||
async def poll_state(self) -> AsyncGenerator[dict, None]:
|
||||
async for state in self.__cache.poll_state():
|
||||
yield state
|
||||
|
||||
# =====
|
||||
|
||||
async def systask(self) -> None:
|
||||
tasks = [
|
||||
asyncio.create_task(self.__systask_events()),
|
||||
asyncio.create_task(self.__systask_default_edid()),
|
||||
asyncio.create_task(self.__systask_storage()),
|
||||
]
|
||||
try:
|
||||
await asyncio.gather(*tasks)
|
||||
except Exception:
|
||||
for task in tasks:
|
||||
task.cancel()
|
||||
await asyncio.gather(*tasks, return_exceptions=True)
|
||||
raise
|
||||
|
||||
async def __systask_events(self) -> None:
|
||||
async for event in self.__chain.poll_events():
|
||||
match event:
|
||||
case DeviceFoundEvent():
|
||||
await self.__load_configs()
|
||||
case ChainTruncatedEvent():
|
||||
self.__cache.truncate(event.units)
|
||||
case PortActivatedEvent():
|
||||
self.__cache.update_active_port(event.port)
|
||||
case UnitStateEvent():
|
||||
self.__cache.update_unit_state(event.unit, event.state)
|
||||
case UnitAtxLedsEvent():
|
||||
self.__cache.update_unit_atx_leds(event.unit, event.atx_leds)
|
||||
|
||||
async def __load_configs(self) -> None:
|
||||
async with self.__lock:
|
||||
try:
|
||||
async with self.__storage.readable() as ctx:
|
||||
values = {
|
||||
key: await getattr(ctx, f"read_{key}")()
|
||||
for key in self.__X_ALL
|
||||
}
|
||||
data_hex = await aiotools.read_file(self.__default_edid_path)
|
||||
values["edids"].set_default(data_hex)
|
||||
except Exception:
|
||||
get_logger(0).exception("Can't load configs")
|
||||
else:
|
||||
for (key, value) in values.items():
|
||||
func = getattr(self, f"_Switch__x_set_{key}")
|
||||
if isinstance(value, tuple):
|
||||
func(*value, save=False)
|
||||
else:
|
||||
func(value, save=False)
|
||||
self.__chain.set_actual(True)
|
||||
|
||||
async def __systask_default_edid(self) -> None:
|
||||
logger = get_logger(0)
|
||||
async for _ in self.__poll_default_edid():
|
||||
async with self.__lock:
|
||||
edids = self.__cache.get_edids()
|
||||
try:
|
||||
data_hex = await aiotools.read_file(self.__default_edid_path)
|
||||
edids.set_default(data_hex)
|
||||
except Exception:
|
||||
logger.exception("Can't read default EDID, ignoring ...")
|
||||
else:
|
||||
self.__x_set_edids(edids, save=False)
|
||||
|
||||
async def __poll_default_edid(self) -> AsyncGenerator[None, None]:
|
||||
logger = get_logger(0)
|
||||
while True:
|
||||
while not os.path.exists(self.__default_edid_path):
|
||||
await asyncio.sleep(5)
|
||||
try:
|
||||
with Inotify() as inotify:
|
||||
await inotify.watch_all_changes(self.__default_edid_path)
|
||||
if os.path.islink(self.__default_edid_path):
|
||||
await inotify.watch_all_changes(os.path.realpath(self.__default_edid_path))
|
||||
yield None
|
||||
while True:
|
||||
need_restart = False
|
||||
need_notify = False
|
||||
for event in (await inotify.get_series(timeout=1)):
|
||||
need_notify = True
|
||||
if event.restart:
|
||||
logger.warning("Got fatal inotify event: %s; reinitializing ...", event)
|
||||
need_restart = True
|
||||
break
|
||||
if need_restart:
|
||||
break
|
||||
if need_notify:
|
||||
yield None
|
||||
except Exception:
|
||||
logger.exception("Unexpected watcher error")
|
||||
await asyncio.sleep(1)
|
||||
|
||||
async def __systask_storage(self) -> None:
|
||||
# При остановке KVMD можем не успеть записать, ну да пофиг
|
||||
prevs = dict.fromkeys(self.__X_ALL)
|
||||
while True:
|
||||
await self.__save_notifier.wait()
|
||||
while (await self.__save_notifier.wait(5)):
|
||||
pass
|
||||
while True:
|
||||
try:
|
||||
async with self.__lock:
|
||||
write = {
|
||||
key: new
|
||||
for (key, old) in prevs.items()
|
||||
if (new := getattr(self.__cache, f"get_{key}")()) != old
|
||||
}
|
||||
if write:
|
||||
async with self.__storage.writable() as ctx:
|
||||
for (key, new) in write.items():
|
||||
func = getattr(ctx, f"write_{key}")
|
||||
if isinstance(new, tuple):
|
||||
await func(*new)
|
||||
else:
|
||||
await func(new)
|
||||
prevs[key] = new
|
||||
except Exception:
|
||||
get_logger(0).exception("Unexpected storage error")
|
||||
await asyncio.sleep(5)
|
||||
else:
|
||||
break
|
||||
440
kvmd/apps/kvmd/switch/chain.py
Normal file
440
kvmd/apps/kvmd/switch/chain.py
Normal file
@@ -0,0 +1,440 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
import multiprocessing
|
||||
import queue
|
||||
import select
|
||||
import dataclasses
|
||||
import time
|
||||
|
||||
from typing import AsyncGenerator
|
||||
|
||||
from .lib import get_logger
|
||||
from .lib import tools
|
||||
from .lib import aiotools
|
||||
from .lib import aioproc
|
||||
|
||||
from .types import Edids
|
||||
from .types import Colors
|
||||
|
||||
from .proto import Response
|
||||
from .proto import UnitState
|
||||
from .proto import UnitAtxLeds
|
||||
|
||||
from .device import Device
|
||||
from .device import DeviceError
|
||||
|
||||
|
||||
# =====
|
||||
class _BaseCmd:
|
||||
pass
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class _CmdSetActual(_BaseCmd):
|
||||
actual: bool
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class _CmdSetActivePort(_BaseCmd):
|
||||
port: int
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
assert self.port >= 0
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class _CmdSetPortBeacon(_BaseCmd):
|
||||
port: int
|
||||
on: bool
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class _CmdSetUnitBeacon(_BaseCmd):
|
||||
unit: int
|
||||
on: bool
|
||||
downlink: bool
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class _CmdSetEdids(_BaseCmd):
|
||||
edids: Edids
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class _CmdSetColors(_BaseCmd):
|
||||
colors: Colors
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class _CmdAtxClick(_BaseCmd):
|
||||
port: int
|
||||
delay: float
|
||||
reset: bool
|
||||
if_powered: (bool | None)
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
assert self.port >= 0
|
||||
assert 0.001 <= self.delay <= (0xFFFF / 1000)
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class _CmdRebootUnit(_BaseCmd):
|
||||
unit: int
|
||||
bootloader: bool
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
assert self.unit >= 0
|
||||
|
||||
|
||||
class _UnitContext:
|
||||
__TIMEOUT = 5.0
|
||||
|
||||
def __init__(self) -> None:
|
||||
self.state: (UnitState | None) = None
|
||||
self.atx_leds: (UnitAtxLeds | None) = None
|
||||
self.__rid = -1
|
||||
self.__deadline_ts = -1.0
|
||||
|
||||
def can_be_changed(self) -> bool:
|
||||
return (
|
||||
self.state is not None
|
||||
and not self.state.flags.changing_busy
|
||||
and self.changing_rid < 0
|
||||
)
|
||||
|
||||
# =====
|
||||
|
||||
@property
|
||||
def changing_rid(self) -> int:
|
||||
if self.__deadline_ts >= 0 and self.__deadline_ts < time.monotonic():
|
||||
self.__rid = -1
|
||||
self.__deadline_ts = -1
|
||||
return self.__rid
|
||||
|
||||
@changing_rid.setter
|
||||
def changing_rid(self, rid: int) -> None:
|
||||
self.__rid = rid
|
||||
self.__deadline_ts = ((time.monotonic() + self.__TIMEOUT) if rid >= 0 else -1)
|
||||
|
||||
# =====
|
||||
|
||||
def is_atx_allowed(self, ch: int) -> tuple[bool, bool]: # (allowed, power_led)
|
||||
if self.state is None or self.atx_leds is None:
|
||||
return (False, False)
|
||||
return ((not self.state.atx_busy[ch]), self.atx_leds.power[ch])
|
||||
|
||||
|
||||
# =====
|
||||
class BaseEvent:
|
||||
pass
|
||||
|
||||
|
||||
class DeviceFoundEvent(BaseEvent):
|
||||
pass
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class ChainTruncatedEvent(BaseEvent):
|
||||
units: int
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class PortActivatedEvent(BaseEvent):
|
||||
port: int
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class UnitStateEvent(BaseEvent):
|
||||
unit: int
|
||||
state: UnitState
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class UnitAtxLedsEvent(BaseEvent):
|
||||
unit: int
|
||||
atx_leds: UnitAtxLeds
|
||||
|
||||
|
||||
# =====
|
||||
class Chain: # pylint: disable=too-many-instance-attributes
|
||||
def __init__(self, device_path: str) -> None:
|
||||
self.__device = Device(device_path)
|
||||
|
||||
self.__actual = False
|
||||
|
||||
self.__edids = Edids()
|
||||
|
||||
self.__colors = Colors()
|
||||
|
||||
self.__units: list[_UnitContext] = []
|
||||
self.__active_port = -1
|
||||
|
||||
self.__cmd_queue: "multiprocessing.Queue[_BaseCmd]" = multiprocessing.Queue()
|
||||
self.__events_queue: "multiprocessing.Queue[BaseEvent]" = multiprocessing.Queue()
|
||||
|
||||
self.__stop_event = multiprocessing.Event()
|
||||
|
||||
def set_actual(self, actual: bool) -> None:
|
||||
# Флаг разрешения синхронизации EDID и прочих чувствительных вещей
|
||||
self.__queue_cmd(_CmdSetActual(actual))
|
||||
|
||||
# =====
|
||||
|
||||
def set_active_port(self, port: int) -> None:
|
||||
self.__queue_cmd(_CmdSetActivePort(port))
|
||||
|
||||
# =====
|
||||
|
||||
def set_port_beacon(self, port: int, on: bool) -> None:
|
||||
self.__queue_cmd(_CmdSetPortBeacon(port, on))
|
||||
|
||||
def set_uplink_beacon(self, unit: int, on: bool) -> None:
|
||||
self.__queue_cmd(_CmdSetUnitBeacon(unit, on, downlink=False))
|
||||
|
||||
def set_downlink_beacon(self, unit: int, on: bool) -> None:
|
||||
self.__queue_cmd(_CmdSetUnitBeacon(unit, on, downlink=True))
|
||||
|
||||
# =====
|
||||
|
||||
def set_edids(self, edids: Edids) -> None:
|
||||
self.__queue_cmd(_CmdSetEdids(edids)) # Will be copied because of multiprocessing.Queue()
|
||||
|
||||
def set_colors(self, colors: Colors) -> None:
|
||||
self.__queue_cmd(_CmdSetColors(colors))
|
||||
|
||||
# =====
|
||||
|
||||
def click_power(self, port: int, delay: float, if_powered: (bool | None)) -> None:
|
||||
self.__queue_cmd(_CmdAtxClick(port, delay, reset=False, if_powered=if_powered))
|
||||
|
||||
def click_reset(self, port: int, delay: float, if_powered: (bool | None)) -> None:
|
||||
self.__queue_cmd(_CmdAtxClick(port, delay, reset=True, if_powered=if_powered))
|
||||
|
||||
# =====
|
||||
|
||||
def reboot_unit(self, unit: int, bootloader: bool) -> None:
|
||||
self.__queue_cmd(_CmdRebootUnit(unit, bootloader))
|
||||
|
||||
# =====
|
||||
|
||||
async def poll_events(self) -> AsyncGenerator[BaseEvent, None]:
|
||||
proc = multiprocessing.Process(target=self.__subprocess, daemon=True)
|
||||
try:
|
||||
proc.start()
|
||||
while True:
|
||||
try:
|
||||
yield (await aiotools.run_async(self.__events_queue.get, True, 0.1))
|
||||
except queue.Empty:
|
||||
pass
|
||||
finally:
|
||||
if proc.is_alive():
|
||||
self.__stop_event.set()
|
||||
if proc.is_alive() or proc.exitcode is not None:
|
||||
await aiotools.run_async(proc.join)
|
||||
|
||||
# =====
|
||||
|
||||
def __queue_cmd(self, cmd: _BaseCmd) -> None:
|
||||
if not self.__stop_event.is_set():
|
||||
self.__cmd_queue.put_nowait(cmd)
|
||||
|
||||
def __queue_event(self, event: BaseEvent) -> None:
|
||||
if not self.__stop_event.is_set():
|
||||
self.__events_queue.put_nowait(event)
|
||||
|
||||
def __subprocess(self) -> None:
|
||||
logger = aioproc.settle("Switch", "switch")
|
||||
no_device_reported = False
|
||||
while True:
|
||||
try:
|
||||
if self.__device.has_device():
|
||||
no_device_reported = False
|
||||
with self.__device:
|
||||
logger.info("Switch found")
|
||||
self.__queue_event(DeviceFoundEvent())
|
||||
self.__main_loop()
|
||||
elif not no_device_reported:
|
||||
self.__queue_event(ChainTruncatedEvent(0))
|
||||
logger.info("Switch is missing")
|
||||
no_device_reported = True
|
||||
except DeviceError as ex:
|
||||
logger.error("%s", tools.efmt(ex))
|
||||
except Exception:
|
||||
logger.exception("Unexpected error in the Switch loop")
|
||||
tools.clear_queue(self.__cmd_queue)
|
||||
if self.__stop_event.is_set():
|
||||
break
|
||||
time.sleep(1)
|
||||
|
||||
def __main_loop(self) -> None:
|
||||
self.__device.request_state()
|
||||
self.__device.request_atx_leds()
|
||||
while not self.__stop_event.is_set():
|
||||
if self.__select():
|
||||
for resp in self.__device.read_all():
|
||||
self.__update_units(resp)
|
||||
self.__adjust_start_port()
|
||||
self.__finish_changing_request(resp)
|
||||
self.__consume_commands()
|
||||
self.__ensure_config()
|
||||
|
||||
def __select(self) -> bool:
|
||||
try:
|
||||
return bool(select.select([
|
||||
self.__device.get_fd(),
|
||||
self.__cmd_queue._reader, # type: ignore # pylint: disable=protected-access
|
||||
], [], [], 1)[0])
|
||||
except Exception as ex:
|
||||
raise DeviceError(ex)
|
||||
|
||||
def __consume_commands(self) -> None:
|
||||
while not self.__cmd_queue.empty():
|
||||
cmd = self.__cmd_queue.get()
|
||||
match cmd:
|
||||
case _CmdSetActual():
|
||||
self.__actual = cmd.actual
|
||||
|
||||
case _CmdSetActivePort():
|
||||
# Может быть вызвано изнутри при синхронизации
|
||||
self.__active_port = cmd.port
|
||||
self.__queue_event(PortActivatedEvent(self.__active_port))
|
||||
|
||||
case _CmdSetPortBeacon():
|
||||
(unit, ch) = self.get_real_unit_channel(cmd.port)
|
||||
self.__device.request_beacon(unit, ch, cmd.on)
|
||||
|
||||
case _CmdSetUnitBeacon():
|
||||
ch = (4 if cmd.downlink else 5)
|
||||
self.__device.request_beacon(cmd.unit, ch, cmd.on)
|
||||
|
||||
case _CmdAtxClick():
|
||||
(unit, ch) = self.get_real_unit_channel(cmd.port)
|
||||
if unit < len(self.__units):
|
||||
(allowed, powered) = self.__units[unit].is_atx_allowed(ch)
|
||||
if allowed and (cmd.if_powered is None or cmd.if_powered == powered):
|
||||
delay_ms = min(int(cmd.delay * 1000), 0xFFFF)
|
||||
if cmd.reset:
|
||||
self.__device.request_atx_cr(unit, ch, delay_ms)
|
||||
else:
|
||||
self.__device.request_atx_cp(unit, ch, delay_ms)
|
||||
|
||||
case _CmdSetEdids():
|
||||
self.__edids = cmd.edids
|
||||
|
||||
case _CmdSetColors():
|
||||
self.__colors = cmd.colors
|
||||
|
||||
case _CmdRebootUnit():
|
||||
self.__device.request_reboot(cmd.unit, cmd.bootloader)
|
||||
|
||||
def __update_units(self, resp: Response) -> None:
|
||||
units = resp.header.unit + 1
|
||||
while len(self.__units) < units:
|
||||
self.__units.append(_UnitContext())
|
||||
|
||||
match resp.body:
|
||||
case UnitState():
|
||||
if not resp.body.flags.has_downlink and len(self.__units) > units:
|
||||
del self.__units[units:]
|
||||
self.__queue_event(ChainTruncatedEvent(units))
|
||||
self.__units[resp.header.unit].state = resp.body
|
||||
self.__queue_event(UnitStateEvent(resp.header.unit, resp.body))
|
||||
|
||||
case UnitAtxLeds():
|
||||
self.__units[resp.header.unit].atx_leds = resp.body
|
||||
self.__queue_event(UnitAtxLedsEvent(resp.header.unit, resp.body))
|
||||
|
||||
def __adjust_start_port(self) -> None:
|
||||
if self.__active_port < 0:
|
||||
for (unit, ctx) in enumerate(self.__units):
|
||||
if ctx.state is not None and ctx.state.ch < 4:
|
||||
# Trigger queue select()
|
||||
port = self.get_virtual_port(unit, ctx.state.ch)
|
||||
get_logger().info("Found an active port %d on [%d:%d]: Syncing ...",
|
||||
port, unit, ctx.state.ch)
|
||||
self.set_active_port(port)
|
||||
break
|
||||
|
||||
def __finish_changing_request(self, resp: Response) -> None:
|
||||
if self.__units[resp.header.unit].changing_rid == resp.header.rid:
|
||||
self.__units[resp.header.unit].changing_rid = -1
|
||||
|
||||
# =====
|
||||
|
||||
def __ensure_config(self) -> None:
|
||||
for (unit, ctx) in enumerate(self.__units):
|
||||
if ctx.state is not None:
|
||||
self.__ensure_config_port(unit, ctx)
|
||||
if self.__actual:
|
||||
self.__ensure_config_edids(unit, ctx)
|
||||
self.__ensure_config_colors(unit, ctx)
|
||||
|
||||
def __ensure_config_port(self, unit: int, ctx: _UnitContext) -> None:
|
||||
assert ctx.state is not None
|
||||
if self.__active_port >= 0 and ctx.can_be_changed():
|
||||
ch = self.get_unit_target_channel(unit, self.__active_port)
|
||||
if ctx.state.ch != ch:
|
||||
get_logger().info("Switching for active port %d: [%d:%d] -> [%d:%d] ...",
|
||||
self.__active_port, unit, ctx.state.ch, unit, ch)
|
||||
ctx.changing_rid = self.__device.request_switch(unit, ch)
|
||||
|
||||
def __ensure_config_edids(self, unit: int, ctx: _UnitContext) -> None:
|
||||
assert self.__actual
|
||||
assert ctx.state is not None
|
||||
if ctx.can_be_changed():
|
||||
for ch in range(4):
|
||||
port = self.get_virtual_port(unit, ch)
|
||||
edid = self.__edids.get_edid_for_port(port)
|
||||
if not ctx.state.compare_edid(ch, edid):
|
||||
get_logger().info("Changing EDID on port %d on [%d:%d]: %d/%d -> %d/%d (%s) ...",
|
||||
port, unit, ch,
|
||||
ctx.state.video_crc[ch], ctx.state.video_edid[ch],
|
||||
edid.crc, edid.valid, edid.name)
|
||||
ctx.changing_rid = self.__device.request_set_edid(unit, ch, edid)
|
||||
break # Busy globally
|
||||
|
||||
def __ensure_config_colors(self, unit: int, ctx: _UnitContext) -> None:
|
||||
assert self.__actual
|
||||
assert ctx.state is not None
|
||||
for np in range(6):
|
||||
if self.__colors.crc != ctx.state.np_crc[np]:
|
||||
# get_logger().info("Changing colors on NP [%d:%d]: %d -> %d ...",
|
||||
# unit, np, ctx.state.np_crc[np], self.__colors.crc)
|
||||
self.__device.request_set_colors(unit, np, self.__colors)
|
||||
|
||||
# =====
|
||||
|
||||
@classmethod
|
||||
def get_real_unit_channel(cls, port: int) -> tuple[int, int]:
|
||||
return (port // 4, port % 4)
|
||||
|
||||
@classmethod
|
||||
def get_unit_target_channel(cls, unit: int, port: int) -> int:
|
||||
(t_unit, t_ch) = cls.get_real_unit_channel(port)
|
||||
if unit != t_unit:
|
||||
t_ch = 4
|
||||
return t_ch
|
||||
|
||||
@classmethod
|
||||
def get_virtual_port(cls, unit: int, ch: int) -> int:
|
||||
return (unit * 4) + ch
|
||||
196
kvmd/apps/kvmd/switch/device.py
Normal file
196
kvmd/apps/kvmd/switch/device.py
Normal file
@@ -0,0 +1,196 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
import os
|
||||
import random
|
||||
import types
|
||||
|
||||
import serial
|
||||
|
||||
from .lib import tools
|
||||
|
||||
from .types import Edid
|
||||
from .types import Colors
|
||||
|
||||
from .proto import Packable
|
||||
from .proto import Request
|
||||
from .proto import Response
|
||||
from .proto import Header
|
||||
|
||||
from .proto import BodySwitch
|
||||
from .proto import BodySetBeacon
|
||||
from .proto import BodyAtxClick
|
||||
from .proto import BodySetEdid
|
||||
from .proto import BodyClearEdid
|
||||
from .proto import BodySetColors
|
||||
|
||||
|
||||
# =====
|
||||
class DeviceError(Exception):
|
||||
def __init__(self, ex: Exception):
|
||||
super().__init__(tools.efmt(ex))
|
||||
|
||||
|
||||
class Device:
|
||||
__SPEED = 115200
|
||||
__TIMEOUT = 5.0
|
||||
|
||||
def __init__(self, device_path: str) -> None:
|
||||
self.__device_path = device_path
|
||||
self.__rid = random.randint(1, 0xFFFF)
|
||||
self.__tty: (serial.Serial | None) = None
|
||||
self.__buf: bytes = b""
|
||||
|
||||
def __enter__(self) -> "Device":
|
||||
try:
|
||||
self.__tty = serial.Serial(
|
||||
self.__device_path,
|
||||
baudrate=self.__SPEED,
|
||||
timeout=self.__TIMEOUT,
|
||||
)
|
||||
except Exception as ex:
|
||||
raise DeviceError(ex)
|
||||
return self
|
||||
|
||||
def __exit__(
|
||||
self,
|
||||
_exc_type: type[BaseException],
|
||||
_exc: BaseException,
|
||||
_tb: types.TracebackType,
|
||||
) -> None:
|
||||
|
||||
if self.__tty is not None:
|
||||
try:
|
||||
self.__tty.close()
|
||||
except Exception:
|
||||
pass
|
||||
self.__tty = None
|
||||
|
||||
def has_device(self) -> bool:
|
||||
return os.path.exists(self.__device_path)
|
||||
|
||||
def get_fd(self) -> int:
|
||||
assert self.__tty is not None
|
||||
return self.__tty.fd
|
||||
|
||||
def read_all(self) -> list[Response]:
|
||||
assert self.__tty is not None
|
||||
try:
|
||||
if not self.__tty.in_waiting:
|
||||
return []
|
||||
self.__buf += self.__tty.read_all()
|
||||
except Exception as ex:
|
||||
raise DeviceError(ex)
|
||||
|
||||
results: list[Response] = []
|
||||
while True:
|
||||
try:
|
||||
begin = self.__buf.index(0xF1)
|
||||
except ValueError:
|
||||
break
|
||||
try:
|
||||
end = self.__buf.index(0xF2, begin)
|
||||
except ValueError:
|
||||
break
|
||||
msg = self.__buf[begin + 1:end]
|
||||
if 0xF1 in msg:
|
||||
# raise RuntimeError(f"Found 0xF1 inside the message: {msg!r}")
|
||||
break
|
||||
self.__buf = self.__buf[end + 1:]
|
||||
msg = self.__unescape(msg)
|
||||
resp = Response.unpack(msg)
|
||||
if resp is not None:
|
||||
results.append(resp)
|
||||
return results
|
||||
|
||||
def __unescape(self, msg: bytes) -> bytes:
|
||||
if 0xF0 not in msg:
|
||||
return msg
|
||||
unesc: list[int] = []
|
||||
esc = False
|
||||
for ch in msg:
|
||||
if ch == 0xF0:
|
||||
esc = True
|
||||
else:
|
||||
if esc:
|
||||
ch ^= 0xFF
|
||||
esc = False
|
||||
unesc.append(ch)
|
||||
return bytes(unesc)
|
||||
|
||||
def request_reboot(self, unit: int, bootloader: bool) -> int:
|
||||
return self.__send_request((Header.BOOTLOADER if bootloader else Header.REBOOT), unit, None)
|
||||
|
||||
def request_state(self) -> int:
|
||||
return self.__send_request(Header.STATE, 0xFF, None)
|
||||
|
||||
def request_switch(self, unit: int, ch: int) -> int:
|
||||
return self.__send_request(Header.SWITCH, unit, BodySwitch(ch))
|
||||
|
||||
def request_beacon(self, unit: int, ch: int, on: bool) -> int:
|
||||
return self.__send_request(Header.BEACON, unit, BodySetBeacon(ch, on))
|
||||
|
||||
def request_atx_leds(self) -> int:
|
||||
return self.__send_request(Header.ATX_LEDS, 0xFF, None)
|
||||
|
||||
def request_atx_cp(self, unit: int, ch: int, delay_ms: int) -> int:
|
||||
return self.__send_request(Header.ATX_CLICK, unit, BodyAtxClick(ch, BodyAtxClick.POWER, delay_ms))
|
||||
|
||||
def request_atx_cr(self, unit: int, ch: int, delay_ms: int) -> int:
|
||||
return self.__send_request(Header.ATX_CLICK, unit, BodyAtxClick(ch, BodyAtxClick.RESET, delay_ms))
|
||||
|
||||
def request_set_edid(self, unit: int, ch: int, edid: Edid) -> int:
|
||||
if edid.valid:
|
||||
return self.__send_request(Header.SET_EDID, unit, BodySetEdid(ch, edid))
|
||||
return self.__send_request(Header.CLEAR_EDID, unit, BodyClearEdid(ch))
|
||||
|
||||
def request_set_colors(self, unit: int, ch: int, colors: Colors) -> int:
|
||||
return self.__send_request(Header.SET_COLORS, unit, BodySetColors(ch, colors))
|
||||
|
||||
def __send_request(self, op: int, unit: int, body: (Packable | None)) -> int:
|
||||
assert self.__tty is not None
|
||||
req = Request(Header(
|
||||
proto=1,
|
||||
rid=self.__get_next_rid(),
|
||||
op=op,
|
||||
unit=unit,
|
||||
), body)
|
||||
data: list[int] = [0xF1]
|
||||
for ch in req.pack():
|
||||
if 0xF0 <= ch <= 0xF2:
|
||||
data.append(0xF0)
|
||||
ch ^= 0xFF
|
||||
data.append(ch)
|
||||
data.append(0xF2)
|
||||
try:
|
||||
self.__tty.write(bytes(data))
|
||||
self.__tty.flush()
|
||||
except Exception as ex:
|
||||
raise DeviceError(ex)
|
||||
return req.header.rid
|
||||
|
||||
def __get_next_rid(self) -> int:
|
||||
rid = self.__rid
|
||||
self.__rid += 1
|
||||
if self.__rid > 0xFFFF:
|
||||
self.__rid = 1
|
||||
return rid
|
||||
35
kvmd/apps/kvmd/switch/lib.py
Normal file
35
kvmd/apps/kvmd/switch/lib.py
Normal file
@@ -0,0 +1,35 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
# pylint: disable=unused-import
|
||||
|
||||
from ....logging import get_logger # noqa: F401
|
||||
|
||||
from .... import tools # noqa: F401
|
||||
from .... import aiotools # noqa: F401
|
||||
from .... import aioproc # noqa: F401
|
||||
from .... import bitbang # noqa: F401
|
||||
from .... import htclient # noqa: F401
|
||||
from ....inotify import Inotify # noqa: F401
|
||||
from ....errors import OperationError # noqa: F401
|
||||
from ....edid import EdidNoBlockError as ParsedEdidNoBlockError # noqa: F401
|
||||
from ....edid import Edid as ParsedEdid # noqa: F401
|
||||
295
kvmd/apps/kvmd/switch/proto.py
Normal file
295
kvmd/apps/kvmd/switch/proto.py
Normal file
@@ -0,0 +1,295 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
import struct
|
||||
import dataclasses
|
||||
|
||||
from typing import Optional
|
||||
|
||||
from .types import Edid
|
||||
from .types import Colors
|
||||
|
||||
|
||||
# =====
|
||||
class Packable:
|
||||
def pack(self) -> bytes:
|
||||
raise NotImplementedError()
|
||||
|
||||
|
||||
class Unpackable:
|
||||
@classmethod
|
||||
def unpack(cls, data: bytes, offset: int=0) -> "Unpackable":
|
||||
raise NotImplementedError()
|
||||
|
||||
|
||||
# =====
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class Header(Packable, Unpackable):
|
||||
proto: int
|
||||
rid: int
|
||||
op: int
|
||||
unit: int
|
||||
|
||||
NAK = 0
|
||||
BOOTLOADER = 2
|
||||
REBOOT = 3
|
||||
STATE = 4
|
||||
SWITCH = 5
|
||||
BEACON = 6
|
||||
ATX_LEDS = 7
|
||||
ATX_CLICK = 8
|
||||
SET_EDID = 9
|
||||
CLEAR_EDID = 10
|
||||
SET_COLORS = 12
|
||||
|
||||
__struct = struct.Struct("<BHBB")
|
||||
|
||||
SIZE = __struct.size
|
||||
|
||||
def pack(self) -> bytes:
|
||||
return self.__struct.pack(self.proto, self.rid, self.op, self.unit)
|
||||
|
||||
@classmethod
|
||||
def unpack(cls, data: bytes, offset: int=0) -> "Header":
|
||||
return Header(*cls.__struct.unpack_from(data, offset=offset))
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class Nak(Unpackable):
|
||||
reason: int
|
||||
|
||||
INVALID_COMMAND = 0
|
||||
BUSY = 1
|
||||
NO_DOWNLINK = 2
|
||||
DOWNLINK_OVERFLOW = 3
|
||||
|
||||
__struct = struct.Struct("<B")
|
||||
|
||||
@classmethod
|
||||
def unpack(cls, data: bytes, offset: int=0) -> "Nak":
|
||||
return Nak(*cls.__struct.unpack_from(data, offset=offset))
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class UnitFlags:
|
||||
changing_busy: bool
|
||||
flashing_busy: bool
|
||||
has_downlink: bool
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class UnitState(Unpackable): # pylint: disable=too-many-instance-attributes
|
||||
sw_version: int
|
||||
hw_version: int
|
||||
flags: UnitFlags
|
||||
ch: int
|
||||
beacons: tuple[bool, bool, bool, bool, bool, bool]
|
||||
np_crc: tuple[int, int, int, int, int, int]
|
||||
video_5v_sens: tuple[bool, bool, bool, bool, bool]
|
||||
video_hpd: tuple[bool, bool, bool, bool, bool]
|
||||
video_edid: tuple[bool, bool, bool, bool]
|
||||
video_crc: tuple[int, int, int, int]
|
||||
usb_5v_sens: tuple[bool, bool, bool, bool]
|
||||
atx_busy: tuple[bool, bool, bool, bool]
|
||||
|
||||
__struct = struct.Struct("<HHHBBHHHHHHBBBHHHHBxB30x")
|
||||
|
||||
def compare_edid(self, ch: int, edid: Optional["Edid"]) -> bool:
|
||||
if edid is None:
|
||||
# Сойдет любой невалидный EDID
|
||||
return (not self.video_edid[ch])
|
||||
return (
|
||||
self.video_edid[ch] == edid.valid
|
||||
and self.video_crc[ch] == edid.crc
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def unpack(cls, data: bytes, offset: int=0) -> "UnitState": # pylint: disable=too-many-locals
|
||||
(
|
||||
sw_version, hw_version, flags, ch,
|
||||
beacons, nc0, nc1, nc2, nc3, nc4, nc5,
|
||||
video_5v_sens, video_hpd, video_edid, vc0, vc1, vc2, vc3,
|
||||
usb_5v_sens, atx_busy,
|
||||
) = cls.__struct.unpack_from(data, offset=offset)
|
||||
return UnitState(
|
||||
sw_version,
|
||||
hw_version,
|
||||
flags=UnitFlags(
|
||||
changing_busy=bool(flags & 0x80),
|
||||
flashing_busy=bool(flags & 0x40),
|
||||
has_downlink=bool(flags & 0x02),
|
||||
),
|
||||
ch=ch,
|
||||
beacons=cls.__make_flags6(beacons),
|
||||
np_crc=(nc0, nc1, nc2, nc3, nc4, nc5),
|
||||
video_5v_sens=cls.__make_flags5(video_5v_sens),
|
||||
video_hpd=cls.__make_flags5(video_hpd),
|
||||
video_edid=cls.__make_flags4(video_edid),
|
||||
video_crc=(vc0, vc1, vc2, vc3),
|
||||
usb_5v_sens=cls.__make_flags4(usb_5v_sens),
|
||||
atx_busy=cls.__make_flags4(atx_busy),
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def __make_flags6(cls, mask: int) -> tuple[bool, bool, bool, bool, bool, bool]:
|
||||
return (
|
||||
bool(mask & 0x01), bool(mask & 0x02), bool(mask & 0x04),
|
||||
bool(mask & 0x08), bool(mask & 0x10), bool(mask & 0x20),
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def __make_flags5(cls, mask: int) -> tuple[bool, bool, bool, bool, bool]:
|
||||
return (
|
||||
bool(mask & 0x01), bool(mask & 0x02), bool(mask & 0x04),
|
||||
bool(mask & 0x08), bool(mask & 0x10),
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def __make_flags4(cls, mask: int) -> tuple[bool, bool, bool, bool]:
|
||||
return (bool(mask & 0x01), bool(mask & 0x02), bool(mask & 0x04), bool(mask & 0x08))
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class UnitAtxLeds(Unpackable):
|
||||
power: tuple[bool, bool, bool, bool]
|
||||
hdd: tuple[bool, bool, bool, bool]
|
||||
|
||||
__struct = struct.Struct("<B")
|
||||
|
||||
@classmethod
|
||||
def unpack(cls, data: bytes, offset: int=0) -> "UnitAtxLeds":
|
||||
(mask,) = cls.__struct.unpack_from(data, offset=offset)
|
||||
return UnitAtxLeds(
|
||||
power=(bool(mask & 0x01), bool(mask & 0x02), bool(mask & 0x04), bool(mask & 0x08)),
|
||||
hdd=(bool(mask & 0x10), bool(mask & 0x20), bool(mask & 0x40), bool(mask & 0x80)),
|
||||
)
|
||||
|
||||
|
||||
# =====
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class BodySwitch(Packable):
|
||||
ch: int
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
assert 0 <= self.ch <= 4
|
||||
|
||||
def pack(self) -> bytes:
|
||||
return self.ch.to_bytes()
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class BodySetBeacon(Packable):
|
||||
ch: int
|
||||
on: bool
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
assert 0 <= self.ch <= 5
|
||||
|
||||
def pack(self) -> bytes:
|
||||
return self.ch.to_bytes() + self.on.to_bytes()
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class BodyAtxClick(Packable):
|
||||
ch: int
|
||||
action: int
|
||||
delay_ms: int
|
||||
|
||||
POWER = 0
|
||||
RESET = 1
|
||||
|
||||
__struct = struct.Struct("<BBH")
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
assert 0 <= self.ch <= 3
|
||||
assert self.action in [self.POWER, self.RESET]
|
||||
assert 1 <= self.delay_ms <= 0xFFFF
|
||||
|
||||
def pack(self) -> bytes:
|
||||
return self.__struct.pack(self.ch, self.action, self.delay_ms)
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class BodySetEdid(Packable):
|
||||
ch: int
|
||||
edid: Edid
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
assert 0 <= self.ch <= 3
|
||||
|
||||
def pack(self) -> bytes:
|
||||
return self.ch.to_bytes() + self.edid.pack()
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class BodyClearEdid(Packable):
|
||||
ch: int
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
assert 0 <= self.ch <= 3
|
||||
|
||||
def pack(self) -> bytes:
|
||||
return self.ch.to_bytes()
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class BodySetColors(Packable):
|
||||
ch: int
|
||||
colors: Colors
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
assert 0 <= self.ch <= 5
|
||||
|
||||
def pack(self) -> bytes:
|
||||
return self.ch.to_bytes() + self.colors.pack()
|
||||
|
||||
|
||||
# =====
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class Request:
|
||||
header: Header
|
||||
body: (Packable | None) = dataclasses.field(default=None)
|
||||
|
||||
def pack(self) -> bytes:
|
||||
msg = self.header.pack()
|
||||
if self.body is not None:
|
||||
msg += self.body.pack()
|
||||
return msg
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class Response:
|
||||
header: Header
|
||||
body: Unpackable
|
||||
|
||||
@classmethod
|
||||
def unpack(cls, msg: bytes) -> Optional["Response"]:
|
||||
header = Header.unpack(msg)
|
||||
match header.op:
|
||||
case Header.NAK:
|
||||
return Response(header, Nak.unpack(msg, Header.SIZE))
|
||||
case Header.STATE:
|
||||
return Response(header, UnitState.unpack(msg, Header.SIZE))
|
||||
case Header.ATX_LEDS:
|
||||
return Response(header, UnitAtxLeds.unpack(msg, Header.SIZE))
|
||||
# raise RuntimeError(f"Unknown OP in the header: {header!r}")
|
||||
return None
|
||||
358
kvmd/apps/kvmd/switch/state.py
Normal file
358
kvmd/apps/kvmd/switch/state.py
Normal file
@@ -0,0 +1,358 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
import asyncio
|
||||
import dataclasses
|
||||
import time
|
||||
|
||||
from typing import AsyncGenerator
|
||||
|
||||
from .types import Edids
|
||||
from .types import Color
|
||||
from .types import Colors
|
||||
from .types import PortNames
|
||||
from .types import AtxClickPowerDelays
|
||||
from .types import AtxClickPowerLongDelays
|
||||
from .types import AtxClickResetDelays
|
||||
|
||||
from .proto import UnitState
|
||||
from .proto import UnitAtxLeds
|
||||
|
||||
from .chain import Chain
|
||||
|
||||
|
||||
# =====
|
||||
@dataclasses.dataclass
|
||||
class _UnitInfo:
|
||||
state: (UnitState | None) = dataclasses.field(default=None)
|
||||
atx_leds: (UnitAtxLeds | None) = dataclasses.field(default=None)
|
||||
|
||||
|
||||
# =====
|
||||
class StateCache: # pylint: disable=too-many-instance-attributes
|
||||
__FW_VERSION = 5
|
||||
|
||||
__FULL = 0xFFFF
|
||||
__SUMMARY = 0x01
|
||||
__EDIDS = 0x02
|
||||
__COLORS = 0x04
|
||||
__VIDEO = 0x08
|
||||
__USB = 0x10
|
||||
__BEACONS = 0x20
|
||||
__ATX = 0x40
|
||||
|
||||
def __init__(self) -> None:
|
||||
self.__edids = Edids()
|
||||
self.__colors = Colors()
|
||||
self.__port_names = PortNames({})
|
||||
self.__atx_cp_delays = AtxClickPowerDelays({})
|
||||
self.__atx_cpl_delays = AtxClickPowerLongDelays({})
|
||||
self.__atx_cr_delays = AtxClickResetDelays({})
|
||||
|
||||
self.__units: list[_UnitInfo] = []
|
||||
self.__active_port = -1
|
||||
self.__synced = True
|
||||
|
||||
self.__queue: "asyncio.Queue[int]" = asyncio.Queue()
|
||||
|
||||
def get_edids(self) -> Edids:
|
||||
return self.__edids.copy()
|
||||
|
||||
def get_colors(self) -> Colors:
|
||||
return self.__colors
|
||||
|
||||
def get_port_names(self) -> PortNames:
|
||||
return self.__port_names.copy()
|
||||
|
||||
def get_atx_cp_delays(self) -> AtxClickPowerDelays:
|
||||
return self.__atx_cp_delays.copy()
|
||||
|
||||
def get_atx_cpl_delays(self) -> AtxClickPowerLongDelays:
|
||||
return self.__atx_cpl_delays.copy()
|
||||
|
||||
def get_atx_cr_delays(self) -> AtxClickResetDelays:
|
||||
return self.__atx_cr_delays.copy()
|
||||
|
||||
# =====
|
||||
|
||||
def get_state(self) -> dict:
|
||||
return self.__inner_get_state(self.__FULL)
|
||||
|
||||
async def trigger_state(self) -> None:
|
||||
self.__bump_state(self.__FULL)
|
||||
|
||||
async def poll_state(self) -> AsyncGenerator[dict, None]:
|
||||
atx_ts: float = 0
|
||||
while True:
|
||||
try:
|
||||
mask = await asyncio.wait_for(self.__queue.get(), timeout=0.1)
|
||||
except TimeoutError:
|
||||
mask = 0
|
||||
|
||||
if mask == self.__ATX:
|
||||
# Откладываем единичное новое событие ATX, чтобы аккумулировать с нескольких свичей
|
||||
if atx_ts == 0:
|
||||
atx_ts = time.monotonic() + 0.2
|
||||
continue
|
||||
elif atx_ts >= time.monotonic():
|
||||
continue
|
||||
# ... Ну или разрешаем отправить, если оно уже достаточно мариновалось
|
||||
elif mask == 0 and atx_ts > time.monotonic():
|
||||
# Разрешаем отправить отложенное
|
||||
mask = self.__ATX
|
||||
atx_ts = 0
|
||||
elif mask & self.__ATX:
|
||||
# Комплексное событие всегда должно обрабатываться сразу
|
||||
atx_ts = 0
|
||||
|
||||
if mask != 0:
|
||||
yield self.__inner_get_state(mask)
|
||||
|
||||
def __inner_get_state(self, mask: int) -> dict: # pylint: disable=too-many-branches,too-many-statements,too-many-locals
|
||||
assert mask != 0
|
||||
x_model = (mask == self.__FULL)
|
||||
x_summary = (mask & self.__SUMMARY)
|
||||
x_edids = (mask & self.__EDIDS)
|
||||
x_colors = (mask & self.__COLORS)
|
||||
x_video = (mask & self.__VIDEO)
|
||||
x_usb = (mask & self.__USB)
|
||||
x_beacons = (mask & self.__BEACONS)
|
||||
x_atx = (mask & self.__ATX)
|
||||
|
||||
state: dict = {}
|
||||
if x_model:
|
||||
state["model"] = {
|
||||
"firmware": {"version": self.__FW_VERSION},
|
||||
"units": [],
|
||||
"ports": [],
|
||||
"limits": {
|
||||
"atx": {
|
||||
"click_delays": {
|
||||
key: {"default": value, "min": 0, "max": 10}
|
||||
for (key, value) in [
|
||||
("power", self.__atx_cp_delays.default),
|
||||
("power_long", self.__atx_cpl_delays.default),
|
||||
("reset", self.__atx_cr_delays.default),
|
||||
]
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
if x_summary:
|
||||
state["summary"] = {"active_port": self.__active_port, "synced": self.__synced}
|
||||
if x_edids:
|
||||
state["edids"] = {
|
||||
"all": {
|
||||
edid_id: {
|
||||
"name": edid.name,
|
||||
"data": edid.as_text(),
|
||||
"parsed": (dataclasses.asdict(edid.info) if edid.info is not None else None),
|
||||
}
|
||||
for (edid_id, edid) in self.__edids.all.items()
|
||||
},
|
||||
"used": [],
|
||||
}
|
||||
if x_colors:
|
||||
state["colors"] = {
|
||||
role: {
|
||||
comp: getattr(getattr(self.__colors, role), comp)
|
||||
for comp in Color.COMPONENTS
|
||||
}
|
||||
for role in Colors.ROLES
|
||||
}
|
||||
if x_video:
|
||||
state["video"] = {"links": []}
|
||||
if x_usb:
|
||||
state["usb"] = {"links": []}
|
||||
if x_beacons:
|
||||
state["beacons"] = {"uplinks": [], "downlinks": [], "ports": []}
|
||||
if x_atx:
|
||||
state["atx"] = {"busy": [], "leds": {"power": [], "hdd": []}}
|
||||
|
||||
if not self.__is_units_ready():
|
||||
return state
|
||||
|
||||
for (unit, ui) in enumerate(self.__units):
|
||||
assert ui.state is not None
|
||||
assert ui.atx_leds is not None
|
||||
if x_model:
|
||||
state["model"]["units"].append({"firmware": {"version": ui.state.sw_version}})
|
||||
if x_video:
|
||||
state["video"]["links"].extend(ui.state.video_5v_sens[:4])
|
||||
if x_usb:
|
||||
state["usb"]["links"].extend(ui.state.usb_5v_sens)
|
||||
if x_beacons:
|
||||
state["beacons"]["uplinks"].append(ui.state.beacons[5])
|
||||
state["beacons"]["downlinks"].append(ui.state.beacons[4])
|
||||
state["beacons"]["ports"].extend(ui.state.beacons[:4])
|
||||
if x_atx:
|
||||
state["atx"]["busy"].extend(ui.state.atx_busy)
|
||||
state["atx"]["leds"]["power"].extend(ui.atx_leds.power)
|
||||
state["atx"]["leds"]["hdd"].extend(ui.atx_leds.hdd)
|
||||
if x_model or x_edids:
|
||||
for ch in range(4):
|
||||
port = Chain.get_virtual_port(unit, ch)
|
||||
if x_model:
|
||||
state["model"]["ports"].append({
|
||||
"unit": unit,
|
||||
"channel": ch,
|
||||
"name": self.__port_names[port],
|
||||
"atx": {
|
||||
"click_delays": {
|
||||
"power": self.__atx_cp_delays[port],
|
||||
"power_long": self.__atx_cpl_delays[port],
|
||||
"reset": self.__atx_cr_delays[port],
|
||||
},
|
||||
},
|
||||
})
|
||||
if x_edids:
|
||||
state["edids"]["used"].append(self.__edids.get_id_for_port(port))
|
||||
return state
|
||||
|
||||
def __inner_check_synced(self) -> bool:
|
||||
for (unit, ui) in enumerate(self.__units):
|
||||
if ui.state is None or ui.state.flags.changing_busy:
|
||||
return False
|
||||
if (
|
||||
self.__active_port >= 0
|
||||
and ui.state.ch != Chain.get_unit_target_channel(unit, self.__active_port)
|
||||
):
|
||||
return False
|
||||
for ch in range(4):
|
||||
port = Chain.get_virtual_port(unit, ch)
|
||||
edid = self.__edids.get_edid_for_port(port)
|
||||
if not ui.state.compare_edid(ch, edid):
|
||||
return False
|
||||
for ch in range(6):
|
||||
if ui.state.np_crc[ch] != self.__colors.crc:
|
||||
return False
|
||||
return True
|
||||
|
||||
def __recache_synced(self) -> bool:
|
||||
synced = self.__inner_check_synced()
|
||||
if self.__synced != synced:
|
||||
self.__synced = synced
|
||||
return True
|
||||
return False
|
||||
|
||||
def truncate(self, units: int) -> None:
|
||||
if len(self.__units) > units:
|
||||
del self.__units[units:]
|
||||
self.__bump_state(self.__FULL)
|
||||
|
||||
def update_active_port(self, port: int) -> None:
|
||||
changed = (self.__active_port != port)
|
||||
self.__active_port = port
|
||||
changed = (self.__recache_synced() or changed)
|
||||
if changed:
|
||||
self.__bump_state(self.__SUMMARY)
|
||||
|
||||
def update_unit_state(self, unit: int, new: UnitState) -> None:
|
||||
ui = self.__ensure_unit(unit)
|
||||
(prev, ui.state) = (ui.state, new)
|
||||
if not self.__is_units_ready():
|
||||
return
|
||||
mask = 0
|
||||
if prev is None:
|
||||
mask = self.__FULL
|
||||
else:
|
||||
if self.__recache_synced():
|
||||
mask |= self.__SUMMARY
|
||||
if prev.video_5v_sens != new.video_5v_sens:
|
||||
mask |= self.__VIDEO
|
||||
if prev.usb_5v_sens != new.usb_5v_sens:
|
||||
mask |= self.__USB
|
||||
if prev.beacons != new.beacons:
|
||||
mask |= self.__BEACONS
|
||||
if prev.atx_busy != new.atx_busy:
|
||||
mask |= self.__ATX
|
||||
if mask:
|
||||
self.__bump_state(mask)
|
||||
|
||||
def update_unit_atx_leds(self, unit: int, new: UnitAtxLeds) -> None:
|
||||
ui = self.__ensure_unit(unit)
|
||||
(prev, ui.atx_leds) = (ui.atx_leds, new)
|
||||
if not self.__is_units_ready():
|
||||
return
|
||||
if prev is None:
|
||||
self.__bump_state(self.__FULL)
|
||||
elif prev != new:
|
||||
self.__bump_state(self.__ATX)
|
||||
|
||||
def __is_units_ready(self) -> bool:
|
||||
for ui in self.__units:
|
||||
if ui.state is None or ui.atx_leds is None:
|
||||
return False
|
||||
return True
|
||||
|
||||
def __ensure_unit(self, unit: int) -> _UnitInfo:
|
||||
while len(self.__units) < unit + 1:
|
||||
self.__units.append(_UnitInfo())
|
||||
return self.__units[unit]
|
||||
|
||||
def __bump_state(self, mask: int) -> None:
|
||||
assert mask != 0
|
||||
self.__queue.put_nowait(mask)
|
||||
|
||||
# =====
|
||||
|
||||
def set_edids(self, edids: Edids) -> None:
|
||||
changed = (
|
||||
self.__edids.all != edids.all
|
||||
or not self.__edids.compare_on_ports(edids, self.__get_ports())
|
||||
)
|
||||
self.__edids = edids.copy()
|
||||
if changed:
|
||||
self.__bump_state(self.__EDIDS)
|
||||
|
||||
def set_colors(self, colors: Colors) -> None:
|
||||
changed = (self.__colors != colors)
|
||||
self.__colors = colors
|
||||
if changed:
|
||||
self.__bump_state(self.__COLORS)
|
||||
|
||||
def set_port_names(self, port_names: PortNames) -> None:
|
||||
changed = (not self.__port_names.compare_on_ports(port_names, self.__get_ports()))
|
||||
self.__port_names = port_names.copy()
|
||||
if changed:
|
||||
self.__bump_state(self.__FULL)
|
||||
|
||||
def set_atx_cp_delays(self, delays: AtxClickPowerDelays) -> None:
|
||||
changed = (not self.__atx_cp_delays.compare_on_ports(delays, self.__get_ports()))
|
||||
self.__atx_cp_delays = delays.copy()
|
||||
if changed:
|
||||
self.__bump_state(self.__FULL)
|
||||
|
||||
def set_atx_cpl_delays(self, delays: AtxClickPowerLongDelays) -> None:
|
||||
changed = (not self.__atx_cpl_delays.compare_on_ports(delays, self.__get_ports()))
|
||||
self.__atx_cpl_delays = delays.copy()
|
||||
if changed:
|
||||
self.__bump_state(self.__FULL)
|
||||
|
||||
def set_atx_cr_delays(self, delays: AtxClickResetDelays) -> None:
|
||||
changed = (not self.__atx_cr_delays.compare_on_ports(delays, self.__get_ports()))
|
||||
self.__atx_cr_delays = delays.copy()
|
||||
if changed:
|
||||
self.__bump_state(self.__FULL)
|
||||
|
||||
def __get_ports(self) -> int:
|
||||
return (len(self.__units) * 4)
|
||||
186
kvmd/apps/kvmd/switch/storage.py
Normal file
186
kvmd/apps/kvmd/switch/storage.py
Normal file
@@ -0,0 +1,186 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
import os
|
||||
import asyncio
|
||||
import json
|
||||
import contextlib
|
||||
|
||||
from typing import AsyncGenerator
|
||||
|
||||
try:
|
||||
from ....clients.pst import PstClient
|
||||
except ImportError:
|
||||
PstClient = None # type: ignore
|
||||
|
||||
# from .lib import get_logger
|
||||
from .lib import aiotools
|
||||
from .lib import htclient
|
||||
from .lib import get_logger
|
||||
|
||||
from .types import Edid
|
||||
from .types import Edids
|
||||
from .types import Color
|
||||
from .types import Colors
|
||||
from .types import PortNames
|
||||
from .types import AtxClickPowerDelays
|
||||
from .types import AtxClickPowerLongDelays
|
||||
from .types import AtxClickResetDelays
|
||||
|
||||
|
||||
# =====
|
||||
class StorageContext:
|
||||
__F_EDIDS_ALL = "edids_all.json"
|
||||
__F_EDIDS_PORT = "edids_port.json"
|
||||
|
||||
__F_COLORS = "colors.json"
|
||||
|
||||
__F_PORT_NAMES = "port_names.json"
|
||||
|
||||
__F_ATX_CP_DELAYS = "atx_click_power_delays.json"
|
||||
__F_ATX_CPL_DELAYS = "atx_click_power_long_delays.json"
|
||||
__F_ATX_CR_DELAYS = "atx_click_reset_delays.json"
|
||||
|
||||
def __init__(self, path: str, rw: bool) -> None:
|
||||
self.__path = path
|
||||
self.__rw = rw
|
||||
|
||||
# =====
|
||||
|
||||
async def write_edids(self, edids: Edids) -> None:
|
||||
await self.__write_json_keyvals(self.__F_EDIDS_ALL, {
|
||||
edid_id.lower(): {"name": edid.name, "data": edid.as_text()}
|
||||
for (edid_id, edid) in edids.all.items()
|
||||
if edid_id != Edids.DEFAULT_ID
|
||||
})
|
||||
await self.__write_json_keyvals(self.__F_EDIDS_PORT, edids.port)
|
||||
|
||||
async def write_colors(self, colors: Colors) -> None:
|
||||
await self.__write_json_keyvals(self.__F_COLORS, {
|
||||
role: {
|
||||
comp: getattr(getattr(colors, role), comp)
|
||||
for comp in Color.COMPONENTS
|
||||
}
|
||||
for role in Colors.ROLES
|
||||
})
|
||||
|
||||
async def write_port_names(self, port_names: PortNames) -> None:
|
||||
await self.__write_json_keyvals(self.__F_PORT_NAMES, port_names.kvs)
|
||||
|
||||
async def write_atx_cp_delays(self, delays: AtxClickPowerDelays) -> None:
|
||||
await self.__write_json_keyvals(self.__F_ATX_CP_DELAYS, delays.kvs)
|
||||
|
||||
async def write_atx_cpl_delays(self, delays: AtxClickPowerLongDelays) -> None:
|
||||
await self.__write_json_keyvals(self.__F_ATX_CPL_DELAYS, delays.kvs)
|
||||
|
||||
async def write_atx_cr_delays(self, delays: AtxClickResetDelays) -> None:
|
||||
await self.__write_json_keyvals(self.__F_ATX_CR_DELAYS, delays.kvs)
|
||||
|
||||
async def __write_json_keyvals(self, name: str, kvs: dict) -> None:
|
||||
if len(self.__path) == 0:
|
||||
return
|
||||
assert self.__rw
|
||||
kvs = {str(key): value for (key, value) in kvs.items()}
|
||||
if (await self.__read_json_keyvals(name)) == kvs:
|
||||
return # Don't write the same data
|
||||
path = os.path.join(self.__path, name)
|
||||
get_logger(0).info("Writing '%s' ...", name)
|
||||
await aiotools.write_file(path, json.dumps(kvs))
|
||||
|
||||
# =====
|
||||
|
||||
async def read_edids(self) -> Edids:
|
||||
all_edids = {
|
||||
edid_id.lower(): Edid.from_data(edid["name"], edid["data"])
|
||||
for (edid_id, edid) in (await self.__read_json_keyvals(self.__F_EDIDS_ALL)).items()
|
||||
}
|
||||
port_edids = await self.__read_json_keyvals_int(self.__F_EDIDS_PORT)
|
||||
return Edids(all_edids, port_edids)
|
||||
|
||||
async def read_colors(self) -> Colors:
|
||||
raw = await self.__read_json_keyvals(self.__F_COLORS)
|
||||
return Colors(**{ # type: ignore
|
||||
role: Color(**{comp: raw[role][comp] for comp in Color.COMPONENTS})
|
||||
for role in Colors.ROLES
|
||||
if role in raw
|
||||
})
|
||||
|
||||
async def read_port_names(self) -> PortNames:
|
||||
return PortNames(await self.__read_json_keyvals_int(self.__F_PORT_NAMES))
|
||||
|
||||
async def read_atx_cp_delays(self) -> AtxClickPowerDelays:
|
||||
return AtxClickPowerDelays(await self.__read_json_keyvals_int(self.__F_ATX_CP_DELAYS))
|
||||
|
||||
async def read_atx_cpl_delays(self) -> AtxClickPowerLongDelays:
|
||||
return AtxClickPowerLongDelays(await self.__read_json_keyvals_int(self.__F_ATX_CPL_DELAYS))
|
||||
|
||||
async def read_atx_cr_delays(self) -> AtxClickResetDelays:
|
||||
return AtxClickResetDelays(await self.__read_json_keyvals_int(self.__F_ATX_CR_DELAYS))
|
||||
|
||||
async def __read_json_keyvals_int(self, name: str) -> dict:
|
||||
return (await self.__read_json_keyvals(name, int_keys=True))
|
||||
|
||||
async def __read_json_keyvals(self, name: str, int_keys: bool=False) -> dict:
|
||||
if len(self.__path) == 0:
|
||||
return {}
|
||||
path = os.path.join(self.__path, name)
|
||||
try:
|
||||
kvs: dict = json.loads(await aiotools.read_file(path))
|
||||
except FileNotFoundError:
|
||||
kvs = {}
|
||||
if int_keys:
|
||||
kvs = {int(key): value for (key, value) in kvs.items()}
|
||||
return kvs
|
||||
|
||||
|
||||
class Storage:
|
||||
__SUBDIR = "__switch__"
|
||||
__TIMEOUT = 5.0
|
||||
|
||||
def __init__(self, unix_path: str) -> None:
|
||||
self.__pst: (PstClient | None) = None
|
||||
if len(unix_path) > 0 and PstClient is not None:
|
||||
self.__pst = PstClient(
|
||||
subdir=self.__SUBDIR,
|
||||
unix_path=unix_path,
|
||||
timeout=self.__TIMEOUT,
|
||||
user_agent=htclient.make_user_agent("KVMD"),
|
||||
)
|
||||
self.__lock = asyncio.Lock()
|
||||
|
||||
@contextlib.asynccontextmanager
|
||||
async def readable(self) -> AsyncGenerator[StorageContext, None]:
|
||||
async with self.__lock:
|
||||
if self.__pst is None:
|
||||
yield StorageContext("", False)
|
||||
else:
|
||||
path = await self.__pst.get_path()
|
||||
yield StorageContext(path, False)
|
||||
|
||||
@contextlib.asynccontextmanager
|
||||
async def writable(self) -> AsyncGenerator[StorageContext, None]:
|
||||
async with self.__lock:
|
||||
if self.__pst is None:
|
||||
yield StorageContext("", True)
|
||||
else:
|
||||
async with self.__pst.writable() as path:
|
||||
yield StorageContext(path, True)
|
||||
308
kvmd/apps/kvmd/switch/types.py
Normal file
308
kvmd/apps/kvmd/switch/types.py
Normal file
@@ -0,0 +1,308 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
import re
|
||||
import struct
|
||||
import uuid
|
||||
import dataclasses
|
||||
|
||||
from typing import TypeVar
|
||||
from typing import Generic
|
||||
|
||||
from .lib import bitbang
|
||||
from .lib import ParsedEdidNoBlockError
|
||||
from .lib import ParsedEdid
|
||||
|
||||
|
||||
# =====
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class EdidInfo:
|
||||
mfc_id: str
|
||||
product_id: int
|
||||
serial: int
|
||||
monitor_name: (str | None)
|
||||
monitor_serial: (str | None)
|
||||
audio: bool
|
||||
|
||||
@classmethod
|
||||
def from_data(cls, data: bytes) -> "EdidInfo":
|
||||
parsed = ParsedEdid(data)
|
||||
|
||||
monitor_name: (str | None) = None
|
||||
try:
|
||||
monitor_name = parsed.get_monitor_name()
|
||||
except ParsedEdidNoBlockError:
|
||||
pass
|
||||
|
||||
monitor_serial: (str | None) = None
|
||||
try:
|
||||
monitor_serial = parsed.get_monitor_serial()
|
||||
except ParsedEdidNoBlockError:
|
||||
pass
|
||||
|
||||
return EdidInfo(
|
||||
mfc_id=parsed.get_mfc_id(),
|
||||
product_id=parsed.get_product_id(),
|
||||
serial=parsed.get_serial(),
|
||||
monitor_name=monitor_name,
|
||||
monitor_serial=monitor_serial,
|
||||
audio=parsed.get_audio(),
|
||||
)
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class Edid:
|
||||
name: str
|
||||
data: bytes
|
||||
crc: int = dataclasses.field(default=0)
|
||||
valid: bool = dataclasses.field(default=False)
|
||||
info: (EdidInfo | None) = dataclasses.field(default=None)
|
||||
|
||||
__HEADER = b"\x00\xFF\xFF\xFF\xFF\xFF\xFF\x00"
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
assert len(self.name) > 0
|
||||
assert len(self.data) == 256
|
||||
object.__setattr__(self, "crc", bitbang.make_crc16(self.data))
|
||||
object.__setattr__(self, "valid", self.data.startswith(self.__HEADER))
|
||||
try:
|
||||
object.__setattr__(self, "info", EdidInfo.from_data(self.data))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def as_text(self) -> str:
|
||||
return "".join(f"{item:0{2}X}" for item in self.data)
|
||||
|
||||
def pack(self) -> bytes:
|
||||
return self.data
|
||||
|
||||
@classmethod
|
||||
def from_data(cls, name: str, data: (str | bytes | None)) -> "Edid":
|
||||
if data is None: # Пустой едид
|
||||
return Edid(name, b"\x00" * 256)
|
||||
|
||||
if isinstance(data, bytes):
|
||||
if data.startswith(cls.__HEADER):
|
||||
return Edid(name, data) # Бинарный едид
|
||||
data_hex = data.decode() # Текстовый едид, прочитанный как бинарный из файла
|
||||
else: # isinstance(data, str)
|
||||
data_hex = str(data) # Текстовый едид
|
||||
|
||||
data_hex = re.sub(r"\s", "", data_hex)
|
||||
assert len(data_hex) == 512
|
||||
data = bytes([
|
||||
int(data_hex[index:index + 2], 16)
|
||||
for index in range(0, len(data_hex), 2)
|
||||
])
|
||||
return Edid(name, data)
|
||||
|
||||
|
||||
@dataclasses.dataclass
|
||||
class Edids:
|
||||
DEFAULT_NAME = "Default"
|
||||
DEFAULT_ID = "default"
|
||||
|
||||
all: dict[str, Edid] = dataclasses.field(default_factory=dict)
|
||||
port: dict[int, str] = dataclasses.field(default_factory=dict)
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
if self.DEFAULT_ID not in self.all:
|
||||
self.set_default(None)
|
||||
|
||||
def set_default(self, data: (str | bytes | None)) -> None:
|
||||
self.all[self.DEFAULT_ID] = Edid.from_data(self.DEFAULT_NAME, data)
|
||||
|
||||
def copy(self) -> "Edids":
|
||||
return Edids(dict(self.all), dict(self.port))
|
||||
|
||||
def compare_on_ports(self, other: "Edids", ports: int) -> bool:
|
||||
for port in range(ports):
|
||||
if self.get_id_for_port(port) != other.get_id_for_port(port):
|
||||
return False
|
||||
return True
|
||||
|
||||
def add(self, edid: Edid) -> str:
|
||||
edid_id = str(uuid.uuid4()).lower()
|
||||
self.all[edid_id] = edid
|
||||
return edid_id
|
||||
|
||||
def set(self, edid_id: str, edid: Edid) -> None:
|
||||
assert edid_id in self.all
|
||||
self.all[edid_id] = edid
|
||||
|
||||
def get(self, edid_id: str) -> Edid:
|
||||
return self.all[edid_id]
|
||||
|
||||
def remove(self, edid_id: str) -> None:
|
||||
assert edid_id in self.all
|
||||
self.all.pop(edid_id)
|
||||
for port in list(self.port):
|
||||
if self.port[port] == edid_id:
|
||||
self.port.pop(port)
|
||||
|
||||
def has_id(self, edid_id: str) -> bool:
|
||||
return (edid_id in self.all)
|
||||
|
||||
def assign(self, port: int, edid_id: str) -> None:
|
||||
assert edid_id in self.all
|
||||
if edid_id == Edids.DEFAULT_ID:
|
||||
self.port.pop(port, None)
|
||||
else:
|
||||
self.port[port] = edid_id
|
||||
|
||||
def get_id_for_port(self, port: int) -> str:
|
||||
return self.port.get(port, self.DEFAULT_ID)
|
||||
|
||||
def get_edid_for_port(self, port: int) -> Edid:
|
||||
return self.all[self.get_id_for_port(port)]
|
||||
|
||||
|
||||
# =====
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class Color:
|
||||
COMPONENTS = frozenset(["red", "green", "blue", "brightness", "blink_ms"])
|
||||
|
||||
red: int
|
||||
green: int
|
||||
blue: int
|
||||
brightness: int
|
||||
blink_ms: int
|
||||
crc: int = dataclasses.field(default=0)
|
||||
_packed: bytes = dataclasses.field(default=b"")
|
||||
|
||||
__struct = struct.Struct("<BBBBH")
|
||||
__rx = re.compile(r"^([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2}):([0-9a-fA-F]{2}):([0-9a-fA-F]{4})$")
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
assert 0 <= self.red <= 0xFF
|
||||
assert 0 <= self.green <= 0xFF
|
||||
assert 0 <= self.blue <= 0xFF
|
||||
assert 0 <= self.brightness <= 0xFF
|
||||
assert 0 <= self.blink_ms <= 0xFFFF
|
||||
data = self.__struct.pack(self.red, self.green, self.blue, self.brightness, self.blink_ms)
|
||||
object.__setattr__(self, "crc", bitbang.make_crc16(data))
|
||||
object.__setattr__(self, "_packed", data)
|
||||
|
||||
def pack(self) -> bytes:
|
||||
return self._packed
|
||||
|
||||
@classmethod
|
||||
def from_text(cls, text: str) -> "Color":
|
||||
match = cls.__rx.match(text)
|
||||
assert match is not None, text
|
||||
return Color(
|
||||
red=int(match.group(1), 16),
|
||||
green=int(match.group(2), 16),
|
||||
blue=int(match.group(3), 16),
|
||||
brightness=int(match.group(4), 16),
|
||||
blink_ms=int(match.group(5), 16),
|
||||
)
|
||||
|
||||
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class Colors:
|
||||
ROLES = frozenset(["inactive", "active", "flashing", "beacon", "bootloader"])
|
||||
|
||||
inactive: Color = dataclasses.field(default=Color(255, 0, 0, 64, 0))
|
||||
active: Color = dataclasses.field(default=Color(0, 255, 0, 128, 0))
|
||||
flashing: Color = dataclasses.field(default=Color(0, 170, 255, 128, 0))
|
||||
beacon: Color = dataclasses.field(default=Color(228, 44, 156, 255, 250))
|
||||
bootloader: Color = dataclasses.field(default=Color(255, 170, 0, 128, 0))
|
||||
crc: int = dataclasses.field(default=0)
|
||||
_packed: bytes = dataclasses.field(default=b"")
|
||||
|
||||
__crc_struct = struct.Struct("<HHHHH")
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
crcs: list[int] = []
|
||||
packed: bytes = b""
|
||||
for color in [self.inactive, self.active, self.flashing, self.beacon, self.bootloader]:
|
||||
crcs.append(color.crc)
|
||||
packed += color.pack()
|
||||
object.__setattr__(self, "crc", bitbang.make_crc16(self.__crc_struct.pack(*crcs)))
|
||||
object.__setattr__(self, "_packed", packed)
|
||||
|
||||
def pack(self) -> bytes:
|
||||
return self._packed
|
||||
|
||||
|
||||
# =====
|
||||
_T = TypeVar("_T")
|
||||
|
||||
|
||||
class _PortsDict(Generic[_T]):
|
||||
def __init__(self, default: _T, kvs: dict[int, _T]) -> None:
|
||||
self.default = default
|
||||
self.kvs = {
|
||||
port: value
|
||||
for (port, value) in kvs.items()
|
||||
if value != default
|
||||
}
|
||||
|
||||
def compare_on_ports(self, other: "_PortsDict[_T]", ports: int) -> bool:
|
||||
for port in range(ports):
|
||||
if self[port] != other[port]:
|
||||
return False
|
||||
return True
|
||||
|
||||
def __getitem__(self, port: int) -> _T:
|
||||
return self.kvs.get(port, self.default)
|
||||
|
||||
def __setitem__(self, port: int, value: (_T | None)) -> None:
|
||||
if value is None:
|
||||
value = self.default
|
||||
if value == self.default:
|
||||
self.kvs.pop(port, None)
|
||||
else:
|
||||
self.kvs[port] = value
|
||||
|
||||
|
||||
class PortNames(_PortsDict[str]):
|
||||
def __init__(self, kvs: dict[int, str]) -> None:
|
||||
super().__init__("", kvs)
|
||||
|
||||
def copy(self) -> "PortNames":
|
||||
return PortNames(self.kvs)
|
||||
|
||||
|
||||
class AtxClickPowerDelays(_PortsDict[float]):
|
||||
def __init__(self, kvs: dict[int, float]) -> None:
|
||||
super().__init__(0.5, kvs)
|
||||
|
||||
def copy(self) -> "AtxClickPowerDelays":
|
||||
return AtxClickPowerDelays(self.kvs)
|
||||
|
||||
|
||||
class AtxClickPowerLongDelays(_PortsDict[float]):
|
||||
def __init__(self, kvs: dict[int, float]) -> None:
|
||||
super().__init__(5.5, kvs)
|
||||
|
||||
def copy(self) -> "AtxClickPowerLongDelays":
|
||||
return AtxClickPowerLongDelays(self.kvs)
|
||||
|
||||
|
||||
class AtxClickResetDelays(_PortsDict[float]):
|
||||
def __init__(self, kvs: dict[int, float]) -> None:
|
||||
super().__init__(0.5, kvs)
|
||||
|
||||
def copy(self) -> "AtxClickResetDelays":
|
||||
return AtxClickResetDelays(self.kvs)
|
||||
@@ -408,7 +408,7 @@ class UserGpio:
|
||||
def __make_item_input(self, parts: list[str]) -> dict:
|
||||
assert len(parts) >= 1
|
||||
color = (parts[1] if len(parts) > 1 else None)
|
||||
if color not in ["green", "yellow", "red"]:
|
||||
if color not in ["green", "yellow", "red", "blue", "cyan", "magenta", "pink", "white"]:
|
||||
color = "green"
|
||||
return {
|
||||
"type": UserGpioModes.INPUT,
|
||||
|
||||
48
kvmd/apps/media/__init__.py
Normal file
48
kvmd/apps/media/__init__.py
Normal file
@@ -0,0 +1,48 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2020 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
from ...clients.streamer import StreamerFormats
|
||||
from ...clients.streamer import MemsinkStreamerClient
|
||||
|
||||
from .. import init
|
||||
|
||||
from .server import MediaServer
|
||||
|
||||
|
||||
# =====
|
||||
def main(argv: (list[str] | None)=None) -> None:
|
||||
config = init(
|
||||
prog="kvmd-media",
|
||||
description="The media proxy",
|
||||
check_run=True,
|
||||
argv=argv,
|
||||
)[2].media
|
||||
|
||||
def make_streamer(name: str, fmt: int) -> (MemsinkStreamerClient | None):
|
||||
if getattr(config.memsink, name).sink:
|
||||
return MemsinkStreamerClient(name.upper(), fmt, **getattr(config.memsink, name)._unpack())
|
||||
return None
|
||||
|
||||
MediaServer(
|
||||
h264_streamer=make_streamer("h264", StreamerFormats.H264),
|
||||
jpeg_streamer=make_streamer("jpeg", StreamerFormats.JPEG),
|
||||
).run(**config.server._unpack())
|
||||
24
kvmd/apps/media/__main__.py
Normal file
24
kvmd/apps/media/__main__.py
Normal file
@@ -0,0 +1,24 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2020 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
from . import main
|
||||
main()
|
||||
190
kvmd/apps/media/server.py
Normal file
190
kvmd/apps/media/server.py
Normal file
@@ -0,0 +1,190 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2020 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
import asyncio
|
||||
import dataclasses
|
||||
|
||||
from aiohttp.web import Request
|
||||
from aiohttp.web import WebSocketResponse
|
||||
|
||||
from ...logging import get_logger
|
||||
|
||||
from ... import tools
|
||||
from ... import aiotools
|
||||
|
||||
from ...htserver import exposed_http
|
||||
from ...htserver import exposed_ws
|
||||
from ...htserver import WsSession
|
||||
from ...htserver import HttpServer
|
||||
|
||||
from ...clients.streamer import StreamerError
|
||||
from ...clients.streamer import StreamerPermError
|
||||
from ...clients.streamer import StreamerFormats
|
||||
from ...clients.streamer import BaseStreamerClient
|
||||
|
||||
|
||||
# =====
|
||||
@dataclasses.dataclass
|
||||
class _Source:
|
||||
type: str
|
||||
fmt: str
|
||||
streamer: BaseStreamerClient
|
||||
meta: dict = dataclasses.field(default_factory=dict)
|
||||
clients: dict[WsSession, "_Client"] = dataclasses.field(default_factory=dict)
|
||||
key_required: bool = dataclasses.field(default=False)
|
||||
|
||||
|
||||
@dataclasses.dataclass
|
||||
class _Client:
|
||||
ws: WsSession
|
||||
src: _Source
|
||||
queue: asyncio.Queue[dict]
|
||||
sender: (asyncio.Task | None) = dataclasses.field(default=None)
|
||||
|
||||
|
||||
class MediaServer(HttpServer):
|
||||
__K_VIDEO = "video"
|
||||
|
||||
__F_H264 = "h264"
|
||||
__F_JPEG = "jpeg"
|
||||
|
||||
__Q_SIZE = 32
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
h264_streamer: (BaseStreamerClient | None),
|
||||
jpeg_streamer: (BaseStreamerClient | None),
|
||||
) -> None:
|
||||
|
||||
super().__init__()
|
||||
|
||||
self.__srcs: list[_Source] = []
|
||||
if h264_streamer:
|
||||
self.__srcs.append(_Source(self.__K_VIDEO, self.__F_H264, h264_streamer, {"profile_level_id": "42E01F"}))
|
||||
if jpeg_streamer:
|
||||
self.__srcs.append(_Source(self.__K_VIDEO, self.__F_JPEG, jpeg_streamer))
|
||||
|
||||
# =====
|
||||
|
||||
@exposed_http("GET", "/ws")
|
||||
async def __ws_handler(self, req: Request) -> WebSocketResponse:
|
||||
async with self._ws_session(req) as ws:
|
||||
media: dict = {self.__K_VIDEO: {}}
|
||||
for src in self.__srcs:
|
||||
media[src.type][src.fmt] = src.meta
|
||||
await ws.send_event("media", media)
|
||||
return (await self._ws_loop(ws))
|
||||
|
||||
@exposed_ws(0)
|
||||
async def __ws_bin_ping_handler(self, ws: WsSession, _: bytes) -> None:
|
||||
await ws.send_bin(255, b"") # Ping-pong
|
||||
|
||||
@exposed_ws("start")
|
||||
async def __ws_start_handler(self, ws: WsSession, event: dict) -> None:
|
||||
try:
|
||||
req_type = str(event.get("type"))
|
||||
req_fmt = str(event.get("format"))
|
||||
except Exception:
|
||||
return
|
||||
src: (_Source | None) = None
|
||||
for cand in self.__srcs:
|
||||
if ws in cand.clients:
|
||||
return # Don't allow any double streaming
|
||||
if (cand.type, cand.fmt) == (req_type, req_fmt):
|
||||
src = cand
|
||||
if src:
|
||||
client = _Client(ws, src, asyncio.Queue(self.__Q_SIZE))
|
||||
client.sender = aiotools.create_deadly_task(str(ws), self.__sender(client))
|
||||
src.clients[ws] = client
|
||||
get_logger(0).info("Streaming %s to %s ...", src.streamer, ws)
|
||||
|
||||
# =====
|
||||
|
||||
async def _init_app(self) -> None:
|
||||
logger = get_logger(0)
|
||||
for src in self.__srcs:
|
||||
logger.info("Starting streamer %s ...", src.streamer)
|
||||
aiotools.create_deadly_task(str(src.streamer), self.__streamer(src))
|
||||
self._add_exposed(self)
|
||||
|
||||
async def _on_shutdown(self) -> None:
|
||||
logger = get_logger(0)
|
||||
logger.info("Stopping system tasks ...")
|
||||
await aiotools.stop_all_deadly_tasks()
|
||||
logger.info("Disconnecting clients ...")
|
||||
await self._close_all_wss()
|
||||
logger.info("On-Shutdown complete")
|
||||
|
||||
async def _on_ws_closed(self, ws: WsSession) -> None:
|
||||
for src in self.__srcs:
|
||||
client = src.clients.pop(ws, None)
|
||||
if client and client.sender:
|
||||
get_logger(0).info("Closed stream for %s", ws)
|
||||
client.sender.cancel()
|
||||
return
|
||||
|
||||
# =====
|
||||
|
||||
async def __sender(self, client: _Client) -> None:
|
||||
need_key = StreamerFormats.is_diff(client.src.streamer.get_format())
|
||||
if need_key:
|
||||
client.src.key_required = True
|
||||
has_key = False
|
||||
while True:
|
||||
frame = await client.queue.get()
|
||||
has_key = (not need_key or has_key or frame["key"])
|
||||
if has_key:
|
||||
try:
|
||||
await client.ws.send_bin(1, frame["key"].to_bytes() + frame["data"])
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
async def __streamer(self, src: _Source) -> None:
|
||||
logger = get_logger(0)
|
||||
while True:
|
||||
if len(src.clients) == 0:
|
||||
await asyncio.sleep(1)
|
||||
continue
|
||||
try:
|
||||
async with src.streamer.reading() as read_frame:
|
||||
while len(src.clients) > 0:
|
||||
frame = await read_frame(src.key_required)
|
||||
if frame["key"]:
|
||||
src.key_required = False
|
||||
for client in src.clients.values():
|
||||
try:
|
||||
client.queue.put_nowait(frame)
|
||||
except asyncio.QueueFull:
|
||||
# Если какой-то из клиентов не справляется, очищаем ему очередь и запрашиваем кейфрейм.
|
||||
# Я вижу у такой логики кучу минусов, хз как себя покажет, но лучше пока ничего не придумал.
|
||||
tools.clear_queue(client.queue)
|
||||
src.key_required = True
|
||||
except Exception:
|
||||
pass
|
||||
except StreamerError as ex:
|
||||
if isinstance(ex, StreamerPermError):
|
||||
logger.exception("Streamer failed: %s", src.streamer)
|
||||
else:
|
||||
logger.error("Streamer error: %s: %s", src.streamer, tools.efmt(ex))
|
||||
except Exception:
|
||||
get_logger(0).exception("Unexpected streamer error: %s", src.streamer)
|
||||
await asyncio.sleep(1)
|
||||
@@ -106,31 +106,45 @@ def _check_config(config: Section) -> None:
|
||||
|
||||
# =====
|
||||
class _GadgetConfig:
|
||||
def __init__(self, gadget_path: str, profile_path: str, meta_path: str) -> None:
|
||||
def __init__(self, gadget_path: str, profile_path: str, meta_path: str, eps: int) -> None:
|
||||
self.__gadget_path = gadget_path
|
||||
self.__profile_path = profile_path
|
||||
self.__meta_path = meta_path
|
||||
self.__eps_max = eps
|
||||
self.__eps_used = 0
|
||||
self.__hid_instance = 0
|
||||
self.__msd_instance = 0
|
||||
_mkdir(meta_path)
|
||||
|
||||
def add_serial(self, start: bool) -> None:
|
||||
func = "acm.usb0"
|
||||
func_path = join(self.__gadget_path, "functions", func)
|
||||
_mkdir(func_path)
|
||||
def add_audio_mic(self, start: bool) -> None:
|
||||
eps = 2
|
||||
func = "uac2.usb0"
|
||||
func_path = self.__create_function(func)
|
||||
_write(join(func_path, "c_chmask"), 0)
|
||||
_write(join(func_path, "p_chmask"), 0b11)
|
||||
_write(join(func_path, "p_srate"), 48000)
|
||||
_write(join(func_path, "p_ssize"), 2)
|
||||
if start:
|
||||
_symlink(func_path, join(self.__profile_path, func))
|
||||
self.__create_meta(func, "Serial Port")
|
||||
self.__start_function(func, eps)
|
||||
self.__create_meta(func, "Microphone", eps)
|
||||
|
||||
def add_serial(self, start: bool) -> None:
|
||||
eps = 3
|
||||
func = "acm.usb0"
|
||||
self.__create_function(func)
|
||||
if start:
|
||||
self.__start_function(func, eps)
|
||||
self.__create_meta(func, "Serial Port", eps)
|
||||
|
||||
def add_ethernet(self, start: bool, driver: str, host_mac: str, kvm_mac: str) -> None:
|
||||
eps = 3
|
||||
if host_mac and kvm_mac and host_mac == kvm_mac:
|
||||
raise RuntimeError("Ethernet host_mac should not be equal to kvm_mac")
|
||||
real_driver = driver
|
||||
if driver == "rndis5":
|
||||
real_driver = "rndis"
|
||||
func = f"{real_driver}.usb0"
|
||||
func_path = join(self.__gadget_path, "functions", func)
|
||||
_mkdir(func_path)
|
||||
func_path = self.__create_function(func)
|
||||
if host_mac:
|
||||
_write(join(func_path, "host_addr"), host_mac)
|
||||
if kvm_mac:
|
||||
@@ -150,20 +164,20 @@ class _GadgetConfig:
|
||||
_write(join(func_path, "os_desc/interface.rndis/sub_compatible_id"), "5162001")
|
||||
_symlink(self.__profile_path, join(self.__gadget_path, "os_desc", usb.G_PROFILE_NAME))
|
||||
if start:
|
||||
_symlink(func_path, join(self.__profile_path, func))
|
||||
self.__create_meta(func, "Ethernet")
|
||||
self.__start_function(func, eps)
|
||||
self.__create_meta(func, "Ethernet", eps)
|
||||
|
||||
def add_keyboard(self, start: bool, remote_wakeup: bool) -> None:
|
||||
self.__add_hid("Keyboard", start, remote_wakeup, make_keyboard_hid())
|
||||
|
||||
def add_mouse(self, start: bool, remote_wakeup: bool, absolute: bool, horizontal_wheel: bool) -> None:
|
||||
name = ("Absolute" if absolute else "Relative") + " Mouse"
|
||||
self.__add_hid(name, start, remote_wakeup, make_mouse_hid(absolute, horizontal_wheel))
|
||||
desc = ("Absolute" if absolute else "Relative") + " Mouse"
|
||||
self.__add_hid(desc, start, remote_wakeup, make_mouse_hid(absolute, horizontal_wheel))
|
||||
|
||||
def __add_hid(self, name: str, start: bool, remote_wakeup: bool, hid: Hid) -> None:
|
||||
def __add_hid(self, desc: str, start: bool, remote_wakeup: bool, hid: Hid) -> None:
|
||||
eps = 1
|
||||
func = f"hid.usb{self.__hid_instance}"
|
||||
func_path = join(self.__gadget_path, "functions", func)
|
||||
_mkdir(func_path)
|
||||
func_path = self.__create_function(func)
|
||||
_write(join(func_path, "no_out_endpoint"), "1", optional=True)
|
||||
if remote_wakeup:
|
||||
_write(join(func_path, "wakeup_on_write"), "1", optional=True)
|
||||
@@ -172,32 +186,66 @@ class _GadgetConfig:
|
||||
_write(join(func_path, "report_length"), hid.report_length)
|
||||
_write_bytes(join(func_path, "report_desc"), hid.report_descriptor)
|
||||
if start:
|
||||
_symlink(func_path, join(self.__profile_path, func))
|
||||
self.__create_meta(func, name)
|
||||
self.__start_function(func, eps)
|
||||
self.__create_meta(func, desc, eps)
|
||||
self.__hid_instance += 1
|
||||
|
||||
def add_msd(self, start: bool, user: str, stall: bool, cdrom: bool, rw: bool, removable: bool, fua: bool) -> None:
|
||||
def add_msd(
|
||||
self,
|
||||
start: bool,
|
||||
user: str,
|
||||
stall: bool,
|
||||
cdrom: bool,
|
||||
rw: bool,
|
||||
removable: bool,
|
||||
fua: bool,
|
||||
inquiry_string_cdrom: str,
|
||||
inquiry_string_flash: str,
|
||||
) -> None:
|
||||
|
||||
# Endpoints number depends on transport_type but we can consider that this is 2
|
||||
# because transport_type is always USB_PR_BULK by default if CONFIG_USB_FILE_STORAGE_TEST
|
||||
# is not defined. See drivers/usb/gadget/function/storage_common.c
|
||||
eps = 2
|
||||
func = f"mass_storage.usb{self.__msd_instance}"
|
||||
func_path = join(self.__gadget_path, "functions", func)
|
||||
_mkdir(func_path)
|
||||
func_path = self.__create_function(func)
|
||||
_write(join(func_path, "stall"), int(stall))
|
||||
_write(join(func_path, "lun.0/cdrom"), int(cdrom))
|
||||
_write(join(func_path, "lun.0/ro"), int(not rw))
|
||||
_write(join(func_path, "lun.0/removable"), int(removable))
|
||||
_write(join(func_path, "lun.0/nofua"), int(not fua))
|
||||
_write(join(func_path, "lun.0/inquiry_string_cdrom"), inquiry_string_cdrom)
|
||||
_write(join(func_path, "lun.0/inquiry_string"), inquiry_string_flash)
|
||||
if user != "root":
|
||||
_chown(join(func_path, "lun.0/cdrom"), user)
|
||||
_chown(join(func_path, "lun.0/ro"), user)
|
||||
_chown(join(func_path, "lun.0/file"), user)
|
||||
_chown(join(func_path, "lun.0/forced_eject"), user, optional=True)
|
||||
if start:
|
||||
_symlink(func_path, join(self.__profile_path, func))
|
||||
name = ("Mass Storage Drive" if self.__msd_instance == 0 else f"Extra Drive #{self.__msd_instance}")
|
||||
self.__create_meta(func, name)
|
||||
self.__start_function(func, eps)
|
||||
desc = ("Mass Storage Drive" if self.__msd_instance == 0 else f"Extra Drive #{self.__msd_instance}")
|
||||
self.__create_meta(func, desc, eps)
|
||||
self.__msd_instance += 1
|
||||
|
||||
def __create_meta(self, func: str, name: str) -> None:
|
||||
_write(join(self.__meta_path, f"{func}@meta.json"), json.dumps({"func": func, "name": name}))
|
||||
def __create_function(self, func: str) -> str:
|
||||
func_path = join(self.__gadget_path, "functions", func)
|
||||
_mkdir(func_path)
|
||||
return func_path
|
||||
|
||||
def __start_function(self, func: str, eps: int) -> None:
|
||||
func_path = join(self.__gadget_path, "functions", func)
|
||||
if self.__eps_max - self.__eps_used >= eps:
|
||||
_symlink(func_path, join(self.__profile_path, func))
|
||||
self.__eps_used += eps
|
||||
else:
|
||||
get_logger().info("Will not be started: No available endpoints")
|
||||
|
||||
def __create_meta(self, func: str, desc: str, eps: int) -> None:
|
||||
_write(join(self.__meta_path, f"{func}@meta.json"), json.dumps({
|
||||
"function": func,
|
||||
"description": desc,
|
||||
"endpoints": eps,
|
||||
}))
|
||||
|
||||
|
||||
def _cmd_start(config: Section) -> None: # pylint: disable=too-many-statements,too-many-branches
|
||||
@@ -248,33 +296,50 @@ def _cmd_start(config: Section) -> None: # pylint: disable=too-many-statements,
|
||||
# XXX: Should we use MaxPower=100 with Remote Wakeup?
|
||||
_write(join(profile_path, "bmAttributes"), "0xA0")
|
||||
|
||||
gc = _GadgetConfig(gadget_path, profile_path, config.otg.meta)
|
||||
gc = _GadgetConfig(gadget_path, profile_path, config.otg.meta, config.otg.endpoints)
|
||||
cod = config.otg.devices
|
||||
|
||||
if cod.serial.enabled:
|
||||
logger.info("===== Serial =====")
|
||||
gc.add_serial(cod.serial.start)
|
||||
|
||||
if cod.ethernet.enabled:
|
||||
logger.info("===== Ethernet =====")
|
||||
gc.add_ethernet(**cod.ethernet._unpack(ignore=["enabled"]))
|
||||
|
||||
if config.kvmd.hid.type == "otg":
|
||||
logger.info("===== HID-Keyboard =====")
|
||||
gc.add_keyboard(cod.hid.keyboard.start, config.otg.remote_wakeup)
|
||||
logger.info("===== HID-Mouse =====")
|
||||
gc.add_mouse(cod.hid.mouse.start, config.otg.remote_wakeup, config.kvmd.hid.mouse.absolute, config.kvmd.hid.mouse.horizontal_wheel)
|
||||
ckhm = config.kvmd.hid.mouse
|
||||
gc.add_mouse(cod.hid.mouse.start, config.otg.remote_wakeup, ckhm.absolute, ckhm.horizontal_wheel)
|
||||
if config.kvmd.hid.mouse_alt.device:
|
||||
logger.info("===== HID-Mouse-Alt =====")
|
||||
gc.add_mouse(cod.hid.mouse.start, config.otg.remote_wakeup, (not config.kvmd.hid.mouse.absolute), config.kvmd.hid.mouse.horizontal_wheel)
|
||||
gc.add_mouse(cod.hid.mouse_alt.start, config.otg.remote_wakeup, (not ckhm.absolute), ckhm.horizontal_wheel)
|
||||
|
||||
if config.kvmd.msd.type == "otg":
|
||||
logger.info("===== MSD =====")
|
||||
gc.add_msd(cod.msd.start, config.otg.user, **cod.msd.default._unpack())
|
||||
gc.add_msd(
|
||||
start=cod.msd.start,
|
||||
user=config.otg.user,
|
||||
inquiry_string_cdrom=usb.make_inquiry_string(**cod.msd.default.inquiry_string.cdrom._unpack()),
|
||||
inquiry_string_flash=usb.make_inquiry_string(**cod.msd.default.inquiry_string.flash._unpack()),
|
||||
**cod.msd.default._unpack(ignore="inquiry_string"),
|
||||
)
|
||||
if cod.drives.enabled:
|
||||
for count in range(cod.drives.count):
|
||||
logger.info("===== MSD Extra: %d =====", count + 1)
|
||||
gc.add_msd(cod.drives.start, "root", **cod.drives.default._unpack())
|
||||
gc.add_msd(
|
||||
start=cod.drives.start,
|
||||
user="root",
|
||||
inquiry_string_cdrom=usb.make_inquiry_string(**cod.drives.default.inquiry_string.cdrom._unpack()),
|
||||
inquiry_string_flash=usb.make_inquiry_string(**cod.drives.default.inquiry_string.flash._unpack()),
|
||||
**cod.drives.default._unpack(ignore="inquiry_string"),
|
||||
)
|
||||
|
||||
if cod.ethernet.enabled:
|
||||
logger.info("===== Ethernet =====")
|
||||
gc.add_ethernet(**cod.ethernet._unpack(ignore=["enabled"]))
|
||||
|
||||
if cod.serial.enabled:
|
||||
logger.info("===== Serial =====")
|
||||
gc.add_serial(cod.serial.start)
|
||||
|
||||
if cod.audio.enabled:
|
||||
logger.info("===== Microphone =====")
|
||||
gc.add_audio_mic(cod.audio.start)
|
||||
|
||||
logger.info("===== Preparing complete =====")
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
import os
|
||||
import json
|
||||
import contextlib
|
||||
import dataclasses
|
||||
import argparse
|
||||
import time
|
||||
|
||||
@@ -38,11 +39,28 @@ from .. import init
|
||||
|
||||
|
||||
# =====
|
||||
@dataclasses.dataclass(frozen=True)
|
||||
class _Function:
|
||||
name: str
|
||||
desc: str
|
||||
eps: int
|
||||
enabled: bool
|
||||
|
||||
|
||||
class _GadgetControl:
|
||||
def __init__(self, meta_path: str, gadget: str, udc: str, init_delay: float) -> None:
|
||||
def __init__(
|
||||
self,
|
||||
meta_path: str,
|
||||
gadget: str,
|
||||
udc: str,
|
||||
eps: int,
|
||||
init_delay: float,
|
||||
) -> None:
|
||||
|
||||
self.__meta_path = meta_path
|
||||
self.__gadget = gadget
|
||||
self.__udc = udc
|
||||
self.__eps = eps
|
||||
self.__init_delay = init_delay
|
||||
|
||||
@contextlib.contextmanager
|
||||
@@ -57,12 +75,12 @@ class _GadgetControl:
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
self.__recreate_profile()
|
||||
self.__clear_profile(recreate=True)
|
||||
time.sleep(self.__init_delay)
|
||||
with open(udc_path, "w") as file:
|
||||
file.write(udc)
|
||||
|
||||
def __recreate_profile(self) -> None:
|
||||
def __clear_profile(self, recreate: bool) -> None:
|
||||
# XXX: See pikvm/pikvm#1235
|
||||
# After unbind and bind, the gadgets stop working,
|
||||
# unless we recreate their links in the profile.
|
||||
@@ -72,14 +90,22 @@ class _GadgetControl:
|
||||
if os.path.islink(path):
|
||||
try:
|
||||
os.unlink(path)
|
||||
os.symlink(self.__get_fsrc_path(func), path)
|
||||
if recreate:
|
||||
os.symlink(self.__get_fsrc_path(func), path)
|
||||
except (FileNotFoundError, FileExistsError):
|
||||
pass
|
||||
|
||||
def __read_metas(self) -> Generator[dict, None, None]:
|
||||
for meta_name in sorted(os.listdir(self.__meta_path)):
|
||||
with open(os.path.join(self.__meta_path, meta_name)) as file:
|
||||
yield json.loads(file.read())
|
||||
def __read_metas(self) -> Generator[_Function, None, None]:
|
||||
for name in sorted(os.listdir(self.__meta_path)):
|
||||
with open(os.path.join(self.__meta_path, name)) as file:
|
||||
meta = json.loads(file.read())
|
||||
enabled = os.path.exists(self.__get_fdest_path(meta["function"]))
|
||||
yield _Function(
|
||||
name=meta["function"],
|
||||
desc=meta["description"],
|
||||
eps=meta["endpoints"],
|
||||
enabled=enabled,
|
||||
)
|
||||
|
||||
def __get_fsrc_path(self, func: str) -> str:
|
||||
return usb.get_gadget_path(self.__gadget, usb.G_FUNCTIONS, func)
|
||||
@@ -89,20 +115,28 @@ class _GadgetControl:
|
||||
return usb.get_gadget_path(self.__gadget, usb.G_PROFILE)
|
||||
return usb.get_gadget_path(self.__gadget, usb.G_PROFILE, func)
|
||||
|
||||
def enable_functions(self, funcs: list[str]) -> None:
|
||||
def change_functions(self, enable: set[str], disable: set[str]) -> None:
|
||||
funcs = list(self.__read_metas())
|
||||
new: set[str] = set(func.name for func in funcs if func.enabled)
|
||||
new = (new - disable) | enable
|
||||
eps_req = sum(func.eps for func in funcs if func.name in new)
|
||||
if eps_req > self.__eps:
|
||||
raise RuntimeError(f"No available endpoints for this config: {eps_req} required, {self.__eps} is maximum")
|
||||
with self.__udc_stopped():
|
||||
for func in funcs:
|
||||
os.symlink(self.__get_fsrc_path(func), self.__get_fdest_path(func))
|
||||
|
||||
def disable_functions(self, funcs: list[str]) -> None:
|
||||
with self.__udc_stopped():
|
||||
for func in funcs:
|
||||
os.unlink(self.__get_fdest_path(func))
|
||||
self.__clear_profile(recreate=False)
|
||||
for func in new:
|
||||
try:
|
||||
os.symlink(self.__get_fsrc_path(func), self.__get_fdest_path(func))
|
||||
except FileExistsError:
|
||||
pass
|
||||
|
||||
def list_functions(self) -> None:
|
||||
for meta in self.__read_metas():
|
||||
enabled = os.path.exists(self.__get_fdest_path(meta["func"]))
|
||||
print(f"{'+' if enabled else '-'} {meta['func']} # {meta['name']}")
|
||||
funcs = list(self.__read_metas())
|
||||
eps_used = sum(func.eps for func in funcs if func.enabled)
|
||||
print(f"# Endpoints used: {eps_used} of {self.__eps}")
|
||||
print(f"# Endpoints free: {self.__eps - eps_used}")
|
||||
for func in funcs:
|
||||
print(f"{'+' if func.enabled else '-'} {func.name} # [{func.eps}] {func.desc}")
|
||||
|
||||
def make_gpio_config(self) -> None:
|
||||
class Dumper(yaml.Dumper):
|
||||
@@ -127,17 +161,17 @@ class _GadgetControl:
|
||||
"scheme": {},
|
||||
"view": {"table": []},
|
||||
}
|
||||
for meta in self.__read_metas():
|
||||
config["scheme"][meta["func"]] = { # type: ignore
|
||||
for func in self.__read_metas():
|
||||
config["scheme"][func.name] = { # type: ignore
|
||||
"driver": "otgconf",
|
||||
"pin": meta["func"],
|
||||
"pin": func.name,
|
||||
"mode": "output",
|
||||
"pulse": False,
|
||||
}
|
||||
config["view"]["table"].append(InlineList([ # type: ignore
|
||||
"#" + meta["name"],
|
||||
"#" + meta["func"],
|
||||
meta["func"],
|
||||
"#" + func.desc,
|
||||
"#" + func.name,
|
||||
func.name,
|
||||
]))
|
||||
print(yaml.dump({"kvmd": {"gpio": config}}, indent=4, Dumper=Dumper))
|
||||
|
||||
@@ -159,25 +193,21 @@ def main(argv: (list[str] | None)=None) -> None:
|
||||
parents=[parent_parser],
|
||||
)
|
||||
parser.add_argument("-l", "--list-functions", action="store_true", help="List functions")
|
||||
parser.add_argument("-e", "--enable-function", nargs="+", metavar="<name>", help="Enable function(s)")
|
||||
parser.add_argument("-d", "--disable-function", nargs="+", metavar="<name>", help="Disable function(s)")
|
||||
parser.add_argument("-e", "--enable-function", nargs="+", default=[], metavar="<name>", help="Enable function(s)")
|
||||
parser.add_argument("-d", "--disable-function", nargs="+", default=[], metavar="<name>", help="Disable function(s)")
|
||||
parser.add_argument("-r", "--reset-gadget", action="store_true", help="Reset gadget")
|
||||
parser.add_argument("--make-gpio-config", action="store_true")
|
||||
options = parser.parse_args(argv[1:])
|
||||
|
||||
gc = _GadgetControl(config.otg.meta, config.otg.gadget, config.otg.udc, config.otg.init_delay)
|
||||
gc = _GadgetControl(config.otg.meta, config.otg.gadget, config.otg.udc, config.otg.endpoints, config.otg.init_delay)
|
||||
|
||||
if options.list_functions:
|
||||
gc.list_functions()
|
||||
|
||||
elif options.enable_function:
|
||||
funcs = list(map(valid_stripped_string_not_empty, options.enable_function))
|
||||
gc.enable_functions(funcs)
|
||||
gc.list_functions()
|
||||
|
||||
elif options.disable_function:
|
||||
funcs = list(map(valid_stripped_string_not_empty, options.disable_function))
|
||||
gc.disable_functions(funcs)
|
||||
elif options.enable_function or options.disable_function:
|
||||
enable = set(map(valid_stripped_string_not_empty, options.enable_function))
|
||||
disable = set(map(valid_stripped_string_not_empty, options.disable_function))
|
||||
gc.change_functions(enable, disable)
|
||||
gc.list_functions()
|
||||
|
||||
elif options.reset_gadget:
|
||||
|
||||
@@ -20,13 +20,12 @@
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
import os
|
||||
import errno
|
||||
import argparse
|
||||
|
||||
from ...validators.basic import valid_bool
|
||||
from ...validators.basic import valid_int_f0
|
||||
from ...validators.os import valid_abs_file
|
||||
from ...validators.os import valid_abs_path
|
||||
|
||||
from ... import usb
|
||||
|
||||
@@ -72,10 +71,10 @@ def main(argv: (list[str] | None)=None) -> None:
|
||||
parser.add_argument("-i", "--instance", default=0, type=valid_int_f0,
|
||||
metavar="<N>", help="Drive instance (0 for KVMD drive)")
|
||||
parser.add_argument("--set-cdrom", default=None, type=valid_bool,
|
||||
metavar="<1|0|yes|no>", help="Set CD-ROM flag")
|
||||
metavar="<1|0|yes|no>", help="Set CD/DVD flag")
|
||||
parser.add_argument("--set-rw", default=None, type=valid_bool,
|
||||
metavar="<1|0|yes|no>", help="Set RW flag")
|
||||
parser.add_argument("--set-image", default=None, type=valid_abs_file,
|
||||
parser.add_argument("--set-image", default=None, type=valid_abs_path,
|
||||
metavar="<path>", help="Set the image file")
|
||||
parser.add_argument("--eject", action="store_true",
|
||||
help="Eject the image")
|
||||
@@ -103,10 +102,10 @@ def main(argv: (list[str] | None)=None) -> None:
|
||||
set_param("ro", str(int(not options.set_rw)))
|
||||
|
||||
if options.set_image:
|
||||
if not os.path.isfile(options.set_image):
|
||||
raise SystemExit(f"Not a file: {options.set_image}")
|
||||
# if not os.path.isfile(options.set_image):
|
||||
# raise SystemExit(f"Not a file: {options.set_image}")
|
||||
set_param("file", options.set_image)
|
||||
|
||||
print("Image file: ", (get_param("file") or "<none>"))
|
||||
print("CD-ROM flag:", ("yes" if int(get_param("cdrom")) else "no"))
|
||||
print("CD/DVD flag:", ("yes" if int(get_param("cdrom")) else "no"))
|
||||
print("RW flag: ", ("no" if int(get_param("ro")) else "yes"))
|
||||
|
||||
@@ -24,6 +24,7 @@ import os
|
||||
import asyncio
|
||||
|
||||
from aiohttp.web import Request
|
||||
from aiohttp.web import Response
|
||||
from aiohttp.web import WebSocketResponse
|
||||
|
||||
from ...logging import get_logger
|
||||
@@ -35,6 +36,7 @@ from ... import fstab
|
||||
|
||||
from ...htserver import exposed_http
|
||||
from ...htserver import exposed_ws
|
||||
from ...htserver import make_json_response
|
||||
from ...htserver import WsSession
|
||||
from ...htserver import HttpServer
|
||||
|
||||
@@ -65,6 +67,16 @@ class PstServer(HttpServer): # pylint: disable=too-many-arguments,too-many-inst
|
||||
await ws.send_event("loop", {})
|
||||
return (await self._ws_loop(ws))
|
||||
|
||||
@exposed_http("GET", "/state")
|
||||
async def __state_handler(self, _: Request) -> Response:
|
||||
return make_json_response({
|
||||
"clients": len(self._get_wss()),
|
||||
"data": {
|
||||
"path": self.__data_path,
|
||||
"write_allowed": self.__is_write_available(),
|
||||
},
|
||||
})
|
||||
|
||||
@exposed_ws("ping")
|
||||
async def __ws_ping_handler(self, ws: WsSession, _: dict) -> None:
|
||||
await ws.send_event("pong", {})
|
||||
@@ -92,10 +104,10 @@ class PstServer(HttpServer): # pylint: disable=too-many-arguments,too-many-inst
|
||||
await self.__remount_storage(rw=False)
|
||||
logger.info("On-Cleanup complete")
|
||||
|
||||
async def _on_ws_opened(self) -> None:
|
||||
async def _on_ws_opened(self, _: WsSession) -> None:
|
||||
self.__notifier.notify()
|
||||
|
||||
async def _on_ws_closed(self) -> None:
|
||||
async def _on_ws_closed(self, _: WsSession) -> None:
|
||||
self.__notifier.notify()
|
||||
|
||||
# ===== SYSTEM TASKS
|
||||
@@ -117,7 +129,7 @@ class PstServer(HttpServer): # pylint: disable=too-many-arguments,too-many-inst
|
||||
await self.__notifier.wait()
|
||||
|
||||
async def __broadcast_storage_state(self, clients: int, write_allowed: bool) -> None:
|
||||
await self._broadcast_ws_event("storage_state", {
|
||||
await self._broadcast_ws_event("storage", {
|
||||
"clients": clients,
|
||||
"data": {
|
||||
"path": self.__data_path,
|
||||
|
||||
@@ -84,7 +84,7 @@ async def _run_cmd_ws(cmd: list[str], ws: aiohttp.ClientWebSocketResponse) -> in
|
||||
msg = receive_task.result()
|
||||
if msg.type == aiohttp.WSMsgType.TEXT:
|
||||
(event_type, event) = htserver.parse_ws_event(msg.data)
|
||||
if event_type == "storage_state":
|
||||
if event_type == "storage":
|
||||
if event["data"]["write_allowed"] and proc is None:
|
||||
logger.info("PST write is allowed: %s", event["data"]["path"])
|
||||
logger.info("Running the process ...")
|
||||
|
||||
167
kvmd/apps/swctl/__init__.py
Normal file
167
kvmd/apps/swctl/__init__.py
Normal file
@@ -0,0 +1,167 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
import os
|
||||
import argparse
|
||||
import pprint
|
||||
import time
|
||||
|
||||
import pyudev
|
||||
|
||||
from ..kvmd.switch.device import Device
|
||||
from ..kvmd.switch.proto import Edid
|
||||
|
||||
|
||||
# =====
|
||||
def _find_serial_device() -> str:
|
||||
ctx = pyudev.Context()
|
||||
for device in ctx.list_devices(subsystem="tty"):
|
||||
if (
|
||||
str(device.properties.get("ID_VENDOR_ID")).upper() == "2E8A"
|
||||
and str(device.properties.get("ID_MODEL_ID")).upper() == "1080"
|
||||
):
|
||||
path = device.properties["DEVNAME"]
|
||||
assert path.startswith("/dev/")
|
||||
return path
|
||||
return ""
|
||||
|
||||
|
||||
def _wait_boot_device() -> str:
|
||||
stop_ts = time.time() + 5
|
||||
ctx = pyudev.Context()
|
||||
while time.time() < stop_ts:
|
||||
for device in ctx.list_devices(subsystem="block", DEVTYPE="partition"):
|
||||
if (
|
||||
str(device.properties.get("ID_VENDOR_ID")).upper() == "2E8A"
|
||||
and str(device.properties.get("ID_MODEL_ID")).upper() == "0003"
|
||||
):
|
||||
path = device.properties["DEVNAME"]
|
||||
assert path.startswith("/dev/")
|
||||
return path
|
||||
time.sleep(0.2)
|
||||
return ""
|
||||
|
||||
|
||||
def _create_edid(arg: str) -> Edid:
|
||||
if arg == "@":
|
||||
return Edid.from_data("Empty", None)
|
||||
with open(arg) as file:
|
||||
return Edid.from_data(os.path.basename(arg), file.read())
|
||||
|
||||
|
||||
# =====
|
||||
def main() -> None: # pylint: disable=too-many-statements
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("-d", "--device", default="")
|
||||
parser.set_defaults(cmd="")
|
||||
subs = parser.add_subparsers()
|
||||
|
||||
def add_command(name: str) -> argparse.ArgumentParser:
|
||||
cmd = subs.add_parser(name)
|
||||
cmd.set_defaults(cmd=name)
|
||||
return cmd
|
||||
|
||||
add_command("poll")
|
||||
|
||||
add_command("state")
|
||||
|
||||
cmd = add_command("bootloader")
|
||||
cmd.add_argument("unit", type=int)
|
||||
|
||||
cmd = add_command("reboot")
|
||||
cmd.add_argument("unit", type=int)
|
||||
|
||||
cmd = add_command("switch")
|
||||
cmd.add_argument("unit", type=int)
|
||||
cmd.add_argument("port", type=int, choices=list(range(5)))
|
||||
|
||||
cmd = add_command("beacon")
|
||||
cmd.add_argument("unit", type=int)
|
||||
cmd.add_argument("port", type=int, choices=list(range(6)))
|
||||
cmd.add_argument("on", choices=["on", "off"])
|
||||
|
||||
add_command("leds")
|
||||
|
||||
cmd = add_command("click")
|
||||
cmd.add_argument("button", choices=["power", "reset"])
|
||||
cmd.add_argument("unit", type=int)
|
||||
cmd.add_argument("port", type=int, choices=list(range(4)))
|
||||
cmd.add_argument("delay_ms", type=int)
|
||||
|
||||
cmd = add_command("set-edid")
|
||||
cmd.add_argument("unit", type=int)
|
||||
cmd.add_argument("port", type=int, choices=list(range(4)))
|
||||
cmd.add_argument("edid", type=_create_edid)
|
||||
|
||||
opts = parser.parse_args()
|
||||
|
||||
if not opts.device:
|
||||
opts.device = _find_serial_device()
|
||||
|
||||
if opts.cmd == "bootloader" and opts.unit == 0:
|
||||
if opts.device:
|
||||
with Device(opts.device) as device:
|
||||
device.request_reboot(opts.unit, bootloader=True)
|
||||
found = _wait_boot_device()
|
||||
if found:
|
||||
print(found)
|
||||
raise SystemExit()
|
||||
raise SystemExit("Error: No switch found")
|
||||
|
||||
if not opts.device:
|
||||
raise SystemExit("Error: No switch found")
|
||||
|
||||
with Device(opts.device) as device:
|
||||
wait_rid: (int | None) = None
|
||||
match opts.cmd:
|
||||
case "poll":
|
||||
device.request_state()
|
||||
device.request_atx_leds()
|
||||
case "state":
|
||||
wait_rid = device.request_state()
|
||||
case "bootloader" | "reboot":
|
||||
device.request_reboot(opts.unit, (opts.cmd == "bootloader"))
|
||||
raise SystemExit()
|
||||
case "switch":
|
||||
wait_rid = device.request_switch(opts.unit, opts.port)
|
||||
case "leds":
|
||||
wait_rid = device.request_atx_leds()
|
||||
case "click":
|
||||
match opts.button:
|
||||
case "power":
|
||||
wait_rid = device.request_atx_cp(opts.unit, opts.port, opts.delay_ms)
|
||||
case "reset":
|
||||
wait_rid = device.request_atx_cr(opts.unit, opts.port, opts.delay_ms)
|
||||
case "beacon":
|
||||
wait_rid = device.request_beacon(opts.unit, opts.port, (opts.on == "on"))
|
||||
case "set-edid":
|
||||
wait_rid = device.request_set_edid(opts.unit, opts.port, opts.edid)
|
||||
|
||||
error_ts = time.monotonic() + 1
|
||||
while True:
|
||||
for resp in device.read_all():
|
||||
pprint.pprint((int(time.time()), resp))
|
||||
print()
|
||||
if resp.header.rid == wait_rid:
|
||||
raise SystemExit()
|
||||
if wait_rid is not None and time.monotonic() > error_ts:
|
||||
raise SystemExit("No answer from unit")
|
||||
24
kvmd/apps/swctl/__main__.py
Normal file
24
kvmd/apps/swctl/__main__.py
Normal file
@@ -0,0 +1,24 @@
|
||||
# ========================================================================== #
|
||||
# #
|
||||
# KVMD - The main PiKVM daemon. #
|
||||
# #
|
||||
# Copyright (C) 2018-2024 Maxim Devaev <mdevaev@gmail.com> #
|
||||
# #
|
||||
# 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/>. #
|
||||
# #
|
||||
# ========================================================================== #
|
||||
|
||||
|
||||
from . import main
|
||||
main()
|
||||
@@ -464,6 +464,10 @@ class RfbClient(RfbClientStream): # pylint: disable=too-many-instance-attribute
|
||||
|
||||
if self._encodings.has_ext_keys: # Preferred method
|
||||
await self._write_fb_update("ExtKeys FBUR", 0, 0, RfbEncodings.EXT_KEYS, drain=True)
|
||||
|
||||
if self._encodings.has_ext_mouse: # Preferred too
|
||||
await self._write_fb_update("ExtMouse FBUR", 0, 0, RfbEncodings.EXT_MOUSE, drain=True)
|
||||
|
||||
await self._on_set_encodings()
|
||||
|
||||
async def __handle_fb_update_request(self) -> None:
|
||||
@@ -486,11 +490,16 @@ class RfbClient(RfbClientStream): # pylint: disable=too-many-instance-attribute
|
||||
|
||||
async def __handle_pointer_event(self) -> None:
|
||||
(buttons, to_x, to_y) = await self._read_struct("pointer event", "B HH")
|
||||
ext_buttons = 0
|
||||
if self._encodings.has_ext_mouse and (buttons & 0x80): # Marker bit 7 for ext event
|
||||
ext_buttons = await self._read_number("ext pointer event buttons", "B")
|
||||
await self._on_pointer_event(
|
||||
buttons={
|
||||
"left": bool(buttons & 0x1),
|
||||
"right": bool(buttons & 0x4),
|
||||
"middle": bool(buttons & 0x2),
|
||||
"up": bool(ext_buttons & 0x2),
|
||||
"down": bool(ext_buttons & 0x1),
|
||||
},
|
||||
wheel={
|
||||
"x": (-4 if buttons & 0x40 else (4 if buttons & 0x20 else 0)),
|
||||
|
||||
@@ -31,6 +31,7 @@ class RfbEncodings:
|
||||
RENAME = -307 # DesktopName Pseudo-encoding
|
||||
LEDS_STATE = -261 # QEMU LED State Pseudo-encoding
|
||||
EXT_KEYS = -258 # QEMU Extended Key Events Pseudo-encoding
|
||||
EXT_MOUSE = -316 # ExtendedMouseButtons Pseudo-encoding
|
||||
CONT_UPDATES = -313 # ContinuousUpdates Pseudo-encoding
|
||||
|
||||
TIGHT = 7
|
||||
@@ -50,16 +51,17 @@ def _make_meta(variants: (int | frozenset[int])) -> dict:
|
||||
class RfbClientEncodings: # pylint: disable=too-many-instance-attributes
|
||||
encodings: frozenset[int]
|
||||
|
||||
has_resize: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.RESIZE)) # noqa: E224
|
||||
has_rename: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.RENAME)) # noqa: E224
|
||||
has_leds_state: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.LEDS_STATE)) # noqa: E224
|
||||
has_ext_keys: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.EXT_KEYS)) # noqa: E224
|
||||
has_cont_updates: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.CONT_UPDATES)) # noqa: E224
|
||||
has_resize: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.RESIZE)) # noqa: E224
|
||||
has_rename: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.RENAME)) # noqa: E224
|
||||
has_leds_state: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.LEDS_STATE)) # noqa: E224
|
||||
has_ext_keys: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.EXT_KEYS)) # noqa: E224
|
||||
has_ext_mouse: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.EXT_MOUSE)) # noqa: E224
|
||||
has_cont_updates: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.CONT_UPDATES)) # noqa: E224
|
||||
|
||||
has_tight: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.TIGHT)) # noqa: E224
|
||||
tight_jpeg_quality: int = dataclasses.field(default=0, metadata=_make_meta(frozenset(RfbEncodings.TIGHT_JPEG_QUALITIES))) # noqa: E224
|
||||
has_tight: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.TIGHT)) # noqa: E224
|
||||
tight_jpeg_quality: int = dataclasses.field(default=0, metadata=_make_meta(frozenset(RfbEncodings.TIGHT_JPEG_QUALITIES))) # noqa: E224
|
||||
|
||||
has_h264: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.H264)) # noqa: E224
|
||||
has_h264: bool = dataclasses.field(default=False, metadata=_make_meta(RfbEncodings.H264)) # noqa: E224
|
||||
|
||||
def get_summary(self) -> list[str]:
|
||||
summary: list[str] = [f"encodings -- {sorted(self.encodings)}"]
|
||||
|
||||
@@ -130,7 +130,7 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes
|
||||
|
||||
# Эти состояния шарить не обязательно - бекенд исключает дублирующиеся события.
|
||||
# Все это нужно только чтобы не посылать лишние жсоны в сокет KVMD
|
||||
self.__mouse_buttons: dict[str, (bool | None)] = dict.fromkeys(["left", "right", "middle"], None)
|
||||
self.__mouse_buttons: dict[str, (bool | None)] = dict.fromkeys(["left", "right", "middle", "up", "down"], None)
|
||||
self.__mouse_move = {"x": -1, "y": -1}
|
||||
|
||||
self.__modifiers = 0
|
||||
@@ -177,7 +177,7 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes
|
||||
self.__kvmd_ws = None
|
||||
|
||||
async def __process_ws_event(self, event_type: str, event: dict) -> None:
|
||||
if event_type == "info_state":
|
||||
if event_type == "info":
|
||||
if "meta" in event:
|
||||
try:
|
||||
host = event["meta"]["server"]["host"]
|
||||
@@ -190,7 +190,7 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes
|
||||
await self._send_rename(name)
|
||||
self.__shared_params.name = name
|
||||
|
||||
elif event_type == "hid_state":
|
||||
elif event_type == "hid":
|
||||
if (
|
||||
self._encodings.has_leds_state
|
||||
and ("keyboard" in event)
|
||||
|
||||
Reference in New Issue
Block a user