@signalapp/ringrtc 2.59.0 → 2.59.3

package/dist/acknowledgments.md

@@ -669,7 +669,7 @@ For more information on this, and how to apply and follow the GNU AGPL, see
 
 ```
 
-## libsignal-account-keys 0.1.0, libsignal-core 0.1.0, mrp 2.59.0, protobuf 2.59.0, ringrtc 2.59.0, regex-aot 0.1.0, partial-default-derive 0.1.0
+## libsignal-account-keys 0.1.0, libsignal-core 0.1.0, mrp 2.59.3, protobuf 2.59.3, ringrtc 2.59.3, regex-aot 0.1.0, partial-default-derive 0.1.0
 
 ```
 GNU AFFERO GENERAL PUBLIC LICENSE

package/dist/bin/virtual_audio.sh

@@ -8,7 +8,7 @@ set -eou pipefail
 
 usage()
 {
-  echo "usage: $0  [--setup|--teardown|--play|--stop] [--input-source <name>] [--output-sink <name>] [--input-file <path>] [--input-loops <count>] [--output-file <path>] [--start-pipewire-pulse]
+  echo "usage: $0  [--setup|--teardown|--play|--stop] [--input-source <name>] [--output-sink <name>] [--input-file <path>] [--input-loops <count>] [--output-file <path>] [--blackhole-path <path>]
     where:
         --setup: Set up the specified devices
         --teardown: Tear down the specified devices.
@@ -20,13 +20,14 @@ usage()
         --input-file: The name of the file to play to your application (should be a .wav).
         --input-loops: Optional. The number of times to loop |input|. Default 1.
         --output-file: The name of the file to record your application to (should be a .wav).
+        --blackhole-path: Optional, macOS only. Path to a checkout of the BlackHole github repo.
+            If unspecified, setup will create a temp dir and clone to there.
 
-        --start-pipewire-pulse: Optional, linux only. Assume that there is no pulse server running and start one.
         -h, --help: Display this usage text.
 
    Examples:
-      # Setup 'my_spiffy_input_source' as an input and 'my_spiffy_output_sink' as an out, and start pipewire if needed.
-      $0 --setup --input-source my_spiffy_input_source --output-sink my_spiffy_output_sink --start-pipewire-pulse
+      # Setup 'my_spiffy_input_source' as an input and 'my_spiffy_output_sink' as an out
+      $0 --setup --input-source my_spiffy_input_source --output-sink my_spiffy_output_sink
       # Start playing foo.wav to my_spiffy_input_source
       $0 --play --input-source my_spiffy_input_source --output-sink my_spiffy_output_sink --input-file foo.wav
       # Stop playing to my_spiffy_input_source
@@ -44,7 +45,7 @@ OUTPUT_SINK=
 INPUT_FILE=
 INPUT_LOOPS=1
 OUTPUT_FILE=
-START_PIPEWIRE_PULSE=
+BLACKHOLE_PATH=
 
 while [[ $# -gt 0 ]]; do
   case $1 in
@@ -80,8 +81,9 @@ while [[ $# -gt 0 ]]; do
       INPUT_LOOPS="$2"
       shift
       ;;
-    --start-pipewire-pulse )
-      START_PIPEWIRE_PULSE=y
+    --blackhole-path )
+      BLACKHOLE_PATH="$2"
+      shift
       ;;
     -h | --help )
       usage
@@ -95,18 +97,74 @@ while [[ $# -gt 0 ]]; do
   shift
 done
 
-start_pipewire_pulse()
+setup_macos()
 {
-  if pactl info | grep -q "Server Name: PulseAudio (on PipeWire"; then
-    echo "not re-initializing pulse/pipewire"
+  CLEANUP_GIT=
+  if [ -n "$BLACKHOLE_PATH" ]; then
+    cd "$BLACKHOLE_PATH"
   else
-    echo "Starting a new pipewire, wireplumber, and pipewire-pulse"
-    pipewire &
-    wireplumber &
-    pipewire-pulse &
+    BLACKHOLE_PATH=$(mktemp -d -t virtual_audio)
+    CLEANUP_GIT=1
+
+    cd "$BLACKHOLE_PATH"
+    git clone https://github.com/ExistentialAudio/BlackHole.git --revision=v0.6.1
+    cd BlackHole
+  fi
+
+  xcodebuild CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO \
+    -project BlackHole.xcodeproj -configuration Release -target BlackHole \
+    CONFIGURATION_BUILD_DIR=build \
+    GCC_PREPROCESSOR_DEFINITIONS='kNumber_Of_Channels=2 kDriver_Name=\"'"$INPUT_SOURCE"'\" kDevice_Name=\"'"$INPUT_SOURCE"'\"'
+  echo "Copying $INPUT_SOURCE driver to /Library/Audio/Plug-Ins/HAL: will require sudo"
+  sudo cp -r build/BlackHole.driver /Library/Audio/Plug-Ins/HAL/"$INPUT_SOURCE".driver
+
+  xcodebuild CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO \
+    -project BlackHole.xcodeproj -configuration Release -target BlackHole \
+    CONFIGURATION_BUILD_DIR=build \
+    GCC_PREPROCESSOR_DEFINITIONS='kNumber_Of_Channels=2 kDriver_Name=\"'"$OUTPUT_SINK"'\" kDevice_Name=\"'"$OUTPUT_SINK"'\"'
+  echo "Copying $OUTPUT_SINK driver to /Library/Audio/Plug-Ins/HAL: will require sudo"
+  sudo cp -r build/BlackHole.driver /Library/Audio/Plug-Ins/HAL/"$OUTPUT_SINK".driver
+
+  echo "Restarting coreaudiod; audio output may glitch"
+  sudo killall -9 coreaudiod
+
+  if [ -n "$CLEANUP_GIT" ]; then
+    echo "cleanup tempdir $BLACKHOLE_PATH"
+    rm -fr "$BLACKHOLE_PATH"
+  fi
+}
+
+teardown_macos()
+{
+  echo "Removing $INPUT_SOURCE from install dir; will require sudo"
+  sudo rm -r /Library/Audio/Plug-Ins/HAL/"$INPUT_SOURCE".driver
+
+  echo "Removing $OUTPUT_SINK from install dir; will require sudo"
+  sudo rm -r /Library/Audio/Plug-Ins/HAL/"$OUTPUT_SINK".driver
+
+  echo "Restarting coreaudiod; audio output may glitch"
+  sudo killall -9 coreaudiod
+}
+
+play_macos()
+{
+  if [ -n "$INPUT_FILE" ] && [ -e "$INPUT_FILE" ]; then
+    # "repeat" is the number of times to repeat, not the total number of plays
+    nohup sox -q "$INPUT_FILE" -t coreaudio "$INPUT_SOURCE" repeat $((INPUT_LOOPS - 1)) &
+  fi
+  if [ -n "$OUTPUT_FILE" ]; then
+    nohup sox -q -t coreaudio "$OUTPUT_SINK" "$OUTPUT_FILE" &
   fi
 }
 
+stop_macos()
+{
+  # Kill the record process
+  pkill -f "sox.*${OUTPUT_SINK}" || true
+  # Kill the play process
+  pkill -f "sox.*${INPUT_SOURCE}" || true
+}
+
 setup_linux()
 {
   pactl load-module module-null-sink sink_name="${INPUT_SINK}" \
@@ -177,12 +235,26 @@ fi
 UNAME=$(uname)
 
 if [ "$UNAME" = "Darwin" ]; then
-  echo "macOS is not yet supported"
-  exit 1
-elif [ "$UNAME" = "Linux" ]; then
-  if [[ "$START_PIPEWIRE_PULSE" ]]; then
-    start_pipewire_pulse
+  if ! which -s sox ; then
+    echo "sox is required to play audio"
+    exit 1
+  fi
+  if [ "$TYPE" = "setup" ]; then
+    setup_macos
+  elif [ "$TYPE" = "teardown" ]; then
+    teardown_macos
+  elif [ "$TYPE" = "play" ]; then
+    if [ -z "$INPUT_FILE" ]; then
+      echo "--input-file was not specified with --play; assuming silence"
+    fi
+    if [ -z "$OUTPUT_FILE" ]; then
+      echo "--output-file was not specified with --play; will not record"
+    fi
+    play_macos
+  elif [ "$TYPE" = "stop" ]; then
+    stop_macos
   fi
+elif [ "$UNAME" = "Linux" ]; then
   if [ "$TYPE" = "setup" ]; then
     setup_linux
   elif [ "$TYPE" = "teardown" ]; then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalapp/ringrtc",
-  "version": "2.59.0",
+  "version": "2.59.3",
   "description": "Signal Messenger voice and video calling library.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,7 +28,7 @@
   },
   "config": {
     "prebuildUrl": "https://build-artifacts.signal.org/libraries/ringrtc-desktop-build-v${npm_package_version}.tar.gz",
-    "prebuildChecksum": "616acca5c1d1d6a12d0258a761880df80b937755db8ddebe0375e07a7c3e5a5f"
+    "prebuildChecksum": "b79c73ba870bbaad7dd1de621b6731b943eac036f00559ce660d9af97f5aae26"
   },
   "author": "",
   "license": "AGPL-3.0-only",