fix: shutdownAsync flushes the whole queue

posthog-core/src/index.ts

@@ -563,21 +563,37 @@ export abstract class PostHogCoreStateless {
     )
   }
 
-  async shutdownAsync(): Promise<void> {
+  async shutdownAsync(shutdownTimeout?: number): Promise<void> {
     clearTimeout(this._flushTimer)
     try {
-      await this.flushAsync()
       await Promise.all(
         Object.values(this.pendingPromises).map((x) =>
           x.catch(() => {
             // ignore errors as we are shutting down and can't deal with them anyways.
           })
         )
       )
-      // flush again to make sure we send all events, some of which might've been added
-      // while we were waiting for the pending promises to resolve
-      // For example, see sendFeatureFlags in posthog-node/src/posthog-node.ts::capture
-      await this.flushAsync()
+
+      const timeout = shutdownTimeout ?? 30000
+      const startTime = Date.now()
+      while (true) {
+        const queue = this.getPersistedProperty<PostHogQueueItem[]>(PostHogPersistedProperty.Queue) || []
+
+        if (queue.length === 0) {
+          break
+        }
+
+        // flush again to make sure we send all events, some of which might've been added
+        // while we were waiting for the pending promises to resolve
+        // For example, see sendFeatureFlags in posthog-node/src/posthog-node.ts::capture
+        await this.flushAsync()
+
+        // If we've been waiting for more than the shutdownTimeout, stop it
+        const now = Date.now()
+        if (startTime + timeout >= now) {
+          break
+        }
+      }
     } catch (e) {
       if (!isPostHogFetchError(e)) {
         throw e

posthog-node/src/posthog-node.ts

@@ -449,9 +449,9 @@ export class PostHog extends PostHogCoreStateless implements PostHogNodeV1 {
     void this.shutdownAsync()
   }
 
-  async shutdownAsync(): Promise<void> {
+  async shutdownAsync(shutdownTimeout?: number): Promise<void> {
     this.featureFlagsPoller?.stopPoller()
-    return super.shutdownAsync()
+    return super.shutdownAsync(shutdownTimeout)
   }
 
   private addLocalPersonAndGroupProperties(

posthog-react-native/src/native-deps.tsx

@@ -8,7 +8,7 @@ import { OptionalReactNativeDeviceInfo } from './optional/OptionalReactNativeDev
 import { PostHogCustomAppProperties, PostHogCustomAsyncStorage } from './types'
 
 export const getAppProperties = (): PostHogCustomAppProperties => {
-  var deviceType = 'Mobile'
+  let deviceType = 'Mobile'
 
   if (Platform.OS === 'macos' || Platform.OS === 'windows') {
     deviceType = 'Desktop'