From c3f37f626bdaad77c03daf07d5cf27a5527db99c Mon Sep 17 00:00:00 2001 From: shy Date: Thu, 27 Feb 2025 16:27:42 +0800 Subject: [PATCH] add some --- base/web/dream.go | 7 ++++++- base/web/store.go | 38 +++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/base/web/dream.go b/base/web/dream.go index 4e6323c0..8043e1ec 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -82,11 +82,16 @@ func _dream_list_more(m *ice.Message) *ice.Message { kit.If(m.IsDebug(), func() { button = append(button, VIMER, STATUS, COMPILE, cli.RUNTIME, XTERM) }) switch value[mdb.TYPE] { case ORIGIN: + if m.IsCliUA() { + return + } value[mdb.TEXT] = kit.JoinLine(value[nfs.MODULE], value[mdb.TEXT]) button = append(button, GETTOKEN, OPEN) kit.If(value[aaa.ACCESS] == "", func() { button = []ice.Any{PORTAL, OPEN} }) case SERVER: - value[mdb.TEXT] = kit.JoinLine(value[nfs.MODULE], value[mdb.TEXT]) + if !m.IsCliUA() { + value[mdb.TEXT] = kit.JoinLine(value[nfs.MODULE], value[mdb.TEXT]) + } button = append(button, SETTOKEN, OPEN) case aaa.LOGIN: value[mdb.TEXT] = kit.JoinWord(value[AGENT], value[cli.SYSTEM], value[aaa.IP], kit.Format(PublicIP(m, value[aaa.IP]))) diff --git a/base/web/store.go b/base/web/store.go index 9c9e1578..c836c317 100644 --- a/base/web/store.go +++ b/base/web/store.go @@ -37,6 +37,10 @@ func init() { mdb.REMOVE: {Hand: func(m *ice.Message, arg ...string) { m.Cmd(SPIDE, mdb.REMOVE, CLIENT_NAME, m.Option(mdb.NAME)) }}, + tcp.DIAL: {Hand: func(m *ice.Message, arg ...string) { + m.Options(m.Cmd(SPIDE, m.Option(mdb.NAME)).AppendSimple()) + m.Cmdy(SPIDE, mdb.DEV_REQUEST) + }}, INSTALL: {Name: "install name*", Hand: func(m *ice.Message, arg ...string) { if !kit.HasPrefixList(arg, ctx.RUN) { m.Cmdy(DREAM, mdb.CREATE, m.OptionSimple(mdb.NAME, nfs.REPOS, nfs.BINARY)) @@ -47,12 +51,6 @@ func init() { PORTAL: {Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) { ProcessIframe(m, m.Option(mdb.NAME), m.Option(ORIGIN)+S(m.Option(mdb.NAME))+C(m.ActionKey()), arg...) }}, - DESKTOP: {Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) { - ProcessIframe(m, kit.Keys(m.Option(mdb.NAME), m.ActionKey()), S(m.Option(mdb.NAME))+C(m.ActionKey()), arg...) - }}, - ADMIN: {Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) { - ProcessIframe(m, kit.Keys(m.Option(mdb.NAME), m.ActionKey()), S(m.Option(mdb.NAME))+C(m.ActionKey()), arg...) - }}, OPEN: {Hand: func(m *ice.Message, arg ...string) { if m.Option(mdb.TYPE) == ORIGIN { m.ProcessOpen(m.Option(ORIGIN)) @@ -60,10 +58,6 @@ func init() { m.ProcessOpen(S(m.Option(mdb.NAME))) } }}, - "connect": {Help: "连接", Hand: func(m *ice.Message, arg ...string) { - m.Options(m.Cmd(SPIDE, m.Option(mdb.NAME)).AppendSimple()) - m.Cmdy(SPIDE, mdb.DEV_REQUEST) - }}, }, ctx.ConfAction(CLIENT_TIMEOUT, cli.TIME_3s), DREAM), Hand: func(m *ice.Message, arg ...string) { if kit.HasPrefixList(arg, ctx.ACTION) { m.Cmdy(DREAM, arg) @@ -71,9 +65,8 @@ func init() { list := m.Spawn(ice.Maps{ice.MSG_FIELDS: ""}).CmdMap(SPACE, mdb.NAME) m.Cmd(SPIDE, arg, kit.Dict(ice.MSG_FIELDS, "time,icons,client.type,client.name,client.origin")).Table(func(value ice.Maps) { kit.If(value[CLIENT_TYPE] == nfs.REPOS && value[CLIENT_NAME] != ice.SHY, func() { - kit.If(value[CLIENT_NAME] == ice.OPS, func() { value[CLIENT_ORIGIN] = UserHost(m) }) - m.Push(mdb.TYPE, ORIGIN) - m.Push(mdb.NAME, value[CLIENT_NAME]).Push(mdb.ICONS, value[mdb.ICONS]).Push(ORIGIN, value[CLIENT_ORIGIN]) + // kit.If(value[CLIENT_NAME] == ice.OPS, func() { value[CLIENT_ORIGIN] = UserHost(m) }) + m.Push(mdb.TYPE, ORIGIN).Push(mdb.NAME, value[CLIENT_NAME]).Push(mdb.ICONS, value[mdb.ICONS]).Push(ORIGIN, value[CLIENT_ORIGIN]) if _, ok := list[value[CLIENT_NAME]]; ok || kit.IsIn(value[CLIENT_NAME], ice.OPS, ice.DEV) { m.Push(mdb.STATUS, ice.TRUE) } else { @@ -81,11 +74,10 @@ func init() { } }) }) - m.SortStrR(mdb.NAME) - if ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) { + if m.SortStrR(mdb.NAME); ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) { m.Action() } else { - m.PushAction(OPEN, "connect", mdb.REMOVE).Action(mdb.CREATE) + m.PushAction(OPEN, tcp.DIAL, mdb.REMOVE).Action(mdb.CREATE) } } else { defer ToastProcess(m, ice.LIST, arg[0])() @@ -102,14 +94,17 @@ func init() { // } else { // origin = tcp.PublishLocalhost(m, origin) // } - origin = tcp.PublishLocalhost(m, origin) + // origin = tcp.PublishLocalhost(m, origin) stat := map[string]int{} list := m.Spawn(ice.Maps{ice.MSG_FIELDS: ""}).CmdMap(SPACE, mdb.NAME) m.SetAppend().Spawn().SplitIndex(m.Cmdx(SPIDE, arg[0], dream, kit.Dict(mdb.ConfigSimple(m, CLIENT_TIMEOUT)))).Table(func(value ice.Maps) { + if value[mdb.TYPE] == ORIGIN { + return + } stat[value[mdb.TYPE]]++ - // if value[nfs.BINARY] == "" { - value[nfs.BINARY] = origin + S(value[mdb.NAME]) - // } + if value[nfs.BINARY] == "" { + value[nfs.BINARY] = origin + S(value[mdb.NAME]) + } m.Push("", value, kit.Split("time,type,name,icons,repos,binary,module,version")) if _, ok := list[value[mdb.NAME]]; ok { m.Push(mdb.STATUS, ice.TRUE) @@ -117,7 +112,8 @@ func init() { m.Push(mdb.STATUS, ice.FALSE) } if value[mdb.TYPE] == SERVER { - m.Push(mdb.TEXT, value[mdb.TEXT]).Push(ORIGIN, value[mdb.TEXT]).PushButton() + m.Push(mdb.TEXT, value[nfs.REPOS]).Push(ORIGIN, origin).PushButton() + // m.Push(mdb.TEXT, value[mdb.TEXT]).Push(ORIGIN, value[mdb.TEXT]).PushButton() return } m.Push(mdb.TEXT, value[nfs.REPOS]).Push(ORIGIN, origin)