Remove the legacy glib channel

Cargo.toml

@@ -32,6 +32,5 @@ members = [
     "sgf",
     "timezone-testing",
     "tree",
-    "visions/server",
+    "visions/server", "gm-dash/server"
-    "gm-dash/server"
 ]

bike-lights/core/src/animations/blinker.rs

@@ -0,0 +1,121 @@
+use fixed::types::U16F0;
+
+use crate::{
+    calculate_frames, Animation, BodyPattern, DashboardPattern, Fade, FadeDirection, Instant, BLINKER_FRAMES, LEFT_BLINKER_BODY, LEFT_BLINKER_DASHBOARD, OFF_BODY, OFF_DASHBOARD, RIGHT_BLINKER_BODY, RIGHT_BLINKER_DASHBOARD
+};
+
+pub enum BlinkerDirection {
+    Left,
+    Right,
+}
+
+pub struct Blinker {
+    transition: Fade,
+    fade_in: Fade,
+    fade_out: Fade,
+    direction: FadeDirection,
+
+    start_time: Instant,
+    frames: U16F0,
+}
+
+impl Blinker {
+    pub fn new(
+        starting_dashboard: DashboardPattern,
+        starting_body: BodyPattern,
+        direction: BlinkerDirection,
+        time: Instant,
+    ) -> Self {
+        let mut ending_dashboard = OFF_DASHBOARD.clone();
+
+        match direction {
+            BlinkerDirection::Left => {
+                ending_dashboard[0].r = LEFT_BLINKER_DASHBOARD[0].r;
+                ending_dashboard[0].g = LEFT_BLINKER_DASHBOARD[0].g;
+                ending_dashboard[0].b = LEFT_BLINKER_DASHBOARD[0].b;
+            }
+            BlinkerDirection::Right => {
+                ending_dashboard[2].r = RIGHT_BLINKER_DASHBOARD[2].r;
+                ending_dashboard[2].g = RIGHT_BLINKER_DASHBOARD[2].g;
+                ending_dashboard[2].b = RIGHT_BLINKER_DASHBOARD[2].b;
+            }
+        }
+
+        let mut ending_body = OFF_BODY.clone();
+        match direction {
+            BlinkerDirection::Left => {
+                for i in 0..30 {
+                    ending_body[i].r = LEFT_BLINKER_BODY[i].r;
+                    ending_body[i].g = LEFT_BLINKER_BODY[i].g;
+                    ending_body[i].b = LEFT_BLINKER_BODY[i].b;
+                }
+            }
+            BlinkerDirection::Right => {
+                for i in 30..60 {
+                    ending_body[i].r = RIGHT_BLINKER_BODY[i].r;
+                    ending_body[i].g = RIGHT_BLINKER_BODY[i].g;
+                    ending_body[i].b = RIGHT_BLINKER_BODY[i].b;
+                }
+            }
+        }
+
+        Blinker {
+            transition: Fade::new(
+                starting_dashboard.clone(),
+                starting_body.clone(),
+                ending_dashboard.clone(),
+                ending_body.clone(),
+                BLINKER_FRAMES,
+                time,
+            ),
+            fade_in: Fade::new(
+                OFF_DASHBOARD.clone(),
+                OFF_BODY.clone(),
+                ending_dashboard.clone(),
+                ending_body.clone(),
+                BLINKER_FRAMES,
+                time,
+            ),
+            fade_out: Fade::new(
+                ending_dashboard.clone(),
+                ending_body.clone(),
+                OFF_DASHBOARD.clone(),
+                OFF_BODY.clone(),
+                BLINKER_FRAMES,
+                time,
+            ),
+            direction: FadeDirection::Transition,
+            start_time: time,
+            frames: BLINKER_FRAMES,
+        }
+    }
+}
+
+impl Animation for Blinker {
+    fn tick(&mut self, time: Instant) -> (DashboardPattern, BodyPattern) {
+        let frames = calculate_frames(self.start_time.0, time.0);
+        if frames > self.frames {
+            match self.direction {
+                FadeDirection::Transition => {
+                    self.direction = FadeDirection::FadeOut;
+                    self.fade_out.start_time = time;
+                }
+                FadeDirection::FadeIn => {
+                    self.direction = FadeDirection::FadeOut;
+                    self.fade_out.start_time = time;
+                }
+                FadeDirection::FadeOut => {
+                    self.direction = FadeDirection::FadeIn;
+                    self.fade_in.start_time = time;
+                }
+            }
+            self.start_time = time;
+        }
+
+        match self.direction {
+            FadeDirection::Transition => self.transition.tick(time),
+            FadeDirection::FadeIn => self.fade_in.tick(time),
+            FadeDirection::FadeOut => self.fade_out.tick(time),
+        }
+    }
+}

bike-lights/core/src/animations/fade.rs

@@ -0,0 +1,100 @@
+use fixed::types::{I8F8, U16F0};
+
+use crate::{calculate_frames, calculate_slope, linear_ease, Animation, BodyPattern, DashboardPattern, Instant, OFF_BODY, OFF_DASHBOARD, RGB};
+
+pub struct Fade {
+    starting_dashboard: DashboardPattern,
+    starting_lights: BodyPattern,
+
+    pub start_time: Instant,
+    dashboard_slope: [RGB<I8F8>; 3],
+    body_slope: [RGB<I8F8>; 60],
+    frames: U16F0,
+}
+
+impl Fade {
+    pub fn new(
+        dashboard: DashboardPattern,
+        lights: BodyPattern,
+        ending_dashboard: DashboardPattern,
+        ending_lights: BodyPattern,
+        frames: U16F0,
+        time: Instant,
+    ) -> Self {
+        let mut dashboard_slope = [Default::default(); 3];
+        let mut body_slope = [Default::default(); 60];
+        for i in 0..3 {
+            let slope = RGB {
+                r: calculate_slope(dashboard[i].r, ending_dashboard[i].r, frames),
+                g: calculate_slope(dashboard[i].g, ending_dashboard[i].g, frames),
+                b: calculate_slope(dashboard[i].b, ending_dashboard[i].b, frames),
+            };
+            dashboard_slope[i] = slope;
+        }
+
+        for i in 0..60 {
+            let slope = RGB {
+                r: calculate_slope(lights[i].r, ending_lights[i].r, frames),
+                g: calculate_slope(lights[i].g, ending_lights[i].g, frames),
+                b: calculate_slope(lights[i].b, ending_lights[i].b, frames),
+            };
+            body_slope[i] = slope;
+        }
+
+        Self {
+            starting_dashboard: dashboard,
+            starting_lights: lights,
+            start_time: time,
+            dashboard_slope,
+            body_slope,
+            frames,
+        }
+    }
+}
+
+impl Animation for Fade {
+    fn tick(&mut self, time: Instant) -> (DashboardPattern, BodyPattern) {
+        let mut frames = calculate_frames(self.start_time.0, time.0);
+        if frames > self.frames {
+            frames = self.frames
+        }
+        let mut dashboard_pattern: DashboardPattern = OFF_DASHBOARD;
+        let mut body_pattern: BodyPattern = OFF_BODY;
+
+        for i in 0..3 {
+            dashboard_pattern[i].r = linear_ease(
+                self.starting_dashboard[i].r,
+                frames,
+                self.dashboard_slope[i].r,
+            );
+            dashboard_pattern[i].g = linear_ease(
+                self.starting_dashboard[i].g,
+                frames,
+                self.dashboard_slope[i].g,
+            );
+            dashboard_pattern[i].b = linear_ease(
+                self.starting_dashboard[i].b,
+                frames,
+                self.dashboard_slope[i].b,
+            );
+        }
+
+        for i in 0..60 {
+            body_pattern[i].r =
+                linear_ease(self.starting_lights[i].r, frames, self.body_slope[i].r);
+            body_pattern[i].g =
+                linear_ease(self.starting_lights[i].g, frames, self.body_slope[i].g);
+            body_pattern[i].b =
+                linear_ease(self.starting_lights[i].b, frames, self.body_slope[i].b);
+        }
+
+        (dashboard_pattern, body_pattern)
+    }
+}
+
+#[derive(Debug)]
+pub enum FadeDirection {
+    Transition,
+    FadeIn,
+    FadeOut,
+}

bike-lights/core/src/animations/flag_ripple.rs

@@ -0,0 +1,43 @@
+use crate::{Animation, BodyPattern, DashboardPattern, Instant};
+
+pub struct FlagRipple {
+    dashboard: DashboardPattern,
+    body: BodyPattern,
+
+    centers: [usize; 12],
+}
+
+impl FlagRipple {
+    fn new(dashboard: DashboardPattern, body: BodyPattern) -> Self {
+        Self {
+            dashboard,
+            body,
+            centers: [5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60],
+        }
+    }
+}
+
+impl Animation for FlagRipple {
+    fn tick(&mut self, time: Instant) -> (DashboardPattern, BodyPattern, Option<Animation>) {
+        // How does a flag ripple work? I think have some center points that are darker and have a
+        // bit of a darker pattern around them.
+
+        let mut body_pattern = self.body.clone();
+
+        for i in 0..60 {
+            if self.centers.contains(&i) {
+                body_pattern[i].r = self.body[i].r / 2;
+                body_pattern[i].g = self.body[i].g / 2;
+                body_pattern[i].b = self.body[i].b / 2;
+            } else {
+                body_pattern[i].r = self.body[i].r;
+                body_pattern[i].g = self.body[i].g;
+                body_pattern[i].b = self.body[i].b;
+            }
+        }
+
+        (self.dashboard, body_pattern, None)
+    }
+}
+
+

bike-lights/core/src/animations/mod.rs

@@ -0,0 +1,31 @@
+use fixed::types::{I48F16, I8F8, U128F0, U16F0};
+use az::*;
+
+use crate::{BodyPattern, DashboardPattern, Instant, FPS};
+
+mod blinker;
+pub use blinker::*;
+
+mod fade;
+pub use fade::*;
+
+pub trait Animation {
+    fn tick(&mut self, time: Instant) -> (DashboardPattern, BodyPattern);
+}
+
+pub fn linear_ease(value: I8F8, frames: U16F0, slope: I8F8) -> I8F8 {
+    let value_i16f16 = I48F16::from(value) + I48F16::from(frames) * I48F16::from(slope);
+    value_i16f16.saturating_as()
+}
+
+pub fn calculate_frames(starting_time: U128F0, now: U128F0) -> U16F0 {
+    let frames_128 = (now - starting_time) / U128F0::from(FPS);
+    (frames_128 % U128F0::from(U16F0::MAX)).cast()
+}
+
+pub fn calculate_slope(start: I8F8, end: I8F8, frames: U16F0) -> I8F8 {
+    let slope_i16f16 = (I48F16::from(end) - I48F16::from(start)) / I48F16::from(frames);
+    slope_i16f16.saturating_as()
+}
+
+

bike-lights/core/src/animations/ripple.rs

@@ -0,0 +1,95 @@
+use fixed::types::{I16F0, I8F0, I8F8, U16F0, U8F0};
+use az::*;
+
+use crate::{
+    calculate_frames, calculate_slope, linear_ease, sin, Animation, BodyPattern, DashboardPattern, Instant, OFF_BODY, OFF_DASHBOARD, RGB, WATER_1, WATER_BODY
+};
+
+const DROPLET_DIMMING: u8 = 30;
+
+pub struct Ripple {
+    dashboard: DashboardPattern,
+    base: BodyPattern,
+
+    focii: [usize; 2],
+    dimming: I8F8,
+    slope: [RGB<I8F8>; 2],
+
+    pub start_time: Instant,
+}
+
+impl Ripple {
+    pub fn new(dashboard: DashboardPattern, base: BodyPattern, time: Instant) -> Self {
+        let mut slope = [Default::default(); 2];
+        let dimming = I8F8::lit("0.5");
+        let focii = [15, 45];
+
+        for (idx, focus) in focii.iter().enumerate() {
+            slope[idx] = RGB {
+                r: calculate_slope(
+                    base[*focus].r,
+                    base[*focus].r * dimming,
+                    U16F0::from(DROPLET_DIMMING),
+                ),
+                g: calculate_slope(
+                    base[*focus].g,
+                    base[*focus].g * dimming,
+                    U16F0::from(DROPLET_DIMMING),
+                ),
+                b: calculate_slope(
+                    base[*focus].b,
+                    base[*focus].b * dimming,
+                    U16F0::from(DROPLET_DIMMING),
+                ),
+            };
+        }
+
+        Self {
+            dashboard,
+            base,
+            focii,
+            dimming,
+            slope,
+            start_time: time,
+        }
+    }
+
+    fn pixel(&self, pos: U8F0, frames: U16F0) -> RGB<I8F8> {
+        let focus: I16F0 = if pos <= 30 { I16F0::from(15 as i16) } else { I16F0::from(45 as i16) };
+        let distance_from_focus: I8F0 = (focus - I16F0::from(pos)).saturating_as();
+
+        let pos: usize = pos.into();
+
+        /*
+        let target = RGB {
+            r: WATER_BODY[pos].r * self.dimming,
+            g: WATER_BODY[pos].g * self.dimming,
+            b: WATER_BODY[pos].b * self.dimming,
+        };
+        let slope = RGB{
+            r: calculate_slope(WATER_BODY[pos].r, target.r, U16F0::from(DROPLET_DIMMING)),
+            g: calculate_slope(WATER_BODY[pos].g, target.g, U16F0::from(DROPLET_DIMMING)),
+            b: calculate_slope(WATER_BODY[pos].b, target.b, U16F0::from(DROPLET_DIMMING)),
+        };
+        */
+
+        RGB {
+            r: WATER_BODY[pos].r + sin(frames * 5) * I8F8::from_num(0.5),
+            g: WATER_BODY[pos].g + sin(frames * 6) * I8F8::from_num(0.5),
+            b: WATER_BODY[pos].b + sin(frames * 7) * I8F8::from_num(0.5),
+        }
+    }
+}
+
+impl Animation for Ripple {
+    fn tick(&mut self, time: Instant) -> (DashboardPattern, BodyPattern) {
+        let frames = calculate_frames(self.start_time.0, time.0);
+        let mut body_pattern: BodyPattern = OFF_BODY;
+
+        for i in 0..60 {
+            body_pattern[i] = self.pixel(U8F0::from(i as u8), frames);
+        }
+
+        (self.dashboard.clone(), body_pattern)
+    }
+}

bike-lights/core/src/lib.rs

@@ -12,27 +12,15 @@ use core::{
 };
 use fixed::types::{I48F16, I8F8, U128F0, U16F0};
 
+mod animations;
+pub use animations::*;
+
 mod patterns;
 pub use patterns::*;
 
 mod types;
 pub use types::{BodyPattern, DashboardPattern, RGB};
 
-fn calculate_frames(starting_time: U128F0, now: U128F0) -> U16F0 {
-    let frames_128 = (now - starting_time) / U128F0::from(FPS);
-    (frames_128 % U128F0::from(U16F0::MAX)).cast()
-}
-
-fn calculate_slope(start: I8F8, end: I8F8, frames: U16F0) -> I8F8 {
-    let slope_i16f16 = (I48F16::from(end) - I48F16::from(start)) / I48F16::from(frames);
-    slope_i16f16.saturating_as()
-}
-
-fn linear_ease(value: I8F8, frames: U16F0, slope: I8F8) -> I8F8 {
-    let value_i16f16 = I48F16::from(value) + I48F16::from(frames) * I48F16::from(slope);
-    value_i16f16.saturating_as()
-}
-
 #[derive(Clone, Copy, PartialOrd, Ord, PartialEq, Eq)]
 pub struct Instant(pub U128F0);
 
@@ -65,233 +53,6 @@ pub trait UI {
     fn update_lights(&self, dashboard_lights: DashboardPattern, body_lights: BodyPattern);
 }
 
-pub trait Animation {
-    fn tick(&mut self, time: Instant) -> (DashboardPattern, BodyPattern);
-}
-
-/*
-pub struct DefaultAnimation {}
-
-impl Animation for DefaultAnimation {
-    fn tick(&mut self, _: Instant) -> (DashboardPattern, BodyPattern) {
-        (WATER_DASHBOARD, WATER_BODY)
-    }
-}
-*/
-
-pub struct Fade {
-    starting_dashboard: DashboardPattern,
-    starting_lights: BodyPattern,
-
-    start_time: Instant,
-    dashboard_slope: [RGB<I8F8>; 3],
-    body_slope: [RGB<I8F8>; 60],
-    frames: U16F0,
-}
-
-impl Fade {
-    fn new(
-        dashboard: DashboardPattern,
-        lights: BodyPattern,
-        ending_dashboard: DashboardPattern,
-        ending_lights: BodyPattern,
-        frames: U16F0,
-        time: Instant,
-    ) -> Self {
-        let mut dashboard_slope = [Default::default(); 3];
-        let mut body_slope = [Default::default(); 60];
-        for i in 0..3 {
-            let slope = RGB {
-                r: calculate_slope(dashboard[i].r, ending_dashboard[i].r, frames),
-                g: calculate_slope(dashboard[i].g, ending_dashboard[i].g, frames),
-                b: calculate_slope(dashboard[i].b, ending_dashboard[i].b, frames),
-            };
-            dashboard_slope[i] = slope;
-        }
-
-        for i in 0..60 {
-            let slope = RGB {
-                r: calculate_slope(lights[i].r, ending_lights[i].r, frames),
-                g: calculate_slope(lights[i].g, ending_lights[i].g, frames),
-                b: calculate_slope(lights[i].b, ending_lights[i].b, frames),
-            };
-            body_slope[i] = slope;
-        }
-
-        Self {
-            starting_dashboard: dashboard,
-            starting_lights: lights,
-            start_time: time,
-            dashboard_slope,
-            body_slope,
-            frames,
-        }
-    }
-}
-
-impl Animation for Fade {
-    fn tick(&mut self, time: Instant) -> (DashboardPattern, BodyPattern) {
-        let mut frames = calculate_frames(self.start_time.0, time.0);
-        if frames > self.frames {
-            frames = self.frames
-        }
-        let mut dashboard_pattern: DashboardPattern = OFF_DASHBOARD;
-        let mut body_pattern: BodyPattern = OFF_BODY;
-
-        for i in 0..3 {
-            dashboard_pattern[i].r = linear_ease(
-                self.starting_dashboard[i].r,
-                frames,
-                self.dashboard_slope[i].r,
-            );
-            dashboard_pattern[i].g = linear_ease(
-                self.starting_dashboard[i].g,
-                frames,
-                self.dashboard_slope[i].g,
-            );
-            dashboard_pattern[i].b = linear_ease(
-                self.starting_dashboard[i].b,
-                frames,
-                self.dashboard_slope[i].b,
-            );
-        }
-
-        for i in 0..60 {
-            body_pattern[i].r =
-                linear_ease(self.starting_lights[i].r, frames, self.body_slope[i].r);
-            body_pattern[i].g =
-                linear_ease(self.starting_lights[i].g, frames, self.body_slope[i].g);
-            body_pattern[i].b =
-                linear_ease(self.starting_lights[i].b, frames, self.body_slope[i].b);
-        }
-
-        (dashboard_pattern, body_pattern)
-    }
-}
-
-#[derive(Debug)]
-pub enum FadeDirection {
-    Transition,
-    FadeIn,
-    FadeOut,
-}
-
-pub enum BlinkerDirection {
-    Left,
-    Right,
-}
-
-pub struct Blinker {
-    transition: Fade,
-    fade_in: Fade,
-    fade_out: Fade,
-    direction: FadeDirection,
-
-    start_time: Instant,
-    frames: U16F0,
-}
-
-impl Blinker {
-    fn new(
-        starting_dashboard: DashboardPattern,
-        starting_body: BodyPattern,
-        direction: BlinkerDirection,
-        time: Instant,
-    ) -> Self {
-        let mut ending_dashboard = OFF_DASHBOARD.clone();
-
-        match direction {
-            BlinkerDirection::Left => {
-                ending_dashboard[0].r = LEFT_BLINKER_DASHBOARD[0].r;
-                ending_dashboard[0].g = LEFT_BLINKER_DASHBOARD[0].g;
-                ending_dashboard[0].b = LEFT_BLINKER_DASHBOARD[0].b;
-            }
-            BlinkerDirection::Right => {
-                ending_dashboard[2].r = RIGHT_BLINKER_DASHBOARD[2].r;
-                ending_dashboard[2].g = RIGHT_BLINKER_DASHBOARD[2].g;
-                ending_dashboard[2].b = RIGHT_BLINKER_DASHBOARD[2].b;
-            }
-        }
-
-        let mut ending_body = OFF_BODY.clone();
-        match direction {
-            BlinkerDirection::Left => {
-                for i in 0..30 {
-                    ending_body[i].r = LEFT_BLINKER_BODY[i].r;
-                    ending_body[i].g = LEFT_BLINKER_BODY[i].g;
-                    ending_body[i].b = LEFT_BLINKER_BODY[i].b;
-                }
-            }
-            BlinkerDirection::Right => {
-                for i in 30..60 {
-                    ending_body[i].r = RIGHT_BLINKER_BODY[i].r;
-                    ending_body[i].g = RIGHT_BLINKER_BODY[i].g;
-                    ending_body[i].b = RIGHT_BLINKER_BODY[i].b;
-                }
-            }
-        }
-
-        Blinker {
-            transition: Fade::new(
-                starting_dashboard.clone(),
-                starting_body.clone(),
-                ending_dashboard.clone(),
-                ending_body.clone(),
-                BLINKER_FRAMES,
-                time,
-            ),
-            fade_in: Fade::new(
-                OFF_DASHBOARD.clone(),
-                OFF_BODY.clone(),
-                ending_dashboard.clone(),
-                ending_body.clone(),
-                BLINKER_FRAMES,
-                time,
-            ),
-            fade_out: Fade::new(
-                ending_dashboard.clone(),
-                ending_body.clone(),
-                OFF_DASHBOARD.clone(),
-                OFF_BODY.clone(),
-                BLINKER_FRAMES,
-                time,
-            ),
-            direction: FadeDirection::Transition,
-            start_time: time,
-            frames: BLINKER_FRAMES,
-        }
-    }
-}
-
-impl Animation for Blinker {
-    fn tick(&mut self, time: Instant) -> (DashboardPattern, BodyPattern) {
-        let frames = calculate_frames(self.start_time.0, time.0);
-        if frames > self.frames {
-            match self.direction {
-                FadeDirection::Transition => {
-                    self.direction = FadeDirection::FadeOut;
-                    self.fade_out.start_time = time;
-                }
-                FadeDirection::FadeIn => {
-                    self.direction = FadeDirection::FadeOut;
-                    self.fade_out.start_time = time;
-                }
-                FadeDirection::FadeOut => {
-                    self.direction = FadeDirection::FadeIn;
-                    self.fade_in.start_time = time;
-                }
-            }
-            self.start_time = time;
-        }
-
-        match self.direction {
-            FadeDirection::Transition => self.transition.tick(time),
-            FadeDirection::FadeIn => self.fade_in.tick(time),
-            FadeDirection::FadeOut => self.fade_out.tick(time),
-        }
-    }
-}
-
 #[derive(Clone, Debug)]
 pub enum Event {
     Brake,

bike-lights/simulator/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2021"
 
 [dependencies]
 adw         = { version = "0.5", package = "libadwaita", features = [ "v1_2" ] }
+async-channel = "2.3.1"
 cairo-rs    = { version = "0.18" }
 fixed       = { version = "1" }
 gio         = { version = "0.18" }

bike-lights/simulator/src/main.rs

@@ -1,16 +1,13 @@
+use std::{cell::RefCell, env, rc::Rc};
+
 use adw::prelude::*;
+use async_channel::{unbounded, Receiver, Sender, TryRecvError};
 use fixed::types::{I8F8, U128F0};
-use glib::{Object, Sender};
+use glib::Object;
 use gtk::subclass::prelude::*;
 use lights_core::{
     App, BodyPattern, DashboardPattern, Event, Instant, FPS, OFF_BODY, OFF_DASHBOARD, RGB, UI,
 };
-use std::{
-    cell::RefCell,
-    env,
-    rc::Rc,
-    sync::mpsc::{Receiver, TryRecvError},
-};
 
 const WIDTH: i32 = 640;
 const HEIGHT: i32 = 480;
@@ -156,13 +153,13 @@ impl UI for GTKUI {
         match self.rx.try_recv() {
             Ok(event) => Some(event),
             Err(TryRecvError::Empty) => None,
-            Err(TryRecvError::Disconnected) => None,
+            Err(TryRecvError::Closed) => None,
         }
     }
 
     fn update_lights(&self, dashboard_lights: DashboardPattern, lights: BodyPattern) {
         self.tx
-            .send(Update {
+            .send_blocking(Update {
                 dashboard: dashboard_lights,
                 lights,
             })
@@ -176,9 +173,8 @@ fn main() {
         .build();
 
     adw_app.connect_activate(move |adw_app| {
-        let (update_tx, update_rx) =
+        let (update_tx, update_rx) = unbounded();
-            gtk::glib::MainContext::channel::<Update>(gtk::glib::Priority::DEFAULT);
+        let (event_tx, event_rx) = unbounded();
-        let (event_tx, event_rx) = std::sync::mpsc::channel();
 
         std::thread::spawn(move || {
             let mut bike_app = App::new(Box::new(GTKUI {
@@ -218,21 +214,21 @@ fn main() {
         left_button.connect_clicked({
             let event_tx = event_tx.clone();
             move |_| {
-                let _ = event_tx.send(Event::LeftBlinker);
+                let _ = event_tx.send_blocking(Event::LeftBlinker);
             }
         });
 
         brake_button.connect_clicked({
             let event_tx = event_tx.clone();
             move |_| {
-                let _ = event_tx.send(Event::Brake);
+                let _ = event_tx.send_blocking(Event::Brake);
             }
         });
 
         right_button.connect_clicked({
             let event_tx = event_tx.clone();
             move |_| {
-                let _ = event_tx.send(Event::RightBlinker);
+                let _ = event_tx.send_blocking(Event::RightBlinker);
             }
         });
 
@@ -251,14 +247,14 @@ fn main() {
         previous_pattern.connect_clicked({
             let event_tx = event_tx.clone();
             move |_| {
-                let _ = event_tx.send(Event::PreviousPattern);
+                let _ = event_tx.send_blocking(Event::PreviousPattern);
             }
         });
 
         next_pattern.connect_clicked({
             let event_tx = event_tx.clone();
             move |_| {
-                let _ = event_tx.send(Event::NextPattern);
+                let _ = event_tx.send_blocking(Event::NextPattern);
             }
         });
 
@@ -269,6 +265,7 @@ fn main() {
         layout.append(&dashboard_lights);
         layout.append(&bike_lights);
 
+        /*
         update_rx.attach(None, {
             let dashboard_lights = dashboard_lights.clone();
             let bike_lights = bike_lights.clone();
@@ -278,6 +275,19 @@ fn main() {
                 glib::ControlFlow::Continue
             }
         });
+        */
+
+        glib::spawn_future_local({
+            let dashboard_lights = dashboard_lights.clone();
+            let bike_lights = bike_lights.clone();
+
+            async move {
+                while let Ok(Update { dashboard, lights }) = update_rx.recv().await {
+                    dashboard_lights.set_lights(dashboard);
+                    bike_lights.set_lights(lights);
+                }
+            }
+        });
 
         window.set_content(Some(&layout));
         window.present();

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1681202837,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1714906307,
+        "lastModified": 1681303793,
-        "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
+        "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
+        "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1731966246,
+        "lastModified": 1698205128,
-        "narHash": "sha256-e/V7Ffm5wPd9DVzCThnPZ7lFxd43bb64tSk8/oGP4Ag=",
+        "narHash": "sha256-jP+81TkldLtda8bzmsBWahETGsyFkoDOCT244YkA+S4=",
         "owner": "1Password",
         "repo": "typeshare",
-        "rev": "e0e5f27ee34d7d4da76a9dc96a11552e98be56da",
+        "rev": "c3ee2ad8f27774c45db7af4f2ba746c4ae11de21",
         "type": "github"
       },
       "original": {

flake.nix

@@ -44,7 +44,6 @@
             pkgs.sqlx-cli
             pkgs.udev
             pkgs.wasm-pack
-            pkgs.go-task
             typeshare.packages."x86_64-linux".default
             pkgs.nodePackages_latest.typescript-language-server
           ];

visions/server/Cargo.toml

@@ -12,10 +12,3 @@ serde_json  = { version = "*" }
 serde       = { version = "1" }
 tokio       = { version = "1", features = [ "full" ] }
 warp        = { version = "0.3" }
-mime_guess = "2.0.5"
-mime = "0.3.17"
-uuid = { version = "1.11.0", features = ["v4"] }
-futures = "0.3.31"
-tokio-stream = "0.1.16"
-typeshare = "1.0.4"
-urlencoding = "2.1.3"

visions/server/src/core.rs

@@ -1,123 +0,0 @@
-use std::{
-    collections::HashMap,
-    io::Read,
-    path::PathBuf,
-    sync::{Arc, RwLock},
-};
-
-use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender};
-use urlencoding::decode;
-use uuid::Uuid;
-
-use crate::types::{AppError, Message, Tabletop, RGB};
-
-#[derive(Debug)]
-struct WebsocketClient {
-    sender: Option<UnboundedSender<Message>>,
-}
-
-#[derive(Debug)]
-pub struct AppState {
-    pub image_base: PathBuf,
-    pub tabletop: Tabletop,
-    pub clients: HashMap<String, WebsocketClient>,
-}
-
-#[derive(Clone, Debug)]
-pub struct Core(pub Arc<RwLock<AppState>>);
-
-impl Core {
-    pub fn new() -> Self {
-        Self(Arc::new(RwLock::new(AppState {
-            image_base: PathBuf::from("/home/savanni/Pictures"),
-            tabletop: Tabletop {
-                background_color: RGB{ red: 0xca, green: 0xb9, blue: 0xbb },
-                background_image: None,
-            },
-            clients: HashMap::new(),
-        })))
-    }
-
-    pub fn register_client(&self) -> String {
-        let mut state = self.0.write().unwrap();
-        let uuid = Uuid::new_v4().simple().to_string();
-
-        let client = WebsocketClient { sender: None };
-
-        state.clients.insert(uuid.clone(), client);
-        uuid
-    }
-
-    pub fn unregister_client(&self, client_id: String) {
-        let mut state = self.0.write().unwrap();
-        let _ = state.clients.remove(&client_id);
-    }
-
-    pub fn connect_client(&self, client_id: String) -> UnboundedReceiver<Message> {
-        let mut state = self.0.write().unwrap();
-
-        match state.clients.get_mut(&client_id) {
-            Some(client) => {
-                let (tx, rx) = unbounded_channel();
-                client.sender = Some(tx);
-                rx
-            }
-            None => {
-                unimplemented!();
-            }
-        }
-    }
-
-    pub fn get_file(&self, file_name: String) -> Vec<u8> {
-        let file_name = decode(&file_name).expect("UTF-8");
-
-        let mut full_path = self.0.read().unwrap().image_base.clone();
-        full_path.push(file_name.to_string());
-
-
-        let mut content: Vec<u8> = Vec::new();
-        let mut file = std::fs::File::open(&full_path).unwrap();
-        file.read_to_end(&mut content).unwrap();
-        content
-    }
-
-    pub fn available_images(&self) -> Vec<String> {
-        std::fs::read_dir(&self.0.read().unwrap().image_base)
-            .unwrap()
-            .filter_map(|entry| match entry {
-                Ok(entry_) => match mime_guess::from_path(entry_.path()).first() {
-                    Some(mime) if mime.type_() == mime::IMAGE => Some(
-                        entry_
-                            .path()
-                            .file_name()
-                            .and_then(|filename| filename.to_str())
-                            .and_then(|filename| Some(filename.to_owned()))
-                            .unwrap(),
-                    ),
-                    _ => None,
-                },
-                Err(_) => None,
-            })
-            .collect()
-    }
-
-    pub fn set_background_image(&self, path: String) -> Result<(), AppError> {
-        let tabletop = {
-            let mut state = self.0.write().unwrap();
-            state.tabletop.background_image = Some(path.clone());
-            state.tabletop.clone()
-        };
-        self.publish(Message::UpdateTabletop(tabletop));
-        Ok(())
-    }
-
-    pub fn publish(&self, message: Message) {
-        let state = self.0.read().unwrap();
-
-        state.clients.values().for_each(|client| {
-            if let Some(ref sender) = client.sender {
-                let _ = sender.send(message.clone());
-            }
-        });
-    }
-}

visions/server/src/handlers.rs

@@ -1,13 +1,6 @@
-use std::{pin::Pin, time::Duration};
+use authdb::{AuthDB, AuthToken};
+use http::{response::Response, status::StatusCode, Error};
 
-use futures::{SinkExt, StreamExt};
-use serde::{Deserialize, Serialize};
-use tokio_stream::wrappers::UnboundedReceiverStream;
-use warp::{http::Response, reply::Reply, ws::Message};
-
-use crate::core::Core;
-
-/*
 pub async fn handle_auth(
     auth_ctx: &AuthDB,
     auth_token: AuthToken,
@@ -29,93 +22,3 @@ pub async fn handle_auth(
             .body("".to_owned()),
     }
 }
-*/
-
-pub async fn handle_file(core: Core, file_name: String) -> impl Reply {
-    let mimetype = mime_guess::from_path(&file_name).first().unwrap();
-    let bytes = core.get_file(file_name);
-    Response::builder()
-        .header("application-type", mimetype.to_string())
-        .body(bytes)
-        .unwrap()
-}
-
-pub async fn handle_available_images(core: Core) -> impl Reply {
-    Response::builder()
-        .header("Access-Control-Allow-Origin", "*")
-        .header("Content-Type", "application/json")
-        .body(serde_json::to_string(&core.available_images()).unwrap())
-        .unwrap()
-}
-
-#[derive(Deserialize, Serialize)]
-pub struct RegisterRequest {}
-
-#[derive(Deserialize, Serialize)]
-pub struct RegisterResponse {
-    url: String,
-}
-
-pub async fn handle_register_client(core: Core, request: RegisterRequest) -> impl Reply {
-    let client_id = core.register_client();
-
-    Response::builder()
-        .header("Access-Control-Allow-Origin", "*")
-        .header("Content-Type", "application/json")
-        .body(
-            serde_json::to_string(&RegisterResponse {
-                url: format!("ws://127.0.0.1:8001/ws/{}", client_id),
-            })
-            .unwrap(),
-        )
-        .unwrap()
-}
-
-pub async fn handle_unregister_client(core: Core, client_id: String) -> impl Reply {
-    core.unregister_client(client_id);
-
-    warp::reply::reply()
-}
-
-pub async fn handle_connect_websocket(
-    core: Core,
-    ws: warp::ws::Ws,
-    client_id: String,
-) -> impl Reply {
-    // println!("handle_connect_websocket: {}", client_id);
-    ws.on_upgrade(move |socket| {
-        let core = core.clone();
-        async move {
-            let (mut ws_sender, _) = socket.split();
-            let mut receiver = core.connect_client(client_id.clone());
-
-            tokio::task::spawn(async move {
-                let tabletop = core.0.read().unwrap().tabletop.clone();
-                let _ = ws_sender
-                    .send(Message::text(
-                        serde_json::to_string(&crate::types::Message::UpdateTabletop(tabletop))
-                            .unwrap(),
-                    ))
-                    .await;
-                while let Some(msg) = receiver.recv().await {
-                    println!("Relaying message: {:?}", msg);
-                    let _ = ws_sender
-                        .send(Message::text(serde_json::to_string(&msg).unwrap()))
-                        .await;
-                }
-                println!("process ended for id {}", client_id);
-            });
-        }
-    })
-}
-
-pub async fn handle_set_background_image(core: Core, image_name: String) -> impl Reply {
-    let _ = core.set_background_image(image_name);
-
-    Response::builder()
-        .header("Access-Control-Allow-Origin", "*")
-        .header("Access-Control-Allow-Methods", "*")
-        .header("Content-Type", "application/json")
-        .body("")
-        .unwrap()
-}

visions/server/src/main.rs

@@ -1,24 +1,19 @@
-use authdb::AuthError;
+use authdb::{AuthDB, AuthError, AuthToken, SessionToken, Username};
-use handlers::{
-    handle_available_images, handle_connect_websocket, handle_file, handle_register_client, handle_set_background_image, handle_unregister_client, RegisterRequest
-};
 use std::{
     convert::Infallible,
     net::{IpAddr, Ipv4Addr, SocketAddr},
+    path::PathBuf,
+    sync::Arc,
 };
 use warp::{
-    // header,
+    header,
-    http::{Response, StatusCode},
+    http::StatusCode,
-    reply::Reply,
+    reply::{Json, Reply},
     Filter,
 };
 
-mod core;
-
 mod handlers;
-// use handlers::handle_auth;
+use handlers::handle_auth;
-
-mod types;
 
 #[derive(Debug)]
 struct Unauthorized;
@@ -28,7 +23,6 @@ impl warp::reject::Reject for Unauthorized {}
 struct AuthDBError(AuthError);
 impl warp::reject::Reject for AuthDBError {}
 
-/*
 fn with_session(
     auth_ctx: Arc<AuthDB>,
 ) -> impl Filter<Extract = (Username,), Error = warp::Rejection> + Clone {
@@ -77,10 +71,8 @@ fn route_echo_authenticated(
             warp::reply::json(&vec!["authenticated", username.as_str(), param.as_str()])
         })
 }
-*/
 
 async fn handle_rejection(err: warp::Rejection) -> Result<impl Reply, Infallible> {
-    println!("handle_rejection: {:?}", err);
     if let Some(Unauthorized) = err.find() {
         Ok(warp::reply::with_status(
             "".to_owned(),
@@ -96,71 +88,14 @@ async fn handle_rejection(err: warp::Rejection) -> Result<impl Reply, Infallible
 
 #[tokio::main]
 pub async fn main() {
-    let core = core::Core::new();
+    let auth_db = AuthDB::new(PathBuf::from("./auth_db.sqlite"))
-    let log = warp::log("visions::api");
+        .await
+        .expect("AuthDB should initialize");
+    let auth_ctx: Arc<AuthDB> = Arc::new(auth_db);
 
-    let route_image = warp::path!("api" / "v1" / "image" / String)
+    let filter = route_echo_authenticated(auth_ctx.clone())
-        .and(warp::get())
+        .or(route_authenticate(auth_ctx.clone()))
-        .then({
+        .or(route_echo_unauthenticated())
-            let core = core.clone();
-            move |file_name| handle_file(core.clone(), file_name)
-        });
-
-    let route_available_images = warp::path!("api" / "v1" / "image").and(warp::get()).then({
-        let core = core.clone();
-        move || handle_available_images(core.clone())
-    });
-
-    let route_register_client = warp::path!("api" / "v1" / "client")
-        .and(warp::post())
-        .then({
-            let core = core.clone();
-            move || handle_register_client(core.clone(), RegisterRequest {})
-        });
-
-    let route_unregister_client = warp::path!("api" / "v1" / "client" / String)
-        .and(warp::delete())
-        .then({
-            let core = core.clone();
-            move |client_id| handle_unregister_client(core.clone(), client_id)
-        });
-
-    let route_websocket = warp::path("ws")
-        .and(warp::ws())
-        .and(warp::path::param())
-        .then({
-            let core = core.clone();
-            move |ws, client_id| handle_connect_websocket(core.clone(), ws, client_id)
-        });
-
-    let route_set_bg_image_options = warp::path!("api" / "v1" / "tabletop" / "bg_image")
-        .and(warp::options())
-        .map({
-            move || {
-                Response::builder()
-                    .header("Access-Control-Allow-Origin", "*")
-                    .header("Access-Control-Allow-Methods", "PUT")
-                    .header("Access-Control-Allow-Headers", "content-type")
-                    .header("Content-Type", "application/json")
-                    .body("")
-                    .unwrap()
-            }
-        });
-    let route_set_bg_image = warp::path!("api" / "v1" / "tabletop" / "bg_image")
-        .and(warp::put())
-        .and(warp::body::json())
-        .then({
-            let core = core.clone();
-            move |body| handle_set_background_image(core.clone(), body)
-        }).with(log);
-
-    let filter = route_register_client
-        .or(route_unregister_client)
-        .or(route_websocket)
-        .or(route_image)
-        .or(route_available_images)
-        .or(route_set_bg_image_options)
-        .or(route_set_bg_image)
         .recover(handle_rejection);
 
     let server = warp::serve(filter);

visions/server/src/types.rs

@@ -1,33 +0,0 @@
-use serde::{Deserialize, Serialize};
-use typeshare::typeshare;
-
-#[derive(Debug)]
-pub enum AppError {
-    JsonError(serde_json::Error),
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-#[typeshare]
-pub struct RGB {
-    pub red: u32,
-    pub green: u32,
-    pub blue: u32,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(rename_all = "camelCase")]
-#[typeshare]
-pub struct Tabletop {
-    pub background_color: RGB,
-    pub background_image: Option<String>,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(tag = "type", content = "content")]
-#[typeshare]
-pub enum Message {
-    UpdateTabletop(Tabletop),
-}
-
-

visions/ui.backup/package.json

@@ -1,24 +0,0 @@
-{
-  "name": "ui",
-  "version": "1.0.0",
-  "description": "",
-  "main": "webpack.config.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "webpack"
-  },
-  "author": "",
-  "license": "GPL-3.0-or-later",
-  "dependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  },
-  "devDependencies": {
-    "@types/react": "^18.2.8",
-    "@types/react-dom": "^18.2.4",
-    "copy-webpack-plugin": "^11.0.0",
-    "ts-loader": "^9.4.3",
-    "webpack": "^5.85.0",
-    "webpack-cli": "^5.1.3"
-  }
-}

visions/ui.backup/src/client.ts

@@ -1,23 +0,0 @@
-type PlayingField = {
-    backgroundImage: string;
-}
-
-class Client {
-    playingField(): PlayingField {
-        return { backgroundImage: "tower-in-mist.jpg" };
-    }
-
-    async getFile(filename: string): Promise<Blob | undefined> {
-        try {
-            const response = await fetch(`http://localhost:8001/api/v1/file/${filename}`);
-            if (!response.ok) {
-                throw new Error(`Response status: ${response.status}`);
-            }
-
-            const body = await response.blob();
-            return body;
-        } catch (error) {
-            console.error(error.message);
-        }
-    }
-}

visions/ui/.gitignore

@@ -1,23 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*

visions/ui/README.md

@@ -1,46 +0,0 @@
-# Getting Started with Create React App
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).

visions/ui/package.json

@@ -1,49 +1,24 @@
 {
   "name": "ui",
-  "version": "0.1.0",
+  "version": "1.0.0",
-  "private": true,
+  "description": "",
-  "dependencies": {
+  "main": "webpack.config.js",
-    "@testing-library/jest-dom": "^5.17.0",
-    "@testing-library/react": "^13.4.0",
-    "@testing-library/user-event": "^13.5.0",
-    "@types/jest": "^27.5.2",
-    "@types/node": "^16.18.119",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "@types/react-router": "^5.1.20",
-    "@types/react-router-dom": "^5.3.3",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-router": "^6.28.0",
-    "react-router-dom": "^6.28.0",
-    "react-scripts": "5.0.1",
-    "react-use-websocket": "^4.11.1",
-    "typescript": "^4.9.5",
-    "web-vitals": "^2.1.4",
-    "visions-types": "../visions-types"
-  },
   "scripts": {
-    "start": "react-scripts start",
+    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "react-scripts build",
+    "build": "webpack"
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
   },
-  "eslintConfig": {
+  "author": "",
-    "extends": [
+  "license": "GPL-3.0-or-later",
-      "react-app",
+  "dependencies": {
-      "react-app/jest"
+    "react": "^18.2.0",
-    ]
+    "react-dom": "^18.2.0"
   },
-  "browserslist": {
+  "devDependencies": {
-    "production": [
+    "@types/react": "^18.2.8",
-      ">0.2%",
+    "@types/react-dom": "^18.2.4",
-      "not dead",
+    "copy-webpack-plugin": "^11.0.0",
-      "not op_mini all"
+    "ts-loader": "^9.4.3",
-    ],
+    "webpack": "^5.85.0",
-    "development": [
+    "webpack-cli": "^5.1.3"
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
   }
 }

visions/ui/public/index.html

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>

visions/ui/public/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

visions/ui/public/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:

visions/ui/src/App.css

@@ -1,38 +0,0 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}

visions/ui/src/App.test.tsx

@@ -1,9 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import App from './App';
-
-test('renders learn react link', () => {
-  // render(<App />);
-  const linkElement = screen.getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
-});

visions/ui/src/App.tsx

@@ -1,39 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import './App.css';
-import { Client } from './client';
-import { createBrowserRouter, RouterProvider } from 'react-router-dom';
-import { GmView } from './views/GmView/GmView';
-import { WebsocketProvider } from './components/WebsocketProvider';
-import { PlayerView } from './views/PlayerView/PlayerView';
-
-interface AppProps {
-    client: Client;
-}
-
-const App = ({ client }: AppProps) => {
-    console.log("rendering app");
-    const [websocketUrl, setWebsocketUrl] = useState<string | undefined>(undefined);
-
-    useEffect(() => {
-        client.registerWebsocket().then((url) => setWebsocketUrl(url))
-    }, [client]);
-
-    let router =
-        createBrowserRouter([
-            {
-                path: "/gm",
-                element: websocketUrl ? <WebsocketProvider websocketUrl={websocketUrl}> <GmView client={client} /> </WebsocketProvider> : <div> </div>
-            },
-            {
-                path: "/",
-                element: websocketUrl ? <WebsocketProvider websocketUrl={websocketUrl}> <PlayerView client={client} /> </WebsocketProvider> : <div> </div>
-            }
-        ]);
-    return (
-        <div className="App">
-            <RouterProvider router={router} />
-        </div>
-    );
-}
-
-export default App;

visions/ui/src/client.ts

@@ -1,47 +0,0 @@
-export type PlayingField = {
-    backgroundImage: string;
-}
-
-export class Client {
-    private base: URL;
-
-    constructor() {
-        this.base = new URL("http://localhost:8001");
-    }
-
-    registerWebsocket() {
-        const url = new URL(this.base);
-        url.pathname = `api/v1/client`;
-        return fetch(url, { method: 'POST' }).then((response) => response.json()).then((ws) => ws.url);
-    }
-
-    /*
-    unregisterWebsocket() {
-        const url = new URL(this.base);
-        url.pathname = `api/v1/client`;
-        return fetch(url, { method: 'POST' }).then((response => response.json()));
-    }
-    */
-
-    imageUrl(imageId: string) {
-        const url = new URL(this.base);
-        url.pathname = `/api/v1/image/${imageId}`;
-        return url;
-    }
-
-    async playingField(): Promise<PlayingField> {
-        return { backgroundImage: "trans-ferris.jpg" };
-    }
-
-    async availableImages(): Promise<string[]> {
-        const url = new URL(this.base);
-        url.pathname = `/api/v1/image`;
-        return fetch(url).then((response) => response.json());
-    }
-
-    async setBackgroundImage(name: string) {
-        const url = new URL(this.base);
-        url.pathname = `/api/v1/tabletop/bg_image`;
-        return fetch(url, { method: 'PUT', headers: [['Content-Type', 'application/json']], body: JSON.stringify(name) });
-    }
-}

visions/ui/src/components/Tabletop/Tabletop.css

@@ -1,7 +0,0 @@
-.playing-field__background {
-    flex-grow: 1;
-}
-
-.playing-field__background > img {
-    max-width: 100%;
-}

visions/ui/src/components/Tabletop/Tabletop.tsx

@@ -1,14 +0,0 @@
-import React, { useContext } from 'react';
-import './Tabletop.css';
-import { RGB } from 'visions-types';
-
-interface TabletopElementProps {
-    backgroundColor: RGB;
-    backgroundUrl: URL | undefined;
-}
-
-export const TabletopElement = ({ backgroundColor, backgroundUrl }: TabletopElementProps) => {
-    const tabletopColorStyle = `rgb(${backgroundColor.red}, ${backgroundColor.green}, ${backgroundColor.blue})`;
-
-    return <div> {backgroundUrl && <img src={backgroundUrl.toString()} alt="playing field" />} </div>
-}

visions/ui/src/components/Thumbnail/Thumbnail.css

@@ -1,4 +0,0 @@
-.thumbnail > img {
-    max-width: 300px;
-    max-height: 300px;
-}

visions/ui/src/components/Thumbnail/Thumbnail.tsx

@@ -1,16 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Client } from '../../client';
-import './Thumbnail.css';
-
-interface ThumbnailProps {
-    id: string;
-    url: URL;
-    onclick?: () => void;
-}
-
-export const ThumbnailComponent = ({ id, url, onclick }: ThumbnailProps) => {
-    const clickHandler = () => {
-        if (onclick) { onclick(); }
-    }
-    return (<div id={id} className="thumbnail" onClick={clickHandler}> <img src={url.toString()} /> </div>)
-}

visions/ui/src/components/WebsocketProvider.tsx

@@ -1,44 +0,0 @@
-import React, { createContext, PropsWithChildren, useEffect, useReducer } from "react";
-import useWebSocket from "react-use-websocket";
-import { Message, Tabletop } from "visions-types";
-
-type TabletopState = {
-    tabletop: Tabletop;
-}
-
-const initialState = (): TabletopState => ({ tabletop: { backgroundColor: { red: 0, green: 0, blue: 0 }, backgroundImage: undefined } });
-
-export const WebsocketContext = createContext<TabletopState>(initialState());
-
-interface WebsocketProviderProps {
-    websocketUrl: string;
-}
-
-export const WebsocketProvider = ({ websocketUrl, children }: PropsWithChildren<WebsocketProviderProps>) => {
-    const { lastMessage } = useWebSocket(websocketUrl);
-
-    const [state, dispatch] = useReducer(handleMessage, initialState());
-
-    useEffect(() => {
-        if (lastMessage !== null) {
-            const message: Message = JSON.parse(lastMessage.data);
-            dispatch(message);
-        }
-    }, [lastMessage]);
-
-    return (<WebsocketContext.Provider value={state}>
-        {children}
-    </WebsocketContext.Provider>);
-}
-
-const handleMessage = (state: TabletopState, message: Message): TabletopState => {
-    console.log(message);
-    switch (message.type) {
-        case "UpdateTabletop": {
-            return {
-                ...state,
-                tabletop: message.content,
-            }
-        }
-    }
-}

visions/ui/src/index.css

@@ -1,13 +0,0 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}

visions/ui/src/index.tsx

@@ -1,22 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom/client';
-import './index.css';
-import App from './App';
-import reportWebVitals from './reportWebVitals';
-import { Client } from './client';
-
-const client = new Client();
-
-const root = ReactDOM.createRoot(
-  document.getElementById('root') as HTMLElement
-);
-root.render(
-  <React.StrictMode>
-    <App client={client} />
-  </React.StrictMode>
-);
-
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();

visions/ui/src/logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

visions/ui/src/react-app-env.d.ts

@@ -1 +0,0 @@
-/// <reference types="react-scripts" />

visions/ui/src/reportWebVitals.ts

@@ -1,15 +0,0 @@
-import { ReportHandler } from 'web-vitals';
-
-const reportWebVitals = (onPerfEntry?: ReportHandler) => {
-  if (onPerfEntry && onPerfEntry instanceof Function) {
-    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
-      getCLS(onPerfEntry);
-      getFID(onPerfEntry);
-      getFCP(onPerfEntry);
-      getLCP(onPerfEntry);
-      getTTFB(onPerfEntry);
-    });
-  }
-};
-
-export default reportWebVitals;

visions/ui/src/setupTests.ts

@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';

visions/ui/src/views/GmView/GmView.css

@@ -1,4 +0,0 @@
-.gm-view {
-    display: flex;
-    width: 100%;
-}

visions/ui/src/views/GmView/GmView.tsx

@@ -1,28 +0,0 @@
-import React, { useContext, useEffect, useState } from 'react';
-import { Client, PlayingField } from '../../client';
-import { TabletopElement } from '../../components/Tabletop/Tabletop';
-import { ThumbnailComponent } from '../../components/Thumbnail/Thumbnail';
-import { WebsocketContext } from '../../components/WebsocketProvider';
-import './GmView.css';
-
-interface GmViewProps {
-    client: Client
-}
-
-export const GmView = ({ client }: GmViewProps) => {
-    const { tabletop } = useContext(WebsocketContext);
-
-    const [images, setImages] = useState<string[]>([]);
-    useEffect(() => {
-        client.availableImages().then((images) => setImages(images));
-    }, [client]);
-
-    const backgroundUrl = tabletop.backgroundImage ? client.imageUrl(tabletop.backgroundImage) : undefined;
-    return (<div className="gm-view">
-        <div>
-            {images.map((imageName) => <ThumbnailComponent id={imageName} url={client.imageUrl(imageName)} onclick={() => { client.setBackgroundImage(imageName); }} />)}
-        </div>
-        <TabletopElement backgroundColor={tabletop.backgroundColor} backgroundUrl={backgroundUrl} />
-    </div>)
-}
-

visions/ui/src/views/PlayerView/PlayerView.css

@@ -1,18 +0,0 @@
-.player-view {
-    display: flex;
-    width: 100%;
-}
-
-.player-view__left-panel {
-    flex-grow: 0;
-    min-width: 100px;
-    max-width: 20%;
-}
-
-.player-view__right-panel {
-    flex-grow: 0;
-    min-width: 100px;
-    max-width: 20%;
-}
-
-

visions/ui/src/views/PlayerView/PlayerView.tsx

@@ -1,24 +0,0 @@
-import React, { useContext } from 'react';
-import './PlayerView.css';
-import { WebsocketContext } from '../../components/WebsocketProvider';
-import { Client } from '../../client';
-import { TabletopElement } from '../../components/Tabletop/Tabletop';
-
-interface PlayerViewProps {
-    client: Client;
-}
-
-export const PlayerView = ({ client }: PlayerViewProps) => {
-    const { tabletop } = useContext(WebsocketContext);
-
-    const backgroundColor = tabletop.backgroundColor;
-    const tabletopColorStyle = `rgb(${backgroundColor.red}, ${backgroundColor.green}, ${backgroundColor.blue})`;
-    const backgroundUrl = tabletop.backgroundImage ? client.imageUrl(tabletop.backgroundImage) : undefined;
-
-    return (<div className="player-view" style={{ backgroundColor: tabletopColorStyle}}>
-        <div className="player-view__left-panel"> Left Side </div>
-        <TabletopElement backgroundColor={backgroundColor} backgroundUrl={backgroundUrl} />
-        <div className="player-view__right-panel"> Right Side </div>
-    </div>)
-}
-

visions/ui/tsconfig.json

@@ -1,27 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "noFallthroughCasesInSwitch": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx"
-  },
-  "include": [
-    "src",
-    "gen"
-  ]
-}

visions/visions-types/.gitignore

@@ -1,2 +0,0 @@
-dist
-visions.ts

visions/visions-types/Taskfile.yml

@@ -1,7 +0,0 @@
-version: '3'
-
-tasks:
-  build:
-    cmds:
-      - typeshare --lang typescript --output-file visions.ts ../server/src
-      - npx tsc

visions/visions-types/package-lock.json

@@ -1,28 +0,0 @@
-{
-  "name": "visions-types",
-  "version": "0.0.1",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "visions-types",
-      "version": "0.0.1",
-      "license": "ISC",
-      "dependencies": {
-        "typescript": "^5.6.3"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
-      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    }
-  }
-}

visions/visions-types/package.json

@@ -1,14 +0,0 @@
-{
-  "name": "visions-types",
-  "version": "0.0.1",
-  "description": "Shared data types for Visions",
-  "main": "visions.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "typescript": "^5.6.3"
-  }
-}

visions/visions-types/tsconfig.json

@@ -1,15 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es2016",
-    "module": "commonjs",
-    "declaration": true,
-    "declarationMap": true,
-    "sourceMap": true,
-    "outDir": "./dist",
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "skipLibCheck": true
-  },
-  "include": ["./visions.ts"]
-}