Home Explore Help
Register Sign In
git
/
tinymq
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix

Joyit 1 month ago
parent
fd73e6dacc
commit
cc6e593ca2
3 changed files with 1 additions and 210 deletions
Unified View Show Diff Stats
  1. 0 79
      examples/echo-client.go
  2. 0 131
      examples/echo-server.go
  3. 1 0
      line.go

+ 0 - 79
examples/echo-client.go
View File 

@@ -1,79 +0,0 @@
 
-//go:build ignore
 
-// +build ignore
 
-
 
-package main
 
-
 
-import (
 
-	"flag"
 
-	"log"
 
-	"net/url"
 
-	"os"
 
-	"os/signal"
 
-	"time"
 
-
 
-	"github.com/gorilla/websocket"
 
-)
 
-
 
-var addr = flag.String("addr", "127.0.0.1:10808", "http service address")
 
-
 
-func main() {
 
-	flag.Parse()
 
-	log.SetFlags(0)
 
-
 
-	interrupt := make(chan os.Signal, 1)
 
-	signal.Notify(interrupt, os.Interrupt)
 
-
 
-	u := url.URL{Scheme: "ws", Host: *addr, Path: "/echo"}
 
-	log.Printf("connecting to %s", u.String())
 
-
 
-	c, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
 
-	if err != nil {
 
-		log.Fatal("dial:", err)
 
-	}
 
-	defer c.Close()
 
-
 
-	done := make(chan struct{})
 
-
 
-	go func() {
 
-		defer close(done)
 
-		for {
 
-			_, message, err := c.ReadMessage()
 
-			if err != nil {
 
-				log.Println("read:", err)
 
-				return
 
-			}
 
-			log.Printf("recv: %s", message)
 
-		}
 
-	}()
 
-
 
-	ticker := time.NewTicker(time.Second)
 
-	defer ticker.Stop()
 
-
 
-	for {
 
-		select {
 
-		case <-done:
 
-			return
 
-		case t := <-ticker.C:
 
-			err := c.WriteMessage(websocket.TextMessage, []byte(t.String()))
 
-			if err != nil {
 
-				log.Println("write:", err)
 
-				return
 
-			}
 
-		case <-interrupt:
 
-			log.Println("interrupt")
 
-
 
-			// Cleanly close the connection by sending a close message and then
 
-			// waiting (with timeout) for the server to close the connection.
 
-			err := c.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
 
-			if err != nil {
 
-				log.Println("write close:", err)
 
-				return
 
-			}
 
-			select {
 
-			case <-done:
 
-			case <-time.After(time.Second):
 
-			}
 
-			return
 
-		}
 
-	}
 
-}

+ 0 - 131
examples/echo-server.go
View File 

@@ -1,131 +0,0 @@
 
-//go:build ignore
 
-// +build ignore
 
-
 
-package main
 
-
 
-import (
 
-	"flag"
 
-	"html/template"
 
-	"log"
 
-	"net/http"
 
-
 
-	"github.com/gorilla/websocket"
 
-)
 
-
 
-var addr = flag.String("addr", "127.0.0.1:10808", "http service address")
 
-
 
-var upgrader = websocket.Upgrader{} // use default options
 
-
 
-func echo(w http.ResponseWriter, r *http.Request) {
 
-	c, err := upgrader.Upgrade(w, r, nil)
 
-	if err != nil {
 
-		log.Print("upgrade:", err)
 
-		return
 
-	}
 
-	defer c.Close()
 
-	for {
 
-		mt, message, err := c.ReadMessage()
 
-		if err != nil {
 
-			log.Println("read:", err)
 
-			break
 
-		}
 
-		log.Printf("recv: %s", message)
 
-		err = c.WriteMessage(mt, message)
 
-		if err != nil {
 
-			log.Println("write:", err)
 
-			break
 
-		}
 
-	}
 
-}
 
-
 
-func home(w http.ResponseWriter, r *http.Request) {
 
-	homeTemplate.Execute(w, "ws://"+r.Host+"/echo")
 
-}
 
-
 
-func main() {
 
-	flag.Parse()
 
-	log.SetFlags(0)
 
-	http.HandleFunc("/echo", echo)
 
-	http.HandleFunc("/", home)
 
-	log.Fatal(http.ListenAndServe(*addr, nil))
 
-}
 
-
 
-var homeTemplate = template.Must(template.New("").Parse(`
 
-<!DOCTYPE html>
 
-<html>
 
-<head>
 
-<meta charset="utf-8">
 
-<script>  
-window.addEventListener("load", function(evt) {
 
-
 
-    var output = document.getElementById("output");
 
-    var input = document.getElementById("input");
 
-    var ws;
 
-
 
-    var print = function(message) {
 
-        var d = document.createElement("div");
 
-        d.textContent = message;
 
-        output.appendChild(d);
 
-        output.scroll(0, output.scrollHeight);
 
-    };
 
-
 
-    document.getElementById("open").onclick = function(evt) {
 
-        if (ws) {
 
-            return false;
 
-        }
 
-        ws = new WebSocket("{{.}}");
 
-        ws.onopen = function(evt) {
 
-            print("OPEN");
 
-        }
 
-        ws.onclose = function(evt) {
 
-            print("CLOSE");
 
-            ws = null;
 
-        }
 
-        ws.onmessage = function(evt) {
 
-            print("RESPONSE: " + evt.data);
 
-        }
 
-        ws.onerror = function(evt) {
 
-            print("ERROR: " + evt.data);
 
-        }
 
-        return false;
 
-    };
 
-
 
-    document.getElementById("send").onclick = function(evt) {
 
-        if (!ws) {
 
-            return false;
 
-        }
 
-        print("SEND: " + input.value);
 
-        ws.send(input.value);
 
-        return false;
 
-    };
 
-
 
-    document.getElementById("close").onclick = function(evt) {
 
-        if (!ws) {
 
-            return false;
 
-        }
 
-        ws.close();
 
-        return false;
 
-    };
 
-
 
-});
 
-</script>
 
-</head>
 
-<body>
 
-<table>
 
-<tr><td valign="top" width="50%">
 
-<p>Click "Open" to create a connection to the server, 
-"Send" to send a message to the server and "Close" to close the connection. 
-You can change the message and send multiple times.
 
-<p>
 
-<form>
 
-<button id="open">Open</button>
 
-<button id="close">Close</button>
 
-<p><input id="input" type="text" value="Hello world!">
 
-<button id="send">Send</button>
 
-</form>
 
-</td><td valign="top" width="50%">
 
-<div id="output" style="max-height: 70vh;overflow-y: scroll;"></div>
 
-</td></tr></table>
 
-</body>
 
-</html>
 
-`))

+ 1 - 0
line.go
View File 

@@ -298,6 +298,7 @@ func NewConnect(
 
 		cf:      cf,
 
 		cf:      cf,
 
 		channel: channel,
 
 		channel: channel,
 
 		hub:     hub,
 
 		hub:     hub,
 
+		pingID:  uint16(time.Now().UnixNano()) % config.ID_MAX,
 
 
 
 		sendRequest:  make(chan *RequestData, 32),
 
 		sendRequest:  make(chan *RequestData, 32),
 
 		sendResponse: make(chan *ResponseData, 32),
 
 		sendResponse: make(chan *ResponseData, 32),