diff --git a/examples/async-api-client/src/api_client.rs b/examples/async-api-client/src/api_client.rs new file mode 100644 index 0000000000..d79aa0c5b6 --- /dev/null +++ b/examples/async-api-client/src/api_client.rs @@ -0,0 +1,76 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +use crate::{run_task, ApiError, Result, TaskRunner}; +use std::sync::Arc; + +#[async_trait::async_trait] +pub trait HttpClient: Send + Sync { + async fn fetch(&self, url: String, credentials: String) -> Result; +} + +impl From for ApiError { + fn from(e: serde_json::Error) -> Self { + Self::Json { + reason: e.to_string(), + } + } +} + +#[derive(Debug, serde::Deserialize)] +pub struct Issue { + pub url: String, + pub title: String, + pub state: IssueState, +} + +#[derive(Debug, serde::Deserialize)] +pub enum IssueState { + #[serde(rename = "open")] + Open, + #[serde(rename = "closed")] + Closed, +} + +pub struct ApiClient { + http_client: Arc, + task_runner: Arc, +} + +impl ApiClient { + // Pretend this is a blocking call that needs to load the credentials from disk/network + fn load_credentials_sync(&self) -> String { + String::from("username:password") + } + + async fn load_credentials(self: Arc) -> String { + let self_cloned = Arc::clone(&self); + run_task(&self.task_runner, move || { + self_cloned.load_credentials_sync() + }) + .await + } +} + +impl ApiClient { + pub fn new(http_client: Arc, task_runner: Arc) -> Self { + Self { + http_client, + task_runner, + } + } + + pub async fn get_issue( + self: Arc, + owner: String, + repository: String, + issue_number: u32, + ) -> Result { + let credentials = self.clone().load_credentials().await; + let url = + format!("https://api.github.com/repos/{owner}/{repository}/issues/{issue_number}"); + let body = self.http_client.fetch(url, credentials).await?; + Ok(serde_json::from_str(&body)?) + } +} diff --git a/examples/async-api-client/src/async-api-client.udl b/examples/async-api-client/src/async-api-client.udl index d041fb4b03..282c433a9a 100644 --- a/examples/async-api-client/src/async-api-client.udl +++ b/examples/async-api-client/src/async-api-client.udl @@ -13,7 +13,20 @@ interface ApiError { [Trait, WithForeign] interface HttpClient { [Throws=ApiError, Async] - string fetch(string url); // fetch an URL and return the body + string fetch(string url, string credentials); // fetch an URL and return the body +}; + +// Run Rust tasks in a thread pool. +// Implemented by the foreign bindings +[Trait, WithForeign] +interface TaskRunner { + [Async] + void run_task(RustTask task); +}; + +[Trait] +interface RustTask { + void execute(); }; dictionary Issue { @@ -29,7 +42,7 @@ enum IssueState { // Implemented by the Rust code interface ApiClient { - constructor(HttpClient http_client); + constructor(HttpClient http_client, TaskRunner task_runner); [Throws=ApiError, Async] Issue get_issue(string owner, string repository, u32 issue_number); diff --git a/examples/async-api-client/src/lib.rs b/examples/async-api-client/src/lib.rs index 851de6b8a1..8417136e36 100644 --- a/examples/async-api-client/src/lib.rs +++ b/examples/async-api-client/src/lib.rs @@ -2,7 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -use std::sync::Arc; +mod api_client; +mod tasks; +mod test_data; + +pub use api_client::{ApiClient, HttpClient, Issue, IssueState}; +pub use tasks::{run_task, RustTask, TaskRunner}; +pub use test_data::test_response_data; #[derive(Debug, thiserror::Error)] pub enum ApiError { @@ -16,127 +22,4 @@ pub enum ApiError { pub type Result = std::result::Result; -#[async_trait::async_trait] -pub trait HttpClient: Send + Sync { - async fn fetch(&self, url: String) -> Result; -} - -#[derive(Debug, serde::Deserialize)] -pub struct Issue { - url: String, - title: String, - state: IssueState, -} - -#[derive(Debug, serde::Deserialize)] -pub enum IssueState { - #[serde(rename = "open")] - Open, - #[serde(rename = "closed")] - Closed, -} - -pub struct ApiClient { - http_client: Arc, -} - -impl ApiClient { - pub fn new(http_client: Arc) -> Self { - Self { http_client } - } - - pub async fn get_issue( - &self, - owner: String, - repository: String, - issue_number: u32, - ) -> Result { - let url = - format!("https://api.github.com/repos/{owner}/{repository}/issues/{issue_number}"); - let body = self.http_client.fetch(url).await?; - Ok(serde_json::from_str(&body)?) - } -} - -impl From for ApiError { - fn from(e: serde_json::Error) -> Self { - Self::Json { - reason: e.to_string(), - } - } -} - -/// Sample data downloaded from a real github api call -/// -/// The tests don't make real HTTP calls to avoid them failing because of network errors. -pub fn test_response_data() -> String { - String::from( - r#"{ - "url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017", - "repository_url": "https://api.github.com/repos/mozilla/uniffi-rs", - "labels_url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017/labels{/name}", - "comments_url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017/comments", - "events_url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017/events", - "html_url": "https://github.com/mozilla/uniffi-rs/issues/2017", - "id": 2174982360, - "node_id": "I_kwDOECpYAM6Bo5jY", - "number": 2017, - "title": "Foreign-implemented async traits", - "user": { - "login": "bendk", - "id": 1012809, - "node_id": "MDQ6VXNlcjEwMTI4MDk=", - "avatar_url": "https://avatars.githubusercontent.com/u/1012809?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/bendk", - "html_url": "https://github.com/bendk", - "followers_url": "https://api.github.com/users/bendk/followers", - "following_url": "https://api.github.com/users/bendk/following{/other_user}", - "gists_url": "https://api.github.com/users/bendk/gists{/gist_id}", - "starred_url": "https://api.github.com/users/bendk/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/bendk/subscriptions", - "organizations_url": "https://api.github.com/users/bendk/orgs", - "repos_url": "https://api.github.com/users/bendk/repos", - "events_url": "https://api.github.com/users/bendk/events{/privacy}", - "received_events_url": "https://api.github.com/users/bendk/received_events", - "type": "User", - "site_admin": false - }, - "labels": [ - - ], - "state": "open", - "locked": false, - "assignee": null, - "assignees": [ - - ], - "milestone": null, - "comments": 0, - "created_at": "2024-03-07T23:07:29Z", - "updated_at": "2024-03-07T23:07:29Z", - "closed_at": null, - "author_association": "CONTRIBUTOR", - "active_lock_reason": null, - "body": "We currently allow Rust code to implement async trait methods, but foreign implementations are not supported. We should extend support to allow for foreign code.\\r\\n\\r\\nI think this is a key feature for full async support. It allows Rust code to define an async method that depends on a foreign async method. This allows users to use async code without running a Rust async runtime, you can effectively piggyback on the foreign async runtime.", - "closed_by": null, - "reactions": { - "url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017/reactions", - "total_count": 0, - "+1": 0, - "-1": 0, - "laugh": 0, - "hooray": 0, - "confused": 0, - "heart": 0, - "rocket": 0, - "eyes": 0 - }, - "timeline_url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017/timeline", - "performed_via_github_app": null, - "state_reason": null -}"#, - ) -} - uniffi::include_scaffolding!("async-api-client"); diff --git a/examples/async-api-client/src/tasks.rs b/examples/async-api-client/src/tasks.rs new file mode 100644 index 0000000000..c684d1a555 --- /dev/null +++ b/examples/async-api-client/src/tasks.rs @@ -0,0 +1,90 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +use std::sync::{Arc, Mutex}; + +#[async_trait::async_trait] +pub trait TaskRunner: Send + Sync { + async fn run_task(&self, task: Arc); +} + +pub trait RustTask: Send + Sync { + fn execute(&self); +} + +pub async fn run_task(runner: &Arc, closure: F) -> T +where + F: FnOnce() -> T + Send + Sync + 'static, + T: Send + 'static, +{ + let closure = Arc::new(TaskClosure::new(closure)); + runner + .run_task(Arc::clone(&closure) as Arc) + .await; + closure.into_result() +} + +struct TaskClosure +where + F: FnOnce() -> T + Send + Sync, + T: Send, +{ + inner: Mutex>, +} + +enum TaskClosureInner +where + F: FnOnce() -> T + Send + Sync, + T: Send, +{ + Pending(F), + Running, + Complete(T), + Finished, +} + +impl TaskClosure +where + F: FnOnce() -> T + Send + Sync, + T: Send, +{ + fn new(closure: F) -> Self { + Self { + inner: Mutex::new(TaskClosureInner::Pending(closure)), + } + } + + fn into_result(&self) -> T { + let mut inner = self.inner.lock().unwrap(); + match *inner { + TaskClosureInner::Pending(_) => panic!("Task never ran"), + TaskClosureInner::Running => panic!("Task still running"), + TaskClosureInner::Finished => panic!("Task already finished"), + TaskClosureInner::Complete(_) => (), + }; + match std::mem::replace(&mut *inner, TaskClosureInner::Finished) { + TaskClosureInner::Complete(v) => v, + _ => unreachable!(), + } + } +} + +impl RustTask for TaskClosure +where + F: FnOnce() -> T + Send + Sync, + T: Send, +{ + fn execute(&self) { + let mut inner = self.inner.lock().unwrap(); + match std::mem::replace(&mut *inner, TaskClosureInner::Running) { + TaskClosureInner::Pending(f) => { + let result = f(); + *inner = TaskClosureInner::Complete(result) + } + TaskClosureInner::Running => panic!("Task already started"), + TaskClosureInner::Complete(_) => panic!("Task already executed"), + TaskClosureInner::Finished => panic!("Task already finished"), + } + } +} diff --git a/examples/async-api-client/src/test_data.rs b/examples/async-api-client/src/test_data.rs new file mode 100644 index 0000000000..9c502f4d67 --- /dev/null +++ b/examples/async-api-client/src/test_data.rs @@ -0,0 +1,76 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/// Sample data downloaded from a real github api call +/// +/// The tests don't make real HTTP calls to avoid them failing because of network errors. +pub fn test_response_data() -> String { + String::from( + r#"{ + "url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017", + "repository_url": "https://api.github.com/repos/mozilla/uniffi-rs", + "labels_url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017/labels{/name}", + "comments_url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017/comments", + "events_url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017/events", + "html_url": "https://github.com/mozilla/uniffi-rs/issues/2017", + "id": 2174982360, + "node_id": "I_kwDOECpYAM6Bo5jY", + "number": 2017, + "title": "Foreign-implemented async traits", + "user": { + "login": "bendk", + "id": 1012809, + "node_id": "MDQ6VXNlcjEwMTI4MDk=", + "avatar_url": "https://avatars.githubusercontent.com/u/1012809?v=4", + "gravatar_id": "", + "url": "https://api.github.com/users/bendk", + "html_url": "https://github.com/bendk", + "followers_url": "https://api.github.com/users/bendk/followers", + "following_url": "https://api.github.com/users/bendk/following{/other_user}", + "gists_url": "https://api.github.com/users/bendk/gists{/gist_id}", + "starred_url": "https://api.github.com/users/bendk/starred{/owner}{/repo}", + "subscriptions_url": "https://api.github.com/users/bendk/subscriptions", + "organizations_url": "https://api.github.com/users/bendk/orgs", + "repos_url": "https://api.github.com/users/bendk/repos", + "events_url": "https://api.github.com/users/bendk/events{/privacy}", + "received_events_url": "https://api.github.com/users/bendk/received_events", + "type": "User", + "site_admin": false + }, + "labels": [ + + ], + "state": "open", + "locked": false, + "assignee": null, + "assignees": [ + + ], + "milestone": null, + "comments": 0, + "created_at": "2024-03-07T23:07:29Z", + "updated_at": "2024-03-07T23:07:29Z", + "closed_at": null, + "author_association": "CONTRIBUTOR", + "active_lock_reason": null, + "body": "We currently allow Rust code to implement async trait methods, but foreign implementations are not supported. We should extend support to allow for foreign code.\\r\\n\\r\\nI think this is a key feature for full async support. It allows Rust code to define an async method that depends on a foreign async method. This allows users to use async code without running a Rust async runtime, you can effectively piggyback on the foreign async runtime.", + "closed_by": null, + "reactions": { + "url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017/reactions", + "total_count": 0, + "+1": 0, + "-1": 0, + "laugh": 0, + "hooray": 0, + "confused": 0, + "heart": 0, + "rocket": 0, + "eyes": 0 + }, + "timeline_url": "https://api.github.com/repos/mozilla/uniffi-rs/issues/2017/timeline", + "performed_via_github_app": null, + "state_reason": null +}"#, + ) +} diff --git a/examples/async-api-client/tests/bindings/test_async_api_client.kts b/examples/async-api-client/tests/bindings/test_async_api_client.kts index 589a1c82ca..110a5f01db 100644 --- a/examples/async-api-client/tests/bindings/test_async_api_client.kts +++ b/examples/async-api-client/tests/bindings/test_async_api_client.kts @@ -2,10 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext import uniffi.async_api_client.* class KtHttpClient : HttpClient { - override suspend fun fetch(url: String): String { + override suspend fun fetch(url: String, credentials: String): String { + if (credentials != "username:password") { + throw ApiException.Http("Unauthorized") + } // In the real-world we would use an async HTTP library and make a real // HTTP request, but to keep the dependencies simple and avoid test // fragility we just fake it. @@ -17,8 +22,16 @@ class KtHttpClient : HttpClient { } } +class KtTaskRunner : TaskRunner { + override suspend fun runTask(task: RustTask) { + withContext(Dispatchers.IO) { + task.execute() + } + } +} + kotlinx.coroutines.runBlocking { - val client = ApiClient(KtHttpClient()) + val client = ApiClient(KtHttpClient(), KtTaskRunner()) val issue = client.getIssue("mozilla", "uniffi-rs", 2017u) assert(issue.title == "Foreign-implemented async traits") } diff --git a/examples/async-api-client/tests/bindings/test_async_api_client.py b/examples/async-api-client/tests/bindings/test_async_api_client.py index de9d4c3563..f45682fcff 100644 --- a/examples/async-api-client/tests/bindings/test_async_api_client.py +++ b/examples/async-api-client/tests/bindings/test_async_api_client.py @@ -1,11 +1,14 @@ import asyncio +import concurrent.futures import unittest from urllib.request import urlopen from async_api_client import * # Http client that the Rust code depends on class PyHttpClient(HttpClient): - async def fetch(self, url): + async def fetch(self, url, credentials): + if credentials != "username:password": + raise ApiError.Http("Unauthorized") # In the real-world we would use something like aiohttp and make a real HTTP request, but to keep # the dependencies simple and avoid test fragility we just fake it. await asyncio.sleep(0.01) @@ -14,9 +17,17 @@ async def fetch(self, url): else: raise ApiError.Http(f"Wrong URL: {url}") +# Run a rust task in a thread pool +class PyTaskRunner(TaskRunner): + def __init__(self): + self.executer = concurrent.futures.ThreadPoolExecutor() + + async def run_task(self, task): + return self.executer.submit(lambda: task.execute()).result() + class CallbacksTest(unittest.IsolatedAsyncioTestCase): async def test_api_client(self): - client = ApiClient(PyHttpClient()) + client = ApiClient(PyHttpClient(), PyTaskRunner()) issue = await client.get_issue("mozilla", "uniffi-rs", 2017) self.assertEqual(issue.title, "Foreign-implemented async traits") diff --git a/examples/async-api-client/tests/bindings/test_async_api_client.swift b/examples/async-api-client/tests/bindings/test_async_api_client.swift index 87777afa27..6bf3a35408 100644 --- a/examples/async-api-client/tests/bindings/test_async_api_client.swift +++ b/examples/async-api-client/tests/bindings/test_async_api_client.swift @@ -9,7 +9,11 @@ import Foundation // To get `DispatchGroup` #endif class SwiftHttpClient : HttpClient { - func fetch(url: String) async throws -> String { + func fetch(url: String, credentials: String) async throws -> String { + if (credentials != "username:password") { + throw ApiError.Http(reason: "Unauthorized") + } + // In the real-world we would use an async HTTP library and make a real // HTTP request, but to keep the dependencies simple and avoid test // fragility we just fake it. @@ -21,10 +25,17 @@ class SwiftHttpClient : HttpClient { } } +class SwiftTaskRunner : TaskRunner { + func runTask(task: RustTask) async { + let swiftTask = Task { task.execute() } + let _ = await swiftTask.result + } +} + var counter = DispatchGroup() counter.enter() Task { - let client = ApiClient(httpClient: SwiftHttpClient()) + let client = ApiClient(httpClient: SwiftHttpClient(), taskRunner: SwiftTaskRunner()) let issue = try! await client.getIssue(owner: "mozilla", repository: "uniffi-rs", issueNumber: 2017) assert(issue.title == "Foreign-implemented async traits") counter.leave()