From 39574c954b7be18f3ed5cfedd5bd16e6a7a6a027 Mon Sep 17 00:00:00 2001 From: Philipp Heckel Date: Sun, 24 Oct 2021 13:34:15 -0400 Subject: [PATCH] Examples, CORS --- examples/example_eventsource_sse.html | 53 +++++++++++++++++++++++++++ server/server.go | 17 ++++++++- 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 examples/example_eventsource_sse.html diff --git a/examples/example_eventsource_sse.html b/examples/example_eventsource_sse.html new file mode 100644 index 00000000..83a8344a --- /dev/null +++ b/examples/example_eventsource_sse.html @@ -0,0 +1,53 @@ + + + + ntfy.sh: EventSource Example + + + +

ntfy.sh: EventSource Example

+

+ This is an example showing how to use ntfy.sh with + EventSource.
+

+ +

Log:

+
+ + + + + diff --git a/server/server.go b/server/server.go index c5b0a6b5..a8050f47 100644 --- a/server/server.go +++ b/server/server.go @@ -131,6 +131,8 @@ func (s *Server) handleInternal(w http.ResponseWriter, r *http.Request) error { return s.handleSubscribeRaw(w, r) } else if (r.Method == http.MethodPut || r.Method == http.MethodPost) && topicRegex.MatchString(r.URL.Path) { return s.handlePublishHTTP(w, r) + } else if r.Method == http.MethodOptions { + return s.handleOptions(w, r) } return errHTTPNotFound } @@ -154,7 +156,11 @@ func (s *Server) handlePublishHTTP(w http.ResponseWriter, r *http.Request) error Time: time.Now().UnixMilli(), Message: string(b), } - return t.Publish(msg) + if err := t.Publish(msg); err != nil { + return err + } + w.Header().Set("Access-Control-Allow-Origin", "*") // CORS, allow cross-origin requests + return nil } func (s *Server) handleSubscribeJSON(w http.ResponseWriter, r *http.Request) error { @@ -169,6 +175,7 @@ func (s *Server) handleSubscribeJSON(w http.ResponseWriter, r *http.Request) err return nil }) defer s.unsubscribe(t, subscriberID) + w.Header().Set("Access-Control-Allow-Origin", "*") // CORS, allow cross-origin requests select { case <-t.ctx.Done(): case <-r.Context().Done(): @@ -194,7 +201,7 @@ func (s *Server) handleSubscribeSSE(w http.ResponseWriter, r *http.Request) erro }) defer s.unsubscribe(t, subscriberID) w.Header().Set("Content-Type", "text/event-stream") - w.WriteHeader(http.StatusOK) + w.Header().Set("Access-Control-Allow-Origin", "*") // CORS, allow cross-origin requests if _, err := io.WriteString(w, "event: open\n\n"); err != nil { return err } @@ -228,6 +235,12 @@ func (s *Server) handleSubscribeRaw(w http.ResponseWriter, r *http.Request) erro return nil } +func (s *Server) handleOptions(w http.ResponseWriter, r *http.Request) error { + w.Header().Set("Access-Control-Allow-Origin", "*") // CORS, allow cross-origin requests + w.Header().Set("Access-Control-Allow-Methods", "GET, PUT, POST") + return nil +} + func (s *Server) createTopic(id string) *topic { s.mu.Lock() defer s.mu.Unlock()