add some

base/cli/runtime.go

@@ -149,16 +149,15 @@ const (
 )
 const (
 	CTX_SHY    = "ctx_shy"
-	CTX_WEB    = "ctx_web"
-	CTX_GIT    = "ctx_git"
-	CTX_DEV_IP = "ctx_dev_ip"
 	CTX_DEV    = "ctx_dev"
+	CTX_DEV_IP = "ctx_dev_ip"
 	CTX_OPS    = "ctx_ops"
 	CTX_REPOS  = "ctx_repos"
 	CTX_NAME   = "ctx_name"
 	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,6 +51,9 @@ 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/web/cache.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"os"
 	"path"
+	"strings"
 
 	ice "shylinux.com/x/icebergs"
 	"shylinux.com/x/icebergs/base/aaa"
@@ -189,6 +190,12 @@ 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

@@ -174,7 +174,8 @@ 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))
 	}
@@ -249,8 +250,8 @@ func init() {
 					if aaa.IsTechOrRoot(m) && m.Option(ctx.ACTION) == GRANT {
 						m.Cmdy(aaa.USER).Cut(aaa.USERNAME, aaa.USERNICK).Option(ice.TABLE_CHECKBOX, ice.FALSE)
 					} else {
-						m.Push(arg[0], m.Option(ice.MSG_USERNAME))
 						m.Push(arg[0], m.Option(tcp.NODENAME))
+						m.Push(arg[0], m.Option(ice.MSG_USERNAME))
 					}
 				case nfs.REPOS:
 				case nfs.BINARY:
@@ -306,6 +307,9 @@ func init() {
 				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) {
@@ -367,12 +371,12 @@ func init() {
 			}},
 			SETTOKEN: {Name: "settoken nodename* username*", Help: "令牌", Style: html.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{CLIENT_NAME: ice.DEV, TOKEN: token})
+				m.Cmd(SPACE, m.Option(mdb.NAME), SPIDE, DEV_CREATE_TOKEN, ice.Maps{TOKEN: token})
 			}},
 			GETTOKEN: {Help: "令牌", Style: html.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", Hand: func(m *ice.Message, arg ...string) {
+			GRANT: {Name: "grant username", Role: aaa.VOID, Hand: func(m *ice.Message, arg ...string) {
 				if aaa.IsTechOrRoot(m) && m.Option(aaa.USERNAME) != "" {
 					m.Option(ice.MSG_USERNAME, m.Option(aaa.USERNAME))
 				}
@@ -476,6 +480,7 @@ 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",
@@ -485,10 +490,7 @@ func init() {
 				if ice.Info.NodeType == WORKER {
 					return
 				}
-				if _dream_list(m); m.Length() == 0 {
-					m.EchoInfoButton(m.Trans("please scan or create new dream", "请扫描或创建新空间"), mdb.CREATE, nfs.SCAN)
-					return
-				}
+				_dream_list(m)
 				if _dream_list_more(m); !aaa.IsTechOrRoot(m) || m.IsCliUA() {
 					m.Action()
 				} else if m.IsDebug() && cli.SystemFindGo(m) {
@@ -496,12 +498,17 @@ func init() {
 				} 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)
 			} else if arg[0] == ctx.ACTION {
-				gdb.Event(m, DREAM_ACTION, arg)
+				m.Cmdy(arg[1], DREAM_ACTION, arg)
+				// gdb.Event(m, DREAM_ACTION, arg)
 			}
 		}},
 	})

base/web/render.go

@@ -84,6 +84,7 @@ 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),
 			)))
@@ -171,7 +172,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 := kit.Select("localhost:9020", UserWeb(m).Host)
+		serve := strings.Split(UserHost(m), "://")[1]
 		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,10 +35,6 @@ 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)
@@ -47,12 +43,16 @@ func _serve_start(m *ice.Message) {
 		}
 		if msg := m.Cmd(SPIDE, dev); msg.Append(TOKEN) == "" {
 			if m.Option(TOKEN) != "" {
-				m.Sleep300ms(SPACE, tcp.DIAL, ice.DEV, dev, TOKEN, m.Option(TOKEN))
+				m.Cmd(SPACE, tcp.DIAL, ice.DEV, dev, TOKEN, m.Option(TOKEN))
 			} else {
-				m.Sleep300ms(SPACE, tcp.DIAL, ice.DEV, dev)
+				m.Cmd(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,6 +65,10 @@ 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))
@@ -214,6 +218,20 @@ 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 {

base/web/space.go

@@ -23,8 +23,26 @@ 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))
 }
@@ -80,6 +98,7 @@ 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)
 		}
@@ -127,6 +146,11 @@ 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 {
@@ -208,6 +232,11 @@ 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))
@@ -229,6 +258,11 @@ 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)

base/web/spide.go

@@ -311,7 +311,6 @@ func init() {
 				m.Cmd("", mdb.CREATE, kit.Select(dev, os.Getenv("ctx_dev_ip")), ice.DEV_IP, ice.SRC_MAIN_ICO, "dev_ip")
 				m.Cmd("", mdb.CREATE, kit.Select("http://localhost:9020", conf[cli.CTX_OPS]), ice.OPS, ice.SRC_MAIN_ICO, nfs.REPOS)
 				m.Cmd("", mdb.CREATE, kit.Select("https://shylinux.com", conf[cli.CTX_SHY]), ice.SHY, ice.SRC_MAIN_ICO, nfs.REPOS)
-				m.Cmd("", mdb.CREATE, kit.Select("https://web.shylinux.com", conf[cli.CTX_WEB]), ice.WEB, ice.SRC_MAIN_ICO, nfs.REPOS)
 				m.Cmd("", mdb.CREATE, kit.Select("https://mail.shylinux.com", conf[cli.CTX_MAIL]), ice.MAIL, "usr/icons/Mail.png", "mail")
 				m.Cmd("", mdb.CREATE, kit.Select("https://demo.shylinux.com", conf[cli.CTX_DEMO]), ice.DEMO, ice.SRC_MAIN_ICO, "demo")
 				m.Cmd("", mdb.CREATE, "https://2023.shylinux.com", "2023-ContextOS", ice.SRC_MAIN_ICO, nfs.REPOS)
@@ -389,8 +388,9 @@ 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, ice.DEV, m.Option(CLIENT_NAME), m.OptionSimple(TOKEN)).Sleep300ms()
+				m.Cmd(SPACE, tcp.DIAL, m.Option(CLIENT_NAME)).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,8 +431,17 @@ 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 {
+		} 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 ""
 		}
 	}
 	nfs.TemplatePath = func(m *ice.Message, arg ...string) string {

base/web/store.go

@@ -65,7 +65,7 @@ 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) })
+						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)

core/chat/header.go

@@ -164,7 +164,12 @@ 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 { return kit.Select("", kit.Split(m.R.Header.Get(html.AcceptLanguage), ",;"), 0) },
+				func() string {
+					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/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}, function(sub) { can.ui.menu = sub, sub._desktop = can
+	_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
 		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,6 +8,7 @@ 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,6 +49,9 @@ 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
@@ -194,14 +197,12 @@ func init() {
 				}
 			}},
 			DEVPACK: {Help: "开发", Hand: func(m *ice.Message, arg ...string) {
-				m.Cmdy(WEBPACK, mdb.REMOVE)
-				if ice.Info.NodeType == web.SERVER {
-					m.Cmd(web.DREAM, nfs.GOWORK)
+				if m.Cmdy(WEBPACK, mdb.REMOVE); ice.Info.NodeType == web.SERVER {
+					m.Cmdy(web.DREAM, nfs.GOWORK)
 				}
 			}},
 			WEBPACK: {Help: "打包", Hand: func(m *ice.Message, arg ...string) {
-				m.Cmdy(WEBPACK, mdb.CREATE)
-				if ice.Info.NodeType == web.SERVER {
+				if m.Cmdy(WEBPACK, mdb.CREATE); ice.Info.NodeType == web.SERVER {
 					nfs.Trash(m, ice.GO_WORK_SUM)
 					nfs.Trash(m, ice.GO_WORK)
 				}

core/code/compile.go

@@ -1,7 +1,6 @@
 package code
 
 import (
-	"os"
 	"path"
 	"runtime"
 	"strings"
@@ -119,10 +118,9 @@ 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, ice.SRC_BINPACK_GO, ice.SRC_BINPACK_USR_GO}
-			if _, e := os.Stat("src/option.go"); e == nil {
-				args = append(args, "src/option.go")
-			}
+			args := []string{main, ice.SRC_VERSION_GO}
+			nfs.Exists(m, "src/option.go", func(p string) { args = append(args, p) })
+			kit.If(file != ice.BIN_ICE_BIN, func() { args = append(args, ice.SRC_BINPACK_GO, ice.SRC_BINPACK_USR_GO) })
 			if msg := GoBuild(m.Spawn(), file, args...); !cli.IsSuccess(msg) {
 				m.Copy(msg)
 			} else {

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" && nfs.Exists(m, p) &&
+		if p := path.Join(arg[2], strings.Split(arg[1], "/")[0], "portal.go"); path.Base(arg[1]) != "portal.go" &&
 			!kit.IsIn(arg[1],
 				"gonganxitong/user.go",
 				"gonganxitong/sess.go",
@@ -82,7 +82,8 @@ 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())
@@ -228,7 +229,7 @@ func TableName(model string) string {
 	}
 	if kit.IsIn(model, "sms", "equipment") {
 
-	} else if kit.HasSuffix(model, "y") {
+	} else if kit.HasSuffix(model, "y") && !kit.HasSuffix(model, "way") {
 		model = model[:len(model)-1] + "ies"
 	} else if kit.HasSuffix(model, "s") {
 		if !kit.HasSuffix(model, "os") {

core/code/js.go

@@ -22,7 +22,9 @@ 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"); nfs.Exists(m, p) {
+		if p := path.Join(arg[2], strings.Split(arg[1], "/")[0], "portal.go"); !kit.IsIn(arg[1],
+			"operation/studio.js",
+		) && nfs.Exists(m, p) {
 			if cmd := ctx.GetFileCmd(p); cmd != "" {
 				ctx.ProcessField(m, cmd, kit.Simple())
 				return

core/code/vimer.go

@@ -136,6 +136,9 @@ 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)))

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.18
+	shylinux.com/x/toolkits v1.0.19
 	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.18 h1:jtQZhmvU10Ajegc87tU0cYFUBSviaODo5TsCXpYb2O4=
-shylinux.com/x/toolkits v1.0.18/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q=
+shylinux.com/x/toolkits v1.0.19 h1:Nrx0xYRc5ph1WS66EZ1hJUCe+2FdSWQ4QP6tBlguikQ=
+shylinux.com/x/toolkits v1.0.19/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,6 +130,10 @@ 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) {