fix: minor fixes

Author: sentialx

example.js

@@ -17,10 +17,7 @@ setTimeout(() => {
 
 console.log("Windows list");
 windowManager.getWindows().forEach(window => {
-   if (window.isVisible()) {
-      console.log(window.getInfo());
-      console.log(window.getMonitor().getInfo());
-   }
+   console.log(window.getInfo());
 });
 
 console.log("Monitors list");

lib/macos.mm

@@ -48,14 +48,21 @@ AXUIElementRef getAXWindow(int pid, int handle) {
   std::vector<Napi::Number> vec;
 
   for (NSDictionary *info in (NSArray *)windowList) {
+    NSNumber *ownerPid = info[(id)kCGWindowOwnerPID];
     NSNumber *windowNumber = info[(id)kCGWindowNumber];
-    vec.push_back(Napi::Number::New(env, [windowNumber intValue]));
+
+    auto app = [NSRunningApplication runningApplicationWithProcessIdentifier: [ownerPid intValue]];
+    auto path = app ? [app.bundleURL.path UTF8String] : "";
+
+    if (app && path != "") {
+      vec.push_back(Napi::Number::New(env, [windowNumber intValue]));
+    }
   }
 
   auto arr = Napi::Array::New(env, vec.size());
 
   for (int i = 0; i < vec.size(); i++) {
-    arr.Set(i, vec[i]);
+    arr[i] = vec[i];
   }
 
   return arr;

src/classes/window.ts

@@ -1,24 +1,8 @@
 import { platform } from "os";
-import { windowManager, addon } from "..";
+import { addon } from "..";
 import extractFileIcon from 'extract-file-icon';
 import { Monitor } from "./monitor";
-
-interface Rectangle {
-  x?: number;
-  y?: number;
-  width?: number;
-  height?: number;
-}
-
-interface WindowInfo {
-  id: number;
-  path: string;
-  processId: number;
-  title?: string;
-  bounds?: Rectangle;
-  opacity?: number;
-  owner?: number;
-}
+import { IRectangle, IWindowInfo } from "../interfaces";
 
 export class Window {
   public id: number;
@@ -35,7 +19,7 @@ export class Window {
     this.path = path;
   }
 
-  getBounds(): Rectangle {
+  getBounds(): IRectangle {
     if (!addon) return;
 
     const { bounds } = this.getInfo();
@@ -52,7 +36,7 @@ export class Window {
     return bounds;
   }
 
-  setBounds(bounds: Rectangle) {
+  setBounds(bounds: IRectangle) {
     if (!addon) return;
 
     const newBounds = { ...this.getBounds(), ...bounds };
@@ -184,11 +168,9 @@ export class Window {
     return new Window(this.getInfo().owner);
   }
 
-  getInfo(): WindowInfo {
+  getInfo(): IWindowInfo {
     if (!addon) return;
-
     const info = addon.getWindowInfo(this.id);
-
     return info;
   }
 }

src/index.ts

@@ -63,12 +63,12 @@ class WindowManager extends EventEmitter {
   };
 
   getWindows = (): Window[] => {
-    if (!addon || !addon.getWindows) return;
+    if (!addon || !addon.getWindows) return [];
     return addon.getWindows().map((win: any) => new Window(win)).filter((x: Window) => x.isWindow());
   };
 
   getMonitors = (): Monitor[] => {
-    if (!addon || !addon.getMonitors) return;
+    if (!addon || !addon.getMonitors) return [];
     return addon.getMonitors().map((mon: any) => new Monitor(mon));
   };