Update ios to reject if serverUrl is null

Author: fchasen

StaticServerExample/App.js

@@ -12,6 +12,7 @@ import {
   View,
   WebView,
   Image,
+  NativeModules
 } from 'react-native';
 
 import StaticServer from 'react-native-static-server';
@@ -31,30 +32,47 @@ export default class App extends Component<Props> {
   componentWillMount() {
     this.port = this.props.port || 3030;
     this.root = this.props.root || "www/";
-    this.file = this.props.file || './index.html';
+    this.file = this.props.file || 'index.html';
 
     // Get HTML file from require
     let html = require('./index.html');
     let {uri} = Image.resolveAssetSource(html);
 
-    let path = RNFS.DocumentDirectoryPath + '/www';
+    let path = RNFS.DocumentDirectoryPath + "/" + this.root;
+    let dest = path + this.file;
 
     // Add the directory
     RNFS.mkdir(path, { NSURLIsExcludedFromBackupKey: true });
 
     // Fetch the file
-    let download = RNFS.downloadFile({
-      fromUrl: uri,
-      toFile: path + "/index.html"
-    })
+    let added;
+
+    if (uri.indexOf("file://") > -1) {
+      // Copy file in release
+      added =  RNFS.exists(dest).then((e) => {
+        if (!e) {
+          return RNFS.copyFile(uri, dest);
+        }
+      });
+    } else {
+      // Download for development
+      let download = RNFS.downloadFile({
+        fromUrl: uri,
+        toFile: dest
+      });
+      added = download.promise;
+    }
+
 
-    download.promise.then(() => {
+    added.then(() => {
       // Create a StaticServer at port 3030
-      this.server = new StaticServer(this.port, this.root, {localOnly: true, keepAlive: true});
+      this.server = new StaticServer(this.port, this.root, {localOnly: true});
 
-      return this.server.start().then((origin) => {
+      this.server.start().then((origin) => {
         this.setState({origin});
       });
+    }).catch((err) => {
+      console.error(err);
     })
 
   }
@@ -77,7 +95,7 @@ export default class App extends Component<Props> {
 
     return (
       <WebView
-        source={{uri: `${this.state.origin}/index.html`}}
+        source={{uri: `${this.state.origin}/${this.file}`}}
         style={styles.webview}
       />
     );

StaticServerExample/ios/StaticServerExample.xcodeproj/project.pbxproj

@@ -746,14 +746,20 @@
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
 						CreatedOnToolsVersion = 6.2;
+						DevelopmentTeam = S9PLTSRA52;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
+					13B07F861A680F5B00A75B9A = {
+						DevelopmentTeam = S9PLTSRA52;
+					};
 					2D02E47A1E0B4A5D006451C7 = {
 						CreatedOnToolsVersion = 8.2.1;
+						DevelopmentTeam = S9PLTSRA52;
 						ProvisioningStyle = Automatic;
 					};
 					2D02E48F1E0B4A5D006451C7 = {
 						CreatedOnToolsVersion = 8.2.1;
+						DevelopmentTeam = S9PLTSRA52;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 2D02E47A1E0B4A5D006451C7;
 					};
@@ -1253,6 +1259,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				DEVELOPMENT_TEAM = S9PLTSRA52;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -1284,6 +1291,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = S9PLTSRA52;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-static-server/ios/**",
@@ -1312,6 +1320,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = NO;
+				DEVELOPMENT_TEAM = S9PLTSRA52;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-static-server/ios/**",
@@ -1337,6 +1346,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = S9PLTSRA52;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/react-native-static-server/ios/**",
@@ -1367,6 +1377,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = S9PLTSRA52;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				HEADER_SEARCH_PATHS = (
@@ -1404,6 +1415,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = S9PLTSRA52;
 				GCC_NO_COMMON_BLOCKS = YES;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1438,6 +1450,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = S9PLTSRA52;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "StaticServerExample-tvOSTests/Info.plist";
@@ -1465,6 +1478,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = S9PLTSRA52;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "StaticServerExample-tvOSTests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";

StaticServerExample/ios/StaticServerExample.xcodeproj/xcshareddata/xcschemes/StaticServerExample.xcscheme

@@ -54,6 +54,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -83,6 +84,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

ios/FPStaticServer.m

@@ -100,11 +100,14 @@ - (dispatch_queue_t)methodQueue
     if([_webServer startWithOptions:options error:&error]) {
         NSNumber *listenPort = [NSNumber numberWithUnsignedInteger:_webServer.port];
         self.port = listenPort;
-        self.url = [NSString stringWithFormat: @"%@://%@:%@", [_webServer.serverURL scheme], [_webServer.serverURL host], [_webServer.serverURL port]];
-        NSLog(@"Started StaticServer at URL %@", self.url);
 
-        resolve(self.url);
-        
+        if(_webServer.serverURL == NULL) {
+            reject(@"server_error", @"StaticServer could not start", error);
+        } else {
+            self.url = [NSString stringWithFormat: @"%@://%@:%@", [_webServer.serverURL scheme], [_webServer.serverURL host], [_webServer.serverURL port]];
+            NSLog(@"Started StaticServer at URL %@", self.url);
+            resolve(self.url);
+        }
     } else {
         NSLog(@"Error starting StaticServer: %@", error);