0.1.1
This commit is contained in:
@@ -2,4 +2,5 @@
|
|||||||
|
|
||||||
0.0.1 - initial skel
|
0.0.1 - initial skel
|
||||||
0.0.2 - Socle conforme
|
0.0.2 - Socle conforme
|
||||||
0.1.0 - Transport WebSocket générique
|
0.1.0 - Transport WebSocket générique
|
||||||
|
0.1.1 = Intégration Tauri minimale du WsClient
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ members = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.1.0"
|
version = "0.1.1"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
repository = "https://git.sasedev.com/Sasedev/khadhroony-bobobot"
|
repository = "https://git.sasedev.com/Sasedev/khadhroony-bobobot"
|
||||||
|
|||||||
@@ -11,23 +11,50 @@
|
|||||||
<header class="app-header">
|
<header class="app-header">
|
||||||
<nav class="navbar navbar-expand-lg h-100 py-0 bg-light text-dark">
|
<nav class="navbar navbar-expand-lg h-100 py-0 bg-light text-dark">
|
||||||
<div class="container my-0">
|
<div class="container my-0">
|
||||||
<a class="navbar-brand d-flex align-items-center" href="/"> <img alt="Logo" src="imgs/logo.png" class="app-logo" /> <span class="ps-2 fs-4 fw-bold text-primary font-logo">Khadhroony-BoBot</span>
|
<a class="navbar-brand d-flex align-items-center" href="/">
|
||||||
|
<img alt="Logo" src="imgs/logo.png" class="app-logo" />
|
||||||
|
<span class="ps-2 fs-4 fw-bold text-primary font-logo">Khadhroony-BoBoBot</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<main class="app-main">
|
<main class="app-main">
|
||||||
<div class="osb-scrollable pt-1 pb-4" data-simplebar>
|
<div class="osb-scrollable pt-1 pb-4" data-simplebar>
|
||||||
<div class="container vcentered sketchy-translucid">
|
<div class="container vcentered sketchy-translucid">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-12 text-center">
|
<div class="col-lg-12 text-center">
|
||||||
<h1>Khadhroony-BoBoBot</h1>
|
<h1>Khadhroony-BoBoBot</h1>
|
||||||
|
|
||||||
<div class="container py-4">
|
<div class="container py-4">
|
||||||
<div class="row g-4">
|
<div class="row g-4 justify-content-center">
|
||||||
<div class="col-12 col-xl-4">
|
<div class="col-12 col-xl-8">
|
||||||
<div class="card shadow-sm border-0 h-100">
|
<div class="card shadow-sm border-0 h-100">
|
||||||
<div class="card-body text-start">
|
<div class="card-body text-start">
|
||||||
<h3 class="h5 card-title mb-3">Content</h3>
|
<div class="d-flex flex-column flex-md-row justify-content-between align-items-md-center gap-3 mb-3">
|
||||||
|
<div>
|
||||||
|
<h3 class="h5 card-title mb-1">WebSocket transport</h3>
|
||||||
|
<p class="text-body-secondary mb-0">
|
||||||
|
Démarre ou arrête tous les endpoints WebSocket activés dans <code>config.json</code>.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div class="d-flex align-items-center gap-2">
|
||||||
|
<span id="wsStatusBadge" class="badge text-bg-secondary">Disconnected</span>
|
||||||
|
<button id="wsConnectButton" class="btn btn-success" type="button">Start</button>
|
||||||
|
<button id="wsDisconnectButton" class="btn btn-danger" type="button" disabled>Stop</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-2">
|
||||||
|
<label for="wsLogTextarea" class="form-label fw-semibold">Transport log</label>
|
||||||
|
<textarea
|
||||||
|
id="wsLogTextarea"
|
||||||
|
class="form-control font-monospace"
|
||||||
|
rows="18"
|
||||||
|
readonly
|
||||||
|
spellcheck="false"
|
||||||
|
></textarea>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -38,6 +65,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<footer class="app-footer bg-dark text-light">
|
<footer class="app-footer bg-dark text-light">
|
||||||
<div class="container h-100 d-flex align-items-center">
|
<div class="container h-100 d-flex align-items-center">
|
||||||
<div class="row flex-grow-1 align-items-center">
|
<div class="row flex-grow-1 align-items-center">
|
||||||
@@ -45,7 +73,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
|
|
||||||
<script type="module" src="ts/main.ts" defer></script>
|
<script type="module" src="ts/main.ts" defer></script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
@@ -3,8 +3,8 @@
|
|||||||
import * as bootstrap from "bootstrap";
|
import * as bootstrap from "bootstrap";
|
||||||
import "simplebar";
|
import "simplebar";
|
||||||
import ResizeObserver from "resize-observer-polyfill";
|
import ResizeObserver from "resize-observer-polyfill";
|
||||||
//import { invoke } from "@tauri-apps/api/core";
|
import { invoke } from "@tauri-apps/api/core";
|
||||||
//import { listen, type UnlistenFn } from "@tauri-apps/api/event";
|
import { listen, type UnlistenFn } from "@tauri-apps/api/event";
|
||||||
//import { error } from "@fltsci/tauri-plugin-tracing";
|
//import { error } from "@fltsci/tauri-plugin-tracing";
|
||||||
//import { info } from "@fltsci/tauri-plugin-tracing";
|
//import { info } from "@fltsci/tauri-plugin-tracing";
|
||||||
import { trace, takeoverConsole } from "@fltsci/tauri-plugin-tracing";
|
import { trace, takeoverConsole } from "@fltsci/tauri-plugin-tracing";
|
||||||
@@ -12,7 +12,45 @@ import { trace, takeoverConsole } from "@fltsci/tauri-plugin-tracing";
|
|||||||
(window as Window & typeof globalThis & { bootstrap?: typeof bootstrap }).bootstrap = bootstrap;
|
(window as Window & typeof globalThis & { bootstrap?: typeof bootstrap }).bootstrap = bootstrap;
|
||||||
(window as Window & typeof globalThis & { ResizeObserver?: typeof ResizeObserver }).ResizeObserver = ResizeObserver;
|
(window as Window & typeof globalThis & { ResizeObserver?: typeof ResizeObserver }).ResizeObserver = ResizeObserver;
|
||||||
|
|
||||||
document.addEventListener("DOMContentLoaded", () => {
|
function appendLogLine(textarea: HTMLTextAreaElement, line: string): void {
|
||||||
|
const now = new Date();
|
||||||
|
const timestamp = now.toLocaleTimeString("fr-CH", { hour12: false });
|
||||||
|
textarea.value += `[${timestamp}] ${line}\n`;
|
||||||
|
textarea.scrollTop = textarea.scrollHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
function setRunningState(
|
||||||
|
isRunning: boolean,
|
||||||
|
statusBadge: HTMLSpanElement,
|
||||||
|
connectButton: HTMLButtonElement,
|
||||||
|
disconnectButton: HTMLButtonElement,
|
||||||
|
): void {
|
||||||
|
if (isRunning) {
|
||||||
|
statusBadge.textContent = "Connected";
|
||||||
|
statusBadge.className = "badge text-bg-success";
|
||||||
|
connectButton.disabled = true;
|
||||||
|
disconnectButton.disabled = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
statusBadge.textContent = "Disconnected";
|
||||||
|
statusBadge.className = "badge text-bg-secondary";
|
||||||
|
connectButton.disabled = false;
|
||||||
|
disconnectButton.disabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function setBusyState(
|
||||||
|
label: string,
|
||||||
|
statusBadge: HTMLSpanElement,
|
||||||
|
connectButton: HTMLButtonElement,
|
||||||
|
disconnectButton: HTMLButtonElement,
|
||||||
|
): void {
|
||||||
|
statusBadge.textContent = label;
|
||||||
|
statusBadge.className = "badge text-bg-warning";
|
||||||
|
connectButton.disabled = true;
|
||||||
|
disconnectButton.disabled = true;
|
||||||
|
}
|
||||||
|
document.addEventListener("DOMContentLoaded", async () => {
|
||||||
void takeoverConsole();
|
void takeoverConsole();
|
||||||
const sidebarToggle = document.querySelector<HTMLButtonElement>('#sidebarToggle');
|
const sidebarToggle = document.querySelector<HTMLButtonElement>('#sidebarToggle');
|
||||||
if (sidebarToggle) {
|
if (sidebarToggle) {
|
||||||
@@ -48,6 +86,61 @@ document.addEventListener("DOMContentLoaded", () => {
|
|||||||
a.setAttribute("href", url.pathname + "?" + url.searchParams.toString());
|
a.setAttribute("href", url.pathname + "?" + url.searchParams.toString());
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const connectButton = document.querySelector<HTMLButtonElement>("#wsConnectButton");
|
||||||
|
const disconnectButton = document.querySelector<HTMLButtonElement>("#wsDisconnectButton");
|
||||||
|
const statusBadge = document.querySelector<HTMLSpanElement>("#wsStatusBadge");
|
||||||
|
const logTextarea = document.querySelector<HTMLTextAreaElement>("#wsLogTextarea");
|
||||||
|
|
||||||
|
if (!connectButton || !disconnectButton || !statusBadge || !logTextarea) {
|
||||||
|
trace("main UI controls not found");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let unlistenLogEvent: UnlistenFn | null = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
unlistenLogEvent = await listen<string>("kb-log", (event) => {
|
||||||
|
appendLogLine(logTextarea, event.payload);
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
appendLogLine(logTextarea, `[ui] event listen error: ${String(error)}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
setRunningState(false, statusBadge, connectButton, disconnectButton);
|
||||||
|
appendLogLine(logTextarea, "[ui] main window loaded");
|
||||||
|
|
||||||
|
connectButton.addEventListener("click", async () => {
|
||||||
|
setBusyState("Starting", statusBadge, connectButton, disconnectButton);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const startedCount = await invoke<number>("start_ws_clients");
|
||||||
|
appendLogLine(logTextarea, `[ui] started ${startedCount} websocket client(s)`);
|
||||||
|
setRunningState(true, statusBadge, connectButton, disconnectButton);
|
||||||
|
} catch (error) {
|
||||||
|
appendLogLine(logTextarea, `[ui] start error: ${String(error)}`);
|
||||||
|
setRunningState(false, statusBadge, connectButton, disconnectButton);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
disconnectButton.addEventListener("click", async () => {
|
||||||
|
setBusyState("Stopping", statusBadge, connectButton, disconnectButton);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const stoppedCount = await invoke<number>("stop_ws_clients");
|
||||||
|
appendLogLine(logTextarea, `[ui] stopped ${stoppedCount} websocket client(s)`);
|
||||||
|
setRunningState(false, statusBadge, connectButton, disconnectButton);
|
||||||
|
} catch (error) {
|
||||||
|
appendLogLine(logTextarea, `[ui] stop error: ${String(error)}`);
|
||||||
|
setRunningState(true, statusBadge, connectButton, disconnectButton);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
window.addEventListener("beforeunload", () => {
|
||||||
|
if (unlistenLogEvent) {
|
||||||
|
unlistenLogEvent();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
trace("window loaded");
|
trace("window loaded");
|
||||||
|
|
||||||
});
|
});
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "kb-app",
|
"name": "kb-app",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.0.2",
|
"version": "0.1.1",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -15,6 +15,27 @@ pub use crate::splash::SplashOrder;
|
|||||||
use tauri::Emitter;
|
use tauri::Emitter;
|
||||||
use tauri::Manager;
|
use tauri::Manager;
|
||||||
|
|
||||||
|
/// Runtime state for started WebSocket clients.
|
||||||
|
struct KbWsRuntimeState {
|
||||||
|
clients: std::vec::Vec<kb_lib::WsClient>,
|
||||||
|
relay_tasks: std::vec::Vec<tauri::async_runtime::JoinHandle<()>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl KbWsRuntimeState {
|
||||||
|
fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
clients: std::vec::Vec::new(),
|
||||||
|
relay_tasks: std::vec::Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Shared application state stored inside Tauri.
|
||||||
|
struct KbAppState {
|
||||||
|
config: kb_lib::KbConfig,
|
||||||
|
ws_runtime: tokio::sync::Mutex<KbWsRuntimeState>,
|
||||||
|
}
|
||||||
|
|
||||||
/// Runs the desktop application.
|
/// Runs the desktop application.
|
||||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||||
pub fn run() {
|
pub fn run() {
|
||||||
@@ -49,8 +70,15 @@ pub fn run() {
|
|||||||
environment = %config.app.environment,
|
environment = %config.app.environment,
|
||||||
"starting desktop application"
|
"starting desktop application"
|
||||||
);
|
);
|
||||||
|
let app_state = KbAppState {
|
||||||
|
config: config.clone(),
|
||||||
|
ws_runtime: tokio::sync::Mutex::new(KbWsRuntimeState::new()),
|
||||||
|
};
|
||||||
let tracing_builder = tauri_plugin_tracing::Builder::new();
|
let tracing_builder = tauri_plugin_tracing::Builder::new();
|
||||||
let mut tauri_builder = tauri::Builder::default();
|
let mut tauri_builder = tauri::Builder::default();
|
||||||
|
tauri_builder = tauri_builder.manage(app_state);
|
||||||
|
tauri_builder =
|
||||||
|
tauri_builder.invoke_handler(tauri::generate_handler![start_ws_clients, stop_ws_clients]);
|
||||||
tauri_builder = tauri_builder.plugin(tracing_builder.build::<tauri::Wry>());
|
tauri_builder = tauri_builder.plugin(tracing_builder.build::<tauri::Wry>());
|
||||||
tauri_builder = tauri_builder.setup(|app| {
|
tauri_builder = tauri_builder.setup(|app| {
|
||||||
let app_handle = app.handle().clone();
|
let app_handle = app.handle().clone();
|
||||||
@@ -143,3 +171,234 @@ fn emit_splash_order(
|
|||||||
tracing::error!("error emitting splash event '{order}': {error:?}");
|
tracing::error!("error emitting splash event '{order}': {error:?}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn start_ws_clients(
|
||||||
|
app_handle: tauri::AppHandle,
|
||||||
|
state: tauri::State<'_, KbAppState>,
|
||||||
|
) -> Result<usize, std::string::String> {
|
||||||
|
{
|
||||||
|
let runtime_guard = state.ws_runtime.lock().await;
|
||||||
|
if !runtime_guard.clients.is_empty() {
|
||||||
|
return Err("websocket clients are already running".to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let enabled_endpoints: std::vec::Vec<kb_lib::KbWsEndpointConfig> = state
|
||||||
|
.config
|
||||||
|
.solana
|
||||||
|
.ws_endpoints
|
||||||
|
.iter()
|
||||||
|
.filter(|endpoint| endpoint.enabled)
|
||||||
|
.cloned()
|
||||||
|
.collect();
|
||||||
|
if enabled_endpoints.is_empty() {
|
||||||
|
return Err("no enabled websocket endpoint found in config.json".to_string());
|
||||||
|
}
|
||||||
|
kb_emit_app_log(
|
||||||
|
&app_handle,
|
||||||
|
&format!(
|
||||||
|
"[app] starting {} websocket client(s)",
|
||||||
|
enabled_endpoints.len()
|
||||||
|
),
|
||||||
|
);
|
||||||
|
let mut started_clients: std::vec::Vec<kb_lib::WsClient> = std::vec::Vec::new();
|
||||||
|
let mut relay_tasks: std::vec::Vec<tauri::async_runtime::JoinHandle<()>> = std::vec::Vec::new();
|
||||||
|
for endpoint in enabled_endpoints {
|
||||||
|
kb_emit_app_log(
|
||||||
|
&app_handle,
|
||||||
|
&format!(
|
||||||
|
"[app] preparing websocket endpoint '{}' ({})",
|
||||||
|
endpoint.name, endpoint.url
|
||||||
|
),
|
||||||
|
);
|
||||||
|
let client_result = kb_lib::WsClient::new(endpoint.clone());
|
||||||
|
let client = match client_result {
|
||||||
|
Ok(client) => client,
|
||||||
|
Err(error) => {
|
||||||
|
kb_shutdown_started_clients(&started_clients, &mut relay_tasks).await;
|
||||||
|
return Err(format!(
|
||||||
|
"cannot create websocket client for endpoint '{}': {}",
|
||||||
|
endpoint.name, error
|
||||||
|
));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let mut event_receiver = client.subscribe_events();
|
||||||
|
let relay_app_handle = app_handle.clone();
|
||||||
|
let relay_task = tauri::async_runtime::spawn(async move {
|
||||||
|
loop {
|
||||||
|
let recv_result = event_receiver.recv().await;
|
||||||
|
match recv_result {
|
||||||
|
Ok(event) => {
|
||||||
|
let line = kb_format_ws_event(&event);
|
||||||
|
kb_emit_app_log(&relay_app_handle, &line);
|
||||||
|
}
|
||||||
|
Err(tokio::sync::broadcast::error::RecvError::Lagged(skipped)) => {
|
||||||
|
kb_emit_app_log(
|
||||||
|
&relay_app_handle,
|
||||||
|
&format!(
|
||||||
|
"[ws] event receiver lagged and skipped {} message(s)",
|
||||||
|
skipped
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Err(tokio::sync::broadcast::error::RecvError::Closed) => {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let connect_result = client.connect().await;
|
||||||
|
if let Err(error) = connect_result {
|
||||||
|
relay_task.abort();
|
||||||
|
kb_shutdown_started_clients(&started_clients, &mut relay_tasks).await;
|
||||||
|
return Err(format!(
|
||||||
|
"cannot connect websocket client for endpoint '{}': {}",
|
||||||
|
endpoint.name, error
|
||||||
|
));
|
||||||
|
}
|
||||||
|
started_clients.push(client);
|
||||||
|
relay_tasks.push(relay_task);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
let mut runtime_guard = state.ws_runtime.lock().await;
|
||||||
|
if !runtime_guard.clients.is_empty() {
|
||||||
|
kb_shutdown_started_clients(&started_clients, &mut relay_tasks).await;
|
||||||
|
return Err("websocket clients were started concurrently".to_string());
|
||||||
|
}
|
||||||
|
runtime_guard.clients = started_clients;
|
||||||
|
runtime_guard.relay_tasks = relay_tasks;
|
||||||
|
}
|
||||||
|
let started_count = {
|
||||||
|
let runtime_guard = state.ws_runtime.lock().await;
|
||||||
|
runtime_guard.clients.len()
|
||||||
|
};
|
||||||
|
kb_emit_app_log(
|
||||||
|
&app_handle,
|
||||||
|
&format!("[app] {} websocket client(s) started", started_count),
|
||||||
|
);
|
||||||
|
Ok(started_count)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn stop_ws_clients(
|
||||||
|
app_handle: tauri::AppHandle,
|
||||||
|
state: tauri::State<'_, KbAppState>,
|
||||||
|
) -> Result<usize, std::string::String> {
|
||||||
|
let (clients, mut relay_tasks) = {
|
||||||
|
let mut runtime_guard = state.ws_runtime.lock().await;
|
||||||
|
(
|
||||||
|
std::mem::take(&mut runtime_guard.clients),
|
||||||
|
std::mem::take(&mut runtime_guard.relay_tasks),
|
||||||
|
)
|
||||||
|
};
|
||||||
|
if clients.is_empty() {
|
||||||
|
kb_emit_app_log(&app_handle, "[app] websocket clients are already stopped");
|
||||||
|
return Ok(0);
|
||||||
|
}
|
||||||
|
kb_emit_app_log(
|
||||||
|
&app_handle,
|
||||||
|
&format!("[app] stopping {} websocket client(s)", clients.len()),
|
||||||
|
);
|
||||||
|
let stopped_count = clients.len();
|
||||||
|
for client in &clients {
|
||||||
|
let disconnect_result = client.disconnect().await;
|
||||||
|
if let Err(error) = disconnect_result {
|
||||||
|
kb_emit_app_log(
|
||||||
|
&app_handle,
|
||||||
|
&format!(
|
||||||
|
"[app] disconnect error for endpoint '{}': {}",
|
||||||
|
client.endpoint_name(),
|
||||||
|
error
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for relay_task in relay_tasks.drain(..) {
|
||||||
|
relay_task.abort();
|
||||||
|
}
|
||||||
|
kb_emit_app_log(
|
||||||
|
&app_handle,
|
||||||
|
&format!("[app] {} websocket client(s) stopped", stopped_count),
|
||||||
|
);
|
||||||
|
Ok(stopped_count)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn kb_emit_app_log(app_handle: &tauri::AppHandle, message: &str) {
|
||||||
|
let emit_result = app_handle.emit("kb-log", message.to_string());
|
||||||
|
if let Err(error) = emit_result {
|
||||||
|
tracing::error!("error emitting app log event: {error:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn kb_format_ws_event(event: &kb_lib::WsEvent) -> std::string::String {
|
||||||
|
match event {
|
||||||
|
kb_lib::WsEvent::Connected {
|
||||||
|
endpoint_name,
|
||||||
|
endpoint_url,
|
||||||
|
} => {
|
||||||
|
format!("[ws:{endpoint_name}] connected to {endpoint_url}")
|
||||||
|
}
|
||||||
|
kb_lib::WsEvent::TextMessage {
|
||||||
|
endpoint_name,
|
||||||
|
text,
|
||||||
|
} => {
|
||||||
|
format!("[ws:{endpoint_name}] text: {text}")
|
||||||
|
}
|
||||||
|
kb_lib::WsEvent::BinaryMessage {
|
||||||
|
endpoint_name,
|
||||||
|
data,
|
||||||
|
} => {
|
||||||
|
format!("[ws:{endpoint_name}] binary message ({} bytes)", data.len())
|
||||||
|
}
|
||||||
|
kb_lib::WsEvent::Ping {
|
||||||
|
endpoint_name,
|
||||||
|
data,
|
||||||
|
} => {
|
||||||
|
format!("[ws:{endpoint_name}] ping ({} bytes)", data.len())
|
||||||
|
}
|
||||||
|
kb_lib::WsEvent::Pong {
|
||||||
|
endpoint_name,
|
||||||
|
data,
|
||||||
|
} => {
|
||||||
|
format!("[ws:{endpoint_name}] pong ({} bytes)", data.len())
|
||||||
|
}
|
||||||
|
kb_lib::WsEvent::CloseReceived {
|
||||||
|
endpoint_name,
|
||||||
|
code,
|
||||||
|
reason,
|
||||||
|
} => {
|
||||||
|
format!(
|
||||||
|
"[ws:{endpoint_name}] close received code={:?} reason={:?}",
|
||||||
|
code, reason
|
||||||
|
)
|
||||||
|
}
|
||||||
|
kb_lib::WsEvent::Disconnected { endpoint_name } => {
|
||||||
|
format!("[ws:{endpoint_name}] disconnected")
|
||||||
|
}
|
||||||
|
kb_lib::WsEvent::Error {
|
||||||
|
endpoint_name,
|
||||||
|
error,
|
||||||
|
} => {
|
||||||
|
format!("[ws:{endpoint_name}] error: {error}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn kb_shutdown_started_clients(
|
||||||
|
started_clients: &[kb_lib::WsClient],
|
||||||
|
relay_tasks: &mut std::vec::Vec<tauri::async_runtime::JoinHandle<()>>,
|
||||||
|
) {
|
||||||
|
for client in started_clients {
|
||||||
|
let disconnect_result = client.disconnect().await;
|
||||||
|
if let Err(error) = disconnect_result {
|
||||||
|
tracing::error!(
|
||||||
|
endpoint_name = %client.endpoint_name(),
|
||||||
|
"cleanup disconnect error: {}",
|
||||||
|
error
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for relay_task in relay_tasks.drain(..) {
|
||||||
|
relay_task.abort();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "kb-bapp",
|
"productName": "kb-bapp",
|
||||||
"version": "0.0.2",
|
"version": "0.1.1",
|
||||||
"identifier": "com.sasedev.kb-app",
|
"identifier": "com.sasedev.kb-app",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
|
|||||||
Reference in New Issue
Block a user