synchronize atoms, implement GET /api/data

Author: sawka

tsunami/app/serverhandlers.go

@@ -40,6 +40,7 @@ func NewHTTPHandlers(client *Client) *HTTPHandlers {
 func (h *HTTPHandlers) RegisterHandlers(mux *http.ServeMux, assetsFS *embed.FS, staticFS *embed.FS) {
 	mux.HandleFunc("/api/render", h.handleRender)
 	mux.HandleFunc("/api/updates", h.handleSSE)
+	mux.HandleFunc("/api/data", h.handleData)
 	mux.HandleFunc("/files/", h.handleAssetsUrl)
 
 	// Add handler for static files at /static/ path
@@ -155,6 +156,28 @@ func (h *HTTPHandlers) processFrontendUpdate(feUpdate *rpctypes.VDomFrontendUpda
 	return update, nil
 }
 
+func (h *HTTPHandlers) handleData(w http.ResponseWriter, r *http.Request) {
+	defer func() {
+		panicErr := util.PanicHandler("handleData", recover())
+		if panicErr != nil {
+			http.Error(w, fmt.Sprintf("internal server error: %v", panicErr), http.StatusInternalServerError)
+		}
+	}()
+
+	if r.Method != http.MethodGet {
+		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+		return
+	}
+
+	result := h.Client.Root.GetDataMap()
+
+	w.Header().Set("Content-Type", "application/json")
+	if err := json.NewEncoder(w).Encode(result); err != nil {
+		log.Printf("failed to encode data response: %v", err)
+		http.Error(w, "failed to encode response", http.StatusInternalServerError)
+	}
+}
+
 func (h *HTTPHandlers) handleAssetsUrl(w http.ResponseWriter, r *http.Request) {
 	defer func() {
 		panicErr := util.PanicHandler("handleAssetsUrl", recover())

tsunami/comp/root_test.go

@@ -22,7 +22,7 @@ type TestContext struct {
 }
 
 func Page(ctx context.Context, props map[string]any) any {
-	clicked, setClicked := vdom.UseState(ctx, false)
+	clicked, setClicked, _ := vdom.UseState(ctx, false)
 	var clickedDiv *vdom.VDomElem
 	if clicked {
 		clickedDiv = vdom.Bind(`<div>clicked</div>`, nil)
@@ -45,7 +45,7 @@ func Page(ctx context.Context, props map[string]any) any {
 
 func Button(ctx context.Context, props map[string]any) any {
 	ref := vdom.UseVDomRef(ctx)
-	clName, setClName := vdom.UseState(ctx, "button")
+	clName, setClName, _ := vdom.UseState(ctx, "button")
 	vdom.UseEffect(ctx, func() func() {
 		fmt.Printf("Button useEffect\n")
 		setClName("button mounted")

tsunami/comp/rootelem.go

@@ -10,6 +10,7 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
+	"sync"
 
 	"github.com/google/uuid"
 	"github.com/wavetermdev/waveterm/tsunami/rpctypes"
@@ -30,6 +31,7 @@ type RootElem struct {
 	EffectWorkQueue []*vdom.EffectWorkElem
 	NeedsRenderMap  map[string]bool
 	Atoms           map[string]*vdom.Atom
+	atomLock        sync.Mutex
 	RefOperations   []rpctypes.VDomRefOperation
 }
 
@@ -44,6 +46,20 @@ func (r *RootElem) AddEffectWork(id string, effectIndex int) {
 	r.EffectWorkQueue = append(r.EffectWorkQueue, &vdom.EffectWorkElem{Id: id, EffectIndex: effectIndex})
 }
 
+func (r *RootElem) GetDataMap() map[string]any {
+	r.atomLock.Lock()
+	defer r.atomLock.Unlock()
+
+	result := make(map[string]any)
+	for atomName, atom := range r.Atoms {
+		if strings.HasPrefix(atomName, "$data.") {
+			strippedName := strings.TrimPrefix(atomName, "$data.")
+			result[strippedName] = atom.Val
+		}
+	}
+	return result
+}
+
 func MakeRoot() *RootElem {
 	return &RootElem{
 		Root:    nil,
@@ -53,7 +69,7 @@ func MakeRoot() *RootElem {
 	}
 }
 
-func (r *RootElem) GetAtom(name string) *vdom.Atom {
+func (r *RootElem) ensureAtomNoLock(name string) *vdom.Atom {
 	atom, ok := r.Atoms[name]
 	if !ok {
 		atom = &vdom.Atom{UsedBy: make(map[string]bool)}
@@ -62,12 +78,47 @@ func (r *RootElem) GetAtom(name string) *vdom.Atom {
 	return atom
 }
 
+
+func (r *RootElem) AtomSetUsedBy(atomName string, waveId string, used bool) {
+	r.atomLock.Lock()
+	defer r.atomLock.Unlock()
+	
+	atom := r.ensureAtomNoLock(atomName)
+	if used {
+		atom.UsedBy[waveId] = true
+	} else {
+		delete(atom.UsedBy, waveId)
+	}
+}
+
+func (r *RootElem) AtomAddRenderWork(atomName string) {
+	r.atomLock.Lock()
+	defer r.atomLock.Unlock()
+	
+	atom, ok := r.Atoms[atomName]
+	if !ok {
+		return
+	}
+	for compId := range atom.UsedBy {
+		r.AddRenderWork(compId)
+	}
+}
+
 func (r *RootElem) GetAtomVal(name string) any {
-	atom := r.GetAtom(name)
+	r.atomLock.Lock()
+	defer r.atomLock.Unlock()
+
+	atom, ok := r.Atoms[name]
+	if !ok {
+		return nil
+	}
 	return atom.Val
 }
 
 func (r *RootElem) GetStateSync(full bool) []rpctypes.VDomStateSync {
+	r.atomLock.Lock()
+	defer r.atomLock.Unlock()
+
 	stateSync := make([]rpctypes.VDomStateSync, 0)
 	for atomName, atom := range r.Atoms {
 		if atom.Dirty || full {
@@ -79,7 +130,10 @@ func (r *RootElem) GetStateSync(full bool) []rpctypes.VDomStateSync {
 }
 
 func (r *RootElem) SetAtomVal(name string, val any, markDirty bool) {
-	atom := r.GetAtom(name)
+	r.atomLock.Lock()
+	defer r.atomLock.Unlock()
+
+	atom := r.ensureAtomNoLock(name)
 	if !markDirty {
 		atom.Val = val
 		return

tsunami/comp/vdomcontext.go

@@ -27,8 +27,20 @@ func (vc *VDomContextVal) AddEffectWork(id string, effectIndex int) {
 	vc.Root.AddEffectWork(id, effectIndex)
 }
 
-func (vc *VDomContextVal) GetAtom(atomName string) *vdom.Atom {
-	return vc.Root.GetAtom(atomName)
+func (vc *VDomContextVal) AtomSetUsedBy(atomName string, waveId string, used bool) {
+	vc.Root.AtomSetUsedBy(atomName, waveId, used)
+}
+
+func (vc *VDomContextVal) AtomAddRenderWork(atomName string) {
+	vc.Root.AtomAddRenderWork(atomName)
+}
+
+func (vc *VDomContextVal) GetAtomVal(atomName string) any {
+	return vc.Root.GetAtomVal(atomName)
+}
+
+func (vc *VDomContextVal) SetAtomVal(atomName string, val any, markDirty bool) {
+	vc.Root.SetAtomVal(atomName, val, markDirty)
 }
 
 func (vc *VDomContextVal) GetRenderTs() int64 {

tsunami/vdom/vdom.go

@@ -320,27 +320,25 @@ func useAtom[T any](ctx context.Context, atomName string) (T, func(T), func(func
 		hookVal.Init = true
 		closedWaveId := vc.GetCompWaveId()
 		hookVal.UnmountFn = func() {
-			atom := vc.GetAtom(atomName)
-			delete(atom.UsedBy, closedWaveId)
+			vc.AtomSetUsedBy(atomName, closedWaveId, false)
 		}
 	}
-	atom := vc.GetAtom(atomName)
-	atom.UsedBy[vc.GetCompWaveId()] = true
-	atomVal, ok := atom.Val.(T)
+	vc.AtomSetUsedBy(atomName, vc.GetCompWaveId(), true)
+	atomVal, ok := vc.GetAtomVal(atomName).(T)
 	if !ok {
-		panic(fmt.Sprintf("UseAtom %q value type mismatch (expected %T, got %T)", atomName, atomVal, atom.Val))
+		panic(fmt.Sprintf("UseAtom %q value type mismatch (expected %T, got %T)", atomName, atomVal, vc.GetAtomVal(atomName)))
 	}
 	setVal := func(newVal T) {
-		atom.Val = newVal
-		for waveId := range atom.UsedBy {
-			vc.AddRenderWork(waveId)
-		}
+		vc.SetAtomVal(atomName, newVal, true)
+		vc.AtomAddRenderWork(atomName)
 	}
 	setFuncVal := func(updateFunc func(T) T) {
-		atom.Val = updateFunc(atom.Val.(T))
-		for waveId := range atom.UsedBy {
-			vc.AddRenderWork(waveId)
+		currentVal, ok := vc.GetAtomVal(atomName).(T)
+		if !ok {
+			panic(fmt.Sprintf("UseAtom %q value type mismatch in setFuncVal", atomName))
 		}
+		vc.SetAtomVal(atomName, updateFunc(currentVal), true)
+		vc.AtomAddRenderWork(atomName)
 	}
 	return atomVal, setVal, setFuncVal
 }

tsunami/vdom/vdom_context.go

@@ -14,7 +14,10 @@ var vdomContextKey = vdomContextKeyType{}
 type VDomContext interface {
 	AddRenderWork(id string)
 	AddEffectWork(id string, effectIndex int)
-	GetAtom(atomName string) *Atom
+	AtomSetUsedBy(atomName string, waveId string, used bool)
+	AtomAddRenderWork(atomName string)
+	GetAtomVal(atomName string) any
+	SetAtomVal(atomName string, val any, markDirty bool)
 	GetRenderTs() int64
 	GetCompWaveId() string
 	GetOrderedHook() *Hook