Merge branch 'master' into minor-fixes

Author: fchasen

README.md

@@ -27,6 +27,10 @@ server.start().then((url) => {
 
 // Stop the server
 server.stop();
+
+// Check if native server running
+const isRunning = await server.isRunning()
+// isRunning - true/false
 ```
 
 `StaticServer` serves from the document directory (default) or takes an optional absolute path to serve from.

android/src/main/java/com/futurepress/staticserver/FPStaticServerModule.java

@@ -177,6 +177,11 @@ public void origin(Promise promise) {
     }
   }
 
+  @ReactMethod
+  public void isRunning(Promise promise) {
+    promise.resolve(server != null && server.isAlive());
+  }
+
   /* Shut down the server if app is destroyed or paused */
   @Override
   public void onHostResume() {

index.js

@@ -111,6 +111,15 @@ class StaticServer {
 		return this._origin;
 	}
 
+	isRunning() {
+		return FPStaticServer.isRunning()
+			.then(running => {
+				this.running = running;
+
+				return this.running;
+			})
+	}
+
 }
 
 export default StaticServer;

ios/FPStaticServer.m

@@ -8,15 +8,15 @@ @implementation FPStaticServer
 
 - (instancetype)init {
     if((self = [super init])) {
-        
+
         [GCDWebServer self];
         _webServer = [[GCDWebServer alloc] init];
     }
     return self;
 }
 
 - (void)dealloc {
-    
+
     if(_webServer.isRunning == YES) {
         [_webServer stop];
     }
@@ -36,9 +36,9 @@ - (dispatch_queue_t)methodQueue
                   keepAlive:(BOOL *)keep_alive
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-    
+
     NSString * root;
-    
+
     if( [optroot isEqualToString:@"DocumentDir"] ){
         root = [NSString stringWithFormat:@"%@", [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] ];
     } else if( [optroot isEqualToString:@"BundleDir"] ){
@@ -48,8 +48,8 @@ - (dispatch_queue_t)methodQueue
     } else {
         root = [NSString stringWithFormat:@"%@/%@", [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0], optroot ];
     }
-    
-    
+
+
     if(root && [root length] > 0) {
         self.www_root = root;
     }
@@ -61,26 +61,26 @@ - (dispatch_queue_t)methodQueue
     } else {
         self.port = [NSNumber numberWithInt:-1];
     }
-        
-    
+
+
     self.keep_alive = keep_alive;
 
     self.localhost_only = localhost_only;
-    
+
     if(_webServer.isRunning != NO) {
         NSLog(@"StaticServer already running at %@", self.url);
         resolve(self.url);
         return;
     }
-    
+
     [_webServer addGETHandlerForBasePath:@"/" directoryPath:self.www_root indexFilename:@"index.html" cacheAge:3600 allowRangeRequests:YES];
-    
+
     NSError *error;
     NSMutableDictionary* options = [NSMutableDictionary dictionary];
-    
-    
+
+
     NSLog(@"Started StaticServer on port %@", self.port);
-    
+
     if (![self.port isEqualToNumber:[NSNumber numberWithInt:-1]]) {
         [options setObject:self.port forKey:GCDWebServerOption_Port];
     } else {
@@ -90,12 +90,12 @@ - (dispatch_queue_t)methodQueue
     if (self.localhost_only == YES) {
         [options setObject:@(YES) forKey:GCDWebServerOption_BindToLocalhost];
     }
-    
+
     if (self.keep_alive == YES) {
         [options setObject:@(NO) forKey:GCDWebServerOption_AutomaticallySuspendInBackground];
         [options setObject:@2.0 forKey:GCDWebServerOption_ConnectedStateCoalescingInterval];
     }
-    
+
 
     if([_webServer startWithOptions:options error:&error]) {
         NSNumber *listenPort = [NSNumber numberWithUnsignedInteger:_webServer.port];
@@ -110,16 +110,16 @@ - (dispatch_queue_t)methodQueue
         }
     } else {
         NSLog(@"Error starting StaticServer: %@", error);
-        
+
         reject(@"server_error", @"StaticServer could not start", error);
-        
+
     }
-    
+
 }
 
 RCT_EXPORT_METHOD(stop) {
     if(_webServer.isRunning == YES) {
-        
+
         [_webServer stop];
 
         NSLog(@"StaticServer stopped");
@@ -135,10 +135,15 @@ - (dispatch_queue_t)methodQueue
     }
 }
 
+RCT_EXPORT_METHOD(isRunning:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject) {
+    bool isRunning = _webServer != nil &&_webServer.isRunning == YES;
+    resolve(@(isRunning));
+}
+
 + (BOOL)requiresMainQueueSetup
 {
     return YES;
 }
 
 @end
-