Update DiscordRPC to plugins v4

Cargo.toml

@@ -1,19 +1,16 @@
 [package]
 name = "northstar-discord-rpc"
-version = "0.1.0"
+version = "0.4.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rrplug = "=3.0.0"
+rrplug = { git = "https://github.com/R2NorthstarTools/rrplug.git", rev = "209a8b4b478ab095e3186dd32a3ed29dc9dbffee" }
 discord-sdk = "0.3.2"
 tokio = "1.26.0"
 parking_lot = "0.12.1"
 
-[build-dependencies]
-windres = "0.2.2"
-
 [lib]
 name = "DiscordRPC"
 crate-type = ["cdylib"]

src/discord.rs

@@ -59,7 +59,8 @@ pub async fn async_main() {
                 large_text: data.large_text,
                 small_image: data.small_image,
                 small_text: data.small_text,
-            });
+            })
+            .secrets(data.secrets);
 
         if let Some(start) = data.start {
             activity_builder = activity_builder.start_timestamp(if start == 0 { 1 } else { start });

src/lib.rs

@@ -1,5 +1,6 @@
 #![allow(non_snake_case)]
 
+use discord_sdk::activity::Secrets;
 use parking_lot::Mutex;
 use rrplug::prelude::*;
 use tokio::runtime::Runtime;
@@ -28,6 +29,7 @@ pub struct ActivityData {
     end: Option<i64>,
     start: Option<i64>,
     last_state: GameState,
+    secrets: Secrets,
 }
 
 #[deny(non_snake_case)]
@@ -38,8 +40,15 @@ pub struct DiscordRpcPlugin {
 
 #[deny(non_snake_case)]
 impl Plugin for DiscordRpcPlugin {
-    fn new(plugin_data: &PluginData) -> Self {
-        plugin_data.register_sq_functions(presence::fetch_presence);
+    const PLUGIN_INFO: PluginInfo = PluginInfo::new(
+        "DISCORDRPC\0",
+        "DSCRD-RPC\0",
+        "DISCORDRPC\0",
+        PluginContext::CLIENT,
+    );
+
+    fn new(_: bool) -> Self {
+        register_sq_functions(presence::fetch_presence);
 
         let activity = Mutex::new(ActivityData {
             large_image: Some("northstar".to_string()),
@@ -51,7 +60,6 @@ impl Plugin for DiscordRpcPlugin {
             Ok(rt) => rt.block_on(async_main()),
             Err(err) => {
                 log::error!("failed to create a runtime; {:?}", err);
-                return;
             }
         });
 
@@ -61,9 +69,9 @@ impl Plugin for DiscordRpcPlugin {
         }
     }
 
-    fn on_sqvm_created(&self, sqvm_handle: &CSquirrelVMHandle) {
+    fn on_sqvm_created(&self, sqvm_handle: &CSquirrelVMHandle, _: EngineToken) {
         match sqvm_handle.get_context() {
-            ScriptVmType::Client | ScriptVmType::Ui => {
+            ScriptContext::CLIENT | ScriptContext::UI => {
                 run_presence_updates(unsafe { sqvm_handle.get_sqvm() })
             }
             _ => {}

src/presence.rs

@@ -33,11 +33,11 @@ pub fn run_presence_updates(sqvm: UnsafeHandle<*mut HSquirrelVM>) {
     "#,
     ) {
         err.log()
-    }
+    };
 }
 
 /// function to pull presence from the sqvm since in runframe it's impossibke to get the output of a function back
-#[rrplug::sqfunction(VM = "UiClient", ExportName = "FetchPresence")]
+#[rrplug::sqfunction(VM = "UI | CLIENT", ExportName = "FetchPresence")]
 pub fn fetch_presence() -> Result<(), String> {
     let plugin = crate::PLUGIN.wait();
     let mut presence_lock = plugin.presence_data.lock();