migrated our script to jxa for cleaner code and proper json serialization

CMakeLists.txt

@@ -5,7 +5,7 @@ file(GLOB_RECURSE SOURCES "src/*.cpp")
 
 #enable objective c support on mac os, needed for wxwidgets and compile for both intel macs and apple sillicon macs
 if(APPLE)
-    list(APPEND SOURCES "src/backends/darwin.mm" ${CMAKE_SOURCE_DIR}/osx/icon.icns ${CMAKE_SOURCE_DIR}/osx/MediaRemote.scptd)
+    list(APPEND SOURCES "src/backends/darwin.mm" ${CMAKE_SOURCE_DIR}/osx/icon.icns ${CMAKE_SOURCE_DIR}/osx/MediaRemote.js)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
     set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "" FORCE)
     project ("PlayerLink" LANGUAGES C CXX OBJCXX)
@@ -32,7 +32,7 @@ if(WIN32)
 elseif(APPLE)
     set_target_properties(PlayerLink PROPERTIES MACOSX_BUNDLE TRUE)
     set_source_files_properties(${CMAKE_SOURCE_DIR}/osx/icon.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
-    set_source_files_properties(${CMAKE_SOURCE_DIR}/osx/MediaRemote.scptd PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+    set_source_files_properties(${CMAKE_SOURCE_DIR}/osx/MediaRemote.js PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
     set_target_properties(PlayerLink PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/osx/Info.plist)
 elseif(UNIX AND NOT APPLE)
     list(APPEND LIBRARIES dbus)

osx/MediaRemote.js

@@ -0,0 +1,33 @@
+ObjC.import('Foundation');
+try {
+    const frameworkPath = '/System/Library/PrivateFrameworks/MediaRemote.framework';
+    const framework = $.NSBundle.bundleWithPath($(frameworkPath));
+    framework.load
+
+    const MRNowPlayingRequest = $.NSClassFromString('MRNowPlayingRequest');
+
+    const playerPath = MRNowPlayingRequest.localNowPlayingPlayerPath;
+	const bundleID = ObjC.unwrap(playerPath.client.bundleIdentifier);
+
+    const nowPlayingItem = MRNowPlayingRequest.localNowPlayingItem;
+    const info = nowPlayingItem.nowPlayingInfo;
+
+    const title = info.valueForKey('kMRMediaRemoteNowPlayingInfoTitle');
+    const album = info.valueForKey('kMRMediaRemoteNowPlayingInfoAlbum');
+    const artist = info.valueForKey('kMRMediaRemoteNowPlayingInfoArtist');
+    const duration = info.valueForKey('kMRMediaRemoteNowPlayingInfoDuration');
+    const playbackStatus = info.valueForKey('kMRMediaRemoteNowPlayingInfoPlaybackRate');
+    const elapsed = info.valueForKey('kMRMediaRemoteNowPlayingInfoElapsedTime');
+
+    JSON.stringify({
+        title: ObjC.unwrap(title),
+        album: ObjC.unwrap(album),
+        artist: ObjC.unwrap(artist),
+        duration: ObjC.unwrap(duration),
+        playbackStatus: ObjC.unwrap(playbackStatus),
+        elapsed: ObjC.unwrap(elapsed),
+        player: ObjC.unwrap(bundleID)
+    });
+} catch (error) {
+	JSON.stringify({ player: 'none', error: error.toString() });
+}

osx/MediaRemote.scptd

@@ -1,30 +0,0 @@
-use framework "Foundation"
-try
-	set MediaRemote to current application's NSBundle's bundleWithPath:"/System/Library/PrivateFrameworks/MediaRemote.framework/"
-	MediaRemote's load()
-	
-	set MRNowPlayingRequest to current application's NSClassFromString("MRNowPlayingRequest")
-	set bundleID to MRNowPlayingRequest's localNowPlayingPlayerPath()'s client()'s bundleIdentifier()
-	set info to MRNowPlayingRequest's localNowPlayingItem()'s nowPlayingInfo()
-	set title to info's valueForKey:"kMRMediaRemoteNowPlayingInfoTitle"
-	set album to info's valueForKey:"kMRMediaRemoteNowPlayingInfoAlbum"
-	set artist to info's valueForKey:"kMRMediaRemoteNowPlayingInfoArtist"
-	set duration to info's valueForKey:"kMRMediaRemoteNowPlayingInfoDuration"
-	set playbackStatus to info's valueForKey:"kMRMediaRemoteNowPlayingInfoPlaybackRate"
-	set elapsed to info's valueForKey:"kMRMediaRemoteNowPlayingInfoElapsedTime"
-	
-	set jsonString to "{"
-	set jsonString to jsonString & "\"title\": \"" & title & "\", "
-	set jsonString to jsonString & "\"album\": \"" & album & "\", "
-	set jsonString to jsonString & "\"artist\": \"" & artist & "\", "
-	set jsonString to jsonString & "\"duration\": \"" & duration & "\", "
-	set jsonString to jsonString & "\"playbackStatus\": \"" & playbackStatus & "\", "
-	set jsonString to jsonString & "\"elapsed\": \"" & elapsed & "\","
-	set jsonString to jsonString & "\"player\": \"" & bundleID & "\""
-	set jsonString to jsonString & "}"
-	return jsonString
-on error
-	set jsonString to "{\"player\": \"none\"}"
-	return jsonString
-end try
-

src/backends/darwin.mm

@@ -39,15 +39,15 @@ NSString* executeCommand(NSString* command, NSArray* arguments) {
 }
 
 std::shared_ptr<MediaInfo> backend::getMediaInformation() {
-    static NSString* script = getFilePathFromBundle(@"MediaRemote", @"scptd");
+    static NSString* script = getFilePathFromBundle(@"MediaRemote", @"js");
-    NSString* output = executeCommand(@"/usr/bin/osascript", @[script]);
+    NSString* output = executeCommand(@"/usr/bin/osascript", @[@"-l", @"JavaScript", script]);
     nlohmann::json j = nlohmann::json::parse([output UTF8String]);
 
     std::string appName = j["player"].get<std::string>();
     if (appName == "none")
         return nullptr;
 
-    bool paused = j["playbackStatus"].get<std::string>() == "0";
+    bool paused = j["playbackStatus"].get<int>() == 0;
 
     std::string songTitle = j["title"].get<std::string>();
 
@@ -58,10 +58,10 @@ std::shared_ptr<MediaInfo> backend::getMediaInformation() {
     int64_t elapsedTimeMs = 0;
     int64_t durationMs = 0;
     try {
-        double durationNumber = std::stod(j["duration"].get<std::string>());  
+        double durationNumber = j["duration"].get<double>();  
         durationMs = static_cast<int64_t>(durationNumber * 1000);
 
-        double elapsedTimeNumber = std::stod(j["elapsed"].get<std::string>());  
+        double elapsedTimeNumber = j["elapsed"].get<double>();   
         elapsedTimeMs = static_cast<int64_t>(elapsedTimeNumber * 1000);
     } catch (...) {}