summaryrefslogtreecommitdiff
path: root/web/share/js/kvm
diff options
context:
space:
mode:
Diffstat (limited to 'web/share/js/kvm')
-rw-r--r--web/share/js/kvm/atx.js12
-rw-r--r--web/share/js/kvm/gpio.js12
-rw-r--r--web/share/js/kvm/hid.js56
-rw-r--r--web/share/js/kvm/msd.js32
-rw-r--r--web/share/js/kvm/ocr.js18
-rw-r--r--web/share/js/kvm/recorder.js48
-rw-r--r--web/share/js/kvm/session.js32
-rw-r--r--web/share/js/kvm/stream.js16
8 files changed, 95 insertions, 131 deletions
diff --git a/web/share/js/kvm/atx.js b/web/share/js/kvm/atx.js
index 61d9b5f9..53c290cf 100644
--- a/web/share/js/kvm/atx.js
+++ b/web/share/js/kvm/atx.js
@@ -73,13 +73,11 @@ export function Atx(__recorder) {
var __clickButton = function(button, confirm_msg) {
let click_button = function() {
- let http = tools.makeRequest("POST", `/api/atx/click?button=${button}`, function() {
- if (http.readyState === 4) {
- if (http.status === 409) {
- wm.error("Performing another ATX operation for other client.<br>Please try again later");
- } else if (http.status !== 200) {
- wm.error("Click error:<br>", http.responseText);
- }
+ tools.httpPost(`/api/atx/click?button=${button}`, function(http) {
+ if (http.status === 409) {
+ wm.error("Performing another ATX operation for other client.<br>Please try again later");
+ } else if (http.status !== 200) {
+ wm.error("Click error:<br>", http.responseText);
}
});
__recorder.recordAtxButtonEvent(button);
diff --git a/web/share/js/kvm/gpio.js b/web/share/js/kvm/gpio.js
index b765820d..db259cee 100644
--- a/web/share/js/kvm/gpio.js
+++ b/web/share/js/kvm/gpio.js
@@ -209,13 +209,11 @@ export function Gpio(__recorder) {
};
var __sendPost = function(url) {
- let http = tools.makeRequest("POST", url, function() {
- if (http.readyState === 4) {
- if (http.status === 409) {
- wm.error("Performing another operation for this GPIO channel.<br>Please try again later");
- } else if (http.status !== 200) {
- wm.error("GPIO error:<br>", http.responseText);
- }
+ tools.httpPost(url, function(http) {
+ if (http.status === 409) {
+ wm.error("Performing another operation for this GPIO channel.<br>Please try again later");
+ } else if (http.status !== 200) {
+ wm.error("GPIO error:<br>", http.responseText);
}
});
};
diff --git a/web/share/js/kvm/hid.js b/web/share/js/kvm/hid.js
index c33c262f..6ca87748 100644
--- a/web/share/js/kvm/hid.js
+++ b/web/share/js/kvm/hid.js
@@ -253,19 +253,17 @@ export function Hid(__getGeometry, __recorder) {
tools.debug(`HID: paste-as-keys ${keymap}: ${text}`);
- let http = tools.makeRequest("POST", `/api/hid/print?limit=0&keymap=${keymap}`, function() {
- if (http.readyState === 4) {
- tools.el.setEnabled($("hid-pak-text"), true);
- tools.el.setEnabled($("hid-pak-button"), true);
- tools.el.setEnabled($("hid-pak-keymap-selector"), true);
- $("hid-pak-text").value = "";
- if (http.status === 413) {
- wm.error("Too many text for paste!");
- } else if (http.status !== 200) {
- wm.error("HID paste error:<br>", http.responseText);
- } else if (http.status === 200) {
- __recorder.recordPrintEvent(text);
- }
+ tools.httpPost(`/api/hid/print?limit=0&keymap=${keymap}`, function(http) {
+ tools.el.setEnabled($("hid-pak-text"), true);
+ tools.el.setEnabled($("hid-pak-button"), true);
+ tools.el.setEnabled($("hid-pak-keymap-selector"), true);
+ $("hid-pak-text").value = "";
+ if (http.status === 413) {
+ wm.error("Too many text for paste!");
+ } else if (http.status !== 200) {
+ wm.error("HID paste error:<br>", http.responseText);
+ } else if (http.status === 200) {
+ __recorder.recordPrintEvent(text);
}
}, text, "text/plain");
};
@@ -288,33 +286,27 @@ export function Hid(__getGeometry, __recorder) {
var __clickOutputsRadio = function(hid) {
let output = tools.radio.getValue(`hid-outputs-${hid}-radio`);
- let http = tools.makeRequest("POST", `/api/hid/set_params?${hid}_output=${output}`, function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error("Can't configure HID:<br>", http.responseText);
- }
+ tools.httpPost(`/api/hid/set_params?${hid}_output=${output}`, function(http) {
+ if (http.status !== 200) {
+ wm.error("Can't configure HID:<br>", http.responseText);
}
});
};
var __clickJigglerSwitch = function() {
let enabled = $("hid-jiggler-switch").checked;
- let http = tools.makeRequest("POST", `/api/hid/set_params?jiggler=${enabled}`, function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error(`Can't ${enabled ? "enabled" : "disable"} mouse juggler:<br>`, http.responseText);
- }
+ tools.httpPost(`/api/hid/set_params?jiggler=${enabled}`, function(http) {
+ if (http.status !== 200) {
+ wm.error(`Can't ${enabled ? "enabled" : "disable"} mouse juggler:<br>`, http.responseText);
}
});
};
var __clickConnectSwitch = function() {
let connected = $("hid-connect-switch").checked;
- let http = tools.makeRequest("POST", `/api/hid/set_connected?connected=${connected}`, function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error(`Can't ${connected ? "connect" : "disconnect"} HID:<br>`, http.responseText);
- }
+ tools.httpPost(`/api/hid/set_connected?connected=${connected}`, function(http) {
+ if (http.status !== 200) {
+ wm.error(`Can't ${connected ? "connect" : "disconnect"} HID:<br>`, http.responseText);
}
});
};
@@ -322,11 +314,9 @@ export function Hid(__getGeometry, __recorder) {
var __clickResetButton = function() {
wm.confirm("Are you sure you want to reset HID (keyboard & mouse)?").then(function(ok) {
if (ok) {
- let http = tools.makeRequest("POST", "/api/hid/reset", function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error("HID reset error:<br>", http.responseText);
- }
+ tools.httpPost("/api/hid/reset", function(http) {
+ if (http.status !== 200) {
+ wm.error("HID reset error:<br>", http.responseText);
}
});
}
diff --git a/web/share/js/kvm/msd.js b/web/share/js/kvm/msd.js
index d6de4107..356e39f6 100644
--- a/web/share/js/kvm/msd.js
+++ b/web/share/js/kvm/msd.js
@@ -88,11 +88,9 @@ export function Msd() {
let name = $("msd-image-selector").value;
wm.confirm(`Are you sure you want to remove the image<br><b>${name}</b> from PiKVM?`).then(function(ok) {
if (ok) {
- let http = tools.makeRequest("POST", `/api/msd/remove?image=${name}`, function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error("Can't remove image:<br>", http.responseText);
- }
+ tools.httpPost(`/api/msd/remove?image=${name}`, function(http) {
+ if (http.status !== 200) {
+ wm.error("Can't remove image:<br>", http.responseText);
}
});
}
@@ -100,11 +98,9 @@ export function Msd() {
};
var __sendParam = function(name, value) {
- let http = tools.makeRequest("POST", `/api/msd/set_params?${name}=${encodeURIComponent(value)}`, function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error("Can't configure MSD:<br>", http.responseText);
- }
+ tools.httpPost(`/api/msd/set_params?${name}=${encodeURIComponent(value)}`, function(http) {
+ if (http.status !== 200) {
+ wm.error("Can't configure MSD:<br>", http.responseText);
}
});
};
@@ -168,11 +164,9 @@ export function Msd() {
};
var __clickConnectButton = function(connected) {
- let http = tools.makeRequest("POST", `/api/msd/set_connected?connected=${connected}`, function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error("Switch error:<br>", http.responseText);
- }
+ tools.httpPost(`/api/msd/set_connected?connected=${connected}`, function(http) {
+ if (http.status !== 200) {
+ wm.error("Switch error:<br>", http.responseText);
}
__applyState();
});
@@ -183,11 +177,9 @@ export function Msd() {
var __clickResetButton = function() {
wm.confirm("Are you sure you want to reset Mass Storage Drive?").then(function(ok) {
if (ok) {
- let http = tools.makeRequest("POST", "/api/msd/reset", function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error("MSD reset error:<br>", http.responseText);
- }
+ tools.httpPost("/api/msd/reset", function(http) {
+ if (http.status !== 200) {
+ wm.error("MSD reset error:<br>", http.responseText);
}
__applyState();
});
diff --git a/web/share/js/kvm/ocr.js b/web/share/js/kvm/ocr.js
index b3828807..94c9d563 100644
--- a/web/share/js/kvm/ocr.js
+++ b/web/share/js/kvm/ocr.js
@@ -167,17 +167,15 @@ export function Ocr(__getGeometry) {
url += `&ocr_left=${__selection.left}&ocr_top=${__selection.top}`;
url += `&ocr_right=${__selection.right}&ocr_bottom=${__selection.bottom}`;
- let http = tools.makeRequest("GET", url, function() {
- if (http.readyState === 4) {
- if (http.status === 200) {
- wm.copyTextToClipboard(http.responseText);
- } else {
- wm.error("OCR error:<br>", http.responseText);
- }
- tools.el.setEnabled($("stream-ocr-button"), true);
- tools.el.setEnabled($("stream-ocr-lang-selector"), true);
- $("stream-ocr-led").className = "led-gray";
+ tools.httpGet(url, function(http) {
+ if (http.status === 200) {
+ wm.copyTextToClipboard(http.responseText);
+ } else {
+ wm.error("OCR error:<br>", http.responseText);
}
+ tools.el.setEnabled($("stream-ocr-button"), true);
+ tools.el.setEnabled($("stream-ocr-lang-selector"), true);
+ $("stream-ocr-led").className = "led-gray";
}, null, null, 30000);
};
diff --git a/web/share/js/kvm/recorder.js b/web/share/js/kvm/recorder.js
index 0f32f66d..1ed340ec 100644
--- a/web/share/js/kvm/recorder.js
+++ b/web/share/js/kvm/recorder.js
@@ -280,30 +280,26 @@ export function Recorder() {
return;
} else if (event.event_type === "print") {
- let http = tools.makeRequest("POST", "/api/hid/print?limit=0", function() {
- if (http.readyState === 4) {
- if (http.status === 413) {
- wm.error("Too many text for paste!");
- __stopProcess();
- } else if (http.status !== 200) {
- wm.error("HID paste error:<br>", http.responseText);
- __stopProcess();
- } else if (http.status === 200) {
- __play_timer = setTimeout(() => __runEvents(index + 1, time), 0);
- }
+ tools.httpPost("/api/hid/print?limit=0", function(http) {
+ if (http.status === 413) {
+ wm.error("Too many text for paste!");
+ __stopProcess();
+ } else if (http.status !== 200) {
+ wm.error("HID paste error:<br>", http.responseText);
+ __stopProcess();
+ } else if (http.status === 200) {
+ __play_timer = setTimeout(() => __runEvents(index + 1, time), 0);
}
}, event.event.text, "text/plain");
return;
} else if (event.event_type === "atx_button") {
- let http = tools.makeRequest("POST", `/api/atx/click?button=${event.event.button}`, function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error("ATX error:<br>", http.responseText);
- __stopProcess();
- } else if (http.status === 200) {
- __play_timer = setTimeout(() => __runEvents(index + 1, time), 0);
- }
+ tools.httpPost(`/api/atx/click?button=${event.event.button}`, function(http) {
+ if (http.status !== 200) {
+ wm.error("ATX error:<br>", http.responseText);
+ __stopProcess();
+ } else if (http.status === 200) {
+ __play_timer = setTimeout(() => __runEvents(index + 1, time), 0);
}
});
return;
@@ -315,14 +311,12 @@ export function Recorder() {
} else { // gpio_pulse
path += `/pulse?channel=${event.event.channel}`;
}
- let http = tools.makeRequest("POST", path, function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error("GPIO error:<br>", http.responseText);
- __stopProcess();
- } else if (http.status === 200) {
- __play_timer = setTimeout(() => __runEvents(index + 1, time), 0);
- }
+ tools.httpPost(path, function(http) {
+ if (http.status !== 200) {
+ wm.error("GPIO error:<br>", http.responseText);
+ __stopProcess();
+ } else if (http.status === 200) {
+ __play_timer = setTimeout(() => __runEvents(index + 1, time), 0);
}
});
return;
diff --git a/web/share/js/kvm/session.js b/web/share/js/kvm/session.js
index f000e953..b0321eb7 100644
--- a/web/share/js/kvm/session.js
+++ b/web/share/js/kvm/session.js
@@ -275,23 +275,21 @@ export function Session() {
$("link-led").className = "led-yellow";
$("link-led").title = "Connecting...";
- let http = tools.makeRequest("GET", "/api/auth/check", function() {
- 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;
- __ws.onclose = __wsCloseHandler;
- } else if (http.status === 401 || http.status === 403) {
- window.onbeforeunload = () => null;
- wm.error("Unexpected logout occured, please login again").then(function() {
- document.location.href = "/login";
- });
- } else {
- __wsCloseHandler(null);
- }
+ tools.httpGet("/api/auth/check", function(http) {
+ 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;
+ __ws.onclose = __wsCloseHandler;
+ } else if (http.status === 401 || http.status === 403) {
+ window.onbeforeunload = () => null;
+ wm.error("Unexpected logout occured, please login again").then(function() {
+ document.location.href = "/login";
+ });
+ } else {
+ __wsCloseHandler(null);
}
});
};
diff --git a/web/share/js/kvm/stream.js b/web/share/js/kvm/stream.js
index 202379d7..b811a657 100644
--- a/web/share/js/kvm/stream.js
+++ b/web/share/js/kvm/stream.js
@@ -295,11 +295,9 @@ export function Streamer() {
wm.confirm("Are you sure you want to reset stream?").then(function (ok) {
if (ok) {
__resetStream();
- let http = tools.makeRequest("POST", "/api/streamer/reset", function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error("Can't reset stream:<br>", http.responseText);
- }
+ tools.httpPost("/api/streamer/reset", function(http) {
+ if (http.status !== 200) {
+ wm.error("Can't reset stream:<br>", http.responseText);
}
});
}
@@ -307,11 +305,9 @@ export function Streamer() {
};
var __sendParam = function(name, value) {
- let http = tools.makeRequest("POST", `/api/streamer/set_params?${name}=${value}`, function() {
- if (http.readyState === 4) {
- if (http.status !== 200) {
- wm.error("Can't configure stream:<br>", http.responseText);
- }
+ tools.httpPost(`/api/streamer/set_params?${name}=${value}`, function(http) {
+ if (http.status !== 200) {
+ wm.error("Can't configure stream:<br>", http.responseText);
}
});
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 21:13:46 +0000