From f77fae492feebb69407d2daa3497da8417f72fb6 Mon Sep 17 00:00:00 2001
From: Chad Retz <chad.retz@gmail.com>
Date: Tue, 24 Jul 2018 10:41:49 -0500
Subject: [PATCH] Clean up single-line event and new hs_desc_content test for
 #8 and #9

---
 control/cmd_event.go                    | 17 +++++------
 tests/control_cmd_hiddenservice_test.go | 38 +++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 tests/control_cmd_hiddenservice_test.go

diff --git a/control/cmd_event.go b/control/cmd_event.go
index 3c9856f..578a800 100644
--- a/control/cmd_event.go
+++ b/control/cmd_event.go
@@ -270,17 +270,14 @@ func (c *Conn) relayAsyncEvents(resp *Response) {
 	var code, data string
 	var dataArray []string
 	if len(resp.Data) == 1 {
-		// If there is a single line of data, first line of it is the code, rest of the first line is data
-		// Find the index which specfies the char after the event code, either space or newline
-		index := strings.Index(resp.Data[0], " ")
-		if index == -1 {
-			index = strings.Index(resp.Data[0], "\r\n")
-			if index == -1 {
-				return
-			}
+		// On single line, part up to space, newline, or EOL is the code, rest is data
+		if index := strings.Index(resp.Data[0], " "); index != -1 {
+			code, data = resp.Data[0][:index], resp.Data[0][index+1:]
+		} else if index := strings.Index(resp.Data[0], "\r\n"); index != -1 {
+			code, data = resp.Data[0][:index], resp.Data[0][index+2:]
+		} else {
+			code, data = resp.Data[0], ""
 		}
-
-		code, data = resp.Data[0][:index], resp.Data[0][index+2:]
 	} else if len(resp.Data) > 0 {
 		// If there are multiple lines, the entire first line is the code
 		code, dataArray = resp.Data[0], resp.Data[1:]
diff --git a/tests/control_cmd_hiddenservice_test.go b/tests/control_cmd_hiddenservice_test.go
new file mode 100644
index 0000000..270909b
--- /dev/null
+++ b/tests/control_cmd_hiddenservice_test.go
@@ -0,0 +1,38 @@
+package tests
+
+import (
+	"context"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/cretz/bine/control"
+)
+
+func TestHSFetch(t *testing.T) {
+	ctx := GlobalEnabledNetworkContext(t)
+	// Add listener
+	eventCh := make(chan control.Event)
+	defer close(eventCh)
+	err := ctx.Control.AddEventListener(eventCh, control.EventCodeHSDescContent)
+	ctx.Require.NoError(err)
+	defer ctx.Control.RemoveEventListener(eventCh, control.EventCodeHSDescContent)
+	// Lookup HS
+	err = ctx.Control.GetHiddenServiceDescriptorAsync("facebookcorewwwi", "")
+	ctx.Require.NoError(err)
+	// Grab events
+	eventCtx, eventCancel := context.WithTimeout(ctx, 45*time.Second)
+	defer eventCancel()
+	errCh := make(chan error, 1)
+	go func() { errCh <- ctx.Control.HandleEvents(eventCtx) }()
+	select {
+	case <-eventCtx.Done():
+		ctx.Require.NoError(eventCtx.Err())
+	case err := <-errCh:
+		ctx.Require.NoError(err)
+	case event := <-eventCh:
+		hsEvent := event.(*control.HSDescContentEvent)
+		ctx.Require.Equal("facebookcorewwwi", hsEvent.Address)
+		ctx.Require.True(strings.HasPrefix(hsEvent.Descriptor, "rendezvous-service-descriptor "+hsEvent.DescID))
+	}
+}