Merge pull request #90 from tsirysndr/feat/graphql-subscriptions

feat: use graphql subscriptions

Author: tsirysndr

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "music-player"
-version = "0.2.0-alpha.5"
+version = "0.2.0-alpha.6"
 edition = "2021"
 repository = "https://github.com/tsirysndr/music-player"
 license = "MIT"
@@ -40,7 +40,7 @@ version = "0.1.9"
 
 [dependencies.music-player-playback]
 path = "playback"
-version = "0.1.5"
+version = "0.1.6"
 
 [dependencies.music-player-scanner]
 path = "scanner"
@@ -76,15 +76,15 @@ version = "0.1.1"
 
 [dependencies.music-player-webui]
 path = "webui"
-version = "0.1.6"
+version = "0.1.7"
 
 [dependencies.music-player-discovery]
 path = "discovery"
 version = "0.1.0"
 
 [dependencies.music-player-graphql]
 path = "graphql"
-version = "0.1.2"
+version = "0.1.3"
 
 [dependencies.music-player-types]
 path = "types"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "music-player-graphql"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 repository = "https://github.com/tsirysndr/music-player"
 license = "MIT"
@@ -49,3 +49,7 @@ sea-orm = { version = "0.9.3", features = ["runtime-tokio-rustls", "sqlx-sqlite"
 rand = "0.8.5"
 cuid = "1.2.0"
 chrono = "0.4.23"
+futures-util = "0.3.25"
+futures-channel = "0.3.25"
+once_cell = "1.16.0"
+slab = "0.4.7"

graphql/Cargo.toml

@@ -1,6 +1,7 @@
-use async_graphql::{EmptySubscription, Schema};
-use schema::{Mutation, Query};
+use async_graphql::Schema;
+use schema::{Mutation, Query, Subscription};
 
 pub mod schema;
+pub mod simple_broker;
 
-pub type MusicPlayerSchema = Schema<Query, Mutation, EmptySubscription>;
+pub type MusicPlayerSchema = Schema<Query, Mutation, Subscription>;

graphql/src/lib.rs

@@ -1,11 +1,11 @@
-use async_graphql::MergedObject;
+use async_graphql::{Enum, MergedObject, MergedSubscription};
 
 use self::{
     library::{LibraryMutation, LibraryQuery},
     mixer::{MixerMutation, MixerQuery},
-    playback::{PlaybackMutation, PlaybackQuery},
-    playlist::{PlaylistMutation, PlaylistQuery},
-    tracklist::{TracklistMutation, TracklistQuery},
+    playback::{PlaybackMutation, PlaybackQuery, PlaybackSubscription},
+    playlist::{PlaylistMutation, PlaylistQuery, PlaylistSubscription},
+    tracklist::{TracklistMutation, TracklistQuery, TracklistSubscription},
 };
 
 pub mod addons;
@@ -35,3 +35,20 @@ pub struct Mutation(
     PlaylistMutation,
     TracklistMutation,
 );
+
+#[derive(MergedSubscription, Default)]
+pub struct Subscription(
+    PlaybackSubscription,
+    PlaylistSubscription,
+    TracklistSubscription,
+);
+
+#[derive(Enum, Eq, PartialEq, Copy, Clone)]
+pub enum MutationType {
+    Created,
+    Cleared,
+    Deleted,
+    Renamed,
+    Moved,
+    Updated,
+}

graphql/src/schema/mod.rs

@@ -3,6 +3,7 @@ pub mod artist;
 pub mod current_track;
 pub mod folder;
 pub mod lyrics;
+pub mod player_state;
 pub mod playlist;
 pub mod search_result;
 pub mod track;

graphql/src/schema/objects/mod.rs

@@ -0,0 +1,23 @@
+use async_graphql::*;
+
+#[derive(Default, Clone)]
+pub struct PlayerState {
+    pub index: u32,
+    pub position_ms: u32,
+    pub is_playing: bool,
+}
+
+#[Object]
+impl PlayerState {
+    async fn index(&self) -> u32 {
+        self.index
+    }
+
+    async fn position_ms(&self) -> u32 {
+        self.position_ms
+    }
+
+    async fn is_playing(&self) -> bool {
+        self.is_playing
+    }
+}

graphql/src/schema/objects/player_state.rs

@@ -1,11 +1,16 @@
 use std::sync::Arc;
 
 use async_graphql::*;
+use futures_util::{lock::Mutex, Stream};
 use music_player_playback::player::PlayerCommand;
-use music_player_tracklist::Tracklist;
-use tokio::sync::{mpsc::UnboundedSender, Mutex};
+use music_player_tracklist::{PlaybackState, Tracklist};
+use tokio::sync::mpsc::UnboundedSender;
 
-use super::objects::current_track::CurrentlyPlayingSong;
+use crate::simple_broker::SimpleBroker;
+
+use super::objects::{
+    current_track::CurrentlyPlayingSong, player_state::PlayerState, track::Track,
+};
 
 #[derive(Default)]
 pub struct PlaybackQuery;
@@ -50,7 +55,7 @@ impl PlaybackQuery {
         })
     }
 
-    async fn get_playback_state(&self, ctx: &Context<'_>) -> bool {
+    async fn get_player_state(&self, ctx: &Context<'_>) -> PlayerState {
         let _tracklist = ctx.data::<Arc<Mutex<Tracklist>>>().unwrap();
         todo!()
     }
@@ -133,3 +138,33 @@ impl PlaybackMutation {
         Ok(true)
     }
 }
+
+#[derive(Clone)]
+pub struct PositionMilliseconds {
+    pub position_ms: u32,
+}
+
+#[Object]
+impl PositionMilliseconds {
+    async fn position_ms(&self) -> u32 {
+        self.position_ms
+    }
+}
+
+#[derive(Default)]
+pub struct PlaybackSubscription;
+
+#[Subscription]
+impl PlaybackSubscription {
+    async fn player_state(&self) -> impl Stream<Item = PlayerState> {
+        SimpleBroker::<PlayerState>::subscribe()
+    }
+
+    async fn currently_playing_song(&self) -> impl Stream<Item = Track> {
+        SimpleBroker::<Track>::subscribe()
+    }
+
+    async fn track_time_position(&self) -> impl Stream<Item = PositionMilliseconds> {
+        SimpleBroker::<PositionMilliseconds>::subscribe()
+    }
+}