Skip to content

feat: custom logger for C #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 4, 2024
Merged

feat: custom logger for C #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dojo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,8 @@ struct ResultToriiClient client_new(const char *torii_url,
const char *libp2p_relay_url,
struct FieldElement world);

void client_set_logger(struct ToriiClient *client, void (*logger)(const char*));

struct ResultCArrayu8 client_publish_message(struct ToriiClient *client,
const char *message,
struct Signature signature);
Expand Down
2 changes: 2 additions & 0 deletions dojo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,8 @@ Result<ToriiClient*> client_new(const char *torii_url,
const char *libp2p_relay_url,
FieldElement world);

void client_set_logger(ToriiClient *client, void (*logger)(const char*));

Result<CArray<uint8_t>> client_publish_message(ToriiClient *client,
const char *message,
Signature signature);
Expand Down
20 changes: 14 additions & 6 deletions src/c/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,21 @@ pub unsafe extern "C" fn client_new(
Result::Ok(Box::into_raw(Box::new(ToriiClient {
inner: client,
runtime,
logger: None,
})))
}

#[no_mangle]
#[allow(clippy::missing_safety_doc)]
pub unsafe extern "C" fn client_set_logger(
client: *mut ToriiClient,
logger: extern "C" fn(*const c_char),
) {
unsafe {
(*client).logger = Some(logger);
}
}

#[no_mangle]
#[allow(clippy::missing_safety_doc)]
pub unsafe extern "C" fn client_publish_message(
Expand Down Expand Up @@ -127,9 +139,7 @@ pub unsafe extern "C" fn client_entities(
client: *mut ToriiClient,
query: &Query,
) -> Result<CArray<Entity>> {
let query = (&query.clone()).into();

let entities_future = unsafe { (*client).inner.entities(query) };
let entities_future = unsafe { (*client).inner.entities(query.into()) };

match (*client).runtime.block_on(entities_future) {
Ok(entities) => {
Expand All @@ -147,9 +157,7 @@ pub unsafe extern "C" fn client_event_messages(
client: *mut ToriiClient,
query: &Query,
) -> Result<CArray<Entity>> {
let query = (&query.clone()).into();

let event_messages_future = unsafe { (*client).inner.event_messages(query) };
let event_messages_future = unsafe { (*client).inner.event_messages(query.into()) };

match (*client).runtime.block_on(event_messages_future) {
Ok(event_messages) => {
Expand Down
11 changes: 6 additions & 5 deletions src/c/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl<T> From<Option<T>> for COption<T> {
}

impl<T> From<COption<T>> for Option<T> {
fn from(val: COption<T>) -> Self {
fn from(val: COption<T>) -> Self {
match val {
COption::Some(v) => Some(v),
COption::None => None,
Expand Down Expand Up @@ -154,6 +154,7 @@ impl From<&Call> for starknet::core::types::FunctionCall {
pub struct ToriiClient {
pub inner: Client,
pub runtime: tokio::runtime::Runtime,
pub logger: Option<extern "C" fn(*const c_char)>,
}

#[derive(Clone, Debug)]
Expand Down Expand Up @@ -874,8 +875,8 @@ impl From<&KeysClause> for torii_grpc::types::KeysClause {
torii_grpc::types::KeysClause {
keys: keys
.iter()
.map(|o| o.as_ref().map(Into::into))
.map(Into::into)
.map(|o| o.clone().into())
.map(|o: Option<FieldElement>| o.as_ref().map(Into::into))
.collect(),
pattern_matching: (&val.pattern_matching).into(),
models: models
Expand All @@ -891,8 +892,8 @@ impl From<&torii_grpc::types::KeysClause> for KeysClause {
let keys = val
.keys
.iter()
.map(|o| o.as_ref().map(|k| k.into()))
.map(Into::into)
.map(|o| o.clone().into())
.map(|o: COption<_>| o.as_ref().map(Into::into))
.collect::<Vec<COption<FieldElement>>>();
let models = val
.models
Expand Down