Merge branch 'main' into dependabot/github_actions/actions/checkout-6

Author: ioannisj

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Next
 
+## 3.35.1 - 2025-12-02
+
+- fix: avoid memory leaks on foat conversions ([#401](https://github.com/PostHog/posthog-ios/pull/401))
+- fix: app group migration now skips identity-related keys from extensions ([#402](https://github.com/PostHog/posthog-ios/pull/402))
+
 ## 3.35.0 - 2025-11-07
 
 - fix: call the flags api with the correct groups key name (the api has a back compatible fix already) ([#389](https://github.com/PostHog/posthog-ios/pull/389))

PostHog.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "PostHog"
-  s.version          = "3.35.0"
+  s.version          = "3.35.1"
   s.summary          = "The hassle-free way to add posthog to your iOS app."
 
   s.description      = <<-DESC

PostHog/PostHogStorage.swift

@@ -76,6 +76,15 @@ func getBundleIdentifier() -> String {
     #endif
 }
 
+/**
+ Determines if the current process is an extension target.
+
+ App extensions have bundle paths ending in ".appex"
+ */
+func isExtension() -> Bool {
+    Bundle.main.bundlePath.hasSuffix(".appex")
+}
+
 /**
  Merges content from a legacy container directory into the current app group container.
 
@@ -84,7 +93,7 @@ func getBundleIdentifier() -> String {
 
  Migration rules:
  - Files that already exist at the destination are skipped (no overwrite)
- - The anonymousId from the first processed container (legacy or current) is preserved to maintain user identity
+ - Identity-related keys (distinctId, anonymousId, etc.) are only migrated from the main app target
  - Successfully migrated files are deleted from the source
  - Empty directories are cleaned up after migration
  - The entire folder structure is preserved during migration
@@ -99,10 +108,26 @@ func mergeLegacyContainerIfNeeded(within libraryUrl: URL?, to destinationUrl: UR
         return
     }
 
-    hedgeLog("Legacy folder found at \(sourceUrl), merging...")
+    let skipKeys: [PostHogStorage.StorageKey]
+    if isExtension() {
+        // Extensions should skip migrating identity-related keys to ensure consistent user identity with main app target
+        skipKeys = [
+            .distinctId,
+            .anonymousId,
+            .isIdentified,
+            .groups,
+            .registerProperties,
+            .personPropertiesForFlags,
+            .groupPropertiesForFlags,
+        ]
+        hedgeLog("Legacy folder found at \(sourceUrl), merging from extension... (skipping \(skipKeys.count) identity keys)")
+    } else {
+        skipKeys = []
+        hedgeLog("Legacy folder found at \(sourceUrl), merging from main app... (migrating all keys)")
+    }
 
-    // Migrate all contents from the legacy container
-    migrateDirectoryContents(from: sourceUrl, to: destinationUrl)
+    // Migrate contents from the legacy container
+    migrateDirectoryContents(from: sourceUrl, to: destinationUrl, skipKeys: skipKeys)
 
     // Try to remove the source directory if it's empty
     if removeIfEmpty(sourceUrl) {
@@ -141,10 +166,11 @@ func removeIfEmpty(_ url: URL) -> Bool {
  - Parameters:
    - sourceFile: The source file URL
    - destinationFile: The destination file URL
+   - skipCopy: Wether to skip copying file to desitnation
  - Throws: Any errors that occur during file operations
  */
-func migrateFile(from sourceFile: URL, to destinationFile: URL) throws {
-    if !FileManager.default.fileExists(atPath: destinationFile.path) {
+func migrateFile(from sourceFile: URL, to destinationFile: URL, skipCopy: Bool) throws {
+    if !skipCopy, !FileManager.default.fileExists(atPath: destinationFile.path) {
         try FileManager.default.copyItem(at: sourceFile, to: destinationFile)
     }
     // Always delete source file after processing (whether copied or skipped)
@@ -157,8 +183,9 @@ func migrateFile(from sourceFile: URL, to destinationFile: URL) throws {
  - Parameters:
    - sourceDir: The source directory URL
    - destinationDir: The destination directory URL
+   - skipKeys: Array of storage keys that should be skipped during migration
  */
-func migrateDirectoryContents(from sourceDir: URL, to destinationDir: URL) {
+func migrateDirectoryContents(from sourceDir: URL, to destinationDir: URL, skipKeys: [PostHogStorage.StorageKey] = []) {
     do {
         // Create destination directory if it doesn't exist (we need to call this here again as the function is recursive)
         createDirectoryAtURLIfNeeded(url: destinationDir)
@@ -174,13 +201,16 @@ func migrateDirectoryContents(from sourceDir: URL, to destinationDir: URL) {
             if FileManager.default.fileExists(atPath: item.path, isDirectory: &isDirectory) {
                 if isDirectory.boolValue {
                     // Recursively migrate subdirectory (preserving the folder structure)
-                    migrateDirectoryContents(from: item, to: destinationItem)
+                    migrateDirectoryContents(from: item, to: destinationItem, skipKeys: skipKeys)
                     // Remove empty directory after migration
                     removeIfEmpty(item)
                 } else {
+                    let fileName = item.lastPathComponent
+                    let shouldSkip = skipKeys.contains(where: { $0.rawValue == fileName })
+
                     // Migrate file
                     do {
-                        try migrateFile(from: item, to: destinationItem)
+                        try migrateFile(from: item, to: destinationItem, skipCopy: shouldSkip)
                     } catch {
                         hedgeLog("Failed to migrate file from \(item.path) to \(destinationItem.path): \(error)")
                     }

PostHog/PostHogVersion.swift

@@ -9,7 +9,7 @@ import Foundation
 
 // if you change this, make sure to also change it in the podspec and check if the script scripts/bump-version.sh still works
 // This property is internal only
-public var postHogVersion = "3.35.0"
+public var postHogVersion = "3.35.1"
 
 public let postHogiOSSdkName = "posthog-ios"
 // This property is internal only

PostHog/Replay/Float+Util.swift

@@ -7,14 +7,11 @@
 
 import Foundation
 
-extension CGFloat {
-    func toInt() -> Int {
-        NSNumber(value: rounded()).intValue
-    }
-}
-
-extension Double {
-    func toInt() -> Int {
-        NSNumber(value: rounded()).intValue
+extension BinaryFloatingPoint {
+    func toInt() -> Int? {
+        guard isFinite else { return nil }
+        guard self >= Self(Int.min), self <= Self(Int.max) else { return nil }
+        // Since this is used primarily for UI size & position, rounding vs truncating makes sense
+        return Int(rounded())
     }
 }

PostHog/Replay/PostHogReplayIntegration.swift

@@ -276,8 +276,8 @@
                         continue
                     }
 
-                    let posX = touch.location.x.toInt()
-                    let posY = touch.location.y.toInt()
+                    let posX = touch.location.x.toInt() ?? 0
+                    let posY = touch.location.y.toInt() ?? 0
 
                     // if the id is 0, BE transformer will set it to the virtual bodyId
                     let touchData: [String: Any] = ["id": 0, "pointerType": 2, "source": 2, "type": type, "x": posX, "y": posY]
@@ -318,8 +318,8 @@
 
             if !snapshotStatus.sentMetaEvent {
                 let size = window.bounds.size
-                let width = size.width.toInt()
-                let height = size.height.toInt()
+                let width = size.width.toInt() ?? 0
+                let height = size.height.toInt() ?? 0
 
                 var data: [String: Any] = ["width": width, "height": height]
 
@@ -393,10 +393,10 @@
             let frame = view.toAbsoluteRect(view.window)
 
             wireframe.id = view.hash
-            wireframe.posX = frame.origin.x.toInt()
-            wireframe.posY = frame.origin.y.toInt()
-            wireframe.width = frame.size.width.toInt()
-            wireframe.height = frame.size.height.toInt()
+            wireframe.posX = frame.origin.x.toInt() ?? 0
+            wireframe.posY = frame.origin.y.toInt() ?? 0
+            wireframe.width = frame.size.width.toInt() ?? 0
+            wireframe.height = frame.size.height.toInt() ?? 0
 
             return wireframe
         }

PostHogTests/UtilsTest.swift

@@ -14,16 +14,22 @@ import Testing
 struct UtilsTest {
     @Suite("CGFloat Tests")
     struct CGFloatTests {
-        @Test("safely converts NaN to Int")
+        @Test("safely handles NaN value")
         func safelyConvertsNanToInt() {
             let nanNumber = CGFloat.nan
-            #expect(nanNumber.toInt() == 0)
+            #expect(nanNumber.toInt() == nil)
         }
 
-        @Test("safely converts Max to Int and deals with overflow")
+        @Test("safely handles Max values")
         func safelyConvertsMaxToIntAndDealsWithOverflow() {
             let gfmNumber = CGFloat.greatestFiniteMagnitude
-            #expect(gfmNumber.toInt() == Int.max)
+            #expect(gfmNumber.toInt() == nil)
+        }
+
+        @Test("safely handles infinity")
+        func safelyHandlesInfinity() {
+            let infNumber = CGFloat.infinity
+            #expect(infNumber.toInt() == nil)
         }
 
         @Test("safely converts to Int and rounds value")
@@ -38,13 +44,19 @@ struct UtilsTest {
         @Test("safely converts NaN to Int")
         func safelyConvertsNanToInt() {
             let nanNumber = Double.nan
-            #expect(nanNumber.toInt() == 0)
+            #expect(nanNumber.toInt() == nil)
         }
 
         @Test("safely converts Max to Int and deals with overflow")
         func safelyConvertsMaxToIntAndDealsWithOverflow() {
             let gfmNumber = Double.greatestFiniteMagnitude
-            #expect(gfmNumber.toInt() == Int.max)
+            #expect(gfmNumber.toInt() == nil)
+        }
+
+        @Test("safely handles infinity")
+        func safelyHandlesInfinity() {
+            let infNumber = Double.infinity
+            #expect(infNumber.toInt() == nil)
         }
 
         @Test("safely converts to Int and rounds value")
@@ -54,6 +66,33 @@ struct UtilsTest {
         }
     }
 
+    @Suite("Float Tests")
+    struct FloatTests {
+        @Test("safely converts NaN to Int")
+        func safelyConvertsNanToInt() {
+            let nanNumber = Float.nan
+            #expect(nanNumber.toInt() == nil)
+        }
+
+        @Test("safely converts Max to Int and deals with overflow")
+        func safelyConvertsMaxToIntAndDealsWithOverflow() {
+            let gfmNumber = Float.greatestFiniteMagnitude
+            #expect(gfmNumber.toInt() == nil)
+        }
+
+        @Test("safely handles infinity")
+        func safelyHandlesInfinity() {
+            let infNumber = Float.infinity
+            #expect(infNumber.toInt() == nil)
+        }
+
+        @Test("safely converts to Int and rounds value")
+        func safelyConvertsToIntAndRoundsValue() {
+            let frNumber: Float = 123456.5
+            #expect(frNumber.toInt() == 123457)
+        }
+    }
+
     @Suite("Date format tests")
     struct DateTests {
         @Test("can parse ISO8601 date with microsecond precision")