dbus: move protocol core into workspace crate

Cargo.lock

@@ -696,6 +696,7 @@ dependencies = [
  "jay-cmm",
  "jay-config",
  "jay-criteria",
+ "jay-dbus-core",
  "jay-edid",
  "jay-formats",
  "jay-geometry",
@@ -762,6 +763,18 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "jay-dbus-core"
+version = "0.1.0"
+dependencies = [
+ "bstr",
+ "jay-bufio",
+ "jay-io-uring",
+ "jay-utils",
+ "thiserror",
+ "uapi",
+]
+
 [[package]]
 name = "jay-edid"
 version = "0.1.0"

Cargo.toml

@@ -30,6 +30,7 @@ members = [
     "async-engine",
     "io-uring",
     "bufio",
+    "dbus-core",
     "toml-config",
     "algorithms",
     "toml-spec",
@@ -61,6 +62,7 @@ jay-tracy = { version = "0.1.0", path = "tracy" }
 jay-async-engine = { version = "0.1.0", path = "async-engine" }
 jay-io-uring = { version = "0.1.0", path = "io-uring" }
 jay-bufio = { version = "0.1.0", path = "bufio" }
+jay-dbus-core = { version = "0.1.0", path = "dbus-core" }
 
 uapi = "0.2.13"
 thiserror = "2.0.11"

dbus-core/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "jay-dbus-core"
+version = "0.1.0"
+edition = "2024"
+license = "GPL-3.0-only"
+
+[dependencies]
+jay-bufio = { version = "0.1.0", path = "../bufio" }
+jay-io-uring = { version = "0.1.0", path = "../io-uring" }
+jay-utils = { version = "0.1.0", path = "../utils" }
+
+bstr = { version = "1.9.0", default-features = false, features = ["std"] }
+thiserror = "2.0.11"
+uapi = "0.2.13"

dbus-core/src/dynamic_type.rs

@@ -3,10 +3,8 @@ use {
         TY_ARRAY, TY_BOOLEAN, TY_BYTE, TY_DOUBLE, TY_INT16, TY_INT32, TY_INT64, TY_OBJECT_PATH,
         TY_SIGNATURE, TY_STRING, TY_UINT16, TY_UINT32, TY_UINT64, TY_UNIX_FD, TY_VARIANT,
     },
-    crate::{
+    crate::{types::Variant, DbusError, DynamicType, Parser},
-        dbus::{DbusError, DynamicType, Parser, types::Variant},
+    jay_utils::buf::DynamicBuf,
-        utils::buf::DynamicBuf,
-    },
     std::ops::Deref,
 };
 
@@ -156,11 +154,8 @@ impl DynamicType {
                 }
                 let mut vals = vec![];
                 {
-                    let mut parser = Parser {
+                    let mut parser =
-                        buf: &parser.buf[..parser.pos + len],
+                        Parser::new_at(&parser.buf[..parser.pos + len], parser.pos, parser.fds);
-                        pos: parser.pos,
-                        fds: parser.fds,
-                    };
                     while !parser.eof() {
                         vals.push(el.parse(&mut parser)?);
                     }

dbus-core/src/formatter.rs

@@ -1,8 +1,6 @@
 use {
-    crate::{
+    crate::{types::Variant, DbusType, Formatter},
-        dbus::{DbusType, Formatter, types::Variant},
+    jay_utils::buf::DynamicBuf,
-        utils::buf::DynamicBuf,
-    },
     std::rc::Rc,
     uapi::{OwnedFd, Packed},
 };

dbus-core/src/lib.rs

@@ -0,0 +1,232 @@
+pub use {property::{Get, GetReply}, types::*};
+use {
+    jay_bufio::BufIoError,
+    jay_io_uring::IoUringError,
+    jay_utils::{buf::DynamicBuf, oserror::OsError},
+    std::{borrow::Cow, fmt::Display, rc::Rc},
+    thiserror::Error,
+    uapi::OwnedFd,
+};
+
+mod dynamic_type;
+mod formatter;
+mod parser;
+pub mod property;
+pub mod types;
+
+#[derive(Debug)]
+pub struct CallError {
+    pub name: String,
+    pub msg: Option<String>,
+}
+
+impl Display for CallError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if let Some(msg) = &self.msg {
+            write!(f, "{}: {}", self.name, msg)
+        } else {
+            write!(f, "{}", self.name)
+        }
+    }
+}
+
+#[derive(Debug, Error)]
+pub enum DbusError {
+    #[error("Encountered an unknown type in a signature")]
+    UnknownType,
+    #[error("Function call reply does not contain a reply serial")]
+    NoReplySerial,
+    #[error("Signal message contains no interface or member or path")]
+    MissingSignalHeaders,
+    #[error("Method call message contains no interface or member or path")]
+    MissingMethodCallHeaders,
+    #[error("Error has no error name")]
+    NoErrorName,
+    #[error("The socket was killed")]
+    Killed,
+    #[error("{0}")]
+    CallError(CallError),
+    #[error("FD index is out of bounds")]
+    OobFds,
+    #[error("Variant has an invalid type")]
+    InvalidVariantType,
+    #[error("Could not create a socket")]
+    Socket(#[source] OsError),
+    #[error("Could not connect")]
+    Connect(#[source] IoUringError),
+    #[error("Could not write to the dbus socket")]
+    WriteError(#[source] IoUringError),
+    #[error("Could not read from the dbus socket")]
+    ReadError(#[source] IoUringError),
+    #[error("timeout")]
+    IoUringError(#[source] Box<IoUringError>),
+    #[error("Server did not send auth challenge")]
+    NoChallenge,
+    #[error("Server did not accept our authentication")]
+    Auth,
+    #[error("Array length is not a multiple of the element size")]
+    PodArrayLength,
+    #[error("Peer did not send enough fds")]
+    TooFewFds,
+    #[error("Variant signature is not a single type")]
+    TrailingVariantSignature,
+    #[error("Dict signature does not contain a terminating '}}'")]
+    UnterminatedDict,
+    #[error("Struct signature does not contain a terminating '}}'")]
+    UnterminatedStruct,
+    #[error("Dict signature contains trailing types")]
+    DictTrailing,
+    #[error("String does not contain valid UTF-8")]
+    InvalidUtf8,
+    #[error("Unexpected end of message")]
+    UnexpectedEof,
+    #[error("Boolean value was not 0 or 1")]
+    InvalidBoolValue,
+    #[error("Signature is empty")]
+    EmptySignature,
+    #[error("The session bus address is not set")]
+    SessionBusAddressNotSet,
+    #[error("Server does not support FD passing")]
+    UnixFd,
+    #[error("Server message has a different endianess than ourselves")]
+    InvalidEndianess,
+    #[error("Server speaks an unexpected protocol version")]
+    InvalidProtocol,
+    #[error("Signature contains an invalid type")]
+    InvalidSignatureType,
+    #[error("The signal already has a handler")]
+    AlreadyHandled,
+    #[error(transparent)]
+    BufIoError(#[from] BufIoError),
+    #[error(transparent)]
+    DbusError(Rc<DbusError>),
+}
+
+impl From<IoUringError> for DbusError {
+    fn from(e: IoUringError) -> Self {
+        DbusError::IoUringError(Box::new(e))
+    }
+}
+
+const TY_BYTE: u8 = b'y';
+const TY_BOOLEAN: u8 = b'b';
+const TY_INT16: u8 = b'n';
+const TY_UINT16: u8 = b'q';
+const TY_INT32: u8 = b'i';
+const TY_UINT32: u8 = b'u';
+const TY_INT64: u8 = b'x';
+const TY_UINT64: u8 = b't';
+const TY_DOUBLE: u8 = b'd';
+const TY_STRING: u8 = b's';
+const TY_OBJECT_PATH: u8 = b'o';
+const TY_SIGNATURE: u8 = b'g';
+const TY_ARRAY: u8 = b'a';
+const TY_VARIANT: u8 = b'v';
+const TY_UNIX_FD: u8 = b'h';
+
+#[derive(Clone, Debug)]
+pub enum DynamicType {
+    U8,
+    Bool,
+    I16,
+    U16,
+    I32,
+    U32,
+    I64,
+    U64,
+    F64,
+    String,
+    ObjectPath,
+    Signature,
+    Variant,
+    Fd,
+    Array(Box<DynamicType>),
+    DictEntry(Box<DynamicType>, Box<DynamicType>),
+    Struct(Vec<DynamicType>),
+}
+
+pub struct Parser<'a> {
+    pub(crate) buf: &'a [u8],
+    pub(crate) pos: usize,
+    pub(crate) fds: &'a [Rc<OwnedFd>],
+}
+
+pub struct Formatter<'a> {
+    fds: &'a mut Vec<Rc<OwnedFd>>,
+    buf: &'a mut DynamicBuf,
+}
+
+pub unsafe trait Message<'a>: Sized + 'a {
+    const SIGNATURE: &'static str;
+    const INTERFACE: &'static str;
+    const MEMBER: &'static str;
+    type Generic<'b>: Message<'b>;
+
+    fn marshal(&self, w: &mut Formatter);
+    fn unmarshal(p: &mut Parser<'a>) -> Result<Self, DbusError>;
+    fn num_fds(&self) -> u32;
+}
+
+pub struct ErrorMessage<'a> {
+    pub msg: Cow<'a, str>,
+}
+
+unsafe impl<'a> Message<'a> for ErrorMessage<'a> {
+    const SIGNATURE: &'static str = "s";
+    const INTERFACE: &'static str = "";
+    const MEMBER: &'static str = "";
+    type Generic<'b> = ErrorMessage<'b>;
+
+    fn marshal(&self, w: &mut Formatter) {
+        self.msg.marshal(w)
+    }
+
+    fn unmarshal(p: &mut Parser<'a>) -> Result<Self, DbusError> {
+        Ok(Self {
+            msg: p.unmarshal()?,
+        })
+    }
+
+    fn num_fds(&self) -> u32 {
+        0
+    }
+}
+
+pub trait Property {
+    const INTERFACE: &'static str;
+    const PROPERTY: &'static str;
+    type Type: DbusType<'static>;
+}
+
+pub trait Signal<'a>: Message<'a> {}
+
+pub trait MethodCall<'a>: Message<'a> {
+    type Reply: Message<'static>;
+}
+
+pub unsafe trait DbusType<'a>: Clone + 'a {
+    const ALIGNMENT: usize;
+    const IS_POD: bool;
+    type Generic<'b>: DbusType<'b> + 'b;
+
+    fn consume_signature(s: &mut &[u8]) -> Result<(), DbusError>;
+    #[allow(clippy::allow_attributes, dead_code)]
+    fn write_signature(w: &mut Vec<u8>);
+    fn marshal(&self, fmt: &mut Formatter);
+    fn unmarshal(parser: &mut Parser<'a>) -> Result<Self, DbusError>;
+
+    fn num_fds(&self) -> u32 {
+        0
+    }
+}
+
+pub mod prelude {
+    pub use {
+        super::{
+            DbusError, DbusType, Formatter, Message, MethodCall, Parser, Property, Signal,
+            types::{Bool, DictEntry, ObjectPath, Variant},
+        },
+        std::{borrow::Cow, rc::Rc},
+        uapi::OwnedFd,
+    };
+}

dbus-core/src/parser.rs

@@ -1,7 +1,7 @@
 use {
-    crate::dbus::{
+    crate::{
+        types::{Bool, ObjectPath, Signature, Variant, FALSE, TRUE},
         DbusError, DbusType, DynamicType, Parser,
-        types::{Bool, FALSE, ObjectPath, Signature, TRUE, Variant},
     },
     bstr::ByteSlice,
     std::{borrow::Cow, rc::Rc},
@@ -10,7 +10,11 @@ use {
 
 impl<'a> Parser<'a> {
     pub fn new(buf: &'a [u8], fds: &'a [Rc<OwnedFd>]) -> Self {
-        Self { buf, pos: 0, fds }
+        Self::new_at(buf, 0, fds)
+    }
+
+    pub fn new_at(buf: &'a [u8], pos: usize, fds: &'a [Rc<OwnedFd>]) -> Self {
+        Self { buf, pos, fds }
     }
 
     pub fn eof(&self) -> bool {
@@ -107,11 +111,7 @@ impl<'a> Parser<'a> {
             self.pos += len;
             Ok(Cow::Borrowed(slice))
         } else {
-            let mut parser = Parser {
+            let mut parser = Parser::new_at(&self.buf[..self.pos + len], self.pos, self.fds);
-                buf: &self.buf[..self.pos + len],
-                pos: self.pos,
-                fds: self.fds,
-            };
             self.pos += len;
             let mut res = vec![];
             while !parser.eof() {

dbus-core/src/property.rs

@@ -1,5 +1,5 @@
 use {
-    crate::dbus::{DbusError, DbusType, Formatter, Message, MethodCall, Parser},
+    crate::{DbusError, DbusType, Formatter, Message, MethodCall, Parser},
     std::{borrow::Cow, marker::PhantomData},
 };
 

dbus-core/src/types.rs

@@ -1,12 +1,10 @@
 use {
     crate::{
-        dbus::{
+        DbusError, DbusType, DynamicType, Formatter, Parser, TY_ARRAY, TY_BOOLEAN, TY_BYTE,
-            DbusError, DbusType, DynamicType, Formatter, Parser, TY_ARRAY, TY_BOOLEAN, TY_BYTE,
+        TY_DOUBLE, TY_INT16, TY_INT32, TY_INT64, TY_OBJECT_PATH, TY_SIGNATURE, TY_STRING,
-            TY_DOUBLE, TY_INT16, TY_INT32, TY_INT64, TY_OBJECT_PATH, TY_SIGNATURE, TY_STRING,
+        TY_UINT16, TY_UINT32, TY_UINT64, TY_UNIX_FD, TY_VARIANT,
-            TY_UINT16, TY_UINT32, TY_UINT64, TY_UNIX_FD, TY_VARIANT,
-        },
-        utils::buf::DynamicBuf,
     },
+    jay_utils::buf::DynamicBuf,
     std::{borrow::Cow, ops::Deref, rc::Rc},
     uapi::{OwnedFd, Packed, Pod},
 };

src/dbus.rs

@@ -1,16 +1,13 @@
-pub use types::*;
+pub use jay_dbus_core::*;
 use {
     crate::{
         async_engine::{AsyncEngine, SpawnedFuture},
-        dbus::{property::GetReply, types::{ObjectPath, Signature, Variant}},
+        io_uring::IoUring,
-        io_uring::{IoUring, IoUringError},
         utils::{
-            buf::DynamicBuf,
+            bufio::BufIo,
-            bufio::{BufIo, BufIoError},
             clonecell::CloneCell,
             copyhashmap::CopyHashMap,
             numcell::NumCell,
-            oserror::OsError,
             run_toplevel::RunToplevel,
             stack::Stack,
             vecstorage::VecStorage,
@@ -21,7 +18,7 @@ use {
     std::{
         borrow::Cow,
         cell::{Cell, RefCell},
-        fmt::{Debug, Display},
+        fmt::Debug,
         future::Future,
         marker::PhantomData,
         mem,
@@ -29,109 +26,14 @@ use {
         rc::Rc,
         task::{Context, Poll, Waker},
     },
-    thiserror::Error,
     uapi::OwnedFd,
 };
 
 mod auth;
-mod dynamic_type;
-mod formatter;
 mod holder;
 mod incoming;
 mod outgoing;
-mod parser;
-mod property;
 mod socket;
-mod types;
-
-#[derive(Debug)]
-pub struct CallError {
-    pub name: String,
-    pub msg: Option<String>,
-}
-
-impl Display for CallError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if let Some(msg) = &self.msg {
-            write!(f, "{}: {}", self.name, msg)
-        } else {
-            write!(f, "{}", self.name)
-        }
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum DbusError {
-    #[error("Encountered an unknown type in a signature")]
-    UnknownType,
-    #[error("Function call reply does not contain a reply serial")]
-    NoReplySerial,
-    #[error("Signal message contains no interface or member or path")]
-    MissingSignalHeaders,
-    #[error("Method call message contains no interface or member or path")]
-    MissingMethodCallHeaders,
-    #[error("Error has no error name")]
-    NoErrorName,
-    #[error("The socket was killed")]
-    Killed,
-    #[error("{0}")]
-    CallError(CallError),
-    #[error("FD index is out of bounds")]
-    OobFds,
-    #[error("Variant has an invalid type")]
-    InvalidVariantType,
-    #[error("Could not create a socket")]
-    Socket(#[source] OsError),
-    #[error("Could not connect")]
-    Connect(#[source] IoUringError),
-    #[error("Could not write to the dbus socket")]
-    WriteError(#[source] IoUringError),
-    #[error("Could not read from the dbus socket")]
-    ReadError(#[source] IoUringError),
-    #[error("timeout")]
-    IoUringError(#[source] Box<IoUringError>),
-    #[error("Server did not send auth challenge")]
-    NoChallenge,
-    #[error("Server did not accept our authentication")]
-    Auth,
-    #[error("Array length is not a multiple of the element size")]
-    PodArrayLength,
-    #[error("Peer did not send enough fds")]
-    TooFewFds,
-    #[error("Variant signature is not a single type")]
-    TrailingVariantSignature,
-    #[error("Dict signature does not contain a terminating '}}'")]
-    UnterminatedDict,
-    #[error("Struct signature does not contain a terminating '}}'")]
-    UnterminatedStruct,
-    #[error("Dict signature contains trailing types")]
-    DictTrailing,
-    #[error("String does not contain valid UTF-8")]
-    InvalidUtf8,
-    #[error("Unexpected end of message")]
-    UnexpectedEof,
-    #[error("Boolean value was not 0 or 1")]
-    InvalidBoolValue,
-    #[error("Signature is empty")]
-    EmptySignature,
-    #[error("The session bus address is not set")]
-    SessionBusAddressNotSet,
-    #[error("Server does not support FD passing")]
-    UnixFd,
-    #[error("Server message has a different endianess than ourselves")]
-    InvalidEndianess,
-    #[error("Server speaks an unexpected protocol version")]
-    InvalidProtocol,
-    #[error("Signature contains an invalid type")]
-    InvalidSignatureType,
-    #[error("The signal already has a handler")]
-    AlreadyHandled,
-    #[error(transparent)]
-    BufIoError(#[from] BufIoError),
-    #[error(transparent)]
-    DbusError(Rc<DbusError>),
-}
-efrom!(DbusError, IoUringError);
 
 const DBUS_SESSION_BUS_ADDRESS: &str = "DBUS_SESSION_BUS_ADDRESS";
 
@@ -274,22 +176,6 @@ pub struct DbusSocket {
     signal_handlers: RefCell<AHashMap<(&'static str, &'static str), InterfaceSignalHandlers>>,
 }
 
-const TY_BYTE: u8 = b'y';
-const TY_BOOLEAN: u8 = b'b';
-const TY_INT16: u8 = b'n';
-const TY_UINT16: u8 = b'q';
-const TY_INT32: u8 = b'i';
-const TY_UINT32: u8 = b'u';
-const TY_INT64: u8 = b'x';
-const TY_UINT64: u8 = b't';
-const TY_DOUBLE: u8 = b'd';
-const TY_STRING: u8 = b's';
-const TY_OBJECT_PATH: u8 = b'o';
-const TY_SIGNATURE: u8 = b'g';
-const TY_ARRAY: u8 = b'a';
-const TY_VARIANT: u8 = b'v';
-const TY_UNIX_FD: u8 = b'h';
-
 const HDR_PATH: u8 = 1;
 const HDR_INTERFACE: u8 = 2;
 const HDR_MEMBER: u8 = 3;
@@ -357,102 +243,6 @@ impl Drop for DbusHolder {
     }
 }
 
-#[derive(Clone, Debug)]
-pub enum DynamicType {
-    U8,
-    Bool,
-    I16,
-    U16,
-    I32,
-    U32,
-    I64,
-    U64,
-    F64,
-    String,
-    ObjectPath,
-    Signature,
-    Variant,
-    Fd,
-    Array(Box<DynamicType>),
-    DictEntry(Box<DynamicType>, Box<DynamicType>),
-    Struct(Vec<DynamicType>),
-}
-
-pub struct Parser<'a> {
-    buf: &'a [u8],
-    pos: usize,
-    fds: &'a [Rc<OwnedFd>],
-}
-
-pub struct Formatter<'a> {
-    fds: &'a mut Vec<Rc<OwnedFd>>,
-    buf: &'a mut DynamicBuf,
-}
-
-pub unsafe trait Message<'a>: Sized + 'a {
-    const SIGNATURE: &'static str;
-    const INTERFACE: &'static str;
-    const MEMBER: &'static str;
-    type Generic<'b>: Message<'b>;
-
-    fn marshal(&self, w: &mut Formatter);
-    fn unmarshal(p: &mut Parser<'a>) -> Result<Self, DbusError>;
-    fn num_fds(&self) -> u32;
-}
-
-pub struct ErrorMessage<'a> {
-    pub msg: Cow<'a, str>,
-}
-
-unsafe impl<'a> Message<'a> for ErrorMessage<'a> {
-    const SIGNATURE: &'static str = "s";
-    const INTERFACE: &'static str = "";
-    const MEMBER: &'static str = "";
-    type Generic<'b> = ErrorMessage<'b>;
-
-    fn marshal(&self, w: &mut Formatter) {
-        self.msg.marshal(w)
-    }
-
-    fn unmarshal(p: &mut Parser<'a>) -> Result<Self, DbusError> {
-        Ok(Self {
-            msg: p.unmarshal()?,
-        })
-    }
-
-    fn num_fds(&self) -> u32 {
-        0
-    }
-}
-
-pub trait Property {
-    const INTERFACE: &'static str;
-    const PROPERTY: &'static str;
-    type Type: DbusType<'static>;
-}
-
-pub trait Signal<'a>: Message<'a> {}
-
-pub trait MethodCall<'a>: Message<'a> {
-    type Reply: Message<'static>;
-}
-
-pub unsafe trait DbusType<'a>: Clone + 'a {
-    const ALIGNMENT: usize;
-    const IS_POD: bool;
-    type Generic<'b>: DbusType<'b> + 'b;
-
-    fn consume_signature(s: &mut &[u8]) -> Result<(), DbusError>;
-    #[allow(clippy::allow_attributes, dead_code)]
-    fn write_signature(w: &mut Vec<u8>);
-    fn marshal(&self, fmt: &mut Formatter);
-    fn unmarshal(parser: &mut Parser<'a>) -> Result<Self, DbusError>;
-
-    fn num_fds(&self) -> u32 {
-        0
-    }
-}
-
 pub struct Reply<T: Message<'static>> {
     socket: Rc<DbusSocket>,
     buf: Vec<u8>,
@@ -609,14 +399,3 @@ struct InterfaceSignalHandlers {
     unconditional: Option<Rc<dyn SignalHandlerApi>>,
     conditional: AHashMap<String, Rc<dyn SignalHandlerApi>>,
 }
-
-pub mod prelude {
-    pub use {
-        super::{
-            DbusError, DbusType, Formatter, Message, MethodCall, Parser, Property, Signal,
-            types::{Bool, DictEntry, ObjectPath, Variant},
-        },
-        std::{borrow::Cow, rc::Rc},
-        uapi::OwnedFd,
-    };
-}

src/dbus/incoming.rs

@@ -83,11 +83,8 @@ impl Incoming {
             return Err(DbusError::TooFewFds);
         }
         let fds: Vec<_> = self.incoming.fds.drain(..unix_fds).collect();
-        let mut parser = Parser {
+        let mut parser =
-            buf: msg_buf,
+            Parser::new_at(msg_buf, FIXED_HEADER_SIZE + dyn_header_len as usize, &fds);
-            pos: FIXED_HEADER_SIZE + dyn_header_len as usize,
-            fds: &fds,
-        };
         match msg_ty {
             MSG_METHOD_CALL => {
                 let sender = match &headers.sender {