opt some

base/web/dream.go

@@ -81,7 +81,7 @@ func _dream_show(m *ice.Message, name string) {
 		kit.Path(os.Args[0])
 
 		m.Optionv(cli.CMD_ERRPUT, path.Join(p, m.Conf(DREAM, kit.Keym(cli.ENV, "ctx_log"))))
-		m.Cmd(cli.DAEMON, m.Confv(DREAM, kit.Keym(cli.CMD)), SPIDE_DEV, SPIDE_DEV, kit.MDB_NAME, name)
+		m.Cmd(cli.DAEMON, m.Confv(DREAM, kit.Keym(cli.CMD)), SPIDE_DEV, SPIDE_DEV, kit.MDB_NAME, name, RIVER, m.Option(RIVER))
 		m.Event(DREAM_CREATE, kit.MDB_TYPE, m.Option(kit.MDB_TYPE), kit.MDB_NAME, name)
 		m.Sleep(ice.MOD_TICK)
 	}
@@ -112,7 +112,7 @@ func init() {
 					m.Cmdy(SPACE, m.Option(ROUTE), "web.code.autogen", mdb.CREATE, arg)
 					m.ProcessInner()
 				}},
-				cli.START: {Name: "start name repos", Help: "启动", Hand: func(m *ice.Message, arg ...string) {
+				cli.START: {Name: "start name repos river", Help: "启动", Hand: func(m *ice.Message, arg ...string) {
 					if m.Option(kit.MDB_NAME) == SPIDE_SELF {
 						m.Option(kit.MDB_NAME, "")
 					}

base/web/share.go

@@ -127,7 +127,8 @@ func init() {
 					m.Cmdy(mdb.INSERT, m.PrefixKey(), "", mdb.HASH, kit.MDB_TIME, m.Time(m.Conf(SHARE, kit.Keym(kit.MDB_EXPIRE))),
 						aaa.USERROLE, m.Option(ice.MSG_USERROLE), aaa.USERNAME, m.Option(ice.MSG_USERNAME),
 						RIVER, m.Option(ice.MSG_RIVER), STORM, m.Option(ice.MSG_STORM), arg)
-					m.Option(kit.MDB_LINK, _share_link(m, "/share/"+m.Result()))
+					// m.Option(kit.MDB_LINK, _share_link(m, "/share/"+m.Result()))
+					m.Option(kit.MDB_LINK, kit.MergeURL2(m.Option(ice.MSG_USERWEB), "/share/"+m.Result()))
 				}},
 				LOGIN: {Name: "login userrole=void,tech username", Help: "登录", Hand: func(m *ice.Message, arg ...string) {
 					msg := m.Cmd(SHARE, mdb.CREATE, kit.MDB_TYPE, LOGIN, m.OptionSimple(aaa.USERROLE, aaa.USERNAME))

base/web/space.go

@@ -52,7 +52,7 @@ func _space_dial(m *ice.Message, dev, name string, arg ...string) {
 		host := kit.Format(client[tcp.HOSTNAME])
 		proto := strings.Replace(kit.Format(client[tcp.PROTOCOL]), "http", "ws", 1)
 		uri := kit.MergeURL(proto+"://"+host+"/space/", kit.MDB_TYPE, ice.Info.NodeType,
-			kit.MDB_NAME, name, SHARE, ice.Info.CtxShare, RIVER, ice.Info.CtxRiver, arg)
+			kit.MDB_NAME, name, SHARE, ice.Info.CtxShare, RIVER, kit.Select(ice.Info.CtxRiver, m.Option(RIVER)), arg)
 
 		if u, e := url.Parse(uri); m.Assert(e) {
 			m.Go(func() {
@@ -250,7 +250,7 @@ func init() {
 		)},
 	}, Commands: map[string]*ice.Command{
 		SPACE: {Name: "space name cmd auto", Help: "空间站", Action: map[string]*ice.Action{
-			tcp.DIAL: {Name: "dial dev name", Help: "连接", Hand: func(m *ice.Message, arg ...string) {
+			tcp.DIAL: {Name: "dial dev name river", Help: "连接", Hand: func(m *ice.Message, arg ...string) {
 				_space_dial(m, m.Option(SPIDE_DEV), kit.Select(ice.Info.NodeName, m.Option(kit.MDB_NAME)))
 			}},
 			mdb.SEARCH: {Name: "search type name text", Help: "搜索", Hand: func(m *ice.Message, arg ...string) {

core/chat/node.go

@@ -16,9 +16,16 @@ func init() {
 	Index.Merge(&ice.Context{
 		Commands: map[string]*ice.Command{
 			ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
+				m.Watch(web.DREAM_START, m.Prefix(NODE))
 				m.Watch(web.SPACE_START, m.Prefix(NODE))
 			}},
-			NODE: {Name: "node name ctx cmd auto insert invite", Help: "设备", Action: map[string]*ice.Action{
+			NODE: {Name: "node pod ctx cmd auto insert invite", Help: "设备", Action: map[string]*ice.Action{
+				web.DREAM_START: {Name: "start type name share river", Help: "启动", Hand: func(m *ice.Message, arg ...string) {
+					if m.Option(ice.MSG_RIVER, m.Option(RIVER)) == "" {
+						return
+					}
+					m.Cmdy(mdb.INSERT, RIVER, _river_key(m, NODE), mdb.HASH, arg)
+				}},
 				web.SPACE_START: {Name: "start type name share river", Help: "启动", Hand: func(m *ice.Message, arg ...string) {
 					if m.Option(ice.MSG_RIVER, m.Option(RIVER)) == "" {
 						return
@@ -45,9 +52,10 @@ func init() {
 					m.Option(mdb.FIELDS, "time,type,name,share")
 					m.Cmdy(mdb.SELECT, RIVER, kit.Keys(kit.MDB_HASH, m.Option(ice.MSG_RIVER), NODE), mdb.HASH)
 					m.Table(func(index int, value map[string]string, head []string) {
-						m.PushAnchor(value[kit.MDB_NAME], kit.MergeURL(m.Option(ice.MSG_USERWEB),
+						m.PushAnchor(value[kit.MDB_NAME], kit.MergeURL2(m.Option(ice.MSG_USERWEB),
-							cli.POD, kit.Keys(m.Option(cli.POD), value[kit.MDB_NAME])))
+							"/chat/pod/"+kit.Keys(m.Option(cli.POD), value[kit.MDB_NAME])))
 					})
+					m.RenameAppend("name", "pod")
 					m.PushAction(mdb.REMOVE)
 					return
 				}

core/chat/river.go

@@ -177,6 +177,8 @@ func init() {
 
 				aaa.INVITE: {Name: "invite", Help: "脚本", Hand: func(m *ice.Message, arg ...string) {
 					m.Cmdy(code.PUBLISH, ice.CONTEXTS)
+					m.Cmd(code.PUBLISH, mdb.CREATE, kit.MDB_FILE, ice.BIN_ICE_SH)
+					m.Cmd(code.PUBLISH, mdb.CREATE, kit.MDB_FILE, ice.BIN_ICE_BIN)
 				}},
 				cli.START: {Name: "start name repos template", Help: "启动", Hand: func(m *ice.Message, arg ...string) {
 					m.Cmdy(m.Space(m.Option(cli.POD)), web.DREAM, cli.START, arg)

core/code/publish.go

@@ -43,8 +43,7 @@ func _publish_file(m *ice.Message, file string, arg ...string) string {
 const PUBLISH = "publish"
 
 func init() {
-	Index.Merge(&ice.Context{
+	Index.Merge(&ice.Context{Commands: map[string]*ice.Command{
-		Commands: map[string]*ice.Command{
 		ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
 			m.Cmd(aaa.ROLE, aaa.WHITE, aaa.VOID, m.Prefix(PUBLISH))
 			m.Cmd(aaa.ROLE, aaa.WHITE, aaa.VOID, ice.USR_PUBLISH)
@@ -144,8 +143,7 @@ func init() {
 			m.Option(nfs.DIR_ROOT, m.Conf(PUBLISH, kit.META_PATH))
 			m.Cmdy(nfs.DIR, kit.Select("", arg, 0), "time,size,path,action,link")
 		}},
-		},
+	}, Configs: map[string]*ice.Config{
-		Configs: map[string]*ice.Config{
 		PUBLISH: {Name: PUBLISH, Help: "发布", Value: kit.Data(
 			kit.MDB_PATH, "usr/publish", ice.CONTEXTS, _contexts,
 			SH, `#!/bin/bash
@@ -158,8 +156,7 @@ echo "hello world"
 }})
 `,
 		)},
-		},
+	}})
-	})
 }
 
 var _contexts = kit.Dict(