Page MenuHomePhabricator
Differential D4488

[Nix] Add support for tunnelbroker build
AbandonedPublicDraft
Actions

Authored by • jon on Jul 8 2022, 10:21 PM.
Tags
None
Referenced Files
F5319471: D4488.id14780.diff
Tue, Apr 8, 7:15 PM
F5319461: D4488.id14402.diff
Tue, Apr 8, 7:15 PM
F5319460: D4488.id14373.diff
Tue, Apr 8, 7:15 PM
F5319454: D4488.id.diff
Tue, Apr 8, 7:15 PM
F5319443: D4488.diff
Tue, Apr 8, 7:15 PM
Unknown Object (File)
Wed, Apr 2, 8:34 AM
Unknown Object (File)
Tue, Mar 18, 3:49 PM
Unknown Object (File)
Sun, Mar 16, 11:37 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
tomek

Details

Reviewers
varun
Summary

Dependencies needed for building tunnelbroker

Test Plan

nix develop

Nix compatible changes are in a later diff

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• jon created this revision.Jul 8 2022, 10:21 PM
Herald added subscribers: • abosh, atul, • adrian and 2 others. · View Herald TranscriptJul 8 2022, 10:21 PM
Harbormaster returned this revision to the author for changes because remote builds failed.Jul 8 2022, 10:24 PM
Harbormaster failed remote builds in B10429: Diff 14373!
• jon added a child revision: D4489: [Services] Export shared services cpp as CMake Project.Jul 8 2022, 10:25 PM
• jon updated this revision to Diff 14402.Jul 11 2022, 5:35 PM

Update diff with changes to master

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 11 2022, 5:37 PM
Harbormaster failed remote builds in B10457: Diff 14402!
• jon updated this revision to Diff 14780.Jul 21 2022, 12:08 PM

Add corrosion

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 21 2022, 12:13 PM
Harbormaster failed remote builds in B10740: Diff 14780!
• jon removed a child revision: D4489: [Services] Export shared services cpp as CMake Project.Jul 26 2022, 8:23 AM
• jon added a child revision: D4489: [Services] Export shared services cpp as CMake Project.Jul 29 2022, 9:51 AM
• jon abandoned this revision.Jul 29 2022, 10:00 AM

This work was scoped down and moved to https://phab.comm.dev/D4604

• jon removed a child revision: D4489: [Services] Export shared services cpp as CMake Project.Jul 29 2022, 2:59 PM
• jon added a child revision: D4489: [Services] Export shared services cpp as CMake Project.Jul 29 2022, 3:04 PM
• jon removed a child revision: D4489: [Services] Export shared services cpp as CMake Project.Jul 29 2022, 3:17 PM
• jon added a child revision: D4489: [Services] Export shared services cpp as CMake Project.Aug 1 2022, 1:01 PM

Revision Contents
Changeset List

PathSize
nix/
10 lines
services/
tunnelbroker/
18 lines

Diff 14402

View Options

nix/dev-shell.nix

  • This file was added.
#import "CommServicesAuthMetadataEmitter.h"
#import <Foundation/Foundation.h>
#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>
NSString *const commServicesAuthMetadata = @"commServicesAuthMetadata";
@interface CommServicesAuthMetadataEmitterIOSWrapper
marcinAuthorUnsubmitted
Done
Inline Actions

It might look uncommon to have interface declaration and implementation next to each other in a single file but in fact we don't need to expose CommServicesAuthMetadataIOSWrapper. If we want to call sendAuthMetadataToJS from Objective - C we can use the common C++ API so let's avoid creating unnecessary files and duplication the same API.

marcin: It might look uncommon to have interface declaration and implementation next to each other in a…
bartekUnsubmitted
Not Done
Inline Actions

It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes sense here

bartek: It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes…
: RCTEventEmitter <RCTBridgeModule>
@property(nonatomic) BOOL hasListeners;
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID;
bartekUnsubmitted
Not Done
Inline Actions

What about sendAccessTokenToJS: ... withUserID: ... withDeviceID?

Initially, I got confused because I understood sendToJSAccessToken as "send something to JS-based access token" 😅

bartek: What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused…
varunUnsubmitted
Not Done
Inline Actions

+1

varun: +1
@end
@implementation CommServicesAuthMetadataEmitterIOSWrapper
RCT_EXPORT_MODULE(CommServicesAuthMetadataEmitter);
static CommServicesAuthMetadataEmitterIOSWrapper *sharedInstance = nil;
- (instancetype)init {
self = [super init];
if (!self) {
return self;
}
_hasListeners = NO;
return self;
}
- (void)startObserving {
@synchronized([self class]) {
_hasListeners = YES;
sharedInstance = self;
}
}
- (void)stopObserving {
@synchronized([self class]) {
_hasListeners = NO;
sharedInstance = nil;
}
}
- (NSArray<NSString *> *)supportedEvents {
return @[ commServicesAuthMetadata ];
}
- (NSDictionary *)constantsToExport {
return @{@"COMM_SERVICES_AUTH_METADATA" : commServicesAuthMetadata};
}
+ (BOOL)requiresMainQueueSetup {
return YES;
}
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID {
@synchronized([self class]) {
if (!sharedInstance) {
return;
}
NSDictionary *eventBody = @{
@"accessToken" : accessToken,
@"userID" : userID,
@"deviceID" : deviceID
};
[sharedInstance sendEventWithName:commServicesAuthMetadata body:eventBody];
}
}
@end
namespace comm {
void CommServicesAuthMetadataEmitter::sendAuthMetadataToJS(
rust::String accessToken,
rust::String userID,
rust::String deviceID) {
NSString *accessTokenObjC =
[NSString stringWithCString:std::string(accessToken).c_str()
encoding:NSUTF8StringEncoding];
NSString *userIDObjC = [NSString stringWithCString:std::string(userID).c_str()
encoding:NSUTF8StringEncoding];
NSString *deviceIDObjC =
[NSString stringWithCString:std::string(deviceID).c_str()
encoding:NSUTF8StringEncoding];
[CommServicesAuthMetadataEmitterIOSWrapper sendToJSAccessToken:accessTokenObjC
withUserID:userIDObjC
withDeviceID:deviceIDObjC];
}
} // namespace comm
View Options

services/tunnelbroker/CMakeLists.txt

  • This file was added.
#import "CommServicesAuthMetadataEmitter.h"
#import <Foundation/Foundation.h>
#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>
NSString *const commServicesAuthMetadata = @"commServicesAuthMetadata";
@interface CommServicesAuthMetadataEmitterIOSWrapper
marcinAuthorUnsubmitted
Done
Inline Actions

It might look uncommon to have interface declaration and implementation next to each other in a single file but in fact we don't need to expose CommServicesAuthMetadataIOSWrapper. If we want to call sendAuthMetadataToJS from Objective - C we can use the common C++ API so let's avoid creating unnecessary files and duplication the same API.

marcin: It might look uncommon to have interface declaration and implementation next to each other in a…
bartekUnsubmitted
Not Done
Inline Actions

It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes sense here

bartek: It's not that uncommon 😉 I've seen this pattern already in some RN-related code and it makes…
: RCTEventEmitter <RCTBridgeModule>
@property(nonatomic) BOOL hasListeners;
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID;
bartekUnsubmitted
Not Done
Inline Actions

What about sendAccessTokenToJS: ... withUserID: ... withDeviceID?

Initially, I got confused because I understood sendToJSAccessToken as "send something to JS-based access token" 😅

bartek: What about `sendAccessTokenToJS: ... withUserID: ... withDeviceID`? Initially, I got confused…
varunUnsubmitted
Not Done
Inline Actions

+1

varun: +1
@end
@implementation CommServicesAuthMetadataEmitterIOSWrapper
RCT_EXPORT_MODULE(CommServicesAuthMetadataEmitter);
static CommServicesAuthMetadataEmitterIOSWrapper *sharedInstance = nil;
- (instancetype)init {
self = [super init];
if (!self) {
return self;
}
_hasListeners = NO;
return self;
}
- (void)startObserving {
@synchronized([self class]) {
_hasListeners = YES;
sharedInstance = self;
}
}
- (void)stopObserving {
@synchronized([self class]) {
_hasListeners = NO;
sharedInstance = nil;
}
}
- (NSArray<NSString *> *)supportedEvents {
return @[ commServicesAuthMetadata ];
}
- (NSDictionary *)constantsToExport {
return @{@"COMM_SERVICES_AUTH_METADATA" : commServicesAuthMetadata};
}
+ (BOOL)requiresMainQueueSetup {
return YES;
}
+ (void)sendToJSAccessToken:(NSString *)accessToken
withUserID:(NSString *)userID
withDeviceID:(NSString *)deviceID {
@synchronized([self class]) {
if (!sharedInstance) {
return;
}
NSDictionary *eventBody = @{
@"accessToken" : accessToken,
@"userID" : userID,
@"deviceID" : deviceID
};
[sharedInstance sendEventWithName:commServicesAuthMetadata body:eventBody];
}
}
@end
namespace comm {
void CommServicesAuthMetadataEmitter::sendAuthMetadataToJS(
rust::String accessToken,
rust::String userID,
rust::String deviceID) {
NSString *accessTokenObjC =
[NSString stringWithCString:std::string(accessToken).c_str()
encoding:NSUTF8StringEncoding];
NSString *userIDObjC = [NSString stringWithCString:std::string(userID).c_str()
encoding:NSUTF8StringEncoding];
NSString *deviceIDObjC =
[NSString stringWithCString:std::string(deviceID).c_str()
encoding:NSUTF8StringEncoding];
[CommServicesAuthMetadataEmitterIOSWrapper sendToJSAccessToken:accessTokenObjC
withUserID:userIDObjC
withDeviceID:deviceIDObjC];
}
} // namespace comm