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

binary keyboard protocol

Browse Source
This commit is contained in:
Maxim Devaev 2023-06-07 05:12:22 +03:00
parent 9c694da00c
commit 9f98a2f701
6 changed files with 68 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kvmd/apps/kvmd/api/hid.py
View File

@ -154,6 +154,25 @@ class HidApi:
# =====
@exposed_ws(1)
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])
except Exception:
return
if key not in self.__ignore_keys:
self.__hid.send_key_events([(key, state)])
@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])
except Exception:
return
self.__hid.send_mouse_button_event(button, state)
@exposed_ws(3)
async def __ws_bin_mouse_move_handler(self, _: WsSession, data: bytes) -> None:
try:

4
kvmd/clients/kvmd.py
View File

@ -188,10 +188,10 @@ class KvmdClientWs:
self.__communicated = False
async def send_key_event(self, key: str, state: bool) -> None:
await self.__writer_queue.put(("key", {"key": key, "state": state}))
await self.__writer_queue.put(bytes([1, state]) + key.encode("ascii"))
async def send_mouse_button_event(self, button: str, state: bool) -> None:
await self.__writer_queue.put(("mouse_button", {"button": button, "state": state}))
await self.__writer_queue.put(bytes([2, state]) + button.encode("ascii"))
async def send_mouse_move_event(self, to_x: int, to_y: int) -> None:
await self.__writer_queue.put(struct.pack(">bhh", 3, to_x, to_y))

2
web/share/js/kvm/keyboard.js
View File

@ -134,7 +134,7 @@ export function Keyboard(__recordWsEvent) {
"event": {"key": code, "state": state},
};
if (__ws && !$("hid-mute-switch").checked) {
__ws.send(JSON.stringify(event));
__ws.sendHidEvent(event);
}
__recordWsEvent(event);
};

33
web/share/js/kvm/mouse.js
View File

@ -345,38 +345,11 @@ export function Mouse(__getGeometry, __recordWsEvent) {
};
var __sendEvent = function(event_type, event) {
let wrapped_event = {"event_type": event_type, "event": event};
event = {"event_type": event_type, "event": event};
if (__ws && !$("hid-mute-switch").checked) {
if (event_type == "mouse_move") {
let data = new Uint8Array([
3,
(event.to.x >> 8) & 0xFF, event.to.x & 0xFF,
(event.to.y >> 8) & 0xFF, event.to.y & 0xFF,
]);
__ws.send(data);
} else if (event_type == "mouse_relative" || event_type == "mouse_wheel") {
let data;
if (Array.isArray(event.delta)) {
data = new Int8Array(2 + event.delta.length * 2);
let index = 0;
for (let delta of event.delta) {
data[index + 2] = delta["x"];
data[index + 3] = delta["y"];
index += 2;
}
} else {
data = new Int8Array([0, 0, event.delta.x, event.delta.y]);
}
data[0] = (event_type == "mouse_relative" ? 4 : 5);
data[1] = (event.squash ? 1 : 0);
__ws.send(data);
} else {
__ws.send(JSON.stringify(wrapped_event));
}
__ws.sendHidEvent(event);
}
__recordWsEvent(wrapped_event);
__recordWsEvent(event);
};
__init__();

2
web/share/js/kvm/recorder.js
View File

@ -290,7 +290,7 @@ export function Recorder() {
return;
} else if (["key", "mouse_button", "mouse_move", "mouse_wheel", "mouse_relative"].includes(event.event_type)) {
__ws.send(JSON.stringify(event));
__ws.sendHidEvent(event);
}
index += 1;

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

@ -278,6 +278,7 @@ export function Session() {
if (http.readyState === 4) {
if (http.status === 200) {
__ws = new WebSocket(`${tools.is_https ? "wss" : "ws"}://${location.host}/api/ws`);
__ws.sendHidEvent = (event) => __sendHidEvent(__ws, event.event_type, event.event);
__ws.onopen = __wsOpenHandler;
__ws.onmessage = __wsMessageHandler;
__ws.onerror = __wsErrorHandler;
@ -294,6 +295,46 @@ export function Session() {
});
};
var __ascii_encoder = new TextEncoder("ascii");
var __sendHidEvent = function(ws, event_type, event) {
if (event_type == "key") {
let data = __ascii_encoder.encode("\x01\x00" + event.key);
data[1] = (event.state ? 1 : 0);
ws.send(data);
} else if (event_type == "mouse_button") {
let data = __ascii_encoder.encode("\x02\x00" + event.button);
data[1] = (event.state ? 1 : 0);
ws.send(data);
} else if (event_type == "mouse_move") {
let data = new Uint8Array([
3,
(event.to.x >> 8) & 0xFF, event.to.x & 0xFF,
(event.to.y >> 8) & 0xFF, event.to.y & 0xFF,
]);
ws.send(data);
} else if (event_type == "mouse_relative" || event_type == "mouse_wheel") {
let data;
if (Array.isArray(event.delta)) {
data = new Int8Array(2 + event.delta.length * 2);
let index = 0;
for (let delta of event.delta) {
data[index + 2] = delta["x"];
data[index + 3] = delta["y"];
index += 2;
}
} else {
data = new Int8Array([0, 0, event.delta.x, event.delta.y]);
}
data[0] = (event_type == "mouse_relative" ? 4 : 5);
data[1] = (event.squash ? 1 : 0);
ws.send(data);
}
};
var __wsOpenHandler = function(event) {
tools.debug("Session: socket opened:", event);
$("link-led").className = "led-green";
@ -365,7 +406,7 @@ export function Session() {
if (__missed_heartbeats >= 15) {
throw new Error("Too many missed heartbeats");
}
__ws.send(JSON.stringify({"event_type": "ping", "event": {}}));
__ws.send("{\"event_type\": \"ping\", \"event\": {}}");
} catch (err) {
tools.error("Session: ping error:", err.message);
if (__ws) {