From f31e56cb10c9c13341ffec74ada2c3a205774be0 Mon Sep 17 00:00:00 2001 From: shy Date: Mon, 1 Apr 2024 22:10:42 +0800 Subject: [PATCH] add some --- base/web/space.go | 30 ++++++++++++++---------------- conf.go | 1 + misc/websocket/websocket.go | 2 ++ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/base/web/space.go b/base/web/space.go index a9038e91..751648d4 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -103,9 +103,11 @@ func _space_fork(m *ice.Message) { case SERVER: defer gdb.EventDeferEvent(m, SPACE_OPEN, args)(SPACE_CLOSE, args) m.Go(func() { - m.Cmd(SPACE, name, cli.PWD, name, kit.Dict(mdb.ICONS, mdb.Config(m, mdb.ICONS), + m.Cmd(SPACE, name, cli.PWD, name, kit.Dict( + mdb.ICONS, mdb.Config(m, mdb.ICONS), mdb.TIME, ice.Info.Make.Time, nfs.MODULE, ice.Info.Make.Module, nfs.VERSION, ice.Info.Make.Versions(), - AGENT, "Go-http-client", cli.SYSTEM, runtime.GOOS)) + AGENT, "Go-http-client", cli.SYSTEM, runtime.GOOS, + )) m.Cmd(SPACE).Table(func(value ice.Maps) { if kit.IsIn(value[mdb.TYPE], WORKER) && value[mdb.NAME] != name { m.Cmd(SPACE, value[mdb.NAME], gdb.EVENT, gdb.HAPPEN, gdb.EVENT, OPS_SERVER_OPEN, args, kit.Dict(ice.MSG_USERROLE, aaa.TECH)) @@ -295,6 +297,14 @@ func init() { kit.If(mdb.Config(m, ice.MAIN), func(cmd string) { RenderPodCmd(m, "", cmd) }, func() { RenderMain(m) }) m.Optionv(ice.MSG_ARGS, kit.Simple(m.Optionv(ice.MSG_ARGS))) }}, + ice.INFO: {Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) { + m.Push(mdb.TIME, ice.Info.Make.Time) + m.Push(mdb.NAME, ice.Info.NodeName) + m.Push(mdb.ICONS, kit.Select(mdb.Config(m, mdb.ICONS))) + m.Push(nfs.MODULE, ice.Info.Make.Module) + m.Push(nfs.VERSION, ice.Info.Make.Versions()) + m.Push(ORIGIN, m.Option(ice.MSG_USERHOST)) + }}, mdb.SEARCH: {Hand: func(m *ice.Message, arg ...string) { if mdb.IsSearchPreview(m, arg) { m.Cmds("", func(value ice.Maps) { @@ -338,22 +348,10 @@ func init() { ProcessIframe(m, m.Option(mdb.NAME), m.MergePod(m.Option(mdb.NAME)), arg...) } }}, - "info": {Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) { - m.Push(mdb.TIME, ice.Info.Make.Time) - m.Push(mdb.NAME, ice.Info.NodeName) - m.Push(mdb.ICONS, kit.Select(mdb.Config(m, mdb.ICONS))) - m.Push(nfs.MODULE, ice.Info.Make.Module) - m.Push(nfs.VERSION, ice.Info.Make.Versions()) - m.Push(ORIGIN, m.Option(ice.MSG_USERHOST)) - m.Push("hostport", UserHost(m)) - m.Push("pathname", ice.Info.Pathname) - }}, nfs.PS: {Hand: func(m *ice.Message, arg ...string) { _space_fork(m) }}, - }, gdb.EventsAction(SPACE_LOGIN), mdb.HashAction( - mdb.ICONS, "src/main.ico", - mdb.LIMIT, 1000, mdb.LEAST, 500, + }, gdb.EventsAction(SPACE_LOGIN), mdb.HashAction(mdb.LIMIT, 1000, mdb.LEAST, 500, mdb.SHORT, mdb.NAME, mdb.FIELD, "time,type,name,text,icons,module,version,agent,system,ip,usernick,username,userrole", - ctx.ACTION, OPEN, REDIAL, kit.Dict("a", 1000, "b", 100, "c", 1000), + ctx.ACTION, OPEN, REDIAL, kit.Dict("a", 1000, "b", 100, "c", 1000), mdb.ICONS, ice.SRC_MAIN_ICO, ), mdb.ClearOnExitHashAction()), Hand: func(m *ice.Message, arg ...string) { if len(arg) < 2 { if len(arg) == 1 && strings.Contains(arg[0], nfs.PT) { diff --git a/conf.go b/conf.go index aede53d7..3d9e1321 100644 --- a/conf.go +++ b/conf.go @@ -27,6 +27,7 @@ const ( DEMO = "demo" MAIL = "mail" HELP = "help" + INFO = "info" MAIN = "main" AUTO = "auto" LIST = "list" diff --git a/misc/websocket/websocket.go b/misc/websocket/websocket.go index 0d6a1a62..d459f48a 100644 --- a/misc/websocket/websocket.go +++ b/misc/websocket/websocket.go @@ -1,6 +1,7 @@ package websocket import ( + "crypto/tls" "net" "net/http" "net/url" @@ -26,6 +27,7 @@ func Upgrade(w http.ResponseWriter, r *http.Request) (*Conn, error) { return &Conn{Conn: conn}, e } func NewClient(c net.Conn, u *url.URL) (*Conn, error) { + websocket.DefaultDialer.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} conn, _, e := websocket.NewClient(c, u, nil, bufs, bufs) return &Conn{Conn: conn}, e }