Feat/use rust and jni on mac

.github/workflows/build.yaml

@@ -13,12 +13,12 @@ jobs:
     strategy:
       matrix:
         os:
-          - image: ubuntu-latest
-          - image: macos-latest
-            mac-backend: jdk
+          #- image: ubuntu-latest
+          #- image: macos-latest
+            #mac-backend: jdk
           - image: macos-latest
             mac-backend: fsevents
-          - image: windows-latest
+          #- image: windows-latest
         jdk: [11, 17, 21]
 
       fail-fast: false
@@ -32,9 +32,12 @@ jobs:
           java-version: ${{ matrix.jdk }}
           distribution: 'temurin'
           cache: 'maven'
+      #- uses: actions-rust-lang/setup-rust-toolchain@v1
+      - run: ./update-rust-jni-libs.sh
+        if: ${{ matrix.os.image == 'macos-latest' }}
 
       - name: test
-        run: mvn -B clean test "-Dwatch.mac.backend=${{ matrix.os.mac-backend }}"
+        run: mvn -B clean test "-Dwatch.mac.backend=${{ matrix.os.mac-backend }}" -Dtest=Basic
         env:
           DELAY_FACTOR: 3
 

.gitignore

@@ -27,4 +27,4 @@ replay_pid*
 
 # release plugin state files
 /pom.xml.releaseBackup
-/release.properties
+/release.properties

pom.xml

@@ -81,6 +81,14 @@
   </properties>
 
   <build>
+      <resources>
+          <resource>
+              <directory>src/main/resources</directory>
+              <excludes>
+                <exclude>src/main/rust/**/*.*</exclude>
+              </excludes>
+          </resource>
+      </resources>
     <plugins>
       <plugin> <!-- configure java compiler -->
         <groupId>org.apache.maven.plugins</groupId>

src/main/java/engineering/swat/watch/impl/mac/jni/FileSystemEvents.java

@@ -0,0 +1,54 @@
+package engineering.swat.watch.impl.mac.jni;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.WatchEvent;
+import java.util.List;
+
+/**
+ * Start a recursive watch on a folder
+ */
+public class FileSystemEvents implements Closeable {
+    static {
+        NativeLibrary.load();
+    }
+
+    private native long start(String path, Runnable signal);
+    private native void stop(long watchId);
+    private native boolean anyEvents(long watchId);
+    private native List<WatchEvent<?>> pollEvents(long watchId);
+
+
+    private volatile boolean closed = false;
+    private final long activeWatch;
+
+    public FileSystemEvents(Path path, Runnable notifyNewEvents) {
+        activeWatch = start(path.toString(), notifyNewEvents);
+    }
+
+    public boolean anyEvents() throws IOException {
+        if (closed) {
+            throw new IOException("Watch is already closed");
+        }
+        return anyEvents(activeWatch);
+    }
+
+    public List<WatchEvent<?>> pollEvents() throws IOException {
+        if (closed) {
+            throw new IOException("Watch is already closed");
+        }
+        return pollEvents(activeWatch);
+    }
+
+    @Override
+    public void close() {
+        if (closed) {
+            return;
+        }
+        closed = true;
+        stop(activeWatch);
+    }
+
+
+}

src/main/java/engineering/swat/watch/impl/mac/jni/NativeLibrary.java

@@ -0,0 +1,73 @@
+package engineering.swat.watch.impl.mac.jni;
+
+import static java.nio.file.attribute.PosixFilePermission.*;
+
+import java.nio.file.Files;
+import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.FileAttribute;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.Set;
+
+class NativeLibrary {
+    private static boolean isMac() {
+        var os = System.getProperty("os.name");
+        return os != null && (os.toLowerCase().contains("mac") || os.toLowerCase().contains("darwin"));
+
+    }
+
+    private static boolean isAarch64() {
+        var arch = System.getProperty("os.arch");
+        return arch != null && arch.toLowerCase().equals("aarch64");
+    }
+
+    private static volatile boolean loaded = false;
+    public static void load() {
+        if (loaded) {
+            return;
+        }
+        try {
+            if (!isMac()) {
+                throw new IllegalStateException("We should not be loading FileSystemEvents api on non mac machines");
+            }
+            String path = "/engineering/swat/watch/jni/";
+            if (isAarch64()) {
+                path += "macos-aarch64/";
+            }
+            else {
+                path += "macos-x64/";
+            }
+            path += "librust_fsevents_jni.dylib";
+
+            loadLibrary(path);
+        } finally {
+            loaded = true;
+        }
+    }
+
+    private static FileAttribute<Set<PosixFilePermission>> PRIVATE_FILE = PosixFilePermissions.asFileAttribute(Set.of(OWNER_READ, OWNER_WRITE , OWNER_EXECUTE));
+
+    private static void loadLibrary(String path) {
+        try {
+            var localFile = FileSystemEvents.class.getResource(path);
+            if (localFile.getProtocol().equals("file")) {
+                System.load(localFile.getPath());
+                return;
+            }
+            // in most cases the file is inside of a jar
+            // so we have to copy it out and load that file instead
+            var localCopy = Files.createTempFile("watch", ".dylib"/*  , PRIVATE_FILE*/);
+            localCopy.toFile().deleteOnExit();
+            try (var libStream = FileSystemEvents.class.getResourceAsStream(path)) {
+                try (var writer = Files.newOutputStream(localCopy, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE)) {
+                    libStream.transferTo(writer);
+                }
+                System.load(localCopy.toString());
+            }
+        }
+        catch (Throwable e) {
+            throw new IllegalStateException("We could not load: " + path, e);
+        }
+    }
+
+}

src/main/resources/.gitignore

@@ -0,0 +1 @@
+*.dylib

src/main/rust/.gitignore

@@ -0,0 +1,7 @@
+/target
+/debug
+**/*.rs.bk
+*.pdb
+*.log
+*.d
+*.dylib