other: v2 vivid 体验优化前

server/actor_srv/network.go

@@ -0,0 +1,2 @@
+package server
+

server/actor_srv/server.go

@@ -0,0 +1,56 @@
+package server
+
+import (
+	"context"
+	"github.com/kercylan98/minotaur/server"
+	"github.com/kercylan98/minotaur/vivid"
+)
+
+// New 创建一个新的服务器
+func New() *Server {
+	return &Server{}
+}
+
+type Server struct {
+	ctx     context.Context
+	network server.Network
+}
+
+func (s *Server) OnPreStart(ctx vivid.ActorContext) (err error) {
+	if err = s.network.OnSetup(s.ctx, nil); err != nil {
+		return
+	}
+
+	ctx.Future(func() vivid.Message {
+		return s.network.OnRun
+	})
+	return
+}
+
+func (s *Server) OnReceived(ctx vivid.MessageContext) (err error) {
+	switch m := ctx.GetMessage().(type) {
+	case error:
+		if err = s.network.OnShutdown(); err != nil {
+			panic(err)
+		}
+		ctx.NotifyTerminated(m)
+	}
+
+	return
+}
+
+func (s *Server) OnDestroy(ctx vivid.ActorContext) (err error) {
+
+}
+
+func (s *Server) OnSaveSnapshot(ctx vivid.ActorContext) (snapshot []byte, err error) {
+
+}
+
+func (s *Server) OnRecoverSnapshot(ctx vivid.ActorContext, snapshot []byte) (err error) {
+
+}
+
+func (s *Server) OnChildTerminated(ctx vivid.ActorContext, child vivid.ActorTerminatedContext) {
+
+}

server/server.go

@@ -12,7 +12,6 @@ import (
 	messageEvents "github.com/kercylan98/minotaur/toolkit/nexus/events"
 	"github.com/kercylan98/minotaur/toolkit/nexus/queues"
 	"github.com/kercylan98/minotaur/toolkit/random"
-	"github.com/kercylan98/minotaur/vivid"
 	"github.com/panjf2000/ants/v2"
 	"reflect"
 	"time"
@@ -64,26 +63,6 @@ type server struct {
 	scheduler   *chrono.Scheduler         // 服务器使用的定时器
 }
 
-func (s *server) OnPreStart(ctx vivid.ActorContext) (err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (s *server) OnReceived(ctx vivid.MessageContext) (err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (s *server) OnDestroy(ctx vivid.ActorContext) (err error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-func (s *server) OnChildTerminated(ctx vivid.ActorContext, child vivid.ActorTerminatedContext) {
-	//TODO implement me
-	panic("implement me")
-}
-
 func NewServer(network Network, options ...*Options) Server {
 	srv := &server{
 		network: network,

vivid/actor.go

@@ -33,6 +33,10 @@ type ActorTerminatedContext interface {
 	// GetActorId 获取 Actor 的 ID
 	GetActorId() ActorId
 
+	// GetActor 获取 Actor 原始对象
+	//  - 常被用于类型断言进行不同 Actor 类型的处理
+	GetActor() any
+
 	// HasTerminatedMessage 判断是否有销毁消息
 	HasTerminatedMessage() bool
 
@@ -71,6 +75,10 @@ func (c *actorTerminatedContext) GetActorId() ActorId {
 	return c.core.id
 }
 
+func (c *actorTerminatedContext) GetActor() any {
+	return c.core.Actor
+}
+
 func (c *actorTerminatedContext) HasTerminatedMessage() bool {
 	return len(c.terminatedMessages) > 0
 }

vivid/actor_context.go

@@ -35,6 +35,9 @@ type ActorContext interface {
 
 	// GetActorId 获取 Actor 的 ID
 	GetActorId() ActorId
+
+	// Future 创建一个 Future 对象，用于异步获取 Actor 的返回值
+	Future(handler func() Message) Future
 }
 
 type actorContextState = uint8 // actorContext 的状态
@@ -191,3 +194,7 @@ func (c *actorContext) GetParentActor() ActorRef {
 func (c *actorContext) GetActorId() ActorId {
 	return c.id
 }
+
+func (c *actorContext) Future(handler func() Message) Future {
+	return NewFuture(c, handler)
+}

vivid/actor_system.go

@@ -19,8 +19,6 @@ func NewActorSystem(name string, opts ...*ActorSystemOptions) *ActorSystem {
 		replyWaiters: make(map[uint64]chan any),
 	}
 	s.actorSystemExternal = new(actorSystemExternal).init(s)
-	s.ctx, s.cancel = context.WithCancel(context.Background())
-
 	return s
 }
 
@@ -43,6 +41,7 @@ type ActorSystem struct {
 
 // Run 非阻塞的运行 ActorSystem
 func (s *ActorSystem) Run() (err error) {
+	s.ctx, s.cancel = context.WithCancel(context.Background())
 	pool, err := ants.NewPool(s.opts.AntsPoolSize, s.opts.AntsOptions...)
 	if err != nil {
 		return err

vivid/actors/actor_terminated_context.go

@@ -0,0 +1,57 @@
+package actors
+
+func NewActorTerminatedContext(c *actorCore, v ...Message) *ActorTerminatedContext {
+	return &ActorTerminatedContext{
+		core:               c,
+		terminatedMessages: v,
+	}
+}
+
+type ActorTerminatedContext struct {
+	core               *actorCore // Actor 核心
+	terminatedMessages []Message  // 销毁消息
+	cancelTerminate    bool       // 是否取消销毁
+}
+
+func (c *ActorTerminatedContext) GetActorId() ActorId {
+	return c.core.id
+}
+
+func (c *ActorTerminatedContext) GetActor() any {
+	return c.core.Actor
+}
+
+func (c *ActorTerminatedContext) HasTerminatedMessage() bool {
+	return len(c.terminatedMessages) > 0
+}
+
+func (c *ActorTerminatedContext) GetTerminatedMessage() Message {
+	if len(c.terminatedMessages) == 1 {
+		return c.terminatedMessages[0]
+	} else {
+		return c.terminatedMessages
+	}
+}
+
+func (c *ActorTerminatedContext) Restart() error {
+	c.core.restartNum++
+	if _, err := c.core.restart(false); err != nil {
+		return err
+	}
+	c.core.restartNum = 0
+	c.cancelTerminate = true
+	return nil
+}
+
+func (c *ActorTerminatedContext) Recover() error {
+	c.cancelTerminate = true
+	return nil
+}
+
+func (c *ActorTerminatedContext) IsPreStart() bool {
+	return c.core.state == actorContextStatePreStart
+}
+
+func (c *ActorTerminatedContext) GetRestartNum() int {
+	return c.core.restartNum
+}

vivid/future.go

@@ -0,0 +1,37 @@
+package vivid
+
+type Receiver interface {
+	Tell(v Message, opts ...MessageOption) error
+	Ask(v Message, opts ...MessageOption) (any, error)
+}
+
+type Future interface {
+	// IsCompleted 判断 Future 是否已完成
+	IsCompleted() bool
+}
+
+// NewFuture 创建一个新的 Future 对象，该对象用于异步获取 Actor 的返回值
+func NewFuture(ctx ActorContext, handler func() Message) Future {
+	f := &future{
+		ctx: ctx,
+	}
+	c := ctx.(*actorContext)
+	var h = func() {
+		m := handler()
+		f.done = true
+		c.core.Tell(m)
+	}
+	if err := c.system.gp.Submit(h); err != nil {
+		go h()
+	}
+	return f
+}
+
+type future struct {
+	ctx  ActorContext
+	done bool
+}
+
+func (f *future) IsCompleted() bool {
+	return f.done
+}