@npaw/forge-react-native 10.0.0 → 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') ?: '10.0.0')
+    : (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

@@ -186,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/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>tvos-arm64</string>
+			<string>tvos-arm64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libForgeKernelFFI.a</string>
 			<key>SupportedArchitectures</key>
@@ -56,6 +51,8 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<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>ios-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>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

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

@@ -1743,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]?
@@ -1751,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
@@ -1772,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
@@ -1815,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), 
@@ -1844,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)

package/ios/ForgeApple/Sources/NPAWForgeCore/NPAWForge.swift

@@ -40,7 +40,7 @@ public final class NPAWForge: NSObject {
     /// `scripts/apple/publish-local-shipped.sh` rewrites this literal to the
     /// release version when staging the shipped package, and fails loudly if
     /// it cannot find it. Keep it a plain stored literal for that reason.
-    public static let defaultPluginVersion = "10.0.0"
+    public static let defaultPluginVersion = "10.0.1"
     public static let defaultAppName = "apple"
     public static let defaultBuildVariant = "release"
     public static let defaultLmaEndpoint = "https://lma.npaw.com"

package/ios/ForgeApple/Sources/NPAWForgeCore/NativeUniFFIRuntime.swift

@@ -167,6 +167,7 @@ final class UniFFIForgeRuntime: ForgeRuntime {
             redirectDurationMs: record.redirectDurationMs.map(u64),
             redirectCount: record.redirectCount.map(u64),
             protocol: record.networkProtocol,
+            requestType: record.requestType,
             requestBytes: record.requestBytes.map(u64),
             responseBytes: record.responseBytes.map(u64),
             requestQuery: record.requestQuery.isEmpty ? nil : record.requestQuery,

package/ios/ForgeApple/Sources/NPAWForgeCore/NetworkRequestRecord.swift

@@ -51,6 +51,11 @@ public struct NetworkRequestRecord: Equatable {
     public var redirectDurationMs: Int64?
     public var redirectCount: Int64?
     public var networkProtocol: String?
+    /// Resource class of the request as reported by the observing host, e.g.
+    /// a player adapter classifying its SDK's own downloads. Canonical
+    /// lowercase tokens (`manifest`, `media_video`, `drm_license`, ...); the
+    /// kernel caps it at 32 chars on the wire.
+    public var requestType: String?
     /// Request body size in bytes (measured uploaded byte count, request
     /// `Content-Length` fallback). Body content is never captured; only this
     /// size is reported.

package/ios/ForgeModuleImpl.swift

@@ -1119,6 +1119,7 @@ public final class ForgeModuleImpl: NSObject {
         record.redirectDurationMs = int64(map["redirectDurationMs"])
         record.redirectCount = int64(map["redirectCount"])
         record.networkProtocol = map["protocol"] as? String
+        record.requestType = map["requestType"] as? String
         record.requestBytes = int64(map["requestBytes"])
         record.responseBytes = int64(map["responseBytes"])
         return record

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npaw/forge-react-native",
-  "version": "10.0.0",
+  "version": "10.0.1",
   "description": "NPAW Forge analytics for React Native: New Architecture TurboModule facade over the native Forge Android/Apple SDKs.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Victor Soto <victor.soto@nicepeopleatwork.com>",

package/src/types.ts

@@ -136,6 +136,13 @@ export type ForgeNetworkRequestRecord = {
   redirectDurationMs?: number;
   redirectCount?: number;
   protocol?: string;
+  /**
+   * Resource class of the request as reported by the observing host, e.g. a
+   * player adapter classifying its SDK's own downloads. Canonical lowercase
+   * tokens (`manifest`, `media_video`, `drm_license`, ...); the kernel caps
+   * it at 32 chars on the wire.
+   */
+  requestType?: string;
   requestBytes?: number;
   responseBytes?: number;
 };