@npaw/forge-react-native 10.0.2 → 10.1.0

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.2')
+    : (System.getenv('FORGE_CORE_VERSION') ?: '10.1.0')
 
 android {
     namespace 'com.npaw.forge.reactnative'

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

@@ -28,15 +28,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>
 		<dict>
 			<key>BinaryPath</key>
@@ -44,18 +47,15 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>tvos-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>
+			<string>tvos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>

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

@@ -481,6 +481,22 @@ fileprivate struct FfiConverterUInt32: FfiConverterPrimitive {
     }
 }
 
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+fileprivate struct FfiConverterInt32: FfiConverterPrimitive {
+    typealias FfiType = Int32
+    typealias SwiftType = Int32
+
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> Int32 {
+        return try lift(readInt(&buf))
+    }
+
+    public static func write(_ value: Int32, into buf: inout [UInt8]) {
+        writeInt(&buf, lower(value))
+    }
+}
+
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif
@@ -1596,10 +1612,14 @@ public struct AppleDeviceSample: Equatable, Hashable {
     public var batteryCharging: Bool?
     public var thermal: AppleThermalState?
     public var diskFreeBytes: UInt64?
+    public var netSignalDbm: Int32?
+    public var netLinkMbps: UInt32?
+    public var netDownlinkKbps: UInt32?
+    public var netFreqMhz: UInt32?
 
     // Default memberwise initializers are never public by default, so we
     // declare one manually.
-    public init(sampledAtMs: UInt64, cpuTimeMs: UInt64?, cpuCores: UInt32?, memUsedBytes: UInt64?, memAvailBytes: UInt64?, batteryLevelPct: UInt8?, batteryCharging: Bool?, thermal: AppleThermalState?, diskFreeBytes: UInt64?) {
+    public init(sampledAtMs: UInt64, cpuTimeMs: UInt64?, cpuCores: UInt32?, memUsedBytes: UInt64?, memAvailBytes: UInt64?, batteryLevelPct: UInt8?, batteryCharging: Bool?, thermal: AppleThermalState?, diskFreeBytes: UInt64?, netSignalDbm: Int32?, netLinkMbps: UInt32?, netDownlinkKbps: UInt32?, netFreqMhz: UInt32?) {
         self.sampledAtMs = sampledAtMs
         self.cpuTimeMs = cpuTimeMs
         self.cpuCores = cpuCores
@@ -1609,6 +1629,10 @@ public struct AppleDeviceSample: Equatable, Hashable {
         self.batteryCharging = batteryCharging
         self.thermal = thermal
         self.diskFreeBytes = diskFreeBytes
+        self.netSignalDbm = netSignalDbm
+        self.netLinkMbps = netLinkMbps
+        self.netDownlinkKbps = netDownlinkKbps
+        self.netFreqMhz = netFreqMhz
     }
 
     
@@ -1635,7 +1659,11 @@ public struct FfiConverterTypeAppleDeviceSample: FfiConverterRustBuffer {
                 batteryLevelPct: FfiConverterOptionUInt8.read(from: &buf), 
                 batteryCharging: FfiConverterOptionBool.read(from: &buf), 
                 thermal: FfiConverterOptionTypeAppleThermalState.read(from: &buf), 
-                diskFreeBytes: FfiConverterOptionUInt64.read(from: &buf)
+                diskFreeBytes: FfiConverterOptionUInt64.read(from: &buf), 
+                netSignalDbm: FfiConverterOptionInt32.read(from: &buf), 
+                netLinkMbps: FfiConverterOptionUInt32.read(from: &buf), 
+                netDownlinkKbps: FfiConverterOptionUInt32.read(from: &buf), 
+                netFreqMhz: FfiConverterOptionUInt32.read(from: &buf)
         )
     }
 
@@ -1649,6 +1677,10 @@ public struct FfiConverterTypeAppleDeviceSample: FfiConverterRustBuffer {
         FfiConverterOptionBool.write(value.batteryCharging, into: &buf)
         FfiConverterOptionTypeAppleThermalState.write(value.thermal, into: &buf)
         FfiConverterOptionUInt64.write(value.diskFreeBytes, into: &buf)
+        FfiConverterOptionInt32.write(value.netSignalDbm, into: &buf)
+        FfiConverterOptionUInt32.write(value.netLinkMbps, into: &buf)
+        FfiConverterOptionUInt32.write(value.netDownlinkKbps, into: &buf)
+        FfiConverterOptionUInt32.write(value.netFreqMhz, into: &buf)
     }
 }
 
@@ -4099,6 +4131,30 @@ fileprivate struct FfiConverterOptionUInt32: FfiConverterRustBuffer {
     }
 }
 
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+fileprivate struct FfiConverterOptionInt32: FfiConverterRustBuffer {
+    typealias SwiftType = Int32?
+
+    public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
+        guard let value = value else {
+            writeInt(&buf, Int8(0))
+            return
+        }
+        writeInt(&buf, Int8(1))
+        FfiConverterInt32.write(value, into: &buf)
+    }
+
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
+        switch try readInt(&buf) as Int8 {
+        case 0: return nil
+        case 1: return try FfiConverterInt32.read(from: &buf)
+        default: throw UniffiInternalError.unexpectedOptionalTag
+        }
+    }
+}
+
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif

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

@@ -17,10 +17,10 @@ import Foundation
 import UIKit
 #endif
 
-/// Thermal pressure on the kernel's normalised ordinal scale (`dev_thermal`).
+/// Thermal pressure on the kernel's normalised ordinal scale (the `thermal` wire ordinal).
 ///
 /// The raw values are the wire ordinals shared with Android, so a Suite
-/// filter on `dev_thermal=2` means "serious" on every platform.
+/// filter on `thermal=2` means "serious" on every platform.
 public enum ForgeThermalState: Int, Equatable, CaseIterable {
     case nominal = 0
     case fair = 1
@@ -52,14 +52,14 @@ public enum ForgeThermalState: Int, Equatable, CaseIterable {
 /// cannot read is left `nil`, and the kernel then omits the metric instead of
 /// inventing `0`. The kernel validates field-wise (a battery level above 100,
 /// zero cores or a CPU counter that went backwards is dropped, the rest kept),
-/// derives `dev_cpu` between two consecutive samples, and attaches the set to
-/// the next session beat and video ping.
+/// derives the CPU rate between two consecutive samples, and emits each
+/// accepted sample as a `device_status` session event.
 public struct ForgeDeviceSample: Equatable {
     /// Wall clock at read time, ms since the Unix epoch. `0` lets the bridge
     /// stamp the call with its own clock.
     public var sampledAtMs: Int64
     /// Cumulative process CPU time, user + system, ms, monotonic over the
-    /// process lifetime. Must travel together with ``cpuCores`` for `dev_cpu`.
+    /// process lifetime. Must travel together with ``cpuCores`` for the derived CPU rate.
     public var cpuTimeMs: UInt64?
     /// Logical cores available to the process, `>= 1`.
     public var cpuCores: UInt32?
@@ -79,6 +79,17 @@ public struct ForgeDeviceSample: Equatable {
     /// declare the reason can supply the value itself through
     /// `NPAWForge.recordDeviceSample(_:)`.
     public var diskFreeBytes: UInt64?
+    /// WiFi signal strength, dBm (negative). **Never filled by Forge on
+    /// Apple**: no public RSSI API exists without special entitlements
+    /// (`NEHotspotNetwork` needs the hotspot entitlement plus Location;
+    /// `CoreWLAN` is macOS-only). Hosts with those grants can supply it.
+    public var netSignalDbm: Int32?
+    /// Negotiated WiFi PHY link rate, Mbps. Never filled by Forge on Apple.
+    public var netLinkMbps: UInt32?
+    /// Downstream-bandwidth estimate, kbps. Never filled by Forge on Apple.
+    public var netDownlinkKbps: UInt32?
+    /// WiFi channel frequency, MHz. Never filled by Forge on Apple.
+    public var netFreqMhz: UInt32?
 
     public init(
         sampledAtMs: Int64 = 0,
@@ -89,7 +100,11 @@ public struct ForgeDeviceSample: Equatable {
         batteryLevelPct: UInt8? = nil,
         batteryCharging: Bool? = nil,
         thermal: ForgeThermalState? = nil,
-        diskFreeBytes: UInt64? = nil
+        diskFreeBytes: UInt64? = nil,
+        netSignalDbm: Int32? = nil,
+        netLinkMbps: UInt32? = nil,
+        netDownlinkKbps: UInt32? = nil,
+        netFreqMhz: UInt32? = nil
     ) {
         self.sampledAtMs = sampledAtMs
         self.cpuTimeMs = cpuTimeMs
@@ -100,6 +115,10 @@ public struct ForgeDeviceSample: Equatable {
         self.batteryCharging = batteryCharging
         self.thermal = thermal
         self.diskFreeBytes = diskFreeBytes
+        self.netSignalDbm = netSignalDbm
+        self.netLinkMbps = netLinkMbps
+        self.netDownlinkKbps = netDownlinkKbps
+        self.netFreqMhz = netFreqMhz
     }
 
     /// `true` when no metric field is present (only the timestamp).
@@ -108,6 +127,8 @@ public struct ForgeDeviceSample: Equatable {
             && memUsedBytes == nil && memAvailBytes == nil
             && batteryLevelPct == nil && batteryCharging == nil
             && thermal == nil && diskFreeBytes == nil
+            && netSignalDbm == nil && netLinkMbps == nil
+            && netDownlinkKbps == nil && netFreqMhz == nil
     }
 }
 
@@ -119,6 +140,7 @@ public enum ForgeDeviceMetricFamily: String, CaseIterable, Equatable {
     case bat
     case thm
     case disk
+    case net
 }
 
 /// A battery reading exactly as the platform reports it, before shaping.
@@ -277,7 +299,7 @@ final class ForgeDeviceInsightsCollector {
         var sample = ForgeDeviceSample(sampledAtMs: readers.nowMs())
         if requested.contains(.cpu) {
             // The two travel together or not at all: the kernel needs both to
-            // derive `dev_cpu`, and half a pair is a value nobody can use.
+            // derive the CPU rate, and half a pair is a value nobody can use.
             if let cpuTimeMs = readers.cpuTimeMs(), let cpuCores = readers.cpuCores() {
                 sample.cpuTimeMs = cpuTimeMs
                 sample.cpuCores = cpuCores
@@ -296,6 +318,10 @@ final class ForgeDeviceInsightsCollector {
             sample.batteryCharging = fields.charging
         }
         // `disk` is deliberately never read: see ForgeDeviceSample.diskFreeBytes.
+        // `net` is deliberately never read either: no public RSSI/link/
+        // bandwidth API exists on Apple without entitlements — see
+        // ForgeDeviceSample.netSignalDbm. Host-supplied samples pass the
+        // fields through.
 
         lock.lock()
         let isActive = active

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

@@ -78,8 +78,8 @@ public protocol ForgeRuntime: AnyObject {
     /// so the three platforms cannot drift into different definitions of moving.
     func recordLocationFix(_ fix: ForgeLocationFix) -> ForgeOutcome
     /// Forwards a device runtime health sample. Every field is optional; the
-    /// kernel validates field-wise, derives `dev_cpu` between samples and
-    /// attaches the set to the next session beat and video ping. Refused
+    /// kernel validates field-wise, derives the CPU rate between samples and
+    /// emits the sample as a `device_status` session event. Refused
     /// (`ignoredInvalidState`) while device insights are off remotely.
     func recordDeviceSample(_ sample: ForgeDeviceSample) -> ForgeOutcome
     /// Registers (or clears with `nil`) the receiver of the kernel's device

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.2"
+    public static let defaultPluginVersion = "10.1.0"
     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

@@ -606,7 +606,11 @@ private func appleDeviceSample(_ sample: ForgeDeviceSample) -> AppleDeviceSample
         batteryLevelPct: sample.batteryLevelPct,
         batteryCharging: sample.batteryCharging,
         thermal: sample.thermal.map(appleThermalState),
-        diskFreeBytes: sample.diskFreeBytes
+        diskFreeBytes: sample.diskFreeBytes,
+        netSignalDbm: sample.netSignalDbm,
+        netLinkMbps: sample.netLinkMbps,
+        netDownlinkKbps: sample.netDownlinkKbps,
+        netFreqMhz: sample.netFreqMhz
     )
 }
 

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

@@ -96,7 +96,15 @@ public struct NetworkRequestRecord: Equatable {
         copy.targetUrl = configuration.sanitizeUrl(targetUrl)
         copy.requestQuery = configuration.filterMap(requestQuery, allowlist: configuration.queryAllowlist)
         copy.requestHeaders = configuration.filterMap(requestHeaders, allowlist: configuration.requestHeaderAllowlist)
-        copy.responseHeaders = configuration.filterMap(responseHeaders, allowlist: configuration.responseHeaderAllowlist)
+        // The cache-stat headers ride beside the host allowlist so the
+        // kernel's network_stats cache counters can classify; their values
+        // reach the raw-event wire only when the remote `nc.sh` allowlist
+        // names them.
+        copy.responseHeaders = configuration.filterMap(
+            responseHeaders,
+            allowlist: configuration.responseHeaderAllowlist
+                .union(NetworkPrivacyConfiguration.cacheStatsResponseHeaders)
+        )
         copy.errorMessage = errorMessage.map(configuration.sanitizeText)
         return copy
     }
@@ -123,6 +131,19 @@ public struct NetworkPrivacyConfiguration: Equatable {
         self.maxStringLength = max(1, maxStringLength)
     }
 
+    /// Response headers the kernel's cache hit/miss statistics classify
+    /// (`network_stats` cacheHits/cacheMisses per tier). Always kept beside
+    /// `responseHeaderAllowlist`; values carry CDN node hostnames, never
+    /// user data, and hit the raw-event wire only when the remote `nc.sh`
+    /// allowlist names them.
+    public static let cacheStatsResponseHeaders: Set<String> = [
+        "cache-status",
+        "cf-cache-status",
+        "x-cache-status",
+        "x-cache",
+        "x-cache-remote",
+    ]
+
     public static let defaultRedactionKeys: Set<String> = [
         "authorization",
         "proxy-authorization",

package/ios/ForgeApple/Sources/NPAWForgeNetworkCaptureObjC/NPAWForgeNetworkSwizzler.m

@@ -125,6 +125,23 @@ static void NPAWEmit(NSURLRequest *request, NSURLResponse *response, NSData *dat
     if (http.MIMEType.length > 0) {
         payload[@"responseHeader.Content-Type"] = http.MIMEType;
     }
+    // Cache-stat headers for the kernel's network_stats hit/miss counters.
+    // -valueForHTTPHeaderField: is case-insensitive and comma-joins repeated
+    // lines, so multi-hop X-Cache chains arrive whole. The values only reach
+    // the raw-event wire when the remote allowlist names them.
+    NSArray<NSString *> *cacheHeaderNames = @[
+        @"Cache-Status",
+        @"CF-Cache-Status",
+        @"X-Cache-Status",
+        @"X-Cache",
+        @"X-Cache-Remote",
+    ];
+    for (NSString *headerName in cacheHeaderNames) {
+        NSString *headerValue = [http valueForHTTPHeaderField:headerName];
+        if (headerValue.length > 0) {
+            payload[[@"responseHeader." stringByAppendingString:headerName]] = headerValue;
+        }
+    }
     callback(payload);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npaw/forge-react-native",
-  "version": "10.0.2",
+  "version": "10.1.0",
   "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>",