From a4ef62fccb7231e1070a35bf8bc18083a07312d8 Mon Sep 17 00:00:00 2001
From: jin <jin+git@hyoo.ru>
Date: Sun, 15 Dec 2024 12:42:13 +0300
Subject: [PATCH] Reapply "$mol_wire_fiber: fixed promise destructor
 propagation"

This reverts commit 850fb75e25400c3bc395a1e035184a4bd373670e.
---
 wire/fiber/fiber.ts | 63 +++++++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/wire/fiber/fiber.ts b/wire/fiber/fiber.ts
index 75573ea1fa..55d514e976 100644
--- a/wire/fiber/fiber.ts
+++ b/wire/fiber/fiber.ts
@@ -1,6 +1,6 @@
 namespace $ {
 	
-	const handled = new WeakSet< Promise< unknown > >()
+	const wrappers = new WeakMap< Promise< unknown >, Promise< any > >()
 	
 	/**
 	 * Suspendable task with support both sync/async api.
@@ -179,14 +179,27 @@ namespace $ {
 					default: result = (this.task as any).call( this.host!, ... this.args ); break
 				}
 				
-				if( $mol_promise_like( result ) && !handled.has( result ) ) {
-					
-					const put = ( res: Result )=> {
-						if( this.cache === result ) this.put( res )
-						return res
-					}
-					result = result.then( put, put )
-					
+				if( $mol_promise_like( result ) ) {
+
+					// if( wrappers.has( result ) ) {
+					// 	result = wrappers.get( result )!
+					// } else {
+						
+						const put = ( res: Result )=> {
+							if( this.cache === result ) this.put( res )
+							return res
+						}
+
+						wrappers.set( result, result = Object.assign(
+							result.then( put, put ),
+							{ destructor: ( result as any ).destructor || (()=> {}) }
+						) )
+						wrappers.set( result, result )
+
+						const error = new Error( `Promise in ${ this }` )
+						Object.defineProperty( result, 'stack', { get: ()=> error.stack } )
+
+					// }
 				}
 				
 			} catch( error: any ) {
@@ -197,28 +210,28 @@ namespace $ {
 					result = new Error( String( error ), { cause: error } )
 				}
 				
-				if( $mol_promise_like( result ) && !handled.has( result ) ) {
+				if( $mol_promise_like( result ) ) {
 					
-					result = result.finally( ()=> {
-						if( this.cache === result ) this.absorb()
-					} )
+					// if( wrappers.has( result ) ) {
+					// 	result = wrappers.get( result )!
+					// } else {
+						
+						wrappers.set( result, result = Object.assign(
+							result.finally( ()=> {
+								if( this.cache === result ) this.absorb()
+							} ),
+							{ destructor: ( result as any ).destructor || (()=> {}) }
+						) )
+						
+						const error = new Error( `Promise in ${ this }` )
+						Object.defineProperty( result, 'stack', { get: ()=> error.stack } )
+
+					// }
 					
 				}
 				
 			}
 			
-			if( $mol_promise_like( result ) && !handled.has( result ) ) {
-					
-				result = Object.assign( result, {
-					destructor: (result as any)['destructor'] ?? (()=> {})
-				} )
-				handled.add( result )
-				
-				const error = new Error( `Promise in ${ this }` )
-				Object.defineProperty( result, 'stack', { get: ()=> error.stack } )
-				
-			}
-			
 			if( ! $mol_promise_like( result ) ) {
 				this.track_cut()
 			}