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

removed _state suffix from all ws events

Browse Source
This commit is contained in:
Maxim Devaev 2025-01-05 15:19:04 +02:00
parent 5a61ddecd3
commit 4488365dfb
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kvmd/apps/kvmd/server.py
View File

@ -131,15 +131,15 @@ class _Subsystem:
class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-instance-attributes class KvmdServer(HttpServer): # pylint: disable=too-many-arguments,too-many-instance-attributes
__EV_GPIO_STATE = "gpio_state" __EV_GPIO_STATE = "gpio"
__EV_HID_STATE = "hid_state" __EV_HID_STATE = "hid"
__EV_HID_KEYMAPS_STATE = "hid_keymaps_state" # FIXME __EV_HID_KEYMAPS_STATE = "hid_keymaps" # FIXME
__EV_ATX_STATE = "atx_state" __EV_ATX_STATE = "atx"
__EV_MSD_STATE = "msd_state" __EV_MSD_STATE = "msd"
__EV_STREAMER_STATE = "streamer_state" __EV_STREAMER_STATE = "streamer"
__EV_OCR_STATE = "ocr_state" __EV_OCR_STATE = "ocr"
__EV_INFO_STATE = "info_state" __EV_INFO_STATE = "info"
__EV_SWITCH_STATE = "switch_state" __EV_SWITCH_STATE = "switch"
def __init__( # pylint: disable=too-many-arguments,too-many-locals def __init__( # pylint: disable=too-many-arguments,too-many-locals
self, self,

2
kvmd/apps/pst/server.py
View File

@ -129,7 +129,7 @@ class PstServer(HttpServer): # pylint: disable=too-many-arguments,too-many-inst
await self.__notifier.wait() await self.__notifier.wait()
async def __broadcast_storage_state(self, clients: int, write_allowed: bool) -> None: 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, "clients": clients,
"data": { "data": {
"path": self.__data_path, "path": self.__data_path,

2
kvmd/apps/pstrun/__init__.py
View File

@ -84,7 +84,7 @@ async def _run_cmd_ws(cmd: list[str], ws: aiohttp.ClientWebSocketResponse) -> in
msg = receive_task.result() msg = receive_task.result()
if msg.type == aiohttp.WSMsgType.TEXT: if msg.type == aiohttp.WSMsgType.TEXT:
(event_type, event) = htserver.parse_ws_event(msg.data) (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: if event["data"]["write_allowed"] and proc is None:
logger.info("PST write is allowed: %s", event["data"]["path"]) logger.info("PST write is allowed: %s", event["data"]["path"])
logger.info("Running the process ...") logger.info("Running the process ...")

4
kvmd/apps/vnc/server.py
View File

@ -177,7 +177,7 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes
self.__kvmd_ws = None self.__kvmd_ws = None
async def __process_ws_event(self, event_type: str, event: dict) -> 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: if "meta" in event:
try: try:
host = event["meta"]["server"]["host"] host = event["meta"]["server"]["host"]
@ -190,7 +190,7 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes
await self._send_rename(name) await self._send_rename(name)
self.__shared_params.name = name self.__shared_params.name = name
elif event_type == "hid_state": elif event_type == "hid":
if ( if (
self._encodings.has_leds_state self._encodings.has_leds_state
and ("keyboard" in event) and ("keyboard" in event)

2
kvmd/clients/pst.py
View File

@ -75,7 +75,7 @@ class PstClient:
if msg.type != aiohttp.WSMsgType.TEXT: if msg.type != aiohttp.WSMsgType.TEXT:
raise PstError(f"Unexpected message type: {msg!r}") raise PstError(f"Unexpected message type: {msg!r}")
(event_type, event) = htserver.parse_ws_event(msg.data) (event_type, event) = htserver.parse_ws_event(msg.data)
if event_type == "storage_state": if event_type == "storage":
if not event["data"]["write_allowed"]: if not event["data"]["write_allowed"]:
raise PstError("Write is not allowed") raise PstError("Write is not allowed")
path = event["data"]["path"] path = event["data"]["path"]

18
web/share/js/kvm/session.js
View File

@ -368,15 +368,15 @@ export function Session() {
let data = JSON.parse(event.data); let data = JSON.parse(event.data);
switch (data.event_type) { switch (data.event_type) {
case "pong": __missed_heartbeats = 0; break; case "pong": __missed_heartbeats = 0; break;
case "info_state": __setInfoState(data.event); break; case "info": __setInfoState(data.event); break;
case "gpio_state": __gpio.setState(data.event); break; case "gpio": __gpio.setState(data.event); break;
case "hid_state": __hid.setState(data.event); break; case "hid": __hid.setState(data.event); break;
case "hid_keymaps_state": __paste.setState(data.event); break; case "hid_keymaps": __paste.setState(data.event); break;
case "atx_state": __atx.setState(data.event); break; case "atx": __atx.setState(data.event); break;
case "streamer_state": __streamer.setState(data.event); break; case "streamer": __streamer.setState(data.event); break;
case "ocr_state": __ocr.setState(data.event); break; case "ocr": __ocr.setState(data.event); break;
case "msd_state": case "msd":
if (data.event.online === false) { if (data.event.online === false) {
__switch.setMsdConnected(false); __switch.setMsdConnected(false);
} else if (data.event.drive !== undefined) { } else if (data.event.drive !== undefined) {
@ -385,7 +385,7 @@ export function Session() {
__msd.setState(data.event); __msd.setState(data.event);
break; break;
case "switch_state": case "switch":
if (data.event.model) { if (data.event.model) {
__atx.setHasSwitch(data.event.model.ports.length > 0); __atx.setHasSwitch(data.event.model.ports.length > 0);
} }