backend: Pass handle token to close

This lets the implementer to know on which `Request` `close` was called.

backend-demo/src/account.rs

@@ -14,8 +14,8 @@ pub struct Account;
 
 #[async_trait]
 impl RequestImpl for Account {
-    async fn close(&self) {
-        tracing::debug!("IN Close()");
+    async fn close(&self, token: HandleToken) {
+        tracing::debug!("IN Close(): {token}");
     }
 }
 

backend-demo/src/screenshot.rs

@@ -14,8 +14,8 @@ pub struct Screenshot;
 
 #[async_trait]
 impl RequestImpl for Screenshot {
-    async fn close(&self) {
-        tracing::debug!("IN Close()");
+    async fn close(&self, token: HandleToken) {
+        tracing::debug!("IN Close(): {token}");
     }
 }
 

backend-demo/src/secret.rs

@@ -13,8 +13,8 @@ pub struct Secret;
 
 #[async_trait]
 impl RequestImpl for Secret {
-    async fn close(&self) {
-        tracing::debug!("IN Close()");
+    async fn close(&self, token: HandleToken) {
+        tracing::debug!("IN Close(): {token}");
     }
 }
 

backend-demo/src/settings.rs

@@ -5,7 +5,7 @@ use ashpd::{
         request::RequestImpl,
         settings::{SettingsImpl, SettingsSignalEmitter},
     },
-    desktop::settings::{ColorScheme, Namespace, APPEARANCE_NAMESPACE, COLOR_SCHEME_KEY},
+    desktop::{settings::{ColorScheme, Namespace, APPEARANCE_NAMESPACE, COLOR_SCHEME_KEY}, HandleToken},
     zbus::zvariant::OwnedValue,
     PortalError,
 };
@@ -20,8 +20,8 @@ pub struct Settings {
 
 #[async_trait]
 impl RequestImpl for Settings {
-    async fn close(&self) {
-        tracing::debug!("IN Close()");
+    async fn close(&self, token: HandleToken) {
+        tracing::debug!("IN Close(): {token}");
     }
 }
 

backend-demo/src/wallpaper.rs

@@ -14,8 +14,8 @@ pub struct Wallpaper;
 
 #[async_trait]
 impl RequestImpl for Wallpaper {
-    async fn close(&self) {
-        tracing::debug!("IN Close()");
+    async fn close(&self, token: HandleToken) {
+        tracing::debug!("IN Close(): {token}");
     }
 }
 

src/backend/request.rs

@@ -5,11 +5,11 @@ use futures_util::future::{abortable, AbortHandle};
 use tokio::sync::Mutex;
 use zbus::zvariant::{ObjectPath, OwnedObjectPath};
 
-use crate::desktop::Response;
+use crate::desktop::{HandleToken, Response};
 
 #[async_trait]
 pub trait RequestImpl: Send + Sync {
-    async fn close(&self);
+    async fn close(&self, token: HandleToken);
 }
 
 pub struct Request {
@@ -39,9 +39,10 @@ impl Request {
         #[cfg(feature = "tracing")]
         tracing::debug!("{_method}");
         let (fut, abort_handle) = abortable(callback);
+        let token = HandleToken::try_from(&path).unwrap();
         let close_cb = || {
             tokio::spawn(async move {
-                RequestImpl::close(&*imp).await;
+                RequestImpl::close(&*imp, token).await;
             });
         };
         let request = Request::new(close_cb, path.clone(), abort_handle, cnx.clone());