liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

mix some

Browse Source
This commit is contained in:
shaoying 2020-02-21 00:30:32 +08:00
parent d640c1c4d6
commit d21932843d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
base/web/web.go
View File

@ -96,9 +96,16 @@ func (web *Frame) HandleWSS(m *ice.Message, safe bool, c *websocket.Conn, name s
return true return true
} }
} else if s, ok := msg.Confv(ice.WEB_SPACE, kit.Keys("hash", target[0], "socket")).(*websocket.Conn); ok { } else if msg.Richs(ice.WEB_SPACE, nil, target[0], func(key string, value map[string]interface{}) {
// 转发报文 msg.Info("what --- ")
if s, ok := value["socket"].(*websocket.Conn); ok {
socket, source, target = s, source, target[1:] socket, source, target = s, source, target[1:]
msg.Info("what --- %v %v", source, target)
} else {
socket, source, target = s, source, target[1:]
}
}) != nil {
// 转发报文
msg.Info("space route") msg.Info("space route")
} else if call, ok := web.send[msg.Option(ice.MSG_TARGET)]; len(target) == 1 && ok { } else if call, ok := web.send[msg.Option(ice.MSG_TARGET)]; len(target) == 1 && ok {
@ -740,7 +747,10 @@ var Index = &ice.Context{Name: "web", Help: "网络模块",
if s, _, e := websocket.NewClient(s, u, nil, m.Confi(ice.WEB_SPACE, "meta.buffer.r"), m.Confi(ice.WEB_SPACE, "meta.buffer.w")); !m.Warn(e != nil, "%s", e) { if s, _, e := websocket.NewClient(s, u, nil, m.Confi(ice.WEB_SPACE, "meta.buffer.r"), m.Confi(ice.WEB_SPACE, "meta.buffer.w")); !m.Warn(e != nil, "%s", e) {
// 连接成功 // 连接成功
m.Rich(ice.WEB_SPACE, nil, kit.Dict(kit.MDB_TYPE, ice.WEB_MASTER, kit.MDB_NAME, dev, "user", kit.Value(value, "client.hostname"))) m.Rich(ice.WEB_SPACE, nil, kit.Dict(
kit.MDB_TYPE, ice.WEB_MASTER, kit.MDB_NAME, dev, "user", kit.Value(value, "client.hostname"),
"socket", s,
))
m.Log(ice.LOG_CMDS, "%d conn %s success %s", i, dev, u) m.Log(ice.LOG_CMDS, "%d conn %s success %s", i, dev, u)
if i = 0; web.HandleWSS(m, true, s, dev) { if i = 0; web.HandleWSS(m, true, s, dev) {
break break