rhodes 5.5.2 → 5.5.15

data/platform/iphone/Classes/TabbedMainView.m

@@ -254,7 +254,7 @@
 
 @implementation TabbedMainView
 
-@synthesize tabbar, tabbarData, tabindex, on_change_tab_callback;
+@synthesize tabbar, tabbarData, tabindex, on_change_tab_callback, invisible_tab_control;
 
 - (UIImage*)recolorImageWithColor:(UIImage*)image color:(UIColor *)color shadowColor:(UIColor *)shadowColor shadowOffset:(CGSize)shadowOffset shadowBlur:(CGFloat)shadowBlur
 {
@@ -344,21 +344,29 @@
     frame.origin.x = 0;
     frame.origin.y = 0;
     
+    invisible_tab_control = NO;
+    
     rootFrame = frame;
 
 	NSString *background_color = nil;
 	NSString *selected_color = nil;
+    NSString *invisibleTabControl = nil;
 	
 	NSDictionary* global_properties = (NSDictionary*)[bar_info objectForKey:NATIVE_BAR_PROPERTIES];
 	if (global_properties != nil) {
 		background_color = (NSString*)[global_properties objectForKey:NATIVE_BAR_BACKGOUND_COLOR];
 		selected_color = (NSString*)[global_properties objectForKey:NATIVE_BAR_SELECTED_COLOR];
+        invisibleTabControl = (NSString*)[global_properties objectForKey:NATIVE_BAR_TABBAR_INVISIBLE];
 
         self.on_change_tab_callback = (id<IMethodResult>)[global_properties objectForKey:NATIVE_BAR_ON_CHANGE_TAB_CALLBACK];
         if (self.on_change_tab_callback != nil) {
             //[self.on_change_tab_callback release];
         }
 	}
+    
+    if (invisibleTabControl != nil) {
+            invisible_tab_control = [invisibleTabControl isEqualToString:@"true"];
+    }
 	
     
 #ifdef __IPHONE_7_0
@@ -411,9 +419,11 @@
     // First call of self.view (when self.view is nil) trigger loadView
     // and viewDidLoad which add all our subviews to the root view
     [self.view addSubview:tabbar.view];
-   	
+
     //tabbar.tabBar.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
     //tabbar.tabBar.autoresizesSubviews = YES;
+
+    tabbar.tabBar.hidden = invisible_tab_control;
     
     CGRect childFrame = [[v view] bounds];
 	childFrame.origin.x = 0;
@@ -424,7 +434,9 @@
 		//childFrame.size.width -= tbFrame.size.height;
     //}
 	//else {
+    if (!invisible_tab_control) {
 		childFrame.size.height -= tbFrame.size.height;
+    }
 	//}
 	
     NSArray *items = (NSArray*)[bar_info objectForKey:NATIVE_BAR_ITEMS];
@@ -624,7 +636,7 @@
 	}
     if ((index < 0) || (index >= [tabbar.viewControllers count])) {
         // error
-        NSLog(@"TabBar invalid tab index [%d] !!! ", index);
+        RAWLOG_ERROR1("TabBar invalid tab index [%d] !!! ", (int)index);
         return nil;
     }
     return (SimpleMainView*)[tabbar.viewControllers objectAtIndex:index];

data/platform/iphone/Classes/URLProtocol/CRhoURLProtocol.h

@@ -15,4 +15,6 @@
 @property (retain) NSMutableDictionary* httpHeaders;
 @property (retain) NSData* httpBody;
 
+@property (nonatomic) BOOL isStopped;
+
 @end

data/platform/iphone/Classes/URLProtocol/CRhoURLProtocol.m

@@ -6,10 +6,29 @@
 
 #import "common/RhoConf.h"
 
+
+#import "logging/RhoLog.h"
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "RhoURLProtocol"
+
+static bool is_net_trace() {
+    static int res = -1;
+    if (res == -1) {
+        if (rho_conf_getBool("net_trace") ) {
+            res = 1;
+        }
+        else {
+            res = 0;
+        }
+    }
+    return res == 1;
+}
+
+
 extern int rho_http_started();
 extern int rho_http_get_port();
 
-const char* rho_http_direct_request( const char* method, const char* uri, const char* query, const void* headers, const char* body, int* responseLength );
+const char* rho_http_direct_request( const char* method, const char* uri, const char* query, const void* headers, const char* body, int bodylen, int* responseLength );
 void rho_http_free_response( const char* data );
 
 void* rho_http_init_headers_list();
@@ -28,6 +47,7 @@ int on_http_data_cb(http_parser* parser, const char *at, size_t length) { return
 int on_http_cb(http_parser* parser) { return 0; }
 
 
+
 @interface CRhoURLResponse : NSHTTPURLResponse {
     
 }
@@ -39,6 +59,16 @@ int on_http_cb(http_parser* parser) { return 0; }
 
 @implementation CRhoURLProtocol
 
+
+-(const char*)selfIDstring {
+    return [[NSString stringWithFormat:@"<%p>", self] UTF8String];
+}
+
++ (const char*)requestInfo:(NSURLRequest*)req {
+    return [[NSString stringWithFormat:@"<NSURLRequest:<%p>, URL:[ %@ ], Headers:[ %@ ]", req, req.URL, req.allHTTPHeaderFields] UTF8String];
+}
+
+
 - (void)dealloc
 {
   [httpBody release];
@@ -59,17 +89,26 @@ int on_http_cb(http_parser* parser) { return 0; }
  
 + (BOOL)canInitWithRequest:(NSURLRequest*)theRequest
 {
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ canInitWithRequest BEGIN: { %s }", [CRhoURLProtocol requestInfo:theRequest]);
+    }
+    
     NSURL* theUrl = [theRequest URL];
     if ([[theUrl path] isEqualToString:@"/!__rhoNativeApi"]) {
         
         NSString* jsonRequestTest = [theRequest valueForHTTPHeaderField:@"__rhoNativeApiCall"];
         if (jsonRequestTest != nil) {
-            //NSLog(@"$$$ process Request: [%@:%@]", [theUrl absoluteString], jsonRequestTest);
+            if (is_net_trace()) {
+                RAWTRACE("$NetRequestProcess$ canInitWithRequest END: return YES by !__rhoNativeApi prefix");
+            }
             return YES;
         }
     }
 #if defined(RHO_NO_RUBY_API) && defined(RHO_NO_HTTP_SERVER)
     if ([theRequest.URL.scheme isEqualToString:@"file"]) {
+        if (is_net_trace()) {
+            RAWTRACE("$NetRequestProcess$ canInitWithRequest END: return YES by file scheme when no Ruby API server");
+        }
         return YES;
     }
 #endif
@@ -79,10 +118,21 @@ int on_http_cb(http_parser* parser) { return 0; }
         canHandle = rho_conf_getBool("ios_direct_local_requests")!=0;
     }
   
-    if ( canHandle && [CRhoURLProtocol isLocalURL:theUrl] ) {
-      return YES;
+    if ( canHandle ) {
+        if (is_net_trace()) {
+            RAWTRACE("$NetRequestProcess$ canInitWithRequest: ios_direct_local_requests = true !");
+        }
+        if ([CRhoURLProtocol isLocalURL:theUrl]) {
+            if (is_net_trace()) {
+                RAWTRACE("$NetRequestProcess$ canInitWithRequest END: return YES URL is local !");
+            }
+            return YES;
+        }
     }
 
+    if (is_net_trace()) {
+        RAWTRACE("$NetRequestProcess$ canInitWithRequest END: return NO");
+    }
     return NO;
 }
 
@@ -91,19 +141,26 @@ int on_http_cb(http_parser* parser) { return 0; }
     return request;
 }
 
-- (void)startLoading
+- (void)startLoadingInThread
 {
+    if (is_net_trace()) {
+        RAWTRACE2("$NetRequestProcess$ CRhoURLProtocol %s :: startLoadingInThread BEGIN: { %s }", [self selfIDstring], [CRhoURLProtocol requestInfo:[self request]]);
+    }
     NSURL* theUrl = [[self request] URL];
     
     
     if ([[theUrl path] isEqualToString:@"/!__rhoNativeApi"]) {
-        
+        if (is_net_trace()) {
+            RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading URL has !__rhoNativeApi", [self selfIDstring]);
+        }
         NSString* jsonRequestTest = [[self request] valueForHTTPHeaderField:@"__rhoNativeApiCall"];
         if (jsonRequestTest != nil) {
             NSString* responseStr = [CJSEntryPoint js_entry_point:jsonRequestTest];
             if (responseStr != nil) {
-                //NSLog(@"$$$ send responce for[%@:%@] = [%@]", [theUrl absoluteString], jsonRequestTest, responseStr);
                 [self sendResponseWithResponseCode:200 data:[responseStr dataUsingEncoding:NSUTF8StringEncoding]];
+                if (is_net_trace()) {
+                    RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading END", [self selfIDstring]);
+                }
                 return;
             }
         }
@@ -133,12 +190,13 @@ int on_http_cb(http_parser* parser) { return 0; }
                                 textEncodingName:@"UTF-8"];
             response.statusCode = 200;
             
-            [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
-            if (data != nil) {
-                [[self client] URLProtocol:self didLoadData:data];
+            if (!self.isStopped) {
+                [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+                if (data != nil) {
+                    [[self client] URLProtocol:self didLoadData:data];
+                }
+                [[self client] URLProtocolDidFinishLoading:self];
             }
-            [[self client] URLProtocolDidFinishLoading:self];
-            
             
             return;
         }
@@ -147,6 +205,9 @@ int on_http_cb(http_parser* parser) { return 0; }
 
   if ( [CRhoURLProtocol isLocalURL:theUrl] )
   {
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: URL is local !", [self selfIDstring]);
+    }
     NSURL* url = theUrl;
     CRhoURLResponse* resp = nil;
     
@@ -154,7 +215,14 @@ int on_http_cb(http_parser* parser) { return 0; }
     
     if ( resp != nil )
     {
+      if (is_net_trace()) {
+          RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading has Responce from local server", [self selfIDstring]);
+      }
       if ( ((self.httpStatusCode==301)||(self.httpStatusCode==302)) && ( [self.httpHeaders objectForKey:@"location"] != nil ) ) {
+          
+        if (is_net_trace()) {
+            RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading we have REDIRECT from local server !", [self selfIDstring]);
+        }
         NSString* loc = [self.httpHeaders objectForKey:@"location"];
         
         NSString* escaped = [loc stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
@@ -202,38 +270,92 @@ int on_http_cb(http_parser* parser) { return 0; }
           }
         
         
-          NSURLRequest* redirReq = [NSURLRequest requestWithURL:url];
-          [[self client] URLProtocol:self wasRedirectedToRequest:redirReq redirectResponse:resp];
+          NSMutableURLRequest* redirReq = [NSMutableURLRequest requestWithURL:url];
+
+          // clone headers from original request to redirect request
+          NSDictionary* headers = [[self request] allHTTPHeaderFields];
+          for (NSString* key in headers) {
+              NSString* value = [headers objectForKey:key];
+              [redirReq setValue:value forHTTPHeaderField:key];
+          }
+            
+          if (is_net_trace()) {
+              RAWTRACE2("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading wasRedirectedToRequest with Request { %s }", [self selfIDstring], [CRhoURLProtocol requestInfo:redirReq]);
+          }
+            if (!self.isStopped) {
+  
+                [[self client] URLProtocol:self wasRedirectedToRequest:redirReq redirectResponse:resp];
+            }
+            if (is_net_trace()) {
+              RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading END", [self selfIDstring]);
+          }
           return;
         }
+        else {
+            RAWLOG_ERROR2("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading Redirect response has no URL ! Initial request: { %s }", [self selfIDstring], [CRhoURLProtocol requestInfo:[self request]]);
+        }
       }
       else
       {
-        [[self client] URLProtocol:self didReceiveResponse:resp cacheStoragePolicy:NSURLCacheStorageNotAllowed];
-        
-        if (self.httpBody != nil) {
-          [[self client] URLProtocol:self didLoadData:self.httpBody];
+        if (is_net_trace()) {
+            RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading just request - no redirection", [self selfIDstring]);
+        }
+          if (!self.isStopped) {
+  
+              [[self client] URLProtocol:self didReceiveResponse:resp cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+          }
+          if (self.httpBody != nil) {
+              if (!self.isStopped) {
+                  [[self client] URLProtocol:self didLoadData:self.httpBody];
+              }
+          }
+          if (!self.isStopped) {
+              [[self client] URLProtocolDidFinishLoading:self];
+          }
+
+        if (is_net_trace()) {
+            RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading END", [self selfIDstring]);
         }
-        
-        [[self client] URLProtocolDidFinishLoading:self];
         return;
       }
     }
+    else {
+        RAWLOG_ERROR2("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading has NO Responce from local server !!! Initial request: { %s }", [self selfIDstring], [CRhoURLProtocol requestInfo:[self request]]);
+    }
   }
   
-    //NSLog(@"$$$ responce ERROR: [%@]", [theUrl absoluteString]);
     NSString* body = @"error";
     [self sendResponseWithResponseCode:401 data:[body dataUsingEncoding:NSUTF8StringEncoding]];
- 
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoadingInThread END", [self selfIDstring]);
+    }
 }
 
+- (void)startLoading
+{
+    self.isStopped = NO;
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading()", [self selfIDstring]);
+    }
+    
+    dispatch_async( dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT, 0 ), ^{
+        [self startLoadingInThread];
+    });
+ }
+
+
 - (CRhoURLResponse*) makeDirectHttpRequest:(NSURL*)theUrl
 {
-  //NSLog(@"Will make local request to %@", [theUrl absoluteString]);
+
+    if (is_net_trace()) {
+        RAWTRACE2("$NetRequestProcess$ CRhoURLProtocol %s :: makeDirectHttpRequest : URL [ %s ]", [self selfIDstring], [[theUrl absoluteString] UTF8String]);
+    }
+    
   
   const char* uri = [[theUrl path] UTF8String];
   const char* method = [[[self request] HTTPMethod] UTF8String];
   const char* body = [[[self request] HTTPBody] bytes];
+  int bodylen = (int)[[self request] HTTPBody].length;
   const char* query = [[theUrl query] UTF8String];
   
   NSDictionary* headers = [[self request] allHTTPHeaderFields];
@@ -249,7 +371,7 @@ int on_http_cb(http_parser* parser) { return 0; }
   
   int len = 0;
   
-  const char* response = rho_http_direct_request(method, uri, query, cHeaders, body, &len);
+  const char* response = rho_http_direct_request(method, uri, query, cHeaders, body, bodylen, &len);
   
   rho_http_free_headers_list(cHeaders);
   
@@ -302,6 +424,10 @@ int on_http_cb(http_parser* parser) { return 0; }
 
 - (void)stopLoading
 {
+    self.isStopped = YES;
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: stopLoading()", [self selfIDstring]);
+    }
 
 }
 
@@ -312,7 +438,13 @@ int on_http_cb(http_parser* parser) { return 0; }
 
 - (void)sendResponseWithResponseCode:(NSInteger)statusCode data:(NSData*)data
 {
+    if (is_net_trace()) {
+        RAWTRACE2("$NetRequestProcess$ CRhoURLProtocol %s :: sendResponseWithResponseCode : code: [ %d ] ", [self selfIDstring], (int)statusCode);
+    }
 
+    if (self.isStopped) {
+        return;
+    }
     CRhoURLResponse* response =
     [[CRhoURLResponse alloc] initWithURL:[[self request] URL]
                                    MIMEType:@"text/plain"
@@ -320,25 +452,39 @@ int on_http_cb(http_parser* parser) { return 0; }
                            textEncodingName:@"UTF-8"];
     response.statusCode = statusCode;
     
-    [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+    if (!self.isStopped) {
+        [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+    }
     if (data != nil) {
-        [[self client] URLProtocol:self didLoadData:data];
+        if (!self.isStopped) {
+            [[self client] URLProtocol:self didLoadData:data];
+        }
+    }
+    if (!self.isStopped) {
+        [[self client] URLProtocolDidFinishLoading:self];
     }
-    [[self client] URLProtocolDidFinishLoading:self];
-
     [response release];
 }
 
 + (BOOL) isLocalURL:(NSURL*)url
 {
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ isLocalURL BEGIN : URL: [ %s ] ", [[url absoluteString] UTF8String]);
+    }
     if ( [[url absoluteString] isEqualToString:@""] )
     {
+      if (is_net_trace()) {
+          RAWTRACE("isLocalURL END : return NO");
+      }
       return NO;
     }
 
     const char* scheme = [[url scheme] UTF8String];
     if (scheme != 0) {
         if ((strcmp(scheme, "http") !=0 ) && (strcmp(scheme, "https") !=0 )) {
+            if (is_net_trace()) {
+                RAWTRACE("$NetRequestProcess$ isLocalURL END : return NO");
+            }
             return NO;
         }
     }
@@ -347,7 +493,10 @@ int on_http_cb(http_parser* parser) { return 0; }
   
     if ( 0 == host )
     {
-      return YES;
+      if (is_net_trace()) {
+          RAWTRACE("$NetRequestProcess$ isLocalURL END : return YES");
+      }
+        return YES;
     }
   
     NSNumber* p = [url port];
@@ -355,10 +504,15 @@ int on_http_cb(http_parser* parser) { return 0; }
   
     int rhoPort = rho_http_get_port();
 
-    return (
+    BOOL ret = (
       ((port == rhoPort))
       && ( (strcmp(host,"127.0.0.1")==0) || (strcmp(host,"localhost")==0)  )
     );
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ isLocalURL END : return [%s]", [[[NSNumber numberWithBool:ret] stringValue] UTF8String]);
+    }
+    
+    return ret;
 }
 
 
@@ -366,6 +520,7 @@ int on_http_cb(http_parser* parser) { return 0; }
 @synthesize httpHeaderName;
 @synthesize httpHeaders;
 @synthesize httpBody;
+@synthesize isStopped;
 
 
 @end