Merge pull request #751 from JiepengTan/pr_add_spx_coror_abort_detection

Add spx coro termination detection

Author: JiepengTan

internal/coroutine/coro.go

@@ -86,7 +86,7 @@ type Coroutines struct {
 	waitMutex sync.Mutex
 	waitCond  sync.Cond
 	debug     bool
-	
+
 	// goroutineIDs tracks all goroutine IDs created by CreateAndStart
 	goroutineIDs sync.Map // map[int64]bool
 }
@@ -202,7 +202,7 @@ func (p *Coroutines) CreateAndStart(start bool, tobj ThreadObj, fn func(me Threa
 		// Track this goroutine ID
 		gid := goid.Get()
 		p.goroutineIDs.Store(gid, true)
-		
+
 		p.sema.Lock()
 		p.setCurrent(id)
 		defer func() {
@@ -211,10 +211,10 @@ func (p *Coroutines) CreateAndStart(start bool, tobj ThreadObj, fn func(me Threa
 			p.mutex.Unlock()
 			p.setWaitStatus(id, waitStatusDelete)
 			p.sema.Unlock()
-			
+
 			// Remove goroutine ID from tracking
 			p.goroutineIDs.Delete(gid)
-			
+
 			if e := recover(); e != nil {
 				if e != ErrAbortThread {
 					if p.onPanic != nil {
@@ -575,3 +575,7 @@ func (p *Coroutines) IsInCoroutine() bool {
 	_, exists := p.goroutineIDs.Load(currentGID)
 	return exists
 }
+
+func IsAbortThreadError(err any) bool {
+	return err == ErrAbortThread
+}

internal/engine/coro.go

@@ -26,6 +26,10 @@ func IsInCoroutine() bool {
 	return gco.IsInCoroutine()
 }
 
+func IsAbortThreadError(err any) bool {
+	return coroutine.IsAbortThreadError(err)
+}
+
 func GetCoroutineOwner() any {
 	if IsInCoroutine() {
 		return gco.Current().Obj

pkg/spx/api.go

@@ -11,6 +11,33 @@ func isSpxEnv() bool {
 	return engine.GetGame() != nil
 }
 
+// IsAbortThreadError checks whether the given error is an SPX coroutine termination error.
+// This function is used to determine if an error was thrown due to SPX coroutine termination.
+//
+// Parameters:
+//
+//	err - The error to check
+//
+// Returns:
+//
+//	true if the error is an SPX coroutine termination error, false otherwise
+//
+// Example:
+//
+//	defer func() {
+//	    if r := recover(); r != nil {
+//	        if spx.IsAbortThreadError(r) {
+//	            // Handle SPX coroutine termination
+//	            return
+//	        }
+//	        // Handle other panics
+//	        panic(r)
+//	    }
+//	}()
+func IsAbortThreadError(err any) bool {
+	return engine.IsAbortThreadError(err)
+}
+
 // IsInCoroutine checks whether the current execution context is within an SPX coroutine.
 // Returns true if running inside an SPX coroutine, false if running in a regular Go goroutine
 // or the main thread.