Implement macOS modules using ScriptingBridge (#152)

* Implement macOS modules using ScriptingBridge

* Fix reviewed issues

src/api/bring-to-front.js

@@ -21,7 +21,7 @@ export default async function (windowDescriptor) {
     if (OS.win)
         bringWindowToFrontArguments = [windowDescription.hwnd];
     else if (OS.mac)
-        bringWindowToFrontArguments = [windowDescription.windowId, windowDescription.bundleId];
+        bringWindowToFrontArguments = [windowDescription.processId, windowDescription.windowId];
     else
         return;
 

src/api/close.js

@@ -21,7 +21,7 @@ export default async function (windowDescriptor) {
     if (OS.win)
         closeWindowArguments = [windowDescription.hwnd];
     else if (OS.mac)
-        closeWindowArguments = [windowDescription.windowId, windowDescription.bundleId];
+        closeWindowArguments = [windowDescription.processId, windowDescription.windowId];
     else if (OS.linux)
         closeWindowArguments = [windowDescription.windowId];
     else

src/api/find-window.js

@@ -18,9 +18,6 @@ export default async function (pageTitle) {
 
     try {
         res = await execFile(BINARIES.findWindow, [pageTitle]);
-
-        if (OS.mac)
-            res += await execFile(BINARIES.findWindowCocoa, [pageTitle]);
     }
     catch (err) {
         return null;
@@ -31,8 +28,11 @@ export default async function (pageTitle) {
     if (OS.win)
         return { hwnd: windowParams[0], browser: windowParams[1] };
 
-    if (OS.mac)
-        return { bundleId: windowParams[0], windowId: windowParams[1], cocoaId: windowParams[2] };
+    if (OS.mac) {
+        windowParams = windowParams.slice(windowParams.length - 4);
+
+        return { processId: windowParams[0], cocoaId: windowParams[1], windowId: windowParams[2] };
+    }
 
     if (OS.linux)
         return { windowId: windowParams[0] };

src/api/get-window-size.js

@@ -13,7 +13,7 @@ export default async function (windowDescription) {
     if (OS.win)
         getWindowSizeArgs = [windowDescription.hwnd];
     else if (OS.mac)
-        getWindowSizeArgs = [windowDescription.windowId, windowDescription.bundleId];
+        getWindowSizeArgs = [windowDescription.processId, windowDescription.windowId];
     else if (OS.linux)
         getWindowSizeArgs = [windowDescription.windowId];
     else

src/api/maximize.js

@@ -4,27 +4,27 @@ import { execFile } from '../utils/exec';
 import BINARIES from '../binaries';
 
 function getBoundsFromString (boundsString) {
-    return boundsString.replace(/\n/g, '').split(', ');
+    return boundsString.split('\n');
 }
 
-async function getWindowBounds (windowId, bundleId) {
-    var boundsString = await execFile(BINARIES.getWindowBounds, [windowId, bundleId]);
+async function getWindowBounds (processId, windowId) {
+    var boundsString = await execFile(BINARIES.getWindowBounds, [processId, windowId]);
 
     return getBoundsFromString(boundsString);
 }
 
-async function getWindowMaxBounds (windowId, bundleId) {
-    var windowBounds    = await getWindowBounds(windowId, bundleId);
+async function getWindowMaxBounds (processId, windowId) {
+    var windowBounds    = await getWindowBounds(processId, windowId);
     var maxBoundsString = await execFile(BINARIES.getWindowMaxBounds, windowBounds);
 
     return getBoundsFromString(maxBoundsString);
 }
 
 async function maximizeWindowMac (windowDescription) {
-    var { windowId, bundleId } = windowDescription;
-    var windowBounds           = await getWindowMaxBounds(windowId, bundleId);
+    var { processId, windowId } = windowDescription;
+    var windowBounds           = await getWindowMaxBounds(processId, windowId);
 
-    await execFile(BINARIES.setWindowBounds, [windowId, bundleId].concat(windowBounds));
+    await execFile(BINARIES.setWindowBounds, [processId, windowId].concat(windowBounds));
 }
 /**
  * Maximizes the specified browser window.

src/api/resize.js

@@ -36,7 +36,7 @@ export default async function (windowDescriptor, currentWidth, currentHeight, wi
     if (OS.win)
         resizeArguments = [windowDescription.hwnd];
     else if (OS.mac)
-        resizeArguments = [windowDescription.windowId, windowDescription.bundleId];
+        resizeArguments = [windowDescription.processId, windowDescription.windowId];
     else if (OS.linux)
         resizeArguments = [windowDescription.windowId];
     else

src/binaries.js

@@ -20,17 +20,16 @@ if (OS.win) {
 else if (OS.mac) {
     BINARIES = {
         open:               toAbsPath('../bin/mac/open.scpt'),
-        findWindow:         toAbsPath('../bin/mac/find-window.scpt'),
-        findWindowCocoa:    toAbsPath('../bin/mac/find-window-cocoa'),
-        getWindowSize:      toAbsPath('../bin/mac/get-window-size.scpt'),
-        getWindowBounds:    toAbsPath('../bin/mac/get-window-bounds.scpt'),
+        findWindow:         toAbsPath('../bin/mac/find-window'),
+        getWindowSize:      toAbsPath('../bin/mac/get-window-size'),
+        getWindowBounds:    toAbsPath('../bin/mac/get-window-bounds'),
         getWindowMaxBounds: toAbsPath('../bin/mac/get-window-max-bounds'),
-        setWindowBounds:    toAbsPath('../bin/mac/set-window-bounds.scpt'),
-        close:              toAbsPath('../bin/mac/close.scpt'),
+        setWindowBounds:    toAbsPath('../bin/mac/set-window-bounds'),
+        close:              toAbsPath('../bin/mac/close'),
         screenshot:         toAbsPath('../bin/mac/screenshot'),
-        resize:             toAbsPath('../bin/mac/resize.scpt'),
+        resize:             toAbsPath('../bin/mac/resize'),
         generateThumbnail:  toAbsPath('../bin/mac/generate-thumbnail'),
-        bringToFront:       toAbsPath('../bin/mac/bring-to-front.scpt')
+        bringToFront:       toAbsPath('../bin/mac/bring-to-front')
     };
 }
 else if (OS.linux) {

src/natives/bring-to-front/mac/Makefile

@@ -1,6 +1,6 @@
 all: clean build
 clean:
-	rm "${DEST}/bring-to-front.scpt" || true
+	rm "${DEST}/bring-to-front" || true
 build:
 	mkdir "${DEST}" || true
-	osacompile -o "${DEST}/bring-to-front.scpt" bring-to-front.applescript
+	clang -o "${DEST}/bring-to-front" -framework Cocoa -framework ScriptingBridge -framework AppKit bring-to-front.m

src/natives/bring-to-front/mac/bring-to-front.m

@@ -0,0 +1,36 @@
+//
+//  bring-to-front.m
+//  Place a window in foreground
+//
+
+#import "AppKit/AppKit.h"
+#include "../../utils/mac/utils.h"
+
+
+const int APP_ACTIVATION_DELAY = 100000;
+
+int main (int argc, const char * argv[]) {
+    if (argc < 3) {
+        printf("Incorrect arguments\n");
+        return 1;
+    }
+
+    @autoreleasepool {
+        NSString *processId = [NSString stringWithUTF8String:argv[1]];
+        NSString *windowId = [NSString stringWithUTF8String:argv[2]];
+
+        @try {
+            [[NSRunningApplication runningApplicationWithProcessIdentifier: [processId intValue]] activateWithOptions: NSApplicationActivateAllWindows|NSApplicationActivateIgnoringOtherApps];
+
+            usleep(APP_ACTIVATION_DELAY);
+
+            [getWindowOfProcess(processId, windowId) setIndex: 1];
+        }
+        @catch (NSException *exception) {
+            return 0;
+        }
+    }
+
+    return 0;
+}
+

src/natives/close/mac/Makefile

@@ -1,6 +1,6 @@
 all: clean build
 clean:
-	rm "${DEST}/close.scpt" || true
+	rm "${DEST}/close" || true
 build:
 	mkdir "${DEST}" || true
-	osacompile -o "${DEST}/close.scpt" close.applescript
+	clang -o "${DEST}/close" -framework Cocoa -framework ScriptingBridge close.m

src/natives/close/mac/close.m

@@ -0,0 +1,45 @@
+//
+//  close.m
+//  Close a window
+//
+
+#include "../../utils/mac/utils.h"
+
+enum CloseOptions {
+    CloseOptionsYes = 'yes ' /* Save the file. */,
+    CloseOptionsNo  = 'no  ' /* Do not save the file. */,
+    CloseOptionsAsk = 'ask ' /* Ask the user whether or not to save the file. */
+};
+
+int main (int argc, const char * argv[]) {
+    if (argc < 3) {
+        printf("Incorrect arguments\n");
+        return 1;
+    }
+
+    @autoreleasepool {
+        NSString *processId = [NSString stringWithUTF8String:argv[1]];
+        NSString *windowId = [NSString stringWithUTF8String:argv[2]];
+
+        id window = getWindowOfProcess(processId, windowId);
+
+        @try {             
+            [window closeSaving:CloseOptionsNo savingIn: nil];
+            return 0;
+        }
+        @catch (NSException *e) {
+
+        }
+
+        @try {             
+            [window close];
+            return 0;
+        }
+        @catch (NSException *e) {
+
+        }
+    }
+
+    return 0;
+}
+

src/natives/find-window/mac/Makefile

@@ -1,8 +1,6 @@
 all: clean build
 clean:
-	rm "${DEST}/find-window.scpt" || true
-	rm "${DEST}/find-window-cocoa" || true
+	rm "${DEST}/find-window" || true
 build:
 	mkdir "${DEST}" || true
-	osacompile -o "${DEST}/find-window.scpt" find-window.applescript
-	clang -o "${DEST}/find-window-cocoa" -framework Cocoa find-window-cocoa.m
+	clang -o "${DEST}/find-window" -framework Cocoa -framework ScriptingBridge find-window.m