From fa21dfea991fd1a15edbe499e3a14c602ddf4f95 Mon Sep 17 00:00:00 2001
From: William Reid <william.reid@uconn.edu>
Date: Thu, 6 Dec 2018 19:41:36 -0500
Subject: [PATCH 1/4] Example exercise message sender and data types added

---
 README.md                | Bin 42 -> 6324 bytes
 data-types/data-types.go |  15 ++++
 hello.go                 |   9 ---
 sender/sender.go         | 161 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 176 insertions(+), 9 deletions(-)
 create mode 100644 data-types/data-types.go
 delete mode 100644 hello.go
 create mode 100644 sender/sender.go

diff --git a/README.md b/README.md
index 863462b85441d6dc9406d334cc0e10e5eda013c4..42732fcd6777f360eac34dba791a4f5d3a0448ae 100644
GIT binary patch
literal 6324
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
V(QLnYl8k~c5R+?9L_~m&^ADr*EVuvw

delta 18
ZcmdmDsKxsKpE85O<Yoay7G4G}1^_#E1h)VH

diff --git a/data-types/data-types.go b/data-types/data-types.go
new file mode 100644
index 0000000..5f0982a
--- /dev/null
+++ b/data-types/data-types.go
@@ -0,0 +1,15 @@
+package data_types
+
+// This file contains data types that are shared between the sender and the responder you will write.
+
+// Struct to manage responses we get
+type ResponseStruct struct {
+	ID int `json:"id"`
+}
+
+// Struct to manage data we're sending
+type DataStruct struct {
+	ID       int `json:"id"`
+	Duration int `json:"duration"`
+	Stamp    int `json:"stamp"`
+}
diff --git a/hello.go b/hello.go
deleted file mode 100644
index 17957ee..0000000
--- a/hello.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package main
-
-import (
-	"fmt"
-)
-
-func main() {
-	fmt.Printf("hello, world\n")
-}
diff --git a/sender/sender.go b/sender/sender.go
new file mode 100644
index 0000000..d4e4fd2
--- /dev/null
+++ b/sender/sender.go
@@ -0,0 +1,161 @@
+package main
+
+import (
+	"fmt"
+	"generator-server/data-types"
+	"github.com/gorilla/websocket"
+	"math/rand"
+	"strconv"
+	"sync"
+	"time"
+)
+
+/* This file tries to make a websocket connection to your server, and then sends it 100 messages at varying intervals
+ * that request a response after a certain duration. Your server will read the messages, wait that amount of time,
+ * and then send a message back with the IDs of the messages it has waited for.
+ */
+
+var globalwait sync.WaitGroup
+
+func main() {
+	// Initialize the waitgroup that will keep this running until the senders are done
+	globalwait = sync.WaitGroup{}
+
+	// Create and start some senders
+	for i := 0; i < 5; i++ {
+		// Try to get a websocket connection
+		c, _, err := websocket.DefaultDialer.Dial("ws://localhost:3000/v1/ws", nil)
+		if err != nil {
+			fmt.Println(err.Error())
+			return
+		}
+
+		// Name the senders 0-4
+		sender := NewSender(strconv.Itoa(i), c)
+		sender.run()
+		time.Sleep(3 * time.Second)
+
+	}
+
+	// Wait on the waitgroup
+	globalwait.Wait()
+}
+
+// Struct to manage our data senders
+type sender struct {
+	name  string
+	conn  *websocket.Conn
+	lock  sync.RWMutex
+	check *checker
+}
+
+// Initialize and return a sender
+func NewSender(n string, conn *websocket.Conn) *sender {
+	return &sender{name: n, conn: conn, lock: sync.RWMutex{}, check: NewChecker()}
+}
+
+// Wrapper around the async run routine that tells globalwait there's something going on and starts the sender
+func (s *sender) run() {
+	globalwait.Add(1)
+	go s._run()
+}
+
+// main sender routine
+func (s *sender) _run() {
+
+	// Need to wait on checker, then close the connection and tell globalwait we're done
+	defer func() {
+		s.check.wg.Wait()
+		s.conn.WriteMessage(websocket.CloseMessage, nil)
+		s.conn.Close()
+		globalwait.Done()
+	}()
+
+	// Start the listener for this sender
+	go s.listen()
+
+	// Change the seed so we don't get the same thing every time
+	rand.Seed(int64(time.Now().Unix()))
+
+	// Loop and send packets
+	for i := 0; i < 100; i++ {
+		// Get a random duration
+		d := rand.Intn(3)
+
+		// Send ID, duration, timestamp
+		ds := &data_types.DataStruct{ID: i, Duration: d, Stamp: int(time.Now().Unix())}
+
+		// Tell the sender to send the packet
+		go s.send(ds)
+
+		// Wait a random amount of time
+		time.Sleep(time.Duration(rand.Intn(100)) * time.Millisecond)
+	}
+}
+
+// Main thread for listening for responses
+func (s *sender) listen() {
+
+	// initialize a response struct to unpack response into
+	var r data_types.ResponseStruct
+
+	// while loop -- repeat indefinitely
+	for {
+		err := s.conn.ReadJSON(&r)
+		if err != nil {
+			if websocket.IsUnexpectedCloseError(err) {
+				fmt.Printf("Sender %v lost reading connection: %v\n", s.name, err.Error())
+			}
+			break
+		}
+
+		// Tell the checker we got a response
+		s.received(r.ID)
+	}
+}
+
+// type for our response checking management
+type checker struct {
+	m    map[int]*data_types.DataStruct
+	lock sync.RWMutex
+	wg   sync.WaitGroup
+}
+
+// Method to get a new, empty checker
+func NewChecker() *checker {
+	return &checker{m: make(map[int]*data_types.DataStruct), lock: sync.RWMutex{}, wg: sync.WaitGroup{}}
+}
+
+// Tell the checker we sent something
+func (s *sender) send(ds *data_types.DataStruct) {
+
+	// Add to wait group
+	s.check.wg.Add(1)
+
+	// Send the message, lock to be safe
+	s.lock.Lock()
+	if err := s.conn.WriteJSON(ds); err != nil {
+		fmt.Printf("Sender %v error writing: %v", s.name, err.Error())
+	}
+	s.lock.Unlock()
+
+	// Add to checker map, lock to be safe
+	s.check.lock.Lock()
+	s.check.m[ds.ID] = ds
+	s.check.lock.Unlock()
+}
+
+// Tell the checker we got something
+func (s *sender) received(i int) {
+
+	// Grab the data entry and then delete it, locking for safe map access
+	s.check.lock.Lock()
+	ds := s.check.m[i]
+	delete(s.check.m, i)
+	s.check.lock.Unlock()
+	s.check.wg.Done()
+
+	// Check how long ago we sent this
+	diff := int(time.Now().Unix()) - ds.Stamp
+	fmt.Printf("sender %v received response for %v at %v seconds later than expected\n", s.name, i, diff-ds.Duration)
+}

From 63fd4f8a969c8009e506add9c0793e66e0a52cbe Mon Sep 17 00:00:00 2001
From: William Reid <william.reid@uconn.edu>
Date: Thu, 6 Dec 2018 20:45:52 -0500
Subject: [PATCH 2/4] Added .gitignore file

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..981ef2d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea/*
+*.exe
\ No newline at end of file

From 3b7e88dda68d7474589d25f697e498af6dbf17fc Mon Sep 17 00:00:00 2001
From: William Reid <william.reid@uconn.edu>
Date: Thu, 6 Dec 2018 21:02:49 -0500
Subject: [PATCH 3/4] trying to fix code block in list

---
 README.md | Bin 6324 -> 6336 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/README.md b/README.md
index 42732fcd6777f360eac34dba791a4f5d3a0448ae..065633c1246c0979cdbc6fc598ae2d359fa2c0ce 100644
GIT binary patch
delta 29
ecmdmDc))Ojn+R(H0}yTw6scx}GWUyqWdZ<;pb0$y

delta 29
gcmX?LxW#aTn+P{A0~dn=1a9^gsb<`KL-Yj`0BsNln*aa+


From 245844dab421f1c1b4e6aa3abcde155d0a880ef6 Mon Sep 17 00:00:00 2001
From: William Reid <william.reid@uconn.edu>
Date: Thu, 6 Dec 2018 21:03:33 -0500
Subject: [PATCH 4/4] Fixed typo

---
 README.md | Bin 6336 -> 6352 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/README.md b/README.md
index 065633c1246c0979cdbc6fc598ae2d359fa2c0ce..d9ddb17c24fe2682b0363cc329a472a559c6c3bc 100644
GIT binary patch
delta 32
ocmX?Lc)@VP3z5lMA~KWnL^viFh;mG>5;d4SOGIsRlxP|=0Lrop4FCWD

delta 28
kcmca$c))PO3z5l5A|jI;L^&pRi5g6vC8D-DOEirc0H?nSPyhe`