@npaw/forge-react-native 9.7.5 → 10.0.1

package/android/build.gradle

@@ -28,7 +28,7 @@ def safeExtGet(prop, fallback) {
 // FORGE_CORE_VERSION (see scripts/react-native/hydrate-natives.sh).
 def forgeCoreVersion = project.hasProperty('NpawForge_forgeCoreVersion')
     ? project.property('NpawForge_forgeCoreVersion')
-    : (System.getenv('FORGE_CORE_VERSION') ?: '9.7.5')
+    : (System.getenv('FORGE_CORE_VERSION') ?: '10.0.1')
 
 android {
     namespace 'com.npaw.forge.reactnative'

package/android/src/main/java/com/npaw/forge/reactnative/ForgeDtoMapper.java

@@ -133,6 +133,9 @@ public final class ForgeDtoMapper {
         case "preSessionEventQueueMaxAgeMs":
           builder.setPreSessionEventQueueMaxAgeMs(asLong(value));
           break;
+        case "logoutSessionGuardMs":
+          builder.setLogoutSessionGuardMs(asLong(value));
+          break;
         case "allowLocalHttpForTesting":
           builder.setLocalPlaintextTransportForTesting(asBoolean(value));
           break;
@@ -183,7 +186,9 @@ public final class ForgeDtoMapper {
         nullableLong(map, "requestBytes"),
         nullableLong(map, "responseBytes"),
         Collections.emptyMap(),
-        Collections.emptyMap());
+        Collections.emptyMap(),
+        Collections.emptyMap(),
+        nullableString(map, "requestType"));
   }
 
   // ---- outputs ----

package/android/src/main/java/com/npaw/forge/reactnative/NPAWForgeModule.java

@@ -178,6 +178,16 @@ public class NPAWForgeModule extends NativeNPAWForgeSpec {
 
   // ---- identity ----
 
+  @Override
+  public void updateSession(String instanceId, @Nullable ReadableMap metadata, Promise promise) {
+    withForge(instanceId, promise, forge -> forge.updateSession(ForgeDtoMapper.toObjectMap(metadata)));
+  }
+
+  @Override
+  public void updateSessionMetrics(String instanceId, @Nullable ReadableMap metrics, Promise promise) {
+    withForge(instanceId, promise, forge -> forge.updateSessionMetrics(ForgeDtoMapper.toDoubleMap(metrics)));
+  }
+
   @Override
   public void loginSuccess(String instanceId, String userId, @Nullable ReadableMap options, Promise promise) {
     withForge(instanceId, promise, forge -> forge.loginSuccess(userId, ForgeDtoMapper.toObjectMap(options)));

package/android/src/test/java/com/npaw/forge/reactnative/ForgeDtoMapperTest.java

@@ -77,6 +77,7 @@ public class ForgeDtoMapperTest {
     map.putString("protocol", "h2");
     map.putInt("redirectCount", 1);
     map.putInt("requestBytes", 100);
+    map.putString("requestType", "drm_license");
 
     NetworkRequestRecord record = ForgeDtoMapper.toNetworkRequestRecord(map);
 
@@ -89,6 +90,9 @@ public class ForgeDtoMapperTest {
     assertEquals("h2", record.getProtocol());
     assertEquals(Integer.valueOf(1), record.getRedirectCount());
     assertEquals(Long.valueOf(100L), record.getRequestBytes());
+    // The map key is a string contract the compiler cannot check; a typo in
+    // ForgeDtoMapper would silently drop the field without this assertion.
+    assertEquals("drm_license", record.getRequestType());
     assertNull(record.getDnsDurationMs());
     assertNull(record.getErrorMessage());
   }

package/ios/ForgeApple/ForgeKernelFFI.xcframework/Info.plist

@@ -10,18 +10,15 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libForgeKernelFFI.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -29,7 +26,7 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64-simulator</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>libForgeKernelFFI.a</string>
 			<key>SupportedArchitectures</key>
@@ -38,8 +35,6 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -47,7 +42,7 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>tvos-arm64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libForgeKernelFFI.a</string>
 			<key>SupportedArchitectures</key>
@@ -55,7 +50,9 @@
 				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -63,15 +60,18 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libForgeKernelFFI.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/ForgeApple/ForgeKernelFFI.xcframework/ios-arm64/Headers/forge_kernelFFI.h

@@ -439,6 +439,11 @@ RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_player
 RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_session_event(uint64_t ptr, RustBuffer event_name, uint64_t timemark_ms, RustBuffer params, RustCallStatus *_Nonnull out_status
 );
 #endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+#define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_session_update(uint64_t ptr, uint64_t timemark_ms, RustBuffer params, RustBuffer metrics, RustCallStatus *_Nonnull out_status
+);
+#endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE
 #define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE
 RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_set_auto_connection_type(uint64_t ptr, RustBuffer connection_type, RustCallStatus *_Nonnull out_status
@@ -891,6 +896,12 @@ uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_pl
 #define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_EVENT
 uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_event(void
     
+);
+#endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+#define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_update(void
+    
 );
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE

package/ios/ForgeApple/ForgeKernelFFI.xcframework/ios-arm64_x86_64-simulator/Headers/forge_kernelFFI.h

@@ -439,6 +439,11 @@ RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_player
 RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_session_event(uint64_t ptr, RustBuffer event_name, uint64_t timemark_ms, RustBuffer params, RustCallStatus *_Nonnull out_status
 );
 #endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+#define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_session_update(uint64_t ptr, uint64_t timemark_ms, RustBuffer params, RustBuffer metrics, RustCallStatus *_Nonnull out_status
+);
+#endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE
 #define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE
 RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_set_auto_connection_type(uint64_t ptr, RustBuffer connection_type, RustCallStatus *_Nonnull out_status
@@ -891,6 +896,12 @@ uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_pl
 #define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_EVENT
 uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_event(void
     
+);
+#endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+#define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_update(void
+    
 );
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE

package/ios/ForgeApple/ForgeKernelFFI.xcframework/tvos-arm64/Headers/forge_kernelFFI.h

@@ -439,6 +439,11 @@ RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_player
 RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_session_event(uint64_t ptr, RustBuffer event_name, uint64_t timemark_ms, RustBuffer params, RustCallStatus *_Nonnull out_status
 );
 #endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+#define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_session_update(uint64_t ptr, uint64_t timemark_ms, RustBuffer params, RustBuffer metrics, RustCallStatus *_Nonnull out_status
+);
+#endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE
 #define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE
 RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_set_auto_connection_type(uint64_t ptr, RustBuffer connection_type, RustCallStatus *_Nonnull out_status
@@ -891,6 +896,12 @@ uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_pl
 #define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_EVENT
 uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_event(void
     
+);
+#endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+#define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_update(void
+    
 );
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE

package/ios/ForgeApple/ForgeKernelFFI.xcframework/tvos-arm64-simulator/Headers/forge_kernelFFI.h

@@ -439,6 +439,11 @@ RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_player
 RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_session_event(uint64_t ptr, RustBuffer event_name, uint64_t timemark_ms, RustBuffer params, RustCallStatus *_Nonnull out_status
 );
 #endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+#define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_session_update(uint64_t ptr, uint64_t timemark_ms, RustBuffer params, RustBuffer metrics, RustCallStatus *_Nonnull out_status
+);
+#endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE
 #define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE
 RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_set_auto_connection_type(uint64_t ptr, RustBuffer connection_type, RustCallStatus *_Nonnull out_status
@@ -891,6 +896,12 @@ uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_pl
 #define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_EVENT
 uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_event(void
     
+);
+#endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+#define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_update(void
+    
 );
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE

package/ios/ForgeApple/Sources/ForgeKernelUniFFI/forge_kernel.swift

@@ -633,6 +633,8 @@ public protocol ForgeRuntimeBridgeProtocol: AnyObject, Sendable {
     
     func recordSessionEvent(eventName: String, timemarkMs: UInt64, params: [String: String])  -> AppleBindingOutcome
     
+    func recordSessionUpdate(timemarkMs: UInt64, params: [String: String], metrics: [String: Double])  -> AppleBindingOutcome
+    
     func setAutoConnectionType(connectionType: String?)  -> AppleBindingOutcome
     
     func setCapturePlanListener(listener: AppleCapturePlanListener)  -> AppleBindingOutcome
@@ -880,6 +882,17 @@ open func recordSessionEvent(eventName: String, timemarkMs: UInt64, params: [Str
 })
 }
     
+open func recordSessionUpdate(timemarkMs: UInt64, params: [String: String], metrics: [String: Double]) -> AppleBindingOutcome  {
+    return try!  FfiConverterTypeAppleBindingOutcome_lift(try! rustCall() {
+    uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_session_update(
+            self.uniffiCloneHandle(),
+        FfiConverterUInt64.lower(timemarkMs),
+        FfiConverterDictionaryStringString.lower(params),
+        FfiConverterDictionaryStringDouble.lower(metrics),$0
+    )
+})
+}
+    
 open func setAutoConnectionType(connectionType: String?) -> AppleBindingOutcome  {
     return try!  FfiConverterTypeAppleBindingOutcome_lift(try! rustCall() {
     uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_set_auto_connection_type(
@@ -1730,6 +1743,7 @@ public struct AppleNetworkObservation: Equatable, Hashable {
     public var redirectDurationMs: UInt64?
     public var redirectCount: UInt64?
     public var `protocol`: String?
+    public var requestType: String?
     public var requestBytes: UInt64?
     public var responseBytes: UInt64?
     public var requestQuery: [String: String]?
@@ -1738,7 +1752,7 @@ public struct AppleNetworkObservation: Equatable, Hashable {
 
     // Default memberwise initializers are never public by default, so we
     // declare one manually.
-    public init(eventId: String, source: String, targetUrl: String, method: String, timemarkMs: UInt64, durationMs: UInt64, responseStatusCode: UInt16, outcome: String, responseStatusText: String?, errorMessage: String?, traceparent: String?, dnsDurationMs: UInt64?, connectDurationMs: UInt64?, sslDurationMs: UInt64?, requestDurationMs: UInt64?, timeToFirstByteMs: UInt64?, responseDownloadDurationMs: UInt64?, redirectDurationMs: UInt64?, redirectCount: UInt64?, `protocol`: String?, requestBytes: UInt64?, responseBytes: UInt64?, requestQuery: [String: String]?, requestHeaders: [String: String]?, responseHeaders: [String: String]?) {
+    public init(eventId: String, source: String, targetUrl: String, method: String, timemarkMs: UInt64, durationMs: UInt64, responseStatusCode: UInt16, outcome: String, responseStatusText: String?, errorMessage: String?, traceparent: String?, dnsDurationMs: UInt64?, connectDurationMs: UInt64?, sslDurationMs: UInt64?, requestDurationMs: UInt64?, timeToFirstByteMs: UInt64?, responseDownloadDurationMs: UInt64?, redirectDurationMs: UInt64?, redirectCount: UInt64?, `protocol`: String?, requestType: String?, requestBytes: UInt64?, responseBytes: UInt64?, requestQuery: [String: String]?, requestHeaders: [String: String]?, responseHeaders: [String: String]?) {
         self.eventId = eventId
         self.source = source
         self.targetUrl = targetUrl
@@ -1759,6 +1773,7 @@ public struct AppleNetworkObservation: Equatable, Hashable {
         self.redirectDurationMs = redirectDurationMs
         self.redirectCount = redirectCount
         self.`protocol` = `protocol`
+        self.requestType = requestType
         self.requestBytes = requestBytes
         self.responseBytes = responseBytes
         self.requestQuery = requestQuery
@@ -1802,6 +1817,7 @@ public struct FfiConverterTypeAppleNetworkObservation: FfiConverterRustBuffer {
                 redirectDurationMs: FfiConverterOptionUInt64.read(from: &buf), 
                 redirectCount: FfiConverterOptionUInt64.read(from: &buf), 
                 protocol: FfiConverterOptionString.read(from: &buf), 
+                requestType: FfiConverterOptionString.read(from: &buf), 
                 requestBytes: FfiConverterOptionUInt64.read(from: &buf), 
                 responseBytes: FfiConverterOptionUInt64.read(from: &buf), 
                 requestQuery: FfiConverterOptionDictionaryStringString.read(from: &buf), 
@@ -1831,6 +1847,7 @@ public struct FfiConverterTypeAppleNetworkObservation: FfiConverterRustBuffer {
         FfiConverterOptionUInt64.write(value.redirectDurationMs, into: &buf)
         FfiConverterOptionUInt64.write(value.redirectCount, into: &buf)
         FfiConverterOptionString.write(value.`protocol`, into: &buf)
+        FfiConverterOptionString.write(value.requestType, into: &buf)
         FfiConverterOptionUInt64.write(value.requestBytes, into: &buf)
         FfiConverterOptionUInt64.write(value.responseBytes, into: &buf)
         FfiConverterOptionDictionaryStringString.write(value.requestQuery, into: &buf)
@@ -2075,10 +2092,11 @@ public struct AppleRuntimeConfig: Equatable, Hashable {
     public var deviceInfoJson: String?
     public var framework: String?
     public var preSessionEventPolicy: ApplePreSessionEventPolicy
+    public var logoutSessionGuardMs: UInt64?
 
     // Default memberwise initializers are never public by default, so we
     // declare one manually.
-    public init(accountCode: String, pluginVersion: String, appName: String, buildVariant: String, appReleaseVersion: String?, lmaEndpoint: String, analyticsUserAgent: String?, allowLocalHttp: Bool, logLevel: String, deviceUuid: String?, deviceInfoJson: String?, framework: String?, preSessionEventPolicy: ApplePreSessionEventPolicy) {
+    public init(accountCode: String, pluginVersion: String, appName: String, buildVariant: String, appReleaseVersion: String?, lmaEndpoint: String, analyticsUserAgent: String?, allowLocalHttp: Bool, logLevel: String, deviceUuid: String?, deviceInfoJson: String?, framework: String?, preSessionEventPolicy: ApplePreSessionEventPolicy, logoutSessionGuardMs: UInt64?) {
         self.accountCode = accountCode
         self.pluginVersion = pluginVersion
         self.appName = appName
@@ -2092,6 +2110,7 @@ public struct AppleRuntimeConfig: Equatable, Hashable {
         self.deviceInfoJson = deviceInfoJson
         self.framework = framework
         self.preSessionEventPolicy = preSessionEventPolicy
+        self.logoutSessionGuardMs = logoutSessionGuardMs
     }
 
     
@@ -2122,7 +2141,8 @@ public struct FfiConverterTypeAppleRuntimeConfig: FfiConverterRustBuffer {
                 deviceUuid: FfiConverterOptionString.read(from: &buf), 
                 deviceInfoJson: FfiConverterOptionString.read(from: &buf), 
                 framework: FfiConverterOptionString.read(from: &buf), 
-                preSessionEventPolicy: FfiConverterTypeApplePreSessionEventPolicy.read(from: &buf)
+                preSessionEventPolicy: FfiConverterTypeApplePreSessionEventPolicy.read(from: &buf), 
+                logoutSessionGuardMs: FfiConverterOptionUInt64.read(from: &buf)
         )
     }
 
@@ -2140,6 +2160,7 @@ public struct FfiConverterTypeAppleRuntimeConfig: FfiConverterRustBuffer {
         FfiConverterOptionString.write(value.deviceInfoJson, into: &buf)
         FfiConverterOptionString.write(value.framework, into: &buf)
         FfiConverterTypeApplePreSessionEventPolicy.write(value.preSessionEventPolicy, into: &buf)
+        FfiConverterOptionUInt64.write(value.logoutSessionGuardMs, into: &buf)
     }
 }
 
@@ -3116,6 +3137,124 @@ public func FfiConverterTypeAppleVideoEvent_lower(_ value: AppleVideoEvent) -> R
 }
 
 
+// Note that we don't yet support `indirect` for enums.
+// See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.
+/**
+ * One request-body value as the wire carries it. `Object` and `Array` nest
+ * recursively, so `entities`, `metrics`, `dimensions` and `deviceInfo` cross
+ * the boundary as real structure rather than as JSON escaped into a string.
+ */
+
+public enum AppleWireValue: Equatable, Hashable {
+    
+    case str(value: String
+    )
+    case int(value: Int64
+    )
+    case num(value: Double
+    )
+    case bool(value: Bool
+    )
+    case object(value: [String: AppleWireValue]
+    )
+    case array(value: [AppleWireValue]
+    )
+
+
+
+
+
+}
+
+#if compiler(>=6)
+extension AppleWireValue: Sendable {}
+#endif
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public struct FfiConverterTypeAppleWireValue: FfiConverterRustBuffer {
+    typealias SwiftType = AppleWireValue
+
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> AppleWireValue {
+        let variant: Int32 = try readInt(&buf)
+        switch variant {
+        
+        case 1: return .str(value: try FfiConverterString.read(from: &buf)
+        )
+        
+        case 2: return .int(value: try FfiConverterInt64.read(from: &buf)
+        )
+        
+        case 3: return .num(value: try FfiConverterDouble.read(from: &buf)
+        )
+        
+        case 4: return .bool(value: try FfiConverterBool.read(from: &buf)
+        )
+        
+        case 5: return .object(value: try FfiConverterDictionaryStringTypeAppleWireValue.read(from: &buf)
+        )
+        
+        case 6: return .array(value: try FfiConverterSequenceTypeAppleWireValue.read(from: &buf)
+        )
+        
+        default: throw UniffiInternalError.unexpectedEnumCase
+        }
+    }
+
+    public static func write(_ value: AppleWireValue, into buf: inout [UInt8]) {
+        switch value {
+        
+        
+        case let .str(value):
+            writeInt(&buf, Int32(1))
+            FfiConverterString.write(value, into: &buf)
+            
+        
+        case let .int(value):
+            writeInt(&buf, Int32(2))
+            FfiConverterInt64.write(value, into: &buf)
+            
+        
+        case let .num(value):
+            writeInt(&buf, Int32(3))
+            FfiConverterDouble.write(value, into: &buf)
+            
+        
+        case let .bool(value):
+            writeInt(&buf, Int32(4))
+            FfiConverterBool.write(value, into: &buf)
+            
+        
+        case let .object(value):
+            writeInt(&buf, Int32(5))
+            FfiConverterDictionaryStringTypeAppleWireValue.write(value, into: &buf)
+            
+        
+        case let .array(value):
+            writeInt(&buf, Int32(6))
+            FfiConverterSequenceTypeAppleWireValue.write(value, into: &buf)
+            
+        }
+    }
+}
+
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterTypeAppleWireValue_lift(_ buf: RustBuffer) throws -> AppleWireValue {
+    return try FfiConverterTypeAppleWireValue.lift(buf)
+}
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterTypeAppleWireValue_lower(_ value: AppleWireValue) -> RustBuffer {
+    return FfiConverterTypeAppleWireValue.lower(value)
+}
+
+
 
 
 
@@ -3647,7 +3786,7 @@ public func FfiConverterCallbackInterfaceAppleLogListener_lower(_ v: AppleLogLis
 
 public protocol AppleSessionPreSendHook: AnyObject, Sendable {
     
-    func willSend(serviceName: String, params: [String: String])  -> [String: String]
+    func willSend(serviceName: String, params: [String: AppleWireValue])  -> [String: AppleWireValue]
     
 }
 
@@ -3682,18 +3821,18 @@ fileprivate struct UniffiCallbackInterfaceAppleSessionPreSendHook {
             uniffiCallStatus: UnsafeMutablePointer<RustCallStatus>
         ) in
             let makeCall = {
-                () throws -> [String: String] in
+                () throws -> [String: AppleWireValue] in
                 guard let uniffiObj = try? FfiConverterCallbackInterfaceAppleSessionPreSendHook.handleMap.get(handle: uniffiHandle) else {
                     throw UniffiInternalError.unexpectedStaleHandle
                 }
                 return uniffiObj.willSend(
                      serviceName: try FfiConverterString.lift(serviceName),
-                     params: try FfiConverterDictionaryStringString.lift(params)
+                     params: try FfiConverterDictionaryStringTypeAppleWireValue.lift(params)
                 )
             }
 
             
-            let writeReturn = { uniffiOutReturn.pointee = FfiConverterDictionaryStringString.lower($0) }
+            let writeReturn = { uniffiOutReturn.pointee = FfiConverterDictionaryStringTypeAppleWireValue.lower($0) }
             uniffiTraitInterfaceCall(
                 callStatus: uniffiCallStatus,
                 makeCall: makeCall,
@@ -3780,7 +3919,7 @@ public func FfiConverterCallbackInterfaceAppleSessionPreSendHook_lower(_ v: Appl
 
 public protocol AppleVideoPreSendHook: AnyObject, Sendable {
     
-    func willSend(eventName: String, viewId: UInt64, serviceName: String, params: [String: String])  -> [String: String]
+    func willSend(eventName: String, viewId: UInt64, serviceName: String, params: [String: AppleWireValue])  -> [String: AppleWireValue]
     
 }
 
@@ -3817,7 +3956,7 @@ fileprivate struct UniffiCallbackInterfaceAppleVideoPreSendHook {
             uniffiCallStatus: UnsafeMutablePointer<RustCallStatus>
         ) in
             let makeCall = {
-                () throws -> [String: String] in
+                () throws -> [String: AppleWireValue] in
                 guard let uniffiObj = try? FfiConverterCallbackInterfaceAppleVideoPreSendHook.handleMap.get(handle: uniffiHandle) else {
                     throw UniffiInternalError.unexpectedStaleHandle
                 }
@@ -3825,12 +3964,12 @@ fileprivate struct UniffiCallbackInterfaceAppleVideoPreSendHook {
                      eventName: try FfiConverterString.lift(eventName),
                      viewId: try FfiConverterUInt64.lift(viewId),
                      serviceName: try FfiConverterString.lift(serviceName),
-                     params: try FfiConverterDictionaryStringString.lift(params)
+                     params: try FfiConverterDictionaryStringTypeAppleWireValue.lift(params)
                 )
             }
 
             
-            let writeReturn = { uniffiOutReturn.pointee = FfiConverterDictionaryStringString.lower($0) }
+            let writeReturn = { uniffiOutReturn.pointee = FfiConverterDictionaryStringTypeAppleWireValue.lower($0) }
             uniffiTraitInterfaceCall(
                 callStatus: uniffiCallStatus,
                 makeCall: makeCall,
@@ -4346,6 +4485,31 @@ fileprivate struct FfiConverterSequenceTypeAppleRuntimeEventSnapshot: FfiConvert
     }
 }
 
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+fileprivate struct FfiConverterSequenceTypeAppleWireValue: FfiConverterRustBuffer {
+    typealias SwiftType = [AppleWireValue]
+
+    public static func write(_ value: [AppleWireValue], into buf: inout [UInt8]) {
+        let len = Int32(value.count)
+        writeInt(&buf, len)
+        for item in value {
+            FfiConverterTypeAppleWireValue.write(item, into: &buf)
+        }
+    }
+
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [AppleWireValue] {
+        let len: Int32 = try readInt(&buf)
+        var seq = [AppleWireValue]()
+        seq.reserveCapacity(Int(len))
+        for _ in 0 ..< len {
+            seq.append(try FfiConverterTypeAppleWireValue.read(from: &buf))
+        }
+        return seq
+    }
+}
+
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif
@@ -4397,6 +4561,32 @@ fileprivate struct FfiConverterDictionaryStringString: FfiConverterRustBuffer {
         return dict
     }
 }
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+fileprivate struct FfiConverterDictionaryStringTypeAppleWireValue: FfiConverterRustBuffer {
+    public static func write(_ value: [String: AppleWireValue], into buf: inout [UInt8]) {
+        let len = Int32(value.count)
+        writeInt(&buf, len)
+        for (key, value) in value {
+            FfiConverterString.write(key, into: &buf)
+            FfiConverterTypeAppleWireValue.write(value, into: &buf)
+        }
+    }
+
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [String: AppleWireValue] {
+        let len: Int32 = try readInt(&buf)
+        var dict = [String: AppleWireValue]()
+        dict.reserveCapacity(Int(len))
+        for _ in 0..<len {
+            let key = try FfiConverterString.read(from: &buf)
+            let value = try FfiConverterTypeAppleWireValue.read(from: &buf)
+            dict[key] = value
+        }
+        return dict
+    }
+}
 public func forgePluginVersion() -> String  {
     return try!  FfiConverterString.lift(try! rustCall() {
     uniffi_forge_kernel_uniffi_fn_func_forge_plugin_version($0
@@ -4473,6 +4663,9 @@ private let initializationResult: InitializationResult = {
     if (uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_event() != 32672) {
         return InitializationResult.apiChecksumMismatch
     }
+    if (uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_update() != 42476) {
+        return InitializationResult.apiChecksumMismatch
+    }
     if (uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_set_auto_connection_type() != 38828) {
         return InitializationResult.apiChecksumMismatch
     }
@@ -4518,10 +4711,10 @@ private let initializationResult: InitializationResult = {
     if (uniffi_forge_kernel_uniffi_checksum_method_appleloglistener_on_log() != 23012) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_forge_kernel_uniffi_checksum_method_applesessionpresendhook_will_send() != 48599) {
+    if (uniffi_forge_kernel_uniffi_checksum_method_applesessionpresendhook_will_send() != 42303) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_forge_kernel_uniffi_checksum_method_applevideopresendhook_will_send() != 35608) {
+    if (uniffi_forge_kernel_uniffi_checksum_method_applevideopresendhook_will_send() != 47813) {
         return InitializationResult.apiChecksumMismatch
     }
 

package/ios/ForgeApple/Sources/ForgeKernelUniFFI/forge_kernelFFI.h

@@ -439,6 +439,11 @@ RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_player
 RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_session_event(uint64_t ptr, RustBuffer event_name, uint64_t timemark_ms, RustBuffer params, RustCallStatus *_Nonnull out_status
 );
 #endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+#define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_record_session_update(uint64_t ptr, uint64_t timemark_ms, RustBuffer params, RustBuffer metrics, RustCallStatus *_Nonnull out_status
+);
+#endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE
 #define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_FN_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE
 RustBuffer uniffi_forge_kernel_uniffi_fn_method_forgeruntimebridge_set_auto_connection_type(uint64_t ptr, RustBuffer connection_type, RustCallStatus *_Nonnull out_status
@@ -891,6 +896,12 @@ uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_pl
 #define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_EVENT
 uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_event(void
     
+);
+#endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+#define UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_RECORD_SESSION_UPDATE
+uint16_t uniffi_forge_kernel_uniffi_checksum_method_forgeruntimebridge_record_session_update(void
+    
 );
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_FORGE_KERNEL_UNIFFI_CHECKSUM_METHOD_FORGERUNTIMEBRIDGE_SET_AUTO_CONNECTION_TYPE