mirror of
https://github.com/joshuadavidthomas/django-language-server.git
synced 2025-08-03 09:42:31 +00:00
create djls-tasks crate for easy background work (#12)
* create djls-tasks create for easy background work * fix notifier
This commit is contained in:
parent
1799355e27
commit
810a591420
7 changed files with 371 additions and 2 deletions
10
crates/djls-worker/Cargo.toml
Normal file
10
crates/djls-worker/Cargo.toml
Normal file
|
@ -0,0 +1,10 @@
|
|||
[package]
|
||||
name = "djls-worker"
|
||||
version = "0.0.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
anyhow = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
|
||||
async-trait = "0.1.83"
|
279
crates/djls-worker/src/lib.rs
Normal file
279
crates/djls-worker/src/lib.rs
Normal file
|
@ -0,0 +1,279 @@
|
|||
use anyhow::Result;
|
||||
use std::sync::Arc;
|
||||
use tokio::sync::{mpsc, oneshot};
|
||||
|
||||
pub trait Task: Send + 'static {
|
||||
type Output: Send + 'static;
|
||||
fn run(&self) -> Result<Self::Output>;
|
||||
}
|
||||
|
||||
struct WorkerInner {
|
||||
sender: mpsc::Sender<TaskMessage>,
|
||||
shutdown_sender: Option<oneshot::Sender<()>>,
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct Worker {
|
||||
inner: Arc<WorkerInner>,
|
||||
}
|
||||
|
||||
enum TaskMessage {
|
||||
Execute(Box<dyn TaskTrait>),
|
||||
WithResult(
|
||||
Box<dyn TaskTrait>,
|
||||
oneshot::Sender<Result<Box<dyn std::any::Any + Send>>>,
|
||||
),
|
||||
}
|
||||
|
||||
trait TaskTrait: Send {
|
||||
fn run_boxed(self: Box<Self>) -> Result<Box<dyn std::any::Any + Send>>;
|
||||
}
|
||||
|
||||
impl<T: Task> TaskTrait for T {
|
||||
fn run_boxed(self: Box<Self>) -> Result<Box<dyn std::any::Any + Send>> {
|
||||
self.run()
|
||||
.map(|output| Box::new(output) as Box<dyn std::any::Any + Send>)
|
||||
}
|
||||
}
|
||||
|
||||
impl Worker {
|
||||
pub fn new() -> Self {
|
||||
let (sender, mut receiver) = mpsc::channel(32);
|
||||
let (shutdown_tx, mut shutdown_rx) = oneshot::channel();
|
||||
|
||||
tokio::spawn(async move {
|
||||
loop {
|
||||
tokio::select! {
|
||||
Some(msg) = receiver.recv() => {
|
||||
match msg {
|
||||
TaskMessage::Execute(task) => {
|
||||
let _ = task.run_boxed();
|
||||
}
|
||||
TaskMessage::WithResult(task, sender) => {
|
||||
let result = task.run_boxed();
|
||||
let _ = sender.send(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
_ = &mut shutdown_rx => break,
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Self {
|
||||
inner: Arc::new(WorkerInner {
|
||||
sender,
|
||||
shutdown_sender: Some(shutdown_tx),
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn execute<T>(&self, task: T) -> Result<()>
|
||||
where
|
||||
T: Task + 'static,
|
||||
{
|
||||
self.inner
|
||||
.sender
|
||||
.try_send(TaskMessage::Execute(Box::new(task)))
|
||||
.map_err(|e| anyhow::anyhow!("Failed to execute task: {}", e))
|
||||
}
|
||||
|
||||
pub async fn submit<T>(&self, task: T) -> Result<()>
|
||||
where
|
||||
T: Task + 'static,
|
||||
{
|
||||
self.inner
|
||||
.sender
|
||||
.send(TaskMessage::Execute(Box::new(task)))
|
||||
.await
|
||||
.map_err(|e| anyhow::anyhow!("Failed to submit task: {}", e))
|
||||
}
|
||||
|
||||
pub async fn wait_for<T>(&self, task: T) -> Result<T::Output>
|
||||
where
|
||||
T: Task + 'static,
|
||||
{
|
||||
let (tx, rx) = oneshot::channel();
|
||||
|
||||
self.inner
|
||||
.sender
|
||||
.send(TaskMessage::WithResult(Box::new(task), tx))
|
||||
.await
|
||||
.map_err(|e| anyhow::anyhow!("Failed to send task: {}", e))?;
|
||||
|
||||
let result = rx
|
||||
.await
|
||||
.map_err(|e| anyhow::anyhow!("Failed to receive result: {}", e))??;
|
||||
|
||||
result
|
||||
.downcast()
|
||||
.map(|b| *b)
|
||||
.map_err(|_| anyhow::anyhow!("Failed to downcast result"))
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Worker {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for WorkerInner {
|
||||
fn drop(&mut self) {
|
||||
if let Some(sender) = self.shutdown_sender.take() {
|
||||
sender.send(()).ok();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use anyhow::anyhow;
|
||||
use std::time::Duration;
|
||||
use tokio::time::sleep;
|
||||
|
||||
struct TestTask(i32);
|
||||
|
||||
impl Task for TestTask {
|
||||
type Output = i32;
|
||||
|
||||
fn run(&self) -> Result<Self::Output> {
|
||||
Ok(self.0 * 2)
|
||||
}
|
||||
}
|
||||
|
||||
// Basic functionality tests
|
||||
#[tokio::test]
|
||||
async fn test_wait_for() {
|
||||
let worker = Worker::new();
|
||||
let result = worker.wait_for(TestTask(21)).await.unwrap();
|
||||
assert_eq!(result, 42);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_submit() {
|
||||
let worker = Worker::new();
|
||||
for i in 0..32 {
|
||||
assert!(worker.execute(TestTask(i)).is_ok());
|
||||
}
|
||||
assert!(worker.execute(TestTask(33)).is_err());
|
||||
assert!(worker.submit(TestTask(33)).await.is_ok());
|
||||
sleep(Duration::from_millis(50)).await;
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_execute() {
|
||||
let worker = Worker::new();
|
||||
assert!(worker.execute(TestTask(21)).is_ok());
|
||||
sleep(Duration::from_millis(50)).await;
|
||||
}
|
||||
|
||||
// Test channel backpressure
|
||||
#[tokio::test]
|
||||
async fn test_channel_backpressure() {
|
||||
let worker = Worker::new();
|
||||
|
||||
// Fill the channel (channel size is 32)
|
||||
for i in 0..32 {
|
||||
assert!(worker.execute(TestTask(i)).is_ok());
|
||||
}
|
||||
|
||||
// Next execute should fail
|
||||
assert!(worker.execute(TestTask(33)).is_err());
|
||||
|
||||
// But wait_for should eventually succeed
|
||||
let result = worker.wait_for(TestTask(33)).await.unwrap();
|
||||
assert_eq!(result, 66);
|
||||
}
|
||||
|
||||
// Test concurrent tasks
|
||||
#[tokio::test]
|
||||
async fn test_concurrent_tasks() {
|
||||
let worker = Worker::new();
|
||||
let mut handles = Vec::new();
|
||||
|
||||
// Spawn multiple concurrent tasks
|
||||
for i in 0..10 {
|
||||
let worker = worker.clone();
|
||||
let handle = tokio::spawn(async move {
|
||||
let result = worker.wait_for(TestTask(i)).await.unwrap();
|
||||
assert_eq!(result, i * 2);
|
||||
});
|
||||
handles.push(handle);
|
||||
}
|
||||
|
||||
// Wait for all tasks to complete
|
||||
for handle in handles {
|
||||
handle.await.unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
// Test shutdown behavior
|
||||
#[tokio::test]
|
||||
async fn test_shutdown() {
|
||||
{
|
||||
let worker = Worker::new();
|
||||
worker.execute(TestTask(1)).unwrap();
|
||||
worker.wait_for(TestTask(2)).await.unwrap();
|
||||
// Worker will be dropped here, triggering shutdown
|
||||
}
|
||||
sleep(Duration::from_millis(50)).await;
|
||||
}
|
||||
|
||||
// Test error handling
|
||||
struct ErrorTask;
|
||||
|
||||
impl Task for ErrorTask {
|
||||
type Output = (); // Unit type for error test
|
||||
|
||||
fn run(&self) -> Result<Self::Output> {
|
||||
Err(anyhow!("Task failed"))
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_error_handling() {
|
||||
let worker = Worker::new();
|
||||
|
||||
// Test error propagation
|
||||
assert!(worker.wait_for(ErrorTask).await.is_err());
|
||||
|
||||
// Test that worker continues to function after error
|
||||
let result = worker.wait_for(TestTask(21)).await.unwrap();
|
||||
assert_eq!(result, 42);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_worker_cloning() {
|
||||
let worker = Worker::new();
|
||||
let worker2 = worker.clone();
|
||||
|
||||
let (result1, result2) = tokio::join!(
|
||||
worker.wait_for(TestTask(21)),
|
||||
worker2.wait_for(TestTask(42))
|
||||
);
|
||||
|
||||
assert_eq!(result1.unwrap(), 42);
|
||||
assert_eq!(result2.unwrap(), 84);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_multiple_workers() {
|
||||
let worker = Worker::new();
|
||||
let mut handles = Vec::new();
|
||||
|
||||
for i in 0..10 {
|
||||
let worker = worker.clone();
|
||||
let handle = tokio::spawn(async move {
|
||||
let result = worker.wait_for(TestTask(i)).await.unwrap();
|
||||
assert_eq!(result, i * 2);
|
||||
});
|
||||
handles.push(handle);
|
||||
}
|
||||
|
||||
for handle in handles {
|
||||
handle.await.unwrap();
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue