summaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/olahol/melody/.gitignore (renamed from vendor/gopkg.in/olahol/melody.v1/.gitignore)0
-rw-r--r--vendor/github.com/olahol/melody/CHANGELOG.md (renamed from vendor/gopkg.in/olahol/melody.v1/CHANGELOG.md)8
-rw-r--r--vendor/github.com/olahol/melody/LICENSE (renamed from vendor/gopkg.in/olahol/melody.v1/LICENSE)0
-rw-r--r--vendor/github.com/olahol/melody/README.md157
-rw-r--r--vendor/github.com/olahol/melody/config.go (renamed from vendor/gopkg.in/olahol/melody.v1/config.go)0
-rw-r--r--vendor/github.com/olahol/melody/doc.go (renamed from vendor/gopkg.in/olahol/melody.v1/doc.go)8
-rw-r--r--vendor/github.com/olahol/melody/envelope.go (renamed from vendor/gopkg.in/olahol/melody.v1/envelope.go)0
-rw-r--r--vendor/github.com/olahol/melody/errors.go10
-rw-r--r--vendor/github.com/olahol/melody/hub.go (renamed from vendor/gopkg.in/olahol/melody.v1/hub.go)11
-rw-r--r--vendor/github.com/olahol/melody/melody.go (renamed from vendor/gopkg.in/olahol/melody.v1/melody.go)40
-rw-r--r--vendor/github.com/olahol/melody/session.go (renamed from vendor/gopkg.in/olahol/melody.v1/session.go)72
-rw-r--r--vendor/gopkg.in/olahol/melody.v1/.travis.yml10
-rw-r--r--vendor/gopkg.in/olahol/melody.v1/README.md185
-rw-r--r--vendor/modules.txt6
14 files changed, 263 insertions, 244 deletions
diff --git a/vendor/gopkg.in/olahol/melody.v1/.gitignore b/vendor/github.com/olahol/melody/.gitignore
index 31ea56b1..31ea56b1 100644
--- a/vendor/gopkg.in/olahol/melody.v1/.gitignore
+++ b/vendor/github.com/olahol/melody/.gitignore
diff --git a/vendor/gopkg.in/olahol/melody.v1/CHANGELOG.md b/vendor/github.com/olahol/melody/CHANGELOG.md
index ff511ddd..e0b19412 100644
--- a/vendor/gopkg.in/olahol/melody.v1/CHANGELOG.md
+++ b/vendor/github.com/olahol/melody/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2022-09-12 (v1.1.0)
+
+* Create Go module.
+* Update examples.
+* Fix concurrent panic (PR-65).
+* Add `Sessions` to get all sessions (PR-53).
+* Add `LocalAddr` and `RemoteAddr` (PR-55).
+
## 2017-05-18
* Fix `HandleSentMessageBinary`.
diff --git a/vendor/gopkg.in/olahol/melody.v1/LICENSE b/vendor/github.com/olahol/melody/LICENSE
index 4ae857e8..4ae857e8 100644
--- a/vendor/gopkg.in/olahol/melody.v1/LICENSE
+++ b/vendor/github.com/olahol/melody/LICENSE
diff --git a/vendor/github.com/olahol/melody/README.md b/vendor/github.com/olahol/melody/README.md
new file mode 100644
index 00000000..53196b44
--- /dev/null
+++ b/vendor/github.com/olahol/melody/README.md
@@ -0,0 +1,157 @@
+# melody
+
+![Build Status](https://github.com/olahol/melody/actions/workflows/test.yml/badge.svg)
+[![Codecov](https://img.shields.io/codecov/c/github/olahol/melody)](https://app.codecov.io/github/olahol/melody)
+[![Go Report Card](https://goreportcard.com/badge/github.com/olahol/melody)](https://goreportcard.com/report/github.com/olahol/melody)
+[![GoDoc](https://godoc.org/github.com/olahol/melody?status.svg)](https://godoc.org/github.com/olahol/melody)
+
+> :notes: Minimalist websocket framework for Go.
+
+Melody is websocket framework based on [github.com/gorilla/websocket](https://github.com/gorilla/websocket)
+that abstracts away the tedious parts of handling websockets. It gets out of
+your way so you can write real-time apps. Features include:
+
+* [x] Clear and easy interface similar to `net/http` or Gin.
+* [x] A simple way to broadcast to all or selected connected sessions.
+* [x] Message buffers making concurrent writing safe.
+* [x] Automatic handling of sending ping/pong heartbeats that timeout broken sessions.
+* [x] Store data on sessions.
+
+## Install
+
+```bash
+go get github.com/olahol/melody
+```
+
+## [Example: chat](https://github.com/olahol/melody/tree/master/examples/chat)
+
+[![Chat](https://cdn.rawgit.com/olahol/melody/master/examples/chat/demo.gif "Demo")](https://github.com/olahol/melody/tree/master/examples/chat)
+
+```go
+package main
+
+import (
+ "net/http"
+
+ "github.com/olahol/melody"
+)
+
+func main() {
+ m := melody.New()
+
+ http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+ http.ServeFile(w, r, "index.html")
+ })
+
+ http.HandleFunc("/ws", func(w http.ResponseWriter, r *http.Request) {
+ m.HandleRequest(w, r)
+ })
+
+ m.HandleMessage(func(s *melody.Session, msg []byte) {
+ m.Broadcast(msg)
+ })
+
+ http.ListenAndServe(":5000", nil)
+}
+```
+
+## [Example: gophers](https://github.com/olahol/melody/tree/master/examples/gophers)
+
+[![Gophers](https://cdn.rawgit.com/olahol/melody/master/examples/gophers/demo.gif "Demo")](https://github.com/olahol/melody/tree/master/examples/gophers)
+
+```go
+package main
+
+import (
+ "net/http"
+ "strings"
+
+ "github.com/google/uuid"
+ "github.com/olahol/melody"
+)
+
+type GopherInfo struct {
+ ID, X, Y string
+}
+
+func main() {
+ m := melody.New()
+
+ http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+ http.ServeFile(w, r, "index.html")
+ })
+
+ http.HandleFunc("/ws", func(w http.ResponseWriter, r *http.Request) {
+ m.HandleRequest(w, r)
+ })
+
+ m.HandleConnect(func(s *melody.Session) {
+ ss, _ := m.Sessions()
+
+ for _, o := range ss {
+ value, exists := o.Get("info")
+
+ if !exists {
+ continue
+ }
+
+ info := value.(*GopherInfo)
+
+ s.Write([]byte("set " + info.ID + " " + info.X + " " + info.Y))
+ }
+
+ id := uuid.NewString()
+ s.Set("info", &GopherInfo{id, "0", "0"})
+
+ s.Write([]byte("iam " + id))
+ })
+
+ m.HandleDisconnect(func(s *melody.Session) {
+ value, exists := s.Get("info")
+
+ if !exists {
+ return
+ }
+
+ info := value.(*GopherInfo)
+
+ m.BroadcastOthers([]byte("dis "+info.ID), s)
+ })
+
+ m.HandleMessage(func(s *melody.Session, msg []byte) {
+ p := strings.Split(string(msg), " ")
+ value, exists := s.Get("info")
+
+ if len(p) != 2 || !exists {
+ return
+ }
+
+ info := value.(*GopherInfo)
+ info.X = p[0]
+ info.Y = p[1]
+
+ m.BroadcastOthers([]byte("set "+info.ID+" "+info.X+" "+info.Y), s)
+ })
+
+ http.ListenAndServe(":5000", nil)
+}
+```
+
+### [More examples](https://github.com/olahol/melody/tree/master/examples)
+
+## [Documentation](https://godoc.org/github.com/olahol/melody)
+
+## Contributors
+
+<a href="https://github.com/olahol/melody/graphs/contributors">
+ <img src="https://contrib.rocks/image?repo=olahol/melody" />
+</a>
+
+## FAQ
+
+If you are getting a `403` when trying to connect to your websocket you can [change allow all origin hosts](http://godoc.org/github.com/gorilla/websocket#hdr-Origin_Considerations):
+
+```go
+m := melody.New()
+m.Upgrader.CheckOrigin = func(r *http.Request) bool { return true }
+```
diff --git a/vendor/gopkg.in/olahol/melody.v1/config.go b/vendor/github.com/olahol/melody/config.go
index 81ebd057..81ebd057 100644
--- a/vendor/gopkg.in/olahol/melody.v1/config.go
+++ b/vendor/github.com/olahol/melody/config.go
diff --git a/vendor/gopkg.in/olahol/melody.v1/doc.go b/vendor/github.com/olahol/melody/doc.go
index a65aa634..b54b6d4a 100644
--- a/vendor/gopkg.in/olahol/melody.v1/doc.go
+++ b/vendor/github.com/olahol/melody/doc.go
@@ -9,14 +9,14 @@
// A broadcasting echo server:
//
// func main() {
-// r := gin.Default()
// m := melody.New()
-// r.GET("/ws", func(c *gin.Context) {
-// m.HandleRequest(c.Writer, c.Request)
+// http.HandleFunc("/ws", func(w http.ResponseWriter, r *http.Request) {
+// m.HandleRequest(w, r)
// })
// m.HandleMessage(func(s *melody.Session, msg []byte) {
// m.Broadcast(msg)
// })
-// r.Run(":5000")
+// http.ListenAndServe(":5000", nil)
// }
+
package melody
diff --git a/vendor/gopkg.in/olahol/melody.v1/envelope.go b/vendor/github.com/olahol/melody/envelope.go
index baa55a3a..baa55a3a 100644
--- a/vendor/gopkg.in/olahol/melody.v1/envelope.go
+++ b/vendor/github.com/olahol/melody/envelope.go
diff --git a/vendor/github.com/olahol/melody/errors.go b/vendor/github.com/olahol/melody/errors.go
new file mode 100644
index 00000000..d8be6157
--- /dev/null
+++ b/vendor/github.com/olahol/melody/errors.go
@@ -0,0 +1,10 @@
+package melody
+
+import "errors"
+
+var (
+ ErrClosed = errors.New("melody instance is closed")
+ ErrSessionClosed = errors.New("session is closed")
+ ErrWriteClosed = errors.New("tried to write to closed a session")
+ ErrMessageBufferFull = errors.New("session message buffer is full")
+)
diff --git a/vendor/gopkg.in/olahol/melody.v1/hub.go b/vendor/github.com/olahol/melody/hub.go
index edc6337d..4a8cffac 100644
--- a/vendor/gopkg.in/olahol/melody.v1/hub.go
+++ b/vendor/github.com/olahol/melody/hub.go
@@ -78,3 +78,14 @@ func (h *hub) len() int {
return len(h.sessions)
}
+
+func (h *hub) all() []*Session {
+ h.rwmutex.RLock()
+ defer h.rwmutex.RUnlock()
+
+ s := make([]*Session, 0, len(h.sessions))
+ for k := range h.sessions {
+ s = append(s, k)
+ }
+ return s
+}
diff --git a/vendor/gopkg.in/olahol/melody.v1/melody.go b/vendor/github.com/olahol/melody/melody.go
index 6e416b15..ca2c5dd1 100644
--- a/vendor/gopkg.in/olahol/melody.v1/melody.go
+++ b/vendor/github.com/olahol/melody/melody.go
@@ -1,7 +1,6 @@
package melody
import (
- "errors"
"net/http"
"sync"
@@ -164,23 +163,24 @@ func (m *Melody) HandleRequest(w http.ResponseWriter, r *http.Request) error {
// HandleRequestWithKeys does the same as HandleRequest but populates session.Keys with keys.
func (m *Melody) HandleRequestWithKeys(w http.ResponseWriter, r *http.Request, keys map[string]interface{}) error {
if m.hub.closed() {
- return errors.New("melody instance is closed")
+ return ErrClosed
}
- conn, err := m.Upgrader.Upgrade(w, r, nil)
+ conn, err := m.Upgrader.Upgrade(w, r, w.Header())
if err != nil {
return err
}
session := &Session{
- Request: r,
- Keys: keys,
- conn: conn,
- output: make(chan *envelope, m.Config.MessageBufferSize),
- melody: m,
- open: true,
- rwmutex: &sync.RWMutex{},
+ Request: r,
+ Keys: keys,
+ conn: conn,
+ output: make(chan *envelope, m.Config.MessageBufferSize),
+ outputDone: make(chan struct{}),
+ melody: m,
+ open: true,
+ rwmutex: &sync.RWMutex{},
}
m.hub.register <- session
@@ -205,7 +205,7 @@ func (m *Melody) HandleRequestWithKeys(w http.ResponseWriter, r *http.Request, k
// Broadcast broadcasts a text message to all sessions.
func (m *Melody) Broadcast(msg []byte) error {
if m.hub.closed() {
- return errors.New("melody instance is closed")
+ return ErrClosed
}
message := &envelope{t: websocket.TextMessage, msg: msg}
@@ -217,7 +217,7 @@ func (m *Melody) Broadcast(msg []byte) error {
// BroadcastFilter broadcasts a text message to all sessions that fn returns true for.
func (m *Melody) BroadcastFilter(msg []byte, fn func(*Session) bool) error {
if m.hub.closed() {
- return errors.New("melody instance is closed")
+ return ErrClosed
}
message := &envelope{t: websocket.TextMessage, msg: msg, filter: fn}
@@ -246,7 +246,7 @@ func (m *Melody) BroadcastMultiple(msg []byte, sessions []*Session) error {
// BroadcastBinary broadcasts a binary message to all sessions.
func (m *Melody) BroadcastBinary(msg []byte) error {
if m.hub.closed() {
- return errors.New("melody instance is closed")
+ return ErrClosed
}
message := &envelope{t: websocket.BinaryMessage, msg: msg}
@@ -258,7 +258,7 @@ func (m *Melody) BroadcastBinary(msg []byte) error {
// BroadcastBinaryFilter broadcasts a binary message to all sessions that fn returns true for.
func (m *Melody) BroadcastBinaryFilter(msg []byte, fn func(*Session) bool) error {
if m.hub.closed() {
- return errors.New("melody instance is closed")
+ return ErrClosed
}
message := &envelope{t: websocket.BinaryMessage, msg: msg, filter: fn}
@@ -274,10 +274,18 @@ func (m *Melody) BroadcastBinaryOthers(msg []byte, s *Session) error {
})
}
+// Sessions returns all sessions. An error is returned if the melody session is closed.
+func (m *Melody) Sessions() ([]*Session, error) {
+ if m.hub.closed() {
+ return nil, ErrClosed
+ }
+ return m.hub.all(), nil
+}
+
// Close closes the melody instance and all connected sessions.
func (m *Melody) Close() error {
if m.hub.closed() {
- return errors.New("melody instance is already closed")
+ return ErrClosed
}
m.hub.exit <- &envelope{t: websocket.CloseMessage, msg: []byte{}}
@@ -289,7 +297,7 @@ func (m *Melody) Close() error {
// Use the FormatCloseMessage function to format a proper close message payload.
func (m *Melody) CloseWithMsg(msg []byte) error {
if m.hub.closed() {
- return errors.New("melody instance is already closed")
+ return ErrClosed
}
m.hub.exit <- &envelope{t: websocket.CloseMessage, msg: msg}
diff --git a/vendor/gopkg.in/olahol/melody.v1/session.go b/vendor/github.com/olahol/melody/session.go
index 3997cefe..879a724d 100644
--- a/vendor/gopkg.in/olahol/melody.v1/session.go
+++ b/vendor/github.com/olahol/melody/session.go
@@ -1,7 +1,7 @@
package melody
import (
- "errors"
+ "net"
"net/http"
"sync"
"time"
@@ -11,31 +11,32 @@ import (
// Session wrapper around websocket connections.
type Session struct {
- Request *http.Request
- Keys map[string]interface{}
- conn *websocket.Conn
- output chan *envelope
- melody *Melody
- open bool
- rwmutex *sync.RWMutex
+ Request *http.Request
+ Keys map[string]interface{}
+ conn *websocket.Conn
+ output chan *envelope
+ outputDone chan struct{}
+ melody *Melody
+ open bool
+ rwmutex *sync.RWMutex
}
func (s *Session) writeMessage(message *envelope) {
if s.closed() {
- s.melody.errorHandler(s, errors.New("tried to write to closed a session"))
+ s.melody.errorHandler(s, ErrWriteClosed)
return
}
select {
case s.output <- message:
default:
- s.melody.errorHandler(s, errors.New("session message buffer is full"))
+ s.melody.errorHandler(s, ErrMessageBufferFull)
}
}
func (s *Session) writeRaw(message *envelope) error {
if s.closed() {
- return errors.New("tried to write to a closed session")
+ return ErrWriteClosed
}
s.conn.SetWriteDeadline(time.Now().Add(s.melody.Config.WriteWait))
@@ -56,12 +57,13 @@ func (s *Session) closed() bool {
}
func (s *Session) close() {
- if !s.closed() {
- s.rwmutex.Lock()
- s.open = false
+ s.rwmutex.Lock()
+ open := s.open
+ s.open = false
+ s.rwmutex.Unlock()
+ if open {
s.conn.Close()
- close(s.output)
- s.rwmutex.Unlock()
+ close(s.outputDone)
}
}
@@ -76,11 +78,7 @@ func (s *Session) writePump() {
loop:
for {
select {
- case msg, ok := <-s.output:
- if !ok {
- break loop
- }
-
+ case msg := <-s.output:
err := s.writeRaw(msg)
if err != nil {
@@ -101,8 +99,14 @@ loop:
}
case <-ticker.C:
s.ping()
+ case _, ok := <-s.outputDone:
+ if !ok {
+ break loop
+ }
}
}
+
+ s.close()
}
func (s *Session) readPump() {
@@ -142,7 +146,7 @@ func (s *Session) readPump() {
// Write writes message to session.
func (s *Session) Write(msg []byte) error {
if s.closed() {
- return errors.New("session is closed")
+ return ErrSessionClosed
}
s.writeMessage(&envelope{t: websocket.TextMessage, msg: msg})
@@ -153,7 +157,7 @@ func (s *Session) Write(msg []byte) error {
// WriteBinary writes a binary message to session.
func (s *Session) WriteBinary(msg []byte) error {
if s.closed() {
- return errors.New("session is closed")
+ return ErrSessionClosed
}
s.writeMessage(&envelope{t: websocket.BinaryMessage, msg: msg})
@@ -164,7 +168,7 @@ func (s *Session) WriteBinary(msg []byte) error {
// Close closes session.
func (s *Session) Close() error {
if s.closed() {
- return errors.New("session is already closed")
+ return ErrSessionClosed
}
s.writeMessage(&envelope{t: websocket.CloseMessage, msg: []byte{}})
@@ -176,7 +180,7 @@ func (s *Session) Close() error {
// Use the FormatCloseMessage function to format a proper close message payload.
func (s *Session) CloseWithMsg(msg []byte) error {
if s.closed() {
- return errors.New("session is already closed")
+ return ErrSessionClosed
}
s.writeMessage(&envelope{t: websocket.CloseMessage, msg: msg})
@@ -184,9 +188,12 @@ func (s *Session) CloseWithMsg(msg []byte) error {
return nil
}
-// Set is used to store a new key/value pair exclusivelly for this session.
+// Set is used to store a new key/value pair exclusively for this session.
// It also lazy initializes s.Keys if it was not used previously.
func (s *Session) Set(key string, value interface{}) {
+ s.rwmutex.Lock()
+ defer s.rwmutex.Unlock()
+
if s.Keys == nil {
s.Keys = make(map[string]interface{})
}
@@ -197,6 +204,9 @@ func (s *Session) Set(key string, value interface{}) {
// Get returns the value for the given key, ie: (value, true).
// If the value does not exists it returns (nil, false)
func (s *Session) Get(key string) (value interface{}, exists bool) {
+ s.rwmutex.RLock()
+ defer s.rwmutex.RUnlock()
+
if s.Keys != nil {
value, exists = s.Keys[key]
}
@@ -217,3 +227,13 @@ func (s *Session) MustGet(key string) interface{} {
func (s *Session) IsClosed() bool {
return s.closed()
}
+
+// LocalAddr returns the local addr of the connection.
+func (s *Session) LocalAddr() net.Addr {
+ return s.conn.LocalAddr()
+}
+
+// RemoteAddr returns the remote addr of the connection.
+func (s *Session) RemoteAddr() net.Addr {
+ return s.conn.RemoteAddr()
+}
diff --git a/vendor/gopkg.in/olahol/melody.v1/.travis.yml b/vendor/gopkg.in/olahol/melody.v1/.travis.yml
deleted file mode 100644
index f1a141cd..00000000
--- a/vendor/gopkg.in/olahol/melody.v1/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-language: go
-sudo: required
-go:
-- 1.6
-- 1.7
-- 1.8
-install:
- - go get github.com/gorilla/websocket
-script:
- - go test
diff --git a/vendor/gopkg.in/olahol/melody.v1/README.md b/vendor/gopkg.in/olahol/melody.v1/README.md
deleted file mode 100644
index 67e3ab50..00000000
--- a/vendor/gopkg.in/olahol/melody.v1/README.md
+++ /dev/null
@@ -1,185 +0,0 @@
-# melody
-
-[![Build Status](https://travis-ci.org/olahol/melody.svg)](https://travis-ci.org/olahol/melody)
-[![Coverage Status](https://img.shields.io/coveralls/olahol/melody.svg?style=flat)](https://coveralls.io/r/olahol/melody)
-[![GoDoc](https://godoc.org/github.com/olahol/melody?status.svg)](https://godoc.org/github.com/olahol/melody)
-
-> :notes: Minimalist websocket framework for Go.
-
-Melody is websocket framework based on [github.com/gorilla/websocket](https://github.com/gorilla/websocket)
-that abstracts away the tedious parts of handling websockets. It gets out of
-your way so you can write real-time apps. Features include:
-
-* [x] Clear and easy interface similar to `net/http` or Gin.
-* [x] A simple way to broadcast to all or selected connected sessions.
-* [x] Message buffers making concurrent writing safe.
-* [x] Automatic handling of ping/pong and session timeouts.
-* [x] Store data on sessions.
-
-## Install
-
-```bash
-go get gopkg.in/olahol/melody.v1
-```
-
-## [Example: chat](https://github.com/olahol/melody/tree/master/examples/chat)
-
-[![Chat](https://cdn.rawgit.com/olahol/melody/master/examples/chat/demo.gif "Demo")](https://github.com/olahol/melody/tree/master/examples/chat)
-
-Using [Gin](https://github.com/gin-gonic/gin):
-```go
-package main
-
-import (
- "github.com/gin-gonic/gin"
- "gopkg.in/olahol/melody.v1"
- "net/http"
-)
-
-func main() {
- r := gin.Default()
- m := melody.New()
-
- r.GET("/", func(c *gin.Context) {
- http.ServeFile(c.Writer, c.Request, "index.html")
- })
-
- r.GET("/ws", func(c *gin.Context) {
- m.HandleRequest(c.Writer, c.Request)
- })
-
- m.HandleMessage(func(s *melody.Session, msg []byte) {
- m.Broadcast(msg)
- })
-
- r.Run(":5000")
-}
-```
-
-Using [Echo](https://github.com/labstack/echo):
-```go
-package main
-
-import (
- "github.com/labstack/echo"
- "github.com/labstack/echo/engine/standard"
- "github.com/labstack/echo/middleware"
- "gopkg.in/olahol/melody.v1"
- "net/http"
-)
-
-func main() {
- e := echo.New()
- m := melody.New()
-
- e.Use(middleware.Logger())
- e.Use(middleware.Recover())
-
- e.GET("/", func(c echo.Context) error {
- http.ServeFile(c.Response().(*standard.Response).ResponseWriter, c.Request().(*standard.Request).Request, "index.html")
- return nil
- })
-
- e.GET("/ws", func(c echo.Context) error {
- m.HandleRequest(c.Response().(*standard.Response).ResponseWriter, c.Request().(*standard.Request).Request)
- return nil
- })
-
- m.HandleMessage(func(s *melody.Session, msg []byte) {
- m.Broadcast(msg)
- })
-
- e.Run(standard.New(":5000"))
-}
-```
-
-## [Example: gophers](https://github.com/olahol/melody/tree/master/examples/gophers)
-
-[![Gophers](https://cdn.rawgit.com/olahol/melody/master/examples/gophers/demo.gif "Demo")](https://github.com/olahol/melody/tree/master/examples/gophers)
-
-```go
-package main
-
-import (
- "github.com/gin-gonic/gin"
- "gopkg.in/olahol/melody.v1"
- "net/http"
- "strconv"
- "strings"
- "sync"
-)
-
-type GopherInfo struct {
- ID, X, Y string
-}
-
-func main() {
- router := gin.Default()
- mrouter := melody.New()
- gophers := make(map[*melody.Session]*GopherInfo)
- lock := new(sync.Mutex)
- counter := 0
-
- router.GET("/", func(c *gin.Context) {
- http.ServeFile(c.Writer, c.Request, "index.html")
- })
-
- router.GET("/ws", func(c *gin.Context) {
- mrouter.HandleRequest(c.Writer, c.Request)
- })
-
- mrouter.HandleConnect(func(s *melody.Session) {
- lock.Lock()
- for _, info := range gophers {
- s.Write([]byte("set " + info.ID + " " + info.X + " " + info.Y))
- }
- gophers[s] = &GopherInfo{strconv.Itoa(counter), "0", "0"}
- s.Write([]byte("iam " + gophers[s].ID))
- counter += 1
- lock.Unlock()
- })
-
- mrouter.HandleDisconnect(func(s *melody.Session) {
- lock.Lock()
- mrouter.BroadcastOthers([]byte("dis "+gophers[s].ID), s)
- delete(gophers, s)
- lock.Unlock()
- })
-
- mrouter.HandleMessage(func(s *melody.Session, msg []byte) {
- p := strings.Split(string(msg), " ")
- lock.Lock()
- info := gophers[s]
- if len(p) == 2 {
- info.X = p[0]
- info.Y = p[1]
- mrouter.BroadcastOthers([]byte("set "+info.ID+" "+info.X+" "+info.Y), s)
- }
- lock.Unlock()
- })
-
- router.Run(":5000")
-}
-```
-
-### [More examples](https://github.com/olahol/melody/tree/master/examples)
-
-## [Documentation](https://godoc.org/github.com/olahol/melody)
-
-## Contributors
-
-* Ola Holmström (@olahol)
-* Shogo Iwano (@shiwano)
-* Matt Caldwell (@mattcaldwell)
-* Heikki Uljas (@huljas)
-* Robbie Trencheny (@robbiet480)
-* yangjinecho (@yangjinecho)
-
-## FAQ
-
-If you are getting a `403` when trying to connect to your websocket you can [change allow all origin hosts](http://godoc.org/github.com/gorilla/websocket#hdr-Origin_Considerations):
-
-```go
-m := melody.New()
-m.Upgrader.CheckOrigin = func(r *http.Request) bool { return true }
-```
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 41e2f2e0..1b9fa5bf 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -333,6 +333,9 @@ github.com/mrexodia/wray
# github.com/nelsonken/gomf v0.0.0-20190423072027-c65cc0469e94
## explicit; go 1.12
github.com/nelsonken/gomf
+# github.com/olahol/melody v1.1.2
+## explicit; go 1.19
+github.com/olahol/melody
# github.com/opentracing/opentracing-go v1.2.0
## explicit; go 1.14
github.com/opentracing/opentracing-go
@@ -698,9 +701,6 @@ gopkg.in/ini.v1
# gopkg.in/natefinch/lumberjack.v2 v2.0.0
## explicit
gopkg.in/natefinch/lumberjack.v2
-# gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376
-## explicit
-gopkg.in/olahol/melody.v1
# gopkg.in/yaml.v2 v2.4.0
## explicit; go 1.15
gopkg.in/yaml.v2