Basic webui works

This commit is contained in:
Igor Katson 2023-11-20 20:15:40 +00:00
parent 1585a7e04a
commit 88ca5960df
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
7 changed files with 574 additions and 10 deletions

View file

@ -13,6 +13,7 @@ readme = "README.md"
[features]
default = ["sha1-system", "default-tls"]
webui = []
timed_existence = []
sha1-system = ["sha1w/sha1-system"]
sha1-openssl = ["sha1w/sha1-openssl"]

View file

@ -118,7 +118,7 @@ impl HttpApi {
state.api_peer_stats(idx, filter).map(axum::Json)
}
let app = Router::new()
let mut app = Router::new()
.route("/", get(api_root))
.route("/dht/stats", get(dht_stats))
.route("/dht/table", get(dht_table))
@ -126,19 +126,55 @@ impl HttpApi {
.route("/torrents/:id", get(torrent_details))
.route("/torrents/:id/haves", get(torrent_haves))
.route("/torrents/:id/stats", get(torrent_stats))
.route("/torrents/:id/peer_stats", get(peer_stats))
.layer(
tower_http::cors::CorsLayer::default()
.allow_origin(AllowOrigin::predicate(|_, _| true))
.allow_headers(AllowHeaders::any()),
)
.route("/torrents/:id/peer_stats", get(peer_stats));
#[cfg(feature = "webui")]
{
let webui_router = Router::new()
.route(
"/",
get(|| async {
(
[("Content-Type", "text/html")],
include_str!("../webui/index.html"),
)
}),
)
.route(
"/app.js",
get(|| async {
(
[("Content-Type", "application/javascript")],
include_str!("../webui/app.js"),
)
}),
);
let cors_layer = {
#[cfg(debug_assertions)]
{
tower_http::cors::CorsLayer::default()
.allow_origin(AllowOrigin::predicate(|_, _| true))
.allow_headers(AllowHeaders::any())
}
#[cfg(not(debug_assertions))]
{
tower_http::cors::CorsLayer::default()
}
};
app = app.nest("/web/", webui_router).layer(cors_layer);
}
let app = app
.layer(tower_http::trace::TraceLayer::new_for_http())
.with_state(state);
.with_state(state)
.into_make_service();
info!("starting HTTP server on {}", addr);
axum::Server::try_bind(&addr)
.with_context(|| format!("error binding to {addr}"))?
.serve(app.into_make_service())
.serve(app)
.await?;
Ok(())
}

View file

@ -0,0 +1,212 @@
// Define API URL and base path
const apiUrl = window.origin == null ? 'http://localhost:3030' : '';
// Helper function for making API requests (async/await)
async function makeRequest(method, path, data) {
const url = apiUrl + path;
const options = {
method,
headers: {
'Accept': 'application/json',
},
body: data,
};
try {
const response = await fetch(url, options);
if (!response.ok) {
const errorBody = await response.text();
try {
const json = JSON.parse(errorBody);
displayApiError({
status: response.status,
statusText: response.statusText,
body: json.human_readable !== undefined ? json.human_readable : errorBody,
});
}
catch (e) {
displayApiError({
status: response.status,
statusText: response.statusText,
body: errorBody,
});
}
return Promise.reject(errorBody);
}
const result = await response.json();
return result;
}
catch (error) {
console.error(error);
displayApiError({
status: error.status,
statusText: error.statusText,
body: error.toString(),
});
return Promise.reject(`Error: ${error.message}`);
}
}
// Helper function to display the API response
function displayResult(result) {
const outputDiv = document.getElementById('output');
if (outputDiv) {
outputDiv.innerHTML = `<pre>${result}</pre>`;
}
}
// Function to get detailed information about a torrent (async/await)
async function getTorrentDetails(index) {
return makeRequest('GET', `/torrents/${index}`);
}
// Function to get detailed statistics about a torrent (async/await)
async function getTorrentStats(index) {
return makeRequest('GET', `/torrents/${index}/stats`);
}
// Display function for listing all torrents with concise information (async/await)
async function displayTorrents() {
try {
const response = await makeRequest('GET', '/torrents');
const torrents = response.torrents;
// Create a container for all torrents using Bootstrap classes
const torrentsContainer = document.createElement('div');
torrentsContainer.classList.add('d-flex', 'flex-column', 'torrents-container');
for (const torrent of torrents) {
const detailsResponse = await getTorrentDetails(torrent.id);
const statsResponse = await getTorrentStats(torrent.id);
const totalBytes = detailsResponse.files.reduce((total, file) => total + file.length, 0);
const downloadedBytes = statsResponse.snapshot.have_bytes;
// Calculate download percentage
const downloadPercentage = (downloadedBytes / totalBytes) * 100;
// Create a container for each torrent using Bootstrap classes
const torrentContainer = document.createElement('div');
torrentContainer.classList.add('torrent-container', 'd-flex', 'flex-row', 'p-3', 'bg-light', 'rounded', 'mb-3');
// Display basic information about the torrent
const largestFileName = getLargestFileName(detailsResponse);
const downloadSpeed = statsResponse.download_speed.human_readable;
const eta = getCompletionETA(statsResponse);
// Create and append divs for concise information as columns
const nameColumn = createColumn('Name', largestFileName);
const sizeColumn = createColumn('Size', `${formatBytesToGB(totalBytes)} GB`);
const progressColumn = createColumnWithProgressBar('Progress', downloadPercentage);
const downloadSpeedColumn = createColumn('Download Speed', downloadSpeed);
const etaColumn = createColumn('ETA', eta);
// Append columns to the torrent container
torrentContainer.appendChild(nameColumn);
torrentContainer.appendChild(sizeColumn);
torrentContainer.appendChild(progressColumn);
torrentContainer.appendChild(downloadSpeedColumn);
torrentContainer.appendChild(etaColumn);
// Append the torrent container to the torrentsContainer
torrentsContainer.appendChild(torrentContainer);
}
// Replace the old content with the new one
const outputDiv = document.getElementById('output');
if (outputDiv) {
outputDiv.innerHTML = '';
outputDiv.appendChild(torrentsContainer);
}
}
catch (error) {
console.error(error);
}
}
// Function to create a column div
function createColumn(label, value) {
const columnDiv = document.createElement('div');
columnDiv.classList.add('me-3', 'p-2');
columnDiv.innerHTML = `<p class="font-weight-bold">${label}</p><p>${value}</p>`;
return columnDiv;
}
// Function to create a column div with a progress bar
function createColumnWithProgressBar(label, percentage) {
const columnDiv = document.createElement('div');
columnDiv.classList.add('column', 'me-3', 'p-2');
columnDiv.innerHTML = `
<p class="font-weight-bold">${label}</p>
<div class="progress mb-1">
<div class="progress-bar" role="progressbar" style="width: ${percentage}%;"></div>
</div>
<p class="mb-1">${percentage.toFixed(2)}%</p>`;
return columnDiv;
}
// Function to format bytes to GB
function formatBytesToGB(bytes) {
const GB = bytes / (1024 * 1024 * 1024);
return GB.toFixed(2);
}
// Function to get the name of the largest file in a torrent
function getLargestFileName(torrentDetails) {
const largestFile = torrentDetails.files.reduce((prev, current) => (prev.length > current.length) ? prev : current);
return largestFile.name;
}
// Function to get the completion ETA of a torrent
function getCompletionETA(stats) {
if (stats.time_remaining) {
return stats.time_remaining.human_readable;
}
else {
return 'N/A';
}
}
// Helper function to display API errors in an alert
function displayApiError(error) {
const errorAlert = document.getElementById('error-alert');
if (errorAlert) {
errorAlert.innerHTML = `
<div class="alert alert-danger alert-dismissible fade show" role="alert">
<strong>Error ${error.status}:</strong> ${error.statusText}<br>
${error.body}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close" onclick="clearErrorAlert()"></button>
</div>
`;
}
}
// Helper function to clear the error alert
function clearErrorAlert() {
const errorAlert = document.getElementById('error-alert');
if (errorAlert) {
errorAlert.innerHTML = ''; // Clear the content
}
}
// List all torrents on page load and set up auto-refresh
async function init() {
try {
await displayTorrents();
autoRefreshTorrents(5000); // Set the interval (in milliseconds), e.g., 5000 for every 5 seconds
}
catch (error) {
console.error(error);
}
}
// Function to refresh torrents at a specified interval
function autoRefreshTorrents(interval) {
setInterval(async () => {
await displayTorrents();
}, interval);
}
// Function to add a torrent from a magnet link
async function addTorrentFromMagnet() {
const magnetLink = prompt('Enter magnet link:');
if (magnetLink) {
await makeRequest('POST', '/torrents?overwrite=true', magnetLink);
await displayTorrents(); // Refresh the torrent list after adding a new torrent
}
}
// Function to handle file input change
async function handleFileInputChange() {
const fileInput = document.getElementById('file-input');
const file = fileInput.files?.[0];
if (file) {
await makeRequest('POST', '/torrents?overwrite=true', file);
await displayTorrents(); // Refresh the torrent list after adding a new torrent
}
}
// Add event listeners for buttons
document.getElementById('add-magnet-button')?.addEventListener('click', addTorrentFromMagnet);
// Update the event listener for the file input button
const fileInputButton = document.getElementById('upload-file-button');
fileInputButton?.addEventListener('click', () => {
const fileInput = document.getElementById('file-input');
fileInput.click();
});
document.getElementById('file-input')?.addEventListener('change', handleFileInputChange);
// Call init function on page load
document.addEventListener('DOMContentLoaded', init);

View file

@ -0,0 +1,274 @@
// Define API URL and base path
const apiUrl = 'http://localhost:3030';
// Interface for the Torrent API response
interface Torrent {
id: number;
info_hash: string;
}
// Interface for the Torrent Details API response
interface TorrentDetails {
files: {
name: string;
length: number;
included: boolean;
}[];
}
// Interface for the Torrent Stats API response
interface TorrentStats {
snapshot: {
have_bytes: number;
remaining_bytes: number;
};
download_speed: {
mbps: number;
human_readable: string;
};
time_remaining?: {
human_readable: string;
};
}
// Interface for the API error response
interface ApiError {
status: number;
statusText: string;
body: string;
}
// Helper function for making API requests (async/await)
async function makeRequest(method: string, path: string, data?: any): Promise<any> {
const url = apiUrl + path;
const options: RequestInit = {
method,
headers: {
'Accept': 'application/json',
},
body: data,
};
try {
const response = await fetch(url, options);
if (!response.ok) {
const errorBody = await response.text();
try {
const json = JSON.parse(errorBody);
displayApiError({
status: response.status,
statusText: response.statusText,
body: json.human_readable !== undefined ? json.human_readable : errorBody,
});
} catch (e) {
displayApiError({
status: response.status,
statusText: response.statusText,
body: errorBody,
});
}
return Promise.reject(errorBody);
}
const result = await response.json();
return result;
} catch (error) {
console.error(error);
displayApiError({
status: error.status,
statusText: error.statusText,
body: error.toString(),
});
return Promise.reject(`Error: ${error.message}`);
}
}
// Helper function to display the API response
function displayResult(result: string): void {
const outputDiv = document.getElementById('output');
if (outputDiv) {
outputDiv.innerHTML = `<pre>${result}</pre>`;
}
}
// Function to get detailed information about a torrent (async/await)
async function getTorrentDetails(index: number): Promise<TorrentDetails> {
return makeRequest('GET', `/torrents/${index}`);
}
// Function to get detailed statistics about a torrent (async/await)
async function getTorrentStats(index: number): Promise<TorrentStats> {
return makeRequest('GET', `/torrents/${index}/stats`);
}
// Display function for listing all torrents with concise information (async/await)
async function displayTorrents(): Promise<void> {
try {
const response = await makeRequest('GET', '/torrents');
const torrents: Torrent[] = response.torrents;
// Create a container for all torrents using Bootstrap classes
const torrentsContainer = document.createElement('div');
torrentsContainer.classList.add('d-flex', 'flex-column', 'torrents-container');
for (const torrent of torrents) {
const detailsResponse = await getTorrentDetails(torrent.id);
const statsResponse = await getTorrentStats(torrent.id);
const totalBytes = detailsResponse.files.reduce((total: number, file: any) => total + file.length, 0);
const downloadedBytes = statsResponse.snapshot.have_bytes;
// Calculate download percentage
const downloadPercentage = (downloadedBytes / totalBytes) * 100;
// Create a container for each torrent using Bootstrap classes
const torrentContainer = document.createElement('div');
torrentContainer.classList.add('torrent-container', 'd-flex', 'flex-row', 'p-3', 'bg-light', 'rounded', 'mb-3');
// Display basic information about the torrent
const largestFileName = getLargestFileName(detailsResponse);
const downloadSpeed = statsResponse.download_speed.human_readable;
const eta = getCompletionETA(statsResponse);
// Create and append divs for concise information as columns
const nameColumn = createColumn('Name', largestFileName);
const sizeColumn = createColumn('Size', `${formatBytesToGB(totalBytes)} GB`);
const progressColumn = createColumnWithProgressBar('Progress', downloadPercentage);
const downloadSpeedColumn = createColumn('Download Speed', downloadSpeed);
const etaColumn = createColumn('ETA', eta);
// Append columns to the torrent container
torrentContainer.appendChild(nameColumn);
torrentContainer.appendChild(sizeColumn);
torrentContainer.appendChild(progressColumn);
torrentContainer.appendChild(downloadSpeedColumn);
torrentContainer.appendChild(etaColumn);
// Append the torrent container to the torrentsContainer
torrentsContainer.appendChild(torrentContainer);
}
// Replace the old content with the new one
const outputDiv = document.getElementById('output');
if (outputDiv) {
outputDiv.innerHTML = '';
outputDiv.appendChild(torrentsContainer);
}
} catch (error) {
console.error(error);
}
}
// Function to create a column div
function createColumn(label: string, value: string): HTMLDivElement {
const columnDiv = document.createElement('div');
columnDiv.classList.add('me-3', 'p-2');
columnDiv.innerHTML = `<p class="font-weight-bold">${label}</p><p>${value}</p>`;
return columnDiv;
}
// Function to create a column div with a progress bar
function createColumnWithProgressBar(label: string, percentage: number): HTMLDivElement {
const columnDiv = document.createElement('div');
columnDiv.classList.add('column', 'me-3', 'p-2');
columnDiv.innerHTML = `
<p class="font-weight-bold">${label}</p>
<div class="progress mb-1">
<div class="progress-bar" role="progressbar" style="width: ${percentage}%;"></div>
</div>
<p class="mb-1">${percentage.toFixed(2)}%</p>`;
return columnDiv;
}
// Function to format bytes to GB
function formatBytesToGB(bytes: number): string {
const GB = bytes / (1024 * 1024 * 1024);
return GB.toFixed(2);
}
// Function to get the name of the largest file in a torrent
function getLargestFileName(torrentDetails: TorrentDetails): string {
const largestFile = torrentDetails.files.reduce((prev: any, current: any) => (prev.length > current.length) ? prev : current);
return largestFile.name;
}
// Function to get the completion ETA of a torrent
function getCompletionETA(stats: TorrentStats): string {
if (stats.time_remaining) {
return stats.time_remaining.human_readable;
} else {
return 'N/A';
}
}
// Helper function to display API errors in an alert
function displayApiError(error: ApiError): void {
const errorAlert = document.getElementById('error-alert');
if (errorAlert) {
errorAlert.innerHTML = `
<div class="alert alert-danger alert-dismissible fade show" role="alert">
<strong>Error ${error.status}:</strong> ${error.statusText}<br>
${error.body}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close" onclick="clearErrorAlert()"></button>
</div>
`;
}
}
// Helper function to clear the error alert
function clearErrorAlert(): void {
const errorAlert = document.getElementById('error-alert');
if (errorAlert) {
errorAlert.innerHTML = ''; // Clear the content
}
}
// List all torrents on page load and set up auto-refresh
async function init(): Promise<void> {
try {
await displayTorrents();
autoRefreshTorrents(5000); // Set the interval (in milliseconds), e.g., 5000 for every 5 seconds
} catch (error) {
console.error(error);
}
}
// Function to refresh torrents at a specified interval
function autoRefreshTorrents(interval: number): void {
setInterval(async () => {
await displayTorrents();
}, interval);
}
// Function to add a torrent from a magnet link
async function addTorrentFromMagnet(): Promise<void> {
const magnetLink = prompt('Enter magnet link:');
if (magnetLink) {
await makeRequest('POST', '/torrents?overwrite=true', magnetLink);
await displayTorrents(); // Refresh the torrent list after adding a new torrent
}
}
// Function to handle file input change
async function handleFileInputChange(): Promise<void> {
const fileInput = document.getElementById('file-input') as HTMLInputElement;
const file = fileInput.files?.[0];
if (file) {
await makeRequest('POST', '/torrents?overwrite=true', file);
await displayTorrents(); // Refresh the torrent list after adding a new torrent
}
}
// Add event listeners for buttons
document.getElementById('add-magnet-button')?.addEventListener('click', addTorrentFromMagnet);
// Update the event listener for the file input button
const fileInputButton = document.getElementById('upload-file-button');
fileInputButton?.addEventListener('click', () => {
const fileInput = document.getElementById('file-input') as HTMLInputElement;
fileInput.click();
});
document.getElementById('file-input')?.addEventListener('change', handleFileInputChange);
// Call init function on page load
document.addEventListener('DOMContentLoaded', init);

View file

@ -0,0 +1,31 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>rqbit web 0.0.1-alpha</title>
<!-- Include Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
</head>
<body>
<div id="app-container" class="container text-center">
<h1 class="mt-3 mb-4">rqbit web 0.0.1-alpha</h1>
<!-- Error Alert Container -->
<div id="error-alert"></div>
<div id="output" class="output-container"></div>
<div id="buttons-container" class="mt-3">
<button id="add-magnet-button" class="btn btn-primary mr-2">Add Torrent from Magnet Link</button>
<input type="file" id="file-input" accept=".torrent" style="display:none;">
<button id="upload-file-button" class="btn btn-secondary">Upload .torrent File</button>
</div>
</div>
<!-- Include Bootstrap JS and Popper.js (required for Bootstrap) -->
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
<script src="app.js"></script> <!-- Include your TypeScript compiled JS file here -->
</body>
</html>

View file

@ -0,0 +1,9 @@
{
"compilerOptions": {
"target": "ES2022",
"lib": [
"dom",
"es2015"
],
}
}

View file

@ -12,7 +12,8 @@ readme = "README.md"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[features]
default = ["sha1-system", "default-tls"]
default = ["sha1-system", "default-tls", "webui"]
webui = ["librqbit/webui"]
timed_existence = ["librqbit/timed_existence"]
sha1-system = ["librqbit/sha1-system"]
sha1-openssl = ["librqbit/sha1-openssl"]