goop: Add Goop (GO OPerator), a BNCS/Discord Channel Operator

* Supports connecting to multiple realms simulateously
* Supports BNCS,  Discord, stdin
* Supports relaying chat between realms
* Automatically reconnect on disconnect

Author: nielsAD

.gitignore

@@ -0,0 +1,10 @@
+bin/
+
+# Config files
+config.toml
+
+# Test binary (go test -c)
+*.test
+
+# Output of the go coverage tool
+*.out

.gitmodules

@@ -25,3 +25,12 @@
 [submodule "vendor/github.com/fatih/color"]
 	path = vendor/github.com/fatih/color
 	url = https://github.com/fatih/color.git
+[submodule "vendor/github.com/imdario/mergo"]
+	path = vendor/github.com/imdario/mergo
+	url = https://github.com/imdario/mergo.git
+[submodule "vendor/github.com/bwmarrin/discordgo"]
+	path = vendor/github.com/bwmarrin/discordgo
+	url = https://github.com/bwmarrin/discordgo.git
+[submodule "vendor/github.com/gorilla/websocket"]
+	path = vendor/github.com/gorilla/websocket
+	url = https://github.com/gorilla/websocket.git

Makefile

@@ -2,16 +2,21 @@
 # Project: gowarcraft3 (https://github.com/nielsAD/gowarcraft3)
 # License: Mozilla Public License, v2.0
 
+VENDOR=vendor/StormLib/build/libstorm.a vendor/bncsutil/build/libbncsutil_static.a
+
 GO_FLAGS=
 GOTEST_FLAGS=-cover -cpu=1,2,4 -timeout=2m
 
 GO=go
 GOFMT=gofmt
-GOLINT=golint
+GOLINT=$(shell go env GOPATH)/bin/golint
 
 DIR_BIN=bin
+DIR_PRE=github.com/nielsAD/gowarcraft3
+
 PKG:=$(shell $(GO) list ./...)
-DIR:=$(subst github.com/nielsAD/gowarcraft3/,,$(PKG))
+DIR:=$(subst $(DIR_PRE)/,,$(PKG))
+CMD:=$(subst $(DIR_PRE)/cmd/,,$(shell $(GO) list ./cmd/...))
 
 ARCH:=$(shell $(GO) env GOARCH)
 ifeq ($(ARCH),amd64)
@@ -22,22 +27,27 @@ ifeq ($(TEST_RACE),1)
 	TEST_FLAGS+= -race
 endif
 
-.PHONY: all release build test fmt lint vet list clean
+.PHONY: all release check test fmt lint vet list clean
+
 all: test release
+release: $(CMD)
 
 $(DIR_BIN):
 	mkdir -p $@
 
+$(PKG): $(VENDOR)
+	$(GO) build $@
+
+$(CMD): $(VENDOR) $(DIR_BIN)
+	cd $(DIR_BIN); $(GO) build $(GO_FLAGS) $(DIR_PRE)/cmd/$@
+
 vendor/%:
 	$(MAKE) -C vendor $(subst vendor/,,$@)
 
-release: build $(DIR_BIN)
-	cd $(DIR_BIN); $(GO) list ../cmd/... | xargs -L1 go build $(GO_FLAGS)
-
-build: vendor/StormLib/build/libstorm.a vendor/bncsutil/build/libbncsutil_static.a
+check: $(VENDOR)
 	$(GO) build $(PKG)
 
-test: build fmt lint vet
+test: check fmt lint vet
 	$(GO) test $(TEST_FLAGS) $(PKG)
 
 fmt:

README.md

@@ -12,6 +12,7 @@ Tools
 
 |              Name            | Description |
 |------------------------------|-------------|
+|      [goop](./cmd/goop)      |Goop (GO OPerator) is a BNCS Channel Operator that can act as a bridge between Battle.net realms and Discord.|
 |[bncsclient](./cmd/bncsclient)|A mocked Warcraft III chat client that can be used to connect to BNCS servers.|
 |[w3gsclient](./cmd/w3gsclient)|A mocked Warcraft III game client that can be used to add dummy players to games.|
 |  [bncsdump](./cmd/bncsdump)  |A tool that decodes and dumps BNCS packets via pcap (on the wire or from a file).|

appveyor.yml

@@ -54,6 +54,6 @@ deploy:
   provider: GitHub
   auth_token:
     secure: wDwXLoUDnL32TSi+DpnwB4o+8LitFI6eIoyOqjm6//LiGMBMpkLiu/PaIZdCw4G/
-  artifact: /release.*/
+  artifact: /release_.*/
   on:
     appveyor_repo_tag: true

cmd/bncsclient/main.go

@@ -40,34 +40,37 @@ var stdin = bufio.NewReader(os.Stdin)
 func main() {
 	flag.Parse()
 
-	var c = bnet.NewClient(*binpath)
+	c, err := bnet.NewClient(&bnet.Config{BinPath: *binpath})
+	if err != nil {
+		logErr.Fatal("NewClient error: ", err)
+	}
 
 	c.ServerAddr = strings.Join(flag.Args(), " ")
 	if c.ServerAddr == "" {
 		c.ServerAddr = "uswest.battle.net:6112"
 	}
 
 	if *gamevers != 0 {
-		c.AuthInfo.GameVersion.Version = uint32(*gamevers)
+		c.GameVersion.Version = uint32(*gamevers)
 	}
 
 	if *keyroc != "" {
 		if *keytft != "" {
-			c.AuthInfo.GameVersion.Product = w3gs.ProductTFT
+			c.GameVersion.Product = w3gs.ProductTFT
 			c.CDKeys = []string{*keyroc, *keytft}
 		} else {
-			c.AuthInfo.GameVersion.Product = w3gs.ProductROC
+			c.GameVersion.Product = w3gs.ProductROC
 			c.CDKeys = []string{*keyroc}
 		}
 	}
 
-	c.UserName = *username
+	c.Username = *username
 	c.Password = *password
 
 	if *username == "" {
 		fmt.Print("Enter username: ")
-		c.UserName, _ = stdin.ReadString('\n')
-		c.UserName = strings.TrimSpace(c.UserName)
+		c.Username, _ = stdin.ReadString('\n')
+		c.Username = strings.TrimSpace(c.Username)
 	}
 
 	if *password == "" {
@@ -102,7 +105,7 @@ func main() {
 	})
 	c.On(&bnet.Whisper{}, func(ev *network.Event) {
 		var msg = ev.Arg.(*bnet.Whisper)
-		logOut.Println(color.GreenString("[WHISPER] %s: %s", msg.UserName, msg.Content))
+		logOut.Println(color.GreenString("[WHISPER] %s: %s", msg.Username, msg.Content))
 	})
 	c.On(&bnet.Chat{}, func(ev *network.Event) {
 		var msg = ev.Arg.(*bnet.Chat)
@@ -114,7 +117,7 @@ func main() {
 			logOut.Printf("[CHAT] %s\n", say.Content)
 		} else {
 
-			logOut.Printf("[CHAT] %s: %s\n", c.UserName, say.Content)
+			logOut.Printf("[CHAT] %s: %s\n", c.Username, say.Content)
 		}
 	})
 	c.On(&bnet.SystemMessage{}, func(ev *network.Event) {
@@ -129,15 +132,15 @@ func main() {
 		if err := c.CreateAccount(); err != nil {
 			logErr.Fatal("CreateAccount error: ", err)
 		}
-		logOut.Println(color.MagentaString("Succesfully registered new account '%s'", c.UserName))
+		logOut.Println(color.MagentaString("Succesfully registered new account '%s'", c.Username))
 		return
 	}
 
 	if err := c.Logon(); err != nil {
 		logErr.Fatal("Logon error: ", err)
 	}
 
-	logOut.Println(color.MagentaString("Succesfully logged onto %s@%s", c.UserName, c.ServerAddr))
+	logOut.Println(color.MagentaString("Succesfully logged onto %s@%s", c.Username, c.ServerAddr))
 
 	go func() {
 		for {

cmd/bncsdump/main.go

@@ -207,7 +207,11 @@ func main() {
 
 	go func() {
 		for packet := range packets {
-			trans := packet.TransportLayer().(*layers.TCP)
+			trans, ok := packet.TransportLayer().(*layers.TCP)
+			if !ok {
+				continue
+			}
+
 			asm.Assemble(packet.NetworkLayer().NetworkFlow(), trans)
 		}
 	}()

cmd/goop/README.md

@@ -0,0 +1,24 @@
+GoWarcraft3/goop
+===========
+[![Build Status](https://travis-ci.org/nielsAD/gowarcraft3.svg?branch=master)](https://travis-ci.org/nielsAD/gowarcraft3)
+[![Build status](https://ci.appveyor.com/api/projects/status/a5cecrpfo0pe14ux/branch/master?svg=true)](https://ci.appveyor.com/project/nielsAD/gowarcraft3)
+[![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-brightgreen.svg)](https://opensource.org/licenses/MPL-2.0)
+
+Goop (GO OPerator) is a BNCS Channel Operator.
+
+Usage
+-----
+
+`./goop [config_file]`
+
+Configuration
+-------------
+See [`config.toml.example`](/cmd/goop/config.toml.example).
+
+
+Download
+--------
+
+Official binaries for tools are [available](https://github.com/nielsAD/gowarcraft3/releases/latest). Simply download and run.
+
+_Note: additional dependencies may be required (see [build instructions](/README.md#build))._