opt chat

base/aaa/sess.go

@@ -89,6 +89,9 @@ func SessCheck(m *ice.Message, sessid string) bool {
 	return sessid != "" && m.Cmdy(SESS, CHECK, sessid).Option(ice.MSG_USERNAME) != ""
 }
 func UserLogout(m *ice.Message) {
+	if m.Option(ice.MSG_SESSID) == "" {
+		return
+	}
 	m.Cmd(SESS, mdb.REMOVE, kit.Dict(mdb.HASH, m.Option(ice.MSG_SESSID)))
 }
 func SessAuth(m *ice.Message, value ice.Maps, arg ...string) {

base/web/render.go

@@ -23,64 +23,66 @@ const (
 	STATUS = "status"
 )
 
-func Render(msg *ice.Message, cmd string, args ...ice.Any) {
+func Render(m *ice.Message, cmd string, args ...ice.Any) {
 	if cmd != "" {
-		defer func() { msg.Logs(mdb.EXPORT, cmd, args) }()
+		defer func() { m.Logs(mdb.EXPORT, cmd, args) }()
 	}
 
 	switch arg := kit.Simple(args...); cmd {
 	case COOKIE: // value [name [path [expire]]]
-		RenderCookie(msg, arg[0], arg[1:]...)
+		RenderCookie(m, arg[0], arg[1:]...)
 
 	case STATUS, ice.RENDER_STATUS: // [code [text]]
-		RenderStatus(msg.W, kit.Int(kit.Select("200", arg, 0)), kit.Select("", arg, 1))
+		RenderStatus(m.W, kit.Int(kit.Select("200", arg, 0)), kit.Select("", arg, 1))
 
 	case ice.RENDER_REDIRECT: // url [arg...]
-		http.Redirect(msg.W, msg.R, kit.MergeURL(arg[0], arg[1:]), http.StatusTemporaryRedirect)
+		http.Redirect(m.W, m.R, kit.MergeURL(arg[0], arg[1:]), http.StatusTemporaryRedirect)
 
 	case ice.RENDER_DOWNLOAD: // file [type [name]]
 		if strings.HasPrefix(arg[0], ice.HTTP) {
-			RenderRedirect(msg, arg[0])
+			RenderRedirect(m, arg[0])
 			break
 		}
-		RenderType(msg.W, arg[0], kit.Select("", arg, 1))
+		RenderType(m.W, arg[0], kit.Select("", arg, 1))
-		RenderHeader(msg.W, "Content-Disposition", fmt.Sprintf("filename=%s", kit.Select(path.Base(kit.Select(arg[0], msg.Option("filename"))), arg, 2)))
+		RenderHeader(m.W, "Content-Disposition", fmt.Sprintf("filename=%s", kit.Select(path.Base(kit.Select(arg[0], m.Option("filename"))), arg, 2)))
 		if _, e := nfs.DiskFile.StatFile(arg[0]); e == nil {
-			http.ServeFile(msg.W, msg.R, kit.Path(arg[0]))
+			http.ServeFile(m.W, m.R, kit.Path(arg[0]))
 		} else if f, e := nfs.PackFile.OpenFile(arg[0]); e == nil {
 			defer f.Close()
-			io.Copy(msg.W, f)
+			io.Copy(m.W, f)
 		}
 
 	case ice.RENDER_RESULT:
 		if len(arg) > 0 { // [str [arg...]]
-			msg.W.Write([]byte(kit.Format(arg[0], args[1:]...)))
+			m.W.Write([]byte(kit.Format(arg[0], args[1:]...)))
 		} else {
-			args = append(args, nfs.SIZE, len(msg.Result()))
+			args = append(args, nfs.SIZE, len(m.Result()))
-			msg.W.Write([]byte(msg.Result()))
+			m.W.Write([]byte(m.Result()))
 		}
 
 	case ice.RENDER_JSON:
-		RenderType(msg.W, nfs.JSON, "")
+		RenderType(m.W, nfs.JSON, "")
-		msg.W.Write([]byte(arg[0]))
+		m.W.Write([]byte(arg[0]))
 
 	case ice.RENDER_VOID:
 		// no output
 
 	default:
-		for _, k := range []string{
+		for _, k := range kit.Simple(m.Optionv("option"), m.Optionv("_option")) {
-			"_option", "_handle", "_output",
+			if m.Option(k) == "" {
-			"cmds", "fields", "sessid",
+				m.Set(k)
-		} {
+			}
-			msg.Set(k)
+		}
+		for _, k := range []string{"sessid", "cmds", "fields", "_option", "_handle", "_output"} {
+			m.Set(k)
 		}
-		msg.Debug("what %v %v", cmd, args)
 
 		if cmd != "" && cmd != ice.RENDER_RAW { // [str [arg...]]
-			msg.Echo(kit.Format(cmd, args...))
+			m.Echo(kit.Format(cmd, args...))
 		}
-		RenderType(msg.W, nfs.JSON, "")
+		RenderType(m.W, nfs.JSON, "")
-		fmt.Fprint(msg.W, msg.FormatMeta())
+		fmt.Fprint(m.W, m.FormatsMeta())
+		// fmt.Fprint(m.W, m.FormatMeta())
 	}
 }
 
@@ -100,17 +102,17 @@ func RenderType(w http.ResponseWriter, name, mime string) {
 func RenderHeader(w http.ResponseWriter, key, value string) {
 	w.Header().Set(key, value)
 }
-func RenderCookie(msg *ice.Message, value string, arg ...string) { // name path expire
+func RenderCookie(m *ice.Message, value string, arg ...string) { // name path expire
-	expire := time.Now().Add(kit.Duration(kit.Select(msg.Conf(aaa.SESS, kit.Keym(mdb.EXPIRE)), arg, 2)))
+	expire := time.Now().Add(kit.Duration(kit.Select(m.Conf(aaa.SESS, kit.Keym(mdb.EXPIRE)), arg, 2)))
-	http.SetCookie(msg.W, &http.Cookie{Value: value,
+	http.SetCookie(m.W, &http.Cookie{Value: value,
-		Name: kit.Select(CookieName(msg.Option(ice.MSG_USERWEB)), arg, 0), Path: kit.Select(ice.PS, arg, 1), Expires: expire})
+		Name: kit.Select(CookieName(m.Option(ice.MSG_USERWEB)), arg, 0), Path: kit.Select(ice.PS, arg, 1), Expires: expire})
 }
 func RenderStatus(w http.ResponseWriter, code int, text string) {
 	w.WriteHeader(code)
 	w.Write([]byte(text))
 }
-func RenderRefresh(msg *ice.Message, arg ...string) { // url text delay
+func RenderRefresh(m *ice.Message, arg ...string) { // url text delay
-	Render(msg, ice.RENDER_RESULT, kit.Format(`
+	Render(m, ice.RENDER_RESULT, kit.Format(`
 <html>
 <head>
 	<meta http-equiv="refresh" content="%s; url='%s'">
@@ -119,20 +121,20 @@ func RenderRefresh(msg *ice.Message, arg ...string) { // url text delay
 	%s
 </body>
 </html>
-`, kit.Select("3", arg, 2), kit.Select(msg.Option(ice.MSG_USERWEB), arg, 0), kit.Select("loading...", arg, 1)))
+`, kit.Select("3", arg, 2), kit.Select(m.Option(ice.MSG_USERWEB), arg, 0), kit.Select("loading...", arg, 1)))
-	msg.Render(ice.RENDER_VOID)
+	m.Render(ice.RENDER_VOID)
 }
-func RenderRedirect(msg *ice.Message, arg ...ice.Any) {
+func RenderRedirect(m *ice.Message, arg ...ice.Any) {
-	Render(msg, ice.RENDER_REDIRECT, arg...)
+	Render(m, ice.RENDER_REDIRECT, arg...)
-	msg.Render(ice.RENDER_VOID)
+	m.Render(ice.RENDER_VOID)
 }
-func RenderDownload(msg *ice.Message, arg ...ice.Any) {
+func RenderDownload(m *ice.Message, arg ...ice.Any) {
-	Render(msg, ice.RENDER_DOWNLOAD, arg...)
+	Render(m, ice.RENDER_DOWNLOAD, arg...)
-	msg.Render(ice.RENDER_VOID)
+	m.Render(ice.RENDER_VOID)
 }
-func RenderResult(msg *ice.Message, arg ...ice.Any) {
+func RenderResult(m *ice.Message, arg ...ice.Any) {
-	Render(msg, ice.RENDER_RESULT, arg...)
+	Render(m, ice.RENDER_RESULT, arg...)
-	msg.Render(ice.RENDER_VOID)
+	m.Render(ice.RENDER_VOID)
 }
 
 func CookieName(url string) string {

base/web/serve.go

@@ -269,6 +269,11 @@ func _serve_handle(key string, cmd *ice.Command, msg *ice.Message, w http.Respon
 			return !strings.HasPrefix(k, ice.MSG_SESSID)
 		}))
 		msg.Target().Cmd(msg, key, cmds...)
+		// if len(cmds) > 0 && cmds[0] == ctx.ACTION {
+		// 	msg.Target().Cmd(msg, key, cmds...)
+		// } else {
+		// 	cmd.Hand(msg, cmds...)
+		// }
 	}
 
 	// 输出响应

base/web/share.go

@@ -140,7 +140,7 @@ func init() {
 		SHARE: {Name: "share hash auto prunes", Help: "共享链", Actions: ice.MergeActions(ice.Actions{
 			ice.CTX_INIT: {Hand: func(m *ice.Message, arg ...string) { _share_render(m) }},
 			mdb.CREATE: {Name: "create type name text", Help: "创建", Hand: func(m *ice.Message, arg ...string) {
-				mdb.HashCreate(m, aaa.USERROLE, m.Option(ice.MSG_USERROLE), aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERNICK, m.Option(ice.MSG_USERNICK), arg)
+				mdb.HashCreate(m, arg, aaa.USERROLE, m.Option(ice.MSG_USERROLE), aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERNICK, m.Option(ice.MSG_USERNICK))
 				m.Option(mdb.LINK, _share_link(m, PP(SHARE)+m.Result()))
 			}},
 			LOGIN: {Name: "login userrole=void,tech username", Help: "登录", Hand: func(m *ice.Message, arg ...string) {

core/chat/header.go

@@ -14,9 +14,15 @@ import (
 )
 
 func _header_users(m *ice.Message, arg ...string) {
+	if m.Warn(m.Option(ice.MSG_USERNAME) == "", ice.ErrNotLogin) {
+		return
+	}
 	m.Cmdy(aaa.USER, mdb.MODIFY, aaa.USERNAME, m.Option(ice.MSG_USERNAME), m.ActionKey(), m.Option(m.ActionKey(), arg[0]))
 }
 func _header_share(m *ice.Message, arg ...string) {
+	if m.Warn(m.Option(ice.MSG_USERNAME) == "", ice.ErrNotLogin) {
+		return
+	}
 	for i := 0; i < len(arg)-1; i += 2 {
 		m.Option(arg[i], arg[i+1])
 	}
@@ -65,23 +71,9 @@ const HEADER = "header"
 
 func init() {
 	Index.MergeCommands(ice.Commands{
-		web.WEB_LOGIN: {Hand: func(m *ice.Message, arg ...string) {
-			switch kit.Select("", arg, 0) {
-			case web.P(HEADER):
-				switch kit.Select("", arg, 1) {
-				case "", aaa.LOGIN:
-					return // 免登录
-				}
-			default:
-				if aaa.Right(m, arg) {
-					return // 免登录
-				}
-			}
-			m.Warn(m.Option(ice.MSG_USERNAME) == "", ice.ErrNotLogin, arg)
-		}},
 		web.P(HEADER): {Name: "/header", Help: "标题栏", Actions: ice.MergeActions(ice.Actions{
 			aaa.LOGIN: {Hand: func(m *ice.Message, arg ...string) {
-				if aaa.UserLogin(m, arg[0], arg[1]) {
+				if len(arg) > 1 && aaa.UserLogin(m, arg[0], arg[1]) {
 					web.RenderCookie(m, aaa.SessCreate(m, arg[0]))
 				}
 			}},
@@ -92,7 +84,6 @@ func init() {
 			aaa.BACKGROUND: {Hand: func(m *ice.Message, arg ...string) { _header_users(m, arg...) }},
 			aaa.AVATAR:     {Hand: func(m *ice.Message, arg ...string) { _header_users(m, arg...) }},
 			web.SHARE:      {Hand: func(m *ice.Message, arg ...string) { _header_share(m, arg...) }},
-			"webpack":      {Hand: func(m *ice.Message, arg ...string) { m.Cmdy("webpack", "build") }},
 		}, ctx.ConfAction(aaa.LOGIN, kit.List("密码登录", "扫码授权")), aaa.RoleAction()), Hand: func(m *ice.Message, arg ...string) {
 			if gdb.Event(m, HEADER_AGENT); !_header_check(m, arg...) {
 				return

core/chat/river.go

@@ -25,11 +25,13 @@ func _river_list(m *ice.Message) {
 			return
 		}
 	}
+	m.Debug("what %v", m.FormatsMeta())
 	m.Cmd(mdb.SELECT, m.PrefixKey(), "", mdb.HASH, ice.OptionFields(mdb.HASH, mdb.NAME), func(value ice.Maps) {
 		if _river_right(m, value[mdb.HASH]) {
 			m.PushRecord(value, mdb.HASH, mdb.NAME)
 		}
 	})
+	m.Debug("what %v", m.FormatsMeta())
 }
 
 const (

logs.go

@@ -111,10 +111,17 @@ func (m *Message) Warn(err Any, arg ...Any) bool {
 	case nil:
 		return false
 	}
-
 	str, meta := m.join(arg...)
 	m.log(LOG_WARN, str, meta...)
 	m.error(arg...)
+	if len(arg) > 0 {
+		switch kit.Format(arg[0]) {
+		case ErrNotLogin:
+			m.RenderStatusUnauthorized()
+		case ErrNotRight:
+			m.RenderStatusForbidden()
+		}
+	}
 	return true
 }
 func (m *Message) Debug(str string, arg ...Any) {