Fixed macOS notifications

google · Jul 28, 2021 · 3e1ca91 · 3e1ca91
1 parent 17e803b
commit 3e1ca91
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pal_event_server/lib/src/daemon/macos/alerter_notifications.dart b/pal_event_server/lib/src/daemon/macos/alerter_notifications.dart
@@ -47,7 +47,8 @@ Future<void> cancel(int id) async {
   }
 
   _notifications.remove(id);
-  await Process.run(_alerterBinary, ['-remove', '$id']);
+  await Process.start(_alerterBinary, ['-remove', '$id'],
+      mode: ProcessStartMode.inheritStdio);
 }
 
 Future<int> notify(int id, String title, String body, {int timeout = 0}) async {

diff --git a/taqo_client/macos/TaqoLauncher/AppDelegate.swift b/taqo_client/macos/TaqoLauncher/AppDelegate.swift
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import Cocoa
+import Darwin
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
@@ -32,9 +33,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     NSLog("Launching taqo_daemon at")
     NSLog(taqoDaemon.absoluteString)
 
+    // Create a pseudo tty as the stdin of taqo_daemon, so that when taqo_daemon calls
+    // alerter, alerter won't read an empty message from the stdin.
+    let fd = posix_openpt(O_RDWR)
+    grantpt(fd)
+    unlockpt(fd)
+    let pty = FileHandle.init(forUpdatingAtPath: String.init(cString: ptsname(fd)))
+
     let task = Process()
     task.executableURL = URL(fileURLWithPath: taqoDaemon.absoluteString)
     task.arguments = []
+    task.standardInput = pty
     do {
       try task.run()
     } catch {