jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fbshipit-source-id: cad5f527363fe09c2eea5b05ce1f3f2ecb86941b

Browse Source
This commit is contained in:
Daniel Buchele
2018-06-12 11:42:02 -07:00
parent 1edffabd05
commit 28be3c7cd8
22 changed files with 208 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
iOS/SonarKit/CppBridge/SonarCppBridgingConnection.mm
View File

@@ -7,7 +7,8 @@
*/
#import "SonarCppBridgingConnection.h"
#import "SKUtils.h"
#import <FBCxxUtils/FBCxxFollyDynamicConvert.h>
#import "SonarCppBridgingResponder.h"
@implementation SonarCppBridgingConnection
@@ -27,7 +28,7 @@
- (void)send:(NSString *)method withParams:(NSDictionary *)params
{
conn_->send([method UTF8String], [SKUtils convertIdToFollyDynamic:params]);
conn_->send([method UTF8String], facebook::cxxutils::convertIdToFollyDynamic(params));
}
- (void)receive:(NSString *)method withBlock:(SonarReceiver)receiver
@@ -36,7 +37,7 @@
std::unique_ptr<facebook::sonar::SonarResponder> responder) {
SonarCppBridgingResponder *const objCResponder =
[[SonarCppBridgingResponder alloc] initWithCppResponder:std::move(responder)];
receiver([SKUtils convertFollyDynamicToId: message], objCResponder);
receiver(facebook::cxxutils::convertFollyDynamicToId(message), objCResponder);
};
conn_->receive([method UTF8String], lambda);
}

6
iOS/SonarKit/CppBridge/SonarCppBridgingResponder.mm
View File

@@ -7,7 +7,7 @@
*/
#import "SonarCppBridgingResponder.h"
#import "SKUtils.h"
#import <FBCxxUtils/FBCxxFollyDynamicConvert.h>
@implementation SonarCppBridgingResponder {
std::unique_ptr<facebook::sonar::SonarResponder> responder_;
@@ -28,8 +28,8 @@
#pragma mark - SonarResponder
- (void)success:(NSDictionary *)response { responder_->success([SKUtils convertIdToFollyDynamic:response]); }
- (void)success:(NSDictionary *)response { responder_->success(facebook::cxxutils::convertIdToFollyDynamic(response)); }
- (void)error:(NSDictionary *)response { responder_->error([SKUtils convertIdToFollyDynamic:response]); }
- (void)error:(NSDictionary *)response { responder_->error(facebook::cxxutils::convertIdToFollyDynamic(response)); }
@end

24
iOS/SonarKit/Info.plist Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>

14
iOS/SonarKit/SonarClient.mm
View File

@@ -15,7 +15,7 @@
#import <UIKit/UIKit.h>
#if !TARGET_OS_SIMULATOR
#import "SKPortForwardingServer.h"
//#import "SKPortForwardingServer.h"
#endif
using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin;
@@ -24,7 +24,7 @@ using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin;
facebook::sonar::SonarClient *_cppClient;
folly::ScopedEventBaseThread eventBaseThread;
#if !TARGET_OS_SIMULATOR
SKPortForwardingServer *_server;
// SKPortForwardingServer *_server;
#endif
}
@@ -103,9 +103,9 @@ using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin;
- (void)start;
{
#if !TARGET_OS_SIMULATOR
_server = [SKPortForwardingServer new];
[_server forwardConnectionsFromPort:8088];
[_server listenForMultiplexingChannelOnPort:8078];
// _server = [SKPortForwardingServer new];
// [_server forwardConnectionsFromPort:8088];
// [_server listenForMultiplexingChannelOnPort:8078];
#endif
_cppClient->start();
}
@@ -114,8 +114,8 @@ using WrapperPlugin = facebook::sonar::SonarCppWrapperPlugin;
{
_cppClient->stop();
#if !TARGET_OS_SIMULATOR
[_server close];
_server = nil;
// [_server close];
// _server = nil;
#endif
}