Improve

Author: timfish

packages/core/src/transports/offline.ts

@@ -1,44 +1,38 @@
 import type { Envelope, InternalBaseTransportOptions, Transport, TransportMakeRequestResponse } from '@sentry/types';
-import { logger } from '@sentry/utils';
+import { forEachEnvelopeItem, logger } from '@sentry/utils';
 
-export const START_DELAY = 5_000;
-const MAX_DELAY = 2_000_000_000;
+export const BETWEEN_DELAY = 100; // 100 ms
+export const START_DELAY = 5_000; // 5 seconds
+const MAX_DELAY = 3.6e6; // 1 hour
 const DEFAULT_QUEUE_SIZE = 30;
 
-function wasRateLimited(result: TransportMakeRequestResponse): boolean {
-  return !!(result.headers && result.headers['x-sentry-rate-limits']);
-}
-
-type BeforeSendResponse = 'send' | 'queue' | 'drop';
+type MaybeAsync<T> = T | Promise<T>;
 
 interface OfflineTransportOptions extends InternalBaseTransportOptions {
   /**
-   * The maximum number of events to keep in the offline queue.
+   * The maximum number of events to keep in the offline store.
    *
    * Defaults: 30
    */
   maxQueueSize?: number;
 
   /**
-   * Flush the offline queue shortly after startup.
+   * Flush the offline store shortly after startup.
    *
    * Defaults: false
    */
   flushAtStartup?: boolean;
 
   /**
-   * Called when an event is queued .
-   */
-  eventQueued?: () => void;
-
-  /**
-   * Called before attempting to send an event to Sentry.
+   * Called before an event is stored.
+   *
+   * Return false to drop the envelope rather than store it.
    *
-   * Return 'send' to attempt to send the event.
-   * Return 'queue' to queue the event for sending later.
-   * Return 'drop' to drop the event.
+   * @param envelope The envelope that failed to send.
+   * @param error The error that occurred.
+   * @param retryDelay The current retry delay.
    */
-  beforeSend?: (request: Envelope) => BeforeSendResponse | Promise<BeforeSendResponse>;
+  shouldStore?: (envelope: Envelope, error: Error, retryDelay: number) => MaybeAsync<boolean>;
 }
 
 interface OfflineStore {
@@ -48,8 +42,22 @@ interface OfflineStore {
 
 export type CreateOfflineStore = (maxQueueCount: number) => OfflineStore;
 
+type Timer = number | { unref?: () => void };
+
+function isReplayEnvelope(envelope: Envelope): boolean {
+  let isReplay = false;
+
+  forEachEnvelopeItem(envelope, (_, type) => {
+    if (type === 'replay_event') {
+      isReplay = true;
+    }
+  });
+
+  return isReplay;
+}
+
 /**
- * Wraps a transport and queues events when envelopes fail to send.
+ * Wraps a transport and stores and retries events when they fail to send.
  *
  * @param createTransport The transport to wrap.
  * @param createStore The store implementation to use.
@@ -59,88 +67,89 @@ export function makeOfflineTransport<TO>(
   createStore: CreateOfflineStore,
 ): (options: TO & OfflineTransportOptions) => Transport {
   return options => {
-    const baseTransport = createTransport(options);
+    const transport = createTransport(options);
     const maxQueueSize = options.maxQueueSize === undefined ? DEFAULT_QUEUE_SIZE : options.maxQueueSize;
     const store = createStore(maxQueueSize);
 
     let retryDelay = START_DELAY;
+    let flushTimer: Timer | undefined;
 
-    function queued(): void {
-      if (options.eventQueued) {
-        options.eventQueued();
+    function shouldQueue(env: Envelope, error: Error, retryDelay: number): MaybeAsync<boolean> {
+      if (isReplayEnvelope(env)) {
+        return false;
       }
+
+      if (options.shouldStore) {
+        return options.shouldStore(env, error, retryDelay);
+      }
+
+      return true;
     }
 
-    function queueRequest(envelope: Envelope): Promise<void> {
-      return store.insert(envelope).then(() => {
-        queued();
+    function flushLater(overrideDelay?: number): void {
+      if (flushTimer) {
+        if (overrideDelay) {
+          clearTimeout(flushTimer as ReturnType<typeof setTimeout>);
+        } else {
+          return;
+        }
+      }
 
-        setTimeout(() => {
-          void flushQueue();
-        }, retryDelay);
+      const delay = overrideDelay || retryDelay;
 
-        retryDelay *= 3;
+      flushTimer = setTimeout(async () => {
+        flushTimer = undefined;
 
-        // If the delay is bigger than 2^31 (max signed 32-bit int), setTimeout throws
-        // an error on node.js and falls back to 1 which can cause a huge number of requests.
-        if (retryDelay > MAX_DELAY) {
-          retryDelay = MAX_DELAY;
+        const found = await store.pop();
+        if (found) {
+          __DEBUG_BUILD__ && logger.info('[Offline]: Attempting to send previously queued event');
+          void send(found).catch(e => {
+            __DEBUG_BUILD__ && logger.info('[Offline]: Failed to send when retrying', e);
+          });
         }
-      });
-    }
+      }, delay) as Timer;
 
-    async function flushQueue(): Promise<void> {
-      const found = await store.pop();
-
-      if (found) {
-        __DEBUG_BUILD__ && logger.info('[Offline]: Attempting to send previously queued event');
-        void send(found);
+      // We need to unref the timer in node.js, otherwise the node process never exit.
+      if (typeof flushTimer !== 'number' && typeof flushTimer.unref === 'function') {
+        flushTimer.unref();
       }
-    }
 
-    async function send(request: Envelope): Promise<void | TransportMakeRequestResponse> {
-      let action = 'send';
+      retryDelay *= 2;
 
-      if (options.beforeSend) {
-        action = await options.beforeSend(request);
+      if (retryDelay > MAX_DELAY) {
+        retryDelay = MAX_DELAY;
       }
+    }
 
-      if (action === 'send') {
-        try {
-          const result = await baseTransport.send(request);
-          if (wasRateLimited(result || {})) {
-            __DEBUG_BUILD__ && logger.info('[Offline]: Event queued due to rate limiting');
-            action = 'queue';
-          } else {
-            // Envelope was successfully sent
-            // Reset the retry delay
-            retryDelay = START_DELAY;
-            // Check if there are any more in the queue
-            void flushQueue();
-            return result;
-          }
-        } catch (e) {
-          __DEBUG_BUILD__ && logger.info('[Offline]: Event queued due to error', e);
-          action = 'queue';
+    async function send(envelope: Envelope): Promise<void | TransportMakeRequestResponse> {
+      try {
+        const result = await transport.send(envelope);
+        // If the status code wasn't a server error, reset retryDelay and flush
+        if (result && (result.statusCode || 500) < 400) {
+          retryDelay = START_DELAY;
+          flushLater(BETWEEN_DELAY);
         }
-      }
 
-      if (action == 'queue') {
-        void queueRequest(request);
+        return result;
+      } catch (e) {
+        if (await shouldQueue(envelope, e, retryDelay)) {
+          await store.insert(envelope);
+          flushLater();
+          __DEBUG_BUILD__ && logger.info('[Offline]: Event queued', e);
+          return {};
+        } else {
+          throw e;
+        }
       }
-
-      return {};
     }
 
     if (options.flushAtStartup) {
-      setTimeout(() => {
-        void flushQueue();
-      }, retryDelay);
+      flushLater();
     }
 
     return {
       send,
-      flush: (timeout?: number) => baseTransport.flush(timeout),
+      flush: (timeout?: number) => transport.flush(timeout),
     };
   };
 }