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

opt some

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2023-12-25 13:43:33 +08:00
parent b122d1021c
commit 7e958b03fb
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/web/spide.go
View File

@ -364,9 +364,9 @@ func init() {
func HostPort(m *ice.Message, host, port string) string { func HostPort(m *ice.Message, host, port string) string {
kit.If(host == "", func() { host = kit.ParseURL(UserHost(m)).Hostname() }) kit.If(host == "", func() { host = kit.ParseURL(UserHost(m)).Hostname() })
if port == "443" { if port == tcp.PORT_443 {
return kit.Format("https://%s", host) return kit.Format("https://%s", host)
} else if port == "80" || port == "" { } else if port == tcp.PORT_80 || port == "" {
return kit.Format("http://%s", host) return kit.Format("http://%s", host)
} else { } else {
return kit.Format("http://%s:%s", host, port) return kit.Format("http://%s:%s", host, port)

39
misc/ssh/relay/relay.go
View File

@ -27,6 +27,7 @@ const (
RELAY = "relay" RELAY = "relay"
SSH_RELAY = "ssh.relay" SSH_RELAY = "ssh.relay"
SRC_RELAY_GO = "src/relay.go" SRC_RELAY_GO = "src/relay.go"
CONTEXTS = "contexts/"
INSTALL_SH = "install.sh" INSTALL_SH = "install.sh"
UPGRADE_SH = "upgrade.sh" UPGRADE_SH = "upgrade.sh"
@ -153,7 +154,7 @@ func (s relay) Stats(m *ice.Message) {
}) })
return nil return nil
}).ProcessInner() }).ProcessInner()
s.ForEach(m.Spawn(ice.Maps{MACHINE: machine, ice.CMD: kit.JoinWord("contexts/"+ice.BIN_ICE_BIN, web.ADMIN, cli.RUNTIME)})).Table(func(value ice.Maps) { s.ForEach(m.Spawn(ice.Maps{MACHINE: machine, ice.CMD: s.admins(m, cli.RUNTIME)})).Table(func(value ice.Maps) {
res := kit.UnMarshal(value[ice.RES]) res := kit.UnMarshal(value[ice.RES])
data := kit.Value(res, cli.MAKE) data := kit.Value(res, cli.MAKE)
s.Modify(m, kit.Simple(MACHINE, value[MACHINE], kit.Dict( s.Modify(m, kit.Simple(MACHINE, value[MACHINE], kit.Dict(
@ -166,25 +167,29 @@ func (s relay) Stats(m *ice.Message) {
}) })
} }
func (s relay) Dream(m *ice.Message) { func (s relay) Dream(m *ice.Message) {
fields := "time,machine,host,space,type,status,module,version,commit,compile,boot,link"
s.foreach(m, func(msg *ice.Message, cmd []string) { s.foreach(m, func(msg *ice.Message, cmd []string) {
ssh.CombinedOutput(msg.Message, "contexts/bin/ice.bin web.admin web.route", func(res string) { m.Push("", kit.Dict(msg.OptionSimple(fields), mdb.TYPE, web.SERVER, mdb.STATUS, web.ONLINE, web.SPACE, ice.CONTEXTS, web.LINK, web.HostPort(m.Message, msg.Option(tcp.HOST), msg.Option(web.PORTAL))), kit.Split(fields))
ssh.CombinedOutput(msg.Message, s.admins(m, web.ROUTE), func(res string) {
_msg := m.Spawn().SplitIndex(res) _msg := m.Spawn().SplitIndex(res)
_msg.Table(func(value ice.Maps) { m.Copy(_msg.Table(func(value ice.Maps) {
_msg.Push(MACHINE, msg.Option(MACHINE)).Push(tcp.HOST, msg.Option(tcp.HOST)) switch _msg.Push(MACHINE, msg.Option(MACHINE)).Push(tcp.HOST, msg.Option(tcp.HOST)); msg.Option(web.PORTAL) {
switch msg.Option(web.PORTAL) {
case "": case "":
_msg.Push(web.LINK, "") _msg.Push(web.LINK, "")
case tcp.PORT_443:
_msg.Push(web.LINK, kit.Format("https://%s/chat/pod/%s", msg.Option(tcp.HOST), value[web.SPACE]))
case tcp.PORT_80:
_msg.Push(web.LINK, kit.Format("http://%s/chat/pod/%s", msg.Option(tcp.HOST), value[web.SPACE]))
default: default:
_msg.Push(web.LINK, kit.Format("http://%s:%s/chat/pod/%s", msg.Option(tcp.HOST), msg.Option(web.PORTAL), value[web.SPACE])) _msg.Push(web.LINK, kit.Format("%s/chat/pod/%s", web.HostPort(m.Message, msg.Option(tcp.HOST), msg.Option(web.PORTAL)), value[web.SPACE]))
} }
}) }).Cut(fields))
m.Copy(_msg.Cut("time,machine,host,space,type,status,module,version,link"))
}) })
}) })
m.Options(ice.MSG_PROCESS, "")
if m.Action(s.Dream, "filter:text"); tcp.IsLocalHost(m.Message, m.Option(ice.MSG_USERIP)) {
_msg := m.Spawn().SplitIndex(m.Cmdx(cli.SYSTEM, kit.Split(s.admin(m, web.ROUTE))))
m.Copy(_msg.Table(func(value ice.Maps) {
_msg.Push(MACHINE, tcp.LOCALHOST).Push(tcp.HOST, tcp.PublishLocalhost(m.Message, tcp.LOCALHOST))
_msg.Push(web.LINK, kit.Format("%s/chat/pod/%s", web.UserHost(m.Message), value[web.SPACE]))
}).Cut(fields))
}
} }
func (s relay) ForEach(m *ice.Message, arg ...string) *ice.Message { func (s relay) ForEach(m *ice.Message, arg ...string) *ice.Message {
s.foreach(m, func(msg *ice.Message, cmd []string) { s.foreach(m, func(msg *ice.Message, cmd []string) {
@ -275,13 +280,13 @@ func (s relay) Pushbin(m *ice.Message, arg ...string) {
case "i686", "386": case "i686", "386":
p = "ice.linux.386" p = "ice.linux.386"
} }
m.Options(nfs.FROM, ice.USR_PUBLISH+p, nfs.PATH, "contexts/", nfs.FILE, ice.BIN_ICE_BIN) m.Options(nfs.FROM, ice.USR_PUBLISH+p, nfs.PATH, CONTEXTS, nfs.FILE, ice.BIN_ICE_BIN)
m.Cmd(SSH_TRANS, tcp.SEND) m.Cmd(SSH_TRANS, tcp.SEND)
} }
s.shell(m, m.Template(PUSHBIN_SH), arg...) s.shell(m, m.Template(PUSHBIN_SH), arg...)
} }
func (s relay) AdminCmd(m *ice.Message, arg ...string) { func (s relay) AdminCmd(m *ice.Message, arg ...string) {
s.shell(m, kit.JoinWord("contexts/"+ice.BIN_ICE_BIN, web.ADMIN, m.Option(ice.CMD)), arg...) s.shell(m, s.admins(m, m.Option(ice.CMD)), arg...)
} }
func (s relay) Xterm(m *ice.Message, arg ...string) { s.Code.Xterm(m, m.Option(MACHINE), arg...) } func (s relay) Xterm(m *ice.Message, arg ...string) { s.Code.Xterm(m, m.Option(MACHINE), arg...) }
@ -330,3 +335,9 @@ func (s relay) iframeCmd(m *ice.Message, cmd string, arg ...string) {
m.ProcessOpen(p) m.ProcessOpen(p)
} }
} }
func (s relay) admin(m *ice.Message, arg ...string) string {
return kit.JoinWord(kit.Simple(ice.BIN_ICE_BIN, web.ADMIN, arg)...)
}
func (s relay) admins(m *ice.Message, arg ...string) string {
return CONTEXTS + s.admin(m, arg...)
}