Upgrade to steamworks-rs v0.12.1

Cargo.toml

@@ -11,7 +11,7 @@ napi = { version = "2.16.8", features = ["tokio_rt", "napi6", "serde-json"] }
 napi-derive = "2.16.9"
 lazy_static = "1"
 tokio = { version = "1", features = ["sync", "time"] }
-steamworks = { git = "https://github.com/Noxime/steamworks-rs/", rev = "fbb79635b06b4feea8261e5ca3e8ea3ef42facf9", features = ["serde"] }
+steamworks = { git = "https://github.com/Noxime/steamworks-rs/", rev = "40a457a61f5ef714d93804e51e0c5e3d405145a3", features = ["serde"] }
 serde = "1"
 serde_json = "1"
 

client.d.ts

@@ -335,7 +335,7 @@ export declare namespace workshop {
    * Get all subscribed workshop items.
    * @returns an array of subscribed workshop item ids
    */
-  export function getSubscribedItems(): Array<bigint>
+  export function getSubscribedItems(includeLocallyDisabled: boolean): Array<bigint>
   export const enum UGCQueryType {
     RankedByVote = 0,
     RankedByPublicationDate = 1,

src/api/callback.rs

@@ -2,23 +2,37 @@ use napi_derive::napi;
 
 #[napi]
 pub mod callback {
+    use std::{
+        collections::HashMap,
+        sync::{
+            atomic::{AtomicU32, Ordering},
+            Mutex, OnceLock,
+        },
+    };
+
     use napi::{
         threadsafe_function::{ErrorStrategy, ThreadsafeFunction, ThreadsafeFunctionCallMode},
         JsFunction,
     };
 
+    static HANDLE_ID_COUNTER: AtomicU32 = AtomicU32::new(1);
+    static CALLBACK_REGISTRY: OnceLock<Mutex<HashMap<u32, steamworks::CallbackHandle>>> =
+        OnceLock::new();
+
+    fn get_registry() -> &'static Mutex<HashMap<u32, steamworks::CallbackHandle>> {
+        CALLBACK_REGISTRY.get_or_init(|| Mutex::new(HashMap::new()))
+    }
+
     #[napi]
     pub struct Handle {
-        handle: Option<steamworks::CallbackHandle>,
+        id: u32,
     }
 
     #[napi]
     impl Handle {
         #[napi]
         pub fn disconnect(&mut self) {
-            if let Some(handle) = self.handle.take() {
-                handle.disconnect();
-            }
+            get_registry().lock().unwrap().remove(&self.id);
         }
     }
 
@@ -79,9 +93,12 @@ pub mod callback {
             }
         };
 
-        Handle {
-            handle: Some(handle),
-        }
+        let id = HANDLE_ID_COUNTER.fetch_add(1, Ordering::Relaxed);
+        let registry = get_registry();
+        let mut map = registry.lock().unwrap();
+        map.insert(id, handle);
+
+        Handle { id }
     }
 
     fn register_callback<C>(

src/api/workshop.rs

@@ -7,7 +7,7 @@ pub mod workshop {
     use napi::threadsafe_function::ThreadsafeFunction;
     use napi::threadsafe_function::ThreadsafeFunctionCallMode;
     use std::path::Path;
-    use steamworks::{ClientManager, FileType, PublishedFileId, UpdateHandle};
+    use steamworks::{FileType, PublishedFileId, UpdateHandle};
     use tokio::sync::oneshot;
 
     #[napi(object)]
@@ -61,11 +61,11 @@ pub mod workshop {
     impl UgcUpdate {
         pub fn submit(
             self,
-            mut update: UpdateHandle<ClientManager>,
+            mut update: UpdateHandle,
             callback: impl FnOnce(Result<(PublishedFileId, bool), steamworks::SteamError>)
                 + Send
                 + 'static,
-        ) -> steamworks::UpdateWatchHandle<ClientManager> {
+        ) -> steamworks::UpdateWatchHandle {
             if let Some(title) = self.title {
                 update = update.title(title.as_str());
             }
@@ -394,9 +394,9 @@ pub mod workshop {
     /// Get all subscribed workshop items.
     /// @returns an array of subscribed workshop item ids
     #[napi]
-    pub fn get_subscribed_items() -> Vec<BigInt> {
+    pub fn get_subscribed_items(include_locally_disabled: bool) -> Vec<BigInt> {
         let client = crate::client::get_client();
-        let result = client.ugc().subscribed_items();
+        let result = client.ugc().subscribed_items(include_locally_disabled);
 
         result
             .iter()

src/api/workshop_item.rs

@@ -374,10 +374,10 @@ pub mod workshop {
         pub consumer: Option<u32>,
     }
 
-    fn handle_query_config<Manager>(
-        mut query_handle: steamworks::QueryHandle<Manager>,
+    fn handle_query_config(
+        mut query_handle: steamworks::QueryHandle,
         query_config: Option<WorkshopItemQueryConfig>,
-    ) -> steamworks::QueryHandle<Manager> {
+    ) -> steamworks::QueryHandle {
         // Apply statistics query parameters if provided
         if let Some(query_config) = query_config {
             if let Some(cached_response_max_age) = query_config.cached_response_max_age {

src/lib.rs

@@ -24,8 +24,6 @@ pub fn init(app_id: Option<u32>) -> Result<(), Error> {
             | SteamAPIInitError::VersionMismatch(msg) => Error::from_reason(msg),
         })?;
 
-    steam_client.user_stats().request_current_stats();
-
     client::set_client(steam_client);
     Ok(())
 }