LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2025 shylinux
+Copyright (c) 2020 shylinux
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,3 +1,3 @@
 # icebergs
 
-icebergs 是一个后端框架，通过集群化、模块化、自动化方式，在各种设备上，即可一键启动完整的云计算服务与云研发环境。
+icebergs 是一个应用框架，通过模块化、集群化、自动化方式，在各种设备上，即可一键启动完整的云计算服务与云研发环境。

base/aaa/email.go

@@ -32,7 +32,7 @@ func init() {
 	)
 	Index.MergeCommands(ice.Commands{
 		EMAIL: {Help: "邮件", Actions: ice.MergeActions(ice.Actions{
-			mdb.CREATE: {Name: "create name*=admin service*='smtp.163.com:25' username* password*"},
+			mdb.CREATE: {Name: "create name*=admin service*='mail.shylinux.com:25' username*='shy@shylinux.com' password*"},
 			SEND: {Name: "send from=admin to*='shy@shylinux.com' cc subject*=hi content*:textarea=hello", Help: "发送", Icon: "bi bi-send-plus", Hand: func(m *ice.Message, arg ...string) {
 				msg := mdb.HashSelects(m.Spawn(), m.OptionDefault(FROM, ADMIN))
 				if m.WarnNotFound(msg.Append(SERVICE) == "", m.Option(FROM)) {

base/aaa/portal/apply.go

@@ -78,11 +78,9 @@ func (s apply) Login(m *ice.Message, arg ...string) {
 		}
 		m.Options(ice.MSG_USERNAME, m.Option(aaa.EMAIL))
 		space := kit.Keys(kit.Slice(kit.Split(m.Option(ice.MSG_DAEMON), nfs.PT), 0, -1))
-		share := m.Cmd(web.SHARE, mdb.CREATE, mdb.TYPE, web.FIELD, mdb.NAME, web.CHAT_GRANT, mdb.TEXT, space, web.SPACE, ice.OPS).Append(mdb.LINK)
+		share := m.Cmd(web.SHARE, mdb.CREATE, mdb.TYPE, web.FIELD, mdb.NAME, web.CHAT_GRANT, mdb.TEXT, space).Append(mdb.LINK)
 		m.Options(web.LINK, share).SendEmail("", "", "")
-		// m.ProcessHold(m.Trans("please auth login in mailbox", "请注意查收邮件"))
+		m.ProcessHold(m.Trans("please auth login in mailbox", "请注意查收邮件"))
-		m.Echo(m.Trans("please auth login in mailbox", "请注意查收邮件"))
-		m.ProcessInner()
 	}
 }
 func (s apply) List(m *ice.Message, arg ...string) *ice.Message {

base/aaa/user.go

@@ -105,7 +105,7 @@ func UserRoot(m *ice.Message, arg ...string) *ice.Message {
 	userzone := kit.Select(ice.OPS, arg, 4)
 	email := kit.Select(UserEmail(m, username), arg, 5)
 	if len(arg) > 0 {
-		kit.If(username != ROOT, func() { ice.Info.Username = username })
+		ice.Info.Username = username
 		m.Cmd(USER, mdb.CREATE, userrole, username, usernick, language, userzone, email)
 	}
 	return SessAuth(m, kit.Dict(USERROLE, userrole, USERNAME, username, USERNICK, usernick))

base/cli/runtime.go

@@ -43,10 +43,9 @@ func _runtime_init(m *ice.Message) {
 	kit.HashSeed = append(kit.HashSeed, ice.Info.Username)
 	kit.HashSeed = append(kit.HashSeed, ice.Info.Hostname)
 	kit.HashSeed = append(kit.HashSeed, ice.Info.Pathname)
-	aaa.UserRoot(ice.Pulse, aaa.TECH, ice.Info.Make.Author, "", "", ice.DEV, ice.Info.Make.Email)
-	aaa.UserRoot(ice.Pulse, aaa.TECH, ice.Info.Make.Username, "", "", ice.DEV, ice.Info.Make.Email)
-	aaa.UserRoot(ice.Pulse, aaa.ROOT, ice.Info.Username)
 	aaa.UserRoot(ice.Pulse, aaa.ROOT, aaa.ROOT)
+	aaa.UserRoot(ice.Pulse, aaa.TECH, ice.Info.Make.Username, "", "", ice.DEV, ice.Info.Make.Email)
+	aaa.UserRoot(ice.Pulse, aaa.TECH, ice.Info.Username)
 	ice.Info.Time = m.Time()
 	m.Conf(RUNTIME, kit.Keys(BOOT, mdb.TIME), ice.Info.Time)
 	if runtime.GOARCH != MIPSLE {
@@ -157,7 +156,6 @@ const (
 	CTX_DEMO   = "ctx_demo"
 	CTX_MAIL   = "ctx_mail"
 	CTX_ROOT   = "ctx_root"
-	CTX_DOMAIN = "ctx_domain"
 
 	CTX_PID = "ctx_pid"
 	CTX_LOG = "ctx_log"

base/ctx/display.go

@@ -51,9 +51,6 @@ func DisplayStoryForm(m *ice.Message, arg ...ice.Any) *ice.Message {
 func DisplayInputKey(m *ice.Message, arg ...ice.Any) *ice.Message {
 	return DisplayInput(m, "key", arg...)
 }
-func DisplayStoryWeight(m *ice.Message, arg ...ice.Any) *ice.Message {
-	return DisplayStory(m, "weight", arg...)
-}
 func DisplayStoryPie(m *ice.Message, arg ...ice.Any) *ice.Message {
 	return DisplayStory(m, "pie", arg...)
 }

base/nfs/dir.go

@@ -155,7 +155,6 @@ const (
 	SRC_DOCUMENT        = "src/document/"
 	SRC_PRIVATE         = "src/private/"
 	SRC_MAIN_PNG        = "src/main.png"
-	SRC_OPTION_GO       = "src/option.go"
 	SRC_TEMPLATE        = ice.SRC_TEMPLATE
 	USR_TOOLKITS        = ice.USR_TOOLKITS
 	USR_ICEBERGS        = ice.USR_ICEBERGS
@@ -194,7 +193,6 @@ const (
 	SHARE_LOCAL     = "/share/local/"
 	PATHNAME        = "pathname"
 	FILENAME        = "filename"
-	CONTEXTS        = "contexts"
 
 	TYPE_ALL  = "all"
 	TYPE_BIN  = "bin"

base/tcp/host.go

@@ -24,9 +24,6 @@ func _host_domain(m *ice.Message) string {
 			}
 			return ""
 		},
-		func() string {
-			return LOCALHOST
-		},
 	)
 }
 func _host_list(m *ice.Message, name string) *ice.Message {

base/web/cache.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"os"
 	"path"
-	"strings"
 
 	ice "shylinux.com/x/icebergs"
 	"shylinux.com/x/icebergs/base/aaa"
@@ -190,12 +189,6 @@ func init() {
 		}
 	})
 }
-func UploadSave(m *ice.Message, p string) string {
-	up := kit.Simple(m.Optionv(ice.MSG_UPLOAD))
-	kit.If(strings.HasSuffix(p, nfs.PS), func() { p = path.Join(p, up[1]) })
-	m.Cmd(CACHE, WATCH, up[0], p)
-	return p
-}
 func Upload(m *ice.Message) []string {
 	if up := kit.Simple(m.Optionv(ice.MSG_UPLOAD)); len(up) == 1 {
 		msg := m.Cmd(CACHE, UPLOAD)

base/web/dream.go

@@ -1,6 +1,7 @@
 package web
 
 import (
+	"net/http"
 	"os"
 	"path"
 	"regexp"
@@ -21,7 +22,7 @@ import (
 	kit "shylinux.com/x/toolkits"
 )
 
-func _dream_list(m *ice.Message) *ice.Message {
+func _dream_list(m *ice.Message, simple bool) *ice.Message {
 	list := m.CmdMap(SPACE, mdb.NAME)
 	mdb.HashSelects(m.Spawn()).Table(func(value ice.Maps, index int, head []string) {
 		if value[aaa.ACCESS] == aaa.PRIVATE && (m.Option(ice.FROM_SPACE) != "" || !aaa.IsTechOrRoot(m)) {
@@ -31,35 +32,46 @@ func _dream_list(m *ice.Message) *ice.Message {
 			value[ice.MAIN] = space[ice.MAIN]
 			value[mdb.ICONS] = space[mdb.ICONS]
 			m.Push("", value, kit.Slice(head, 0, -1))
-			m.Push(mdb.TYPE, space[mdb.TYPE]).Push(cli.STATUS, cli.START)
+			if m.IsCliUA() || simple {
-			m.Push(nfs.MODULE, space[nfs.MODULE]).Push(nfs.VERSION, space[nfs.VERSION])
+				m.Push(mdb.TYPE, space[mdb.TYPE]).Push(cli.STATUS, cli.START)
-			button := []ice.Any{PORTAL, DESKTOP, ADMIN, WORD}
+				m.Push(nfs.MODULE, space[nfs.MODULE]).Push(nfs.VERSION, space[nfs.VERSION])
-			text := space[nfs.MODULE]
+				// m.Push(mdb.TEXT, DreamStat(m, value[mdb.NAME]))
-			kit.If(m.Option(ice.DREAM_SIMPLE) != ice.TRUE && aaa.IsTechOrRoot(m), func() {
+				m.Push(mdb.TEXT, "")
-				kit.If(m.IsDebug(), func() {
+				button := []ice.Any{PORTAL, DESKTOP, ADMIN, WORD, OPEN}
-					button = append(button, VIMER, STATUS, COMPILE, cli.RUNTIME, XTERM)
+				kit.If(aaa.IsTechOrRoot(m), func() { button = append(button, cli.STOP) })
-					text += "\n" + DreamStat(m, value[mdb.NAME])
+				m.PushButton(button...)
-				})
+			} else {
-				button = append(button, "settings", cli.STOP)
+				msg := gdb.Event(m.Spawn(value, space), DREAM_TABLES)
-			})
+				kit.If(aaa.IsTechOrRoot(m), func() { msg.Copy(m.Spawn().PushButton(cli.STOP)) })
-			m.Push(mdb.TEXT, text)
+				m.Push(mdb.TYPE, space[mdb.TYPE]).Push(cli.STATUS, cli.START)
-			m.PushButton(append(button, OPEN)...)
+				m.Push(nfs.MODULE, space[nfs.MODULE]).Push(nfs.VERSION, space[nfs.VERSION])
+				m.Push(mdb.TEXT, space[nfs.MODULE]+"\n"+msg.Append(mdb.TEXT))
+				m.PushButton(strings.Join(msg.Appendv(ctx.ACTION), ""))
+			}
 		} else if aaa.IsTechOrRoot(m) {
 			m.Push("", value, kit.Slice(head, 0, -1))
-			m.Push(nfs.MODULE, "").Push(nfs.VERSION, "").Push(mdb.TEXT, "")
 			if m.Push(mdb.TYPE, WORKER); nfs.Exists(m, path.Join(ice.USR_LOCAL_WORK, value[mdb.NAME])) {
-				m.Push(cli.STATUS, cli.STOP).PushButton(cli.START, nfs.TRASH)
+				m.Push(cli.STATUS, cli.STOP).Push(nfs.MODULE, "").Push(nfs.VERSION, "").Push(mdb.TEXT, "")
+				kit.If(aaa.IsTechOrRoot(m), func() { m.PushButton(cli.START, nfs.TRASH) }, func() { m.PushButton() })
 			} else {
-				m.Push(cli.STATUS, cli.BEGIN).PushButton(cli.START, mdb.REMOVE)
+				m.Push(cli.STATUS, cli.BEGIN).Push(nfs.MODULE, "").Push(nfs.VERSION, "").Push(mdb.TEXT, "")
+				kit.If(aaa.IsTechOrRoot(m), func() { m.PushButton(cli.START, mdb.REMOVE) }, func() { m.PushButton() })
 			}
 		}
 	})
 	m.RewriteAppend(func(value, key string, index int) string {
 		if key == mdb.TIME {
 			if space, ok := list[m.Appendv(mdb.NAME)[index]]; ok {
-				return space[mdb.TIME]
+				value = space[mdb.TIME]
 			}
-		} else if key == mdb.ICONS {
+		}
+		return value
+	})
+	return m
+}
+func _dream_list_icon(m *ice.Message) {
+	m.RewriteAppend(func(value, key string, index int) string {
+		if key == mdb.ICONS {
 			if kit.HasPrefix(value, HTTP, nfs.PS) {
 				return value
 			} else if nfs.ExistsFile(m, path.Join(ice.USR_LOCAL_WORK, m.Appendv(mdb.NAME)[index], value)) {
@@ -70,42 +82,40 @@ func _dream_list(m *ice.Message) *ice.Message {
 		}
 		return value
 	})
-	return m
 }
-func _dream_list_more(m *ice.Message) *ice.Message {
+func _dream_list_more(m *ice.Message, simple bool) *ice.Message {
 	field := kit.Split(mdb.Config(m, mdb.FIELD) + ",type,status,module,version,text")
 	m.Cmds(SPACE).Table(func(value ice.Maps) {
 		value[nfs.REPOS] = "https://" + value[nfs.MODULE]
 		value[aaa.ACCESS] = kit.Select("", value[aaa.USERROLE], value[aaa.USERROLE] != aaa.VOID)
 		value[mdb.STATUS] = cli.START
-		button := []ice.Any{PORTAL, DESKTOP, ADMIN, WORD}
+		button := []ice.Any{PORTAL, DESKTOP, ADMIN, WORD, DREAM, OPEN}
-		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:
-			if !m.IsCliUA() {
+			value[mdb.TEXT] = kit.JoinLine(value[nfs.MODULE], value[mdb.TEXT])
-				value[mdb.TEXT] = kit.JoinLine(value[nfs.MODULE], value[mdb.TEXT])
+			if simple {
-			} else if !strings.HasPrefix(value[mdb.TEXT], ice.HTTP) {
+				defer m.PushButton(button...)
-				return
+			} else {
+				msg := gdb.Event(m.Spawn(value), DREAM_TABLES)
+				defer m.PushButton(strings.Join(msg.Appendv(ctx.ACTION), ""))
+			}
+		case ORIGIN:
+			value[mdb.TEXT] = kit.JoinLine(value[nfs.MODULE], value[mdb.TEXT])
+			if simple {
+				defer m.PushButton(button...)
+			} else if value[aaa.ACCESS] == "" {
+				defer m.PushButton(PORTAL)
+			} else {
+				msg := gdb.Event(m.Spawn(value), DREAM_TABLES)
+				defer m.PushButton(strings.Join(msg.Appendv(ctx.ACTION), ""))
 			}
-			button = append(button, SETTOKEN, OPEN)
 		case aaa.LOGIN:
-			if m.IsCliUA() {
-				return
-			}
 			value[mdb.TEXT] = kit.JoinWord(value[AGENT], value[cli.SYSTEM], value[aaa.IP], kit.Format(PublicIP(m, value[aaa.IP])))
-			button = []ice.Any{GRANT}
+			defer m.PushButton(GRANT)
 		default:
 			return
 		}
 		m.Push("", value, field)
-		m.PushButton(button...)
 	})
 	return m
 }
@@ -174,8 +184,7 @@ func _dream_binary(m *ice.Message, p string) {
 	if bin := path.Join(m.Option(cli.CMD_DIR), ice.BIN_ICE_BIN); nfs.Exists(m, bin) {
 		return
 	} else if kit.IsUrl(p) || strings.HasPrefix(p, S()) {
-		// m.Cmd(DREAM, DOWNLOAD, bin, kit.MergeURL2(p, kit.Format("/publish/ice.%s.%s", runtime.GOOS, runtime.GOARCH), ice.POD, m.Option(mdb.NAME)))
+		m.Cmd(DREAM, DOWNLOAD, bin, kit.MergeURL2(p, kit.Format("/publish/ice.%s.%s", runtime.GOOS, runtime.GOARCH), ice.POD, m.Option(mdb.NAME)))
-		m.Cmd(DREAM, DOWNLOAD, bin, kit.MergeURL(p, cli.GOOS, runtime.GOOS, cli.GOARCH, runtime.GOARCH))
 	} else {
 		m.Cmd(nfs.LINK, bin, kit.Path(p))
 	}
@@ -204,8 +213,6 @@ const (
 	STOPALL  = "stopall"
 	FOR_EACH = "forEach"
 	FOR_FLOW = "forFlow"
-	GETTOKEN = "gettoken"
-	SETTOKEN = "settoken"
 
 	DREAM_INPUTS = "dream.inputs"
 	DREAM_CREATE = "dream.create"
@@ -215,6 +222,7 @@ const (
 	DREAM_STOP   = "dream.stop"
 	DREAM_OPEN   = "dream.open"
 	DREAM_CLOSE  = "dream.close"
+
 	DREAM_TABLES = "dream.tables"
 	DREAM_ACTION = "dream.action"
 
@@ -235,28 +243,66 @@ func init() {
 每个空间都自带软件开发工具，也可以随时编程添加新的功能。
 `, 200.0)
 			}},
+			html.BUTTON: {Hand: func(m *ice.Message, arg ...string) {
+				mdb.Config(m, html.BUTTON, kit.Join(arg))
+			}},
 			mdb.SEARCH: {Hand: func(m *ice.Message, arg ...string) {
 				if mdb.IsSearchPreview(m, arg) {
 					mdb.HashSelects(m.Spawn()).Table(func(value ice.Maps) { m.PushSearch(mdb.TYPE, WORKER, mdb.TEXT, m.MergePod(value[mdb.NAME]), value) })
 				}
 			}},
 			mdb.INPUTS: {Hand: func(m *ice.Message, arg ...string) {
-				switch arg[0] {
+				switch m.Option(ctx.ACTION) {
-				case mdb.NAME:
+				case mdb.CREATE:
-					DreamEach(m, "", kit.Select(cli.START, cli.STOP, m.Option(ctx.ACTION) == STARTALL), func(name string) { m.Push(arg[0], name) })
+					switch arg[0] {
-				case tcp.NODENAME:
+					case mdb.NAME:
-					m.Cmdy(SPACE, m.Option(mdb.NAME), SPACE, ice.INFO).CutTo(mdb.NAME, arg[0])
+						_dream_list(m, true).Cut("name,status,time")
-				case aaa.USERNAME:
+					case mdb.ICONS:
-					if aaa.IsTechOrRoot(m) && m.Option(ctx.ACTION) == GRANT {
+						mdb.HashInputs(m, arg)
-						m.Cmdy(aaa.USER).Cut(aaa.USERNAME, aaa.USERNICK).Option(ice.TABLE_CHECKBOX, ice.FALSE)
+					case nfs.REPOS:
-					} else {
+						defer ctx.DisplayInputKey(m, ctx.STYLE, "_nameicon")
-						m.Push(arg[0], m.Option(tcp.NODENAME))
+						m.Cmd(STORE).Table(func(value ice.Maps) {
-						m.Push(arg[0], m.Option(ice.MSG_USERNAME))
+							m.Spawn().SplitIndex(m.Cmdx(SPIDE, value[mdb.NAME], SPIDE_RAW, http.MethodGet, C(DREAM))).Table(func(value ice.Maps) {
+								m.PushRecord(value, mdb.ICONS, nfs.REPOS, nfs.VERSION, mdb.NAME)
+							})
+						})
+					case nfs.BINARY:
+						defer ctx.DisplayInputKey(m, ctx.STYLE, "_nameicon")
+						m.Cmd(STORE).Table(func(val ice.Maps) {
+							m.Spawn().SplitIndex(m.Cmdx(SPIDE, val[mdb.NAME], SPIDE_RAW, http.MethodGet, S(), cli.GOOS, runtime.GOOS, cli.GOARCH, runtime.GOARCH)).Table(func(value ice.Maps) {
+								m.Push(mdb.ICONS, value[mdb.ICONS])
+								m.Push(arg[0], val[ORIGIN]+S(value[mdb.NAME])).Push(nfs.SIZE, value[nfs.SIZE]).Push(mdb.TIME, value[mdb.TIME])
+							})
+						})
 					}
-				case nfs.REPOS:
+				case STARTALL:
-				case nfs.BINARY:
+					DreamEach(m, "", cli.STOP, func(name string) { m.Push(arg[0], name) })
+				case tcp.SEND:
+					m.Cmd(SPACE, func(value ice.Maps) {
+						kit.If(kit.IsIn(value[mdb.TYPE], SERVER), func() { m.Push(arg[0], value[mdb.NAME]) })
+					})
 				default:
-					gdb.Event(m, DREAM_INPUTS, arg)
+					switch arg[0] {
+					case mdb.NAME:
+						DreamEach(m, "", cli.START, func(name string) { m.Push(arg[0], name) })
+					case ctx.CMDS:
+						m.Cmdy(ctx.COMMAND)
+					case nfs.FILE:
+						m.Options(nfs.DIR_TYPE, nfs.TYPE_CAT, ice.MSG_FIELDS, nfs.PATH)
+						m.Cmdy(nfs.DIR, nfs.SRC).Cmdy(nfs.DIR, nfs.ETC).Cmdy(nfs.DIR, "")
+					case tcp.NODENAME:
+						m.Cmdy(SPACE, m.Option(mdb.NAME), SPACE, ice.INFO).CutTo(mdb.NAME, tcp.NODENAME)
+					case aaa.USERNAME:
+						if aaa.IsTechOrRoot(m) && m.Option(ctx.ACTION) == GRANT {
+							m.Cmdy(aaa.USER).Cut(aaa.USERNAME, aaa.USERNICK)
+							m.Option(ice.TABLE_CHECKBOX, ice.FALSE)
+						} else {
+							m.Push(arg[0], m.Option(ice.MSG_USERNAME))
+							m.Push(arg[0], m.Option(tcp.NODENAME))
+						}
+					default:
+						gdb.Event(m, DREAM_INPUTS, arg)
+					}
 				}
 			}},
 			nfs.SCAN: {Hand: func(m *ice.Message, arg ...string) {
@@ -269,9 +315,12 @@ func init() {
 			}},
 			mdb.CREATE: {Name: "create name*=hi repos binary", Hand: func(m *ice.Message, arg ...string) {
 				kit.If(!strings.Contains(m.Option(mdb.NAME), "-") || !strings.HasPrefix(m.Option(mdb.NAME), "20"), func() { m.Option(mdb.NAME, m.Time("20060102-")+m.Option(mdb.NAME)) })
+				kit.If(mdb.Config(m, nfs.BINARY), func(p string) { m.OptionDefault(nfs.BINARY, p+m.Option(mdb.NAME)) })
+				kit.If(mdb.Config(m, nfs.REPOS), func(p string) { m.OptionDefault(nfs.REPOS, p+m.Option(mdb.NAME)) })
 				m.Option(nfs.REPOS, kit.Select("", kit.Split(m.Option(nfs.REPOS)), -1))
 				if mdb.HashCreate(m); ice.Info.Important == true {
 					_dream_start(m, m.Option(mdb.NAME))
+					StreamPushRefreshConfirm(m, m.Trans("refresh for new space ", "刷新列表查看新空间 ")+m.Option(mdb.NAME))
 					SpaceEvent(m, OPS_DREAM_CREATE, m.Option(mdb.NAME), m.OptionSimple(mdb.NAME, nfs.REPOS, nfs.BINARY)...)
 				}
 			}},
@@ -299,35 +348,24 @@ func init() {
 						m.Cmd(SPACE, path.Base(p), cli.RUNTIME, UPGRADE)
 						return true
 					}
-				}).Sleep3s()
+				})
-				m.ProcessHold()
+				kit.If(m.Option(mdb.NAME) == "", func() { m.Sleep("5s").Cmdy(ROUTE, cli.BUILD).ProcessInner() })
 			}},
 			PUBLISH: {Name: "publish name", Hand: func(m *ice.Message, arg ...string) {
 				m.Option(ice.MSG_TITLE, kit.Keys(m.Option(ice.MSG_USERPOD0), m.Option(ice.MSG_USERPOD), m.CommandKey(), m.ActionKey()))
 				list := []string{cli.LINUX, cli.DARWIN, cli.WINDOWS}
 				msg := m.Spawn(ice.Maps{ice.MSG_DAEMON: ""})
 				func() {
-					if m.Option(mdb.NAME) != "" {
-						return
-					}
 					defer ToastProcess(m, PUBLISH, ice.Info.Pathname)()
 					m.Cmd(AUTOGEN, BINPACK)
 					kit.For(list, func(goos string) {
-						list := []string{cli.AMD64}
+						PushNoticeRich(m, mdb.NAME, ice.Info.NodeName, msg.Cmd(COMPILE, goos, cli.AMD64).AppendSimple())
-						kit.If(goos == cli.DARWIN, func() { list = append(list, cli.ARM64) })
-						kit.For(list, func(arch string) {
-							PushNoticeRich(m, mdb.NAME, ice.Info.NodeName, msg.Cmd(COMPILE, goos, arch).AppendSimple())
-						})
 					})
 				}()
 				DreamEach(m, m.Option(mdb.NAME), "", func(name string) {
 					m.Cmd(SPACE, name, AUTOGEN, BINPACK)
 					kit.For(list, func(goos string) {
-						list := []string{cli.AMD64}
+						PushNoticeRich(m.Options(ice.MSG_COUNT, "0", ice.LOG_DISABLE, ice.TRUE), mdb.NAME, name, msg.Cmd(SPACE, name, COMPILE, goos, cli.AMD64, kit.Dict(ice.MSG_USERPOD, name)).AppendSimple())
-						kit.If(goos == cli.DARWIN, func() { list = append(list, cli.ARM64) })
-						kit.For(list, func(arch string) {
-							PushNoticeRich(m.Options(ice.MSG_COUNT, "0", ice.LOG_DISABLE, ice.TRUE), mdb.NAME, name, msg.Cmd(SPACE, name, COMPILE, goos, arch, kit.Dict(ice.MSG_USERPOD, name)).AppendSimple())
-						})
 					})
 				})
 				m.ProcessHold()
@@ -343,46 +381,66 @@ func init() {
 					if cb, ok := m.OptionCB("").(func(string) bool); ok && cb(p) {
 						return
 					}
-					defer PushNoticeGrow(msg, "\r\n\r\n")
+					defer PushNoticeGrow(msg, "\r\n\r\n\r\n")
-					PushNoticeGrow(msg, kit.Format("\033[33m[%s]%s$\033[0m %s\r\n", time.Now().Format(ice.MOD_TIME_ONLY), name, m.Option(ice.CMD)))
+					PushNoticeGrow(msg, kit.Format("[%s]%s$ %s\r\n", time.Now().Format(ice.MOD_TIME_ONLY), name, m.Option(ice.CMD)))
 					m.Cmd(cli.SYSTEM, kit.Split(m.Option(ice.CMD)), kit.Dict(cli.CMD_DIR, p)).Sleep300ms()
 				})
 			}},
+			ctx.CMDS: {Name: "cmds name cmds*", Help: "命令", Icon: "bi bi-terminal", Hand: func(m *ice.Message, arg ...string) {
+				DreamEach(m, m.Option(mdb.NAME), "", func(name string) {
+					m.Push(mdb.NAME, name).Push(mdb.TEXT, m.Cmdx(SPACE, name, kit.Split(m.Option(ctx.CMDS))))
+				}).StatusTimeCount(m.OptionSimple(ctx.CMDS)).ProcessInner()
+			}},
+			nfs.FILE: {Name: "file name file*", Help: "文件", Icon: "bi bi-file-earmark-code", Hand: func(m *ice.Message, arg ...string) {
+				DreamEach(m, m.Option(mdb.NAME), "", func(name string) {
+					m.Push(mdb.NAME, name).Push(mdb.TEXT, m.Cmdx(SPACE, name, nfs.CAT, m.Option(nfs.FILE)))
+				}).StatusTimeCount(m.OptionSimple(nfs.FILE)).ProcessInner()
+			}},
+
 			cli.START: {Hand: func(m *ice.Message, arg ...string) {
 				_dream_start(m, m.Option(mdb.NAME))
 				gdb.Event(m, DREAM_START, arg)
 			}},
 			cli.STOP: {Hand: func(m *ice.Message, arg ...string) {
+				defer ToastProcess(m)()
 				gdb.Event(m, DREAM_STOP, arg)
 				m.Cmd(SPACE, mdb.MODIFY, m.OptionSimple(mdb.NAME), mdb.STATUS, cli.STOP)
 				m.Cmd(SPACE, m.Option(mdb.NAME), ice.EXIT).Sleep3s()
 			}},
+			cli.RUNTIME: {Hand: func(m *ice.Message, arg ...string) {
+				ProcessPodCmd(m, m.Option(mdb.NAME), "", nil, arg...)
+			}},
 			nfs.TRASH: {Hand: func(m *ice.Message, arg ...string) {
 				gdb.Event(m, DREAM_TRASH, arg)
 				nfs.Trash(m, path.Join(ice.USR_LOCAL_WORK, m.Option(mdb.NAME)))
 			}},
-			cli.RUNTIME: {Hand: func(m *ice.Message, arg ...string) {
+			nfs.COPY: {Name: "copy to*", Help: "复制", Hand: func(m *ice.Message, arg ...string) {
-				ProcessPodCmd(m, m.Option(mdb.NAME), "", nil, arg...)
+				m.Cmdy("", mdb.CREATE, mdb.NAME, m.Option(nfs.TO), nfs.BINARY, path.Join(ice.USR_LOCAL_WORK, m.Option(mdb.NAME), ice.BIN_ICE_BIN))
 			}},
-			"settings": {Name: "settings restart=manual,always access=public,private", Help: "设置", Style: html.DANGER, Hand: func(m *ice.Message, arg ...string) {
+			tcp.SEND: {Name: "send to*", Hand: func(m *ice.Message, arg ...string) {
+				m.Cmd(SPACE, m.Option(nfs.TO), DREAM, mdb.CREATE, m.OptionSimple(mdb.NAME, mdb.ICONS, nfs.REPOS, nfs.BINARY))
+				m.Cmd(SPACE, m.Option(nfs.TO), DREAM, cli.START, m.OptionSimple(mdb.NAME))
+				ProcessIframe(m, "", m.MergePod(kit.Keys(m.Option(nfs.TO), m.Option(mdb.NAME))))
+			}},
+			"settings": {Name: "settings restart=manual,always access=public,private", Help: "设置", Style: "danger", Hand: func(m *ice.Message, arg ...string) {
 				kit.If(m.Option(cli.RESTART) == "manual", func() { m.Option(cli.RESTART, "") })
 				kit.If(m.Option(aaa.ACCESS) == aaa.PUBLIC, func() { m.Option(aaa.ACCESS, "") })
 				mdb.HashModify(m, m.OptionSimple(mdb.NAME, cli.RESTART, aaa.ACCESS))
 			}},
-			SETTOKEN: {Name: "settoken nodename* username*", Help: "令牌", Style: html.DANGER, Hand: func(m *ice.Message, arg ...string) {
+			"settoken": {Name: "settoken nodename* username*", Help: "令牌", Style: "danger", Hand: func(m *ice.Message, arg ...string) {
 				token := m.Cmdx(TOKEN, mdb.CREATE, mdb.TYPE, SERVER, mdb.NAME, m.Option(aaa.USERNAME), mdb.TEXT, m.Option(tcp.NODENAME))
-				m.Cmd(SPACE, m.Option(mdb.NAME), SPIDE, DEV_CREATE_TOKEN, ice.Maps{TOKEN: token})
+				m.Cmd(SPACE, m.Option(mdb.NAME), SPIDE, DEV_CREATE_TOKEN, ice.Maps{CLIENT_NAME: ice.DEV, TOKEN: token})
 			}},
-			GETTOKEN: {Help: "令牌", Style: html.DANGER, Hand: func(m *ice.Message, arg ...string) {
+			"gettoken": {Help: "令牌", Style: "danger", Hand: func(m *ice.Message, arg ...string) {
 				m.Options(m.Cmd(SPIDE, m.Option(mdb.NAME)).AppendSimple()).Cmdy(SPIDE, mdb.DEV_REQUEST)
 			}},
-			GRANT: {Name: "grant username", Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) {
+			GRANT: {Name: "grant username", Hand: func(m *ice.Message, arg ...string) {
 				if aaa.IsTechOrRoot(m) && m.Option(aaa.USERNAME) != "" {
 					m.Option(ice.MSG_USERNAME, m.Option(aaa.USERNAME))
 				}
 				m.Cmd(CHAT_GRANT, aaa.CONFIRM, kit.Dict(SPACE, m.Option(mdb.NAME)))
 			}},
-			OPEN: {Style: html.NOTICE, Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) {
+			OPEN: {Style: "notice", Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) {
 				if strings.HasSuffix(m.Option(ice.MAIN), ".portal") || kit.HasPrefixList(arg, ctx.RUN) {
 					if !kit.HasPrefixList(arg, ctx.RUN) {
 						defer m.Push(TITLE, m.Option(mdb.NAME))
@@ -412,15 +470,17 @@ func init() {
 				button := []ice.Any{}
 				if aaa.IsTechOrRoot(m) {
 					switch m.Option(mdb.TYPE) {
-					case ORIGIN:
-						button = append(button, DREAM, GETTOKEN)
-					case SERVER:
-						button = append(button, DREAM, SETTOKEN)
 					case WORKER:
-						button = append(button, "settings")
+						button = append(button, OPEN, "settings")
+					case SERVER:
+						button = append(button, DREAM, OPEN, "settoken")
+					default:
+						button = append(button, DREAM, OPEN, "gettoken")
 					}
+				} else {
+					button = append(button, OPEN)
 				}
-				m.PushButton(append(button, OPEN)...)
+				m.PushButton(button...)
 			}},
 			SERVE_START: {Hand: func(m *ice.Message, arg ...string) {
 				for _, cmd := range kit.Reverse(kit.Split(mdb.Config(m, html.BUTTON))) {
@@ -435,7 +495,7 @@ func init() {
 				})
 			}},
 			STATS_TABLES: {Hand: func(m *ice.Message, arg ...string) {
-				if msg := _dream_list(m.Spawn()); msg.Length() > 0 {
+				if msg := _dream_list(m.Spawn(), true); msg.Length() > 0 {
 					stat := map[string]int{}
 					msg.Table(func(value ice.Maps) { stat[value[mdb.TYPE]]++; stat[value[mdb.STATUS]]++ })
 					PushStats(m, kit.Keys(m.CommandKey(), cli.START), stat[cli.START], "", "已启动空间")
@@ -447,22 +507,13 @@ func init() {
 				m.Cmd(SPACE).Table(func(value ice.Maps, index int, head []string) {
 					kit.If(value[mdb.TYPE] == m.ActionKey(), func() { m.PushRecord(value, head...) })
 				})
-				m.SortStrR(mdb.NAME)
+				m.Sort(mdb.TIME, ice.STR_R)
-				kit.If(len(arg) > 0, func() { m.Cut(arg...) })
 			}},
 			SERVER: {Hand: func(m *ice.Message, arg ...string) {
 				m.Cmd(SPACE).Table(func(value ice.Maps, index int, head []string) {
 					kit.If(value[mdb.TYPE] == m.ActionKey(), func() { m.PushRecord(value, head...) })
 				})
-				m.SortStrR(mdb.NAME)
+				m.Sort(mdb.TIME, ice.STR_R)
-				kit.If(len(arg) > 0, func() { m.Cut(arg...) })
-			}},
-			WORKER: {Hand: func(m *ice.Message, arg ...string) {
-				m.Cmd(SPACE).Table(func(value ice.Maps, index int, head []string) {
-					kit.If(value[mdb.TYPE] == m.ActionKey(), func() { m.PushRecord(value, head...) })
-				})
-				m.SortStrR(mdb.NAME)
-				kit.If(len(arg) > 0, func() { m.Cut(arg...) })
 			}},
 			DOWNLOAD: {Name: "download path link", Hand: func(m *ice.Message, arg ...string) {
 				GoToast(m, func(toast func(string, int, int)) []string {
@@ -480,35 +531,52 @@ func init() {
 				m.Cmd(cli.SYSTEM, cli.GO, "work", "init")
 				kit.For([]string{".", nfs.USR_RELEASE, nfs.USR_ICEBERGS, nfs.USR_TOOLKITS}, func(p string) { m.Cmd(cli.SYSTEM, cli.GO, "work", "use", p) })
 				DreamEach(m, m.Option(mdb.NAME), "", func(name string) { m.Cmd(cli.SYSTEM, cli.GO, "work", "use", path.Join(ice.USR_LOCAL_WORK, name)) })
-				m.Cmdy(nfs.CAT, "go.work")
 			}},
 		}, StatsAction(), DreamAction(), DreamTablesAction(), mdb.ImportantHashAction(
 			mdb.SHORT, mdb.NAME, mdb.FIELD, "time,name,main,icons,repos,binary,template,restart,access",
-			html.BUTTON, kit.JoinWord(PORTAL, DESKTOP, ADMIN, WORD, VIMER, STATUS, COMPILE, XTERM, DREAM),
+			html.BUTTON, kit.JoinWord(PORTAL, DESKTOP, ADMIN, WORD, STATUS, VIMER, COMPILE, XTERM, DREAM),
+			ONLINE, ice.TRUE,
 		)), Hand: func(m *ice.Message, arg ...string) {
 			if len(arg) == 0 {
-				if ice.Info.NodeType == WORKER {
+				simple := m.Option(ice.DREAM_SIMPLE) == ice.TRUE || m.Option(ice.MSG_DEBUG) != ice.TRUE
-					return
+				if ice.Info.NodeType != WORKER {
+					_dream_list(m, simple)
+					_dream_list_icon(m)
+					if m.Length() == 0 {
+						m.EchoInfoButton(m.Trans("please scan or create new dream", "请扫描或创建新空间"), mdb.CREATE, nfs.SCAN)
+						return
+					}
 				}
-				_dream_list(m)
+				if !m.IsCliUA() && aaa.IsTechOrRoot(m) {
-				if _dream_list_more(m); !aaa.IsTechOrRoot(m) || m.IsCliUA() {
+					_dream_list_more(m, simple)
+				} else {
+					msg := m.Spawn(kit.Dict(ice.MSG_USERROLE, aaa.TECH))
+					m.Cmds(SPACE).Table(func(value ice.Maps) {
+						if value[mdb.TYPE] == SERVER {
+							if p := ProxyDomain(msg, value[mdb.NAME]); p != "" {
+								value[mdb.TEXT] = p
+								m.PushRecord(value, mdb.TIME, mdb.TYPE, mdb.NAME, mdb.ICONS, nfs.MODULE, nfs.VERSION, mdb.TEXT)
+								m.PushButton(PORTAL, DESKTOP)
+							}
+						}
+					})
+				}
+				if ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) || m.IsCliUA() {
 					m.Action()
 				} else if m.IsDebug() && cli.SystemFindGo(m) {
 					m.Action(mdb.CREATE, STARTALL, STOPALL, cli.BUILD, PUBLISH)
 				} else {
 					m.Action(mdb.CREATE, STARTALL, STOPALL)
 				}
-				if m.Length() == 0 {
-					m.EchoInfoButton(m.Trans("please scan or create new dream", "请扫描或创建新空间"), mdb.CREATE, nfs.SCAN)
-					return
-				}
-				ctx.DisplayTableCard(m)
-				m.Options(ice.MSG_TOOLKIT, "web.code.compose.insight")
 				m.Sort("type,status,name", []string{aaa.LOGIN, WORKER, SERVER, ORIGIN}, []string{cli.START, cli.STOP, cli.BEGIN}, ice.STR_R)
 				m.StatusTimeCountStats(mdb.TYPE, mdb.STATUS)
+				ctx.DisplayTableCard(m)
+				kit.If(!aaa.IsTechOrRoot(m), func() { m.Options(ice.MSG_TOOLKIT, "", ice.MSG_ONLINE, ice.FALSE) })
+				kit.If(!m.IsDebug(), func() { m.Options(ice.MSG_TOOLKIT, "") })
 			} else if arg[0] == ctx.ACTION {
-				m.Cmdy(arg[1], DREAM_ACTION, arg)
+				gdb.Event(m, DREAM_ACTION, arg)
-				// gdb.Event(m, DREAM_ACTION, arg)
+			} else {
+				mdb.HashSelects(m, arg[0]).PushAction(PORTAL, DESKTOP, ADMIN, OPEN, mdb.REMOVE)
 			}
 		}},
 	})

base/web/matrix.go

@@ -119,7 +119,7 @@ func init() {
 			}},
 		}, ctx.ConfAction(
 			mdb.FIELD, "time,domain,status,type,name,text,icons,repos,binary,module,version,access",
-			ctx.TOOLS, kit.Simple("web.code.compose.insight", VERSION), ONLINE, ice.TRUE, cli.TIMEOUT, "10s",
+			ctx.TOOLS, kit.Simple(VERSION), ONLINE, ice.TRUE, cli.TIMEOUT, "10s",
 		)), Hand: func(m *ice.Message, arg ...string) {
 			if kit.HasPrefixList(arg, ctx.ACTION) {
 				_matrix_action(m, arg[1], arg[2:]...)

base/web/option.go

@@ -15,7 +15,7 @@ import (
 )
 
 func UserWeb(m *ice.Message) *url.URL {
-	return kit.ParseURL(m.OptionDefault(ice.MSG_USERWEB, "http://localhost:9020"))
+	return kit.ParseURL(m.Option(ice.MSG_USERWEB))
 }
 func UserHost(m *ice.Message) string {
 	if p := m.Option(ice.MSG_USERHOST); p != "" {

base/web/render.go

@@ -84,7 +84,6 @@ func Render(m *ice.Message, cmd string, args ...ice.Any) bool {
 				"$output", fieldset+">div.output",
 				"$status", fieldset+">div.status",
 				"$fieldset", fieldset,
-				"$body", "body.cmd."+m.Option(ctx.INDEX),
 				"$index", m.Option(ctx.INDEX),
 				"$input", "body>div.input.float."+m.Option(ctx.INDEX),
 			)))
@@ -172,7 +171,7 @@ func RenderPodCmd(m *ice.Message, pod, cmd string, arg ...ice.Any) {
 			m.Option(mdb.ICONS, msg.Option(ice.MSG_NODEICON))
 		}
 		m.OptionDefault(mdb.ICONS, m.Resource(kit.Select(ice.Info.NodeIcon, msg.Option(ice.MSG_NODEICON), msg.Append(mdb.ICONS))))
-		serve := strings.Split(UserHost(m), "://")[1]
+		serve := kit.Select("localhost:9020", UserWeb(m).Host)
 		pod = kit.Select(pod, msg.Option(ice.MSG_NODENAME), m.Option(ice.MSG_USERPOD) != "")
 		m.OptionDefault(TITLE, kit.Select(cmd, msg.Append(mdb.HELP), !m.IsEnglish())+" "+kit.Select(serve, pod))
 		RenderCmds(m, kit.Dict(msg.AppendSimple(), ctx.ARGS, kit.Simple(arg), ctx.DISPLAY, m.Option(ice.MSG_DISPLAY)))

base/web/serve.go

@@ -35,6 +35,10 @@ func _serve_start(m *ice.Message) {
 	}).Sleep(cli.TIME_1s)
 	cli.NodeInfo(m, kit.Select(kit.Split(ice.Info.Hostname, nfs.PT)[0], m.Option(tcp.NODENAME)), SERVER, mdb.Config(m, mdb.ICONS))
 	kit.If(ice.HasVar(), func() { m.Cmd(nfs.SAVE, ice.VAR_LOG_ICE_PORT, m.Option(tcp.PORT)) })
+	m.Spawn(ice.Maps{TOKEN: ""}).Start("", m.OptionSimple(tcp.HOST, tcp.PORT)...)
+	if m.Cmd(tcp.HOST).Length() == 0 {
+		return
+	}
 	kit.For(kit.Split(m.Option(ice.DEV)), func(dev string) {
 		if strings.HasPrefix(dev, HTTP) {
 			m.Cmd(SPIDE, mdb.CREATE, dev, ice.DEV, "", nfs.REPOS)
@@ -43,16 +47,12 @@ func _serve_start(m *ice.Message) {
 		}
 		if msg := m.Cmd(SPIDE, dev); msg.Append(TOKEN) == "" {
 			if m.Option(TOKEN) != "" {
-				m.Cmd(SPACE, tcp.DIAL, ice.DEV, dev, TOKEN, m.Option(TOKEN))
+				m.Sleep300ms(SPACE, tcp.DIAL, ice.DEV, dev, TOKEN, m.Option(TOKEN))
 			} else {
-				m.Cmd(SPACE, tcp.DIAL, ice.DEV, dev)
+				m.Sleep300ms(SPACE, tcp.DIAL, ice.DEV, dev)
 			}
 		}
 	})
-	m.Spawn(ice.Maps{TOKEN: ""}).Start("", m.OptionSimple(tcp.HOST, tcp.PORT)...)
-	if m.Cmd(tcp.HOST).Length() == 0 {
-		return
-	}
 }
 func _serve_main(m *ice.Message, w http.ResponseWriter, r *http.Request) bool {
 	const (
@@ -65,10 +65,6 @@ func _serve_main(m *ice.Message, w http.ResponseWriter, r *http.Request) bool {
 	} else {
 		return true
 	}
-	func() {
-		defer InfoLock.Lock()()
-		Info.ServeMainCount++
-	}()
 	if ip := r.Header.Get(X_REAL_IP); ip != "" {
 		if r.Header.Set(ice.MSG_USERIP, ip); r.Header.Get(X_REAL_PORT) != "" {
 			r.Header.Set(ice.MSG_USERADDR, ip+nfs.DF+r.Header.Get(X_REAL_PORT))
@@ -218,20 +214,6 @@ func _serve_handle(key string, cmd *ice.Command, m *ice.Message, w http.Response
 		} else {
 			m.CmdHand(cmd, key, cmds...)
 		}
-		func() {
-			defer InfoLock.Lock()()
-			Info.Commands[kit.Select(kit.Select("", cmds, 0), m.Option(ice.MSG_INDEX))]++
-			switch r.Method {
-			case http.MethodGet:
-				Info.ServeGetCount++
-			case http.MethodPut:
-				Info.ServePutCount++
-			case http.MethodPost:
-				Info.ServePostCount++
-			case http.MethodDelete:
-				Info.ServeDeleteCount++
-			}
-		}()
 	}
 }
 func _serve_domain(m *ice.Message) string {
@@ -330,14 +312,11 @@ func init() {
 				ice.Info.Important = ice.HasVar()
 			}},
 			PROXY_CONF: {Name: "proxyConf name* port host path", Hand: func(m *ice.Message, arg ...string) {
-				if dir := m.OptionDefault(nfs.PATH, PROXY_PATH, tcp.HOST, "127.0.0.1", tcp.PORT, tcp.PORT_9020); nfs.Exists(m, dir) {
+				if dir := m.OptionDefault(nfs.PATH, PROXY_PATH, tcp.HOST, "127.0.0.1", tcp.PORT, tcp.PORT_9020); true || nfs.Exists(m, dir) {
-					for _, p := range []string{"upstream.conf"} {
+					for _, p := range []string{"server.conf", "location.conf", "upstream.conf"} {
 						m.Cmd(nfs.SAVE, kit.Format("%s/conf/portal/%s/%s", dir, m.Option(mdb.NAME), p), m.Template(p)+lex.NL)
 					}
-					for _, p := range []string{"server.conf", "location.conf"} {
+					m.Cmd(cli.SYSTEM, "sudo", kit.Path("usr/local/daemon/10000/sbin/nginx"), "-p", kit.Path("usr/local/daemon/10000/"), "-s", "reload")
-						m.Cmd(nfs.DEFS, kit.Format("%s/conf/portal/%s/%s", dir, m.Option(mdb.NAME), p), m.Template(p)+lex.NL)
-					}
-					m.Cmd(cli.SYSTEM, cli.SUDO, kit.Path(dir, "sbin/nginx"), "-p", kit.Path(dir), "-s", "reload")
 				}
 			}},
 		}, gdb.EventsAction(SERVE_START), mdb.HashAction(

base/web/share.go

@@ -91,8 +91,7 @@ func init() {
 			ctx.RUN: {Hand: func(m *ice.Message, arg ...string) {
 				if msg := mdb.HashSelects(m.Spawn(), m.Option(SHARE)); !IsNotValidFieldShare(m, msg) {
 					aaa.SessAuth(m, kit.Dict(msg.AppendSimple(aaa.USERNICK, aaa.USERNAME, aaa.USERROLE)))
-					// m.Cmdy(Space(m, msg.Append(SPACE)), msg.Append(mdb.NAME), kit.UnMarshal(msg.Append(mdb.TEXT)), arg[1:], kit.Dict(ice.MSG_USERPOD, msg.Append(SPACE)))
+					m.Cmdy(Space(m, msg.Append(SPACE)), msg.Append(mdb.NAME), kit.UnMarshal(msg.Append(mdb.TEXT)), arg[1:], kit.Dict(ice.MSG_USERPOD, msg.Append(SPACE)))
-					m.Cmdy(Space(m, msg.Append(SPACE)), msg.Append(mdb.NAME), arg[1:], kit.Dict(ice.MSG_USERPOD, msg.Append(SPACE)))
 				}
 			}},
 			nfs.PS: {Hand: func(m *ice.Message, arg ...string) {
@@ -119,11 +118,7 @@ func init() {
 					RenderCookie(m, aaa.SessCreate(m, msg.Append(aaa.USERNAME)))
 					m.RenderRedirect(m.MergeLink(kit.Select(nfs.PS, msg.Append(mdb.TEXT)), msg.AppendSimple(RIVER, STORM)))
 				case FIELD:
-					if msg.Append(mdb.NAME) == "web.chat.grant" {
+					RenderPodCmd(m, msg.Append(SPACE), msg.Append(mdb.NAME), kit.UnMarshal(msg.Append(mdb.TEXT)))
-						RenderPodCmd(m, "", msg.Append(mdb.NAME), kit.UnMarshal(msg.Append(mdb.TEXT)))
-					} else {
-						RenderPodCmd(m, msg.Append(SPACE), msg.Append(mdb.NAME), kit.UnMarshal(msg.Append(mdb.TEXT)))
-					}
 				case DOWNLOAD:
 					m.RenderDownload(msg.Append(mdb.TEXT))
 				default:

base/web/space.go

@@ -23,26 +23,8 @@ import (
 	"shylinux.com/x/icebergs/base/web/html"
 	"shylinux.com/x/icebergs/misc/websocket"
 	kit "shylinux.com/x/toolkits"
-	"shylinux.com/x/toolkits/task"
 )
 
-var Info = struct {
-	ServeMainCount   int
-	ServeGetCount    int
-	ServePutCount    int
-	ServePostCount   int
-	ServeDeleteCount int
-	SpaceCmdCount    int
-	SpaceReadCount   int
-	SpaceReadByte    int
-	SpaceWriteCount  int
-	SpaceWriteByte   int
-	Commands         map[string]int
-}{
-	Commands: map[string]int{},
-}
-var InfoLock = &task.Lock{}
-
 func _space_qrcode(m *ice.Message, dev string) {
 	ssh.PrintQRCode(m, m.Cmdv(SPACE, dev, cli.PWD, mdb.LINK))
 }
@@ -98,7 +80,6 @@ func _space_fork(m *ice.Message) {
 		if msg := m.Cmd(TOKEN, m.Option(TOKEN)); msg.Append(mdb.TIME) > m.Time() && kit.IsIn(msg.Append(mdb.TYPE), SERVER, SPIDE) {
 			aaa.SessAuth(m, kit.Dict(m.Cmd(aaa.USER, m.Option(ice.MSG_USERNAME, msg.Append(mdb.NAME))).AppendSimple()))
 			name = SpaceName(kit.Select(name, msg.Append(mdb.TEXT)))
-			// kit.If(ProxyDomain(m.Spawn(kit.Dict(ice.MSG_USERROLE, aaa.TECH)), name), func(p string) { text = p })
 			kit.If(ProxyDomain(m, name), func(p string) { text = p })
 			safe = aaa.IsTechOrRoot(m)
 		}
@@ -146,11 +127,6 @@ func _space_handle(m *ice.Message, safe bool, name string, c *websocket.Conn) {
 		if e != nil {
 			break
 		}
-		func() {
-			defer InfoLock.Lock()()
-			Info.SpaceReadCount++
-			Info.SpaceReadByte += len(b)
-		}()
 		msg := m.Spawn(b)
 		if safe && msg.Option(ice.MSG_UNSAFE) != ice.TRUE { // 下行权限
 			if !aaa.IsTechOrRoot(msg) && msg.Option(ice.MSG_HANDLE) != ice.TRUE {
@@ -232,11 +208,6 @@ func _space_exec(m *ice.Message, name string, source, target []string, c *websoc
 		if m.IsErr() {
 			return
 		}
-		func() {
-			defer InfoLock.Lock()()
-			Info.SpaceCmdCount++
-			Info.Commands[kit.Select(kit.Select("", m.Detailv(), 0), m.Option(ice.MSG_INDEX))]++
-		}()
 		m.Options(ice.MSG_ARGS, "", ice.MSG_COUNT, "0")
 		kit.If(m.Option(ice.MSG_DAEMON), func(p string) {
 			m.Option(ice.MSG_DAEMON0, m.Option(ice.MSG_DAEMON))
@@ -258,11 +229,6 @@ func _space_echo(m *ice.Message, source, target []string, c *websocket.Conn) {
 	m.Options(ice.MSG_SOURCE, source, ice.MSG_TARGET, target[1:])
 	data := m.FormatMeta()
 	if !m.WarnNotValid(c.WriteMessage(1, []byte(data))) {
-		func() {
-			defer InfoLock.Lock()()
-			Info.SpaceWriteCount++
-			Info.SpaceWriteByte += len(data)
-		}()
 		if source != nil {
 			m.Log(kit.Select(tcp.SEND, tcp.DONE, m.Option(ice.MSG_HANDLE) == ice.TRUE), "%d %v->%v %v %v", len(data), source, target,
 				kit.ReplaceAll(kit.Format("%v", m.Detailv()), "\r\n", "\\r\\n", "\t", "\\t", "\n", "\\n"), data)
@@ -496,7 +462,7 @@ func init() {
 					m.Cmdy(arg[1:])
 					return
 				}
-				if kit.IsIn(arg[0], "", ice.Info.NodeName) {
+				if kit.IsIn(arg[0], "", ice.CONTEXTS, ice.Info.NodeName) {
 					m.Cmdy(arg[1:])
 					return
 				}

base/web/spide.go

@@ -345,22 +345,22 @@ func init() {
 				default:
 					switch arg[0] {
 					case mdb.NAME, mdb.ICONS:
-						m.SplitIndex(m.Cmdx(SPIDE, ice.DEV, kit.MergeURL2(m.Option(ORIGIN), C(SPACE, ice.INFO)))).Cut(arg[0])
+						m.SplitIndex(m.Cmdx(SPIDE, ice.DEV, kit.MergeURL2(m.Option(ORIGIN), C(SPACE, "info")))).Cut(arg[0])
 						mdb.HashInputs(m, arg)
 					default:
 						mdb.HashSelectValue(m.Spawn(), func(value ice.Map) {
 							m.Push(kit.Select(ORIGIN, arg, 0), kit.Value(value, kit.Keys("client", arg[0])))
 						})
 						kit.If(arg[0] == mdb.TYPE, func() { m.Push(arg[0], nfs.REPOS) })
-						m.Sort(arg[0])
 					}
 				}
 			}},
 			mdb.CREATE: {Name: "create origin* name icons type token", Hand: func(m *ice.Message, arg ...string) {
-				if m.Option(mdb.TYPE) == nfs.REPOS && (m.Option(mdb.NAME) == "" || m.Option(mdb.ICONS) == "") {
+				if m.Option(mdb.NAME) == "" || m.Option(mdb.ICONS) == "" {
 					msg := m.Spawn().SplitIndex(m.Cmdx(SPIDE, ice.DEV, kit.MergeURL2(m.Option(ORIGIN), C(SPACE, ice.INFO))))
 					if m.OptionDefault(mdb.NAME, msg.Append(mdb.NAME)); msg.Append(mdb.ICONS) != "" {
 						m.OptionDefault(mdb.ICONS, m.Resource(msg.Append(mdb.ICONS), msg.Append(ORIGIN)))
+						m.OptionDefault(mdb.TYPE, nfs.REPOS)
 					}
 				}
 				if u, e := url.Parse(m.Option(ORIGIN)); m.WarnNotValid(e != nil || u.Host == "", m.Option(ORIGIN)) {
@@ -388,9 +388,8 @@ func init() {
 				mdb.HashModify(m, mdb.NAME, m.Option(CLIENT_NAME), TOKEN, "")
 			}},
 			DEV_CREATE_TOKEN: {Hand: func(m *ice.Message, arg ...string) {
-				m.OptionDefault(CLIENT_NAME, m.Option(ice.FROM_SPACE))
 				mdb.HashModify(m, m.OptionSimple(CLIENT_NAME, TOKEN))
-				m.Cmd(SPACE, tcp.DIAL, m.Option(CLIENT_NAME)).Sleep300ms()
+				m.Cmd(SPACE, tcp.DIAL, ice.DEV, m.Option(CLIENT_NAME), m.OptionSimple(TOKEN)).Sleep300ms()
 			}},
 			DEV_REQUEST_TEXT: {Hand: func(m *ice.Message, arg ...string) { m.Echo(SpaceName(ice.Info.NodeName)) }},
 		}, DevTokenAction(CLIENT_NAME, CLIENT_URL), mdb.ImportantHashAction(mdb.SHORT, CLIENT_NAME, mdb.FIELD, "time,icons,client.name,client.url,client.type,token")), Hand: func(m *ice.Message, arg ...string) {
@@ -431,17 +430,8 @@ func init() {
 			return kit.Format(mdb.Cache(ice.Pulse, p, func() ice.Any { return m.Cmdx(SPIDE, ice.OPS, SPIDE_RAW, http.MethodGet, p) }))
 		} else if p == "" {
 			return ""
-		} else if nfs.Exists(m, p) {
-			return m.Cmdx(nfs.CAT, p)
-		} else if strings.Contains(p, "/pkg/mod/") {
-			ls := strings.Split(p, "/pkg/mod/")
-			return kit.Format(mdb.Cache(ice.Pulse, p, func() ice.Any { return m.Cmdx(SPIDE, ice.OPS, SPIDE_RAW, http.MethodGet, nfs.REQUIRE+ls[1]) }))
-		} else if strings.Contains(p, "/usr/local/work/") {
-			ls := strings.Split(strings.Split(p, "/usr/local/work/")[1], "/src/")
-			pp := kit.MergeURL2(ice.Info.Make.Domain, "/p/src/"+ls[1]+"?pod="+ls[0])
-			return kit.Format(mdb.Cache(ice.Pulse, p, func() ice.Any { return m.Cmdx(SPIDE, ice.OPS, SPIDE_RAW, http.MethodGet, pp) }))
 		} else {
-			return ""
+			return m.Cmdx(nfs.CAT, p)
 		}
 	}
 	nfs.TemplatePath = func(m *ice.Message, arg ...string) string {
@@ -526,12 +516,7 @@ func HostPort(m *ice.Message, host, port string, arg ...string) string {
 		kit.If(kit.Select("", arg, 1), func(cmd string) { p += C(cmd) })
 	}
 	kit.If(m.Option(ice.LOG_DEBUG) == ice.TRUE, func() { p += "?debug=true" })
-	kit.If(host == "", func() {
+	kit.If(host == "", func() { host = kit.ParseURL(UserHost(m)).Hostname() })
-		if u := kit.ParseURL(UserHost(m)); u != nil {
-			host = u.Hostname()
-		}
-	})
-	host = kit.Select("localhost", host)
 	if port == tcp.PORT_443 {
 		return kit.Format("https://%s", host) + p
 	} else if port == tcp.PORT_80 {

base/web/store.go

@@ -22,25 +22,13 @@ func init() {
 同样的每个用户，也可以添加任意多个商店，直接将空间下载到本机使用。
 `, 300.0)
 			}},
-			mdb.INPUTS: {Hand: func(m *ice.Message, arg ...string) {
+			mdb.INPUTS: {Hand: func(m *ice.Message, arg ...string) { m.Cmdy(SPIDE, mdb.INPUTS, arg) }},
-				switch arg[0] {
-				case ORIGIN:
-					m.Cmd(BROAD).Table(func(value ice.Maps) {
-						m.Push(arg[0], HostPort(m, value[tcp.HOST], value[tcp.PORT]))
-					})
-				}
-				m.Cmdy(SPIDE, mdb.INPUTS, arg)
-			}},
 			mdb.CREATE: {Name: "create origin* name icons", Hand: func(m *ice.Message, arg ...string) {
 				m.Cmd(SPIDE, mdb.CREATE, m.OptionSimple("origin,name,icons"), mdb.TYPE, nfs.REPOS)
 			}},
 			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))
@@ -51,6 +39,12 @@ 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))
@@ -58,6 +52,10 @@ 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)
@@ -66,18 +64,20 @@ func init() {
 				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).Push(mdb.NAME, value[CLIENT_NAME]).Push(mdb.ICONS, value[mdb.ICONS]).Push(ORIGIN, value[CLIENT_ORIGIN])
+						m.Push(mdb.TYPE, ORIGIN)
+						m.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)
+							m.Push("exists", ice.TRUE)
 						} else {
-							m.Push(mdb.STATUS, ice.FALSE)
+							m.Push("exists", ice.FALSE)
 						}
 					})
 				})
-				if m.SortStrR(mdb.NAME); ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) {
+				m.SortStrR(mdb.NAME)
+				if ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) {
 					m.Action()
 				} else {
-					m.PushAction(OPEN, tcp.DIAL, mdb.REMOVE).Action(mdb.CREATE)
+					m.PushAction(OPEN, "connect", mdb.REMOVE).Action(mdb.CREATE)
 				}
 			} else {
 				defer ToastProcess(m, ice.LIST, arg[0])()
@@ -89,40 +89,36 @@ func init() {
 				origin := SpideOrigin(m, arg[0])
 				kit.If(origin == "", func() { arg[0], origin, dream = ice.DEV, arg[0], arg[0]+dream })
 				// if kit.IsIn(kit.ParseURL(origin).Hostname(), append(m.Cmds(tcp.HOST).Appendv(aaa.IP), tcp.LOCALHOST)...) {
-				// if kit.IsIn(kit.ParseURL(origin).Hostname(), tcp.LOCALHOST) {
+				if kit.IsIn(kit.ParseURL(origin).Hostname(), tcp.LOCALHOST) {
-				// origin = m.Option(ice.MSG_USERHOST)
+					origin = m.Option(ice.MSG_USERHOST)
-				// } else {
+				} 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] == "" {
+					// if value[nfs.BINARY] == "" {
-						value[nfs.BINARY] = origin + S(value[mdb.NAME])
+					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)
+						m.Push("exists", ice.TRUE)
 					} else {
-						m.Push(mdb.STATUS, ice.FALSE)
+						m.Push("exists", ice.FALSE)
 					}
 					if value[mdb.TYPE] == SERVER {
 						m.Push(mdb.TEXT, value[mdb.TEXT]).Push(ORIGIN, value[mdb.TEXT]).PushButton()
 						return
 					}
 					m.Push(mdb.TEXT, value[nfs.REPOS]).Push(ORIGIN, origin)
-					button := []ice.Any{PORTAL}
+					if _, ok := list[value[mdb.NAME]]; ok || arg[0] == ice.OPS {
-					if _, ok := list[value[mdb.NAME]]; ok {
+						m.PushButton(PORTAL, INSTALL)
-						button = append(button, OPEN)
+					} else if ice.Info.NodeType == WORKER || !aaa.IsTechOrRoot(m) {
-					} else if aaa.IsTechOrRoot(m) {
+						m.PushButton(PORTAL)
-						button = append(button, INSTALL)
+					} else {
+						m.PushButton(PORTAL, INSTALL)
 					}
-					m.PushButton(button...)
 				})
 				m.StatusTimeCount(ORIGIN, origin, stat)
 			}

base/web/store.js

@@ -6,7 +6,7 @@ Volcanos(chat.ONIMPORT, {
 	},
 	_project: function(can, msg, dev, target) {
 		msg.Table(function(value) { if (value.type == web.WORKER) { return }
-			value.nick = [{text: value.name}, value.status == "true" && {text: ["●", "", "exists"]}]
+			value.nick = [{text: value.name}, value.exists == "true" && {text: ["●", "", "exists"]}]
 			value._hash = dev.concat([value.name]).join(":"), value._select = can.base.beginWith(can.db.hash.join(":"), value._hash)
 			value.icons = can.misc.Resource(can, value.icons||"usr/icons/icebergs.png", "", value.origin)
 			can.onimport.itemlist(can, [value], function(event, item, show, target) {

base/web/token.go

@@ -25,7 +25,7 @@ func init() {
 					}
 				})
 			}},
-		}, mdb.HashAction(mdb.SHORT, mdb.UNIQ, mdb.EXPIRE, mdb.MONTH, html.CHECKBOX, ice.TRUE)), Hand: func(m *ice.Message, arg ...string) {
+		}, mdb.ExportHashAction(mdb.SHORT, mdb.UNIQ, mdb.EXPIRE, mdb.MONTH, html.CHECKBOX, ice.TRUE)), Hand: func(m *ice.Message, arg ...string) {
 			if mdb.HashSelect(m, arg...); len(arg) > 0 {
 				m.EchoScript(kit.MergeURL2(m.Option(ice.MSG_USERWEB), nfs.PS, TOKEN, arg[0]))
 			} else {

conf.go

@@ -62,15 +62,15 @@ const (
 )
 const ( // REPOS
 	CONTEXTOS = "ContextOS"
-	// CONTEXTS  = "contexts"
+	CONTEXTS  = "contexts"
-	INTSHELL = "intshell"
+	INTSHELL  = "intshell"
-	LEARNING = "learning"
+	LEARNING  = "learning"
-	VOLCANOS = "volcanos"
+	VOLCANOS  = "volcanos"
-	TOOLKITS = "toolkits"
+	TOOLKITS  = "toolkits"
-	ICEBERGS = "icebergs"
+	ICEBERGS  = "icebergs"
-	RELEASE  = "release"
+	RELEASE   = "release"
-	MATRIX   = "matrix"
+	MATRIX    = "matrix"
-	ICONS    = "icons"
+	ICONS     = "icons"
 
 	INSTALL = "install"
 	REQUIRE = "require"

core/chat/header.go

@@ -164,12 +164,7 @@ func init() {
 			}
 			m.Option(aaa.LANGUAGE, strings.ReplaceAll(strings.ToLower(kit.Select("", kit.Split(kit.GetValid(
 				func() string { return kit.Select("", "zh-cn", strings.Contains(m.Option(ice.MSG_USERUA), "zh_CN")) },
-				func() string {
+				func() string { return kit.Select("", kit.Split(m.R.Header.Get(html.AcceptLanguage), ",;"), 0) },
-					if m.R != nil {
-						return kit.Select("", kit.Split(m.R.Header.Get(html.AcceptLanguage), ",;"), 0)
-					}
-					return ""
-				},
 				func() string { return ice.Info.Lang },
 			), " ."), 0)), "_", "-"))
 			m.Option("language.list", m.Cmd(nfs.DIR, nfs.TemplatePath(m, aaa.LANGUAGE)+nfs.PS, nfs.FILE).Appendv(nfs.FILE))

core/chat/iframe.go

@@ -65,10 +65,7 @@ func init() {
 				kit.If(m.Option(mdb.TYPE) == web.LINK, func() { ctx.ProcessField(m, m.ShortKey(), m.Option(mdb.TEXT)) })
 			}},
 		}, FavorAction(), mdb.HashAction(mdb.SHORT, web.LINK, mdb.FIELD, "time,hash,type,name,link")), Hand: func(m *ice.Message, arg ...string) {
-			list := []string{m.MergePodCmd("", web.PORTAL), m.MergePodCmd("", web.ADMIN), m.MergePodCmd("", web.DESKTOP)}
+			list := []string{m.MergePodCmd("", web.PORTAL), m.MergePodCmd("", web.ADMIN)}
-			m.Cmd(web.SPACE).Table(func(value ice.Maps) {
-				kit.If(kit.IsIn(value[mdb.TYPE], web.WORKER, web.SERVER), func() { list = append(list, m.MergePod(value[mdb.NAME])) })
-			})
 			if mdb.HashSelect(m, arg...); len(arg) == 0 {
 				for _, link := range list {
 					if u := kit.ParseURL(link); u != nil {

core/chat/macos/desktop.js

@@ -6,7 +6,7 @@ Volcanos(chat.ONIMPORT, {
 		can.sup.onexport.link = function() { return can.misc.MergeURL(can, {pod: can.ConfSpace()||can.misc.Search(can, ice.POD), cmd: web.DESKTOP}) }
 		can.onexport.title(can, can.ConfHelp(), can.user.titles)
 	},
-	_menu: function(can) { can.onappend.plugin(can, {index: "web.chat.macos.menu", style: html.OUTPUT, title: can.Conf("title")}, function(sub) { can.ui.menu = sub, sub._desktop = can
+	_menu: function(can) { can.onappend.plugin(can, {index: "web.chat.macos.menu", style: html.OUTPUT}, function(sub) { can.ui.menu = sub, sub._desktop = can
 		var tabs = can.misc.sessionStorage(can, [can.ConfIndex(), html.TABS])
 		sub.onexport.output = function() { can.onimport._desktop(can, can._msg)
 			var sess = can.misc.SearchHash(can)[0]||can.Conf("session")

core/chat/macos/menu.js

@@ -8,7 +8,6 @@ Volcanos(chat.ONIMPORT, {_init: function(can, msg) { can.page.style(can, can._ou
 		{view: [[html.MENU, html.TITLE]], list: [
 			{img: can.misc.ResourceFavicon(can, msg.Option(html.FAVICON), can.ConfSpace())},
 			{text: decodeURIComponent(
-				can.Conf("title")||
 				(window == top? can.user.info.titles: "")||can.ConfSpace()||can.misc.Search(can, ice.POD)||location.host
 			)},
 		], onclick: function(event) { can.sup.onexport.record(can, html.DESKTOP) }},

core/code/autogen.go

@@ -49,9 +49,6 @@ func _autogen_import(m *ice.Message, main string, ctx string, mod string) string
 	_autogen_defs(m, ice.SRC_MAIN_GO, ice.ETC_MISS_SH, ice.README_MD, ice.MAKEFILE, ice.LICENSE)
 	begin, done, list := false, false, []string{}
 	imports := kit.Format(`_ "%s/src/%s"`, mod, ctx)
-	if mod == "shylinux.com/x/ice" {
-		imports = kit.Format(`_ "%s/%s"`, mod, ctx)
-	}
 	m.Cmd(nfs.CAT, main, func(line string, index int) {
 		if strings.HasSuffix(line, imports) {
 			done = true
@@ -197,18 +194,20 @@ func init() {
 				}
 			}},
 			DEVPACK: {Help: "开发", Hand: func(m *ice.Message, arg ...string) {
-				if m.Cmdy(WEBPACK, mdb.REMOVE); ice.Info.NodeType == web.SERVER {
+				m.Cmdy(WEBPACK, mdb.REMOVE)
-					m.Cmdy(web.DREAM, nfs.GOWORK)
+				if ice.Info.NodeType == web.SERVER {
+					m.Cmd(web.DREAM, nfs.GOWORK)
 				}
 			}},
 			WEBPACK: {Help: "打包", Hand: func(m *ice.Message, arg ...string) {
-				if m.Cmdy(WEBPACK, mdb.CREATE); ice.Info.NodeType == web.SERVER {
+				m.Cmdy(WEBPACK, mdb.CREATE)
+				if ice.Info.NodeType == web.SERVER {
 					nfs.Trash(m, ice.GO_WORK_SUM)
 					nfs.Trash(m, ice.GO_WORK)
 				}
 			}},
 			IMPORT: {Hand: func(m *ice.Message, arg ...string) {
-				m.Echo(_autogen_import(m, kit.Select(ice.SRC_MAIN_GO, arg, 2), arg[0], kit.Select(_autogen_mod(m, ice.GO_MOD), arg, 1)))
+				_autogen_import(m, ice.SRC_MAIN_GO, arg[0], kit.Select(_autogen_mod(m, ice.GO_MOD), arg, 1))
 			}},
 			BINPACK: {Help: "打包", Hand: func(m *ice.Message, arg ...string) {
 				kit.For([]string{"intshell", "volcanos", "node_modules", "learning", "icons"}, func(p string) {

core/code/compile.go

@@ -1,6 +1,7 @@
 package code
 
 import (
+	"os"
 	"path"
 	"runtime"
 	"strings"
@@ -118,16 +119,17 @@ func init() {
 			m.Options(cli.CMD_ENV, env).Cmd(AUTOGEN, VERSION)
 			_compile_get(m, main)
 			defer m.StatusTime(VERSION, strings.TrimPrefix(GoVersion(m), "go version"))
-			args := []string{main, ice.SRC_VERSION_GO}
+			args := []string{main, ice.SRC_VERSION_GO, ice.SRC_BINPACK_GO, ice.SRC_BINPACK_USR_GO}
-			nfs.Exists(m, "src/option.go", func(p string) { args = append(args, p) })
+			if _, e := os.Stat("src/option.go"); e == nil {
-			kit.If(file != ice.BIN_ICE_BIN, func() { args = append(args, ice.SRC_BINPACK_GO, ice.SRC_BINPACK_USR_GO) })
+				args = append(args, "src/option.go")
+			}
 			if msg := GoBuild(m.Spawn(), file, args...); !cli.IsSuccess(msg) {
 				m.Copy(msg)
 			} else {
 				m.Logs(nfs.SAVE, nfs.TARGET, file, nfs.SOURCE, main)
 				m.Cmdy(nfs.DIR, file, "time,path,size,hash,link")
 				web.MessageInsertJSON(m, cli.SYSTEM, "", m.Spawn().Copy(m).FormatMeta(), ctx.ARGS, m.Append(mdb.HASH))
-				kit.If(!m.IsCliUA() && strings.Contains(file, ice.ICE), func() { m.Cmdy(PUBLISH, nfs.CONTEXTS, ice.APP) })
+				kit.If(!m.IsCliUA() && strings.Contains(file, ice.ICE), func() { m.Cmdy(PUBLISH, ice.CONTEXTS, ice.APP) })
 				web.Count(m, "", file)
 			}
 		}},

core/code/go.go

@@ -74,7 +74,7 @@ func _go_show(m *ice.Message, arg ...string) {
 		// ctx.ProcessField(m, "web.code.xterm", kit.Simple())
 		ctx.ProcessField(m, "log.debug", kit.Simple("bench"))
 	} else if cmd := ctx.GetFileCmd(path.Join(arg[2], arg[1])); cmd != "" {
-		if p := path.Join(arg[2], strings.Split(arg[1], "/")[0], "portal.go"); path.Base(arg[1]) != "portal.go" &&
+		if p := path.Join(arg[2], strings.Split(arg[1], "/")[0], "portal.go"); path.Base(arg[1]) != "portal.go" && nfs.Exists(m, p) &&
 			!kit.IsIn(arg[1],
 				"gonganxitong/user.go",
 				"gonganxitong/sess.go",
@@ -82,8 +82,7 @@ func _go_show(m *ice.Message, arg ...string) {
 				"gonganxitong/domain.go",
 				"gonganxitong/command.go",
 				"gonganxitong/quotalist.go",
-				"operation/studio.go",
+			) {
-			) && nfs.Exists(m, p) {
 			if cmd := ctx.GetFileCmd(p); cmd != "" {
 				if m.ActionKey() == mdb.RENDER {
 					ctx.ProcessField(m, cmd, kit.Simple())
@@ -229,7 +228,7 @@ func TableName(model string) string {
 	}
 	if kit.IsIn(model, "sms", "equipment") {
 
-	} else if kit.HasSuffix(model, "y") && !kit.HasSuffix(model, "way") {
+	} else if kit.HasSuffix(model, "y") {
 		model = model[:len(model)-1] + "ies"
 	} else if kit.HasSuffix(model, "s") {
 		if !kit.HasSuffix(model, "os") {

core/code/js.go

@@ -22,9 +22,7 @@ func _js_show(m *ice.Message, arg ...string) {
 			ctx.ProcessField(m, kit.Select(ice.CAN_PLUGIN, "web."+strings.Replace(strings.TrimSuffix(strings.TrimPrefix(arg[1], "plugin/local/"), nfs.PT+JS), nfs.PS, nfs.PT, -1)), nil)
 		}
 	} else {
-		if p := path.Join(arg[2], strings.Split(arg[1], "/")[0], "portal.go"); !kit.IsIn(arg[1],
+		if p := path.Join(arg[2], strings.Split(arg[1], "/")[0], "portal.go"); nfs.Exists(m, p) {
-			"operation/studio.js",
-		) && nfs.Exists(m, p) {
 			if cmd := ctx.GetFileCmd(p); cmd != "" {
 				ctx.ProcessField(m, cmd, kit.Simple())
 				return

core/code/publish.go

@@ -67,12 +67,11 @@ func _publish_contexts(m *ice.Message, arg ...string) {
 			}
 			if m.Option(ice.MSG_USERPOD) != "" {
 				env = append(env, cli.CTX_POD, m.Option(ice.MSG_USERPOD))
-			} else if name := msg.Append(nfs.PATHNAME); !kit.IsIn(name, path.Base(m.Option(nfs.SOURCE))) {
+			} else if name := msg.Append(nfs.PATHNAME); !kit.IsIn(name, path.Base(m.Option(nfs.SOURCE)), ice.CONTEXTS) {
 				env = append(env, cli.CTX_NAME, name)
 			}
 		case cli.CURL, cli.WGET:
 		}
-		env = append(env, kit.Simple(m.Optionv(cli.CTX_ENV))...)
 		kit.If(len(env) > 0, func() { m.Options(cli.CTX_ENV, lex.SP+kit.JoinKV(mdb.EQ, lex.SP, env...)) })
 		if template := strings.TrimSpace(nfs.Template(m, kit.Keys(k, SH))); m.Option(nfs.FORMAT) == "raw" {
 			m.Echo(template)
@@ -94,9 +93,9 @@ func init() {
 	Index.MergeCommands(ice.Commands{
 		PUBLISH: {Name: "publish path auto create volcanos icebergs intshell", Help: "发布", Icon: "QuickTime Player.png", Role: aaa.VOID, Actions: ice.MergeActions(ice.Actions{
 			ice.VOLCANOS: {Help: "火山架", Hand: func(m *ice.Message, arg ...string) { _publish_list(m, kit.ExtReg(HTML, CSS, JS)) }},
-			ice.ICEBERGS: {Help: "冰山架", Hand: func(m *ice.Message, arg ...string) { _publish_bin_list(m).Cmdy("", nfs.CONTEXTS) }},
+			ice.ICEBERGS: {Help: "冰山架", Hand: func(m *ice.Message, arg ...string) { _publish_bin_list(m).Cmdy("", ice.CONTEXTS) }},
 			ice.INTSHELL: {Help: "神农架", Hand: func(m *ice.Message, arg ...string) { _publish_list(m, kit.ExtReg(SH, VIM, CONF)) }},
-			nfs.CONTEXTS: {Hand: func(m *ice.Message, arg ...string) { _publish_contexts(m, arg...) }},
+			ice.CONTEXTS: {Hand: func(m *ice.Message, arg ...string) { _publish_contexts(m, arg...) }},
 			nfs.SOURCE:   {Hand: func(m *ice.Message, arg ...string) { _publish_contexts(m, nfs.SOURCE) }},
 			nfs.BINARY:   {Hand: func(m *ice.Message, arg ...string) { _publish_contexts(m, nfs.BINARY) }},
 			cli.CURL:     {Hand: func(m *ice.Message, arg ...string) { _publish_contexts(m, cli.CURL) }},
@@ -132,7 +131,7 @@ func init() {
 			nfs.TRASH:  {Hand: func(m *ice.Message, arg ...string) { nfs.Trash(m, path.Join(ice.USR_PUBLISH, m.Option(nfs.PATH))) }},
 		}, ctx.ConfAction(mdb.FIELD, nfs.PATH)), Hand: func(m *ice.Message, arg ...string) {
 			if m.Option(nfs.DIR_ROOT, ice.USR_PUBLISH); len(arg) == 0 {
-				_publish_list(m).Cmdy("", nfs.CONTEXTS, ice.APP)
+				_publish_list(m).Cmdy("", ice.CONTEXTS, ice.APP)
 			} else {
 				m.Cmdy(nfs.DIR, arg[0], "time,path,size,hash,link,action", ice.OptionFields(mdb.DETAIL))
 				web.PushImages(m, web.P(PUBLISH, arg[0]))

core/code/upgrade.go

@@ -33,7 +33,6 @@ func init() {
 				uri := "/publish/" + kit.Format(value[nfs.FILE])
 				kit.If(m.Spawn().Options(ice.MSG_USERPOD, "").ParseLink(ice.Info.Make.Domain).Option(ice.MSG_USERPOD), func(p string) {
 					uri = kit.MergeURL(uri, ice.POD, p)
-					uri = kit.MergeURL2(ice.Info.Make.Domain, uri)
 				})
 				dir := path.Join(kit.Format(value[nfs.PATH]), kit.Format(value[nfs.FILE]))
 				web.GoToast(m, func(toast func(name string, count, total int)) []string {

core/code/vimer.go

@@ -136,9 +136,6 @@ func init() {
 			nfs.TRASH: {Hand: func(m *ice.Message, arg ...string) {
 				nfs.Trash(m, arg[0])
 			}},
-			web.UPLOAD: {Hand: func(m *ice.Message, arg ...string) {
-				web.UploadSave(m, path.Dir(path.Join(m.Option(nfs.PATH), m.Option(nfs.FILE)))+nfs.PS)
-			}},
 			nfs.SAVE: {Hand: func(m *ice.Message, arg ...string) {
 				kit.If(m.Option(nfs.CONTENT) == "", func() { m.Option(nfs.CONTENT, m.Cmdx("", TEMPLATE)) })
 				m.Cmd(nfs.SAVE, path.Join(m.Option(nfs.PATH), m.Option(nfs.FILE)))

core/core.go

@@ -2,6 +2,7 @@ package core
 
 import (
 	_ "shylinux.com/x/icebergs/core/chat"
+	_ "shylinux.com/x/icebergs/core/chat/location"
 	_ "shylinux.com/x/icebergs/core/chat/macos"
 	_ "shylinux.com/x/icebergs/core/code"
 	_ "shylinux.com/x/icebergs/core/mall"

core/wiki/geoarea.go

@@ -21,7 +21,7 @@ func init() {
 	Index.MergeCommands(ice.Commands{
 		GEOAREA: {Name: "geoarea path auto", Help: "地区", Actions: ice.Actions{
 			ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) {
-				// m.Cmd(web.SPIDE, mdb.CREATE, "https://geo.datav.aliyun.com/areas_v3/bound/", GEOAREA)
+				m.Cmd(web.SPIDE, mdb.CREATE, "https://geo.datav.aliyun.com/areas_v3/bound/", GEOAREA)
 			}},
 			nfs.PS: {Hand: func(m *ice.Message, arg ...string) {
 				p := path.Join(ice.USR_GEOAREA, path.Join(arg...))

go.mod

@@ -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.19
+	shylinux.com/x/toolkits v1.0.16
 	shylinux.com/x/websocket v0.0.4
 )

go.sum

@@ -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.19 h1:Nrx0xYRc5ph1WS66EZ1hJUCe+2FdSWQ4QP6tBlguikQ=
+shylinux.com/x/toolkits v1.0.16 h1:7Oh454uAyBLfflIFEQooLNzml4pqXIReiaxEVA/YXaU=
-shylinux.com/x/toolkits v1.0.19/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q=
+shylinux.com/x/toolkits v1.0.16/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=

meta.go

@@ -130,10 +130,6 @@ func (m *Message) Push(key string, value Any, arg ...Any) *Message {
 			k = strings.TrimSuffix(k, "*")
 			m.Push(k, kit.Select(kit.Format(val[k]), value[k]))
 		})
-	case map[string]int:
-		kit.For(value, func(key string, value int) {
-			m.Push(key, value)
-		})
 	default:
 		keys := strings.Split(key, ",")
 		kit.For(kit.Simple(value, arg), func(v string, i int) {

misc/coder/server.go

@@ -52,4 +52,4 @@ func (s server) List(m *ice.Message, arg ...string) {
 		})
 	}
 }
-func init() { ice.Cmd("web.code.coder.server", server{}) }
+func init() { ice.CodeCtxCmd(server{}) }

misc/git/service.go

@@ -202,7 +202,7 @@ func init() {
 					m.Push(nfs.SIZE, kit.Split(m.Cmdx(cli.SYSTEM, "du", "-sh", path.Join(ice.USR_LOCAL_REPOS, value[REPOS])))[0])
 					m.PushScript(kit.Format("git clone %s", _service_link(m, value[REPOS])))
 				}).Sort(REPOS)
-				kit.If(!m.IsCliUA(), func() { m.Cmdy(web.CODE_PUBLISH, nfs.CONTEXTS, ice.DEV) })
+				kit.If(!m.IsCliUA(), func() { m.Cmdy(web.CODE_PUBLISH, ice.CONTEXTS, ice.DEV) })
 				kit.If(mdb.Config(m, aaa.AUTH) == aaa.PRIVATE, func() { m.StatusTimeCount(aaa.AUTH, aaa.PRIVATE) })
 				m.PushAction("settoken", mdb.REMOVE).Action(mdb.CREATE, aaa.AUTH)
 			} else if repos := _repos_open(m, arg[0]); len(arg) == 1 {

misc/git/status.go

@@ -93,7 +93,7 @@ func init() {
 				} else {
 					m.Action(PULL, PUSH, INSTEADOF, mdb.DEV_REQUEST, ctx.CONFIG, STASH)
 				}
-				kit.If(!m.IsCliUA(), func() { m.Cmdy(code.PUBLISH, nfs.CONTEXTS, ice.DEV) })
+				kit.If(!m.IsCliUA(), func() { m.Cmdy(code.PUBLISH, ice.CONTEXTS, ice.DEV) })
 				ctx.Toolkit(m)
 			} else {
 				_repos_cmd(m, arg[0], DIFF)

misc/git/totals.go

@@ -118,9 +118,9 @@ func init() {
 }
 func TableGo(m *ice.Message, cb ice.Any) *ice.Message {
 	wg, lock := sync.WaitGroup{}, &task.Lock{}
-	wg.Add(m.Length())
 	defer wg.Wait()
 	m.Table(func(value ice.Maps) {
+		wg.Add(1)
 		task.Put(m.FormatTaskMeta(), logs.FileLine(cb), func(*task.Task) {
 			defer wg.Done()
 			switch cb := cb.(type) {

misc/misc.go

@@ -1,5 +1,8 @@
 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/vim"
 )

misc/ssh/relay/relay.go

@@ -228,21 +228,18 @@ func (s relay) List(m *ice.Message, arg ...string) *ice.Message {
 			stats[DISK_TOTAL] += kit.Int(ls[1])
 		}
 		if value[web.PORTAL] == "" {
-			m.Push(web.LINK, "").PushButton(s.Xterm,
+			m.Push(web.LINK, "").PushButton(s.Xterm, s.Pushbin, s.Install, s.Remove)
-				// s.Pushbin, s.Install,
-				s.Remove)
 		} else {
 			m.Push(web.LINK, m.HostPort(value[tcp.HOST], value[web.PORTAL]))
 			m.PushButton(s.Portal, s.Desktop, s.Admin, s.Open,
-				// s.Status, s.Vimer,
+				s.Status, s.Vimer, s.Login,
-				s.Login,
 				s.Spide,
-				// s.AdminCmd,
+				s.AdminCmd,
-				// s.Upgrade,
+				s.Upgrade,
-				// s.Pushbin,
+				s.Pushbin,
-				// s.Pushkey,
+				s.Pushkey,
 				s.Xterm,
-				// s.SetIcon,
+				s.SetIcon,
 				s.Remove)
 			kit.If(len(arg) > 0, func() { m.PushQRCode(cli.QRCODE, m.Append(web.LINK)) })
 		}