waveform-analysis 0.1.71 → 0.1.73

package/src/components/core/useWaveformChartLifecycle.ts

@@ -1,3 +1,5 @@
+import { useWaveformMeasurements } from './useWaveformMeasurements'
+import { useWaveformViewportRestore } from './useWaveformViewportRestore'
 import { zoomIdentity, type ZoomTransform } from 'd3'
 import {
   nextTick,
@@ -13,12 +15,10 @@ import type { AnnotationSeriesCandidate, useWaveformAnnotationInteraction } from
 import type { NormalizedWaveformGridOptions } from './grid'
 import type { DisplaySeries, DisplayTrack, TrackLayout } from './types'
 import type { ResolvedWaveformChartProps, WaveformChartEmit } from './waveformChartTypes'
-import { transformForDomain } from '../interaction/zoomConstraints'
-import { remotePanBoundary, restoreViewportDomain } from '../interaction/remoteViewport'
 import { isEditableTarget } from '../interaction/interactionTarget'
-import { seriesIdentity } from '../interaction/zoomEventPayload'
 
-interface LifecycleContext {
+export interface LifecycleContext {
+  preserveFullViewport?: () => boolean
   props: ResolvedWaveformChartProps
   emit: WaveformChartEmit
   container: Ref<HTMLDivElement | undefined>
@@ -64,19 +64,10 @@ interface LifecycleContext {
 }
 
 export function useWaveformChartLifecycle(context: LifecycleContext) {
+  useWaveformMeasurements(context)
   const {
     props,
     emit,
-    container,
-    titleMeasureElement,
-    resizeObserver,
-    observedWidth,
-    observedHeight,
-    measuredTitleWidth,
-    measuredTitleHeight,
-    resolvedTitleText,
-    titleAreaReserved,
-    titleMeasureStyle,
     spacePressed,
     pointerInsideChart,
     currentPage,
@@ -85,18 +76,13 @@ export function useWaveformChartLifecycle(context: LifecycleContext) {
     gridOptions,
     chartSeries,
     chartTracks,
-    trackLayouts,
     innerWidth,
     innerHeight,
-    sharedZoomDomain,
-    initialXDomain,
-    sharedTransform,
     activeInteractionMode,
     hiddenSeriesIdSet,
     internalHiddenSeriesIds,
     independentTransforms,
     independentYDomains,
-    resolveInitialTrackDomain,
     annotationInteraction,
     editorSeriesOptions,
     isPresentationMode,
@@ -110,6 +96,10 @@ export function useWaveformChartLifecycle(context: LifecycleContext) {
   } = context
 
   function handleInteractionKeyDown(event: KeyboardEvent) {
+    if (event.key === 'Escape') {
+      cancelViewportDrag()
+      cancelAnnotation()
+    }
     if (
       isPresentationMode.value ||
       event.code !== 'Space' ||
@@ -142,68 +132,8 @@ export function useWaveformChartLifecycle(context: LifecycleContext) {
     emit('page-change', nextPage, pageCount.value)
   }
 
-  let pendingSharedXDomain: [number, number] | undefined
-  let pendingIndependentXDomains: Map<string, [number, number]> | undefined
-
-  function handleBeforeDataReferenceChange() {
-    if (props.displayMode === 'independent') {
-      pendingSharedXDomain = undefined
-      pendingIndependentXDomains = new Map(
-        trackLayouts.value.flatMap((track) => {
-          const current = track.xScale.domain() as [number, number]
-          const boundary = resolveInitialTrackDomain(track)
-          return remotePanBoundary(props) ||
-            current[1] - current[0] < boundary[1] - boundary[0] - 1e-12
-            ? [[seriesIdentity(track.seriesList.map((series) => series.id)), current]]
-            : []
-        }),
-      )
-      return
-    }
-    pendingIndependentXDomains = undefined
-    const current = sharedZoomDomain.value
-    const boundary = initialXDomain.value
-    pendingSharedXDomain =
-      remotePanBoundary(props) || current[1] - current[0] < boundary[1] - boundary[0] - 1e-12
-        ? [...current]
-        : undefined
-  }
-
-  function handleDataReferenceChange() {
-    if (props.displayMode === 'independent') {
-      const currentTransforms = independentTransforms.value
-      independentTransforms.value = chartTracks.value.map(
-        (_track, index) => currentTransforms[index] ?? zoomIdentity,
-      )
-    }
-    clearHover()
-    editorSeriesOptions.value = []
-    void nextTick(() => {
-      if (props.displayMode === 'independent' && pendingIndependentXDomains) {
-        const nextTransforms = chartTracks.value.map(() => zoomIdentity)
-        trackLayouts.value.forEach((track) => {
-          const previousDomain = pendingIndependentXDomains?.get(
-            seriesIdentity(track.seriesList.map((series) => series.id)),
-          )
-          if (!previousDomain) return
-          const boundary = resolveInitialTrackDomain(track)
-          const domain = restoreViewportDomain(previousDomain, boundary, [track.seriesList], props)
-          nextTransforms[track.index] = transformForDomain(domain, boundary, track.width)
-        })
-        independentTransforms.value = nextTransforms
-        pendingIndependentXDomains = undefined
-      } else if (props.displayMode !== 'independent' && pendingSharedXDomain) {
-        const boundary = initialXDomain.value
-        const groups = trackLayouts.value
-          .filter((track) => track.hasVisibleSeries)
-          .map((track) => track.seriesList)
-        const domain = restoreViewportDomain(pendingSharedXDomain, boundary, groups, props)
-        sharedTransform.value = transformForDomain(domain, boundary, innerWidth.value)
-        pendingSharedXDomain = undefined
-      }
-      configureZoom()
-    })
-  }
+  const { handleBeforeDataReferenceChange, handleDataReferenceChange } =
+    useWaveformViewportRestore(context)
 
   watch(
     [
@@ -347,45 +277,15 @@ export function useWaveformChartLifecycle(context: LifecycleContext) {
     { deep: true },
   )
 
-  function measureTitle() {
-    if (!titleAreaReserved.value || !titleMeasureElement.value) {
-      measuredTitleWidth.value = 0
-      measuredTitleHeight.value = 0
-      return
-    }
-    const bounds = titleMeasureElement.value.getBoundingClientRect()
-    measuredTitleWidth.value = titleMeasureElement.value.scrollWidth || bounds.width
-    measuredTitleHeight.value = titleMeasureElement.value.scrollHeight || bounds.height
-  }
-
-  watch(
-    [resolvedTitleText, titleAreaReserved, titleMeasureStyle],
-    async () => {
-      measuredTitleWidth.value = 0
-      measuredTitleHeight.value = 0
-      await nextTick()
-      measureTitle()
-    },
-    { immediate: true },
-  )
-
   onMounted(() => {
     window.addEventListener('keydown', handleInteractionKeyDown)
     window.addEventListener('keyup', handleInteractionKeyUp)
-    if (!container.value) return
-    resizeObserver.value = new ResizeObserver(([entry]) => {
-      observedWidth.value = Math.max(0, entry?.contentRect.width ?? 0)
-      observedHeight.value = Math.max(0, entry?.contentRect.height ?? 0)
-      void nextTick(measureTitle)
-    })
-    resizeObserver.value.observe(container.value)
   })
 
   onBeforeUnmount(() => {
     window.removeEventListener('keydown', handleInteractionKeyDown)
     window.removeEventListener('keyup', handleInteractionKeyUp)
     cancelPendingHover()
-    resizeObserver.value?.disconnect()
     clearZoomBindings()
     editorSeriesOptions.value = []
   })

package/src/components/core/useWaveformData.ts

@@ -25,6 +25,8 @@ export interface PreparedWaveformSeries {
   points: WaveformPoint[]
   source: WaveformPointSource
   xDomain: [number, number]
+  rawYMaximum?: number
+  rawYMinimum?: number
   yDomain: [number, number]
   hasErrorPoints: boolean
 }
@@ -48,6 +50,8 @@ export function prepareWaveformSeries(data: WaveformData): PreparedWaveformSerie
           ? [sourceMetrics.yMinimum, sourceMetrics.yMaximum]
           : [],
       ),
+      rawYMaximum: Number.isFinite(sourceMetrics.yMaximum) ? sourceMetrics.yMaximum : undefined,
+      rawYMinimum: Number.isFinite(sourceMetrics.yMinimum) ? sourceMetrics.yMinimum : undefined,
       hasErrorPoints: sourceMetrics.hasErrorPoints,
     }
   })

package/src/components/core/useWaveformLayout.ts

@@ -17,9 +17,11 @@ import type { ResolvedWaveformChartProps } from './waveformChartTypes'
 import { applyXDomainStrategy } from './xDomain'
 import { alignIntegerZoomDomain, normalizeIntegerZoomDomain } from '../interaction/integerZoom'
 import { resolveViewportYDomains } from './yAxisLayoutMetrics'
+import { useExtremaTickViewport } from '../interaction/useExtremaTickViewport'
 import { useWaveformYAxisLayout } from './useWaveformYAxisLayout'
 import type { useWaveformAnnotationInteraction } from '../annotation'
 interface LayoutContext {
+  boundaries?: ShallowRef<Record<string, [number, number]>>
   props: ResolvedWaveformChartProps
   preparedSeries: ShallowRef<PreparedWaveformSeries[]>
   currentPage: Ref<number>
@@ -147,7 +149,7 @@ export function useWaveformLayout(context: LayoutContext) {
   const hasChartArea = computed(() => innerWidth.value > 0 && innerHeight.value > 0)
   const resolvedXLabel = computed(() => props.xLabel ?? `时间（${props.timeUnit}）`)
   const activeInteractionMode = computed(() => props.interactionMode)
-  const isZoomMode = computed(() => activeInteractionMode.value !== 'annotation')
+  const isZoomMode = computed(() => activeInteractionMode.value === 'zoom')
   const sharedXDomain = computed(() => {
     const values: number[] = []
     const tracks = chartTracks.value.some((track) => track.visibleSeries.length)
@@ -158,7 +160,7 @@ export function useWaveformLayout(context: LayoutContext) {
     })
     return paddedDomain(values)
   })
-  const initialXDomain = computed<[number, number]>(() => {
+  const originalXDomain = computed<[number, number]>(() => {
     const domain = props.initialXDomain
     if (
       domain &&
@@ -180,7 +182,7 @@ export function useWaveformLayout(context: LayoutContext) {
       props,
     )
   })
-  const resolveInitialTrackDomain = (track: TrackLayout): [number, number] => {
+  const resolveOriginalTrackDomain = (track: TrackLayout): [number, number] => {
     const configuredDomain =
       props.initialXDomains?.[track.series?.trackId ?? track.series?.id ?? track.id] ??
       (track.series ? props.initialXDomains?.[track.series.id] : undefined) ??
@@ -210,6 +212,13 @@ export function useWaveformLayout(context: LayoutContext) {
       props,
     )
   }
+  const initialXDomain = computed(
+    () =>
+      (props.displayMode !== 'independent' ? context.boundaries?.value.shared : undefined) ??
+      originalXDomain.value,
+  )
+  const resolveInitialTrackDomain = (track: TrackLayout): [number, number] =>
+    context.boundaries?.value[track.id] ?? resolveOriginalTrackDomain(track)
   const sharedZoomDomain = computed(() =>
     normalizeIntegerZoomDomain(
       sharedTransform.value
@@ -240,6 +249,7 @@ export function useWaveformLayout(context: LayoutContext) {
       useNonEmptyBottomTracks: props.layoutPreset === 'edge-compact',
       compactYAxisLayout: props.layoutPreset === 'edge-compact',
       showAxisUnits:
+        props.unitDisplayMode !== 'channel-label' &&
         props.unitDisplayMode !== 'channel-label-or-legend' &&
         (props.layoutPreset !== 'edge-compact' || props.unitDisplayMode === 'axis'),
       displayMode: props.displayMode,
@@ -248,6 +258,7 @@ export function useWaveformLayout(context: LayoutContext) {
       sharedZoomDomain: sharedZoomDomain.value,
       initialXDomain: props.initialXDomain ? initialXDomain.value : undefined,
       initialXDomains: props.initialXDomains,
+      effectiveXDomains: context.boundaries?.value,
       xDomainStrategy: props.xDomainStrategy,
       integerZoom: props.integerZoom,
       fixedYDomain: props.yDomain,
@@ -257,7 +268,7 @@ export function useWaveformLayout(context: LayoutContext) {
       xAxisLabelFormatter: props.axes?.x?.labelFormatter,
       yAxisSplitNumber: props.axes?.y?.splitNumber,
       yAxisNice: props.axes?.y?.nice,
-      yAxisUpperPaddingRatio: props.axes?.y?.upperPaddingRatio,
+      yAxisPadding: props.axes?.y,
       rendering: renderingOptions.value,
       linePointOverrides: linePointOverrides?.value,
       hideSecondaryLabels: isCleanView.value || yAxisLayout.value.hideSecondaryLabels,
@@ -266,9 +277,16 @@ export function useWaveformLayout(context: LayoutContext) {
         yAxisSlots.value.slots.find((slot) => slot.side === 'left' && slot.sideIndex === 0)
           ?.labelOffset ?? yAxisMetrics.value.labelCenterX,
       yAxisSlots: yAxisSlots.value.slots,
-      showCompactEmptyTracks: props.displayMode === 'compact' && hasWaveformData.value,
+      showEmptyTracks: hasWaveformData.value,
     }),
   )
+  useExtremaTickViewport(
+    () => props.axes?.y?.extremaTicksVisible !== false,
+    innerWidth,
+    trackLayouts,
+    sharedTransform,
+    independentTransforms,
+  )
   const annotationLayoutsForTrack = (track: TrackLayout): AnnotationTrackLayout[] =>
     track.seriesList.map((series) => ({
       ...track,
@@ -329,6 +347,8 @@ export function useWaveformLayout(context: LayoutContext) {
     activeInteractionMode,
     isZoomMode,
     initialXDomain,
+    originalXDomain,
+    resolveOriginalTrackDomain,
     sharedZoomDomain,
     resolveInitialTrackDomain,
     gridCells,

package/src/components/core/useWaveformMeasurements.ts

@@ -0,0 +1,63 @@
+import { nextTick, watch, onMounted, onBeforeUnmount } from 'vue'
+import type { LifecycleContext } from './useWaveformChartLifecycle'
+
+export function useWaveformMeasurements(
+  context: Pick<
+    LifecycleContext,
+    | 'container'
+    | 'titleMeasureElement'
+    | 'resizeObserver'
+    | 'observedWidth'
+    | 'observedHeight'
+    | 'measuredTitleWidth'
+    | 'measuredTitleHeight'
+    | 'resolvedTitleText'
+    | 'titleAreaReserved'
+    | 'titleMeasureStyle'
+  >,
+) {
+  const {
+    container,
+    titleMeasureElement,
+    resizeObserver,
+    observedWidth,
+    observedHeight,
+    measuredTitleWidth,
+    measuredTitleHeight,
+    resolvedTitleText,
+    titleAreaReserved,
+    titleMeasureStyle,
+  } = context
+  function measureTitle() {
+    if (!titleAreaReserved.value || !titleMeasureElement.value) {
+      measuredTitleWidth.value = 0
+      measuredTitleHeight.value = 0
+      return
+    }
+    const bounds = titleMeasureElement.value.getBoundingClientRect()
+    measuredTitleWidth.value = titleMeasureElement.value.scrollWidth || bounds.width
+    measuredTitleHeight.value = titleMeasureElement.value.scrollHeight || bounds.height
+  }
+
+  watch(
+    [resolvedTitleText, titleAreaReserved, titleMeasureStyle],
+    async () => {
+      measuredTitleWidth.value = 0
+      measuredTitleHeight.value = 0
+      await nextTick()
+      measureTitle()
+    },
+    { immediate: true },
+  )
+
+  onMounted(() => {
+    if (!container.value) return
+    resizeObserver.value = new ResizeObserver(([entry]) => {
+      observedWidth.value = Math.max(0, entry?.contentRect.width ?? 0)
+      observedHeight.value = Math.max(0, entry?.contentRect.height ?? 0)
+      void nextTick(measureTitle)
+    })
+    resizeObserver.value.observe(container.value)
+  })
+  onBeforeUnmount(() => resizeObserver.value?.disconnect())
+}

package/src/components/core/useWaveformRenderSampling.ts

@@ -1,3 +1,5 @@
+import { createWaveformSamplingSession } from './waveformSamplingSession'
+import { lineBoundaryIndexes, withLineBoundaries } from '../../core/lineBoundary'
 import { computed, onScopeDispose, shallowRef, watch, type ComputedRef, type ShallowRef } from 'vue'
 
 import {
@@ -11,12 +13,8 @@ import { pointSourceFromPoints, type WaveformPointSource } from '../../core/wave
 import type { PreparedWaveformSeries } from './useWaveformData'
 import type { DisplaySeries, TrackLayout } from './types'
 import type { ResolvedWaveformChartProps, WaveformChartEmit } from './waveformChartTypes'
-import { createLatestTaskScheduler, resolveAutoSelectedMode } from './latestTaskScheduler'
-import {
-  createWorkerSamplingClient,
-  isDatasetResponse,
-  type WorkerSamplingClient,
-} from './workerSamplingClient'
+import { resolveAutoSelectedMode } from './latestTaskScheduler'
+import { isDatasetResponse, type WorkerSamplingClient } from './workerSamplingClient'
 
 interface SamplingTarget {
   series: DisplaySeries
@@ -62,7 +60,8 @@ function rawDiagnostics(target: SamplingTarget, requestId: number): WorkerSampli
     strategy: sampling.strategy === 'auto' ? 'peak' : sampling.strategy,
     sourcePointCount: target.source.length,
     visiblePointCount,
-    renderedPointCount: visiblePointCount,
+    renderedPointCount:
+      visiblePointCount + lineBoundaryIndexes(target.visibleRange, target.source.length).length,
     durationMs: 0,
     cacheHit: false,
     requestId,
@@ -75,7 +74,7 @@ function rawDiagnostics(target: SamplingTarget, requestId: number): WorkerSampli
   }
 }
 
-function fallbackPoints(target: SamplingTarget) {
+function fallbackInteriorPoints(target: SamplingTarget) {
   const { source } = target
   const { start, end } = target.visibleRange
   const count = end - start
@@ -104,18 +103,17 @@ function errorPayload(
 }
 
 export function useWaveformRenderSampling(context: SamplingContext) {
+  const settledSignature = shallowRef<string>()
   const dataEpoch = shallowRef(0)
-  let client: WorkerSamplingClient | undefined
-  let requestId = 0
-  const revisions = new Map<string, number>()
-  const backendBySeries = new Map<string, WorkerSamplingDiagnostics['backend']>()
-  const selectedModeBySeries = new Map<string, 'raw' | 'sampled'>()
-  const emittedErrors = new Set<string>()
-  const pendingDiagnostics = new Map<string, WorkerSamplingDiagnostics>()
-  const samplingScheduler = createLatestTaskScheduler()
-  let diagnosticsTimer: ReturnType<typeof setTimeout> | undefined
-  let autoModeSettleTimer: ReturnType<typeof setTimeout> | undefined
-  let hasInitialSamplingRun = false
+  const session = createWaveformSamplingSession()
+  const {
+    revisions,
+    backendBySeries,
+    selectedModeBySeries,
+    emittedErrors,
+    pendingDiagnostics,
+    scheduler: samplingScheduler,
+  } = session
 
   const targets = computed(() => {
     const sampling = context.renderingOptions.value.sampling
@@ -169,7 +167,7 @@ export function useWaveformRenderSampling(context: SamplingContext) {
   )
 
   const flushDiagnostics = () => {
-    diagnosticsTimer = undefined
+    session.diagnosticsTimer = undefined
     pendingDiagnostics.forEach((diagnostic) => {
       const previousBackend = backendBySeries.get(diagnostic.seriesId)
       if (previousBackend && previousBackend !== diagnostic.backend) {
@@ -193,7 +191,7 @@ export function useWaveformRenderSampling(context: SamplingContext) {
         maxPendingRequestCount: samplingScheduler.metrics.maxPending,
       }),
     )
-    if (!diagnosticsTimer) diagnosticsTimer = setTimeout(flushDiagnostics, 100)
+    if (!session.diagnosticsTimer) session.diagnosticsTimer = setTimeout(flushDiagnostics, 100)
   }
 
   const emitErrorOnce = (payload: WaveformSamplingError) => {
@@ -213,7 +211,7 @@ export function useWaveformRenderSampling(context: SamplingContext) {
         if (revisions.has(target.request.datasetId)) return
         const response = await workerClient.send({
           type: 'register-dataset',
-          requestId: ++requestId,
+          requestId: ++session.requestId,
           datasetId: target.request.datasetId,
           revision: 0,
           dataset: target.source.toWorkerDataset(),
@@ -249,15 +247,22 @@ export function useWaveformRenderSampling(context: SamplingContext) {
           previousSelectedMode,
         ) === 'raw'
       if (target.request.mode === 'raw' || autoRaw) {
-        nextOverrides[target.series.id] = target.source.pointsInRange(
-          target.visibleRange.start,
-          target.visibleRange.end,
+        nextOverrides[target.series.id] = withLineBoundaries(
+          target.source.pointsInRange(target.visibleRange.start, target.visibleRange.end),
+          target.visibleRange,
+          target.source.length,
+          (index) => target.source.pointAt(index)!,
         )
         selectedModeBySeries.set(target.series.id, 'raw')
         diagnostics.push(rawDiagnostics(target, token))
       } else {
         if (!nextOverrides[target.series.id]?.length) {
-          nextOverrides[target.series.id] = fallbackPoints(target)
+          nextOverrides[target.series.id] = withLineBoundaries(
+            fallbackInteriorPoints(target),
+            target.visibleRange,
+            target.source.length,
+            (index) => target.source.pointAt(index)!,
+          )
         }
         sampledTargets.push({
           ...target,
@@ -273,18 +278,18 @@ export function useWaveformRenderSampling(context: SamplingContext) {
     }
 
     context.linePointOverrides.value = nextOverrides
-    client ??= createWorkerSamplingClient()
-    await registerTargets(client, sampledTargets, token)
-    if (!samplingScheduler.isCurrent(token)) return
-    const batch = sampledTargets.map((target) => ({
-      ...target.request,
-      revision: revisions.get(target.request.datasetId) ?? 1,
-    }))
+    const client = session.getClient()
     let response: SampleViewportResponse
     try {
+      await registerTargets(client, sampledTargets, token)
+      if (!samplingScheduler.isCurrent(token)) return
+      const batch = sampledTargets.map((target) => ({
+        ...target.request,
+        revision: revisions.get(target.request.datasetId) ?? 1,
+      }))
       const result = await client.send({
         type: 'sample-viewport',
-        requestId: ++requestId,
+        requestId: ++session.requestId,
         series: batch,
       })
       if (result.type !== 'sample-viewport-response') return
@@ -295,7 +300,10 @@ export function useWaveformRenderSampling(context: SamplingContext) {
         errorPayload(
           error instanceof Error ? error.message : String(error),
           context.renderingOptions.value.sampling.mode,
-          'javascript',
+          context.renderingOptions.value.sampling.mode === 'wasm' &&
+            context.renderingOptions.value.sampling.wasmFailureFallback === 'error'
+            ? 'none'
+            : 'javascript',
           sampledTargets.map((target) => target.series.id),
         ),
       )
@@ -322,12 +330,18 @@ export function useWaveformRenderSampling(context: SamplingContext) {
         )
       }
     })
-    if (response.workerError) {
+    if (
+      response.workerError &&
+      response.results.every((result) => result.status !== 'wasm-unavailable')
+    ) {
       emitErrorOnce(
         errorPayload(
           response.workerError,
           context.renderingOptions.value.sampling.mode,
-          'javascript',
+          context.renderingOptions.value.sampling.mode === 'wasm' &&
+            context.renderingOptions.value.sampling.wasmFailureFallback === 'error'
+            ? 'none'
+            : 'javascript',
           sampledTargets.map((target) => target.series.id),
         ),
       )
@@ -340,7 +354,10 @@ export function useWaveformRenderSampling(context: SamplingContext) {
         errorPayload(
           client.workerFailureReason,
           context.renderingOptions.value.sampling.mode,
-          'javascript',
+          context.renderingOptions.value.sampling.mode === 'wasm' &&
+            context.renderingOptions.value.sampling.wasmFailureFallback === 'error'
+            ? 'none'
+            : 'javascript',
           sampledTargets.map((target) => target.series.id),
         ),
       )
@@ -349,21 +366,33 @@ export function useWaveformRenderSampling(context: SamplingContext) {
     emitDiagnostics(diagnostics)
   }
 
+  const scheduleSampling = (hysteresis: boolean) => {
+    settledSignature.value = undefined
+    const signature = targetSignature.value
+    samplingScheduler.schedule(async (token) => {
+      try {
+        await runSampling(token, hysteresis)
+      } finally {
+        if (samplingScheduler.isCurrent(token)) settledSignature.value = signature
+      }
+    })
+  }
+
   watch(
     targetSignature,
     () => {
-      if (autoModeSettleTimer) clearTimeout(autoModeSettleTimer)
-      const useAutoHysteresis = hasInitialSamplingRun
-      hasInitialSamplingRun = true
-      samplingScheduler.schedule((token) => runSampling(token, useAutoHysteresis))
+      if (session.autoModeSettleTimer) clearTimeout(session.autoModeSettleTimer)
+      const useAutoHysteresis = session.hasInitialSamplingRun
+      session.hasInitialSamplingRun = true
+      scheduleSampling(useAutoHysteresis)
       if (
         useAutoHysteresis &&
         context.renderingOptions.value.sampling.mode === 'auto' &&
         context.renderingOptions.value.sampling.autoHysteresis > 0
       ) {
-        autoModeSettleTimer = setTimeout(() => {
-          autoModeSettleTimer = undefined
-          samplingScheduler.schedule((token) => runSampling(token, false))
+        session.autoModeSettleTimer = setTimeout(() => {
+          session.autoModeSettleTimer = undefined
+          scheduleSampling(false)
         }, AUTO_MODE_SETTLE_DELAY_MS)
       }
     },
@@ -372,24 +401,16 @@ export function useWaveformRenderSampling(context: SamplingContext) {
   watch(
     context.preparedSeries,
     () => {
-      samplingScheduler.cancelPending()
+      session.invalidate()
       dataEpoch.value += 1
       context.linePointOverrides.value = {}
-      revisions.clear()
-      backendBySeries.clear()
-      selectedModeBySeries.clear()
-      emittedErrors.clear()
-      client?.dispose()
-      client = undefined
     },
     { flush: 'sync' },
   )
-  onScopeDispose(() => {
-    if (diagnosticsTimer) clearTimeout(diagnosticsTimer)
-    if (autoModeSettleTimer) clearTimeout(autoModeSettleTimer)
-    samplingScheduler.dispose()
-    client?.dispose()
-  })
+  onScopeDispose(() => session.dispose())
 
-  return { linePointOverrides: context.linePointOverrides }
+  return {
+    linePointOverrides: context.linePointOverrides,
+    ready: () => settledSignature.value === targetSignature.value && !session.autoModeSettleTimer,
+  }
 }