@logbrew/react-native 0.1.22 → 0.1.24

package/ios/LBRNFatalStoreModule.mm

@@ -1,11 +1,12 @@
 #import "LBRNFatalStoreModule.h"
 
 #import "LBRNEventRecordStore.h"
-#import "LBRNFatalRecordStore.h"
 #import "LBRNPrivateStorage.h"
 
 #import <CommonCrypto/CommonDigest.h>
+#import <Security/SecRandom.h>
 #import <TargetConditionals.h>
+#import <math.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <LogBrewReactNativeSpec/LogBrewReactNativeSpec.h>
@@ -61,39 +62,10 @@ static NSString *LBRNQueueHash(NSString *queueKey)
     return value;
 }
 
-static NSDictionary *LBRNNormalizeRecord(NSDictionary *record)
-{
-    if (![record isKindOfClass:[NSDictionary class]]) {
-        return @{};
-    }
-    id framesValue = record[@"stackFrames"];
-    if (![framesValue isKindOfClass:[NSArray class]]) {
-        return record;
-    }
-    NSMutableArray *frames = [NSMutableArray arrayWithCapacity:[framesValue count]];
-    for (id value in framesValue) {
-        if (![value isKindOfClass:[NSDictionary class]]) {
-            return record;
-        }
-        NSMutableDictionary *frame = [value mutableCopy];
-        NSString *filename = frame[@"filename"];
-        if ([filename isKindOfClass:[NSString class]]
-            && [filename hasPrefix:@"/"]
-            && [[filename substringFromIndex:1] rangeOfString:@"/"].location == NSNotFound) {
-            frame[@"filename"] = [filename substringFromIndex:1];
-        }
-        [frames addObject:frame];
-    }
-    NSMutableDictionary *normalized = [record mutableCopy];
-    normalized[@"stackFrames"] = frames;
-    return normalized;
-}
-
 @interface LBRNFatalStoreModule ()
 #ifdef RCT_NEW_ARCH_ENABLED
 <NativeLogBrewFatalStoreSpec>
 #endif
-@property (nonatomic, nullable) LBRNFatalRecordStore *store;
 @property (nonatomic, nullable) NSURL *eventStoreParentURL;
 @property (nonatomic) NSMutableDictionary<NSString *, LBRNEventRecordStore *> *eventStores;
 @end
@@ -117,19 +89,28 @@ RCT_EXPORT_MODULE(LogBrewFatalStore)
         if (baseURL != nil && LBRNPreparePrivateRootDirectory(baseURL)) {
             _eventStoreParentURL = baseURL;
             _eventStores = [NSMutableDictionary dictionary];
-            NSURL *directoryURL = [baseURL URLByAppendingPathComponent:@"LogBrewFatalJS"
-                                                           isDirectory:YES];
-            LBRNFatalDirectoryPreparation directoryPreparation = ^BOOL(NSURL *preparedURL) {
-              return LBRNPrepareProtectedDirectory(preparedURL);
-            };
-            _store = [[LBRNFatalRecordStore alloc]
-                initWithDirectoryURL:directoryURL
-                directoryPreparation:directoryPreparation];
         }
     }
     return self;
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(secureRandomHex:(double)length)
+{
+    if (!isfinite(length) || length < 1 || length > 64 || floor(length) != length) {
+        return @"";
+    }
+    uint8_t bytes[64];
+    NSUInteger byteCount = (NSUInteger)length;
+    if (SecRandomCopyBytes(kSecRandomDefault, byteCount, bytes) != errSecSuccess) {
+        return @"";
+    }
+    NSMutableString *output = [NSMutableString stringWithCapacity:byteCount * 2];
+    for (NSUInteger index = 0; index < byteCount; index += 1) {
+        [output appendFormat:@"%02x", bytes[index]];
+    }
+    return output;
+}
+
 - (nullable LBRNEventRecordStore *)eventStoreForQueueKey:(NSString *)queueKey
 {
     NSString *queueHash = LBRNQueueHash(queueKey);
@@ -154,54 +135,6 @@ RCT_EXPORT_MODULE(LogBrewFatalStore)
     }
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(writeFatalRecord:(NSDictionary *)record)
-{
-    if (self.store == nil) {
-        return LBRNStorageError();
-    }
-    @try {
-        return [self.store writeRecord:LBRNNormalizeRecord(record)];
-    } @catch (__unused NSException *exception) {
-        return LBRNStorageError();
-    }
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(readFatalRecord)
-{
-    if (self.store == nil) {
-        return LBRNStorageError();
-    }
-    @try {
-        return [self.store readRecord];
-    } @catch (__unused NSException *exception) {
-        return LBRNStorageError();
-    }
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(acknowledgeFatalRecord:(NSString *)recordId)
-{
-    if (self.store == nil || ![recordId isKindOfClass:[NSString class]]) {
-        return LBRNStorageError();
-    }
-    @try {
-        return [self.store acknowledgeRecordId:recordId];
-    } @catch (__unused NSException *exception) {
-        return LBRNStorageError();
-    }
-}
-
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(discardFatalRecord)
-{
-    if (self.store == nil) {
-        return LBRNStorageError();
-    }
-    @try {
-        return [self.store discardRecord];
-    } @catch (__unused NSException *exception) {
-        return LBRNStorageError();
-    }
-}
-
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(loadEventRecords:(NSString *)queueKey)
 {
     LBRNEventRecordStore *eventStore = [self eventStoreForQueueKey:queueKey];
@@ -281,6 +214,21 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(closeEventStore:(NSString *)queueKey)
     }
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(installAndroidDiagnostics:(NSDictionary *)configuration)
+{
+    return @{ @"status" : @"error", @"code" : @"unsupported_platform" };
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(androidDiagnosticsStatus)
+{
+    return @{ @"status" : @"not_installed", @"pending" : @0 };
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(uninstallAndroidDiagnostics)
+{
+    return @{ @"status" : @"not_installed", @"pending" : @0 };
+}
+
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@logbrew/react-native",
-  "version": "0.1.22",
-  "description": "React Native offline delivery, Apple native diagnostics, screen, error, trace, action, and network timeline helpers for LogBrew.",
+  "version": "0.1.24",
+  "description": "React Native offline delivery, native diagnostics, screen, error, trace, action, and network timeline helpers for LogBrew.",
   "type": "module",
   "main": "./index.cjs",
   "module": "./index.js",
@@ -126,6 +126,17 @@
       },
       "default": "./apple-native-diagnostics.js"
     },
+    "./android-native-diagnostics": {
+      "react-native": {
+        "types": "./android-native-diagnostics.d.ts",
+        "default": "./android-native-diagnostics.js"
+      },
+      "import": {
+        "types": "./android-native-diagnostics.d.ts",
+        "default": "./android-native-diagnostics.js"
+      },
+      "default": "./android-native-diagnostics.js"
+    },
     "./expo": {
       "import": {
         "types": "./expo.d.ts",
@@ -185,16 +196,17 @@
     "metro.d.cts",
     "apple-native-diagnostics.js",
     "apple-native-diagnostics.d.ts",
+    "android-native-diagnostics.js",
+    "android-native-diagnostics.d.ts",
     "expo.cjs",
     "expo.js",
     "expo.d.ts",
     "LogBrewReactNative.podspec",
     "android/build.gradle",
+    "android/CMakeLists.txt",
     "android/src/main",
     "android/src/oldarch",
     "android/src/newarch",
-    "ios/LBRNFatalRecordStore.h",
-    "ios/LBRNFatalRecordStore.m",
     "ios/LBRNFatalStoreModule.h",
     "ios/LBRNFatalStoreModule.mm",
     "ios/LBRNPrivateStorage.h",
@@ -251,6 +263,6 @@
     }
   },
   "scripts": {
-    "test": "node scripts/sync-apple-native-sources.mjs --check && node --check index.js && node --check index.cjs && node --check index.native.js && node --check apple-native-diagnostics.js && node --check expo.js && node --check expo.cjs && node --check apollo.js && node --check apollo.cjs && node --check instrumentation.js && node --check instrumentation.cjs && node --check lifecycle.js && node --check lifecycle.cjs && node --check global-errors.js && node --check global-errors.native.js && node --check global-errors.cjs && node --check promise-rejections.cjs && node --check fatal-replay.cjs && node --check metadata.js && node --check metadata.cjs && node --check native-bridge.js && node --check native-bridge.cjs && node --check resource-fetch.js && node --check resource-fetch.cjs && node --check release-artifacts.js && node --check release-artifacts.cjs && node --check metro.js && node --check metro.cjs && node --check examples/index.mjs && node --check examples/apollo-link-spans.mjs && node --check examples/instrumentation-kit.mjs && node --check examples/lifecycle-spans.mjs && node --check examples/native-bridge-scope.mjs && node --check examples/navigation-resource-spans.mjs && node --check examples/readme-example.mjs && node --check examples/real-user-smoke.mjs && node --check examples/resource-fetch-spans.mjs && node --check examples/trace-correlation.mjs && node --test"
+    "test": "node scripts/sync-apple-native-sources.mjs --check && node --check index.js && node --check index.cjs && node --check index.native.js && node --check apple-native-diagnostics.js && node --check android-native-diagnostics.js && node --check expo.js && node --check expo.cjs && node --check apollo.js && node --check apollo.cjs && node --check instrumentation.js && node --check instrumentation.cjs && node --check lifecycle.js && node --check lifecycle.cjs && node --check global-errors.js && node --check global-errors.native.js && node --check global-errors.cjs && node --check promise-rejections.cjs && node --check fatal-replay.cjs && node --check metadata.js && node --check metadata.cjs && node --check native-bridge.js && node --check native-bridge.cjs && node --check resource-fetch.js && node --check resource-fetch.cjs && node --check release-artifacts.js && node --check release-artifacts.cjs && node --check metro.js && node --check metro.cjs && node --check examples/index.mjs && node --check examples/apollo-link-spans.mjs && node --check examples/instrumentation-kit.mjs && node --check examples/lifecycle-spans.mjs && node --check examples/native-bridge-scope.mjs && node --check examples/navigation-resource-spans.mjs && node --check examples/readme-example.mjs && node --check examples/real-user-smoke.mjs && node --check examples/resource-fetch-spans.mjs && node --check examples/trace-correlation.mjs && node --test"
   }
 }

package/persistent-delivery.native.js

@@ -29,10 +29,10 @@ export function resolveReactNativePersistentEventStore({
         "eventStore and persistentQueue are mutually exclusive"
       );
     }
-    return { eventStore, abort() {}, release() {} };
+    return { eventStore, durable: false, abort() {}, release() {} };
   }
   if (persistentQueue === "disabled") {
-    return { eventStore: undefined, abort() {}, release() {} };
+    return { eventStore: undefined, durable: false, abort() {}, release() {} };
   }
 
   const nativeStore = defaultNativeStore();
@@ -43,7 +43,7 @@ export function resolveReactNativePersistentEventStore({
         "React Native persistent queue requires the linked LogBrew native module"
       );
     }
-    return { eventStore: undefined, abort() {}, release() {} };
+    return { eventStore: undefined, durable: false, abort() {}, release() {} };
   }
   validateNativeQueueLimits({ maxQueueBytes, maxQueueSize });
   if (ACTIVE_QUEUE_KEYS.has(authKey)) {
@@ -63,6 +63,7 @@ export function resolveReactNativePersistentEventStore({
   };
   const nativeEventStore = createNativeEventStore(nativeStore, authKey, release);
   return {
+    durable: true,
     eventStore: nativeEventStore,
     abort() {
       try {