b612/notify
1
0
Fork 0
Code Issues Pull Requests Projects Releases 7 Wiki Activity

update

Browse Source
This commit is contained in:
兔子 2020-02-11 10:50:11 +08:00
parent dc7e6db1a0
commit f30d42e130
2 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
client.go
View File

@ -1,6 +1,7 @@
package notify package notify
import ( import (
"context"
"net" "net"
"strings" "strings"
"time" "time"
@ -13,14 +14,14 @@ type StarNotifyC struct {
Connc net.Conn Connc net.Conn
clientSign map[string]chan string clientSign map[string]chan string
// FuncLists 当不使用channel时，使用此记录调用函数 // FuncLists 当不使用channel时，使用此记录调用函数
FuncLists map[string]func(CMsg) FuncLists map[string]func(CMsg)
clientStopSign chan int stopSign context.Context
defaultFunc func(CMsg) cancel context.CancelFunc
defaultFunc func(CMsg)
// Stop 停止信 号 // Stop 停止信 号
Stop chan int Stop chan int
// UseChannel 是否使用channel作为信息传递 // UseChannel 是否使用channel作为信息传递
UseChannel bool UseChannel bool
notifychan chan int
isUDP bool isUDP bool
// Queue 是用来处理收发信息的简单消息队列 // Queue 是用来处理收发信息的简单消息队列
Queue *starainrt.StarQueue Queue *starainrt.StarQueue
@ -35,12 +36,14 @@ type CMsg struct {
} }
func (star *StarNotifyC) starinitc() { func (star *StarNotifyC) starinitc() {
star.stopSign, star.cancel = context.WithCancel(context.Background())
star.Queue = starainrt.NewQueue() star.Queue = starainrt.NewQueue()
star.FuncLists = make(map[string]func(CMsg)) star.FuncLists = make(map[string]func(CMsg))
star.UseChannel = true star.UseChannel = true
star.clientStopSign, star.notifychan, star.Stop = make(chan int, 1), make(chan int, 3), make(chan int, 5) star.Stop = make(chan int, 5)
star.clientSign = make(map[string]chan string) star.clientSign = make(map[string]chan string)
star.Online = false star.Online = false
star.Queue.RestoreDuration(time.Second * 2)
} }
// Notify 用于获取一个通知 // Notify 用于获取一个通知
@ -77,10 +80,8 @@ func NewNotifyC(netype, value string) (*StarNotifyC, error) {
} }
go star.cnotify() go star.cnotify()
go func() { go func() {
<-star.clientStopSign <-star.stopSign.Done()
star.notifychan <- 2
star.Connc.Close() star.Connc.Close()
star.Stop <- 0
star.Online = false star.Online = false
return return
}() }()
@ -93,8 +94,7 @@ func NewNotifyC(netype, value string) (*StarNotifyC, error) {
} }
if err != nil { if err != nil {
star.Connc.Close() star.Connc.Close()
star.Stop <- 1 star.ClientStop()
star.notifychan <- 3
//star, _ = NewNotifyC(netype, value) //star, _ = NewNotifyC(netype, value)
star.Online = false star.Online = false
return return
@ -107,20 +107,20 @@ func NewNotifyC(netype, value string) (*StarNotifyC, error) {
// Send 用于向Server端发送数据 // Send 用于向Server端发送数据
func (star *StarNotifyC) Send(name string) error { func (star *StarNotifyC) Send(name string) error {
_, err := star.Connc.Write(star.Queue.BuildMessage(name)) _, err := star.Connc.Write(star.Queue.BuildMessage([]byte(name)))
return err return err
} }
// SendValue 用于向Server端发送key-value类型数据 // SendValue 用于向Server端发送key-value类型数据
func (star *StarNotifyC) SendValue(name, value string) error { func (star *StarNotifyC) SendValue(name, value string) error {
_, err := star.Connc.Write(star.Queue.BuildMessage(name + "||" + value)) _, err := star.Connc.Write(star.Queue.BuildMessage([]byte(name + "||" + value)))
return err return err
} }
func (star *StarNotifyC) cnotify() { func (star *StarNotifyC) cnotify() {
for { for {
select { select {
case <-star.notifychan: case <-star.stopSign.Done():
return return
default: default:
} }
@ -129,12 +129,12 @@ func (star *StarNotifyC) cnotify() {
time.Sleep(time.Millisecond * 20) time.Sleep(time.Millisecond * 20)
continue continue
} }
if data.Msg == "b612ryzstop" { if string(data.Msg) == "b612ryzstop" {
star.clientStopSign <- 0 star.ClientStop()
star.Online = false star.Online = false
return return
} }
strs := strings.SplitN(data.Msg, "||", 2) strs := strings.SplitN(string(data.Msg), "||", 2)
if len(strs) < 2 { if len(strs) < 2 {
continue continue
} }
@ -158,7 +158,8 @@ func (star *StarNotifyC) ClientStop() {
if star.isUDP { if star.isUDP {
star.Send("b612ryzstop") star.Send("b612ryzstop")
} }
star.clientStopSign <- 1 star.cancel()
star.Stop <- 1
} }
// SetNotify 用于设置关键词的调用函数 // SetNotify 用于设置关键词的调用函数

44
server.go
View File

@ -2,6 +2,7 @@
package notify package notify
import ( import (
"context"
"net" "net"
"strings" "strings"
"time" "time"
@ -20,13 +21,13 @@ type StarNotifyS struct {
// Queue 是用来处理收发信息的简单消息队列 // Queue 是用来处理收发信息的简单消息队列
Queue *starainrt.StarQueue Queue *starainrt.StarQueue
// FuncLists 记录了被通知项所记录的函数 // FuncLists 记录了被通知项所记录的函数
FuncLists map[string]func(SMsg) string FuncLists map[string]func(SMsg) string
defaultFunc func(SMsg) string defaultFunc func(SMsg) string
serverStopSign chan int stopSign context.Context
notifychan chan int cancel context.CancelFunc
connPool map[string]net.Conn connPool map[string]net.Conn
udpPool map[string]*net.UDPAddr udpPool map[string]*net.UDPAddr
isUDP bool isUDP bool
// UDPConn UDP监听 // UDPConn UDP监听
UDPConn *net.UDPConn UDPConn *net.UDPConn
// Online 当前链接是否处于活跃状态 // Online 当前链接是否处于活跃状态
@ -53,9 +54,9 @@ type SMsg struct {
func (nmsg *SMsg) Reply(msg string) error { func (nmsg *SMsg) Reply(msg string) error {
var err error var err error
if nmsg.uconn == nil { if nmsg.uconn == nil {
_, err = nmsg.Conn.Write(builder.BuildMessage(nmsg.Key + "||" + msg)) _, err = nmsg.Conn.Write(builder.BuildMessage([]byte(nmsg.Key + "||" + msg)))
} else { } else {
_, err = nmsg.uconn.WriteToUDP(builder.BuildMessage(nmsg.Key+"||"+msg), nmsg.UDP) _, err = nmsg.uconn.WriteToUDP(builder.BuildMessage([]byte(nmsg.Key+"||"+msg)), nmsg.UDP)
} }
return err return err
} }
@ -64,20 +65,21 @@ func (nmsg *SMsg) Reply(msg string) error {
func (nmsg *SMsg) Send(key, value string) error { func (nmsg *SMsg) Send(key, value string) error {
var err error var err error
if nmsg.uconn == nil { if nmsg.uconn == nil {
_, err = nmsg.Conn.Write(builder.BuildMessage(key + "||" + value)) _, err = nmsg.Conn.Write(builder.BuildMessage([]byte(key + "||" + value)))
} else { } else {
_, err = nmsg.uconn.WriteToUDP(builder.BuildMessage(key+"||"+value), nmsg.UDP) _, err = nmsg.uconn.WriteToUDP(builder.BuildMessage([]byte(key+"||"+value)), nmsg.UDP)
} }
return err return err
} }
func (star *StarNotifyS) starinits() { func (star *StarNotifyS) starinits() {
star.serverStopSign, star.notifychan = make(chan int, 1), make(chan int, 5) star.stopSign, star.cancel = context.WithCancel(context.Background())
star.Queue = starainrt.NewQueue() star.Queue = starainrt.NewQueue()
star.udpPool = make(map[string]*net.UDPAddr) star.udpPool = make(map[string]*net.UDPAddr)
star.FuncLists = make(map[string]func(SMsg) string) star.FuncLists = make(map[string]func(SMsg) string)
star.connPool = make(map[string]net.Conn) star.connPool = make(map[string]net.Conn)
star.Online = false star.Online = false
star.Queue.RestoreDuration(time.Second * 2)
} }
// NewNotifyS 开启一个新的Server端通知 // NewNotifyS 开启一个新的Server端通知
@ -102,11 +104,9 @@ func doudps(netype, value string) (*StarNotifyS, error) {
} }
go star.notify() go star.notify()
go func() { go func() {
<-star.serverStopSign <-star.stopSign.Done()
star.notifychan <- 1
star.notifychan <- 2
for k, v := range star.udpPool { for k, v := range star.udpPool {
star.UDPConn.WriteToUDP(star.Queue.BuildMessage("b612ryzstop"), v) star.UDPConn.WriteToUDP(star.Queue.BuildMessage([]byte("b612ryzstop")), v)
delete(star.connPool, k) delete(star.connPool, k)
} }
star.UDPConn.Close() star.UDPConn.Close()
@ -140,9 +140,7 @@ func notudps(netype, value string) (*StarNotifyS, error) {
} }
go star.notify() go star.notify()
go func() { go func() {
<-star.serverStopSign <-star.stopSign.Done()
star.notifychan <- 3
star.notifychan <- 4
for k, v := range star.connPool { for k, v := range star.connPool {
v.Close() v.Close()
delete(star.connPool, k) delete(star.connPool, k)
@ -156,7 +154,7 @@ func notudps(netype, value string) (*StarNotifyS, error) {
conn, err := listener.Accept() conn, err := listener.Accept()
if err != nil { if err != nil {
select { select {
case <-star.notifychan: case <-star.stopSign.Done():
listener.Close() listener.Close()
return return
default: default:
@ -206,7 +204,7 @@ func (star *StarNotifyS) SetDefaultNotify(name string, data func(SMsg) string) {
func (star *StarNotifyS) notify() { func (star *StarNotifyS) notify() {
for { for {
select { select {
case <-star.notifychan: case <-star.stopSign.Done():
return return
default: default:
} }
@ -215,7 +213,7 @@ func (star *StarNotifyS) notify() {
time.Sleep(time.Millisecond * 20) time.Sleep(time.Millisecond * 20)
continue continue
} }
key, value := analyseData(data.Msg) key, value := analyseData(string(data.Msg))
var rmsg SMsg var rmsg SMsg
if !star.isUDP { if !star.isUDP {
rmsg = SMsg{data.Conn.(net.Conn), key, value, nil, nil} rmsg = SMsg{data.Conn.(net.Conn), key, value, nil, nil}
@ -256,5 +254,5 @@ func analyseData(msg string) (key, value string) {
// ServerStop 用于终止Server端运行 // ServerStop 用于终止Server端运行
func (star *StarNotifyS) ServerStop() { func (star *StarNotifyS) ServerStop() {
star.serverStopSign <- 0 star.cancel()
} }