Merge pull request #37 from linkdata/direct-ws-writing

Direct ws writing

html.go

@@ -43,8 +43,7 @@ func appendAttrs(b []byte, attrs []template.HTMLAttr) []byte {
 }
 
 func WriteHtmlTag(w io.Writer, jid jid.Jid, htmlTag, typeAttr, valueAttr string, attrs []template.HTMLAttr) (err error) {
-	b := make([]byte, 0, 64)
-	b = jid.AppendStartTagAttr(b, htmlTag)
+	b := jid.AppendStartTagAttr(nil, htmlTag)
 	if typeAttr != "" {
 		b = append(b, ` type=`...)
 		b = strconv.AppendQuote(b, typeAttr)
@@ -66,13 +65,12 @@ func WriteHtmlInput(w io.Writer, jid jid.Jid, typeAttr, valueAttr string, attrs
 func WriteHtmlInner(w io.Writer, jid jid.Jid, htmlTag, typeAttr string, innerHtml template.HTML, attrs ...template.HTMLAttr) (err error) {
 	if err = WriteHtmlTag(w, jid, htmlTag, typeAttr, "", attrs); err == nil {
 		if innerHtml != "" || needClosingTag(htmlTag) {
-			if _, err = w.Write([]byte(innerHtml)); err == nil {
-				var b []byte
-				b = append(b, "</"...)
-				b = append(b, htmlTag...)
-				b = append(b, '>')
-				_, err = w.Write(b)
-			}
+			var b []byte
+			b = append(b, innerHtml...)
+			b = append(b, "</"...)
+			b = append(b, htmlTag...)
+			b = append(b, '>')
+			_, err = w.Write(b)
 		}
 	}
 	return

request.go

@@ -417,12 +417,12 @@ func (rq *Request) Done() (ch <-chan struct{}) {
 }
 
 // process is the main message processing loop. Will unsubscribe broadcastMsgCh and close outboundMsgCh on exit.
-func (rq *Request) process(broadcastMsgCh chan Message, incomingMsgCh <-chan wsMsg, outboundCh chan<- string) {
+func (rq *Request) process(broadcastMsgCh chan Message, incomingMsgCh <-chan wsMsg, outboundMsgCh chan<- wsMsg) {
 	jawsDoneCh := rq.Jaws.Done()
 	ctxDoneCh := rq.Done()
 	eventDoneCh := make(chan struct{})
-	eventCallCh := make(chan eventFnCall, cap(outboundCh))
-	go rq.eventCaller(eventCallCh, outboundCh, eventDoneCh)
+	eventCallCh := make(chan eventFnCall, cap(outboundMsgCh))
+	go rq.eventCaller(eventCallCh, outboundMsgCh, eventDoneCh)
 
 	defer func() {
 		rq.Jaws.unsubscribe(broadcastMsgCh)
@@ -433,7 +433,7 @@ func (rq *Request) process(broadcastMsgCh chan Message, incomingMsgCh <-chan wsM
 			case <-eventCallCh:
 			case <-incomingMsgCh:
 			case <-eventDoneCh:
-				close(outboundCh)
+				close(outboundMsgCh)
 				if x := recover(); x != nil {
 					var err error
 					var ok bool
@@ -455,7 +455,7 @@ func (rq *Request) process(broadcastMsgCh chan Message, incomingMsgCh <-chan wsM
 		var ok bool
 
 		if len(wsQueue) > 0 {
-			wsQueue = rq.sendQueue(outboundCh, wsQueue)
+			wsQueue = rq.sendQueue(outboundMsgCh, wsQueue)
 		}
 
 		// Empty the dirty tags list and call JawsUpdate()
@@ -475,7 +475,7 @@ func (rq *Request) process(broadcastMsgCh chan Message, incomingMsgCh <-chan wsM
 		rq.mu.RUnlock()
 
 		if len(wsQueue) > 0 {
-			wsQueue = rq.sendQueue(outboundCh, wsQueue)
+			wsQueue = rq.sendQueue(outboundMsgCh, wsQueue)
 		}
 
 		select {
@@ -629,21 +629,19 @@ func (rq *Request) queueEvent(eventCallCh chan eventFnCall, call eventFnCall) {
 	}
 }
 
-func (rq *Request) wsSend(outboundCh chan<- string, s string) {
+func (rq *Request) wsSend(outboundMsgCh chan<- wsMsg, msg wsMsg) {
 	select {
 	case <-rq.Done():
-	case outboundCh <- s:
+	case outboundMsgCh <- msg:
 	default:
-		panic(fmt.Errorf("jaws: %v: outbound message channel is full (%d) sending %s", rq, len(outboundCh), s))
+		panic(fmt.Errorf("jaws: %v: outbound message channel is full (%d) sending %s", rq, len(outboundMsgCh), msg))
 	}
 }
 
-func (rq *Request) sendQueue(outboundCh chan<- string, wsQueue []wsMsg) []wsMsg {
-	var sb strings.Builder
+func (rq *Request) sendQueue(outboundMsgCh chan<- wsMsg, wsQueue []wsMsg) []wsMsg {
 	for _, msg := range wsQueue {
-		sb.WriteString(msg.Format())
+		rq.wsSend(outboundMsgCh, msg)
 	}
-	rq.wsSend(outboundCh, sb.String())
 	return wsQueue[:0]
 }
 
@@ -700,14 +698,14 @@ func (rq *Request) makeUpdateList() (todo []*Element) {
 }
 
 // eventCaller calls event functions
-func (rq *Request) eventCaller(eventCallCh <-chan eventFnCall, outboundCh chan<- string, eventDoneCh chan<- struct{}) {
+func (rq *Request) eventCaller(eventCallCh <-chan eventFnCall, outboundMsgCh chan<- wsMsg, eventDoneCh chan<- struct{}) {
 	defer close(eventDoneCh)
 	for call := range eventCallCh {
 		if err := rq.callAllEventHandlers(call.jid, call.wht, call.data); err != nil {
 			var m wsMsg
 			m.FillAlert(err)
 			select {
-			case outboundCh <- m.Format():
+			case outboundMsgCh <- m:
 			default:
 				_ = rq.Jaws.Log(fmt.Errorf("jaws: outboundMsgCh full sending event error '%s'", err.Error()))
 			}

request_test.go

@@ -18,10 +18,10 @@ import (
 
 const testTimeout = time.Second * 3
 
-func fillWsCh(ch chan string) {
+func fillWsCh(ch chan wsMsg) {
 	for {
 		select {
-		case ch <- "":
+		case ch <- wsMsg{}:
 		default:
 			return
 		}
@@ -72,9 +72,7 @@ func TestRequest_SendArrivesOk(t *testing.T) {
 	select {
 	case <-time.NewTimer(testTimeout).C:
 		is.Fail()
-	case msgstr := <-rq.outCh:
-		msg, ok := wsParse([]byte(msgstr))
-		is.True(ok)
+	case msg := <-rq.outCh:
 		elem := rq.getElementByJid(jid)
 		is.True(elem != nil)
 		is.Equal(msg, wsMsg{Jid: elem.jid, Data: "bar", What: what.Inner})
@@ -214,7 +212,7 @@ func TestRequest_Trigger(t *testing.T) {
 	case <-th.C:
 		th.Timeout()
 	case msg := <-rq.outCh:
-		th.Equal(msg, (&wsMsg{
+		th.Equal(msg.Format(), (&wsMsg{
 			Data: "danger\nomg",
 			Jid:  jid.Jid(0),
 			What: what.Alert,
@@ -393,7 +391,8 @@ func TestRequest_Alert(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq1.outCh:
+	case msg := <-rq1.outCh:
+		s := msg.Format()
 		if s != "Alert\t\t\"info\\n<html>\\nnot\\tescaped\"\n" {
 			t.Errorf("%q", s)
 		}
@@ -416,7 +415,8 @@ func TestRequest_Redirect(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq1.outCh:
+	case msg := <-rq1.outCh:
+		s := msg.Format()
 		if s != "Redirect\t\t\"some-url\"\n" {
 			t.Errorf("%q", s)
 		}
@@ -437,7 +437,8 @@ func TestRequest_AlertError(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != "Alert\t\t\"danger\\n&lt;html&gt;\\nshould-be-escaped\"\n" {
 			t.Errorf("%q", s)
 		}
@@ -478,19 +479,43 @@ func TestRequest_DeleteByTag(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq1.outCh:
-		if s != "Delete\tJid.1\t\"\"\nDelete\tJid.3\t\"\"\n" {
+	case msg := <-rq1.outCh:
+		s := msg.Format()
+		if s != "Delete\tJid.1\t\"\"\n" {
 			t.Errorf("%q", s)
 		}
 	}
+
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq2.outCh:
-		if s != "Delete\tJid.4\t\"\"\nDelete\tJid.6\t\"\"\n" {
+	case msg := <-rq1.outCh:
+		s := msg.Format()
+		if s != "Delete\tJid.3\t\"\"\n" {
 			t.Errorf("%q", s)
 		}
 	}
+
+	select {
+	case <-th.C:
+		th.Timeout()
+	case msg := <-rq2.outCh:
+		s := msg.Format()
+		if s != "Delete\tJid.4\t\"\"\n" {
+			t.Errorf("%q", s)
+		}
+	}
+
+	select {
+	case <-th.C:
+		th.Timeout()
+	case msg := <-rq2.outCh:
+		s := msg.Format()
+		if s != "Delete\tJid.6\t\"\"\n" {
+			t.Errorf("%q", s)
+		}
+	}
+
 }
 
 func TestRequest_HtmlIdBroadcast(t *testing.T) {
@@ -508,15 +533,17 @@ func TestRequest_HtmlIdBroadcast(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq1.outCh:
+	case msg := <-rq1.outCh:
+		s := msg.Format()
 		if s != "Inner\tfooId\t\"inner\"\n" {
 			t.Errorf("%q", s)
 		}
 	}
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq2.outCh:
+	case msg := <-rq2.outCh:
+		s := msg.Format()
 		if s != "Inner\tfooId\t\"inner\"\n" {
 			t.Errorf("%q", s)
 		}

testjaws_test.go

@@ -35,7 +35,7 @@ type testRequest struct {
 	readyCh     chan struct{}
 	doneCh      chan struct{}
 	inCh        chan wsMsg
-	outCh       chan string
+	outCh       chan wsMsg
 	bcastCh     chan Message
 	ctx         context.Context
 	cancel      context.CancelFunc
@@ -70,7 +70,7 @@ func (tj *testJaws) newRequest(hr *http.Request) (tr *testRequest) {
 		readyCh:       make(chan struct{}),
 		doneCh:        make(chan struct{}),
 		inCh:          make(chan wsMsg),
-		outCh:         make(chan string, cap(bcastCh)),
+		outCh:         make(chan wsMsg, cap(bcastCh)),
 		bcastCh:       bcastCh,
 		ctx:           ctx,
 		cancel:        cancel,

uicheckbox_test.go

@@ -42,7 +42,8 @@ func TestRequest_Checkbox(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != "Value\tJid.1\t\"true\"\n" {
 			t.Errorf("%q", s)
 		}
@@ -58,7 +59,8 @@ func TestRequest_Checkbox(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != "Alert\t\t\"danger\\nstrconv.ParseBool: parsing &#34;omg&#34;: invalid syntax\"\n" {
 			t.Errorf("wrong Alert: %q", s)
 		}
@@ -69,7 +71,8 @@ func TestRequest_Checkbox(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != "Alert\t\t\"danger\\nmeh\"\n" {
 			t.Errorf("wrong Alert: %q", s)
 		}

uidate_test.go

@@ -46,7 +46,8 @@ func TestRequest_Date(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != fmt.Sprintf("Value\tJid.1\t\"%s\"\n", val.Format(ISO8601)) {
 			t.Error("wrong Value")
 		}
@@ -62,7 +63,8 @@ func TestRequest_Date(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != "Alert\t\t\"danger\\nparsing time &#34;omg&#34; as &#34;2006-01-02&#34;: cannot parse &#34;omg&#34; as &#34;2006&#34;\"\n" {
 			t.Errorf("wrong Alert: %q", s)
 		}
@@ -73,7 +75,8 @@ func TestRequest_Date(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != "Alert\t\t\"danger\\nmeh\"\n" {
 			t.Errorf("wrong Alert: %q", s)
 		}

uiimg_test.go

@@ -25,7 +25,8 @@ func TestRequest_Img(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != "SAttr\tJid.1\t\"src\\n\\\"unquoted.jpg\\\"\"\n" {
 			t.Error(strconv.Quote(s))
 		}

uinumber_test.go

@@ -43,7 +43,8 @@ func TestRequest_Number(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != fmt.Sprintf("Value\tJid.1\t\"%v\"\n", val) {
 			t.Error("wrong Value")
 		}
@@ -59,7 +60,8 @@ func TestRequest_Number(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != "Alert\t\t\"danger\\nstrconv.ParseFloat: parsing &#34;omg&#34;: invalid syntax\"\n" {
 			t.Errorf("wrong Alert: %q", s)
 		}
@@ -70,7 +72,8 @@ func TestRequest_Number(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != "Alert\t\t\"danger\\nmeh\"\n" {
 			t.Errorf("wrong Alert: %q", s)
 		}

uioption_test.go

@@ -30,7 +30,8 @@ func TestUiOption(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != "RAttr\tJid.1\t\"selected\"\n" {
 			t.Errorf("%q", s)
 		}
@@ -41,7 +42,8 @@ func TestUiOption(t *testing.T) {
 	select {
 	case <-th.C:
 		th.Timeout()
-	case s := <-rq.outCh:
+	case msg := <-rq.outCh:
+		s := msg.Format()
 		if s != "SAttr\tJid.1\t\"selected\\n\"\n" {
 			t.Errorf("%q", s)
 		}