x/icebergs
1
0
Fork 1
mirror of https://shylinux.com/x/icebergs synced 2025-04-25 09:08:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt some

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2024-04-03 00:14:33 +08:00
parent 5735299596
commit 4ea7d66862
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -5,6 +5,6 @@ go 1.13
require (
shylinux.com/x/go-git/v5 v5.6.7
shylinux.com/x/go-qrcode v0.0.3
shylinux.com/x/toolkits v1.0.4
shylinux.com/x/websocket v0.0.3
shylinux.com/x/toolkits v1.0.5
shylinux.com/x/websocket v0.0.4
)

8
go.sum
View File

@ -4,7 +4,7 @@ shylinux.com/x/go-qrcode v0.0.3 h1:RMo+Vidbgq3HatLBj7DDXcTbTLFUwzis5K7TqBkD38U=
shylinux.com/x/go-qrcode v0.0.3/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po=
shylinux.com/x/toolkits v0.7.10 h1:65d5rkQXQ71MD8FzYnZ9DFxb1XcOYSYfmRc4j8qQsUw=
shylinux.com/x/toolkits v0.7.10/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q=
shylinux.com/x/toolkits v1.0.4 h1:lKn+So/Mxt5EXbWF+Xfvhk81P/YqvdIZycl00Hz2sKk=
shylinux.com/x/toolkits v1.0.4/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q=
shylinux.com/x/websocket v0.0.3 h1:edhLwCp0Mv1ITXqIwbVWdXdX2+vui/jRnS25K89k68I=
shylinux.com/x/websocket v0.0.3/go.mod h1:3UGWkjTu3ie5NAZen7J+uLPBrO7DFeKloj6Jxo13Oiw=
shylinux.com/x/toolkits v1.0.5 h1:0siROY35Y3l66BAIv2Pm5josHjAteQE8aklFd1W8edE=
shylinux.com/x/toolkits v1.0.5/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q=
shylinux.com/x/websocket v0.0.4 h1:AJpwblePoOpiE6C8NrvgNYpKTotXMLrDDX2chTvx44Q=
shylinux.com/x/websocket v0.0.4/go.mod h1:3UGWkjTu3ie5NAZen7J+uLPBrO7DFeKloj6Jxo13Oiw=

1
init.go
View File

@ -26,6 +26,7 @@ func (s *Frame) Begin(m *Message, arg ...string) {
func (s *Frame) Start(m *Message, arg ...string) {
m.Cmd(INIT, arg)
kit.For([]string{LOG, GDB, SSH}, func(k string) { m.Sleep30ms().Start(k) })
Info.Important = true
m.Sleep30ms().Cmd(arg)
}
func (s *Frame) Close(m *Message, arg ...string) {

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

@ -81,7 +81,6 @@ type relay struct {
func (s relay) Init(m *ice.Message, arg ...string) {
s.Hash.Init(m, arg...)
return
xterm.AddCommand(RELAY, func(m *icebergs.Message, arg ...string) (xterm.XTerm, error) {
m.Cmd("ssh.connect", tcp.DIAL, mdb.NAME, m.Option(mdb.NAME, arg[1]), arg)
return ssh.NewSession(m, arg[1])
@ -335,13 +334,13 @@ func (s relay) iframe(m *ice.Message, cmd string, arg ...string) {
}
}
func (s relay) shell(m *ice.Message, init string, arg ...string) {
m.ProcessXterm(kit.Keys(m.Option(MACHINE), m.ActionKey()), []string{kit.JoinWord(kit.Simple(
strings.TrimPrefix(os.Args[0], kit.Path("")+nfs.PS), "ssh.connect", tcp.OPEN, ssh.AUTHFILE, "", m.OptionSimple(aaa.USERNAME, tcp.HOST, tcp.PORT),
)...), mdb.TEXT, strings.ReplaceAll(init, lex.NL, "; ")}, arg...)
return
m.ProcessXterm(kit.Keys(m.Option(MACHINE), m.ActionKey()), []string{kit.JoinWord(
RELAY, tcp.HOST, m.Option(tcp.HOST), aaa.USERNAME, m.Option(aaa.USERNAME),
), mdb.TEXT, strings.ReplaceAll(init, lex.NL, "; ")}, arg...)
return
m.ProcessXterm(kit.Keys(m.Option(MACHINE), m.ActionKey()), []string{kit.JoinWord(kit.Simple(
strings.TrimPrefix(os.Args[0], kit.Path("")+nfs.PS), "ssh.connect", tcp.OPEN, ssh.AUTHFILE, "", m.OptionSimple(aaa.USERNAME, tcp.HOST, tcp.PORT),
)...), mdb.TEXT, strings.ReplaceAll(init, lex.NL, "; ")}, arg...)
}
func (s relay) foreachScript(m *ice.Message, script string, arg ...string) {
m.Option(ice.MSG_TITLE, kit.Keys(m.Option(ice.MSG_USERPOD), m.CommandKey(), m.ActionKey()))
@ -350,9 +349,7 @@ func (s relay) foreachScript(m *ice.Message, script string, arg ...string) {
if msg.Option(cli.GO) == "" {
return
}
m.Debug("what %v", msg.Option(web.DREAM))
msg.Option(web.DREAM, path.Base(m.DreamPath(msg.Option(web.DREAM))))
m.Debug("what %v", msg.Option(web.DREAM))
msg.Option(web.LINK, m.HostPort(msg.Option(tcp.HOST), msg.Option(web.PORTAL)))
ssh.PushShell(msg.Message, strings.Split(msg.Template(script), lex.NL), func(res string) {
web.PushNoticeGrow(m.Options(ctx.DISPLAY, html.PLUGIN_XTERM, ice.MSG_COUNT, "0", ice.MSG_DEBUG, ice.FALSE, ice.LOG_DISABLE, ice.TRUE).Message, res)