Merge branch 'master' into feature/advanced_mod_installation

Author: knoxfighter

Makefile

@@ -1,29 +1,49 @@
 # Build tool for Factorio Server Manager
-#
 
 NODE_ENV:=production
 
-build:
-# make sure this project is located within GOPATH, I.E. $GOPATH/src/factorio-server-manager
-
-	# Build Linux release
-	mkdir build
-	GOOS=linux GOARCH=amd64 go build -o factorio-server-manager/factorio-server-manager factorio-server-manager/src
-#	ui/node_modules/webpack/bin/webpack.js ui/webpack.config.js app/bundle.js --progress --profile --colors 
-	cp -r app/ factorio-server-manager/
-	cp conf.json.example factorio-server-manager/conf.json
-	zip -r build/factorio-server-manager-linux-x64.zip factorio-server-manager
-	rm -rf factorio-server-manager
-	# Build Windows release
-	GOOS=windows GOARCH=386 go build -o factorio-server-manager/factorio-server-manager.exe factorio-server-manager/src
-	cp -r app/ factorio-server-manager/
-	cp conf.json.example factorio-server-manager/conf.json
-	zip -r build/factorio-server-manager-windows.zip factorio-server-manager
-	rm -rf factorio-server-manager
-
-dev:
-	mkdir dev
-	GOOS=linux GOARCH=amd64 go build -o factorio-server-linux/factorio-server-manager factorio-server-manager/src
-	cp -r app/ dev/
-	cp conf.json.example dev/conf.json
-	mv factorio-server-linux/factorio-server-manager dev/factorio-server-manager
+#TODO add support for a mac build maybe?
+UNAME := $(shell uname)
+ifeq ($(UNAME), Linux)
+	release := build/factorio-server-manager-linux.zip
+else
+	release := build/factorio-server-manager-windows.zip
+endif
+
+build: $(release)
+
+$(shell mkdir -p build)
+build/factorio-server-manager-%.zip: app/bundle.js factorio-server-manager-%
+	@echo "Packaging Build - $@"
+	@cp -r app/ factorio-server-manager/
+	@cp conf.json.example factorio-server-manager/conf.json
+	@zip -r $@ factorio-server-manager > /dev/null
+	@rm -r factorio-server-manager
+
+app/bundle.js:
+	@echo "Building Frontend"
+	@cd ui && npm install && npm run build
+
+factorio-server-manager-linux: godeps
+	@echo "Building Backend - Linux"
+	@GOPATH="${GOPATH}:${PDW}"
+	@mkdir -p factorio-server-manager
+	@GOOS=linux GOARCH=amd64 go build -o factorio-server-manager/factorio-server-manager ./src
+
+factorio-server-manager-windows: godeps
+	@echo "Building Backend - Windows"
+	@GOPATH="${GOPATH}:${PDW}"
+	@mkdir -p factorio-server-manager
+	@GOOS=windows GOARCH=386 go build -o factorio-server-manager/factorio-server-manager.exe ./src
+
+godeps:
+	@echo "Installing Packages"
+	@cat gopkglist | xargs go get
+
+gen_release: build/factorio-server-manager-linux.zip build/factorio-server-manager-windows.zip
+	@echo "Done"
+
+clean:
+	@echo "Cleaning"
+	@rm -r build/
+	@rm app/bundle.js

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/mroote/factorio-server-manager.svg?branch=master)](https://travis-ci.org/mroote/factorio-server-manager) 
+[![Build Status](https://travis-ci.org/mroote/factorio-server-manager.svg?branch=master)](https://travis-ci.org/mroote/factorio-server-manager)
 
 # Factorio Server Manager
 
@@ -27,16 +27,16 @@ This tool runs on a Factorio server and allows management of the Factorio server
 
 ## Installation Linux
 1. Download the latest release
-  * [https://github.com/MajorMJR/factorio-server-manager/releases](https://github.com/MajorMJR/factorio-server-manager/releases)
-2. Download the Factorio Standalone server and install to a known directory. 
+  * [https://github.com/mroote/factorio-server-manager/releases](https://github.com/mroote/factorio-server-manager/releases)
+2. Download the Factorio Standalone server and install to a known directory.
 3. Run the server binary file, use the --dir flag to point the management server to your Factorio installation.
   * ```./factorio-server-manager --dir /home/user/.factorio ```
 4. Visit [localhost:8080](localhost:8080) in your web browser.
 
 ## Installation Windows
 1. Download the latest release
-  * [https://github.com/MajorMJR/factorio-server-manager/releases](https://github.com/MajorMJR/factorio-server-manager/releases)
-2. Download the Factorio Standalone server and install to a known directory. 
+  * [https://github.com/mroote/factorio-server-manager/releases](https://github.com/mroote/factorio-server-manager/releases)
+2. Download the Factorio Standalone server and install to a known directory.
 3. Run the server binary file via cmd or Powershell, use the --dir flag to point the management server to your Factorio installation.
   * ```.\factorio-server-manager --dir C:/Users/username/Factorio```
 4. Visit [localhost:8080](localhost:8080) in your web browser.
@@ -59,7 +59,7 @@ Usage of ./factorio-server-manager:
     	Maximum filesize for uploaded files (default 20MB). (default 20971520)
   -port string
     	Specify a port for the server. (default "8080")
-     
+
 Example:
 
 ./factorio-server-manager --dir /home/user/.factorio --host 10.0.0.1
@@ -81,7 +81,7 @@ Example:
 
 
 ## Development
-The backend is built as a REST API via the Go web application.  
+The backend is built as a REST API via the Go web application.
 
 It also acts as the webserver to serve the front end react application
 
@@ -91,19 +91,23 @@ All api actions are accessible with the /api route.  The frontend is accessible
 + Go 1.6
 + NodeJS 4.2.6
 
-#### Building the Go backend
-Go Application which manages the Factorio server.
-
-API requests for managing the Factorio server are sent to /api.
+#### Building Releases
+Creates a release zip for windows and linux: (this will install the dependencies listed in gopkgdeps)
+```
+git clone https://github.com/mroote/factorio-server-manager.git
+cd factorio-server-manager
+make gen_release
+```
 
-The frontend code is served by a HTTP file server running on /.
+#### Building a Testing Binary:
 ```
-git clone https://github.com/MajorMJR/factorio-server-manager.git
+git clone https://github.com/mroote/factorio-server-manager.git
 cd factorio-server-manager
-make build
+make
+./factorio-server-manager/factorio-server-manager
 ```
 
-#### Building the React frontend
+#### Building the React Frontend alone
 Frontend is built using React and the AdminLTE CSS framework. See app/dist/ for AdminLTE included files and license.
 
 The root of the UI application is served at app/index.html.  Run the npm build script and the Go application during development to get live rebuilding of the UI code.
@@ -112,15 +116,13 @@ All necessary CSS and Javascript files are included for running the UI.
 
 Transpiled bundle.js application is output to app/bundle.js, 'npm run build' script starts webpack to build the React application for development.
 ```
- cd ui/
- npm install
- npm run build
+make app/bundle.js
 ```
 
 ### Building for Windows
 1. Download the latest release source zip file
-  * [https://github.com/MajorMJR/factorio-server-manager/releases](https://github.com/MajorMJR/factorio-server-manager/releases)
-2. Unzip the Factorio Standalone server and move it to a known directory. 
+  * [https://github.com/mroote/factorio-server-manager/releases](https://github.com/mroote/factorio-server-manager/releases)
+2. Unzip the Factorio Standalone server and move it to a known directory.
 3. Download and install Go 1.6 64-bit or 32-bit depending on your operating system, if unsure download 32-bit
   * https://storage.googleapis.com/golang/go1.6.windows-amd64.msi 64-bit
   * https://storage.googleapis.com/golang/go1.6.windows-386.msi 32-bit
@@ -147,7 +149,7 @@ go get github.com/gorilla/websocket
 go get github.com/majormjr/rcon
 ```
 
-3. Now you will want to go into the src folder for example "C:\FS\factorio-server-manager\src" once there hold down left shift and right click an empty area of the folder. Then click "Open command windows here" 
+3. Now you will want to go into the src folder for example "C:\FS\factorio-server-manager\src" once there hold down left shift and right click an empty area of the folder. Then click "Open command windows here"
 4. Type this into the command prompt then hit enter:
 
 ```

docker/Dockerfile

@@ -4,7 +4,7 @@ FROM frolvlad/alpine-glibc
 MAINTAINER Mitch Roote <[email protected]>
 
 ENV FACTORIO_VERSION=latest \
-    MANAGER_VERSION=0.6.0 \
+    MANAGER_VERSION=0.6.1 \
     ADMIN_PASSWORD=factorio
 
 VOLUME /opt/factorio/saves /opt/factorio/mods /opt/factorio/config /security

gopkglist

@@ -0,0 +1,6 @@
+github.com/apexskier/httpauth
+github.com/go-ini/ini
+github.com/gorilla/mux
+github.com/gorilla/websocket
+github.com/hpcloud/tail
+github.com/majormjr/rcon

src/factorio_server.go

@@ -23,6 +23,7 @@ type FactorioServer struct {
 	Cmd      *exec.Cmd              `json:"-"`
 	Savefile string                 `json:"savefile"`
 	Latency  int                    `json:"latency"`
+	BindIP   string                 `json:"bindip"`
 	Port     int                    `json:"port"`
 	Running  bool                   `json:"running"`
 	StdOut   io.ReadCloser          `json:"-"`
@@ -105,10 +106,11 @@ func (f *FactorioServer) Run() error {
 	}
 
 	args := []string{
+		"--bind", (f.BindIP),
 		"--port", strconv.Itoa(f.Port),
 		"--server-settings", filepath.Join(config.FactorioConfigDir, "server-settings.json"),
 		"--rcon-port", strconv.Itoa(config.FactorioRconPort),
-		"--rcon-pass", config.FactorioRconPass,
+		"--rcon-password", config.FactorioRconPass,
 	}
 
 	if f.Savefile == "Load Latest" {

src/handlers.go

@@ -419,6 +419,7 @@ func CheckServer(w http.ResponseWriter, r *http.Request) {
 		status["status"] = "running"
 		status["port"] = strconv.Itoa(FactorioServ.Port)
 		status["savefile"] = FactorioServ.Savefile
+		status["address"] = FactorioServ.BindIP
 		resp.Data = status
 		if err := json.NewEncoder(w).Encode(resp); err != nil {
 			log.Printf("Error encoding config file JSON reponse: %s", err)

src/main.go

@@ -23,6 +23,7 @@ type Config struct {
 	FactorioRconPort        int    `json:"rcon_port"`
 	FactorioRconPass        string `json:"rcon_pass"`
 	FactorioCredentialsFile string `json:"factorio_credentials_file"`
+  FactorioIP              string `json:"factorio_ip"`
 	ServerIP                string `json:"server_ip"`
 	ServerPort              string `json:"server_port"`
 	MaxUploadSize           int64  `json:"max_upload_size"`
@@ -65,7 +66,8 @@ func loadServerConfig(f string) {
 func parseFlags() {
 	confFile := flag.String("conf", "./conf.json", "Specify location of Factorio Server Manager config file.")
 	factorioDir := flag.String("dir", "./", "Specify location of Factorio directory.")
-	factorioIP := flag.String("host", "0.0.0.0", "Specify IP for webserver to listen on.")
+	serverIP := flag.String("host", "0.0.0.0", "Specify IP for webserver to listen on.")
+	factorioIP := flag.String("game-bind-address", "0.0.0.0", "Specify IP for Fcatorio gamer server to listen on.")
 	factorioPort := flag.String("port", "8080", "Specify a port for the server.")
 	factorioConfigFile := flag.String("config", "config/config.ini", "Specify location of Factorio config.ini file")
 	factorioMaxUpload := flag.Int64("max-upload", 1024*1024*20, "Maximum filesize for uploaded files (default 20MB).")
@@ -75,7 +77,8 @@ func parseFlags() {
 
 	config.ConfFile = *confFile
 	config.FactorioDir = *factorioDir
-	config.ServerIP = *factorioIP
+	config.ServerIP = *serverIP
+	config.FactorioIP = *factorioIP
 	config.ServerPort = *factorioPort
 	config.FactorioSavesDir = filepath.Join(config.FactorioDir, "saves")
 	config.FactorioModsDir = filepath.Join(config.FactorioDir, "mods")