Optimize streaming

pull/50/head
178inaba 2017-04-30 03:12:55 +09:00
parent c66c3aaa22
commit 517247284e
2 changed files with 102 additions and 39 deletions

View File

@ -8,8 +8,8 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"path" "path"
"strconv"
"strings" "strings"
"time"
) )
// UpdateEvent is struct for passing status event to app. // UpdateEvent is struct for passing status event to app.
@ -42,8 +42,8 @@ type Event interface {
event() event()
} }
func handleReader(ctx context.Context, q chan Event, r io.Reader) error { func handleReader(q chan Event, r io.Reader) error {
name := "" var name string
s := bufio.NewScanner(r) s := bufio.NewScanner(r)
for s.Scan() { for s.Scan() {
line := s.Text() line := s.Text()
@ -55,30 +55,33 @@ func handleReader(ctx context.Context, q chan Event, r io.Reader) error {
case "event": case "event":
name = strings.TrimSpace(token[1]) name = strings.TrimSpace(token[1])
case "data": case "data":
var err error
switch name { switch name {
case "update": case "update":
var status Status var status Status
err := json.Unmarshal([]byte(token[1]), &status) err = json.Unmarshal([]byte(token[1]), &status)
if err == nil { if err == nil {
q <- &UpdateEvent{&status} q <- &UpdateEvent{&status}
} }
case "notification": case "notification":
var notification Notification var notification Notification
err := json.Unmarshal([]byte(token[1]), &notification) err = json.Unmarshal([]byte(token[1]), &notification)
if err == nil { if err == nil {
q <- &NotificationEvent{&notification} q <- &NotificationEvent{&notification}
} }
case "delete": case "delete":
var id int64 var id int64
err := json.Unmarshal([]byte(token[1]), &id) id, err = strconv.ParseInt(strings.TrimSpace(token[1]), 10, 64)
if err == nil { if err == nil {
q <- &DeleteEvent{id} q <- &DeleteEvent{id}
} }
} }
default: if err != nil {
q <- &ErrorEvent{err}
} }
} }
return ctx.Err() }
return s.Err()
} }
func (c *Client) streaming(ctx context.Context, p string, params url.Values) (chan Event, error) { func (c *Client) streaming(ctx context.Context, p string, params url.Values) (chan Event, error) {
@ -96,38 +99,42 @@ func (c *Client) streaming(ctx context.Context, p string, params url.Values) (ch
req = req.WithContext(ctx) req = req.WithContext(ctx)
req.Header.Set("Authorization", "Bearer "+c.config.AccessToken) req.Header.Set("Authorization", "Bearer "+c.config.AccessToken)
var resp *http.Response q := make(chan Event)
q := make(chan Event, 10)
go func() { go func() {
defer ctx.Done() defer close(q)
for { for {
resp, err = c.Do(req) select {
if resp != nil && resp.StatusCode != http.StatusOK { case <-ctx.Done():
err = parseAPIError("bad request", resp) q <- &ErrorEvent{ctx.Err()}
return
default:
} }
if err == nil {
err = handleReader(ctx, q, resp.Body) c.doStreaming(req, q)
if err == nil {
break
}
} else {
q <- &ErrorEvent{err}
}
resp.Body.Close()
time.Sleep(3 * time.Second)
}
}()
go func() {
<-ctx.Done()
if resp != nil && resp.Body != nil {
resp.Body.Close()
} }
}() }()
return q, nil return q, nil
} }
func (c *Client) doStreaming(req *http.Request, q chan Event) {
resp, err := c.Do(req)
if err != nil {
q <- &ErrorEvent{err}
return
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
q <- &ErrorEvent{parseAPIError("bad request", resp)}
return
}
err = handleReader(q, resp.Body)
if err != nil {
q <- &ErrorEvent{err}
}
}
// StreamingUser return channel to read events on home. // StreamingUser return channel to read events on home.
func (c *Client) StreamingUser(ctx context.Context) (chan Event, error) { func (c *Client) StreamingUser(ctx context.Context) (chan Event, error) {
return c.streaming(ctx, "user", nil) return c.streaming(ctx, "user", nil)

View File

@ -23,7 +23,7 @@ data: 1234567
`) `)
go func() { go func() {
defer close(q) defer close(q)
err := handleReader(context.Background(), q, r) err := handleReader(q, r)
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
@ -54,9 +54,64 @@ data: 1234567
} }
} }
func TestStreamingPublic(t *testing.T) { func TestStreaming(t *testing.T) {
canErr := true
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/api/v1/streaming/public" { if canErr {
canErr = false
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
f := w.(http.Flusher)
fmt.Fprintln(w, `
event: update
data: {"content": "foo"}
`)
f.Flush()
}))
defer ts.Close()
c := NewClient(&Config{Server: ":"})
_, err := c.streaming(context.Background(), "", nil)
if err == nil {
t.Fatalf("should be fail: %v", err)
}
c = NewClient(&Config{Server: ts.URL})
ctx, cancel := context.WithCancel(context.Background())
time.AfterFunc(time.Second, func() {
cancel()
})
q, err := c.streaming(ctx, "", nil)
if err != nil {
t.Fatalf("should not be fail: %v", err)
}
var passError, passUpdate bool
for e := range q {
switch event := e.(type) {
case *ErrorEvent:
passError = true
if event.err == nil {
t.Fatalf("should be fail: %v", event.err)
}
case *UpdateEvent:
passUpdate = true
if event.Status.Content != "foo" {
t.Fatalf("want %q but %q", "foo", event.Status.Content)
}
}
}
if !passError || !passUpdate {
t.Fatalf("have not passed through somewhere: error %t, update %t", passError, passUpdate)
}
}
func TestStreamingPublic(t *testing.T) {
var isEnd bool
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if isEnd {
return
} else if r.URL.Path != "/api/v1/streaming/public" {
http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound) http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
return return
} }
@ -72,7 +127,7 @@ event: update
data: {"content": "bar"} data: {"content": "bar"}
`) `)
f.Flush() f.Flush()
return isEnd = true
})) }))
defer ts.Close() defer ts.Close()
@ -87,14 +142,15 @@ data: {"content": "bar"}
if err != nil { if err != nil {
t.Fatalf("should not be fail: %v", err) t.Fatalf("should not be fail: %v", err)
} }
time.AfterFunc(3*time.Second, func() { time.AfterFunc(time.Second, func() {
cancel() cancel()
close(q)
}) })
events := []Event{} events := []Event{}
for e := range q { for e := range q {
if _, ok := e.(*ErrorEvent); !ok {
events = append(events, e) events = append(events, e)
} }
}
if len(events) != 2 { if len(events) != 2 {
t.Fatalf("result should be two: %d", len(events)) t.Fatalf("result should be two: %d", len(events))
} }