Add MRClient and modify _MRNowPlayingClientProtobuf

Author: DimitarNestorov

.gitattributes

@@ -0,0 +1,2 @@
+Package.swift linguist-vendored
+Tests/** linguist-vendored

.github/workflows/test.yml

@@ -2,15 +2,20 @@ name: Test
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   test:
     runs-on: macos-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Play sounds
+        run: open /System/Library/Sounds/*
+
       - name: Run tests
         run: swift test -v

.gitignore

@@ -1,3 +1,4 @@
 .build/
 .swiftpm/
 .DS_Store
+DerivedData/

Sources/PrivateMediaRemote/Functions.h

@@ -1,12 +1,16 @@
 #ifndef PrivateMediaRemote_Functions_h
 #define PrivateMediaRemote_Functions_h
 
-#import "_MRNowPlayingClientProtobuf.h"
-
 void MRMediaRemoteRegisterForNowPlayingNotifications(dispatch_queue_t queue);
 void MRMediaRemoteUnregisterForNowPlayingNotifications(void);
-typedef void (^MRMediaRemoteGetNowPlayingClientCallback)(_MRNowPlayingClientProtobuf *client);
-void MRMediaRemoteGetNowPlayingClient(dispatch_queue_t queue, MRMediaRemoteGetNowPlayingClientCallback block);
+
+/// - Parameters:
+///   - queue: `dispatch_queue_t`
+///   - block:
+///     - Since macOS 10.15 it's `void (^)(MRClient *client)`.
+///     - Since macOS 10.12 it's `void (^)(_MRNowPlayingClientProtobuf *client)`.
+void MRMediaRemoteGetNowPlayingClient(dispatch_queue_t queue, void (^block)(id client));
+
 typedef void (^MRMediaRemoteGetNowPlayingInfoCallback)(NSDictionary *info);
 void MRMediaRemoteGetNowPlayingInfo(dispatch_queue_t queue, MRMediaRemoteGetNowPlayingInfoCallback block);
 typedef void (^MRMediaRemoteGetNowPlayingApplicationIsPlayingCallback)(BOOL isPlaying);

Sources/PrivateMediaRemote/MRClient.h

@@ -0,0 +1,18 @@
+#ifndef PrivateMediaRemote_MRClient_h
+#define PrivateMediaRemote_MRClient_h
+
+#import <os/availability.h>
+#import <PrivateProtocolBuffer/PrivateProtocolBuffer.h>
+
+API_AVAILABLE(macos(10.15))
+@interface MRClient : NSObject {
+    NSString *_bundleIdentifier;
+}
+
+@property (nonatomic, copy) NSString *bundleIdentifier;
+@property (nonatomic, readonly) _MRNowPlayingClientProtobuf *protobuf;
+- (instancetype)initWithProtobuf:(_MRNowPlayingClientProtobuf *)protobuf;
+
+@end
+
+#endif /* PrivateMediaRemote_MRClient_h */

Sources/PrivateMediaRemote/PrivateMediaRemote.h

@@ -5,6 +5,7 @@
 
 #import "_MRColorProtobuf.h"
 #import "_MRNowPlayingClientProtobuf.h"
+#import "MRClient.h"
 #import "Constants.h"
 #import "Enums.h"
 #import "Functions.h"

Tests/TestClasses.h

@@ -11,9 +11,18 @@ BOOL Identifier(isClassDefined)(Class classInstance, NSString *classString) {
 #define TestClass(CLASS) XCTAssertTrue(IsClassDefined(CLASS))
 #define TestUnlinkableClass(CLASS) XCTAssertTrue(IsUnlinkableClassDefined(CLASS))
 
+void Identifier(testClassesCatalina)() {
+    if (@available(macOS 10.15, *)) {
+        TestUnlinkableClass(MRClient);
+    }
+}
+
+#define TestClassesCatalina Identifier(testClassesCatalina)
+
 #define TestClasses \
 TestUnlinkableClass(_MRColorProtobuf); \
 TestClass(_MRNowPlayingClientProtobuf); \
+TestClassesCatalina(); \
 
 
 #endif /* TestClasses_h */

Tests/TestFunctions.h

@@ -5,6 +5,33 @@
 
 #define TestFunction(FUNCTION) XCTAssertTrue(GetFunctionPointer(FUNCTION) != nil)
 
+void Identifier(getNowPlayingClient)(Identifier(Tests) *self) {
+    typeof(MRMediaRemoteGetNowPlayingClient) *func = nil;
+    
+#ifdef LINKED_TESTS
+    func = &MRMediaRemoteGetNowPlayingClient;
+#elif defined(UNLINKED_TESTS)
+    func = CFBundleGetFunctionPointerForName(self.cfBundle, CFSTR("MRMediaRemoteGetNowPlayingClient"));
+#endif
+    
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Long method"];
+    (*func)(dispatch_get_main_queue(), ^(id client) {
+        XCTAssertNotNil(client, @"`client` is `nil` when calling `MRMediaRemoteGetNowPlayingClient`. Play some music for this test to pass.");
+        
+        if (@available(macOS 10.15, *)) {
+            XCTAssertTrue([((NSObject *)client).className isEqualToString:@"MRClient"]);
+        } else {
+            XCTAssertTrue([((NSObject *)client).className isEqualToString:@"_MRNowPlayingClientProtobuf"]);
+        }
+        
+        [expectation fulfill];
+    });
+    
+    [self waitForExpectationsWithTimeout:1 handler:nil];
+}
+
+#define TestMRMediaRemoteGetNowPlayingClient Identifier(getNowPlayingClient)
+
 #define TestFunctions \
 TestFunction(MRMediaRemoteRegisterForNowPlayingNotifications); \
 TestFunction(MRMediaRemoteUnregisterForNowPlayingNotifications); \
@@ -15,5 +42,6 @@ TestFunction(MRNowPlayingClientGetBundleIdentifier); \
 TestFunction(MRNowPlayingClientGetParentAppBundleIdentifier); \
 TestFunction(MRMediaRemoteSetElapsedTime); \
 TestFunction(MRMediaRemoteSendCommand); \
+TestMRMediaRemoteGetNowPlayingClient(self); \
 
 #endif /* TestFunctions_h */