@logbrew/react-native 0.1.4 → 0.1.5

package/android/src/main/java/co/logbrew/reactnative/AndroidParentDirectorySync.java

@@ -0,0 +1,61 @@
+package co.logbrew.reactnative;
+
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.OsConstants;
+import java.io.File;
+import java.io.FileDescriptor;
+
+final class AndroidParentDirectorySync implements FatalRecordStore.ParentDirectorySync {
+  @Override
+  public FatalRecordStore.ParentDirectorySyncResult sync(File directory) {
+    FileDescriptor descriptor;
+    try {
+      descriptor =
+          Os.open(
+              directory.getAbsolutePath(),
+              OsConstants.O_RDONLY | OsConstants.O_CLOEXEC | OsConstants.O_NOFOLLOW,
+              0);
+    } catch (ErrnoException | RuntimeException error) {
+      return FatalRecordStore.ParentDirectorySyncResult.FAILED;
+    }
+
+    FatalRecordStore.ParentDirectorySyncResult result;
+    try {
+      if (!OsConstants.S_ISDIR(Os.fstat(descriptor).st_mode)) {
+        result = FatalRecordStore.ParentDirectorySyncResult.FAILED;
+      } else {
+        result = syncDescriptor(descriptor);
+      }
+    } catch (ErrnoException | RuntimeException error) {
+      result = FatalRecordStore.ParentDirectorySyncResult.FAILED;
+    }
+
+    try {
+      Os.close(descriptor);
+    } catch (ErrnoException | RuntimeException error) {
+      return FatalRecordStore.ParentDirectorySyncResult.FAILED;
+    }
+    return result;
+  }
+
+  private static FatalRecordStore.ParentDirectorySyncResult syncDescriptor(
+      FileDescriptor descriptor) {
+    try {
+      Os.fsync(descriptor);
+      return FatalRecordStore.ParentDirectorySyncResult.SYNCHRONIZED;
+    } catch (ErrnoException error) {
+      return unsupportedDirectorySync(error.errno)
+          ? FatalRecordStore.ParentDirectorySyncResult.UNSUPPORTED
+          : FatalRecordStore.ParentDirectorySyncResult.FAILED;
+    } catch (RuntimeException error) {
+      return FatalRecordStore.ParentDirectorySyncResult.FAILED;
+    }
+  }
+
+  private static boolean unsupportedDirectorySync(int errno) {
+    return errno == OsConstants.EINVAL
+        || errno == OsConstants.ENOTSUP
+        || errno == OsConstants.EOPNOTSUPP;
+  }
+}

package/android/src/main/java/co/logbrew/reactnative/FatalRecordStore.java

@@ -6,12 +6,9 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.EOFException;
 import java.io.File;
-import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -49,15 +46,23 @@ final class FatalRecordStore {
                   "SyntaxError",
                   "TypeError",
                   "URIError")));
+  private static final ParentDirectorySync UNSUPPORTED_PARENT_DIRECTORY_SYNC =
+      directory -> ParentDirectorySyncResult.UNSUPPORTED;
 
   private final File directory;
   private final File recordFile;
   private final File temporaryFile;
+  private final ParentDirectorySync parentDirectorySync;
 
   FatalRecordStore(File directory) {
+    this(directory, UNSUPPORTED_PARENT_DIRECTORY_SYNC);
+  }
+
+  FatalRecordStore(File directory, ParentDirectorySync parentDirectorySync) {
     this.directory = resolveCanonicalParent(directory);
     this.recordFile = new File(this.directory, RECORD_FILE_NAME);
     this.temporaryFile = new File(this.directory, TEMP_FILE_NAME);
+    this.parentDirectorySync = parentDirectorySync;
   }
 
   synchronized Result write(Record incoming) {
@@ -525,35 +530,17 @@ final class FatalRecordStore {
   }
 
   private boolean syncParentDirectory() {
-    try {
-      Class<?> constants = Class.forName("android.system.OsConstants");
-      int flags =
-          intField(constants, "O_RDONLY")
-              | intField(constants, "O_DIRECTORY")
-              | intField(constants, "O_CLOEXEC");
-      Class<?> os = Class.forName("android.system.Os");
-      Method open = os.getMethod("open", String.class, int.class, int.class);
-      Method fsync = os.getMethod("fsync", FileDescriptor.class);
-      Method close = os.getMethod("close", FileDescriptor.class);
-      FileDescriptor descriptor =
-          (FileDescriptor) open.invoke(null, directory.getAbsolutePath(), flags, 0);
-      try {
-        fsync.invoke(null, descriptor);
-      } finally {
-        close.invoke(null, descriptor);
-      }
-      return true;
-    } catch (ClassNotFoundException unavailableOutsideAndroid) {
-      return true;
-    } catch (ReflectiveOperationException | RuntimeException error) {
-      return false;
-    }
+    return parentDirectorySync.sync(directory) != ParentDirectorySyncResult.FAILED;
+  }
+
+  interface ParentDirectorySync {
+    ParentDirectorySyncResult sync(File directory);
   }
 
-  private static int intField(Class<?> owner, String name)
-      throws ReflectiveOperationException {
-    Field field = owner.getField(name);
-    return field.getInt(null);
+  enum ParentDirectorySyncResult {
+    SYNCHRONIZED,
+    UNSUPPORTED,
+    FAILED
   }
 
   static final class Frame {

package/android/src/main/java/co/logbrew/reactnative/FatalStoreModuleImpl.java

@@ -35,7 +35,12 @@ final class FatalStoreModuleImpl {
 
   FatalStoreModuleImpl(ReactApplicationContext context) {
     File root = context.getNoBackupFilesDir();
-    store = root == null ? null : new FatalRecordStore(new File(root, "logbrew-fatal-js"));
+    store =
+        root == null
+            ? null
+            : new FatalRecordStore(
+                new File(root, "logbrew-fatal-js"),
+                new AndroidParentDirectorySync());
   }
 
   WritableMap writeFatalRecord(ReadableMap input) {

package/package.json

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