Fixed root, added AppState events to start and stop

Author: fchasen

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

@@ -69,6 +69,11 @@ public String getName() {
   @ReactMethod
   public void start(String _port, String root, Boolean localhost, Promise promise) {
 
+    if (server != null){
+      promise.resolve(url);
+      return;
+    }
+
     if (_port != null) {
       try {
         port = Integer.parseInt(_port);
@@ -77,34 +82,29 @@ public void start(String _port, String root, Boolean localhost, Promise promise)
       }
     }
 
-    if (root != null) {
-      if(root.startsWith("/")) {
-        www_root = new File(root);
-        localPath = www_root.getAbsolutePath();
-      } else {
-        www_root = this.reactContext.getFilesDir();
-        localPath = www_root.getAbsolutePath();
-      }
+    if(root != null && root.startsWith("/")) {
+      www_root = new File(root);
+      localPath = www_root.getAbsolutePath();
+    } else {
+      www_root = new File(this.reactContext.getFilesDir(), root);
+      localPath = www_root.getAbsolutePath();
     }
 
     if (localhost != null) {
       localhost_only = localhost;
     }
 
-
     try {
 
       if(localhost_only) {
-        byte[] ipAddr = new byte[]{127, 0, 0, 1};
-        InetAddress localAddr = InetAddress.getByAddress(ipAddr);
-        server = new WebServer(localAddr.toString(), port, www_root);
+        server = new WebServer("localhost", port, www_root);
       } else {
         server = new WebServer(__getLocalIpAddress(), port, www_root);
       }
 
 
       if (localhost_only) {
-        url = "http://127.0.0.1:" + port;
+        url = "http://localhost:" + port;
       } else {
         url = "http://" + __getLocalIpAddress() + ":" + port;
       }
@@ -117,12 +117,10 @@ public void start(String _port, String root, Boolean localhost, Promise promise)
       String msg = e.getMessage();
 
 
-      Log.w(LOGTAG, e);
 
       // Server doesn't stop on refresh
       if (server != null && msg.equals("bind failed: EADDRINUSE (Address already in use)")){
-        server.stop();
-        start(_port, root, localhost, promise);
+        promise.resolve(url);
       } else {
         promise.reject(null, msg);
       }
@@ -135,6 +133,7 @@ public void start(String _port, String root, Boolean localhost, Promise promise)
   @ReactMethod
   public void stop() {
     if (server != null) {
+      Log.w(LOGTAG, "Stopped Server");
       server.stop();
       server = null;
     }
@@ -143,12 +142,12 @@ public void stop() {
   /* Shut down the server if app is destroyed or paused */
   @Override
   public void onHostResume() {
-    start(null, null, null, null);
+    //start(null, null, null, null);
   }
 
   @Override
   public void onHostPause() {
-    stop();
+    //stop();
   }
 
   @Override

index.js

@@ -1,5 +1,7 @@
-
-import { NativeModules } from 'react-native';
+import {
+	NativeModules,
+	AppState
+ } from 'react-native';
 
 const { FPStaticServer } = NativeModules;
 
@@ -47,26 +49,53 @@ class StaticServer {
 	}
 
 	start() {
-		if( this.started ){
-			console.warn('StaticServer already running');
+		if( this.running ){
+			return console.warn('StaticServer already running');
 		}
 
-		this.origin = LOCALHOST + this.port;
-
 		this.started = true;
+		this.running = true;
+
+		AppState.addEventListener('change', this._handleAppStateChange.bind(this));
 
 		return FPStaticServer.start(this.port, this.root, this.localOnly);
 	}
 
 	stop() {
-		if( !this.started ){
-			console.warn('StaticServer not running');
+		if( !this.running ){
+			return console.warn('StaticServer not running');
 		}
 
-		this.started = false;
+		this.running = false;
 
 		return FPStaticServer.stop();
 	}
+
+	kill() {
+		this.stop();
+		this.started = false;
+		AppState.addEventListener('change', this._handleAppStateChange.bind(this));
+	}
+
+	_handleAppStateChange(appState) {
+		if (!this.started) {
+			return;
+		}
+
+		if (appState === "active" && !this.running) {
+			this.start();
+		}
+
+		if (appState === "background" && this.running) {
+			this.stop();
+		}
+
+		if (appState === "inactive" && this.running) {
+			this.stop();
+		}
+	}
+
+
 }
 
 export default StaticServer;

ios/FPStaticServer.m

@@ -22,14 +22,6 @@
 
 @implementation FPStaticServer
 
-//HTTPServer *httpServer;
-//NSString *_localPath = @"";
-//NSString *_url = @"";
-//
-//NSString *_www_root = @"";
-//int _port = 8888;
-//BOOL _localhost_only = false;
-
 @synthesize bridge = _bridge;
 
 RCT_EXPORT_MODULE();
@@ -105,12 +97,14 @@ - (NSDictionary *)getIPAddresses
 
     NSString * root;
 
-    if( [optroot length] == 0 ){
+    if( [optroot isEqualToString:@"DocumentDir"] ){
         root = [NSString stringWithFormat:@"%@", [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] ];
+    } else if( [optroot isEqualToString:@"BundleDir"] ){
+        root = [NSString stringWithFormat:@"%@", [[NSBundle mainBundle] bundlePath] ];
     } else if([optroot hasPrefix:@"/"]) {
         root = optroot;
-    } else if( [optroot isEqualToString:@"BUNDLE"] ){
-        root = [NSString stringWithFormat:@"%@", [[NSBundle mainBundle] bundlePath] ];
+    } else {
+        root = [NSString stringWithFormat:@"%@/%@", [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0], optroot ];
     }
 
 
@@ -135,16 +129,10 @@ - (NSDictionary *)getIPAddresses
 
     if(self.localhost_only) [self.httpServer setInterface:IP_LOCALHOST];
 
-    // Serve files from our embedded Web folder
-    const char * docroot = [self.www_root UTF8String];
-    if(*docroot == '/') {
-        self.localPath = self.www_root;
-    } else {
-        NSString* basePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"www"];
-        self.localPath = [NSString stringWithFormat:@"%@/%@", basePath, self.www_root];
-    }
-    NSLog(@"Setting document root: %@", self.localPath);
-    [self.httpServer setDocumentRoot:self.localPath];
+    //self.localPath = self.www_root;
+
+    // NSLog(@"Setting document root: %@", self.www_root);
+    [self.httpServer setDocumentRoot:self.www_root];
 
 
     NSError *error;
@@ -172,7 +160,7 @@ - (NSDictionary *)getIPAddresses
         [self.httpServer stop];
         self.httpServer = nil;
 
-        self.localPath = @"";
+        self.www_root = @"";
         self.url = @"";
 
         NSLog(@"httpd stopped");

package.json

@@ -1,7 +1,7 @@
 
 {
   "name": "react-native-static-server",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "repository": "https://github.com/futurepress/react-native-static-server",
   "description": "HTTP static file server for React Native",
   "main": "index.js",