From cff1d03423159ed9ba6a5504e5f3806711296dee Mon Sep 17 00:00:00 2001 From: zhouhui8915 Date: Sun, 6 Sep 2015 16:03:15 +0800 Subject: [PATCH] rename go-socket.io-client --- LICENSE | 2 +- README.md | 2 +- caller.go | 2 +- client.go | 2 +- client_conn.go | 28 +++++++++++++--------------- ioutil.go | 2 +- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/LICENSE b/LICENSE index 702d558..dea27f8 100644 --- a/LICENSE +++ b/LICENSE @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of go-engine.io-client nor the names of its +* Neither the name of go-socket.io-client nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/README.md b/README.md index 58024b4..6574b49 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# go-engine.io-client \ No newline at end of file +# go-socket.io-client \ No newline at end of file diff --git a/caller.go b/caller.go index 2e28ace..a109fa0 100644 --- a/caller.go +++ b/caller.go @@ -1,4 +1,4 @@ -package engine_client +package socketio_client import ( "errors" diff --git a/client.go b/client.go index 468fe70..37dd35c 100644 --- a/client.go +++ b/client.go @@ -1,4 +1,4 @@ -package engine_client +package socketio_client import ( "reflect" diff --git a/client_conn.go b/client_conn.go index 95d1723..758bd42 100644 --- a/client_conn.go +++ b/client_conn.go @@ -1,4 +1,4 @@ -package engine_client +package socketio_client import ( "errors" @@ -217,26 +217,25 @@ func (c *clientConn) onOpen() error { return InvalidError } - q:= c.request.URL.Query() - q.Set("transport","polling") + q := c.request.URL.Query() + q.Set("transport", "polling") c.request.URL.RawQuery = q.Encode() - transport, err := creater.Client(c.request) if err != nil { return err } c.setCurrent("polling", transport) - pack,err := c.getCurrent().NextReader() + pack, err := c.getCurrent().NextReader() if err != nil { - return err + return err } fmt.Println(pack) //var p []byte - p:=make([]byte,1024) - l,err := pack.Read(p) + p := make([]byte, 1024) + l, err := pack.Read(p) fmt.Println(l) fmt.Println(err) fmt.Println(string(p)) @@ -247,25 +246,24 @@ func (c *clientConn) onOpen() error { } c.request.URL.Scheme = "ws" - q.Set("sid","0") - q.Set("transport","websocket") + q.Set("sid", "0") + q.Set("transport", "websocket") c.request.URL.RawQuery = q.Encode() - transport, err = creater.Client(c.request) if err != nil { return err } c.setCurrent("websocket", transport) - pack,err = c.getCurrent().NextReader() + pack, err = c.getCurrent().NextReader() if err != nil { - return err + return err } fmt.Println(pack) - p2:=make([]byte,1024) - l,err = pack.Read(p2) + p2 := make([]byte, 1024) + l, err = pack.Read(p2) fmt.Println(l) fmt.Println(err) fmt.Println(string(p2)) diff --git a/ioutil.go b/ioutil.go index ac0248b..ec2e8fb 100644 --- a/ioutil.go +++ b/ioutil.go @@ -1,4 +1,4 @@ -package engine_client +package socketio_client import ( "github.com/googollee/go-engine.io/parser"