整理代码

async.go

@@ -21,7 +21,7 @@ package core
 
 import (
 	"context"
-	"git.golaxy.org/core/internal/ictx"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/runtime"
 	"git.golaxy.org/core/utils/async"
 	"git.golaxy.org/core/utils/exception"
@@ -30,13 +30,13 @@ import (
 )
 
 // CallAsync 异步执行代码，有返回值
-func CallAsync(provider ictx.ConcurrentContextProvider, fun generic.FuncVar1[runtime.Context, any, async.Ret], args ...any) async.AsyncRet {
+func CallAsync(provider ectx.ConcurrentContextProvider, fun generic.FuncVar1[runtime.Context, any, async.Ret], args ...any) async.AsyncRet {
 	ctx := runtime.UnsafeConcurrentContext(runtime.Concurrent(provider)).GetContext()
 	return ctx.CallAsync(func(...any) async.Ret { return fun.UnsafeCall(ctx, args...) })
 }
 
 // CallVoidAsync 异步执行代码，无返回值
-func CallVoidAsync(provider ictx.ConcurrentContextProvider, fun generic.ActionVar1[runtime.Context, any], args ...any) async.AsyncRet {
+func CallVoidAsync(provider ectx.ConcurrentContextProvider, fun generic.ActionVar1[runtime.Context, any], args ...any) async.AsyncRet {
 	ctx := runtime.UnsafeConcurrentContext(runtime.Concurrent(provider)).GetContext()
 	return ctx.CallVoidAsync(func(...any) { fun.UnsafeCall(ctx, args...) })
 }

await.go

@@ -22,7 +22,7 @@ package core
 import (
 	"context"
 	"fmt"
-	"git.golaxy.org/core/internal/ictx"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/runtime"
 	"git.golaxy.org/core/utils/async"
 	"git.golaxy.org/core/utils/exception"
@@ -36,7 +36,7 @@ var (
 )
 
 // Await 异步等待结果返回
-func Await(provider ictx.CurrentContextProvider, asyncRet ...async.AsyncRet) AwaitDirector {
+func Await(provider ectx.CurrentContextProvider, asyncRet ...async.AsyncRet) AwaitDirector {
 	return AwaitDirector{
 		rtCtx:     runtime.Current(provider),
 		asyncRets: asyncRet,

ec/component.go

@@ -22,8 +22,8 @@ package ec
 import (
 	"context"
 	"fmt"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/event"
-	"git.golaxy.org/core/internal/ictx"
 	"git.golaxy.org/core/utils/generic"
 	"git.golaxy.org/core/utils/iface"
 	"git.golaxy.org/core/utils/types"
@@ -35,7 +35,7 @@ import (
 type Component interface {
 	iComponent
 	iContext
-	ictx.CurrentContextProvider
+	ectx.CurrentContextProvider
 	fmt.Stringer
 
 	// GetId 获取组件Id

internal/ictx/context.go → ec/ectx/context.go

@@ -17,7 +17,7 @@
  * Copyright (c) 2024 pangdogs.
  */
 
-package ictx
+package ectx
 
 import (
 	"context"

internal/ictx/context_provider.go → ec/ectx/context_provider.go

@@ -17,7 +17,7 @@
  * Copyright (c) 2024 pangdogs.
  */
 
-package ictx
+package ectx
 
 import (
 	"git.golaxy.org/core/utils/iface"

internal/ictx/unsafe_context.go → ec/ectx/unsafe_context.go

@@ -17,7 +17,7 @@
  * Copyright (c) 2024 pangdogs.
  */
 
-package ictx
+package ectx
 
 import (
 	"context"

ec/entity.go

@@ -22,8 +22,8 @@ package ec
 import (
 	"context"
 	"fmt"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/event"
-	"git.golaxy.org/core/internal/ictx"
 	"git.golaxy.org/core/utils/generic"
 	"git.golaxy.org/core/utils/iface"
 	"git.golaxy.org/core/utils/meta"
@@ -59,7 +59,7 @@ type Entity interface {
 	iContext
 	iComponentManager
 	iTreeNode
-	ictx.CurrentContextProvider
+	ectx.CurrentContextProvider
 	reinterpret.InstanceProvider
 	fmt.Stringer
 

ec/entity_concurrent.go

@@ -22,15 +22,15 @@ package ec
 import (
 	"context"
 	"fmt"
-	"git.golaxy.org/core/internal/ictx"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/utils/uid"
 )
 
 // ConcurrentEntity 多线程安全的实体接口
 type ConcurrentEntity interface {
 	iConcurrentEntity
 	iContext
-	ictx.ConcurrentContextProvider
+	ectx.ConcurrentContextProvider
 	fmt.Stringer
 
 	// GetId 获取实体Id

entitycreator.go

@@ -21,8 +21,8 @@ package core
 
 import (
 	"git.golaxy.org/core/ec"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/ec/pt"
-	"git.golaxy.org/core/internal/ictx"
 	"git.golaxy.org/core/runtime"
 	"git.golaxy.org/core/service"
 	"git.golaxy.org/core/utils/exception"
@@ -33,7 +33,7 @@ import (
 )
 
 // BuildEntity 创建实体
-func BuildEntity(provider ictx.CurrentContextProvider, prototype string) EntityCreator {
+func BuildEntity(provider ectx.CurrentContextProvider, prototype string) EntityCreator {
 	if provider == nil {
 		exception.Panicf("%w: %w: provider is nil", ErrCore, ErrArgs)
 	}

runtime.go

@@ -21,8 +21,8 @@ package core
 
 import (
 	"git.golaxy.org/core/ec"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/event"
-	"git.golaxy.org/core/internal/ictx"
 	"git.golaxy.org/core/runtime"
 	"git.golaxy.org/core/utils/async"
 	"git.golaxy.org/core/utils/exception"
@@ -54,8 +54,8 @@ func UnsafeNewRuntime(rtCtx runtime.Context, options RuntimeOptions) Runtime {
 type Runtime interface {
 	iRuntime
 	iRunning
-	ictx.CurrentContextProvider
-	ictx.ConcurrentContextProvider
+	ectx.CurrentContextProvider
+	ectx.ConcurrentContextProvider
 	reinterpret.InstanceProvider
 	async.Callee
 }
@@ -156,7 +156,7 @@ func (rt *RuntimeBehavior) init(rtCtx runtime.Context, opts RuntimeOptions) {
 		exception.Panicf("%w: %w: rtCtx is nil", ErrRuntime, ErrArgs)
 	}
 
-	if !ictx.UnsafeContext(rtCtx).SetPaired(true) {
+	if !ectx.UnsafeContext(rtCtx).SetPaired(true) {
 		exception.Panicf("%w: context already paired", ErrRuntime)
 	}
 

runtime/context.go

@@ -21,9 +21,9 @@ package runtime
 
 import (
 	"fmt"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/event"
 	"git.golaxy.org/core/extension"
-	"git.golaxy.org/core/internal/ictx"
 	"git.golaxy.org/core/service"
 	"git.golaxy.org/core/utils/async"
 	"git.golaxy.org/core/utils/exception"
@@ -57,8 +57,8 @@ func UnsafeNewContext(svcCtx service.Context, options ContextOptions) Context {
 type Context interface {
 	iContext
 	iConcurrentContext
-	ictx.Context
-	ictx.CurrentContextProvider
+	ectx.Context
+	ectx.CurrentContextProvider
 	reinterpret.InstanceProvider
 	extension.AddInProvider
 	async.Caller
@@ -101,7 +101,7 @@ type iContext interface {
 
 // ContextBehavior 运行时上下文行为，在扩展运行时上下文能力时，匿名嵌入至运行时上下文结构体中
 type ContextBehavior struct {
-	ictx.ContextBehavior
+	ectx.ContextBehavior
 	svcCtx          service.Context
 	opts            ContextOptions
 	reflected       reflect.Value
@@ -199,7 +199,7 @@ func (ctx *ContextBehavior) init(svcCtx service.Context, opts ContextOptions) {
 		ctx.opts.PersistId = uid.New()
 	}
 
-	ictx.UnsafeContext(&ctx.ContextBehavior).Init(ctx.opts.Context, ctx.opts.AutoRecover, ctx.opts.ReportError)
+	ectx.UnsafeContext(&ctx.ContextBehavior).Init(ctx.opts.Context, ctx.opts.AutoRecover, ctx.opts.ReportError)
 	ctx.svcCtx = svcCtx
 	ctx.reflected = reflect.ValueOf(ctx.opts.InstanceFace.Iface)
 	ctx.entityManager.init(ctx.opts.InstanceFace.Iface)

runtime/context_concurrent.go

@@ -21,7 +21,7 @@ package runtime
 
 import (
 	"fmt"
-	"git.golaxy.org/core/internal/ictx"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/service"
 	"git.golaxy.org/core/utils/async"
 	"git.golaxy.org/core/utils/exception"
@@ -30,13 +30,13 @@ import (
 )
 
 // ConcurrentContextProvider 多线程安全的上下文提供者
-type ConcurrentContextProvider = ictx.ConcurrentContextProvider
+type ConcurrentContextProvider = ectx.ConcurrentContextProvider
 
 // ConcurrentContext 多线程安全的运行时上下文接口
 type ConcurrentContext interface {
 	iConcurrentContext
-	ictx.Context
-	ictx.ConcurrentContextProvider
+	ectx.Context
+	ectx.ConcurrentContextProvider
 	async.Caller
 	fmt.Stringer
 
@@ -55,14 +55,14 @@ func (ctx *ContextBehavior) getContext() Context {
 }
 
 // Concurrent 获取多线程安全的运行时上下文
-func Concurrent(provider ictx.ConcurrentContextProvider) ConcurrentContext {
+func Concurrent(provider ectx.ConcurrentContextProvider) ConcurrentContext {
 	if provider == nil {
 		exception.Panicf("%w: %w: provider is nil", ErrContext, exception.ErrArgs)
 	}
 	return iface.Cache2Iface[Context](provider.GetConcurrentContext())
 }
 
-func getServiceContext(provider ictx.ConcurrentContextProvider) service.Context {
+func getServiceContext(provider ectx.ConcurrentContextProvider) service.Context {
 	if provider == nil {
 		exception.Panicf("%w: %w: provider is nil", ErrContext, exception.ErrArgs)
 	}
@@ -73,7 +73,7 @@ func getServiceContext(provider ictx.ConcurrentContextProvider) service.Context
 	return ctx.getServiceCtx()
 }
 
-func getCaller(provider ictx.ConcurrentContextProvider) async.Caller {
+func getCaller(provider ectx.ConcurrentContextProvider) async.Caller {
 	if provider == nil {
 		exception.Panicf("%w: %w: provider is nil", ErrContext, exception.ErrArgs)
 	}

runtime/context_current.go

@@ -20,23 +20,23 @@
 package runtime
 
 import (
-	"git.golaxy.org/core/internal/ictx"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/utils/exception"
 	"git.golaxy.org/core/utils/iface"
 )
 
 // CurrentContextProvider 当前上下文提供者
-type CurrentContextProvider = ictx.CurrentContextProvider
+type CurrentContextProvider = ectx.CurrentContextProvider
 
 // Current 获取当前运行时上下文
-func Current(provider ictx.CurrentContextProvider) Context {
+func Current(provider ectx.CurrentContextProvider) Context {
 	if provider == nil {
 		exception.Panicf("%w: %w: provider is nil", ErrContext, exception.ErrArgs)
 	}
 	return iface.Cache2Iface[Context](provider.GetCurrentContext())
 }
 
-func getRuntimeContext(provider ictx.CurrentContextProvider) Context {
+func getRuntimeContext(provider ectx.CurrentContextProvider) Context {
 	if provider == nil {
 		exception.Panicf("%w: %w: provider is nil", ErrContext, exception.ErrArgs)
 	}

runtime/entitymanager.go

@@ -22,8 +22,8 @@ package runtime
 import (
 	"fmt"
 	"git.golaxy.org/core/ec"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/event"
-	"git.golaxy.org/core/internal/ictx"
 	"git.golaxy.org/core/service"
 	"git.golaxy.org/core/utils/exception"
 	"git.golaxy.org/core/utils/generic"
@@ -33,7 +33,7 @@ import (
 
 // EntityManager 实体管理器接口
 type EntityManager interface {
-	ictx.CurrentContextProvider
+	ectx.CurrentContextProvider
 
 	// AddEntity 添加实体
 	AddEntity(entity ec.Entity) error

runtime/entitytree.go

@@ -22,7 +22,7 @@ package runtime
 import (
 	"fmt"
 	"git.golaxy.org/core/ec"
-	"git.golaxy.org/core/internal/ictx"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/utils/exception"
 	"git.golaxy.org/core/utils/generic"
 	"git.golaxy.org/core/utils/iface"
@@ -31,7 +31,7 @@ import (
 
 // EntityTree 实体树接口
 type EntityTree interface {
-	ictx.CurrentContextProvider
+	ectx.CurrentContextProvider
 
 	// AddNode 新增实体节点，会向实体管理器添加实体
 	AddNode(entity ec.Entity, parentId uid.Id) error

runtime_running.go

@@ -21,9 +21,9 @@ package core
 
 import (
 	"context"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/event"
 	"git.golaxy.org/core/extension"
-	"git.golaxy.org/core/internal/ictx"
 	"git.golaxy.org/core/runtime"
 	"git.golaxy.org/core/service"
 	"git.golaxy.org/core/utils/exception"
@@ -42,13 +42,13 @@ func (rt *RuntimeBehavior) Run() <-chan struct{} {
 	default:
 	}
 
-	if parentCtx, ok := ctx.GetParentContext().(ictx.Context); ok {
+	if parentCtx, ok := ctx.GetParentContext().(ectx.Context); ok {
 		parentCtx.GetWaitGroup().Add(1)
 	}
 
 	go rt.running()
 
-	return ictx.UnsafeContext(ctx).GetTerminatedChan()
+	return ectx.UnsafeContext(ctx).GetTerminatedChan()
 }
 
 // Terminate 停止
@@ -79,11 +79,11 @@ func (rt *RuntimeBehavior) running() {
 
 	rt.changeRunningStatus(runtime.RunningStatus_Terminated)
 
-	if parentCtx, ok := ctx.GetParentContext().(ictx.Context); ok {
+	if parentCtx, ok := ctx.GetParentContext().(ectx.Context); ok {
 		parentCtx.GetWaitGroup().Done()
 	}
 
-	close(ictx.UnsafeContext(ctx).GetTerminatedChan())
+	close(ectx.UnsafeContext(ctx).GetTerminatedChan())
 }
 
 func (rt *RuntimeBehavior) changeRunningStatus(status runtime.RunningStatus, args ...any) {

service.go

@@ -20,7 +20,7 @@
 package core
 
 import (
-	"git.golaxy.org/core/internal/ictx"
+	"git.golaxy.org/core/ec/ectx"
 	"git.golaxy.org/core/service"
 	"git.golaxy.org/core/utils/exception"
 	"git.golaxy.org/core/utils/iface"
@@ -89,7 +89,7 @@ func (svc *ServiceBehavior) init(svcCtx service.Context, opts ServiceOptions) {
 		exception.Panicf("%w: %w: svcCtx is nil", ErrService, ErrArgs)
 	}
 
-	if !ictx.UnsafeContext(svcCtx).SetPaired(true) {
+	if !ectx.UnsafeContext(svcCtx).SetPaired(true) {
 		exception.Panicf("%w: context already paired", ErrService)
 	}