x/icebergs
1
0
Fork 1
mirror of https://shylinux.com/x/icebergs synced 2025-04-26 17:44:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt some

Browse Source
This commit is contained in:
harveyshao 2022-11-29 23:56:28 +08:00
parent 0f65bdb891
commit 050e796486
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base/web/broad.go
View File

@ -13,13 +13,13 @@ import (
) )
func _broad_addr(m *ice.Message, host, port string) *net.UDPAddr { func _broad_addr(m *ice.Message, host, port string) *net.UDPAddr {
if addr, e := net.ResolveUDPAddr("udp4", kit.Format("%s:%s", host, port)); !m.Warn(e != nil, e, host, port, logs.FileLineMeta(logs.FileLine(2))) { if addr, e := net.ResolveUDPAddr("udp4", kit.Format("%s:%s", host, port)); !m.Warn(e, ice.ErrNotValid, host, port, logs.FileLineMeta(2)) {
return addr return addr
} }
return nil return nil
} }
func _broad_send(m *ice.Message, host, port string, remote_host, remote_port string) { func _broad_send(m *ice.Message, host, port string, remote_host, remote_port string) {
if s, e := net.DialUDP("udp", nil, _broad_addr(m, remote_host, remote_port)); m.Assert(e) { if s, e := net.DialUDP("udp", nil, _broad_addr(m, remote_host, remote_port)); !m.Warn(e, ice.ErrNotValid) {
defer s.Close() defer s.Close()
msg := m.Spawn(kit.Dict(tcp.HOST, host, tcp.PORT, port)) msg := m.Spawn(kit.Dict(tcp.HOST, host, tcp.PORT, port))
m.Logs(mdb.EXPORT, BROAD, msg.FormatMeta(), "to", remote_host+ice.DF+remote_port) m.Logs(mdb.EXPORT, BROAD, msg.FormatMeta(), "to", remote_host+ice.DF+remote_port)
@ -42,7 +42,7 @@ func _broad_serve(m *ice.Message, host, port string) {
if m.Cmd(BROAD, kit.Format("%s,%s", msg.Option(tcp.HOST), msg.Option(tcp.PORT))).Length() > 0 { if m.Cmd(BROAD, kit.Format("%s,%s", msg.Option(tcp.HOST), msg.Option(tcp.PORT))).Length() > 0 {
continue continue
} }
if remote := _broad_addr(m, msg.Option(tcp.HOST), msg.Option(tcp.PORT)); !m.Warn(remote == nil) { if remote := _broad_addr(m, msg.Option(tcp.HOST), msg.Option(tcp.PORT)); remote != nil {
m.Cmd(BROAD, func(value ice.Maps) { m.Cmd(BROAD, func(value ice.Maps) {
m.Logs(mdb.EXPORT, BROAD, kit.Format(value), "to", kit.Format(remote)) m.Logs(mdb.EXPORT, BROAD, kit.Format(value), "to", kit.Format(remote))
s.WriteToUDP([]byte(m.Spawn(value).FormatMeta()), remote) s.WriteToUDP([]byte(m.Spawn(value).FormatMeta()), remote)

7
base/web/space.go
View File

@ -76,8 +76,7 @@ func _space_handle(m *ice.Message, safe bool, name string, conn *websocket.Conn)
}) { }) {
} else if res := getSend(m, next); !m.Warn(res == nil || len(target) != 1, ice.ErrNotFound, next) { } else if res := getSend(m, next); !m.Warn(res == nil || len(target) != 1, ice.ErrNotFound, next) {
res.Cost(kit.Format("[%v]->%v %v %v", next, res.Optionv(ice.MSG_TARGET), res.Detailv(), msg.FormatSize())) res.Cost(kit.Format("[%v]->%v %v %v", next, res.Optionv(ice.MSG_TARGET), res.Detailv(), msg.FormatSize()))
m.Sleep("10ms") back(res, msg.Sleep("10ms")) // 接收响应
back(res, msg) // 接收响应
} }
} }
} }
@ -131,9 +130,7 @@ func _space_send(m *ice.Message, space string, arg ...string) {
_space_echo(m, []string{addSend(m, m)}, target, conn) _space_echo(m, []string{addSend(m, m)}, target, conn)
} }
}), ice.ErrNotFound, space) { }), ice.ErrNotFound, space) {
call(m, m.Config(kit.Keys(TIMEOUT, "c")), func(res *ice.Message) { call(m, m.Config(kit.Keys(TIMEOUT, "c")), func(res *ice.Message) { m.Copy(res) })
m.Copy(res)
})
} }
} }

11
base/web/web.go
View File

@ -44,18 +44,14 @@ func (f *Frame) Start(m *ice.Message, arg ...string) bool {
pf.Handle(route, http.StripPrefix(path.Dir(route), f)) pf.Handle(route, http.StripPrefix(path.Dir(route), f))
list[c] = path.Join(list[p], route) list[c] = path.Join(list[p], route)
} }
m.Confm(SERVE, kit.Keym(nfs.PATH), func(key string, value string) {
msg.Log(ROUTE, "%s <- %s <- %s", c.Name, key, value)
f.Handle(key, http.StripPrefix(key, http.FileServer(http.Dir(value))))
})
for key, cmd := range c.Commands { for key, cmd := range c.Commands {
if key[0] != '/' { if key[:1] != ice.PS {
continue continue
} }
func(key string, cmd *ice.Command) { func(key string, cmd *ice.Command) {
msg.Log(ROUTE, "%s <- %s", c.Name, key) msg.Log(ROUTE, "%s <- %s", c.Name, key)
f.HandleFunc(key, func(w http.ResponseWriter, r *http.Request) { f.HandleFunc(key, func(w http.ResponseWriter, r *http.Request) {
m.TryCatch(m.Spawn(w, r, c, cmd, key), true, func(msg *ice.Message) { _serve_handle(key, cmd, msg, w, r) }) m.TryCatch(m.Spawn(key, cmd, c, w, r), true, func(msg *ice.Message) { _serve_handle(key, cmd, msg, w, r) })
}) })
ice.Info.Route[path.Join(list[c], key)] = ctx.FileURI(cmd.GetFileLines()) ice.Info.Route[path.Join(list[c], key)] = ctx.FileURI(cmd.GetFileLines())
}(key, cmd) }(key, cmd)
@ -67,8 +63,7 @@ func (f *Frame) Start(m *ice.Message, arg ...string) bool {
cb(f) cb(f)
default: default:
m.Cmd(tcp.SERVER, tcp.LISTEN, mdb.TYPE, WEB, m.OptionSimple(mdb.NAME, tcp.HOST, tcp.PORT), func(l net.Listener) { m.Cmd(tcp.SERVER, tcp.LISTEN, mdb.TYPE, WEB, m.OptionSimple(mdb.NAME, tcp.HOST, tcp.PORT), func(l net.Listener) {
mdb.HashCreate(m, m.OptionSimple(mdb.NAME, tcp.PROTO), arg, cli.STATUS, tcp.START) defer mdb.HashCreateDeferRemove(m, m.OptionSimple(mdb.NAME, tcp.PROTO), arg, cli.STATUS, tcp.START)()
defer mdb.HashModify(m, m.OptionSimple(mdb.NAME), cli.STATUS, tcp.STOP)
m.Warn(f.Server.Serve(l)) m.Warn(f.Server.Serve(l))
}) })
} }