From 4eea30cc6e46b1a1dc61a4c311c34f3d6787dc22 Mon Sep 17 00:00:00 2001 From: shy Date: Tue, 30 Jan 2024 18:32:47 +0800 Subject: [PATCH] add some --- base/web/broad.go | 4 ++-- base/web/dream.go | 6 +++--- base/web/serve.go | 9 ++++----- base/web/spide.go | 16 +++++++++------- base/web/store.go | 2 +- base/web/store.js | 3 ++- core/chat/header.go | 3 +++ misc/misc.go | 2 +- 8 files changed, 25 insertions(+), 20 deletions(-) diff --git a/base/web/broad.go b/base/web/broad.go index 59ebb9ef..22d1a83f 100644 --- a/base/web/broad.go +++ b/base/web/broad.go @@ -24,7 +24,7 @@ func _broad_send(m *ice.Message, to_host, to_port string, host, port string, arg func _broad_serve(m *ice.Message) { m.GoSleep300ms(func() { m.Cmd(tcp.HOST, func(value ice.Maps) { - _broad_send(m, "", "", value[aaa.IP], m.Option(tcp.PORT), kit.Simple(gdb.EVENT, tcp.LISTEN, mdb.NAME, ice.Info.Hostname, mdb.TYPE, ice.Info.NodeType, mdb.TIME, m.Time(), cli.SimpleMake())...) + _broad_send(m, "", "", value[aaa.IP], m.Option(tcp.PORT), kit.Simple(gdb.EVENT, tcp.LISTEN, mdb.NAME, ice.Info.NodeName, mdb.TYPE, ice.Info.NodeType, mdb.TIME, m.Time(), cli.SimpleMake())...) }) }) m.Cmd(tcp.SERVER, tcp.LISTEN, mdb.TYPE, tcp.UDP4, mdb.NAME, logs.FileLine(1), m.OptionSimple(tcp.HOST, tcp.PORT), func(from *net.UDPAddr, buf []byte) { @@ -60,7 +60,7 @@ func init() { ADMIN: {Hand: func(m *ice.Message, arg ...string) { broadOpen(m) }}, DREAM: {Hand: func(m *ice.Message, arg ...string) { broadOpen(m) }}, VIMER: {Hand: func(m *ice.Message, arg ...string) { broadOpen(m) }}, - SPIDE: {Name: "spide name type=repos", Hand: func(m *ice.Message, arg ...string) { + SPIDE: {Name: "spide name type=repos", Icon: "bi bi-house-add", Hand: func(m *ice.Message, arg ...string) { m.Cmd(SPIDE, mdb.CREATE, m.OptionSimple(mdb.NAME), ORIGIN, "http://"+m.Option(mdb.NAME)+":"+m.Option(tcp.PORT)) }}, diff --git a/base/web/dream.go b/base/web/dream.go index f0096364..8a2e421f 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -405,9 +405,6 @@ func init() { mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,icon,repos,binary,template,restart", ctx.TOOLS, kit.Simple(STORE, SPIDE, ROUTE), html.BUTTON, kit.JoinWord(PORTAL, ADMIN, DESKTOP, WIKI_WORD, STATUS, VIMER, XTERM, COMPILE), )), Hand: func(m *ice.Message, arg ...string) { - if ice.Info.NodeType == WORKER { - return - } if len(arg) == 0 { _dream_list(m).RewriteAppend(func(value, key string, index int) string { if key == mdb.ICON { @@ -429,6 +426,9 @@ func init() { kit.If(stat[cli.START] == stat[WORKER], func() { delete(stat, cli.START) }) m.Sort("type,status,name", []string{aaa.LOGIN, WORKER, SERVER, MASTER}, []string{cli.START, cli.STOP, cli.BEGIN}, ice.STR_R).StatusTimeCount(stat) ctx.DisplayTableCard(m) + if ice.Info.NodeType == WORKER { + return + } kit.If(cli.SystemFind(m, "go"), func() { m.Action(html.FILTER, mdb.CREATE, STARTALL, STOPALL, cli.BUILD, PUBLISH) }, func() { diff --git a/base/web/serve.go b/base/web/serve.go index aa672fb1..cd57812b 100644 --- a/base/web/serve.go +++ b/base/web/serve.go @@ -5,7 +5,6 @@ import ( "net/url" "path" "regexp" - "runtime" "strings" ice "shylinux.com/x/icebergs" @@ -28,12 +27,12 @@ func _serve_address(m *ice.Message) string { return Domain(tcp.LOCALHOST, m.Opti func _serve_start(m *ice.Message) { kit.If(m.Option(aaa.USERNAME), func() { aaa.UserRoot(m, m.Option(aaa.USERNICK), m.Option(aaa.USERNAME)) }) kit.If(m.Option(tcp.PORT) == tcp.RANDOM, func() { m.Option(tcp.PORT, m.Cmdx(tcp.PORT, aaa.RIGHT)) }) - kit.If(runtime.GOOS == cli.WINDOWS || m.Cmdx(cli.SYSTEM, "lsof", "-i", ":"+m.Option(tcp.PORT)) != "", func() { - m.Go(func() { m.Cmd(SPIDE, ice.OPS, _serve_address(m)+"/exit", ice.Maps{CLIENT_TIMEOUT: "30ms"}) }).Sleep300ms() - }) cli.NodeInfo(m, kit.Select(kit.Split(ice.Info.Hostname, ".")[0], m.Option(tcp.NODENAME)), SERVER) - m.Start("", m.OptionSimple(tcp.HOST, tcp.PORT)...) + m.Go(func() { + m.Cmd(SPIDE, ice.OPS, _serve_address(m)+"/exit", ice.Maps{CLIENT_TIMEOUT: "30ms", ice.LOG_DISABLE: ice.TRUE}) + }).Sleep300ms() m.Cmd(nfs.SAVE, ice.VAR_LOG_ICE_PORT, m.Option(tcp.PORT)) + m.Start("", m.OptionSimple(tcp.HOST, tcp.PORT)...) kit.For(kit.Split(m.Option(ice.DEV)), func(dev string) { if m.Cmds(SPIDE, dev).Append(TOKEN) == "" { m.Sleep30ms(SPACE, tcp.DIAL, ice.DEV, dev, mdb.NAME, ice.Info.NodeName, m.OptionSimple(TOKEN)) diff --git a/base/web/spide.go b/base/web/spide.go index 5a99d5d6..8be7552d 100644 --- a/base/web/spide.go +++ b/base/web/spide.go @@ -322,7 +322,7 @@ func init() { m.Cmd("", mdb.CREATE, ice.SHY, kit.Select("https://shylinux.com", conf[cli.CTX_SHY]), nfs.REPOS) m.Cmd("", mdb.CREATE, ice.DEV, dev, nfs.REPOS) m.Cmd("", mdb.CREATE, ice.DEV_IP, kit.Select(dev, os.Getenv("ctx_dev_ip"))) - m.Cmd("", mdb.CREATE, ice.OPS, kit.Select("http://localhost:9020", conf[cli.CTX_OPS]), nfs.REPOS) + m.Cmd("", mdb.CREATE, ice.OPS, kit.Select("http://localhost:9020", conf[cli.CTX_OPS])) m.Cmd("", mdb.CREATE, ice.DEMO, kit.Select("http://localhost:20000", conf[cli.CTX_DEMO])) m.Cmd("", mdb.CREATE, ice.MAIL, kit.Select("https://mail.shylinux.com", conf[cli.CTX_MAIL])) m.Cmd("", mdb.CREATE, nfs.REPOS, kit.Select("https://repos.shylinux.com", conf[cli.CTX_HUB])) @@ -374,7 +374,7 @@ func init() { PROXY: {Name: "proxy url size cache upload", Hand: func(m *ice.Message, arg ...string) { m.Cmdy(SPIDE, ice.DEV, SPIDE_RAW, http.MethodPost, m.Option(URL), SPIDE_PART, arg[2:]) }}, - "disconn": {Help: "断连", Hand: func(m *ice.Message, arg ...string) { + "disconn": {Help: "断连", Icon: "bi bi-person-x", Hand: func(m *ice.Message, arg ...string) { m.Cmd(SPACE, cli.CLOSE, kit.Dict(mdb.NAME, m.Option(CLIENT_NAME))) mdb.HashModify(m, mdb.NAME, m.Option(CLIENT_NAME), TOKEN, "") }}, @@ -388,12 +388,14 @@ func init() { list := m.CmdMap(SPACE, mdb.NAME) mdb.HashSelect(m, kit.Slice(arg, 0, 1)...).Sort("client.type,client.name", []string{nfs.REPOS, ""}) m.Table(func(value ice.Maps) { - if _, ok := list[value[CLIENT_NAME]]; ok { - m.Push(mdb.STATUS, ONLINE) - m.PushButton("disconn", mdb.REMOVE) + if value[CLIENT_TYPE] == nfs.REPOS { + if _, ok := list[value[CLIENT_NAME]]; ok { + m.Push(mdb.STATUS, ONLINE).PushButton("disconn", mdb.REMOVE) + } else { + m.Push(mdb.STATUS, "").PushButton(mdb.DEV_REQUEST, mdb.REMOVE) + } } else { - m.Push(mdb.STATUS, "") - m.PushButton(mdb.DEV_REQUEST, mdb.REMOVE) + m.Push(mdb.STATUS, "").PushButton(mdb.REMOVE) } }) kit.If(len(arg) > 0 && arg[0] != "", func() { m.Action(COOKIE, HEADER) }) diff --git a/base/web/store.go b/base/web/store.go index 6a15c661..618d4f5f 100644 --- a/base/web/store.go +++ b/base/web/store.go @@ -17,7 +17,7 @@ const STORE = "store" func init() { Index.MergeCommands(ice.Commands{ - STORE: {Name: "store list", Help: "系统商店", Role: aaa.VOID, Actions: ice.MergeActions(ice.Actions{ + STORE: {Name: "store refresh", Help: "系统商店", Role: aaa.VOID, Actions: ice.MergeActions(ice.Actions{ mdb.INPUTS: {Hand: func(m *ice.Message, arg ...string) { m.Cmds(SPIDE).Table(func(value ice.Maps) { kit.If(value[CLIENT_TYPE] == nfs.REPOS, func() { m.Push("", value, arg[0]) }) }) }}, diff --git a/base/web/store.js b/base/web/store.js index 55ef9dbd..a484ec30 100644 --- a/base/web/store.js +++ b/base/web/store.js @@ -13,6 +13,7 @@ Volcanos(chat.ONIMPORT, { }), select && select.click() }, layout: function(can) { can.Action(html.FILTER) && can.onmotion.filter(can, can.Action(html.FILTER)) - can.ui.layout(can.ConfHeight(), can.ConfWidth()), can.onlayout.expand(can, can.ui.content, 320) + can.ui.layout(can.ConfHeight(), can.ConfWidth()), can.onlayout.expand(can, can.ui.content) + // can.user.isMobile && can.page.style(can, can.ui.content, html.HEIGHT, "") }, }, [""]) diff --git a/core/chat/header.go b/core/chat/header.go index 755ec448..f6d462a6 100644 --- a/core/chat/header.go +++ b/core/chat/header.go @@ -119,6 +119,9 @@ func init() { } }}, }, web.ApiAction(), mdb.ImportantHashAction(mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,icons,type,link,order,space,index,args")), Hand: func(m *ice.Message, arg ...string) { + if ice.Info.NodeType == web.WORKER { + return + } kit.If(m.Option(ice.MSG_USERPOD), func(p string) { m.Option(ice.MSG_NODETYPE, m.Cmdx(web.SPACE, p, cli.RUNTIME, ice.MSG_NODETYPE)) }) m.Option("language.list", m.Cmd(nfs.DIR, nfs.TemplatePath(m, aaa.LANGUAGE)+nfs.PS, nfs.FILE).Appendv(nfs.FILE)) m.Option("theme.list", m.Cmd(nfs.DIR, nfs.TemplatePath(m, aaa.THEME)+nfs.PS, nfs.FILE).Appendv(nfs.FILE)) diff --git a/misc/misc.go b/misc/misc.go index b8ace34e..2242a3a9 100644 --- a/misc/misc.go +++ b/misc/misc.go @@ -3,6 +3,6 @@ package misc import ( // _ "shylinux.com/x/icebergs/misc/bash" _ "shylinux.com/x/icebergs/misc/git" - _ "shylinux.com/x/icebergs/misc/tmux" + // _ "shylinux.com/x/icebergs/misc/tmux" // _ "shylinux.com/x/icebergs/misc/vim" )