moved types but with error.rs

Cargo.toml

@@ -14,6 +14,7 @@ members = [
     "integration_tests",
     "generate",
     "decklink",
+    "compositor_api",
 ]
 resolver = "2"
 
@@ -52,6 +53,7 @@ schemars = { git = "https://github.com/membraneframework-labs/schemars", rev = "
 ] }
 
 [dependencies]
+compositor_api = { path = "compositor_api" }
 compositor_render = { workspace = true }
 compositor_pipeline = { path = "compositor_pipeline" }
 compositor_chromium = { path = "compositor_chromium", optional = true }

compositor_api/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "compositor_api"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+compositor_pipeline = { path = "../compositor_pipeline" }
+compositor_render = { path = "../compositor_render"}
+serde = { workspace = true }
+schemars = { workspace = true }
+bytes = { workspace = true }
+axum = { version = "0.7.4", features = ["ws"] }

compositor_api/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod error;
+pub mod types;

generate/Cargo.toml

@@ -11,6 +11,7 @@ decklink = ["live_compositor/decklink"]
 
 [dependencies]
 live_compositor = { path = ".." }
+compositor_api = { path="../compositor_api" }
 reqwest = { workspace = true }
 anyhow = { workspace = true }
 serde = { workspace = true }

generate/src/bin/generate_from_types/generate_docs.rs

@@ -1,7 +1,7 @@
 use super::docs_config::DocsConfig;
 use super::document::generate;
 use super::markdown::overrides;
-use live_compositor::types::{
+use compositor_api::types::{
     DeckLink, Image, ImageSpec, InputStream, Mp4, Rescaler, RtpInputStream, RtpOutputStream,
     Shader, ShaderSpec, Text, Tiles, View, WebRendererSpec, WebView,
 };

generate/src/bin/generate_from_types/generate_json_schema.rs

@@ -1,6 +1,7 @@
 use std::{fs, io, path::PathBuf};
 
-use live_compositor::{routes, types};
+use compositor_api::types;
+use live_compositor::routes;
 use schemars::{
     schema::{RootSchema, Schema, SchemaObject},
     schema_for, JsonSchema,

integration_tests/Cargo.toml

@@ -19,6 +19,7 @@ web_renderer = [
 ]
 
 [dependencies]
+compositor_api = { path = "../compositor_api" }
 live_compositor = { path = ".." }
 compositor_pipeline = { path = "../compositor_pipeline" }
 reqwest = { workspace = true }

integration_tests/examples/aac_rtp_input.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::{

integration_tests/examples/audio.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::{

integration_tests/examples/decklink.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::{

integration_tests/examples/docker.rs

@@ -1,5 +1,6 @@
 use anyhow::{anyhow, Result};
-use live_compositor::{config::read_config, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::config::read_config;
 use log::{error, info, warn};
 use serde_json::json;
 use signal_hook::{consts, iterator::Signals};

integration_tests/examples/hls.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::{env, process::Command, thread, time::Duration};

integration_tests/examples/image.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::{env, path::PathBuf, thread};

integration_tests/examples/mp4.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::{thread, time::Duration};

integration_tests/examples/pass_through.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::{env, thread, time::Duration};

integration_tests/examples/rtp_tcp.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::{

integration_tests/examples/simple.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::{thread, time::Duration};

integration_tests/examples/test_pattern.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde::Deserialize;
 use serde_json::json;

integration_tests/examples/text.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::thread;

integration_tests/examples/tiles.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::thread;

integration_tests/examples/transition.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::{thread, time::Duration};

integration_tests/examples/web_view.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
-use live_compositor::{server, types::Resolution};
+use compositor_api::types::Resolution;
+use live_compositor::server;
 use log::{error, info};
 use serde_json::json;
 use std::{

integration_tests/src/examples.rs

@@ -1,7 +1,8 @@
 use anyhow::{anyhow, Result};
 
+use compositor_api::types::Resolution;
 use futures_util::{SinkExt, StreamExt};
-use live_compositor::{config::read_config, types::Resolution};
+use live_compositor::config::read_config;
 use log::error;
 use reqwest::{blocking::Response, StatusCode};
 use std::{

src/lib.rs

@@ -1,8 +1,5 @@
 pub mod config;
-pub mod error;
 pub mod logger;
 pub mod routes;
 pub mod server;
 pub mod state;
-
-pub mod types;

src/main.rs

@@ -1,12 +1,10 @@
 use log::info;
 
 mod config;
-mod error;
 mod logger;
 mod routes;
 mod server;
 mod state;
-mod types;
 
 #[cfg(test)]
 mod snapshot_tests;

src/routes.rs

@@ -9,10 +9,9 @@ use axum::{
 use compositor_pipeline::Pipeline;
 use serde_json::{json, Value};
 
-use crate::{
-    error::ApiError,
-    state::{ApiState, Response},
-};
+use crate::state::{ApiState, Response};
+
+use compositor_api::error::ApiError;
 
 use self::{
     update_output::handle_keyframe_request, update_output::handle_output_update,

src/routes/register_request.rs

@@ -4,9 +4,11 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    error::ApiError,
     routes::Json,
     state::{Pipeline, Response},
+};
+use compositor_api::{
+    error::ApiError,
     types::{
         DeckLink, ImageSpec, InputId, Mp4, OutputId, RendererId, RtpInputStream, RtpOutputStream,
         ShaderSpec, WebRendererSpec,

src/routes/unregister_request.rs

@@ -5,9 +5,10 @@ use compositor_render::{error::ErrorStack, RegistryType};
 use log::error;
 use serde::{Deserialize, Serialize};
 
-use crate::{
+use crate::state::{ApiState, Response};
+
+use compositor_api::{
     error::ApiError,
-    state::{ApiState, Response},
     types::{InputId, OutputId, RendererId},
 };
 

src/routes/update_output.rs

@@ -4,9 +4,10 @@ use axum::extract::{Path, State};
 use compositor_render::error::ErrorStack;
 use tracing::error;
 
-use crate::{
+use crate::state::{ApiState, Response};
+
+use compositor_api::{
     error::ApiError,
-    state::{ApiState, Response},
     types::{OutputId, UpdateOutputRequest},
 };
 

src/snapshot_tests/test_case.rs

@@ -3,12 +3,12 @@ use std::{fmt::Display, path::PathBuf, sync::Arc, time::Duration};
 use super::utils::{create_renderer, frame_to_rgba, snaphot_save_path, snapshots_diff};
 
 use anyhow::Result;
+use compositor_api::types::{self};
 use compositor_render::{
     scene::RGBColor, Frame, FrameData, FrameSet, InputId, OutputFrameFormat, OutputId, Renderer,
     RendererId, RendererSpec, Resolution, YuvPlanes,
 };
 use image::ImageBuffer;
-use live_compositor::types::{self};
 
 pub(super) const OUTPUT_ID: &str = "output_1";