perf(ccp): 调整customContentfulPaint由，宏任务改为微任务

clouDr-f2e · Dec 9, 2021 · 41c9c35 · 41c9c35
1 parent d826f21
commit 41c9c35
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/packages/web-performance/src/index.ts b/packages/web-performance/src/index.ts
@@ -126,7 +126,9 @@ class WebVitals implements IWebVitals {
   }
 
   customContentfulPaint() {
-    setTimeout(() => WebVitals.dispatchCustomEvent())
+    Promise.resolve().then(() => {
+      WebVitals.dispatchCustomEvent()
+    })
   }
 }
 

diff --git a/packages/web-performance/src/metrics/getCCP.ts b/packages/web-performance/src/metrics/getCCP.ts
@@ -25,10 +25,8 @@ let isDone = false
 let reportLock = true
 
 const storeMetrics = (name, value, store) => {
-  if (value < getFirstHiddenTime().timeStamp) {
-    const metrics = { name, value }
-    store.set(name, metrics)
-  }
+  const metrics = { name, value }
+  store.set(name, metrics)
 }
 
 const computeCCPAndRL = (store) => {
@@ -95,15 +93,21 @@ const afterHandler = (url, apiConfig, store, needCCP, hashHistory) => {
         if (isIncludeArr(remoteQueue.queue, completeQueue) && !remoteQueue.hasStoreMetrics) {
           console.log('api list = ', remoteQueue.queue)
           remoteQueue.hasStoreMetrics = true
-          storeMetrics(metricsName.ACT, performance.now(), store)
-          computeCCPAndRL(store)
+          const now = performance.now()
+          if (now < getFirstHiddenTime().timeStamp) {
+            storeMetrics(metricsName.ACT, now, store)
+            computeCCPAndRL(store)
+          }
         }
       } else {
         if (isIncludeArr(remoteQueue.queue, completeQueue) && !remoteQueue.hasStoreMetrics && isDone && needCCP) {
           console.log('api list = ', remoteQueue.queue)
           remoteQueue.hasStoreMetrics = true
-          storeMetrics(metricsName.ACT, performance.now(), store)
-          computeCCPAndRL(store)
+          const now = performance.now()
+          if (now < getFirstHiddenTime().timeStamp) {
+            storeMetrics(metricsName.ACT, now, store)
+            computeCCPAndRL(store)
+          }
         }
       }
     }
@@ -165,7 +169,10 @@ export const initCCP = (
       if (!firstVisitedState) {
         isDone = true
         if (isPerformanceSupported()) {
-          computeCCPAndRL(store)
+          const now = performance.now()
+          if (now < getFirstHiddenTime().timeStamp) {
+            computeCCPAndRL(store)
+          }
         }
       }
     },