pbind 0.6.2 → 0.8.2

data/source/PBLiveLoader/PBLLInspectorController.h

@@ -15,6 +15,8 @@
 
 @interface PBLLInspectorController : UIViewController
 
++ (void)presentFromViewController:(UIViewController *)viewController;
+
 @end
 
 #endif

data/source/PBLiveLoader/PBLLInspectorController.m

@@ -11,8 +11,21 @@
 
 #import "PBLLInspector.h"
 #import "PBLLRemoteWatcher.h"
+#import "PBLLResource.h"
 #import <Pbind/Pbind.h>
 
+@interface _PBLLWrapperNavigationController : UINavigationController
+
+@end
+
+@implementation _PBLLWrapperNavigationController
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleLightContent;
+}
+
+@end
+
 @interface PBLLInspectorController () <UISearchBarDelegate>
 {
     UISearchBar *_searchBar;
@@ -25,27 +38,77 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    self.title = [PBLLResource pbindTitle];
+    UIColor *primaryColor = [PBLLResource pbindColor];
+    UINavigationBar *navigationBar = self.navigationController.navigationBar;
+    [navigationBar setBarTintColor:primaryColor];
+    [navigationBar setTintColor:[UIColor whiteColor]];
+    [navigationBar setBackgroundImage:[UIImage new] forBarPosition:UIBarPositionAny barMetrics:UIBarMetricsDefault];
+    [navigationBar setShadowImage:[UIImage new]];
+    [navigationBar setTranslucent:NO];
+    [navigationBar setTitleTextAttributes:@{NSForegroundColorAttributeName: [UIColor whiteColor]}];
+    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop target:self action:@selector(dismiss)];
+    
     self.edgesForExtendedLayout = UIRectEdgeNone;
     self.view.backgroundColor = [UIColor whiteColor];
     CGRect frame = self.view.bounds;
     frame.size.height = 44.f;
-    frame.origin.y = 16.f;
     UISearchBar *searchBar = [[UISearchBar alloc] initWithFrame:frame];
-    searchBar.text = [self defaultIP];
+    searchBar.barTintColor = primaryColor;
+    searchBar.text = [PBLLRemoteWatcher globalWatcher].defaultIP;
     searchBar.delegate = self;
     searchBar.returnKeyType = UIReturnKeyJoin;
+    searchBar.barStyle = UISearchBarStyleMinimal;
     [self.view addSubview:searchBar];
     _searchBar = searchBar;
+    [searchBar becomeFirstResponder];
+    
+    // Help label
+    UILabel *helpLabel = [[UILabel alloc] init];
+    helpLabel.font = [UIFont systemFontOfSize:14.f];
+    helpLabel.numberOfLines = 0;
+    helpLabel.textColor = PBColorMake(@"666");
+    helpLabel.text = @(
+    "Input the IP of the pbind server started by:\n"
+    "\n"
+    "        > gem install pbind"      "\n"
+    "        > cd [path-to-xcodeproj]" "\n"
+    "        > pbind serv"             "\n"
+    "\n"
+    "Then click [Join] to start online debugging.");
+    [self.view addSubview:helpLabel];
+    
+    frame.origin.y += frame.size.height + 44.f;
+    frame.origin.x = 32.f;
+    frame.size.width = frame.size.width - 64.f;
+    frame.size.height = [helpLabel sizeThatFits:frame.size].height;
+    helpLabel.frame = frame;
     
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didTap:)];
     [self.view addGestureRecognizer:tap];
 }
 
++ (void)presentFromViewController:(UIViewController *)viewController {
+    PBLLInspectorController *inspectorVC = [[PBLLInspectorController alloc] init];
+    UINavigationController *nav = [[_PBLLWrapperNavigationController alloc] initWithRootViewController:inspectorVC];
+    [viewController presentViewController:nav animated:YES completion:nil];
+}
+
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [PBLLInspector sharedInspector].hidden = YES;
 }
 
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault];
+}
+
 - (void)viewDidDisappear:(BOOL)animated {
     [super viewDidDisappear:animated];
     [PBLLInspector sharedInspector].hidden = NO;
@@ -56,19 +119,6 @@
     // Dispose of any resources that can be recreated.
 }
 
-- (NSString *)defaultIP {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"pbind.server.ip"];
-    if (ip == nil) {
-        ip = @"192.168.1.10";
-    }
-    return ip;
-}
-
-- (void)setDefaultIP:(NSString *)ip {
-    [[NSUserDefaults standardUserDefaults] setObject:ip forKey:@"pbind.server.ip"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-}
-
 #pragma mark - UISearchBarDelegate
 
 - (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar {
@@ -77,9 +127,8 @@
         return;
     }
     
-    [self setDefaultIP:ip];
     [[PBLLRemoteWatcher globalWatcher] connect:ip];
-    [self.navigationController popViewControllerAnimated:YES];
+    [self dismiss];
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(.3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [PBTopController().view pb_reloadClient];
     });
@@ -91,6 +140,11 @@
     [_searchBar resignFirstResponder];
 }
 
+- (void)dismiss {
+    [_searchBar resignFirstResponder];
+    [self.navigationController dismissViewControllerAnimated:YES completion:nil];
+}
+
 @end
 
 #endif

data/source/PBLiveLoader/PBLLInspectorTipsController.h

@@ -0,0 +1,23 @@
+//
+//  PBLLInspectorTipsController.h
+//  Pbind
+//
+//  Created by galen on 17/7/29.
+//
+
+#import "PBLLOptions.h"
+#include <targetconditionals.h>
+
+#if (PBLIVE_ENABLED)
+
+#import <UIKit/UIKit.h>
+
+@interface PBLLInspectorTipsController : UIViewController
+
+@property (nonatomic, strong) NSString *tips;
+
+@property (nonatomic, strong) NSString *code;
+
+@end
+
+#endif

data/source/PBLiveLoader/PBLLInspectorTipsController.m

@@ -0,0 +1,140 @@
+//
+//  PBLLInspectorTipsController.m
+//  Pbind
+//
+//  Created by galen on 17/7/29.
+//
+
+#import "PBLLInspectorTipsController.h"
+
+#if (PBLIVE_ENABLED)
+
+#import "PBLLRemoteWatcher.h"
+#import "PBLLResource.h"
+#import <Pbind/Pbind.h>
+
+@interface PBLLInspectorTipsController ()
+
+@property (nonatomic, strong) UILabel *tipsLabel;
+@property (nonatomic, strong) UIToolbar *toolbar;
+@property (nonatomic, assign) CGFloat preferredWidth;
+@property (nonatomic, strong) UIBarButtonItem *codeOrTipsItem;
+
+@end
+
+@implementation PBLLInspectorTipsController
+
+static BOOL kDisplaysCode = NO;
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    
+    CGRect rect = [UIScreen mainScreen].bounds;
+    _preferredWidth = rect.size.width * 2.f / 3.f;
+    
+    rect.origin.x = 16.f;
+    rect.origin.y = 16.f;
+    UILabel *label = [[UILabel alloc] initWithFrame:rect];
+    label.textColor = [UIColor whiteColor];
+    label.text = self.tips;
+    label.font = [UIFont systemFontOfSize:12.f];
+    label.numberOfLines = 0;
+    rect.size.height = [label sizeThatFits:rect.size].height;
+    label.frame = rect;
+    
+    [self.view addSubview:label];
+    _tipsLabel = label;
+    
+    UIToolbar *toolbar = [[UIToolbar alloc] init];
+    [toolbar setBarTintColor:self.popoverPresentationController.backgroundColor];
+    [toolbar setTintColor:[UIColor whiteColor]];
+    
+    NSMutableArray *items = [NSMutableArray arrayWithCapacity:4];
+    [items addObject:[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemStop target:self action:@selector(handleClose:)]];
+    [items addObject:[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil]];
+    if (self.code != nil) {
+        _codeOrTipsItem = [[UIBarButtonItem alloc] initWithTitle:@"" style:UIBarButtonItemStylePlain target:self action:@selector(handleToggleCode:)];
+        [items addObject:_codeOrTipsItem];
+        
+        [items addObject:[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil]];
+    }
+    // Copy
+    [items addObject:[[UIBarButtonItem alloc] initWithImage:[PBLLResource copyImage] style:UIBarButtonItemStylePlain target:self action:@selector(handleCopy:)]];
+#if !(TARGET_IPHONE_SIMULATOR)
+    // Post
+    UIBarButtonItem *postItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemReply target:self action:@selector(handlePost:)];
+    [items addObject:postItem];
+#endif
+    
+    toolbar.items = items;
+    [self.view addSubview:toolbar];
+    _toolbar = toolbar;
+    
+    [self render];
+}
+
+- (void)render {
+    [self renderWithAnimated:NO];
+}
+
+- (void)renderWithAnimated:(BOOL)animated {
+    dispatch_block_t renderBlock = ^{
+        if (_code != nil) {
+            if (kDisplaysCode) {
+                _codeOrTipsItem.title = @"Value";
+                _tipsLabel.text = _code;
+            } else {
+                _codeOrTipsItem.title = @"Code";
+                _tipsLabel.text = _tips;
+            }
+        } else {
+            _tipsLabel.text = _tips;
+        }
+        
+        CGRect rect = CGRectMake(16.f, 16.f, _preferredWidth - 32.f, CGFLOAT_MAX);
+        rect.size.height = [_tipsLabel sizeThatFits:rect.size].height;
+        _tipsLabel.frame = rect;
+        
+        rect.origin.x = 0.f;
+        rect.origin.y += rect.size.height + 16.f;
+        rect.size.width = _preferredWidth;
+        rect.size.height = 44.f;
+        _toolbar.frame = rect;
+        
+        rect.size.height += rect.origin.y;
+        self.preferredContentSize = rect.size;
+    };
+    if (animated) {
+        [UIView animateWithDuration:.25f animations:renderBlock completion:^(BOOL finished) {
+            [self.popoverPresentationController.containerView setNeedsLayout];
+        }];
+    } else {
+        renderBlock();
+    }
+}
+
+#pragma mark - BarButtonItem
+
+- (void)handleClose:(id)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (void)handleToggleCode:(id)sender {
+    kDisplaysCode = !kDisplaysCode;
+    [self renderWithAnimated:YES];
+}
+
+- (void)handleCopy:(id)sender {
+    [UIPasteboard generalPasteboard].string = _tipsLabel.text;
+}
+
+#if !(TARGET_IPHONE_SIMULATOR)
+- (void)handlePost:(id)sender {
+    [[PBLLRemoteWatcher globalWatcher] sendLog:_tips];
+}
+#endif
+
+@end
+
+#endif

data/source/PBLiveLoader/PBLLOptions.h

@@ -5,4 +5,4 @@
 //  Created by Galen Lin on 25/03/2017.
 //
 
-#define PBLIVE_ENABLED DEBUG
+#define PBLIVE_ENABLED (DEBUG || PROFILE)

data/source/PBLiveLoader/PBLLRemoteWatcher.h

@@ -24,6 +24,8 @@
 - (void)remoteWatcher:(PBLLRemoteWatcher *)watcher didCreateFile:(NSString *)fileName;
 - (void)remoteWatcher:(PBLLRemoteWatcher *)watcher didDeleteFile:(NSString *)fileName;
 
+- (void)remoteWatcher:(PBLLRemoteWatcher *)watcher didChangeConnectState:(BOOL)connected;
+
 @end
 
 @interface PBLLRemoteWatcher : NSObject
@@ -35,8 +37,12 @@
 
 - (void)requestAPI:(NSString *)api success:(void (^)(NSData *))success failure:(void (^)(NSError *))failure;
 
+- (void)sendLog:(NSString *)log;
+
 @property (nonatomic, assign) id<PBLLRemoteWatcherDelegate> delegate;
 
+@property (nonatomic, strong, readonly) NSString *defaultIP;
+
 @end
 
 #endif

data/source/PBLiveLoader/PBLLRemoteWatcher.m

@@ -16,17 +16,25 @@
 {
     NSInputStream *inputStream;
     NSOutputStream *outputStream;
-    void (^responseBlock)(NSData *);
+    void (^apiSuccessBlock)(NSData *);
+    void (^apiFailureBolck)(NSError *);
     BOOL streamOpened;
     NSData *apiReqData;
     NSString *tempResourcesPath;
     NSString *connectedIP;
+    NSInteger retryCount;
 }
 
 @end
 
 @implementation PBLLRemoteWatcher
 
+static const NSTimeInterval kTimeoutSeconds = 3.f;
+static NSString *const kServerIPUserDefaultsKey = @"pbind.server.ip";
+static NSString *const kDefaultServerIP = @"192.168.1.10";
+static const NSInteger kServerPort = 8082;
+static const NSInteger kMaxRetryCount = 5;
+
 + (instancetype)globalWatcher {
     static PBLLRemoteWatcher *o;
     static dispatch_once_t onceToken;
@@ -39,10 +47,15 @@
 - (void)connect:(NSString *)ip {
     [self close];
     
+    if (ip == nil) {
+        return;
+    }
+    
     connectedIP = ip;
+    [[NSUserDefaults standardUserDefaults] setObject:ip forKey:kServerIPUserDefaultsKey];
     CFReadStreamRef readStream;
     CFWriteStreamRef writeStream;
-    CFStreamCreatePairWithSocketToHost(NULL, (__bridge CFStringRef)ip, 8082, &readStream, &writeStream);
+    CFStreamCreatePairWithSocketToHost(NULL, (__bridge CFStringRef)ip, kServerPort, &readStream, &writeStream);
     inputStream = (__bridge NSInputStream *)readStream;
     outputStream = (__bridge NSOutputStream *)writeStream;
     inputStream.delegate = self;
@@ -54,11 +67,15 @@
 }
 
 - (void)connectDefaultIP {
-    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:@"pbind.server.ip"];
+    [self connect:self.defaultIP];
+}
+
+- (NSString *)defaultIP {
+    NSString *ip = [[NSUserDefaults standardUserDefaults] objectForKey:kServerIPUserDefaultsKey];
     if (ip == nil) {
-        ip = @"192.168.1.2";
+        ip = kDefaultServerIP;
     }
-    [self connect:ip];
+    return ip;
 }
 
 - (void)requestAPI:(NSString *)api success:(void (^)(NSData *))success failure:(void (^)(NSError *))failure {
@@ -69,13 +86,31 @@
         return;
     }
     
-    responseBlock = success;
-    NSData *data = [api dataUsingEncoding:NSUTF8StringEncoding];
+    apiSuccessBlock = success;
+    apiFailureBolck = failure;
+    
+    NSData *reqData = [self dataWithMessage:api event:PBLLRemoteEventJsonRequest];
     if (streamOpened) {
-        [outputStream write:[data bytes] maxLength:[data length]];
+        [self sendData:reqData];
     } else {
-        apiReqData = data;
+//        apiReqData = reqData;
+        failure(nil);
+        return;
     }
+    
+    NSLog(@"---- perform delay onTimeout");
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(onTimeout) object:nil];
+    [self performSelector:@selector(onTimeout) withObject:nil afterDelay:kTimeoutSeconds];
+}
+
+- (void)onTimeout {
+    if (apiFailureBolck) {
+        apiFailureBolck([NSError errorWithDomain:@"PBLLRemoteWatcher"
+                                            code:-1
+                                        userInfo:@{NSLocalizedDescriptionKey: @"Server no response"}]);
+        apiFailureBolck = nil;
+    }
+    apiSuccessBlock = nil;
 }
 
 - (void)close {
@@ -90,10 +125,67 @@
     streamOpened = NO;
 }
 
+#pragma mark - Communication
+
+typedef NS_ENUM(NSUInteger, PBLLRemoteEvent) {
+    // client events
+    PBLLRemoteEventConnected    = 0xC0,
+    PBLLRemoteEventJsonRequest  = 0xC1,
+    PBLLRemoteEventLog          = 0xC2,
+    
+    // server events - data
+    PBLLRemoteEventDataJson     = 0xD0,
+    
+    // server events - error
+    PBLLRemoteEventErrorIgnored = 0xE0,
+    
+    // server events - file
+    PBLLRemoteEventFileCreated  = 0xF0,
+    PBLLRemoteEventFileUpdated  = 0xF1,
+    PBLLRemoteEventFileDeleted  = 0xF2,
+};
+
+- (void)sendMessage:(NSString *)message {
+    NSData *msgData = [message dataUsingEncoding:NSUTF8StringEncoding];
+    [self sendData:msgData];
+}
+
+- (void)sendLog:(NSString *)log {
+    [self sendMessage:log event:PBLLRemoteEventLog];
+}
+
+- (void)sendConnectedMessage {
+    NSString *osModel = [[UIDevice currentDevice] name];
+    NSString *osVersion = [[UIDevice currentDevice] systemVersion];
+    NSString *deviceName = [NSString stringWithFormat:@"%@(%@)", osModel, osVersion];
+    [self sendMessage:deviceName event:PBLLRemoteEventConnected];
+}
+
+- (void)sendMessage:(NSString *)message event:(PBLLRemoteEvent)event {
+    NSData *data = [self dataWithMessage:message event:event];
+    [self sendData:data];
+}
+
+- (void)sendData:(NSData *)data {
+    if (!streamOpened) {
+        return;
+    }
+    
+    [outputStream write:[data bytes] maxLength:[data length]];
+}
+
+- (NSData *)dataWithMessage:(NSString *)message event:(PBLLRemoteEvent)event {
+    NSData *msgData = [message dataUsingEncoding:NSUTF8StringEncoding];
+    NSUInteger len = msgData.length + 1;
+    NSMutableData *data = [[NSMutableData alloc] initWithCapacity:len];
+    [data appendBytes:&event length:1];
+    [data appendData:msgData];
+    return data;
+}
+
 #pragma mark - NSStreamDelegate
 
 - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode {
-    NSLog(@"socket: %i, %@", (int)eventCode, aStream);
     switch (eventCode) {
         case NSStreamEventOpenCompleted:
             break;
@@ -102,47 +194,71 @@
                 if (!streamOpened) {
                     streamOpened = YES;
                     
-                    // Send connected message
-                    NSString *osModel = [[UIDevice currentDevice] name];
-                    NSString *osVersion = [[UIDevice currentDevice] systemVersion];
-                    NSString *msg = [NSString stringWithFormat:@"[C]%@(%@)", osModel, osVersion];
-                    NSData *msgData = [msg dataUsingEncoding:NSUTF8StringEncoding];
-                    [outputStream write:[msgData bytes] maxLength:[msgData length]];
+                    [self sendConnectedMessage];
+                    
+                    if ([self.delegate respondsToSelector:@selector(remoteWatcher:didChangeConnectState:)]) {
+                        [self.delegate remoteWatcher:self didChangeConnectState:YES];
+                    }
                 }
                 
-                if (apiReqData != nil) {
-                    [outputStream write:[apiReqData bytes] maxLength:[apiReqData length]];
-                    apiReqData = nil;
-                }
+//                if (apiReqData != nil) {
+//                    [self sendData:apiReqData];
+//                    apiReqData = nil;
+//                }
             }
             break;
         case NSStreamEventHasBytesAvailable:
             if (aStream == inputStream) {
-                NSLog(@"inputStream is ready.");
-                
                 uint8_t type[1];
                 [inputStream read:type maxLength:1];
-                switch (*type) {
-                    case 0xE0: { // Got json
+                PBLLRemoteEvent event = *type;
+                switch (event) {
+                    case PBLLRemoteEventDataJson: { // Got json
+                        NSString *jsonName = [inputStream readString];
                         NSData *jsonData = [inputStream readData];
-                        if (responseBlock != nil) {
-                            responseBlock(jsonData);
+                        NSLog(@"---- cancel onTimeout");
+                        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(onTimeout) object:nil];
+                        if (apiSuccessBlock != nil) {
+                            apiSuccessBlock(jsonData);
+                            apiSuccessBlock = nil;
+                        }
+                        apiFailureBolck = nil;
+                        [self sendMessage:jsonName event:PBLLRemoteEventDataJson];
+                        break;
+                    }
+                    case PBLLRemoteEventErrorIgnored: { // Ingores API
+                        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(onTimeout) object:nil];
+                        if (apiFailureBolck != nil) {
+                            apiFailureBolck([NSError errorWithDomain:@"PBLLRemoteWatcher" code:-2 userInfo:@{NSLocalizedDescriptionKey: @"User ignores the API"}]);
                         }
+                        apiSuccessBlock = nil;
                         break;
                     }
-                    case 0xF0: { // Create file
+                    case PBLLRemoteEventFileCreated: { // Create file
                         NSString *fileName = [inputStream readString];
+                        if (fileName == nil) {
+                            break;
+                        }
+                        [self sendMessage:fileName event:event];
                         [self.delegate remoteWatcher:self didCreateFile:fileName];
                         break;
                     }
-                    case 0xF1: { // Update file
+                    case PBLLRemoteEventFileUpdated: { // Update file
                         NSString *fileName = [inputStream readString];
+                        if (fileName == nil) {
+                            break;
+                        }
                         NSData *fileData = [inputStream readData];
+                        [self sendMessage:fileName event:event];
                         [self.delegate remoteWatcher:self didUpdateFile:fileName withData:fileData];
                         break;
                     }
-                    case 0xF2: { // Delete file
+                    case PBLLRemoteEventFileDeleted: { // Delete file
                         NSString *fileName = [inputStream readString];
+                        if (fileName == nil) {
+                            break;
+                        }
+                        [self sendMessage:fileName event:event];
                         [self.delegate remoteWatcher:self didDeleteFile:fileName];
                         break;
                     }
@@ -153,14 +269,24 @@
             break;
         case NSStreamEventErrorOccurred:
             if (aStream == outputStream) {
+                retryCount++;
+                if (retryCount >= kMaxRetryCount) {
+                    retryCount = 0;
+                    break;
+                }
+                
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.f * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                     [self connect:connectedIP];
                 });
             }
+            NSLog(@"[PBLLRemoteWatcher] %@", [aStream streamError]);
             break;
         case NSStreamEventEndEncountered:
             if (aStream == inputStream) {
                 [self close];
+                if ([self.delegate respondsToSelector:@selector(remoteWatcher:didChangeConnectState:)]) {
+                    [self.delegate remoteWatcher:self didChangeConnectState:NO];
+                }
             }
             break;
         default: