[Darwin] New XPC Service

src/darwin/Framework/CHIP/MTRCluster.h

@@ -73,7 +73,7 @@ MTR_AVAILABLE(ios(17.4), macos(14.4), watchos(10.4), tvos(17.4))
  *    treated as if a default-initialized object was passed in.
  */
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRWriteParams : NSObject <NSCopying>
+@interface MTRWriteParams : NSObject <NSCopying, NSSecureCoding>
 
 /**
  * Controls whether the write is a timed write.
@@ -109,7 +109,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  *    treated as if a default-initialized object was passed in.
  */
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRReadParams : NSObject <NSCopying>
+@interface MTRReadParams : NSObject <NSCopying, NSSecureCoding>
 
 /**
  * Whether the read/subscribe is fabric-filtered. The default is YES.
@@ -152,7 +152,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  *    treated as if a default-initialized object was passed in.
  */
 MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRSubscribeParams : MTRReadParams
+@interface MTRSubscribeParams : MTRReadParams <NSCopying, NSSecureCoding>
 
 /**
  * Whether the subscribe should replace already-existing

src/darwin/Framework/CHIP/MTRCluster.mm

@@ -69,6 +69,8 @@ - (instancetype)init
     return self;
 }
 
+#pragma mark - Copying
+
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
     auto other = [[MTRWriteParams alloc] init];
@@ -77,6 +79,38 @@ - (id)copyWithZone:(NSZone * _Nullable)zone
     return other;
 }
 
+#pragma mark - Coding
+
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
+static NSString * sTimedWriteTimeoutCodingKey = @"sTimedWriteTimeoutKey";
+static NSString * sDataVersionCodingKey = @"sDataVersionKey";
+
+- (nullable instancetype)initWithCoder:(NSCoder *)decoder
+{
+    self = [super init];
+
+    if (self == nil) {
+        return nil;
+    }
+
+    self.timedWriteTimeout = [decoder decodeObjectOfClass:[NSNumber class] forKey:sTimedWriteTimeoutCodingKey];
+    self.dataVersion = [decoder decodeObjectOfClass:[NSNumber class] forKey:sDataVersionCodingKey];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    if (self.timedWriteTimeout)
+        [coder encodeObject:self.timedWriteTimeout forKey:sTimedWriteTimeoutCodingKey];
+    if (self.dataVersion)
+        [coder encodeObject:self.dataVersion forKey:sDataVersionCodingKey];
+}
+
 @end
 
 @implementation MTRReadParams
@@ -89,6 +123,43 @@ - (instancetype)init
     return self;
 }
 
+#pragma mark - Coding
+
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
+static NSString * sFilterByFabricCoderKey = @"sFilterByFabricKey";
+static NSString * sMinEventNumberCoderKey = @"sMinEventNumberKey";
+static NSString * sAssumeUnknownAttributesReportableCoderKey = @"sAssumeUnknownAttributesReportableKey";
+
+- (nullable instancetype)initWithCoder:(NSCoder *)decoder
+{
+    self = [super init];
+
+    if (self == nil) {
+        return nil;
+    }
+
+    self.filterByFabric = [decoder decodeBoolForKey:sFilterByFabricCoderKey];
+    self.assumeUnknownAttributesReportable = [decoder decodeBoolForKey:sAssumeUnknownAttributesReportableCoderKey];
+    self.minEventNumber = [decoder decodeObjectOfClass:[NSNumber class] forKey:sMinEventNumberCoderKey];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    [coder encodeBool:self.filterByFabric forKey:sFilterByFabricCoderKey];
+    [coder encodeBool:self.assumeUnknownAttributesReportable forKey:sAssumeUnknownAttributesReportableCoderKey];
+
+    if (self.minEventNumber)
+        [coder encodeObject:self.minEventNumber forKey:sMinEventNumberCoderKey];
+}
+
+#pragma mark - Copying
+
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
     auto other = [[MTRReadParams alloc] init];
@@ -98,6 +169,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone
     return other;
 }
 
+#pragma mark - Other
+
 - (void)toReadPrepareParams:(chip::app::ReadPrepareParams &)readPrepareParams
 {
     readPrepareParams.mIsFabricFiltered = self.filterByFabric;
@@ -121,18 +194,68 @@ - (instancetype)initWithMinInterval:(NSNumber *)minInterval maxInterval:(NSNumbe
     return self;
 }
 
+#pragma mark - Copying
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
     auto other = [[MTRSubscribeParams alloc] initWithMinInterval:self.minInterval maxInterval:self.maxInterval];
+
     other.filterByFabric = self.filterByFabric;
     other.minEventNumber = self.minEventNumber;
     other.assumeUnknownAttributesReportable = self.assumeUnknownAttributesReportable;
     other.replaceExistingSubscriptions = self.replaceExistingSubscriptions;
     other.reportEventsUrgently = self.reportEventsUrgently;
     other.resubscribeAutomatically = self.resubscribeAutomatically;
+    other.minInterval = self.minInterval;
+    other.maxInterval = self.maxInterval;
+
     return other;
 }
 
+#pragma mark - Coding
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
+static NSString * sReplaceExistingSubscriptionsCoderKey = @"sFilterByFabricKey";
+static NSString * sReportEventsUrgentlyCoderKey = @"sMinEventNumberKey";
+static NSString * sResubscribeAutomaticallyCoderKey = @"sAssumeUnknownAttributesReportableKey";
+static NSString * sMinIntervalKeyCoderKey = @"sMinIntervalKeyKey";
+static NSString * sMaxIntervalKeyCoderKey = @"sMaxIntervalKeyKey";
+
+- (nullable instancetype)initWithCoder:(NSCoder *)decoder
+{
+    self = [super initWithCoder:decoder];
+
+    if (self == nil) {
+        return nil;
+    }
+
+    self.replaceExistingSubscriptions = [decoder decodeBoolForKey:sReplaceExistingSubscriptionsCoderKey];
+    self.reportEventsUrgently = [decoder decodeBoolForKey:sReportEventsUrgentlyCoderKey];
+    self.resubscribeAutomatically = [decoder decodeBoolForKey:sResubscribeAutomaticallyCoderKey];
+    self.minInterval = [decoder decodeObjectOfClass:[NSNumber class] forKey:sMinIntervalKeyCoderKey];
+    self.maxInterval = [decoder decodeObjectOfClass:[NSNumber class] forKey:sMaxIntervalKeyCoderKey];
+
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    [super encodeWithCoder:coder];
+
+    [coder encodeBool:self.replaceExistingSubscriptions forKey:sReplaceExistingSubscriptionsCoderKey];
+    [coder encodeBool:self.reportEventsUrgently forKey:sReportEventsUrgentlyCoderKey];
+    [coder encodeBool:self.resubscribeAutomatically forKey:sResubscribeAutomaticallyCoderKey];
+
+    if (self.minInterval)
+        [coder encodeObject:self.minInterval forKey:sMinIntervalKeyCoderKey];
+    if (self.maxInterval)
+        [coder encodeObject:self.maxInterval forKey:sMaxIntervalKeyCoderKey];
+}
+
+#pragma mark - Main
+
 - (void)toReadPrepareParams:(chip::app::ReadPrepareParams &)readPrepareParams
 {
     [super toReadPrepareParams:readPrepareParams];

src/darwin/Framework/CHIP/MTRDefines_Internal.h

@@ -64,3 +64,50 @@ typedef struct {} variable_hidden_by_mtr_hide;
 
 // Default timed interaction timeout, in ms, if another one is not provided.
 #define MTR_DEFAULT_TIMED_INTERACTION_TIMEOUT_MS 10000
+
+#pragma mark - XPC Defines
+
+#define MTR_SIMPLE_REMOTE_XPC_GETTER(XPC_CONNECTION, NAME, TYPE, DEFAULT_VALUE, GETTER_NAME, PREFIX) \
+                                                                                                     \
+    -(TYPE) NAME                                                                                     \
+    {                                                                                                \
+        __block TYPE outValue = DEFAULT_VALUE;                                                       \
+                                                                                                     \
+        NSXPCConnection * xpcConnection = XPC_CONNECTION;                                            \
+                                                                                                     \
+        [[xpcConnection synchronousRemoteObjectProxyWithErrorHandler:^(NSError * _Nonnull error) {   \
+            MTR_LOG_ERROR("Error: %@", error);                                                       \
+        }] PREFIX                                                                                    \
+            GETTER_NAME:^(TYPE returnValue) {                                                        \
+                outValue = returnValue;                                                              \
+            }];                                                                                      \
+                                                                                                     \
+        return outValue;                                                                             \
+    }
+
+#define MTR_SIMPLE_REMOTE_XPC_COMMAND(XPC_CONNECTION, METHOD_SIGNATURE, ADDITIONAL_ARGUMENTS, PREFIX) \
+                                                                                                      \
+    -(void) METHOD_SIGNATURE                                                                          \
+    {                                                                                                 \
+        NSXPCConnection * xpcConnection = XPC_CONNECTION;                                             \
+                                                                                                      \
+        [[xpcConnection synchronousRemoteObjectProxyWithErrorHandler:^(NSError * _Nonnull error) {    \
+            MTR_LOG_ERROR("Error: %@", error);                                                        \
+        }] PREFIX ADDITIONAL_ARGUMENTS];                                                              \
+    }
+
+#define MTR_COMPLEX_REMOTE_XPC_GETTER(XPC_CONNECTION, SIGNATURE, TYPE, DEFAULT_VALUE, ADDITIONAL_ARGUMENTS, PREFIX) \
+    -(TYPE) SIGNATURE                                                                                               \
+    {                                                                                                               \
+        __block TYPE outValue = DEFAULT_VALUE;                                                                      \
+                                                                                                                    \
+        NSXPCConnection * xpcConnection = XPC_CONNECTION;                                                           \
+                                                                                                                    \
+        [[xpcConnection synchronousRemoteObjectProxyWithErrorHandler:^(NSError * _Nonnull error) {                  \
+            MTR_LOG_ERROR("Error: %@", error);                                                                      \
+        }] PREFIX ADDITIONAL_ARGUMENTS:^(TYPE returnValue) {                                                        \
+            outValue = returnValue;                                                                                 \
+        }];                                                                                                         \
+                                                                                                                    \
+        return outValue;                                                                                            \
+    }

src/darwin/Framework/CHIP/MTRDeviceController.mm

@@ -31,6 +31,7 @@
 #import "MTRDeviceControllerLocalTestStorage.h"
 #import "MTRDeviceControllerStartupParams.h"
 #import "MTRDeviceControllerStartupParams_Internal.h"
+#import "MTRDeviceController_XPC.h"
 #import "MTRDevice_Concrete.h"
 #import "MTRDevice_Internal.h"
 #import "MTRError_Internal.h"
@@ -144,7 +145,11 @@ - (instancetype)initForSubclasses
 
 - (nullable MTRDeviceController *)initWithParameters:(MTRDeviceControllerAbstractParameters *)parameters error:(NSError * __autoreleasing *)error
 {
-    if (![parameters isKindOfClass:MTRDeviceControllerParameters.class]) {
+    if ([parameters isKindOfClass:MTRXPCDeviceControllerParameters.class]) {
+        MTRXPCDeviceControllerParameters * resolvedParameters = (MTRXPCDeviceControllerParameters *) parameters;
+        MTR_LOG("Starting up with XPC Device Controller Parameters: %@", parameters);
+        return [[MTRDeviceController_XPC alloc] initWithUniqueIdentifier:resolvedParameters.uniqueIdentifier xpConnectionBlock:resolvedParameters.xpcConnectionBlock];
+    } else if (![parameters isKindOfClass:MTRDeviceControllerParameters.class]) {
         MTR_LOG_ERROR("Unsupported type of MTRDeviceControllerAbstractParameters: %@", parameters);
         if (error) {
             *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INVALID_ARGUMENT];

src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h

@@ -145,4 +145,26 @@ MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6))
 
 @end
 
+MTR_NEWLY_AVAILABLE
+@interface MTRXPCDeviceControllerParameters : MTRDeviceControllerAbstractParameters
+
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
+
+/**
+ * A controller created from this way will connect to a remote instance of an MTRDeviceController loaded in an XPC Service
+ *
+ * @param xpcConnectionBlock The XPC Connection block that will return an NSXPCConnection to the indended listener.
+ *
+ * @param uniqueIdentifier The unique id to assign to the controller.
+ *
+ */
+- (instancetype)initWithXPConnectionBlock:(NSXPCConnection * (^)(void) )xpcConnectionBlock
+                         uniqueIdentifier:(NSUUID *)uniqueIdentifier;
+
+@property (atomic, readonly, retain) NSUUID * uniqueIdentifier MTR_NEWLY_AVAILABLE;
+@property (readonly, strong, nonatomic) NSXPCConnection * (^xpcConnectionBlock)(void) MTR_NEWLY_AVAILABLE;
+
+@end
+
 NS_ASSUME_NONNULL_END

src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm

@@ -331,6 +331,23 @@ - (instancetype)initWithStorageDelegate:(id<MTRDeviceControllerStorageDelegate>)
 }
 @end
 
+@implementation MTRXPCDeviceControllerParameters
+
+@synthesize uniqueIdentifier = _uniqueIdentifier;
+@synthesize xpcConnectionBlock = _xpcConnectionBlock;
+
+- (instancetype)initWithXPConnectionBlock:(NSXPCConnection * (^)(void) )xpcConnectionBlock
+                         uniqueIdentifier:(NSUUID *)uniqueIdentifier;
+{
+    if (self = [super _initInternal]) {
+        _xpcConnectionBlock = [xpcConnectionBlock copy];
+        _uniqueIdentifier = [uniqueIdentifier copy];
+    }
+
+    return self;
+}
+@end
+
 @implementation MTRDeviceControllerStartupParamsInternal
 
 - (instancetype)initWithParams:(MTRDeviceControllerStartupParams *)params

src/darwin/Framework/CHIP/MTRDeviceControllerXPCParameters.h

@@ -0,0 +1,31 @@
+/**
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#import <Matter/Matter.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MTRDeviceControllerXPCParameters : MTRDeviceControllerParameters
+@end
+
+@interface MTRDeviceControllerMachServiceXPCParameters : MTRDeviceControllerXPCParameters
+
+@property (atomic, retain) NSString * machServiceName;
+@property (atomic, readwrite) NSXPCConnectionOptions connectionOptions;
+
+@end
+
+NS_ASSUME_NONNULL_END

src/darwin/Framework/CHIP/MTRDeviceControllerXPCParameters.mm

@@ -0,0 +1,35 @@
+/**
+ *    Copyright (c) 2024 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#import "MTRDeviceControllerXPCParameters.h"
+
+@implementation MTRDeviceControllerXPCParameters
+
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
+@end
+
+@implementation MTRDeviceControllerMachServiceXPCParameters
+
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
+@end