@xstate-devtools/adapter 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xstate-devtools/adapter",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "main": "./src/index.ts",
   "exports": {

package/src/core.ts

@@ -569,44 +569,45 @@ export function createInspector(
     if (inspectionEvent.type === '@xstate.actor') {
       const actorRef: AnyActorRef = inspectionEvent.actorRef
       const sessionId: string = actorRef.sessionId
+
+      // Serialize machine and populate both Maps BEFORE subscribing so that
+      // the Maps are fully consistent if complete()/error() ever fire
+      // synchronously during subscribe() (e.g. an actor that starts in a
+      // final state).  Populating after subscribe introduced a race where
+      // actorMachines.delete() in the callback was a no-op and the subsequent
+      // actorMachines.set() would leak the entry permanently.
+      const actorLogic = (actorRef as { logic?: unknown }).logic as any
+      const machine = actorLogic?.root
+        ? serializeMachine(
+            actorLogic,
+            actorLogic.config?.__xstateDevtoolsSource ?? getSourceLocation(source, options),
+          )
+        : null
       actorRefs.set(sessionId, actorRef)
+      actorMachines.set(sessionId, machine)
 
       // Eagerly remove the actor from both maps when it stops so we don't
       // accumulate strong references to every short-lived actor indefinitely.
       // Without this, actors that stop silently (no further snapshot/event) are
       // only removed by checkAndNotifyStop — which never fires for them.
+      const notifyStop = () => {
+        if (actorRefs.has(sessionId)) {
+          actorRefs.delete(sessionId)
+          actorMachines.delete(sessionId)
+          const stopMsg: PageToExtensionMessage = {
+            type: 'XSTATE_ACTOR_STOPPED',
+            sessionId: tag(sessionId),
+          }
+          debugLog(source, 'actor stopped; notifying transport', summarizeMessage(stopMsg))
+          transport.send(stopMsg)
+        }
+      }
       try {
-        actorRef.subscribe({
-          complete: () => {
-            if (actorRefs.has(sessionId)) {
-              actorRefs.delete(sessionId)
-              actorMachines.delete(sessionId)
-              const stopMsg: PageToExtensionMessage = {
-                type: 'XSTATE_ACTOR_STOPPED',
-                sessionId: tag(sessionId),
-              }
-              debugLog(source, 'actor completed; notifying transport', summarizeMessage(stopMsg))
-              transport.send(stopMsg)
-            }
-          },
-          error: () => {
-            actorRefs.delete(sessionId)
-            actorMachines.delete(sessionId)
-          },
-        })
+        actorRef.subscribe({ complete: notifyStop, error: notifyStop })
       } catch {
         // subscribe is best-effort; older actor implementations may not support it
       }
 
-      const actorLogic = (actorRef as { logic?: unknown }).logic as any
-      const machine = actorLogic?.root
-        ? serializeMachine(
-            actorLogic,
-            actorLogic.config?.__xstateDevtoolsSource ?? getSourceLocation(source, options),
-          )
-        : null
-      actorMachines.set(sessionId, machine)
-
       const message: PageToExtensionMessage = {
         type: 'XSTATE_ACTOR_REGISTERED',
         sessionId: tag(sessionId),