liubin/ContextOS
1
0
Fork 0
forked from x/ContextOS
Code Pull Requests Activity

mac pro cmd message 完整了message命令，和close接口

Browse Source
This commit is contained in:
shaoying 2017-12-13 08:40:22 +08:00
parent 3fe163061c
commit 5375ba3ac8
5 changed files with 172 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -19,6 +19,17 @@ context: 通过提供自由的模块，简洁的接口，动态的结构，让
* 配置管理config
* 缓存管理cache
* Cap() Conf() Cmd()
* Spawn() Begin() Start() Close()
* Request[] History[] Session[]
* detail[] option[] result[] append[]
* Context Master Owner
* Search() Action() Assert() Figure()
## 结构设计
* 功能树
* 权限树

15
etc/init.sh
View File

@ -1,26 +1,25 @@
# ~lex source etc/lex.sh
~cli @lex lex
~root aaa login root root
# ~tcp listen ":9393"
# ~tcp dial ":9393"
~cli remote slaver listen ":9393" tcp
# @debug on
~mdb open chat chat "chat:chat@/chat" mysql
~web listen
return
~root aaa login root root
@debug
~web spawn hi he ./
~web listen
route template /tpl ./usr/msg.tpl
route script /php ./usr/msg.php
route script /who who
~hi listen ./ ":9494"
master nice
pwd
# ~aaa login shy shy
return
login shy shy
~root cli
remote slaver listen ":9393" tcp

47
src/context/cli/cli.go
View File

@ -25,6 +25,7 @@ type CLI struct {
out io.WriteCloser
alias map[string]string
back string
next string
exit bool
@ -83,6 +84,7 @@ func (cli *CLI) parse(m *ctx.Message) bool { // {{{
if len(cli.ins) > 1 {
return true
}
line, cli.back = cli.back, ""
}
} else {
line, cli.next = cli.next, ""
@ -144,13 +146,12 @@ func (cli *CLI) parse(m *ctx.Message) bool { // {{{
msg.Add("detail", ls[i])
}
if msg.Wait = make(chan bool); msg.Target.Master != cli.Context {
msg.Post(msg.Target.Master)
} else {
msg.Wait = make(chan bool)
msg.Post(cli.Context)
}
cli.echo(strings.Join(msg.Meta["result"], ""))
cli.target = msg.Target
cli.back = line
return true
}
@ -218,11 +219,11 @@ func (cli *CLI) Begin(m *ctx.Message, arg ...string) ctx.Server { // {{{
m.Assert(lex != nil, "词法解析模块不存在")
if lex.Cap("status") != "start" {
lex.Target.Start(lex)
lex.Cmd("train", "'[^']*'")
lex.Cmd("train", "\"[^\"]*\"")
lex.Cmd("train", "[^ \t\n]+")
lex.Cmd("train", "[ \n\t]+", "void", "void")
lex.Cmd("train", "#[^\n]*\n", "void", "void")
m.Spawn(lex.Target).Cmd("train", "'[^']*'")
m.Spawn(lex.Target).Cmd("train", "\"[^\"]*\"")
m.Spawn(lex.Target).Cmd("train", "[^ \t\n]+")
m.Spawn(lex.Target).Cmd("train", "[ \n\t]+", "void", "void")
m.Spawn(lex.Target).Cmd("train", "#[^\n]*\n", "void", "void")
}
cli.lex = lex
}
@ -285,6 +286,7 @@ func (cli *CLI) Start(m *ctx.Message, arg ...string) bool { // {{{
cli.echo("password>")
fmt.Fscanln(cli.in, &password)
msg.Wait = make(chan bool)
if msg.Cmd("login", username, password) == "" {
cli.echo("登录失败")
m.Cmd("exit")
@ -292,7 +294,15 @@ func (cli *CLI) Start(m *ctx.Message, arg ...string) bool { // {{{
cli.in.Close()
return false
}
if cli.Sessions == nil {
cli.Sessions = make(map[string]*ctx.Message)
}
cli.Sessions["aaa"] = msg
msg.Name = "aaa"
}
} else {
m.Cap("stream", "stdout")
}
m.Log("info", nil, "slaver terminal")
@ -319,7 +329,7 @@ func (cli *CLI) Start(m *ctx.Message, arg ...string) bool { // {{{
msg.Set("append")
c := exec.Command(msg.Meta["detail"][0], msg.Meta["detail"][1:]...)
if len(cli.ins) == 1 {
if len(cli.ins) == 1 && cli.Context == Index {
c.Stdin, c.Stdout, c.Stderr = cli.in, cli.out, cli.out
msg.Assert(c.Start())
msg.Assert(c.Wait())
@ -342,20 +352,21 @@ func (cli *CLI) Start(m *ctx.Message, arg ...string) bool { // {{{
// }}}
func (cli *CLI) Close(m *ctx.Message, arg ...string) bool { // {{{
switch cli.Context {
case m.Source:
if cli.Context == Index {
return false
case m.Target:
m.Log("exit", nil, "release")
}
return false
switch cli.Context {
case m.Target:
case m.Source:
}
return true
}
// }}}
var Index = &ctx.Context{Name: "cli", Help: "管理终端",
var Index = &ctx.Context{Name: "cli", Help: "管理中心",
Caches: map[string]*ctx.Cache{
"nterm": &ctx.Cache{Name: "终端数量", Value: "0", Help: "已经运行的终端数量"},
},
@ -437,7 +448,7 @@ var Index = &ctx.Context{Name: "cli", Help: "管理终端",
"open": &ctx.Command{Name: "open [master|slaver] [script [log]]", Help: "建立远程连接",
Options: map[string]string{"master": "主控终端", "slaver": "被控终端", "args": "启动参数", "io": "读写流"},
Hand: func(m *ctx.Message, c *ctx.Context, key string, arg ...string) string {
m.Start(fmt.Sprintf("PTS%d", m.Capi("nterm")), "管理终端", arg...) // {{{
m.Start(fmt.Sprintf("PTS%d", m.Capi("nterm")), "管理终端", "void.sh") // {{{
return ""
// }}}
}},

190
src/context/ctx.go
View File

@ -50,7 +50,6 @@ type Server interface {
type Context struct {
Name string
Help string
Server
Caches map[string]*Cache
Configs map[string]*Config
@ -61,16 +60,20 @@ type Context struct {
root *Context
Sessions map[string]*Message
Historys []*Message
Requests []*Message
Master *Context
messages chan *Message
message *Message
Master *Context
Group string
Owner *Context
Index map[string]*Context
Groups map[string]*Context
Owner *Context
Group string
Pulse *Message
Server
}
func (c *Context) Register(s *Context, x Server) *Context { // {{{
@ -125,6 +128,7 @@ func (c *Context) Begin(m *Message) *Context { // {{{
}
c.Requests = []*Message{m}
c.Historys = []*Message{m}
if c.Server != nil {
c.Server.Begin(m, m.Meta["detail"]...)
@ -155,44 +159,53 @@ func (c *Context) Start(m *Message) bool { // {{{
}
// }}}
func (c *Context) Close(m *Message, arg ...string) { // {{{
if c.Server == nil || c.Server.Close(m, arg...) {
m.Log("close", c, "%d %v", m.Capi("ncontext", -1)+1, arg)
delete(c.context.contexts, c.Name)
}
return
func (c *Context) Close(m *Message, arg ...string) bool { // {{{
m.Log("close", c, "close %v", arg)
if m.Target == c {
for _, v := range c.Sessions {
if v.Target != c {
v.Target.Close(v, arg...)
for k, v := range c.Sessions {
delete(c.Sessions, k)
if v.Target != c && !v.Target.Close(v, arg...) {
return false
}
}
}
if c.Server != nil && c.Server.Close(m, arg...) {
if len(c.Sessions) == 0 && c.context != nil {
delete(c.context.contexts, c.Name)
if c.Server != nil && !c.Server.Close(m, arg...) {
return false
}
if m.Source == c {
if _, ok := c.Sessions[m.Name]; ok {
delete(c.Sessions, m.Name)
m.Target.Server.Close(m, arg...)
}
} else {
if m.Index == -1 {
return true
}
}
if len(c.Sessions) > 0 {
return false
}
if m.Cap("status") == "close" {
return true
}
if c.context != nil && len(c.contexts) == 0 {
m.Log("close", c, "%d context %v", m.root.Capi("ncontext", -1)+1, arg)
delete(c.context.contexts, c.Name)
}
for _, v := range c.Requests {
if v.Source != c {
if v.Source != c && v.Index != -1 {
v.Index = -1
v.Source.Close(v, arg...)
}
}
} else if m.Source == c {
delete(c.Sessions, m.Name)
if c.Server != nil && c.Server.Close(m, arg...) {
if len(c.Sessions) == 0 && c.context != nil {
delete(c.context.contexts, c.Name)
}
}
}
if len(c.Requests) == 0 {
m.Log(m.Cap("status", "stop"), c, "%d %v", m.root.Capi("nserver", -1), m.Meta["detail"])
}
return true
}
// }}}
@ -602,6 +615,15 @@ func (m *Message) Reply(key ...string) *Message { // {{{
return msg
}
// }}}
func (m *Message) Format() string { // {{{
name := fmt.Sprintf("%s->%s", m.Source.Name, m.Target.Name)
if m.Name != "" {
name = fmt.Sprintf("%s.%s->%s.%d", m.Source.Name, m.Name, m.Target.Name, m.Index)
}
return fmt.Sprintf("%d(%s): %s %v", m.code, name, m.time.Format("15:04:05"), m.Meta["detail"])
}
// }}}
func (m *Message) BackTrace(hand func(m *Message) bool) { // {{{
@ -616,6 +638,9 @@ func (m *Message) BackTrace(hand func(m *Message) bool) { // {{{
// }}}
func (m *Message) Travel(c *Context, hand func(m *Message) bool) { // {{{
if c == nil {
c = m.Target
}
target := m.Target
cs := []*Context{c}
@ -856,10 +881,10 @@ func (m *Message) Exec(key string, arg ...string) string { // {{{
}
}
if c.Requests == nil {
c.Requests = make([]*Message, 0, 10)
if c.Historys == nil {
c.Historys = make([]*Message, 0, 10)
}
c.Requests = append(c.Requests, m)
c.Historys = append(c.Historys, m)
})
return m.Get("result")
@ -902,6 +927,10 @@ func (m *Message) Deal(pre func(msg *Message, arg ...string) bool, post func(msg
// }}}
func (m *Message) Post(s *Context) string { // {{{
if s == nil {
s = m.Target.Master
}
m.Assert(s.messages != nil, s.Name+" 没有开启消息处理")
if s.messages <- m; m.Wait != nil {
@ -1048,7 +1077,7 @@ func (m *Message) Cap(key string, arg ...string) string { // {{{
// }}}
var Index = &Context{Name: "ctx", Help: "根模块",
var Index = &Context{Name: "ctx", Help: "元始模块",
Caches: map[string]*Cache{
"nserver": &Cache{Name: "服务数量", Value: "0", Help: "显示已经启动运行模块的数量"},
"ncontext": &Cache{Name: "模块数量", Value: "0", Help: "显示功能树已经注册模块的数量"},
@ -1164,68 +1193,67 @@ var Index = &Context{Name: "ctx", Help: "根模块",
return ""
// }}}
}},
"message": &Command{Name: "message [index|home] [order]", Help: "查看消息", Hand: func(m *Message, c *Context, key string, arg ...string) string {
"message": &Command{Name: "message code", Help: "查看消息", Hand: func(m *Message, c *Context, key string, arg ...string) string {
switch len(arg) { // {{{
case 0:
for k, v := range m.Target.Sessions {
if v.Name != "" {
m.Echo("%s %s.%s -> %s.%d: %s %v\n", k, v.Source.Name, v.Name, v.Target.Name, v.Index, v.time.Format("15:04:05"), v.Meta["detail"])
} else {
m.Echo("%s %s -> %s: %s %v\n", k, v.Source.Name, v.Target.Name, v.time.Format("15:04:05"), v.Meta["detail"])
}
}
m.Echo("\033[31mrequests:\033[0m\n")
for i, v := range m.Target.Requests {
if v.Name != "" {
m.Echo("%d %s.%s -> %s.%d: %s %v\n", i, v.Source.Name, v.Name, v.Target.Name, v.Index, v.time.Format("15:04:05"), v.Meta["detail"])
} else {
m.Echo("%d %s -> %s: %s %v\n", i, v.Source.Name, v.Target.Name, v.time.Format("15:04:05"), v.Meta["detail"])
}
m.Echo("%d %s\n", i, v.Format())
for i, v := range v.messages {
if v.Name != "" {
m.Echo(" %d %s.%s -> %s.%d: %s %v\n", i, v.Source.Name, v.Name, v.Target.Name, v.Index, v.time.Format("15:04:05"), v.Meta["detail"])
} else {
m.Echo(" %d %s -> %s: %s %v\n", i, v.Source.Name, v.Target.Name, v.time.Format("15:04:05"), v.Meta["detail"])
m.Echo(" %d %s\n", i, v.Format())
}
}
m.Echo("\033[32msessions:\033[0m\n")
for k, v := range m.Target.Sessions {
m.Echo("%s %s\n", k, v.Format())
}
case 1, 2:
m.Echo("\033[33mhistorys:\033[0m\n")
for i, v := range m.Target.Historys {
m.Echo("%d %s\n", i, v.Format())
for i, v := range v.messages {
m.Echo(" %d %s\n", i, v.Format())
}
}
case 1:
n, e := strconv.Atoi(arg[0])
v := m
if e == nil && 0 <= n && n < len(m.Target.Requests) {
v = m.Target.Requests[n]
} else {
v = m.Target.Sessions[arg[0]]
m.Assert(e)
ms := []*Message{m.root}
for i := 0; i < len(ms); i++ {
if ms[i].code == n {
if ms[i].message != nil {
m.Echo("message: %d\n", ms[i].message.code)
}
if v != nil {
if len(arg) > 1 {
if n, e = strconv.Atoi(arg[1]); e == nil && 0 <= n && n < len(v.messages) {
v = v.messages[n]
m.Echo("%s\n", ms[i].Format())
if len(ms[i].Meta["option"]) > 0 {
m.Echo("option: %v\n", ms[i].Meta["option"])
}
for _, k := range ms[i].Meta["option"] {
m.Echo(" %s: %v\n", k, ms[i].Meta[k])
}
if v.Name != "" {
m.Echo("%s.%s -> %s.%d: %s %v\n", v.Source.Name, v.Name, v.Target.Name, v.Index, v.time.Format("15:04:05"), v.Meta["detail"])
} else {
m.Echo("%s -> %s: %s %v\n", v.Source.Name, v.Target.Name, v.time.Format("15:04:05"), v.Meta["detail"])
if len(ms[i].Meta["result"]) > 0 {
m.Echo("result: %v\n", ms[i].Meta["result"])
}
if len(ms[i].Meta["append"]) > 0 {
m.Echo("append: %v\n", ms[i].Meta["append"])
}
for _, k := range ms[i].Meta["append"] {
m.Echo(" %s: %v\n", k, ms[i].Meta[k])
}
if len(v.Meta["option"]) > 0 {
m.Echo("option:\n")
if len(ms[i].messages) > 0 {
m.Echo("messages: %d\n", len(ms[i].messages))
}
for _, k := range v.Meta["option"] {
m.Echo(" %s: %v\n", k, v.Meta[k])
for _, v := range ms[i].messages {
m.Echo(" %s\n", v.Format())
}
if len(v.Meta["result"]) > 0 {
m.Echo("result: %v\n", v.Meta["result"])
}
if len(v.Meta["append"]) > 0 {
m.Echo("append:\n")
}
for _, k := range v.Meta["append"] {
m.Echo(" %s: %v\n", k, v.Meta[k])
break
}
ms = append(ms, ms[i].messages...)
}
}
@ -1319,7 +1347,7 @@ var Index = &Context{Name: "ctx", Help: "根模块",
m.Echo("%s\n", target.Help)
return true
})
case len(arg) > 0:
case len(arg) > 0 && v != m:
v.Set("detail", arg...).Cmd()
}
}
@ -1511,7 +1539,7 @@ var Index = &Context{Name: "ctx", Help: "根模块",
return all
})
case 2:
m.Conf(arg[0], arg[1])
m.Cap(arg[0], arg[1])
case 4:
m.Cap(arg[0], arg[1:]...)
}
@ -1559,13 +1587,13 @@ func Start(args ...string) {
log.Println("\n\n")
Index.Group = "root"
Index.Owner = Index.contexts["aaa"]
Index.Master = Index.contexts["cli"]
for _, m := range Pulse.Search("") {
m.Target.root = Index
m.Target.Begin(m)
}
Index.Requests = append(Index.Requests, Pulse)
log.Println()
for _, m := range Pulse.Search(Pulse.Conf("start")) {

7
src/example/bench.go
View File

@ -2,16 +2,15 @@ package main
import (
"context"
_ "context/aaa"
_ "context/cli"
_ "context/mdb"
_ "context/tcp"
_ "context/aaa"
_ "context/ssh"
_ "context/web"
_ "context/ssh"
_ "context/lex"
"os"