aboutsummaryrefslogtreecommitdiff
path: root/src/message/signalproxy
diff options
context:
space:
mode:
Diffstat (limited to 'src/message/signalproxy')
-rw-r--r--src/message/signalproxy/heartbeat.rs9
-rw-r--r--src/message/signalproxy/initdata.rs5
-rw-r--r--src/message/signalproxy/initrequest.rs5
-rw-r--r--src/message/signalproxy/mod.rs34
-rw-r--r--src/message/signalproxy/objects/backlogmanager.rs11
-rw-r--r--src/message/signalproxy/rpccall.rs5
-rw-r--r--src/message/signalproxy/syncmessage.rs5
7 files changed, 32 insertions, 42 deletions
diff --git a/src/message/signalproxy/heartbeat.rs b/src/message/signalproxy/heartbeat.rs
index 58dc430..32df3d4 100644
--- a/src/message/signalproxy/heartbeat.rs
+++ b/src/message/signalproxy/heartbeat.rs
@@ -1,3 +1,4 @@
+use crate::error::ProtocolError;
use crate::message::MessageType;
use crate::primitive::{DateTime, Variant, VariantList};
use crate::{deserialize::Deserialize, serialize::Serialize};
@@ -8,7 +9,7 @@ pub struct HeartBeat {
}
impl Serialize for HeartBeat {
- fn serialize(&self) -> Result<Vec<std::primitive::u8>, failure::Error> {
+ fn serialize(&self) -> Result<Vec<std::primitive::u8>, ProtocolError> {
let mut res = VariantList::new();
res.push(Variant::i32(MessageType::HeartBeat as i32));
@@ -19,7 +20,7 @@ impl Serialize for HeartBeat {
}
impl Deserialize for HeartBeat {
- fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), failure::Error> {
+ fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), ProtocolError> {
let (size, mut res) = VariantList::parse(&b)?;
res.remove(0);
@@ -39,7 +40,7 @@ pub struct HeartBeatReply {
}
impl Serialize for HeartBeatReply {
- fn serialize(&self) -> Result<Vec<std::primitive::u8>, failure::Error> {
+ fn serialize(&self) -> Result<Vec<std::primitive::u8>, ProtocolError> {
let mut res = VariantList::new();
res.push(Variant::i32(MessageType::HeartBeatReply as i32));
@@ -50,7 +51,7 @@ impl Serialize for HeartBeatReply {
}
impl Deserialize for HeartBeatReply {
- fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), failure::Error> {
+ fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), ProtocolError> {
let (size, mut res) = VariantList::parse(&b)?;
res.remove(0);
diff --git a/src/message/signalproxy/initdata.rs b/src/message/signalproxy/initdata.rs
index a391b4a..2b9fa18 100644
--- a/src/message/signalproxy/initdata.rs
+++ b/src/message/signalproxy/initdata.rs
@@ -1,3 +1,4 @@
+use crate::error::ProtocolError;
use crate::message::MessageType;
use crate::primitive::{Variant, VariantList};
use crate::{deserialize::Deserialize, serialize::Serialize};
@@ -12,7 +13,7 @@ pub struct InitData {
}
impl Serialize for InitData {
- fn serialize(&self) -> Result<Vec<std::primitive::u8>, failure::Error> {
+ fn serialize(&self) -> Result<Vec<std::primitive::u8>, ProtocolError> {
let mut res = VariantList::new();
res.push(Variant::i32(MessageType::InitData as i32));
@@ -26,7 +27,7 @@ impl Serialize for InitData {
}
impl Deserialize for InitData {
- fn parse(b: &[u8]) -> Result<(usize, Self), failure::Error> {
+ fn parse(b: &[u8]) -> Result<(usize, Self), ProtocolError> {
let (size, mut res) = VariantList::parse(&b)?;
res.remove(0);
diff --git a/src/message/signalproxy/initrequest.rs b/src/message/signalproxy/initrequest.rs
index 1beef5c..79b6cbc 100644
--- a/src/message/signalproxy/initrequest.rs
+++ b/src/message/signalproxy/initrequest.rs
@@ -1,3 +1,4 @@
+use crate::error::ProtocolError;
use crate::message::MessageType;
use crate::primitive::{Variant, VariantList};
use crate::{deserialize::Deserialize, serialize::Serialize};
@@ -9,7 +10,7 @@ pub struct InitRequest {
}
impl Serialize for InitRequest {
- fn serialize(&self) -> Result<Vec<std::primitive::u8>, failure::Error> {
+ fn serialize(&self) -> Result<Vec<std::primitive::u8>, ProtocolError> {
let mut res = VariantList::new();
res.push(Variant::i32(MessageType::InitRequest as i32));
@@ -21,7 +22,7 @@ impl Serialize for InitRequest {
}
impl Deserialize for InitRequest {
- fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), failure::Error> {
+ fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), ProtocolError> {
let (size, mut res) = VariantList::parse(&b)?;
res.remove(0);
diff --git a/src/message/signalproxy/mod.rs b/src/message/signalproxy/mod.rs
index cc1fc54..5801846 100644
--- a/src/message/signalproxy/mod.rs
+++ b/src/message/signalproxy/mod.rs
@@ -1,5 +1,6 @@
use crate::{
deserialize::Deserialize,
+ error::ProtocolError,
primitive::{Variant, VariantList},
serialize::Serialize,
};
@@ -57,13 +58,7 @@ impl SyncProxy {
}
/// Send a SyncMessage
- fn sync(
- &self,
- class_name: Class,
- object_name: Option<&str>,
- function: &str,
- params: VariantList,
- ) {
+ fn sync(&self, class_name: Class, object_name: Option<&str>, function: &str, params: VariantList) {
let msg = SyncMessage {
class_name,
object_name: object_name.unwrap_or("").to_string(),
@@ -91,12 +86,10 @@ pub trait Syncable {
/// Send a SyncMessage.
fn send_sync(&self, function: &str, params: VariantList) {
- crate::message::signalproxy::SYNC_PROXY.get().unwrap().sync(
- Self::CLASS,
- None,
- function,
- params,
- );
+ crate::message::signalproxy::SYNC_PROXY
+ .get()
+ .unwrap()
+ .sync(Self::CLASS, None, function, params);
}
/// Send a RpcCall
@@ -125,10 +118,9 @@ where
Self: Sized,
{
match msg.slot_name.as_str() {
- "requestUpdate" => StatefulSyncableServer::request_update(
- self,
- msg.params.pop().unwrap().try_into().unwrap(),
- ),
+ "requestUpdate" => {
+ StatefulSyncableServer::request_update(self, msg.params.pop().unwrap().try_into().unwrap())
+ }
_ => StatefulSyncableServer::sync_custom(self, msg),
}
}
@@ -167,9 +159,7 @@ pub trait StatefulSyncableClient: Syncable + translation::NetworkMap {
Self: Sized,
{
match msg.slot_name.as_str() {
- "update" => {
- StatefulSyncableClient::update(self, msg.params.pop().unwrap().try_into().unwrap())
- }
+ "update" => StatefulSyncableClient::update(self, msg.params.pop().unwrap().try_into().unwrap()),
_ => StatefulSyncableClient::sync_custom(self, msg),
}
}
@@ -229,7 +219,7 @@ pub enum Message {
// }
impl Serialize for Message {
- fn serialize(&self) -> Result<Vec<std::primitive::u8>, failure::Error> {
+ fn serialize(&self) -> Result<Vec<std::primitive::u8>, ProtocolError> {
match &self {
Message::SyncMessage(value) => value.serialize(),
Message::RpcCall(value) => value.serialize(),
@@ -242,7 +232,7 @@ impl Serialize for Message {
}
impl Deserialize for Message {
- fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), failure::Error> {
+ fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), ProtocolError> {
let (_, message_type) = i32::parse(&b[9..13])?;
match MessageType::from(message_type) {
diff --git a/src/message/signalproxy/objects/backlogmanager.rs b/src/message/signalproxy/objects/backlogmanager.rs
index 7d6624d..4e74b15 100644
--- a/src/message/signalproxy/objects/backlogmanager.rs
+++ b/src/message/signalproxy/objects/backlogmanager.rs
@@ -48,6 +48,8 @@
// receiveBacklogAllFiltered(first: MsgId, last: MsgId, limit: Int, additional: Int, type: Int, flags: Int, messages: QVariantList)
// }
+#![allow(non_snake_case, dead_code)]
+
use crate::primitive::VariantList;
/// Receive and Request Backlog
@@ -59,14 +61,7 @@ impl BacklogManager {
/// Loads backlog for `bufferId`, starting at message `first`, up to `last`
/// (plus `additional` more messages after `last`) but at most `limit`
/// messages total.
- fn requestBacklog(
- self: Self,
- buffer_id: u32,
- first: u32,
- last: u32,
- limit: u32,
- additional: u32,
- ) {
+ fn requestBacklog(self: Self, buffer_id: u32, first: u32, last: u32, limit: u32, additional: u32) {
unimplemented!()
}
diff --git a/src/message/signalproxy/rpccall.rs b/src/message/signalproxy/rpccall.rs
index e485f6b..04c75cb 100644
--- a/src/message/signalproxy/rpccall.rs
+++ b/src/message/signalproxy/rpccall.rs
@@ -1,3 +1,4 @@
+use crate::error::ProtocolError;
use crate::message::MessageType;
use crate::primitive::Message;
use crate::primitive::{Variant, VariantList};
@@ -21,7 +22,7 @@ pub struct DisplayMessage {
// }
impl Serialize for RpcCall {
- fn serialize(&self) -> Result<Vec<std::primitive::u8>, failure::Error> {
+ fn serialize(&self) -> Result<Vec<std::primitive::u8>, ProtocolError> {
let mut res = VariantList::new();
res.push(Variant::i32(MessageType::RpcCall as i32));
@@ -39,7 +40,7 @@ impl Serialize for RpcCall {
}
impl Deserialize for RpcCall {
- fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), failure::Error> {
+ fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), ProtocolError> {
let (size, mut res) = VariantList::parse(&b)?;
res.remove(0);
diff --git a/src/message/signalproxy/syncmessage.rs b/src/message/signalproxy/syncmessage.rs
index 7e7aabc..d1f359b 100644
--- a/src/message/signalproxy/syncmessage.rs
+++ b/src/message/signalproxy/syncmessage.rs
@@ -1,3 +1,4 @@
+use crate::error::ProtocolError;
use crate::message::MessageType;
use crate::primitive::{Variant, VariantList};
use crate::{deserialize::Deserialize, serialize::Serialize};
@@ -85,7 +86,7 @@ pub struct SyncMessage {
// impl Act for SyncMessage {}
impl Serialize for SyncMessage {
- fn serialize(&self) -> Result<Vec<std::primitive::u8>, failure::Error> {
+ fn serialize(&self) -> Result<Vec<std::primitive::u8>, ProtocolError> {
let mut res = VariantList::new();
res.push(Variant::i32(MessageType::SyncMessage as i32));
@@ -100,7 +101,7 @@ impl Serialize for SyncMessage {
}
impl Deserialize for SyncMessage {
- fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), failure::Error> {
+ fn parse(b: &[std::primitive::u8]) -> Result<(std::primitive::usize, Self), ProtocolError> {
let (size, mut res) = VariantList::parse(&b)?;
res.remove(0);
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-02 14:40:32 +0000