diff --git a/base/web/dream.go b/base/web/dream.go index 8a2e421f..4fb0c30e 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -29,10 +29,16 @@ func _dream_list(m *ice.Message) *ice.Message { list := m.CmdMap(SPACE, mdb.NAME) mdb.HashSelect(m).Table(func(value ice.Maps) { if space, ok := list[value[mdb.NAME]]; ok { - msg := gdb.Event(m.Spawn(value, space), DREAM_TABLES).Copy(m.Spawn().PushButton(cli.STOP)) - m.Push(mdb.TYPE, space[mdb.TYPE]).Push(cli.STATUS, cli.START) - m.Push(nfs.MODULE, space[nfs.MODULE]).Push(nfs.VERSION, space[nfs.VERSION]).Push(mdb.TEXT, msg.Append(mdb.TEXT)) - m.PushButton(strings.Join(msg.Appendv(ctx.ACTION), "")) + if m.IsCliUA() { + m.Push(mdb.TYPE, space[mdb.TYPE]).Push(cli.STATUS, cli.START) + m.Push(nfs.MODULE, space[nfs.MODULE]).Push(nfs.VERSION, space[nfs.VERSION]).Push(mdb.TEXT, "") + m.PushButton(cli.STOP) + } else { + msg := gdb.Event(m.Spawn(value, space), DREAM_TABLES).Copy(m.Spawn().PushButton(cli.STOP)) + m.Push(mdb.TYPE, space[mdb.TYPE]).Push(cli.STATUS, cli.START) + m.Push(nfs.MODULE, space[nfs.MODULE]).Push(nfs.VERSION, space[nfs.VERSION]).Push(mdb.TEXT, msg.Append(mdb.TEXT)) + m.PushButton(strings.Join(msg.Appendv(ctx.ACTION), "")) + } } else { if m.Push(mdb.TYPE, WORKER); nfs.Exists(m, path.Join(ice.USR_LOCAL_WORK, value[mdb.NAME])) { m.Push(cli.STATUS, cli.STOP) @@ -56,6 +62,9 @@ func _dream_list(m *ice.Message) *ice.Message { return m } func _dream_more_list(m *ice.Message) *ice.Message { + if m.IsCliUA() { + return m + } list := m.Spawn(ice.Maps{ice.MSG_FIELDS: ""}).CmdMap(SPIDE, CLIENT_NAME) m.Cmds(SPACE).Table(func(value ice.Maps) { value[mdb.ICON] = nfs.USR_ICONS_VOLCANOS @@ -429,6 +438,9 @@ func init() { if ice.Info.NodeType == WORKER { return } + if m.IsCliUA() { + 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/space.go b/base/web/space.go index b6ce7e57..81cca7c6 100644 --- a/base/web/space.go +++ b/base/web/space.go @@ -396,7 +396,7 @@ func init() { return } defer m.StatusTimeCount(kit.Dict(ice.MAIN, mdb.Config(m, ice.MAIN))) - m.Option(ice.MSG_USERWEB, tcp.PublishLocalhost(m, m.Option(ice.MSG_USERWEB))) + // m.Option(ice.MSG_USERWEB, tcp.PublishLocalhost(m, m.Option(ice.MSG_USERWEB))) kit.If(len(arg) > 0 && arg[0] != "", func() { m.OptionFields(ice.MSG_DETAIL) }) mdb.HashSelect(m.Spawn(), arg...).Table(func(index int, value ice.Maps, field []string) { if m.Push("", value, kit.Split(mdb.Config(m, mdb.FIELD))); len(arg) > 0 && arg[0] != "" { diff --git a/base/web/spide.go b/base/web/spide.go index 8590a547..445f9bc9 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, nfs.USR_ICONS_CONTEXTS) m.Cmd("", mdb.CREATE, ice.DEV, dev, nfs.REPOS, nfs.USR_ICONS_ICEBERGS) m.Cmd("", mdb.CREATE, ice.DEV_IP, kit.Select(dev, os.Getenv("ctx_dev_ip")), "", nfs.USR_ICONS_ICEBERGS) - m.Cmd("", mdb.CREATE, ice.OPS, kit.Select("http://localhost:9020", conf[cli.CTX_OPS]), "", nfs.USR_ICONS_VOLCANOS) + m.Cmd("", mdb.CREATE, ice.OPS, kit.Select("http://localhost:9020", conf[cli.CTX_OPS]), nfs.REPOS, nfs.USR_ICONS_VOLCANOS) m.Cmd("", mdb.CREATE, ice.DEMO, kit.Select("http://localhost:20000", conf[cli.CTX_DEMO]), "", nfs.USR_ICONS_VOLCANOS) m.Cmd("", mdb.CREATE, ice.MAIL, kit.Select("https://mail.shylinux.com", conf[cli.CTX_MAIL]), "", "usr/icons/Mail.png") mdb.HashSelects(m.Spawn()).Table(func(value ice.Maps) { @@ -386,6 +386,12 @@ func init() { if len(arg) < 2 || arg[0] == "" || (len(arg) > 3 && arg[3] == "") { list := m.CmdMap(SPACE, mdb.NAME) mdb.HashSelect(m, kit.Slice(arg, 0, 1)...).Sort("client.type,client.name", []string{nfs.REPOS, ""}) + m.RewriteAppend(func(value, key string, index int) string { + if key == CLIENT_URL { + value = kit.MergeURL(value, m.OptionSimple(ice.MSG_DEBUG)) + } + return value + }) m.Table(func(value ice.Maps) { if value[CLIENT_TYPE] == nfs.REPOS { if _, ok := list[value[CLIENT_NAME]]; ok { diff --git a/base/web/store.go b/base/web/store.go index 618d4f5f..da6aeb05 100644 --- a/base/web/store.go +++ b/base/web/store.go @@ -51,7 +51,7 @@ func init() { }, ctx.ConfAction(ctx.TOOLS, DREAM)), Hand: func(m *ice.Message, arg ...string) { if len(arg) == 0 { m.Cmd(SPIDE, arg, kit.Dict(ice.MSG_FIELDS, "time,client.type,client.name,client.origin")).Table(func(value ice.Maps) { - if value[CLIENT_TYPE] == nfs.REPOS && value[CLIENT_NAME] != ice.OPS { + if value[CLIENT_TYPE] == nfs.REPOS { m.Push(mdb.NAME, value[CLIENT_NAME]) } })