expo-observe 58.0.13 → 58.0.15

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 58.0.15
+
+### Patch Changes
+
+- Updated dependencies. ([#51609](https://github.com/expo/expo/pull/51609))
+  - expo-app-metrics@58.0.13
+
+## 58.0.14
+
+### Patch Changes
+
+- Adjust router integration to use `unstable_PerformanceObserver` instead of `unstable_navigationEvents` ([#51068](https://github.com/expo/expo/pull/51068) by [@Ubax](https://github.com/Ubax))
+- Measure Expo Router navigation TTR and TTI from when the navigation action is queued. ([#51485](https://github.com/expo/expo/pull/51485) by [@Ubax](https://github.com/Ubax))
+- Updated dependencies. ([#51538](https://github.com/expo/expo/pull/51538))
+  - expo-app-metrics@58.0.12
+
 ## 58.0.13
 
 ### Patch Changes

package/build/integrations/expo-router/ObserveRouterIntegrationProvider.js

@@ -8,7 +8,7 @@ export function ObserveRouterIntegrationProvider({ children }) {
     const [storage] = useState(()=>isInitialized() ? createRouterIntegrationStorage() : null);
     const [listenersCleanup] = useState(()=>{
         if (!storage || !optionalRouter) return;
-        return initListeners(storage, optionalRouter.unstable_navigationEvents);
+        return initListeners(storage, optionalRouter.unstable_PerformanceObserver);
     });
     const prevInitialized = useRef(isInitialized());
     if (prevInitialized.current !== isInitialized()) {

package/build/integrations/expo-router/ObserveRouterIntegrationProvider.js.map

@@ -1 +1 @@
-{"version":3,"sources":["integrations/expo-router/ObserveRouterIntegrationProvider.tsx"],"sourcesContent":[null],"names":["createContext","useEffect","useRef","useState","initListeners","isInitialized","optionalRouter","createRouterIntegrationStorage","ObserveRouterIntegrationContext","ObserveRouterIntegrationProvider","children","storage","listenersCleanup","unstable_navigationEvents","prevInitialized","current","Error","Provider","value"],"mappings":";AAAA,SAASA,aAAa,EAA0BC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,QAAQ;AAE3F,SAASC,aAAa,EAAEC,aAAa,QAAQ,SAAS;AACtD,SAASC,cAAc,QAAQ,WAAW;AAC1C,SAASC,8BAA8B,QAAuC,YAAY;AAE1F,OAAO,MAAMC,gDAAkCR,cAA+C,MAAM;AAEpG,OAAO,SAASS,iCAAiC,EAAEC,QAAQ,EAAqB;IAC9E,MAAM,CAACC,QAAQ,GAAGR,SAA0C,IAC1DE,kBAAkBE,mCAAmC;IAEvD,MAAM,CAACK,iBAAiB,GAAGT,SAAS;QAClC,IAAI,CAACQ,WAAW,CAACL,gBAAgB;QACjC,OAAOF,cAAcO,SAASL,eAAeO,yBAAyB;IACxE;IAEA,MAAMC,kBAAkBZ,OAAOG;IAC/B,IAAIS,gBAAgBC,OAAO,KAAKV,iBAAiB;QAC/C,MAAM,IAAIW,MACR,CAAC,sCAAsC,EAAEX,kBAAkB,YAAY,WAAW,oFAAoF,CAAC;IAE3K;IAEAJ,UAAU,IAAMW,kBAAkB;QAACA;KAAiB;IAEpD,qBACE,KAACJ,gCAAgCS,QAAQ;QAACC,OAAOP;kBAC9CD;;AAGP"}
+{"version":3,"sources":["integrations/expo-router/ObserveRouterIntegrationProvider.tsx"],"sourcesContent":[null],"names":["createContext","useEffect","useRef","useState","initListeners","isInitialized","optionalRouter","createRouterIntegrationStorage","ObserveRouterIntegrationContext","ObserveRouterIntegrationProvider","children","storage","listenersCleanup","unstable_PerformanceObserver","prevInitialized","current","Error","Provider","value"],"mappings":";AAAA,SAASA,aAAa,EAA0BC,SAAS,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,QAAQ;AAE3F,SAASC,aAAa,EAAEC,aAAa,QAAQ,SAAS;AACtD,SAASC,cAAc,QAAQ,WAAW;AAC1C,SAASC,8BAA8B,QAAuC,YAAY;AAE1F,OAAO,MAAMC,gDAAkCR,cAA+C,MAAM;AAEpG,OAAO,SAASS,iCAAiC,EAAEC,QAAQ,EAAqB;IAC9E,MAAM,CAACC,QAAQ,GAAGR,SAA0C,IAC1DE,kBAAkBE,mCAAmC;IAEvD,MAAM,CAACK,iBAAiB,GAAGT,SAAS;QAClC,IAAI,CAACQ,WAAW,CAACL,gBAAgB;QACjC,OAAOF,cAAcO,SAASL,eAAeO,4BAA4B;IAC3E;IAEA,MAAMC,kBAAkBZ,OAAOG;IAC/B,IAAIS,gBAAgBC,OAAO,KAAKV,iBAAiB;QAC/C,MAAM,IAAIW,MACR,CAAC,sCAAsC,EAAEX,kBAAkB,YAAY,WAAW,oFAAoF,CAAC;IAE3K;IAEAJ,UAAU,IAAMW,kBAAkB;QAACA;KAAiB;IAEpD,qBACE,KAACJ,gCAAgCS,QAAQ;QAACC,OAAOP;kBAC9CD;;AAGP"}

package/build/integrations/expo-router/init.d.ts

@@ -1,9 +1,7 @@
 import type { ObserveIntegrationsConfig } from '../../types';
-import { optionalRouter } from './router';
+import { type RouterPerformanceObserver } from './router';
 import { type RouterIntegrationStorage } from './storage';
 export declare const isInitialized: () => boolean;
 export declare const getRouterIntegrationConfig: () => boolean | import("../..").ObserveNavigationIntegrationConfig | undefined;
 export declare function initRouterIntegration(config?: ObserveIntegrationsConfig['expo-router']): void;
-type NavigationEvents = NonNullable<typeof optionalRouter>['unstable_navigationEvents'];
-export declare function initListeners(storage: RouterIntegrationStorage, navigationEvents: NavigationEvents): () => void;
-export {};
+export declare function initListeners(storage: RouterIntegrationStorage, PerformanceObserver: RouterPerformanceObserver): () => void;

package/build/integrations/expo-router/init.js

@@ -7,6 +7,7 @@ import { optionalRouter } from './router';
 // web bundle doesn't pull in `expo-app-metrics`' native bridge calls. The web
 // version should be an explicit no-op (return a noop cleanup) rather than
 // relying on the web stubs in `expo-app-metrics/module.web.ts`.
+const MAX_ENQUEUE_TIMES = 100;
 let initialized = false;
 let routerIntegrationConfig;
 export const isInitialized = ()=>initialized;
@@ -14,32 +15,54 @@ export const getRouterIntegrationConfig = ()=>routerIntegrationConfig;
 export function initRouterIntegration(config) {
     initialized = true;
     routerIntegrationConfig = config;
-    optionalRouter?.unstable_navigationEvents.enable();
+    optionalRouter?.unstable_enablePerformanceIntegration();
 }
-export function initListeners(storage, navigationEvents) {
+export function initListeners(storage, PerformanceObserver) {
     const appLaunchTime = performance.now();
-    const cleanup = new Set();
-    const unsubscribeAction = navigationEvents.addListener('actionDispatched', (event)=>{
-        // PRELOAD comes from router.prefetch() — a route warm-up, not a user
-        // navigation — so it must not seed dispatchTime.
-        if (event.actionType === 'PRELOAD') return;
-        storage.pendingActions.push({
-            actionType: event.actionType,
-            dispatchTime: performance.now()
-        });
+    const observer = new PerformanceObserver((list)=>{
+        for (const performanceEntry of list.getEntries()){
+            // Marks with the names handled below always have the matching `detail`.
+            const entry = performanceEntry;
+            switch(entry.name){
+                case 'expo-router:action-enqueued':
+                    storage.enqueueTimes.set(entry.detail.actionId, entry.startTime);
+                    // Ids grow and the map keeps insertion order, so the first key is the oldest. The cap
+                    // bounds the map, because some actions never dispatch.
+                    if (storage.enqueueTimes.size > MAX_ENQUEUE_TIMES) {
+                        storage.enqueueTimes.delete(storage.enqueueTimes.keys().next().value);
+                    }
+                    break;
+                case 'expo-router:action-dispatched':
+                    {
+                        // Look up by id so an action that never dispatched can't become the TTR start.
+                        const { actionId } = entry.detail;
+                        const enqueueTime = actionId === undefined ? undefined : storage.enqueueTimes.get(actionId);
+                        // PRELOAD comes from router.prefetch() — a route warm-up, not a user
+                        // navigation — so it must not become a TTR start.
+                        if (entry.detail.actionType === 'PRELOAD') break;
+                        storage.pendingActions.push({
+                            actionType: entry.detail.actionType,
+                            startTime: enqueueTime ?? entry.startTime
+                        });
+                        break;
+                    }
+                case 'expo-router:page-preloaded':
+                    // The screen rendered as part of a preload. Mark it as already rendered so
+                    // the eventual page focus resolves to `warm_ttr` rather than `cold_ttr`.
+                    storage.renderedScreensIds.add(entry.detail.screenId);
+                    break;
+                case 'expo-router:page-focused':
+                    onPageFocused(entry.detail, entry.startTime);
+                    break;
+            }
+        }
     });
-    cleanup.add(unsubscribeAction);
-    const unsubscribePreload = navigationEvents.addListener('pagePreloaded', (e)=>{
-        // The screen rendered as part of a preload. Mark it as already rendered so
-        // the eventual `pageFocused` resolves to `warm_ttr` rather than `cold_ttr`.
-        storage.renderedScreensIds.add(e.screenId);
+    observer.observe({
+        type: 'mark'
     });
-    cleanup.add(unsubscribePreload);
-    const unsubscribeFocus = navigationEvents.addListener('pageFocused', async (e)=>{
-        // Snapshot both clocks once so every metric written below is stamped with
-        // the moment the focus event fired, not the moment `addMetric` happens to run
-        // after the surrounding async work.
-        const now = performance.now();
+    async function onPageFocused(e, now) {
+        // Stamp every metric written below with the moment of the focus mark, not
+        // the moment `addMetric` happens to run after the surrounding async work.
         const timestamp = new Date().toISOString();
         // Snapshot BEFORE seeding dispatchTime below so the deferred-TTI check
         // sees the pre-focus state of this screen. A pending interactive means
@@ -61,7 +84,7 @@ export function initListeners(storage, navigationEvents) {
         } else {
             const last = storage.pendingActions[storage.pendingActions.length - 1];
             if (!last) return;
-            dispatchTime = last.dispatchTime;
+            dispatchTime = last.startTime;
             isAppLaunch = false;
             storage.pendingActions.length = 0;
         }
@@ -108,12 +131,8 @@ export function initListeners(storage, navigationEvents) {
                 config: routerIntegrationConfig
             });
         }
-    });
-    cleanup.add(unsubscribeFocus);
-    return ()=>{
-        cleanup.forEach((c)=>c());
-        cleanup.clear();
-    };
+    }
+    return ()=>observer.disconnect();
 }
 
 //# sourceMappingURL=init.js.map

package/build/integrations/expo-router/init.js.map

@@ -1 +1 @@
-{"version":3,"sources":["integrations/expo-router/init.ts"],"sourcesContent":[null],"names":["AppMetrics","getNavigationMetricParams","emitTTI","buildRoutePattern","optionalRouter","initialized","routerIntegrationConfig","isInitialized","getRouterIntegrationConfig","initRouterIntegration","config","unstable_navigationEvents","enable","initListeners","storage","navigationEvents","appLaunchTime","performance","now","cleanup","Set","unsubscribeAction","addListener","event","actionType","pendingActions","push","dispatchTime","add","unsubscribePreload","e","renderedScreensIds","screenId","unsubscribeFocus","timestamp","Date","toISOString","existingFocusedScreenTimes","screenTimes","hasPendingInteractive","lastInteractiveCall","isInitial","has","name","routePattern","segments","isAppLaunch","hasRecordedInitialTtr","last","length","ttrSeconds","interactiveScreensIds","mainSession","getMainSession","navigationParams","params","pathname","addMetric","category","routeName","value","session","routeParams","url","forEach","c","clear"],"mappings":"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"}
+{"version":3,"sources":["integrations/expo-router/init.ts"],"sourcesContent":[null],"names":["AppMetrics","getNavigationMetricParams","emitTTI","buildRoutePattern","optionalRouter","MAX_ENQUEUE_TIMES","initialized","routerIntegrationConfig","isInitialized","getRouterIntegrationConfig","initRouterIntegration","config","unstable_enablePerformanceIntegration","initListeners","storage","PerformanceObserver","appLaunchTime","performance","now","observer","list","performanceEntry","getEntries","entry","name","enqueueTimes","set","detail","actionId","startTime","size","delete","keys","next","value","enqueueTime","undefined","get","actionType","pendingActions","push","renderedScreensIds","add","screenId","onPageFocused","observe","type","e","timestamp","Date","toISOString","existingFocusedScreenTimes","screenTimes","hasPendingInteractive","lastInteractiveCall","dispatchTime","isInitial","has","routePattern","segments","isAppLaunch","hasRecordedInitialTtr","last","length","ttrSeconds","interactiveScreensIds","mainSession","getMainSession","navigationParams","params","pathname","addMetric","category","routeName","session","routeParams","url","disconnect"],"mappings":"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"}

package/build/integrations/expo-router/router.d.ts

@@ -1,19 +1,38 @@
-interface RouterPageEvent {
+export interface RouterPageMarkDetail {
     pathname: string;
-    params: Record<string, string | string[]>;
+    params: Record<string, string | string[] | undefined>;
     screenId: string;
     segments: string[];
 }
-interface RouterActionDispatchedEvent {
-    actionType: string;
-}
-interface RouterNavigationEvents {
-    addListener(eventType: 'actionDispatched', callback: (event: RouterActionDispatchedEvent) => void): () => void;
-    addListener(eventType: 'pagePreloaded' | 'pageFocused', callback: (event: RouterPageEvent) => void): () => void;
-    enable(): void;
-}
+export type RouterPerformanceMark = {
+    name: 'expo-router:action-enqueued';
+    startTime: number;
+    detail: {
+        actionId: number;
+    };
+} | {
+    name: 'expo-router:action-dispatched';
+    startTime: number;
+    detail: {
+        actionType: string;
+        actionId?: number;
+    };
+} | {
+    name: 'expo-router:page-preloaded' | 'expo-router:page-focused' | 'expo-router:page-blurred' | 'expo-router:page-removed';
+    startTime: number;
+    detail: RouterPageMarkDetail;
+};
+export type RouterPerformanceObserver = new (callback: (list: {
+    getEntries(): Pick<PerformanceEntry, 'name' | 'startTime'>[];
+}) => void) => {
+    observe(options: {
+        type: 'mark';
+    }): void;
+    disconnect(): void;
+};
 interface OptionalRouter {
-    unstable_navigationEvents: RouterNavigationEvents;
+    unstable_enablePerformanceIntegration(): void;
+    unstable_PerformanceObserver: RouterPerformanceObserver;
     useCurrentRouteInfo(): {
         pathname: string;
         params: Record<string, string | string[]>;

package/build/integrations/expo-router/router.js.map

@@ -1 +1 @@
-{"version":3,"sources":["integrations/expo-router/router.ts"],"sourcesContent":[null],"names":["optionalRouter","require","isRouterInstalled"],"mappings":"AAAA,+EAA+E;AAC/E,6EAA6E;AAmC7E,IAAIA;AACJ,IAAI;IACFA,iBAAiBC,QAAQ;AAC3B,EAAE,OAAM;AACN,oDAAoD;AACtD;AACA,MAAMC,oBAAoB,CAAC,CAACF;AAE5B,SAASA,cAAc,EAAEE,iBAAiB,GAAG"}
+{"version":3,"sources":["integrations/expo-router/router.ts"],"sourcesContent":[null],"names":["optionalRouter","require","isRouterInstalled"],"mappings":"AAAA,+EAA+E;AAC/E,6EAA6E;AA6C7E,IAAIA;AACJ,IAAI;IACFA,iBAAiBC,QAAQ;AAC3B,EAAE,OAAM;AACN,oDAAoD;AACtD;AACA,MAAMC,oBAAoB,CAAC,CAACF;AAE5B,SAASA,cAAc,EAAEE,iBAAiB,GAAG"}

package/build/integrations/expo-router/storage.d.ts

@@ -5,13 +5,17 @@ export interface ScreenTimes {
 }
 export interface PendingAction {
     actionType: string;
-    dispatchTime: number;
+    startTime: number;
 }
 export interface RouterIntegrationStorage {
     /**
      * Actions dispatched, but not yet processed by the integration
      */
     pendingActions: PendingAction[];
+    /**
+     * Enqueue times by `actionId`. The oldest id is dropped when the map is full
+     */
+    enqueueTimes: Map<number, number>;
     renderedScreensIds: Set<string>;
     /**
      * Whether the app had already recorded the first render of the screen

package/build/integrations/expo-router/storage.js

@@ -1,6 +1,7 @@
 export function createRouterIntegrationStorage() {
     return {
         pendingActions: [],
+        enqueueTimes: new Map(),
         renderedScreensIds: new Set(),
         hasRecordedInitialTtr: false,
         screenTimes: {},

package/build/integrations/expo-router/storage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["integrations/expo-router/storage.ts"],"sourcesContent":[null],"names":["createRouterIntegrationStorage","pendingActions","renderedScreensIds","Set","hasRecordedInitialTtr","screenTimes","interactiveScreensIds"],"mappings":"AA4BA,OAAO,SAASA;IACd,OAAO;QACLC,gBAAgB,EAAE;QAClBC,oBAAoB,IAAIC;QACxBC,uBAAuB;QACvBC,aAAa,CAAC;QACdC,uBAAuB,IAAIH;IAC7B;AACF"}
+{"version":3,"sources":["integrations/expo-router/storage.ts"],"sourcesContent":[null],"names":["createRouterIntegrationStorage","pendingActions","enqueueTimes","Map","renderedScreensIds","Set","hasRecordedInitialTtr","screenTimes","interactiveScreensIds"],"mappings":"AAiCA,OAAO,SAASA;IACd,OAAO;QACLC,gBAAgB,EAAE;QAClBC,cAAc,IAAIC;QAClBC,oBAAoB,IAAIC;QACxBC,uBAAuB;QACvBC,aAAa,CAAC;QACdC,uBAAuB,IAAIH;IAC7B;AACF"}

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15-sources.jar.md5

@@ -0,0 +1 @@
+a0876aa95376b387ad9ef3eefafe1acc

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15-sources.jar.sha1

@@ -0,0 +1 @@
+72f7812f7086633b4c5331076e8690489f96dc1a

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15-sources.jar.sha256

@@ -0,0 +1 @@
+c02a8b50f70ece1b1191edd827ad9b52620d889a417165944738528dd66553f7

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15-sources.jar.sha512

@@ -0,0 +1 @@
+7a4bbc7979433522800d4baeb436dbf6a0a3601a5bda49c817816e3713904c42535c35084593e01871e5d1ba19d44379a16cbbaa4000f521bacdd3136d1ef9f0

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.aar.md5

@@ -0,0 +1 @@
+7e21fda796d8c5d26e9a5cca8c9b4480

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.aar.sha1

@@ -0,0 +1 @@
+7b75ba665fc7dace594e3ccbe2d3fe6cfab1da98

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.aar.sha256

@@ -0,0 +1 @@
+05fe1ce8955cfebb5ad5b9248cf9738de2787fd7790e128612d5afa0938545d9

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.aar.sha512

@@ -0,0 +1 @@
+3b99f79444ac74ffab58045e87c7bf908bd088f33cf806ed911ef3488f82b126ab55c51191045d5363db8b609afe0fd156bcb8998e9c33b3e1331ecba6f9774c

package/local-maven-repo/expo/modules/observe/expo.modules.observe/{58.0.13/expo.modules.observe-58.0.13.module → 58.0.15/expo.modules.observe-58.0.15.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.observe",
     "module": "expo.modules.observe",
-    "version": "58.0.13",
+    "version": "58.0.15",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,13 +24,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.observe-58.0.13.aar",
-          "url": "expo.modules.observe-58.0.13.aar",
-          "size": 302597,
-          "sha512": "ea11a3c8ff1b0068d999f4903f1efd2a6d95328adc7f6761277fe031fad5bba601076defb05b0f840fae495c7e5783bc1bab9d81bafd96965ec9c898c346e897",
-          "sha256": "44496217f172c4a1a972ee8cb5e80975f153fbd46df70f71def2369495f9893b",
-          "sha1": "7551496d19872ae167cac6cc24b148193f7fe5b1",
-          "md5": "bfe711d63f4b276c8f45c8bfdda55c82"
+          "name": "expo.modules.observe-58.0.15.aar",
+          "url": "expo.modules.observe-58.0.15.aar",
+          "size": 302595,
+          "sha512": "3b99f79444ac74ffab58045e87c7bf908bd088f33cf806ed911ef3488f82b126ab55c51191045d5363db8b609afe0fd156bcb8998e9c33b3e1331ecba6f9774c",
+          "sha256": "05fe1ce8955cfebb5ad5b9248cf9738de2787fd7790e128612d5afa0938545d9",
+          "sha1": "7b75ba665fc7dace594e3ccbe2d3fe6cfab1da98",
+          "md5": "7e21fda796d8c5d26e9a5cca8c9b4480"
         }
       ]
     },
@@ -61,7 +61,7 @@
           "group": "expo.modules.appmetrics",
           "module": "expo.modules.appmetrics",
           "version": {
-            "requires": "58.0.11"
+            "requires": "58.0.13"
           }
         },
         {
@@ -120,13 +120,13 @@
       ],
       "files": [
         {
-          "name": "expo.modules.observe-58.0.13.aar",
-          "url": "expo.modules.observe-58.0.13.aar",
-          "size": 302597,
-          "sha512": "ea11a3c8ff1b0068d999f4903f1efd2a6d95328adc7f6761277fe031fad5bba601076defb05b0f840fae495c7e5783bc1bab9d81bafd96965ec9c898c346e897",
-          "sha256": "44496217f172c4a1a972ee8cb5e80975f153fbd46df70f71def2369495f9893b",
-          "sha1": "7551496d19872ae167cac6cc24b148193f7fe5b1",
-          "md5": "bfe711d63f4b276c8f45c8bfdda55c82"
+          "name": "expo.modules.observe-58.0.15.aar",
+          "url": "expo.modules.observe-58.0.15.aar",
+          "size": 302595,
+          "sha512": "3b99f79444ac74ffab58045e87c7bf908bd088f33cf806ed911ef3488f82b126ab55c51191045d5363db8b609afe0fd156bcb8998e9c33b3e1331ecba6f9774c",
+          "sha256": "05fe1ce8955cfebb5ad5b9248cf9738de2787fd7790e128612d5afa0938545d9",
+          "sha1": "7b75ba665fc7dace594e3ccbe2d3fe6cfab1da98",
+          "md5": "7e21fda796d8c5d26e9a5cca8c9b4480"
         }
       ]
     },
@@ -140,13 +140,13 @@
       },
       "files": [
         {
-          "name": "expo.modules.observe-58.0.13-sources.jar",
-          "url": "expo.modules.observe-58.0.13-sources.jar",
+          "name": "expo.modules.observe-58.0.15-sources.jar",
+          "url": "expo.modules.observe-58.0.15-sources.jar",
           "size": 27883,
-          "sha512": "932944f468a6cac663389d69143847a72f707f1cef1fe7a1d387720cda2fbce7c7d2f97e2a753db818b551be5775e2a57b87de07e7ee37e259ebe439640d08c2",
-          "sha256": "d8556490b2358f9a799f840d3f1f58b7c27604bc295b77d2c02a2e56aa1f6cd5",
-          "sha1": "4b89134bf052a72a4717311b2bcded0ccf0a901c",
-          "md5": "d1786b64c18bbc1b9d244f7b9e14f38e"
+          "sha512": "7a4bbc7979433522800d4baeb436dbf6a0a3601a5bda49c817816e3713904c42535c35084593e01871e5d1ba19d44379a16cbbaa4000f521bacdd3136d1ef9f0",
+          "sha256": "c02a8b50f70ece1b1191edd827ad9b52620d889a417165944738528dd66553f7",
+          "sha1": "72f7812f7086633b4c5331076e8690489f96dc1a",
+          "md5": "a0876aa95376b387ad9ef3eefafe1acc"
         }
       ]
     }

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.module.md5

@@ -0,0 +1 @@
+98262fb369f28d87d4f38ea769dd1304

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.module.sha1

@@ -0,0 +1 @@
+5956ab4c2d8f032a1ac4c904169aa091db6d911d

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.module.sha256

@@ -0,0 +1 @@
+a1d050543088b73d78b20604ab3ae64d564f3556a714605c94435ed09a471f8c

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.module.sha512

@@ -0,0 +1 @@
+bc29f0255499459175045cccc96a99411856784438ce4c37e7f48c3bc35dd091c29169e8b1eeaae76ccf45773d705f87edbbad533897faf6e6d37c2c6c572775

package/local-maven-repo/expo/modules/observe/expo.modules.observe/{58.0.13/expo.modules.observe-58.0.13.pom → 58.0.15/expo.modules.observe-58.0.15.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>expo.modules.observe</groupId>
   <artifactId>expo.modules.observe</artifactId>
-  <version>58.0.13</version>
+  <version>58.0.15</version>
   <packaging>aar</packaging>
   <name>expo.modules.observe</name>
   <url>https://github.com/expo/expo</url>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>expo.modules.appmetrics</groupId>
       <artifactId>expo.modules.appmetrics</artifactId>
-      <version>58.0.11</version>
+      <version>58.0.13</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.pom.md5

@@ -0,0 +1 @@
+9f64d3510bf3298d740fbdd72e24e33d

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.pom.sha1

@@ -0,0 +1 @@
+ac07b5575c46de3f1d0b8ea9ac4c5f6ece9dc223

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.pom.sha256

@@ -0,0 +1 @@
+f304fb019425adb6b01a2e1525618ac6a799bbefe94c311ed6d0fb14eb63eb31

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.15/expo.modules.observe-58.0.15.pom.sha512

@@ -0,0 +1 @@
+96f2bbc77510e35cfcb27f8c57d9db5dd1cc6f009714159696f34adab091cdd516214a79452ad8be99f8549aee6d9138a620ea33278587907328412d325f739b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-observe",
-  "version": "58.0.13",
+  "version": "58.0.15",
   "description": "Expo module that dispatches collected app metrics to EAS Observe",
   "keywords": [
     "EAS",
@@ -42,15 +42,15 @@
     }
   },
   "dependencies": {
-    "expo-app-metrics": "~58.0.11",
+    "expo-app-metrics": "~58.0.13",
     "expo-eas-client": "~58.0.2"
   },
   "devDependencies": {
+    "@expo/internal-scripts": "58.0.3",
     "@react-navigation/native": "^7.1.33",
     "@testing-library/react-native": "^14.0.1",
     "@types/react": "~19.3.0",
-    "expo": "58.0.2",
-    "expo-module-scripts": "56.0.5"
+    "expo": "58.0.13"
   },
   "peerDependencies": {
     "@react-navigation/native": "^7.0.0",

package/src/integrations/expo-router/ObserveRouterIntegrationProvider.tsx

@@ -12,7 +12,7 @@ export function ObserveRouterIntegrationProvider({ children }: PropsWithChildren
   );
   const [listenersCleanup] = useState(() => {
     if (!storage || !optionalRouter) return;
-    return initListeners(storage, optionalRouter.unstable_navigationEvents);
+    return initListeners(storage, optionalRouter.unstable_PerformanceObserver);
   });
 
   const prevInitialized = useRef(isInitialized());

package/src/integrations/expo-router/init.ts

@@ -4,7 +4,12 @@ import type { ObserveIntegrationsConfig } from '../../types';
 import { getNavigationMetricParams } from '../navigationConfig';
 import { emitTTI } from './emitTTI';
 import { buildRoutePattern } from './routeName';
-import { optionalRouter } from './router';
+import {
+  optionalRouter,
+  type RouterPageMarkDetail,
+  type RouterPerformanceMark,
+  type RouterPerformanceObserver,
+} from './router';
 import { type RouterIntegrationStorage } from './storage';
 
 // TODO(@ubax): split this module into `.native.ts` / `.web.ts` variants so the
@@ -12,6 +17,8 @@ import { type RouterIntegrationStorage } from './storage';
 // version should be an explicit no-op (return a noop cleanup) rather than
 // relying on the web stubs in `expo-app-metrics/module.web.ts`.
 
+const MAX_ENQUEUE_TIMES = 100;
+
 let initialized = false;
 let routerIntegrationConfig: ObserveIntegrationsConfig['expo-router'];
 
@@ -21,41 +28,58 @@ export const getRouterIntegrationConfig = () => routerIntegrationConfig;
 export function initRouterIntegration(config?: ObserveIntegrationsConfig['expo-router']) {
   initialized = true;
   routerIntegrationConfig = config;
-  optionalRouter?.unstable_navigationEvents.enable();
+  optionalRouter?.unstable_enablePerformanceIntegration();
 }
 
-type NavigationEvents = NonNullable<typeof optionalRouter>['unstable_navigationEvents'];
-
 export function initListeners(
   storage: RouterIntegrationStorage,
-  navigationEvents: NavigationEvents
+  PerformanceObserver: RouterPerformanceObserver
 ): () => void {
   const appLaunchTime = performance.now();
-  const cleanup = new Set<() => void>();
-
-  const unsubscribeAction = navigationEvents.addListener('actionDispatched', (event) => {
-    // PRELOAD comes from router.prefetch() — a route warm-up, not a user
-    // navigation — so it must not seed dispatchTime.
-    if (event.actionType === 'PRELOAD') return;
-    storage.pendingActions.push({
-      actionType: event.actionType,
-      dispatchTime: performance.now(),
-    });
-  });
-  cleanup.add(unsubscribeAction);
 
-  const unsubscribePreload = navigationEvents.addListener('pagePreloaded', (e) => {
-    // The screen rendered as part of a preload. Mark it as already rendered so
-    // the eventual `pageFocused` resolves to `warm_ttr` rather than `cold_ttr`.
-    storage.renderedScreensIds.add(e.screenId);
+  const observer = new PerformanceObserver((list) => {
+    for (const performanceEntry of list.getEntries()) {
+      // Marks with the names handled below always have the matching `detail`.
+      const entry = performanceEntry as RouterPerformanceMark;
+      switch (entry.name) {
+        case 'expo-router:action-enqueued':
+          storage.enqueueTimes.set(entry.detail.actionId, entry.startTime);
+          // Ids grow and the map keeps insertion order, so the first key is the oldest. The cap
+          // bounds the map, because some actions never dispatch.
+          if (storage.enqueueTimes.size > MAX_ENQUEUE_TIMES) {
+            storage.enqueueTimes.delete(storage.enqueueTimes.keys().next().value!);
+          }
+          break;
+        case 'expo-router:action-dispatched': {
+          // Look up by id so an action that never dispatched can't become the TTR start.
+          const { actionId } = entry.detail;
+          const enqueueTime =
+            actionId === undefined ? undefined : storage.enqueueTimes.get(actionId);
+          // PRELOAD comes from router.prefetch() — a route warm-up, not a user
+          // navigation — so it must not become a TTR start.
+          if (entry.detail.actionType === 'PRELOAD') break;
+          storage.pendingActions.push({
+            actionType: entry.detail.actionType,
+            startTime: enqueueTime ?? entry.startTime,
+          });
+          break;
+        }
+        case 'expo-router:page-preloaded':
+          // The screen rendered as part of a preload. Mark it as already rendered so
+          // the eventual page focus resolves to `warm_ttr` rather than `cold_ttr`.
+          storage.renderedScreensIds.add(entry.detail.screenId);
+          break;
+        case 'expo-router:page-focused':
+          onPageFocused(entry.detail, entry.startTime);
+          break;
+      }
+    }
   });
-  cleanup.add(unsubscribePreload);
+  observer.observe({ type: 'mark' });
 
-  const unsubscribeFocus = navigationEvents.addListener('pageFocused', async (e) => {
-    // Snapshot both clocks once so every metric written below is stamped with
-    // the moment the focus event fired, not the moment `addMetric` happens to run
-    // after the surrounding async work.
-    const now = performance.now();
+  async function onPageFocused(e: RouterPageMarkDetail, now: number) {
+    // Stamp every metric written below with the moment of the focus mark, not
+    // the moment `addMetric` happens to run after the surrounding async work.
     const timestamp = new Date().toISOString();
 
     // Snapshot BEFORE seeding dispatchTime below so the deferred-TTI check
@@ -82,7 +106,7 @@ export function initListeners(
     } else {
       const last = storage.pendingActions[storage.pendingActions.length - 1];
       if (!last) return;
-      dispatchTime = last.dispatchTime;
+      dispatchTime = last.startTime;
       isAppLaunch = false;
       storage.pendingActions.length = 0;
     }
@@ -132,11 +156,7 @@ export function initListeners(
         config: routerIntegrationConfig,
       });
     }
-  });
-  cleanup.add(unsubscribeFocus);
+  }
 
-  return () => {
-    cleanup.forEach((c) => c());
-    cleanup.clear();
-  };
+  return () => observer.disconnect();
 }

package/src/integrations/expo-router/router.ts

@@ -1,30 +1,40 @@
 // expo-router is an optional peerDependency of expo-observe. When the host app
 // hasn't installed it, `require` throws and the integration becomes a no-op.
-interface RouterPageEvent {
+export interface RouterPageMarkDetail {
   pathname: string;
-  params: Record<string, string | string[]>;
+  params: Record<string, string | string[] | undefined>;
   screenId: string;
   segments: string[];
 }
 
-interface RouterActionDispatchedEvent {
-  actionType: string;
-}
+export type RouterPerformanceMark =
+  | { name: 'expo-router:action-enqueued'; startTime: number; detail: { actionId: number } }
+  | {
+      name: 'expo-router:action-dispatched';
+      startTime: number;
+      // `actionId` is missing in expo-router versions without the action-enqueued mark.
+      detail: { actionType: string; actionId?: number };
+    }
+  | {
+      name:
+        | 'expo-router:page-preloaded'
+        | 'expo-router:page-focused'
+        | 'expo-router:page-blurred'
+        | 'expo-router:page-removed';
+      startTime: number;
+      detail: RouterPageMarkDetail;
+    };
 
-interface RouterNavigationEvents {
-  addListener(
-    eventType: 'actionDispatched',
-    callback: (event: RouterActionDispatchedEvent) => void
-  ): () => void;
-  addListener(
-    eventType: 'pagePreloaded' | 'pageFocused',
-    callback: (event: RouterPageEvent) => void
-  ): () => void;
-  enable(): void;
-}
+export type RouterPerformanceObserver = new (
+  callback: (list: { getEntries(): Pick<PerformanceEntry, 'name' | 'startTime'>[] }) => void
+) => {
+  observe(options: { type: 'mark' }): void;
+  disconnect(): void;
+};
 
 interface OptionalRouter {
-  unstable_navigationEvents: RouterNavigationEvents;
+  unstable_enablePerformanceIntegration(): void;
+  unstable_PerformanceObserver: RouterPerformanceObserver;
   useCurrentRouteInfo(): {
     pathname: string;
     params: Record<string, string | string[]>;

package/src/integrations/expo-router/storage.ts

@@ -6,7 +6,8 @@ export interface ScreenTimes {
 
 export interface PendingAction {
   actionType: string;
-  dispatchTime: number;
+  // When the action was enqueued, or dispatched if expo-router did not mark the enqueue.
+  startTime: number;
 }
 
 export interface RouterIntegrationStorage {
@@ -14,6 +15,10 @@ export interface RouterIntegrationStorage {
    * Actions dispatched, but not yet processed by the integration
    */
   pendingActions: PendingAction[];
+  /**
+   * Enqueue times by `actionId`. The oldest id is dropped when the map is full
+   */
+  enqueueTimes: Map<number, number>;
   renderedScreensIds: Set<string>;
   /**
    * Whether the app had already recorded the first render of the screen
@@ -29,6 +34,7 @@ export interface RouterIntegrationStorage {
 export function createRouterIntegrationStorage(): RouterIntegrationStorage {
   return {
     pendingActions: [],
+    enqueueTimes: new Map(),
     renderedScreensIds: new Set(),
     hasRecordedInitialTtr: false,
     screenTimes: {},

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13-sources.jar.md5

@@ -1 +0,0 @@
-d1786b64c18bbc1b9d244f7b9e14f38e

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13-sources.jar.sha1

@@ -1 +0,0 @@
-4b89134bf052a72a4717311b2bcded0ccf0a901c

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13-sources.jar.sha256

@@ -1 +0,0 @@
-d8556490b2358f9a799f840d3f1f58b7c27604bc295b77d2c02a2e56aa1f6cd5

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13-sources.jar.sha512

@@ -1 +0,0 @@
-932944f468a6cac663389d69143847a72f707f1cef1fe7a1d387720cda2fbce7c7d2f97e2a753db818b551be5775e2a57b87de07e7ee37e259ebe439640d08c2

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.aar.md5

@@ -1 +0,0 @@
-bfe711d63f4b276c8f45c8bfdda55c82

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.aar.sha1

@@ -1 +0,0 @@
-7551496d19872ae167cac6cc24b148193f7fe5b1

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.aar.sha256

@@ -1 +0,0 @@
-44496217f172c4a1a972ee8cb5e80975f153fbd46df70f71def2369495f9893b

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.aar.sha512

@@ -1 +0,0 @@
-ea11a3c8ff1b0068d999f4903f1efd2a6d95328adc7f6761277fe031fad5bba601076defb05b0f840fae495c7e5783bc1bab9d81bafd96965ec9c898c346e897

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.module.md5

@@ -1 +0,0 @@
-fccf7cf904906b101780270faadc2417

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.module.sha1

@@ -1 +0,0 @@
-85968958c48b39d9732775f3b11b0bed5918fe34

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.module.sha256

@@ -1 +0,0 @@
-1f8035bc03dff06a61cd1a63d0f948142a58cd147d469811739798b362b0082a

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.module.sha512

@@ -1 +0,0 @@
-42a58abd8a98bb822b082e409d9a57ba11ac2b5d3816a759f300761dc96c9ad86368c55088d4c3fa8b5e8fa7f3c24c435e076ef6f0503fc24d31f342220eacbe

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.pom.md5

@@ -1 +0,0 @@
-8a6ba126386fb18cdd595aa2993f4db0

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.pom.sha1

@@ -1 +0,0 @@
-3efa177a7a1f4adc0cab0e790a48b05678a1bd3a

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.pom.sha256

@@ -1 +0,0 @@
-72e714733b2aa35135661176fc1d48584979c0cf28f863de25725fa2691f0046

package/local-maven-repo/expo/modules/observe/expo.modules.observe/58.0.13/expo.modules.observe-58.0.13.pom.sha512

@@ -1 +0,0 @@
-60909890d99316e5b80890cd807842caffb6e59d05ec2727803541866543f6deee96d63f244abbfac76eee67e9cd763756015e77f598b4f56f3b53f592094966