Rust rewrite

README.md

@@ -48,9 +48,7 @@ You can find us on [Matrix](https://matrix.to/#/#pipewire-screenaudio:matrix.org
 
 #### Requirements
 
-- gawk
-- hexdump
-- jq
+- cargo
 - pipewire
 
 ```bash
@@ -82,6 +80,10 @@ bash install.sh
     ```bash
     bash native/connector/cli.sh SetSharingNode '{ "micId": 100, "node": 200 }'
     ```
+  - **Environment:**
+    ```bash
+    DEBUG=1 # Set to enable verbose logging
+    ```
 
 ## Known Problems
 

flake.nix

@@ -4,49 +4,38 @@
 
   outputs = { self, nixpkgs, }:
     let
+      forAllSystems = nixpkgs.lib.genAttrs systems;
       pkgsFor = nixpkgs.legacyPackages;
+      read = builtins.readFile;
       systems = [ "aarch64-linux" "i686-linux" "x86_64-linux" ];
-      forAllSystems = nixpkgs.lib.genAttrs systems;
+      write = builtins.toFile;
+
       mkDate = longDate:
         with builtins;
         (concatStringsSep "-" [
           (substring 0 4 longDate)
           (substring 4 2 longDate)
           (substring 6 2 longDate)
         ]);
+
+      firefoxJSON = write "firefox.json" (read native/native-messaging-hosts/firefox.json);
+      connectorPath = "lib/mozilla/native-messaging-hosts/com.icedborn.pipewirescreenaudioconnector.json";
     in {
       packages = forAllSystems (system: {
         default = with pkgsFor.${system};
-          stdenv.mkDerivation {
+          rustPlatform.buildRustPackage {
             name = "pipewire-screenaudio";
             version = mkDate (self.lastModifiedDate or "19700101") + "_"
               + (self.shortRev or "dirty");
 
-            src = self;
-
-            buildInputs = [ gawk hexdump jq pipewire ];
-
-            installPhase = ''
-              runHook preInstall
-
-              # Replace jq with its absolute path
-              substituteInPlace native/connector/virtmic.sh --replace jq ${pkgs.jq}/bin/jq
-              substituteInPlace native/connector/pipewire-screen-audio-connector.sh --replace jq ${pkgs.jq}/bin/jq
-              substituteInPlace native/connector/connect-and-monitor.sh --replace jq ${pkgs.jq}/bin/jq
-              substituteInPlace native/connector/util.sh --replace jq ${pkgs.jq}/bin/jq
-
-              # Install files
-              mkdir -p $out/lib/out
-              install -Dm755 native/connector/pipewire-screen-audio-connector.sh $out/lib/connector/pipewire-screen-audio-connector.sh
-              install -Dm755 native/connector/virtmic.sh $out/lib/connector/virtmic.sh
-              install -Dm755 native/connector/connect-and-monitor.sh $out/lib/connector/connect-and-monitor.sh
-              install -Dm755 native/connector/util.sh $out/lib/connector/util.sh
+            src = ./native/connector-rs;
+            buildInputs = [ pipewire ];
+            cargoHash = "sha256-+mLsrKt7WRyO++B0rFoRb/JodBPxhZCdg2qZguKzqUI=";
 
+            postInstall = ''
               # Firefox manifest
-              substituteInPlace native/native-messaging-hosts/firefox.json --replace /usr/lib/pipewire-screenaudio $out/lib
-              install -Dm644 native/native-messaging-hosts/firefox.json $out/lib/mozilla/native-messaging-hosts/com.icedborn.pipewirescreenaudioconnector.json
-
-              runHook postInstall
+              install -Dm644 ${firefoxJSON} "$out/${connectorPath}"
+              substituteInPlace "$out/${connectorPath}" --replace "/usr/lib/pipewire-screenaudio/connector-rs/target/debug" "$out/bin"
             '';
           };
       });

install.sh

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 
+set -e
+
 projectRoot="$( cd -- "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 
-mkdir -p ~/.mozilla/native-messaging-hosts
+( cd $projectRoot/native/connector-rs ; cargo build )
 
+mkdir -p ~/.mozilla/native-messaging-hosts
 sed "s|/usr/lib/pipewire-screenaudio|$projectRoot/native|g" $projectRoot/native/native-messaging-hosts/firefox.json > ~/.mozilla/native-messaging-hosts/com.icedborn.pipewirescreenaudioconnector.json
-

native/connector-rs/.gitignore

@@ -0,0 +1,10 @@
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb