[WIP]ウィンドウ情報の取得をポーリング方式からイベント駆動方式にする

electron-builder.yml

@@ -5,6 +5,7 @@ directories:
 files:
   - '!**/.vscode/*'
   - '!src/*'
+  - '!nativeSrc/*'
   - '!electron.vite.config.{js,ts,mjs,cjs}'
   - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
   - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'

nativeSrc/taskbar.helper/main.swift

@@ -86,8 +86,50 @@ func getWindowInfoListData() -> Data? {
 }
 
 
+class WindowObserver {
+    static let shared = WindowObserver()
 
+    private init() {}
 
+    // ウィンドウの変更を監視
+    func observeWindowChanges() {
+        let notificationCenter = NSWorkspace.shared.notificationCenter
+
+        // アクティブになるイベントの監視
+        notificationCenter.addObserver(
+            self,
+            selector: #selector(windowDidChange(notification:)),
+            name: NSWorkspace.didActivateApplicationNotification,
+            object: nil
+        )
+
+        // アプリケーションが起動されたイベントを監視
+        notificationCenter.addObserver(
+            self,
+            selector: #selector(windowDidChange(notification:)),
+            name: NSWorkspace.didLaunchApplicationNotification,
+            object: nil
+        )
+    }
+
+    @objc func windowDidChange(notification: NSNotification) {
+        // 非同期処理を開始
+        DispatchQueue.global(qos: .background).async {
+            // わずかに遅延させて非同期処理を実行
+            // これがないと開いたウィンドウの変更が反映されない
+            let delayTime = DispatchTime.now() + .milliseconds(500)
+
+            DispatchQueue.global(qos: .background).asyncAfter(deadline: delayTime) {
+                DispatchQueue.main.async {
+                    if let data = getWindowInfoListData() {
+                        let stdOut = FileHandle.standardOutput
+                        stdOut.write(data)
+                    }
+                }
+            }
+        }
+    }
+}
 
 
 let arguments = CommandLine.arguments
@@ -103,11 +145,9 @@ case "grant":
     CGRequestScreenCaptureAccess()
 case "list":
 
-    if let data = getWindowInfoListData() {
-        let stdOut = FileHandle.standardOutput
-        stdOut.write(data)
-    }
+    // ウィンドウの変更を監視
+    WindowObserver.shared.observeWindowChanges()
+    RunLoop.main.run()
 default:
     print("default")
 }
-

src/main/funcs/helper.ts

@@ -14,25 +14,38 @@ if (app.isPackaged) {
 
 export const macWindowProcesses: MacWindow[] = []
 
-export function getAndSubmitProcesses(): void {
+export async function getAndSubmitProcesses(): Promise<void> {
   let rawData = ''
   try {
     const taskbarHelper = spawn(binaryPath, ['list'])
-    taskbarHelper.stdout.on('data', (raw) => {
-      rawData += raw
-    })
-    taskbarHelper.stderr.on('data', (raw) => {
-      console.error(raw)
-    })
-    taskbarHelper.on('close', async (code) => {
-      if ((await code) === 0) {
-        const jsoned = JSON.parse(Buffer.from(rawData).toString('utf-8'))
-        applyProcessChange(jsoned)
-        rawData = ''
+
+    for await (const chunk of taskbarHelper.stdout) {
+      rawData += chunk.toString()
+      if (rawData.endsWith(']')) {
+        try {
+          const jsoned = JSON.parse(rawData)
+          await applyProcessChange(jsoned)
+          rawData = ''
+        } catch (parseError) {
+          console.error('Failed to parse JSON:', parseError)
+          rawData = '' // Reset rawData to avoid accumulating invalid data
+        }
       }
+    }
+
+    taskbarHelper.stderr.on('data', (data) => {
+      console.error(`TaskbarHelper error: ${data.toString()}`)
+    })
+
+    await new Promise<void>((resolve) => {
+      taskbarHelper.on('close', (code) => {
+        console.log(`TaskbarHelper process exited with code ${code}`)
+        resolve()
+      })
     })
-  } catch (e) {
-    console.log(e)
+  } catch (error) {
+    console.error('Error in getAndSubmitProcesses:', error);
+    throw error // Re-throw the error for upper-level error handling
   }
 }
 

src/main/main.ts

@@ -32,10 +32,8 @@ app.whenReady().then(() => {
   setEventHandlers()
 })
 
-// 1秒ごとにプロセスを取得する
-setInterval(() => {
-  getAndSubmitProcesses()
-}, 1000)
+// プロセスを取得するプロセスを起動
+getAndSubmitProcesses()
 
 // Quit when all windows are closed, except on macOS. There, it's common
 // for applications and their menu bar to stay active until the user quits