implement RenderWork based send async initiation

sawka · sawka · commit 1bd88e8b99d5 · 2025-09-10T17:03:58.000-07:00
diff --git a/tsunami/app/atom.go b/tsunami/app/atom.go
@@ -117,13 +117,8 @@ func (a Atom[T]) SetFn(fn func(T) T) {
 		logInvalidAtomSet(a.name)
 		return
 	}
-	err := a.client.Root.SetFnAtomVal(a.name, func(val any) any {
-		typedVal := util.GetTypedAtomValue[T](val, a.name)
-		return fn(typedVal)
-	})
-	if err != nil {
-		log.Printf("Failed to set atom value for %s: %v", a.name, err)
-		return
-	}
-	a.client.Root.AtomAddRenderWork(a.name)
+	currentVal := a.Get()
+	copiedVal := DeepCopy(currentVal)
+	newVal := fn(copiedVal)
+	a.Set(newVal)
 }
diff --git a/tsunami/demo/cpuchart/app.go b/tsunami/demo/cpuchart/app.go
@@ -172,7 +172,6 @@ var App = app.DefineComponent("App", func(_ struct{}) any {
 			}
 			return data
 		})
-		app.SendAsyncInitiation()
 	}, []any{})
 
 	handleClear := func() {
diff --git a/tsunami/demo/cpuchart/static/tw.css b/tsunami/demo/cpuchart/static/tw.css
@@ -252,33 +252,12 @@
   .sticky {
     position: sticky;
   }
-  .-inset-1 {
-    inset: calc(var(--spacing) * -1);
-  }
   .isolate {
     isolation: isolate;
   }
   .isolation-auto {
     isolation: auto;
   }
-  .\!container {
-    width: 100% !important;
-    @media (width >= 40rem) {
-      max-width: 40rem !important;
-    }
-    @media (width >= 48rem) {
-      max-width: 48rem !important;
-    }
-    @media (width >= 64rem) {
-      max-width: 64rem !important;
-    }
-    @media (width >= 80rem) {
-      max-width: 80rem !important;
-    }
-    @media (width >= 96rem) {
-      max-width: 96rem !important;
-    }
-  }
   .container {
     width: 100%;
     @media (width >= 40rem) {
@@ -875,18 +854,10 @@
     --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 1px 2px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
     box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
   }
-  .ring {
-    --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
-    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
-  }
   .inset-ring {
     --tw-inset-ring-shadow: inset 0 0 0 1px var(--tw-inset-ring-color, currentcolor);
     box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
   }
-  .outline {
-    outline-style: var(--tw-outline-style);
-    outline-width: 1px;
-  }
   .blur {
     --tw-blur: blur(8px);
     filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
@@ -896,18 +867,10 @@
     --tw-drop-shadow: drop-shadow(0 1px 2px rgb(0 0 0 / 0.1)) drop-shadow( 0 1px 1px rgb(0 0 0 / 0.06));
     filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
   }
-  .grayscale {
-    --tw-grayscale: grayscale(100%);
-    filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
-  }
   .invert {
     --tw-invert: invert(100%);
     filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
   }
-  .sepia {
-    --tw-sepia: sepia(100%);
-    filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
-  }
   .filter {
     filter: var(--tw-blur,) var(--tw-brightness,) var(--tw-contrast,) var(--tw-grayscale,) var(--tw-hue-rotate,) var(--tw-invert,) var(--tw-saturate,) var(--tw-sepia,) var(--tw-drop-shadow,);
   }
@@ -935,11 +898,6 @@
     -webkit-backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);
     backdrop-filter: var(--tw-backdrop-blur,) var(--tw-backdrop-brightness,) var(--tw-backdrop-contrast,) var(--tw-backdrop-grayscale,) var(--tw-backdrop-hue-rotate,) var(--tw-backdrop-invert,) var(--tw-backdrop-opacity,) var(--tw-backdrop-saturate,) var(--tw-backdrop-sepia,);
   }
-  .transition {
-    transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter, display, content-visibility, overlay, pointer-events;
-    transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
-    transition-duration: var(--tw-duration, var(--default-transition-duration));
-  }
   .transition-colors {
     transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
     transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
@@ -1145,11 +1103,6 @@
   inherits: false;
   initial-value: 0 0 #0000;
 }
-@property --tw-outline-style {
-  syntax: "*";
-  inherits: false;
-  initial-value: solid;
-}
 @property --tw-blur {
   syntax: "*";
   inherits: false;
@@ -1283,7 +1236,6 @@
       --tw-ring-offset-width: 0px;
       --tw-ring-offset-color: #fff;
       --tw-ring-offset-shadow: 0 0 #0000;
-      --tw-outline-style: solid;
       --tw-blur: initial;
       --tw-brightness: initial;
       --tw-contrast: initial;
diff --git a/tsunami/engine/asyncnotify.go b/tsunami/engine/asyncnotify.go
@@ -0,0 +1,164 @@
+// Copyright 2025, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package engine
+
+import (
+	"log"
+	"time"
+)
+
+const NotifyMaxCadence = 10 * time.Millisecond
+const NotifyDebounceTime = 500 * time.Microsecond
+const NotifyMaxDebounceTime = 2 * time.Millisecond
+
+func (c *ClientImpl) notifyAsyncRenderWork() {
+	log.Printf("notify async work\n")
+	c.notifyOnce.Do(func() {
+		c.notifyWakeCh = make(chan struct{}, 1)
+		go c.asyncInitiationLoop()
+	})
+
+	nowNs := time.Now().UnixNano()
+	c.notifyLastEventNs.Store(nowNs)
+	// Establish batch start if there's no active batch.
+	if c.notifyBatchStartNs.Load() == 0 {
+		c.notifyBatchStartNs.CompareAndSwap(0, nowNs)
+	}
+	// Coalesced wake-up.
+	select {
+	case c.notifyWakeCh <- struct{}{}:
+	default:
+	}
+}
+
+func (c *ClientImpl) asyncInitiationLoop() {
+	var (
+		lastSent time.Time
+		timer    *time.Timer
+		timerC   <-chan time.Time
+	)
+
+	schedule := func() {
+		firstNs := c.notifyBatchStartNs.Load()
+		if firstNs == 0 {
+			// No pending batch; stop timer if running.
+			if timer != nil {
+				if !timer.Stop() {
+					select {
+					case <-timer.C:
+					default:
+					}
+				}
+			}
+			timerC = nil
+			return
+		}
+		lastNs := c.notifyLastEventNs.Load()
+
+		first := time.Unix(0, firstNs)
+		last := time.Unix(0, lastNs)
+		cadenceReady := lastSent.Add(NotifyMaxCadence)
+
+		// Reset the 2ms "max debounce" window at the cadence boundary:
+		// deadline = max(first, cadenceReady) + 2ms
+		anchor := first
+		if cadenceReady.After(anchor) {
+			anchor = cadenceReady
+		}
+		deadline := anchor.Add(NotifyMaxDebounceTime)
+
+		// candidate = min(last+500us, deadline)
+		candidate := last.Add(NotifyDebounceTime)
+		if deadline.Before(candidate) {
+			candidate = deadline
+		}
+
+		// final target = max(cadenceReady, candidate)
+		target := candidate
+		if cadenceReady.After(target) {
+			target = cadenceReady
+		}
+
+		d := time.Until(target)
+		if d < 0 {
+			d = 0
+		}
+		if timer == nil {
+			timer = time.NewTimer(d)
+		} else {
+			if !timer.Stop() {
+				select {
+				case <-timer.C:
+				default:
+				}
+			}
+			timer.Reset(d)
+		}
+		timerC = timer.C
+	}
+
+	for {
+		select {
+		case <-c.notifyWakeCh:
+			schedule()
+
+		case <-timerC:
+			now := time.Now()
+
+			// Recompute right before sending; if a late event arrived,
+			// push the fire time out to respect the debounce.
+			firstNs := c.notifyBatchStartNs.Load()
+			if firstNs == 0 {
+				// Nothing to do.
+				continue
+			}
+			lastNs := c.notifyLastEventNs.Load()
+
+			first := time.Unix(0, firstNs)
+			last := time.Unix(0, lastNs)
+			cadenceReady := lastSent.Add(NotifyMaxCadence)
+
+			anchor := first
+			if cadenceReady.After(anchor) {
+				anchor = cadenceReady
+			}
+			deadline := anchor.Add(NotifyMaxDebounceTime)
+
+			candidate := last.Add(NotifyDebounceTime)
+			if deadline.Before(candidate) {
+				candidate = deadline
+			}
+			target := candidate
+			if cadenceReady.After(target) {
+				target = cadenceReady
+			}
+
+			// If we're early (because a new event just came in), reschedule.
+			if now.Before(target) {
+				d := time.Until(target)
+				if d < 0 {
+					d = 0
+				}
+				if !timer.Stop() {
+					select {
+					case <-timer.C:
+					default:
+					}
+				}
+				timer.Reset(d)
+				continue
+			}
+
+			// Fire.
+			_ = c.SendAsyncInitiation()
+			lastSent = now
+
+			// Close current batch; a concurrent notify will CAS a new start.
+			c.notifyBatchStartNs.Store(0)
+
+			// If anything is already pending, this will arm the next timer.
+			schedule()
+		}
+	}
+}
diff --git a/tsunami/engine/atomimpl.go b/tsunami/engine/atomimpl.go
@@ -64,14 +64,6 @@ func (a *AtomImpl[T]) SetVal(val any) error {
 	return a.setVal_nolock(val)
 }
 
-func (a *AtomImpl[T]) SetFnVal(setFn func(any) any) error {
-	a.lock.Lock()
-	defer a.lock.Unlock()
-	
-	newVal := setFn(a.val)
-	return a.setVal_nolock(newVal)
-}
-
 func (a *AtomImpl[T]) SetUsedBy(waveId string, used bool) {
 	a.lock.Lock()
 	defer a.lock.Unlock()
diff --git a/tsunami/engine/clientimpl.go b/tsunami/engine/clientimpl.go
@@ -13,6 +13,7 @@ import (
 	"os"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"time"
 	"unicode"
 
@@ -26,10 +27,6 @@ const TsunamiListenAddrEnvVar = "TSUNAMI_LISTENADDR"
 const DefaultListenAddr = "localhost:0"
 const DefaultComponentName = "App"
 
-const NotifyMaxCadence = 10 * time.Millisecond
-const NotifyDebounceTime = 500 * time.Microsecond
-const NotifyMaxDebounceTime = 2 * time.Millisecond
-
 type ssEvent struct {
 	Event string
 	Data  []byte
@@ -53,6 +50,14 @@ type ClientImpl struct {
 	AssetsFS           fs.FS
 	StaticFS           fs.FS
 	ManifestFileBytes  []byte
+
+	// for notification
+	// Atomics so we never drop "last event" timing info even if wakeCh is full.
+	// 0 means "no pending batch".
+	notifyOnce         sync.Once
+	notifyWakeCh       chan struct{}
+	notifyBatchStartNs atomic.Int64 // ns of first event in current batch
+	notifyLastEventNs  atomic.Int64 // ns of most recent event
 }
 
 func makeClient() *ClientImpl {
@@ -210,6 +215,7 @@ func (c *ClientImpl) listenAndServe(ctx context.Context) error {
 }
 
 func (c *ClientImpl) SendAsyncInitiation() error {
+	log.Printf("send async initiation\n")
 	if c.GetIsDone() {
 		return fmt.Errorf("client is done")
 	}
@@ -222,10 +228,6 @@ func (c *ClientImpl) SendAsyncInitiation() error {
 	}
 }
 
-func (c *ClientImpl) notifyAsyncRenderWork() {
-	// TODO
-}
-
 func makeNullRendered() *rpctypes.RenderedElem {
 	return &rpctypes.RenderedElem{WaveId: uuid.New().String(), Tag: vdom.WaveNullTag}
 }
diff --git a/tsunami/engine/rootelem.go b/tsunami/engine/rootelem.go
@@ -27,7 +27,6 @@ type EffectWorkElem struct {
 type genAtom interface {
 	GetVal() any
 	SetVal(any) error
-	SetFnVal(func(any) any) error
 	SetUsedBy(string, bool)
 	GetUsedBy() []string
 }
@@ -53,7 +52,7 @@ func (r *RootElem) addRenderWork(id string) {
 			r.Client.notifyAsyncRenderWork()
 		}
 	}()
-	
+
 	r.needsRenderLock.Lock()
 	defer r.needsRenderLock.Unlock()
 
@@ -192,17 +191,6 @@ func (r *RootElem) SetAtomVal(name string, val any) error {
 	return atom.SetVal(val)
 }
 
-func (r *RootElem) SetFnAtomVal(name string, setFn func(any) any) error {
-	r.atomLock.Lock()
-	defer r.atomLock.Unlock()
-
-	atom, ok := r.Atoms[name]
-	if !ok {
-		return fmt.Errorf("atom %q not found", name)
-	}
-	return atom.SetFnVal(setFn)
-}
-
 func (r *RootElem) RemoveAtom(name string) {
 	r.atomLock.Lock()
 	defer r.atomLock.Unlock()

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,6 @@ var App = app.DefineComponent("App", func(_ struct{}) any {`
`172`	`172`	`}`
`173`	`173`	`return data`
`174`	`174`	`})`
`175`		`- app.SendAsyncInitiation()`
`176`	`175`	`}, []any{})`
`177`	`176`
`178`	`177`	`handleClear := func() {`