@logbrew/react-native 0.1.19 → 0.1.20

package/index.native.d.ts

@@ -46,6 +46,7 @@ declare const defaultExport: Omit<
   installLogBrewAppleNativeDiagnostics: typeof import("./apple-native-diagnostics.js").installLogBrewAppleNativeDiagnostics;
   purgeLogBrewReactNativePersistentQueue: typeof purgeLogBrewReactNativePersistentQueue;
   replayLogBrewAppleNativeDiagnostics: typeof import("./apple-native-diagnostics.js").replayLogBrewAppleNativeDiagnostics;
+  setLogBrewAppleNativeCrashContext: typeof import("./apple-native-diagnostics.js").setLogBrewAppleNativeCrashContext;
 };
 
 export default defaultExport;

package/index.native.js

@@ -13,7 +13,8 @@ import baseDefault from "./index.js";
 import {
   getLogBrewAppleNativeDiagnosticsStatus,
   installLogBrewAppleNativeDiagnostics,
-  replayLogBrewAppleNativeDiagnostics
+  replayLogBrewAppleNativeDiagnostics,
+  setLogBrewAppleNativeCrashContext
 } from "./apple-native-diagnostics.js";
 import {
   purgeReactNativePersistentQueue,
@@ -26,7 +27,8 @@ export {
 export {
   getLogBrewAppleNativeDiagnosticsStatus,
   installLogBrewAppleNativeDiagnostics,
-  replayLogBrewAppleNativeDiagnostics
+  replayLogBrewAppleNativeDiagnostics,
+  setLogBrewAppleNativeCrashContext
 };
 
 export * from "./index.js";
@@ -146,7 +148,8 @@ const defaultExport = {
   getLogBrewAppleNativeDiagnosticsStatus,
   installLogBrewAppleNativeDiagnostics,
   purgeLogBrewReactNativePersistentQueue,
-  replayLogBrewAppleNativeDiagnostics
+  replayLogBrewAppleNativeDiagnostics,
+  setLogBrewAppleNativeCrashContext
 };
 
 export default defaultExport;

package/ios/AppleDiagnostics/LBRNAppleDiagnosticsModule.mm

@@ -40,6 +40,11 @@ RCT_EXPORT_METHOD(replayNativeDiagnostics:(RCTPromiseResolveBlock)resolve
     }];
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(setNativeDiagnosticsContext:(NSDictionary *)context)
+{
+    return [LBRNAppleNativeDiagnostics setCorrelationContext:context];
+}
+
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(nativeDiagnosticsStatus)
 {
     return [LBRNAppleNativeDiagnostics status];

package/ios/AppleDiagnostics/LBRNAppleNativeDiagnostics.swift

@@ -3,7 +3,7 @@ import Foundation
 @objc(LBRNAppleNativeDiagnostics)
 public final class LBRNAppleNativeDiagnostics: NSObject, @unchecked Sendable {
     private static let shared = LBRNAppleNativeDiagnostics()
-    private static let sdkVersion = "0.1.19"
+    private static let sdkVersion = "0.1.20"
 
     private let lock = NSLock()
     private let replayQueue = DispatchQueue(label: "co.logbrew.react-native.apple-diagnostics-replay")
@@ -39,6 +39,11 @@ public final class LBRNAppleNativeDiagnostics: NSObject, @unchecked Sendable {
         shared.currentStatus()
     }
 
+    @objc(setCorrelationContext:)
+    public static func setCorrelationContext(_ rawContext: NSDictionary?) -> NSDictionary {
+        shared.updateCorrelationContext(rawContext)
+    }
+
     private func installOnMainThread(_ rawConfiguration: NSDictionary) -> NSDictionary {
         guard let configuration = InstalledConfiguration(rawConfiguration) else {
             return failure("native_diagnostics_invalid_configuration")
@@ -132,6 +137,23 @@ public final class LBRNAppleNativeDiagnostics: NSObject, @unchecked Sendable {
         return captureStatus(status: "ready")
     }
 
+    private func updateCorrelationContext(_ rawContext: NSDictionary?) -> NSDictionary {
+        lock.lock()
+        defer { lock.unlock() }
+        guard let capture else {
+            return failure("native_diagnostics_not_installed")
+        }
+        do {
+            let context = try rawContext.map { try NativeCrashCorrelation.validated($0) }
+            try capture.setCorrelationContext(context)
+            return ["status": rawContext == nil ? "cleared" : "updated"]
+        } catch let error as NativeCrashError {
+            return failure(error.code.rawValue)
+        } catch {
+            return failure("native_diagnostics_failed")
+        }
+    }
+
     private func captureStatus(status: String) -> NSDictionary {
         guard let capture else {
             return failure("native_diagnostics_not_installed")

package/ios/GeneratedAppleDiagnostics/LogBrew/TelemetryContextValidation.swift

@@ -43,6 +43,22 @@ func validateTelemetryContext(
     return TelemetryContext(resource: resource, trace: trace, session: session, subject: subject, tags: tags)
 }
 
+@_spi(CrashReplay)
+public func validateNativeCrashCorrelationContext(_ value: TelemetryContext) throws -> TelemetryContext {
+    let context = try validateTelemetryContext(value, label: "native crash correlation context")
+    let identifiers = [context.session?.id, context.session?.previousId, context.subject?.id].compactMap(\.self)
+    guard context.resource == nil,
+          context.tags == nil,
+          context.trace != nil || context.session != nil || context.subject != nil,
+          identifiers.allSatisfy({
+              validMachineKey($0, maximum: 200, separators: ["_", "-"], allowNumericStart: true)
+          })
+    else {
+        throw contextValidationError("native crash correlation context is invalid")
+    }
+    return context
+}
+
 func telemetryTraceContext(_ context: LogBrewTraceContext) -> TelemetryTraceContext {
     TelemetryTraceContext(
         traceId: context.traceId,

package/ios/GeneratedAppleDiagnostics/LogBrewCrash/CrashEngine.swift

@@ -23,6 +23,7 @@ struct CrashEngineConfiguration: Equatable {
 
 protocol CrashEngineDriving: AnyObject {
     func install(configuration: CrashEngineConfiguration) throws -> any CrashReportStoring
+    func setUserInfo(_ value: String?, forKey key: String)
 }
 
 protocol CrashReportStoring: AnyObject {
@@ -98,6 +99,10 @@ final class KSCrashEngineDriver: CrashEngineDriving {
         }
         return KSCrashReportStoreAdapter(store: reportStore)
     }
+
+    func setUserInfo(_ value: String?, forKey key: String) {
+        KSCrash.shared.setUserInfo(value, forKey: key)
+    }
 }
 
 private final class KSCrashReportStoreAdapter: CrashReportStoring {

package/ios/GeneratedAppleDiagnostics/LogBrewCrash/CrashReportSanitizer.swift

@@ -22,6 +22,7 @@ struct CrashReportSanitizer {
         let error = crash?["error"] as? [String: Any]
         let nativeStackFrames = NativeStackFrameSanitizer().frames(from: rawReport)
         let artifactIdentity = try NativeArtifactIdentityValue.persistedIdentity(in: rawReport)
+        let correlation = NativeCrashCorrelation.captured(in: rawReport)
         return NativeCrashRecord(
             eventID: uuid.uuidString.lowercased(),
             timestamp: timestamp.normalized,
@@ -31,7 +32,9 @@ struct CrashReportSanitizer {
             context: nativeCrashContext(
                 system: rawReport["system"] as? [String: Any],
                 artifactIdentity: artifactIdentity,
+                correlation: correlation.0,
             ),
+            correlationState: correlation.1,
             hangState: nil,
             hangDurationMs: nil,
             source: .engine(reportID: reportID),
@@ -77,6 +80,7 @@ struct CrashReportSanitizer {
 func nativeCrashContext(
     system: [String: Any]?,
     artifactIdentity: NativeArtifactIdentity?,
+    correlation: TelemetryContext? = nil,
 ) -> TelemetryContext? {
     let value = { (key: String) in crashContextValue(system?[key]) }
     let operatingSystem = value("system_name").map {
@@ -94,18 +98,26 @@ func nativeCrashContext(
     let application = applicationName == nil && applicationVersion == nil && applicationBuild == nil
         ? nil
         : TelemetryApplication(name: applicationName, version: applicationVersion, build: applicationBuild)
-    guard artifactIdentity != nil || operatingSystem != nil || device != nil || application != nil else {
+    let resource = artifactIdentity != nil || operatingSystem != nil || device != nil || application != nil
+        ? TelemetryResource(
+            service: artifactIdentity.map { TelemetryNamedVersion(name: $0.service) },
+            deployment: artifactIdentity.map {
+                TelemetryDeployment(environment: $0.environment, release: $0.release)
+            },
+            operatingSystem: operatingSystem,
+            device: device,
+            application: application,
+        )
+        : nil
+    guard resource != nil || correlation != nil else {
         return nil
     }
-    return TelemetryContext(resource: TelemetryResource(
-        service: artifactIdentity.map { TelemetryNamedVersion(name: $0.service) },
-        deployment: artifactIdentity.map {
-            TelemetryDeployment(environment: $0.environment, release: $0.release)
-        },
-        operatingSystem: operatingSystem,
-        device: device,
-        application: application,
-    ))
+    return TelemetryContext(
+        resource: resource,
+        trace: correlation?.trace,
+        session: correlation?.session,
+        subject: correlation?.subject,
+    )
 }
 
 private func crashContextValue(_ rawValue: Any?) -> String? {

package/ios/GeneratedAppleDiagnostics/LogBrewCrash/NativeCrashCapture.swift

@@ -106,6 +106,22 @@ public final class NativeCrashCapture: NSObject, @unchecked Sendable {
         return try pendingReportsLocked()
     }
 
+    /// Replaces the crash-time trace, session, and opaque subject snapshot in one bounded write.
+    @nonobjc
+    public func setCorrelationContext(_ context: TelemetryContext?) throws {
+        lock.lock()
+        defer { lock.unlock() }
+        try verifyProcessLocked()
+        guard store != nil, lifecycle != .stopped else {
+            throw NativeCrashError(.notInstalled)
+        }
+        try verifyStorageLocked()
+        try driver.setUserInfo(
+            NativeCrashCorrelation.encoded(context),
+            forKey: NativeCrashCorrelation.reportKey,
+        )
+    }
+
     @objc(replayPendingReportsWithHandler:error:)
     public func replayPendingReports(
         _ handler: (NativeCrashRecord) -> Bool,

package/ios/GeneratedAppleDiagnostics/LogBrewCrash/NativeCrashCorrelation.swift

@@ -0,0 +1,77 @@
+// Generated by scripts/sync-apple-native-sources.mjs.
+// Edit the canonical Swift source, then regenerate this package boundary.
+import Foundation
+
+enum NativeCrashCorrelationState: String {
+    case captured
+    case notCaptured = "not_captured"
+    case unavailable
+}
+
+enum NativeCrashCorrelation {
+    static let reportKey = "logbrew_native_correlation"
+    private static let maximumBytes = 1024
+
+    static func encoded(_ context: TelemetryContext?) throws -> String? {
+        guard let context else {
+            return nil
+        }
+        do {
+            let data = try encoder().encode(validateNativeCrashCorrelationContext(context))
+            guard data.count <= maximumBytes, let value = String(data: data, encoding: .utf8) else {
+                throw NativeCrashError(.invalidConfiguration)
+            }
+            return value
+        } catch let error as NativeCrashError {
+            throw error
+        } catch {
+            throw NativeCrashError(.invalidConfiguration)
+        }
+    }
+
+    static func captured(in rawReport: [String: Any]) -> (TelemetryContext?, NativeCrashCorrelationState) {
+        guard let user = rawReport["user"] as? [String: Any], let value = user[reportKey] else {
+            return (nil, .notCaptured)
+        }
+        guard let value = value as? String,
+              let data = value.data(using: .utf8),
+              data.count <= maximumBytes,
+              let object = try? JSONSerialization.jsonObject(with: data),
+              let context = try? validated(object)
+        else {
+            return (nil, .unavailable)
+        }
+        return (context, .captured)
+    }
+
+    static func validated(_ object: Any) throws -> TelemetryContext {
+        do {
+            guard JSONSerialization.isValidJSONObject(object) else {
+                throw NativeCrashError(.invalidConfiguration)
+            }
+            let data = try JSONSerialization.data(withJSONObject: object, options: [.sortedKeys])
+            guard data.count <= maximumBytes else {
+                throw NativeCrashError(.invalidConfiguration)
+            }
+            let context = try validateNativeCrashCorrelationContext(
+                JSONDecoder().decode(TelemetryContext.self, from: data),
+            )
+            let normalized = try encoder().encode(context)
+            let normalizedObject = try JSONSerialization.jsonObject(with: normalized)
+            guard object as? NSDictionary == normalizedObject as? NSDictionary else {
+                throw NativeCrashError(.invalidConfiguration)
+            }
+            return context
+        } catch let error as NativeCrashError {
+            throw error
+        } catch {
+            throw NativeCrashError(.invalidConfiguration)
+        }
+    }
+
+    private static func encoder() -> JSONEncoder {
+        let encoder = JSONEncoder()
+        encoder.outputFormatting = [.sortedKeys, .withoutEscapingSlashes]
+        return encoder
+    }
+}

package/ios/GeneratedAppleDiagnostics/LogBrewCrash/NativeCrashPublic.swift

@@ -164,6 +164,7 @@ public final class NativeCrashRecord: NSObject, @unchecked Sendable {
     private let nativeStackFrames: [NativeStackFrame]?
     private let artifactIdentity: NativeArtifactIdentity?
     private let context: TelemetryContext?
+    private let correlationState: NativeCrashCorrelationState?
     private let hangState: NativeHangIncidentState?
     private let hangDurationMs: Double?
     let source: NativeCrashRecordSource
@@ -177,6 +178,7 @@ public final class NativeCrashRecord: NSObject, @unchecked Sendable {
         nativeStackFrames: [NativeStackFrame]?,
         artifactIdentity: NativeArtifactIdentity?,
         context: TelemetryContext?,
+        correlationState: NativeCrashCorrelationState? = nil,
         hangState: NativeHangIncidentState?,
         hangDurationMs: Double? = nil,
         source: NativeCrashRecordSource,
@@ -189,6 +191,7 @@ public final class NativeCrashRecord: NSObject, @unchecked Sendable {
         self.nativeStackFrames = nativeStackFrames
         self.artifactIdentity = artifactIdentity
         self.context = context
+        self.correlationState = correlationState
         self.hangState = hangState
         self.hangDurationMs = hangDurationMs
         self.source = source
@@ -228,6 +231,9 @@ public final class NativeCrashRecord: NSObject, @unchecked Sendable {
             metadata["environment"] = .string(artifactIdentity.environment)
             metadata["service"] = .string(artifactIdentity.service)
         }
+        if let correlationState {
+            metadata["crash.correlation"] = .string(correlationState.rawValue)
+        }
         if let hangState {
             metadata["crash.handled"] = .bool(hangState == .recovered)
         }
@@ -284,6 +290,11 @@ public final class NativeCrashRecord: NSObject, @unchecked Sendable {
         for legacyField in ["exception", "exceptionChain", "context"] where actual[legacyField] == nil {
             expected.removeValue(forKey: legacyField)
         }
+        if (actual["metadata"] as? [String: Any])?["crash.correlation"] == nil {
+            var metadata = expected["metadata"] as? [String: Any]
+            metadata?.removeValue(forKey: "crash.correlation")
+            expected["metadata"] = metadata
+        }
         return actual as NSDictionary == expected as NSDictionary
     }
 }

package/ios/GeneratedAppleDiagnostics/SOURCE-MANIFEST.json

@@ -22,19 +22,20 @@
     "swift/logbrew-swift/Sources/LogBrew/ProductTimeline.swift": "209906aa0e8f096a347e35832840522710eadfb530053253cd73c748518e362d",
     "swift/logbrew-swift/Sources/LogBrew/PublicTypes.swift": "a21aee058f716ec9d41d54ad032b2c7a4d64a4b99d749a9fa2be3fd2df5c6568",
     "swift/logbrew-swift/Sources/LogBrew/TelemetryContext.swift": "ce3ac93a62a345f8c9a8f4c69ce84efc991bf02a688f49bad5e68edcff2f6e08",
-    "swift/logbrew-swift/Sources/LogBrew/TelemetryContextValidation.swift": "23524d281a185962a2ecc75f1ca1cb775171e2f72ecd39ca325ace7e45082485",
+    "swift/logbrew-swift/Sources/LogBrew/TelemetryContextValidation.swift": "ab5811b48df308bf8f6435efee30a24f91a62bfe8b6dea612a2077c8ae0eb302",
     "swift/logbrew-swift/Sources/LogBrew/TraceEvidence.swift": "40aaa42976164c53d9f4d9e9e30d236534238da43bbe90832a673c8809ad54b6",
     "swift/logbrew-swift/Sources/LogBrew/Transport.swift": "73eec81aaebec4bc922b2a372429c88fcd3e85606a7862cd08e1795eb2a8e6cd",
     "swift/logbrew-swift/Sources/LogBrew/URLSessionTrace.swift": "d0076c72671716c41bd7498d0509e453b8182c418156e169196fee9f26fc66b1",
     "swift/logbrew-swift/Sources/LogBrew/URLSessionTracer.swift": "0cdf08f92d6111c0dc2883b87837b81f69b5c2f9a8e5501780a114c23a741af7",
     "swift/logbrew-swift/Sources/LogBrew/Validation.swift": "07ff5c2daeb829b1df4f50edb0b79727f9a81b1c9b5cde5f995f5ad6ce660aa7",
-    "swift/logbrew-swift/Sources/LogBrewCrash/CrashEngine.swift": "7a46035fcaa72dd7504b4e274a92070d73dd1c45fe20e008474340d6d7c44ede",
-    "swift/logbrew-swift/Sources/LogBrewCrash/CrashReportSanitizer.swift": "8798c8900ea28a85d6909183dc8435bc08da96573b89310d26ed178217fbc04b",
+    "swift/logbrew-swift/Sources/LogBrewCrash/CrashEngine.swift": "a94dfce653e3e7f381be42b6d2c4540f0be77e83777ecc53e06682cd2e569c5a",
+    "swift/logbrew-swift/Sources/LogBrewCrash/CrashReportSanitizer.swift": "5b503240977bd0c266035b2024e16c50846e6d2932dea083182bc549192a804f",
     "swift/logbrew-swift/Sources/LogBrewCrash/CrashStorageDirectory.swift": "7cd566703cbf704dc99155451ee93dcace12c35c805abc09a6dcf23975cf43f9",
     "swift/logbrew-swift/Sources/LogBrewCrash/NativeArtifactIdentity.swift": "3d785ad717dcf7302451531c18b5e1183983270a6cd78dd543a407e3facc6ae0",
-    "swift/logbrew-swift/Sources/LogBrewCrash/NativeCrashCapture.swift": "e9ab5f1850a096f40592a025d16c5ffa2fdff0222004a37056898cf1cb4b0dd9",
+    "swift/logbrew-swift/Sources/LogBrewCrash/NativeCrashCapture.swift": "3ebecef96e67b8e5a56a10d0d847470cb276dea44164e2e637584e110ea3ea39",
+    "swift/logbrew-swift/Sources/LogBrewCrash/NativeCrashCorrelation.swift": "a513d933eea0b4e83418eb5dd60086cc6871c9e0147a6e7224c45cc6b502de2e",
     "swift/logbrew-swift/Sources/LogBrewCrash/NativeCrashExceptionEvidence.swift": "ce191e46298d91d87b379528d610caa88b924b15a8dd912b4a164b51eb172a7a",
-    "swift/logbrew-swift/Sources/LogBrewCrash/NativeCrashPublic.swift": "7c1d028bea143c6ab34ebddaaaab64aeb69d4d950ec7a42264c567e672991748",
+    "swift/logbrew-swift/Sources/LogBrewCrash/NativeCrashPublic.swift": "1672116a06fbdd10971838817591ee23af68bd5a9b07bbffb073e0fafc6cb1c0",
     "swift/logbrew-swift/Sources/LogBrewCrash/NativeCrashReplay.swift": "3eb3d93b32cf14de416f56fa30d6d65e6f268b5ec9d1a67081d7525c4efd4f80",
     "swift/logbrew-swift/Sources/LogBrewCrash/NativeHangIncidentStore.swift": "5a8150083f16d6b495c9c63434809dc5f11f13ebb23211f57151bad62040781b",
     "swift/logbrew-swift/Sources/LogBrewCrash/NativeHangWatchdog.swift": "37b25904cd6576e20c40500be2c153156403b57ad7b4186a1b6b35b414145ecb",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logbrew/react-native",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "React Native offline delivery, Apple native diagnostics, screen, error, trace, action, and network timeline helpers for LogBrew.",
   "type": "module",
   "main": "./index.cjs",

package/src/NativeLogBrewAppleDiagnostics.ts

@@ -6,6 +6,9 @@ export interface Spec extends TurboModule {
     configuration: CodegenTypes.UnsafeObject
   ): CodegenTypes.UnsafeObject;
   replayNativeDiagnostics(): Promise<CodegenTypes.UnsafeObject>;
+  setNativeDiagnosticsContext(
+    context: CodegenTypes.UnsafeObject | null
+  ): CodegenTypes.UnsafeObject;
   nativeDiagnosticsStatus(): CodegenTypes.UnsafeObject;
 }