Different way of notif

Cargo.toml

@@ -52,7 +52,8 @@ hypr-moonshine = { path = "crates/moonshine", package = "moonshine" }
 hypr-nango = { path = "crates/nango", package = "nango" }
 hypr-network = { path = "crates/network", package = "network" }
 hypr-notification = { path = "crates/notification", package = "notification" }
-hypr-notification2 = { path = "crates/notification2", package = "notification2" }
+hypr-notification-interface = { path = "crates/notification-interface", package = "notification-interface" }
+hypr-notification-macos = { path = "crates/notification-macos", package = "notification-macos" }
 hypr-notion = { path = "crates/notion", package = "notion" }
 hypr-onnx = { path = "crates/onnx", package = "onnx" }
 hypr-openai = { path = "crates/openai", package = "openai" }

apps/desktop/src/components/settings/views/notifications.tsx

@@ -38,8 +38,12 @@ export default function NotificationsComponent() {
   const eventMutation = useMutation({
     mutationFn: async (v: Schema) => {
       if (v.event) {
-        notificationCommands.requestNotificationPermission().then(() => {
-          notificationCommands.setEventNotification(true);
+        notificationCommands.setEventNotification(true);
+        notificationCommands.showNotification({
+          title: "Test",
+          message: "Test",
+          url: "https://hypr.ai",
+          timeout: { secs: 5, nanos: 0 },
         });
       } else {
         notificationCommands.setEventNotification(false);
@@ -59,8 +63,12 @@ export default function NotificationsComponent() {
   const detectMutation = useMutation({
     mutationFn: async (v: Schema) => {
       if (v.detect) {
-        notificationCommands.requestNotificationPermission().then(() => {
-          notificationCommands.setDetectNotification(true);
+        notificationCommands.setDetectNotification(true);
+        notificationCommands.showNotification({
+          title: "Test",
+          message: "Test",
+          url: "https://hypr.ai",
+          timeout: { secs: 5, nanos: 0 },
         });
       } else {
         notificationCommands.setDetectNotification(false);

crates/notification-interface/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "notification-interface"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde = { workspace = true, features = ["derive"] }
+specta = { workspace = true, features = ["derive"] }

crates/notification-interface/src/lib.rs

@@ -0,0 +1,7 @@
+#[derive(Debug, serde::Serialize, serde::Deserialize, specta::Type)]
+pub struct Notification {
+    pub title: String,
+    pub message: String,
+    pub url: Option<String>,
+    pub timeout: Option<std::time::Duration>,
+}

crates/notification-macos/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "notification-macos"
+version = "0.1.0"
+edition = "2021"
+
+[build-dependencies]
+swift-rs = { workspace = true, features = ["build"] }
+
+[dependencies]
+hypr-notification-interface = { workspace = true }
+swift-rs = { workspace = true }

crates/notification-macos/build.rs

@@ -0,0 +1,13 @@
+fn main() {
+    #[cfg(target_os = "macos")]
+    {
+        swift_rs::SwiftLinker::new("14.2")
+            .with_package("swift-lib", "./swift-lib/")
+            .link();
+    }
+
+    #[cfg(not(target_os = "macos"))]
+    {
+        println!("cargo:warning=Swift linking is only available on macOS");
+    }
+}

crates/notification-macos/examples/test_notification.rs

@@ -0,0 +1,44 @@
+use notification_macos::*;
+use std::time::Duration;
+
+#[cfg(target_os = "macos")]
+#[link(name = "AppKit", kind = "framework")]
+#[link(name = "Foundation", kind = "framework")]
+extern "C" {
+    fn NSApplicationLoad() -> bool;
+    fn CFRunLoopRun();
+    fn CFRunLoopStop(rl: *const std::ffi::c_void);
+    fn CFRunLoopGetMain() -> *const std::ffi::c_void;
+}
+
+fn main() {
+    #[cfg(target_os = "macos")]
+    {
+        unsafe {
+            NSApplicationLoad();
+        }
+
+        std::thread::spawn(|| {
+            std::thread::sleep(Duration::from_millis(100));
+
+            let notification = Notification {
+                title: "Test Notification".to_string(),
+                message: "This is a test message from Rust".to_string(),
+                url: Some("https://example.com".to_string()),
+                timeout: Some(Duration::from_secs(3)),
+            };
+
+            show(&notification);
+
+            std::thread::sleep(Duration::from_secs(5));
+            unsafe {
+                let main_loop = CFRunLoopGetMain();
+                CFRunLoopStop(main_loop);
+            }
+        });
+
+        unsafe {
+            CFRunLoopRun();
+        }
+    }
+}

crates/notification-macos/src/lib.rs

@@ -0,0 +1,47 @@
+pub use hypr_notification_interface::*;
+
+#[cfg(target_os = "macos")]
+use swift_rs::{swift, Bool, SRString};
+
+#[cfg(target_os = "macos")]
+swift!(fn _show_notification(
+    title: &SRString,
+    message: &SRString,
+    url: &SRString,
+    has_url: Bool,
+    timeout_seconds: f64
+) -> Bool);
+
+#[cfg(target_os = "macos")]
+pub fn show(notification: &hypr_notification_interface::Notification) {
+    unsafe {
+        let title = SRString::from(notification.title.as_str());
+        let message = SRString::from(notification.message.as_str());
+        let url = notification
+            .url
+            .as_ref()
+            .map(|u| SRString::from(u.as_str()))
+            .unwrap_or_else(|| SRString::from(""));
+        let has_url = notification.url.is_some();
+        let timeout_seconds = notification.timeout.map(|d| d.as_secs_f64()).unwrap_or(5.0);
+
+        _show_notification(&title, &message, &url, has_url, timeout_seconds);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_notification() {
+        let notification = hypr_notification_interface::Notification {
+            title: "Test Title".to_string(),
+            message: "Test message content".to_string(),
+            url: Some("https://example.com".to_string()),
+            timeout: Some(std::time::Duration::from_secs(3)),
+        };
+
+        show(&notification);
+    }
+}

crates/notification-macos/swift-lib/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

crates/notification-macos/swift-lib/Package.swift

@@ -0,0 +1,28 @@
+// swift-tools-version:5.9
+
+import PackageDescription
+
+let package = Package(
+  name: "swift-lib",
+  platforms: [.macOS("14.2")],
+  products: [
+    .library(
+      name: "swift-lib",
+      type: .static,
+      targets: ["swift-lib"])
+  ],
+  dependencies: [
+    .package(
+      url: "https://github.com/Brendonovich/swift-rs",
+      revision: "01980f981bc642a6da382cc0788f18fdd4cde6df")
+  ],
+  targets: [
+    .target(
+      name: "swift-lib",
+      dependencies: [
+        .product(name: "SwiftRs", package: "swift-rs")
+      ],
+      path: "src"
+    )
+  ]
+)