Switch to gRPC client in Swift app

- Deprecates old json-rpc system
- Add GRPC daemon over uds

.github/actions/build-for-testing/action.yml

@@ -27,7 +27,9 @@ runs:
         Apple/DerivedData
       key: ${{ runner.os }}-${{ inputs.scheme }}-${{ hashFiles('**/Package.resolved') }}
       restore-keys: |
+        ${{ runner.os }}-${{ inputs.scheme }}-${{ hashFiles('**/Package.resolved') }}
         ${{ runner.os }}-${{ inputs.scheme }}-
+        ${{ runner.os }}-
   - name: Build
     shell: bash
     working-directory: Apple

.github/actions/download-profiles/action.yml

@@ -0,0 +1,30 @@
+name: Download Provisioning Profiles
+inputs:
+  app-store-key:
+    description: App Store key in PEM PKCS#8 format
+    required: true
+  app-store-key-id:
+    description: App Store key ID
+    required: true
+  app-store-key-issuer-id:
+    description: App Store key issuer ID
+    required: true
+runs:
+  using: composite
+  steps:
+  - shell: bash
+    env:
+      FASTLANE_OPT_OUT_USAGE: 'YES'
+    run: |
+      APP_STORE_KEY=$(echo "${{ inputs.app-store-key }}" | jq -sR .)
+      cat << EOF > api-key.json
+      {
+        "key_id": "${{ inputs.app-store-key-id }}",
+        "issuer_id": "${{ inputs.app-store-key-issuer-id }}",
+        "key": $APP_STORE_KEY
+      }
+      EOF
+
+      fastlane sigh download_all --api_key_path api-key.json
+
+      rm -rf api-key.json

.github/actions/export/action.yml

@@ -12,11 +12,8 @@ inputs:
   archive-path:
     description: Xcode archive path
     required: true
-  destination:
-    description: The Xcode export destination. This can either be "export" or "upload"
-    required: true
-  method:
-    description: The Xcode export method. This can be one of app-store, validation, ad-hoc, package, enterprise, development, developer-id, or mac-application.
+  export-options:
+    description: The export options in JSON format
     required: true
   export-path:
     description: The path to export the archive to
@@ -29,8 +26,7 @@ runs:
     run: |
       echo "${{ inputs.app-store-key }}" > AuthKey_${{ inputs.app-store-key-id }}.p8
 
-      echo '{"destination":"${{ inputs.destination }}","method":"${{ inputs.method }}"}' \
-        | plutil -convert xml1 -o ExportOptions.plist -
+      echo '${{ inputs.export-options }}' | plutil -convert xml1 -o ExportOptions.plist -
 
       xcodebuild \
         -exportArchive \

.github/actions/notarize/action.yml

@@ -9,12 +9,6 @@ inputs:
   app-store-key-issuer-id:
     description: App Store key issuer ID
     required: true
-  archive-path:
-    description: Xcode archive path
-    required: true
-  export-path:
-    description: The path to export the archive to
-    required: true
 runs:
   using: composite
   steps:
@@ -24,28 +18,8 @@ runs:
     run: |
       echo "${{ inputs.app-store-key }}" > AuthKey_${{ inputs.app-store-key-id }}.p8
 
-      echo '{"destination":"export","method":"developer-id"}' \
-        | plutil -convert xml1 -o ExportOptions.plist -
+      ditto -c -k --keepParent Release/Burrow.app Upload.zip
+      xcrun notarytool submit --wait --issuer ${{ inputs.app-store-key-issuer-id }} --key-id ${{ inputs.app-store-key-id }} --key "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" Upload.zip
+      xcrun stapler staple Release/Burrow.app
 
-      xcodebuild -exportArchive \
-        -allowProvisioningUpdates \
-        -allowProvisioningDeviceRegistration \
-        -skipPackagePluginValidation \
-        -skipMacroValidation \
-        -onlyUsePackageVersionsFromResolvedFile \
-        -authenticationKeyID ${{ inputs.app-store-key-id }} \
-        -authenticationKeyIssuerID ${{ inputs.app-store-key-issuer-id }} \
-        -authenticationKeyPath "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" \
-        -archivePath Wallet.xcarchive \
-        -exportPath Release \
-        -exportOptionsPlist ExportOptions.plist
-
-      ditto -c -k --keepParent Release/Wallet.app Upload.zip
-      SUBMISSION_ID=$(xcrun notarytool submit --issuer ${{ inputs.app-store-key-issuer-id }} --key-id ${{ inputs.app-store-key-id }} --key "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" Upload.zip | awk '/ id:/ { print $2; exit }')
-
-      xcrun notarytool wait $SUBMISSION_ID --issuer ${{ inputs.app-store-key-issuer-id }} --key-id ${{ inputs.app-store-key-id }} --key "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8"
-      xcrun stapler staple Release/Wallet.app
-
-      aa archive -a lzma -b 8m -d Release -subdir Wallet.app -o Wallet.app.aar
-
-      rm -rf Upload.zip Release AuthKey_${{ inputs.app-store-key-id }}.p8 ExportOptions.plist
+      rm -rf AuthKey_${{ inputs.app-store-key-id }}.p8 Release

.github/workflows/build-appimage.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches:
     - "*"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   appimage:
     name: Build AppImage

.github/workflows/build-apple.yml

@@ -1,7 +1,7 @@
 name: Build Apple Apps
 on:
   push:
-    branches:  
+    branches:
     - main
   pull_request:
     branches:
@@ -24,7 +24,7 @@ jobs:
           rust-targets:
           - aarch64-apple-ios
         - scheme: App
-          destination: platform=iOS Simulator,OS=17.2,name=iPhone 15 Pro
+          destination: platform=iOS Simulator,OS=18.0,name=iPhone 15 Pro
           platform: iOS Simulator
           sdk-name: iphonesimulator
           rust-targets:
@@ -38,7 +38,8 @@ jobs:
           - x86_64-apple-darwin
           - aarch64-apple-darwin
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
+      PROTOC_PATH: /opt/homebrew/bin/protoc
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -54,6 +55,9 @@ jobs:
       uses: dtolnay/rust-toolchain@stable
       with:
         targets: ${{ join(matrix.rust-targets, ', ') }}
+    - name: Install Protobuf
+      shell: bash
+      run: brew install protobuf
     - name: Build
       id: build
       uses: ./.github/actions/build-for-testing
@@ -82,4 +86,4 @@ jobs:
         destination: ${{ matrix.destination }}
         test-plan: ${{ matrix.xcode-ui-test }}
         artifact-prefix: ui-tests-${{ matrix.sdk-name }}
-        check-name: Xcode UI Tests (${{ matrix.platform }})
+        check-name: Xcode UI Tests (${{ matrix.platform }})

.github/workflows/build-docker.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches:
     - "*"
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   build:
     name: Build Docker Image

.github/workflows/build-rpm.yml

@@ -5,7 +5,7 @@ jobs:
     name: Build RPM
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
     - name: Install RPM
       run: cargo install cargo-generate-rpm

.github/workflows/build-rust.yml

@@ -21,15 +21,21 @@ jobs:
           - x86_64-unknown-linux-gnu
           targets:
           - aarch64-unknown-linux-gnu
-        - os: macos-12
-          platform: macOS
+        - os: macos-13
+          platform: macOS (Intel)
+          xcode: /Applications/Xcode_15.2.app
           test-targets:
           - x86_64-apple-darwin
           targets:
+          - x86_64-apple-ios
+        - os: macos-14
+          platform: macOS
+          xcode: /Applications/Xcode_16.0.app
+          test-targets:
           - aarch64-apple-darwin
+          targets:
           - aarch64-apple-ios
           - aarch64-apple-ios-sim
-          - x86_64-apple-ios
         - os: windows-2022
           platform: Windows
           test-targets:
@@ -38,10 +44,11 @@ jobs:
           - aarch64-pc-windows-msvc
     runs-on: ${{ matrix.os }}
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+      DEVELOPER_DIR: ${{ matrix.xcode }}/Contents/Developer
       CARGO_INCREMENTAL: 0
       CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
       RUST_BACKTRACE: short
+      PROTOC_VERSION: 3.25.1
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -54,10 +61,14 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y ${{ join(matrix.packages, ' ') }}
-    - name: Install Windows Deps
+    - name: Configure LLVM
       if: matrix.os == 'windows-2022'
       shell: bash
       run: echo "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\Llvm\x64\bin" >> $GITHUB_PATH
+    - name: Install protoc
+      uses: taiki-e/install-action@v2
+      with:
+        tool: protoc@${{ env.PROTOC_VERSION }}
     - name: Install Rust
       uses: dtolnay/rust-toolchain@stable
       with:
@@ -71,4 +82,4 @@ jobs:
       run: cargo build --verbose --workspace --all-features --target ${{ join(matrix.targets, ' --target ') }} --target ${{ join(matrix.test-targets, ' --target ') }}
     - name: Test
       shell: bash
-      run: cargo test --verbose --workspace --all-features --target ${{ join(matrix.test-targets, ' --target ') }}
+      run: cargo test --verbose --workspace --all-features --target ${{ join(matrix.test-targets, ' --target ') }}

.github/workflows/lint-swift.yml

@@ -13,4 +13,4 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Lint
-      run: swiftlint lint --reporter github-actions-logging
+      run: swiftlint lint --strict --reporter github-actions-logging

.github/workflows/release-appimage.yml

@@ -1,29 +0,0 @@
-name: Release (AppImage)
-on:
-  release:
-    types:
-    - created
-jobs:
-  appimage:
-    name: Build AppImage
-    runs-on: ubuntu-latest
-    container: docker
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-    - name: Build
-      run: |
-        docker build -t appimage-builder . -f burrow-gtk/build-aux/Dockerfile
-        docker create --name temp appimage-builder
-        docker cp temp:/app/burrow-gtk/build-appimage/Burrow-x86_64.AppImage .
-        docker rm temp
-    - name: Upload to GitHub
-      uses: SierraSoftworks/gh-releases@v1.0.7
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        release_tag: ${{ github.ref_name }}
-        overwrite: 'true'
-        files: |
-          Burrow-x86_64.AppImage

.github/workflows/release-apple.yml

@@ -13,17 +13,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - destination: generic/platform=iOS
-          platform: iOS
+        - platform: iOS
           rust-targets:
           - aarch64-apple-ios
-        - destination: generic/platform=macOS
-          platform: macOS
+        - platform: macOS
           rust-targets:
           - x86_64-apple-darwin
           - aarch64-apple-darwin
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
+      PROTOC_PATH: /opt/homebrew/bin/protoc
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -34,41 +33,56 @@ jobs:
       with:
         certificate: ${{ secrets.DEVELOPER_CERT }}
         password: ${{ secrets.DEVELOPER_CERT_PASSWORD }}
+    - name: Download Provisioning Profiles
+      uses: ./.github/actions/download-profiles
+      with:
+        app-store-key: ${{ secrets.APPSTORE_KEY }}
+        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
+        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
+    - name: Install Provisioning Profiles
+      shell: bash
+      run: |
+        mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles/
+        cp -f Apple/Profiles/* ~/Library/MobileDevice/Provisioning\ Profiles/
     - name: Install Rust
       uses: dtolnay/rust-toolchain@stable
       with:
         targets: ${{ join(matrix.rust-targets, ', ') }}
-    - name: Configure Version
+    - name: Install Protobuf
       shell: bash
-      run: Tools/version.sh
+      run: brew install protobuf
+    - name: Configure Version
+      id: version
+      shell: bash
+      run: echo "BUILD_NUMBER=$(Tools/version.sh)" >> $GITHUB_OUTPUT
     - name: Archive
       uses: ./.github/actions/archive
       with:
         scheme: App
-        destination: ${{ matrix.destination }}
+        destination: generic/platform=${{ matrix.platform }}
         app-store-key: ${{ secrets.APPSTORE_KEY }}
         app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
         app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
         archive-path: Burrow.xcarchive
-    - name: Notarize (macOS)
+    - name: Export
+      uses: ./.github/actions/export
+      with:
+        method: ${{ matrix.platform == 'macOS' && 'developer-id' || 'ad-hoc' }}
+        destination: export
+        app-store-key: ${{ secrets.APPSTORE_KEY }}
+        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
+        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
+        archive-path: Burrow.xcarchive
+        export-options: |
+          {"teamID":"P6PV2R9443","destination":"export","method":"developer-id","provisioningProfiles":{"com.hackclub.burrow":"Burrow Developer ID","com.hackclub.burrow.network":"Burrow Network Developer ID"},"signingCertificate":"Developer ID Application","signingStyle":"manual"}
+        export-path: Release
+    - name: Notarize
       if: ${{ matrix.platform == 'macOS' }}
       uses: ./.github/actions/notarize
       with:
         app-store-key: ${{ secrets.APPSTORE_KEY }}
         app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
         app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
-        archive-path: Burrow.xcarchive
-    - name: Export IPA (iOS)
-      if: ${{ matrix.platform == 'iOS' }}
-      uses: ./.github/actions/export
-      with:
-        method: ad-hoc
-        destination: export
-        app-store-key: ${{ secrets.APPSTORE_KEY }}
-        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
-        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
-        archive-path: Burrow.xcarchive
-        export-path: Release
     - name: Compress (iOS)
       if: ${{ matrix.platform == 'iOS' }}
       shell: bash
@@ -83,33 +97,23 @@ jobs:
         aa archive -a lzma -b 8m -d Apple/Release -subdir Burrow.app -o Burrow.app.aar
         aa archive -a lzma -b 8m -d Apple -subdir Burrow.xcarchive -o Burrow-${{ matrix.platform }}.xcarchive.aar
         rm -rf Apple/Release
-    - name: Upload to GitHub (iOS)
-      if: ${{ matrix.platform == 'iOS' }}
+    - name: Upload to GitHub
       uses: SierraSoftworks/gh-releases@v1.0.7
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         release_tag: ${{ github.ref_name }}
         overwrite: 'true'
         files: |
-          Burrow.ipa 
-          Burrow-${{ matrix.platform }}.xcarchive.aar
-    - name: Upload to GitHub (macOS)
-      if: ${{ matrix.platform == 'macOS' }}
-      uses: SierraSoftworks/gh-releases@v1.0.7
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        release_tag: ${{ github.ref_name }}
-        overwrite: 'true'
-        files: |
-          Burrow.aap.aar
+          ${{ matrix.platform == 'macOS' && 'Burrow.aap.aar' || 'Burrow.ipa' }}
           Burrow-${{ matrix.platform }}.xcarchive.aar
     - name: Upload to App Store Connect
+      if: ${{ matrix.platform == 'iOS' }}
       uses: ./.github/actions/export
       with:
-        method: app-store
-        destination: upload
         app-store-key: ${{ secrets.APPSTORE_KEY }}
         app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
         app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
         archive-path: Burrow.xcarchive
+        export-options: |
+          {"method": "app-store", "destination": "upload"}
         export-path: Release

.github/workflows/release-if-needed.yaml

@@ -9,6 +9,8 @@ jobs:
   create:
     name: Create Release If Needed
     runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ github.token }}
     steps:
     - name: Checkout
       uses: actions/checkout@v4

.github/workflows/release-linux.yml

@@ -2,33 +2,28 @@ name: Release (Linux)
 on:
   release:
     types:
-      - created
+    - created
 jobs:
   appimage:
     name: Build AppImage
     runs-on: ubuntu-latest
     container: docker
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Build AppImage
-        run: |
-          docker build -t appimage-builder . -f burrow-gtk/build-aux/Dockerfile
-          docker create --name temp appimage-builder
-          docker cp temp:/app/burrow-gtk/build-appimage/Burrow-x86_64.AppImage .
-          docker rm temp
-      - name: Get Build Number
-        id: version
-        shell: bash
-        run: |
-          echo "BUILD_NUMBER=$(Tools/version.sh)" >> $GITHUB_OUTPUT
-      - name: Attach Artifacts
-        uses: SierraSoftworks/gh-releases@v1.0.7
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          release_tag: builds/${{ steps.version.outputs.BUILD_NUMBER }}
-          overwrite: "true"
-          files: |
-            Burrow-x86_64.AppImage
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Build AppImage
+      run: |
+        docker build -t appimage-builder . -f burrow-gtk/build-aux/Dockerfile
+        docker create --name temp appimage-builder
+        docker cp temp:/app/burrow-gtk/build-appimage/Burrow-x86_64.AppImage .
+        docker rm temp
+    - name: Attach Artifacts
+      uses: SierraSoftworks/gh-releases@v1.0.7
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        release_tag: ${{ github.ref_name }}
+        overwrite: "true"
+        files: |
+          Burrow-x86_64.AppImage

.gitignore

@@ -1,8 +1,17 @@
 # Xcode
 xcuserdata
 
+# Swift
+Apple/Package/.swiftpm/
+
 # Rust
 target/
+.env
 
 .DS_STORE
 .idea/
+
+tmp/
+
+*.db
+*.sock

.swiftlint.yml

@@ -30,7 +30,6 @@ opt_in_rules:
 - function_default_parameter_at_end
 - ibinspectable_in_extension
 - identical_operands
-- implicitly_unwrapped_optional
 - indentation_width
 - joined_default_parameter
 - last_where

.vscode/settings.json

@@ -15,5 +15,12 @@
   "rust-analyzer.inlayHints.typeHints.enable": false,
   "rust-analyzer.linkedProjects": [
     "./burrow/Cargo.toml"
-  ]
+  ],
+  "[yaml]": {
+    "editor.insertSpaces": true,
+    "editor.tabSize": 2,
+    "editor.autoIndent": "advanced",
+    "diffEditor.ignoreTrimWhitespace": false,
+    "editor.formatOnSave": false
+  }
 }

Apple/App/AppDelegate.swift

@@ -1,9 +1,10 @@
 #if os(macOS)
 import AppKit
+import BurrowUI
 import SwiftUI
 
+@main
 @MainActor
-@NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
     private let quitItem: NSMenuItem = {
         let quitItem = NSMenuItem(

Apple/App/BurrowApp.swift

@@ -1,6 +1,7 @@
+#if !os(macOS)
+import BurrowUI
 import SwiftUI
 
-#if !os(macOS)
 @MainActor
 @main
 struct BurrowApp: App {

Apple/App/MainMenu.xib

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23091" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23091"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">

Apple/App/Networks/Network.swift

@@ -1,10 +0,0 @@
-import SwiftUI
-
-protocol Network {
-    associatedtype Label: View
-
-    var id: String { get }
-    var backgroundColor: Color { get }
-
-    var label: Label { get }
-}

Apple/App/Tunnel.swift

@@ -1,50 +0,0 @@
-import SwiftUI
-
-protocol Tunnel {
-    var status: TunnelStatus { get }
-
-    func start()
-    func stop()
-    func enable()
-}
-
-enum TunnelStatus: Equatable, Hashable {
-    case unknown
-    case permissionRequired
-    case disabled
-    case connecting
-    case connected(Date)
-    case disconnecting
-    case disconnected
-    case reasserting
-    case invalid
-    case configurationReadWriteFailed
-}
-
-struct TunnelKey: EnvironmentKey {
-    static let defaultValue: any Tunnel = NetworkExtensionTunnel()
-}
-
-extension EnvironmentValues {
-    var tunnel: any Tunnel {
-        get { self[TunnelKey.self] }
-        set { self[TunnelKey.self] = newValue }
-    }
-}
-
-#if DEBUG
-@Observable
-class PreviewTunnel: Tunnel {
-    var status: TunnelStatus = .permissionRequired
-
-    func start() {
-        status = .connected(.now)
-    }
-    func stop() {
-        status = .disconnected
-    }
-    func enable() {
-        status = .disconnected
-    }
-}
-#endif

Apple/Burrow.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,86 +1,123 @@
 {
+  "originHash" : "fa512b990383b7e309c5854a5279817052294a8191a6d3c55c49cfb38e88c0c3",
   "pins" : [
     {
-      "identity" : "collectionconcurrencykit",
+      "identity" : "grpc-swift",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/JohnSundell/CollectionConcurrencyKit.git",
+      "location" : "https://github.com/grpc/grpc-swift.git",
       "state" : {
-        "revision" : "b4f23e24b5a1bff301efc5e70871083ca029ff95",
-        "version" : "0.2.0"
+        "revision" : "6a90b7e77e29f9bda6c2b3a4165a40d6c02cfda1",
+        "version" : "1.23.0"
       }
     },
     {
-      "identity" : "cryptoswift",
+      "identity" : "swift-async-algorithms",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
+      "location" : "https://github.com/apple/swift-async-algorithms.git",
       "state" : {
-        "revision" : "7892a123f7e8d0fe62f9f03728b17bbd4f94df5c",
-        "version" : "1.8.1"
+        "revision" : "6ae9a051f76b81cc668305ceed5b0e0a7fd93d20",
+        "version" : "1.0.1"
       }
     },
     {
-      "identity" : "sourcekitten",
+      "identity" : "swift-atomics",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/jpsim/SourceKitten.git",
+      "location" : "https://github.com/apple/swift-atomics.git",
       "state" : {
-        "revision" : "b6dc09ee51dfb0c66e042d2328c017483a1a5d56",
-        "version" : "0.34.1"
+        "revision" : "cd142fd2f64be2100422d658e7411e39489da985",
+        "version" : "1.2.0"
       }
     },
     {
-      "identity" : "swift-argument-parser",
+      "identity" : "swift-collections",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser.git",
+      "location" : "https://github.com/apple/swift-collections.git",
       "state" : {
-        "revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531",
-        "version" : "1.2.3"
+        "revision" : "9bf03ff58ce34478e66aaee630e491823326fd06",
+        "version" : "1.1.3"
       }
     },
     {
-      "identity" : "swift-syntax",
+      "identity" : "swift-http-types",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax.git",
+      "location" : "https://github.com/apple/swift-http-types",
       "state" : {
-        "revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
-        "version" : "509.1.1"
+        "revision" : "ae67c8178eb46944fd85e4dc6dd970e1f3ed6ccd",
+        "version" : "1.3.0"
       }
     },
     {
-      "identity" : "swiftlint",
+      "identity" : "swift-log",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/realm/SwiftLint.git",
+      "location" : "https://github.com/apple/swift-log.git",
       "state" : {
-        "branch" : "main",
-        "revision" : "7595ad3fafc1a31086dc40ba01fd898bf6b42d5f"
+        "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
+        "version" : "1.6.1"
       }
     },
     {
-      "identity" : "swiftytexttable",
+      "identity" : "swift-nio",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/scottrhoyt/SwiftyTextTable.git",
+      "location" : "https://github.com/apple/swift-nio.git",
       "state" : {
-        "revision" : "c6df6cf533d120716bff38f8ff9885e1ce2a4ac3",
-        "version" : "0.9.0"
+        "revision" : "9746cf80e29edfef2a39924a66731249223f42a3",
+        "version" : "2.72.0"
       }
     },
     {
-      "identity" : "swxmlhash",
+      "identity" : "swift-nio-extras",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/drmohundro/SWXMLHash.git",
+      "location" : "https://github.com/apple/swift-nio-extras.git",
       "state" : {
-        "revision" : "a853604c9e9a83ad9954c7e3d2a565273982471f",
-        "version" : "7.0.2"
+        "revision" : "d1ead62745cc3269e482f1c51f27608057174379",
+        "version" : "1.24.0"
       }
     },
     {
-      "identity" : "yams",
+      "identity" : "swift-nio-http2",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/jpsim/Yams.git",
+      "location" : "https://github.com/apple/swift-nio-http2.git",
       "state" : {
-        "revision" : "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3",
-        "version" : "5.0.6"
+        "revision" : "b5f7062b60e4add1e8c343ba4eb8da2e324b3a94",
+        "version" : "1.34.0"
+      }
+    },
+    {
+      "identity" : "swift-nio-ssl",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-nio-ssl.git",
+      "state" : {
+        "revision" : "7b84abbdcef69cc3be6573ac12440220789dcd69",
+        "version" : "2.27.2"
+      }
+    },
+    {
+      "identity" : "swift-nio-transport-services",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-nio-transport-services.git",
+      "state" : {
+        "revision" : "38ac8221dd20674682148d6451367f89c2652980",
+        "version" : "1.21.0"
+      }
+    },
+    {
+      "identity" : "swift-protobuf",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-protobuf.git",
+      "state" : {
+        "revision" : "edb6ed4919f7756157fe02f2552b7e3850a538e5",
+        "version" : "1.28.1"
+      }
+    },
+    {
+      "identity" : "swift-system",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-system.git",
+      "state" : {
+        "revision" : "d2ba781702a1d8285419c15ee62fd734a9437ff5",
+        "version" : "1.3.2"
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

Apple/Burrow.xcodeproj/xcshareddata/xcschemes/App.xcscheme

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1600"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

Apple/Burrow.xcodeproj/xcshareddata/xcschemes/NetworkExtension.xcscheme

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1600"
+   wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

Apple/Configuration/App.xcconfig

@@ -1,10 +1,8 @@
+LD_EXPORT_SYMBOLS = NO
 SKIP_INSTALL = NO
-MERGED_BINARY_TYPE = manual
 
-LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks
 LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks
 
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor
-
-ENABLE_PREVIEWS = YES

Apple/Configuration/Compiler.xcconfig

@@ -1,16 +1,17 @@
 #include "Identity.xcconfig"
+#include "Debug.xcconfig"
 #include "Version.xcconfig"
 
 SDKROOT = auto
 ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx
+SWIFT_VERSION = 6.0
 IPHONEOS_DEPLOYMENT_TARGET = 17.0
 MACOSX_DEPLOYMENT_TARGET = 14.0
 SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO
 SUPPORTS_MACCATALYST = NO
 
-ALWAYS_SEARCH_USER_PATHS = NO
 PRODUCT_NAME = $(TARGET_NAME:c99extidentifier)
 PRODUCT_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER).$(PRODUCT_NAME)
 MARKETING_VERSION = 0.1
@@ -19,43 +20,25 @@ SKIP_INSTALL = YES
 
 CODE_SIGN_IDENTITY = Apple Development
 
-INFOPLIST_FILE = Configuration/Info.plist
 GENERATE_INFOPLIST_FILE = YES
+INFOPLIST_FILE = Configuration/Info.plist
 INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2023-2024 Hack Club
 INFOPLIST_KEY_CFBundleDisplayName = Burrow
 
-ENABLE_BITCODE = NO
-
 ENABLE_APP_SANDBOX[sdk=macosx*] = YES
-ENABLE_HARDENED_RUNTIME[sdk=macosx*] = YES
-COMBINE_HIDPI_IMAGES = YES
-COPY_PHASE_STRIP = NO
 
+ENABLE_BITCODE = NO
+ALWAYS_SEARCH_USER_PATHS = NO
+COMBINE_HIDPI_IMAGES = YES
+EAGER_LINKING = YES
 FUSE_BUILD_SCRIPT_PHASES = YES
+SWIFT_EMIT_LOC_STRINGS = YES
+LOCALIZATION_PREFERS_STRING_CATALOGS = YES
+ENABLE_DEBUG_DYLIB = NO
 
 APP_GROUP_IDENTIFIER = group.$(APP_BUNDLE_IDENTIFIER)
 APP_GROUP_IDENTIFIER[sdk=macosx*] = $(DEVELOPMENT_TEAM).$(APP_BUNDLE_IDENTIFIER)
 NETWORK_EXTENSION_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER).network
 
-// Swift
-SWIFT_VERSION = 5.0
-SWIFT_EMIT_LOC_STRINGS = YES
-
-// Release
-DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
-SWIFT_COMPILATION_MODE = wholemodule
-SWIFT_OPTIMIZATION_LEVEL = -Osize
-LLVM_LTO = YES
-DEAD_CODE_STRIPPING = YES
-VALIDATE_PRODUCT = YES
-
-// Debug
-ONLY_ACTIVE_ARCH[config=Debug] = YES
-DEBUG_INFORMATION_FORMAT[config=Debug] = dwarf
-ENABLE_TESTABILITY[config=Debug] = YES
-SWIFT_OPTIMIZATION_LEVEL[config=Debug] = -Onone
-SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug] = DEBUG
-SWIFT_COMPILATION_MODE[config=Debug] = singlefile
-LLVM_LTO[config=Debug] = NO
-DEAD_CODE_STRIPPING[config=Debug] = NO
-VALIDATE_PRODUCT[config=Debug] = NO
+// https://github.com/grpc/grpc-swift/issues/683#issuecomment-1130118953
+OTHER_SWIFT_FLAGS = $(inherited) -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DIR)/CNIOAtomics.modulemap -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DIR)/CNIODarwin.modulemap -Xcc -fmodule-map-file=$(GENERATED_MODULEMAP_DIR)/CGRPCZlib.modulemap

Apple/Configuration/Configuration.xcconfig

@@ -1,5 +1,4 @@
-PRODUCT_NAME = BurrowShared
-MERGEABLE_LIBRARY = YES
+#include "Framework.xcconfig"
 
-SWIFT_INCLUDE_PATHS = $(PROJECT_DIR)/Shared/Constants
+SWIFT_INCLUDE_PATHS = $(PROJECT_DIR)/Configuration/Constants
 GCC_PREPROCESSOR_DEFINITIONS = APP_BUNDLE_IDENTIFIER=$(APP_BUNDLE_IDENTIFIER) APP_GROUP_IDENTIFIER=$(APP_GROUP_IDENTIFIER) NETWORK_EXTENSION_BUNDLE_IDENTIFIER=$(NETWORK_EXTENSION_BUNDLE_IDENTIFIER)

Apple/Configuration/Constants/Constants.swift

@@ -1,4 +1,5 @@
-@_implementationOnly import Constants
+@_implementationOnly import CConstants
+import OSLog
 
 public enum Constants {
     enum Error: Swift.Error {
@@ -9,25 +10,29 @@ public enum Constants {
     public static let appGroupIdentifier = AppGroupIdentifier
     public static let networkExtensionBundleIdentifier = NetworkExtensionBundleIdentifier
 
-    public static var groupContainerURL: URL {
-        get throws { try _groupContainerURL.get() }
-    }
-
-    private static let _groupContainerURL: Result<URL, Error> = {
-        guard let groupContainerURL = FileManager.default
-            .containerURL(forSecurityApplicationGroupIdentifier: appGroupIdentifier) else {
-            return .failure(.invalidAppGroupIdentifier)
-        }
-        return .success(groupContainerURL)
-    }()
     public static var socketURL: URL {
         get throws {
             try groupContainerURL.appending(component: "burrow.sock", directoryHint: .notDirectory)
         }
     }
-    public static var dbURL: URL {
+    public static var databaseURL: URL {
         get throws {
             try groupContainerURL.appending(component: "burrow.db", directoryHint: .notDirectory)
         }
     }
+
+    private static var groupContainerURL: URL {
+        get throws { try _groupContainerURL.get() }
+    }
+    private static let _groupContainerURL: Result<URL, Error> = {
+        switch FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupIdentifier) {
+        case .some(let url): .success(url)
+        case .none: .failure(.invalidAppGroupIdentifier)
+        }
+    }()
+}
+
+extension Logger {
+    @_dynamicReplacement(for: subsystem)
+    public static var subsystem: String { Constants.bundleIdentifier }
 }

Apple/Configuration/Constants/module.modulemap

@@ -1,4 +1,4 @@
-module Constants {
+module CConstants {
     header "Constants.h"
     export *
 }

Apple/Configuration/Debug.xcconfig

@@ -0,0 +1,26 @@
+// Release
+DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
+SWIFT_COMPILATION_MODE = wholemodule
+SWIFT_OPTIMIZATION_LEVEL = -Osize
+LLVM_LTO = YES
+DEAD_CODE_STRIPPING = YES
+STRIP_INSTALLED_PRODUCT = YES
+STRIP_SWIFT_SYMBOLS = YES
+COPY_PHASE_STRIP = NO
+VALIDATE_PRODUCT = YES
+ENABLE_MODULE_VERIFIER = YES
+
+// Debug
+ONLY_ACTIVE_ARCH[config=Debug] = YES
+DEBUG_INFORMATION_FORMAT[config=Debug] = dwarf
+ENABLE_TESTABILITY[config=Debug] = YES
+GCC_PREPROCESSOR_DEFINITIONS[config=Debug] = DEBUG=1 $(inherited)
+SWIFT_OPTIMIZATION_LEVEL[config=Debug] = -Onone
+SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug] = DEBUG
+SWIFT_COMPILATION_MODE[config=Debug] = singlefile
+LLVM_LTO[config=Debug] = NO
+DEAD_CODE_STRIPPING[config=Debug] = NO
+VALIDATE_PRODUCT[config=Debug] = NO
+STRIP_INSTALLED_PRODUCT[config=Debug] = NO
+STRIP_SWIFT_SYMBOLS[config=Debug] = NO
+ENABLE_MODULE_VERIFIER[config=Debug] = NO

Apple/Configuration/Extension.xcconfig

@@ -1,4 +1,6 @@
-MERGED_BINARY_TYPE = manual
+LD_EXPORT_SYMBOLS = NO
+
+OTHER_SWIFT_FLAGS = $(inherited) -Xfrontend -disable-autolink-framework -Xfrontend UIKit -Xfrontend -disable-autolink-framework -Xfrontend AppKit -Xfrontend -disable-autolink-framework -Xfrontend SwiftUI
 
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
-LD_RUNPATH_SEARCH_PATHS[sdk=macos*] = $(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks

Apple/Configuration/Framework.xcconfig

@@ -0,0 +1,14 @@
+PRODUCT_NAME = Burrow$(TARGET_NAME:c99extidentifier)
+PRODUCT_BUNDLE_IDENTIFIER = $(APP_BUNDLE_IDENTIFIER).$(TARGET_NAME:c99extidentifier)
+APPLICATION_EXTENSION_API_ONLY = YES
+SWIFT_INSTALL_OBJC_HEADER = NO
+SWIFT_SKIP_AUTOLINKING_FRAMEWORKS = YES
+SWIFT_SKIP_AUTOLINKING_LIBRARIES = YES
+
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @loader_path/Frameworks
+LD_RUNPATH_SEARCH_PATHS[sdk=macosx*] = $(inherited) @executable_path/../Frameworks @loader_path/Frameworks
+
+DYLIB_INSTALL_NAME_BASE = @rpath
+DYLIB_COMPATIBILITY_VERSION = 1
+DYLIB_CURRENT_VERSION = 1
+VERSIONING_SYSTEM =

Apple/Core/Client.swift

@@ -0,0 +1,32 @@
+import GRPC
+import NIOTransportServices
+
+public typealias TunnelClient = Burrow_TunnelAsyncClient
+public typealias NetworksClient = Burrow_NetworksAsyncClient
+
+public protocol Client {
+    init(channel: GRPCChannel)
+}
+
+extension Client {
+    public static func unix(socketURL: URL) -> Self {
+        let group = NIOTSEventLoopGroup()
+        let configuration = ClientConnection.Configuration.default(
+            target: .unixDomainSocket(socketURL.path),
+            eventLoopGroup: group
+        )
+        return Self(channel: ClientConnection(configuration: configuration))
+    }
+}
+
+extension TunnelClient: Client {
+    public init(channel: any GRPCChannel) {
+        self.init(channel: channel, defaultCallOptions: .init(), interceptors: .none)
+    }
+}
+
+extension NetworksClient: Client {
+    public init(channel: any GRPCChannel) {
+        self.init(channel: channel, defaultCallOptions: .init(), interceptors: .none)
+    }
+}

Apple/Core/Client/burrow.proto

@@ -0,0 +1 @@
+../../../proto/burrow.proto

Apple/Core/Client/grpc-swift-config.json

@@ -0,0 +1,11 @@
+{
+  "invocations": [
+    {
+      "protoFiles": [
+        "burrow.proto",
+      ],
+      "server": false,
+      "visibility": "public"
+    }
+  ]
+}

Apple/Core/Client/swift-protobuf-config.json

@@ -0,0 +1,10 @@
+{
+  "invocations": [
+    {
+      "protoFiles": [
+        "burrow.proto",
+      ],
+      "visibility": "public"
+    }
+  ]
+}

Apple/Core/Logging.swift

@@ -4,7 +4,7 @@ import os
 extension Logger {
     private static let loggers: OSAllocatedUnfairLock<[String: Logger]> = OSAllocatedUnfairLock(initialState: [:])
 
-    public static let subsystem = Constants.bundleIdentifier
+    public dynamic static var subsystem: String { "com.hackclub.burrow" }
 
     public static func logger(for type: Any.Type) -> Logger {
         let category = String(describing: type)

Apple/NetworkExtension/PacketTunnelProvider.swift

@@ -1,92 +1,74 @@
-import BurrowShared
+import AsyncAlgorithms
+import BurrowConfiguration
+import BurrowCore
 import libburrow
 import NetworkExtension
 import os
 
 class PacketTunnelProvider: NEPacketTunnelProvider {
+    enum Error: Swift.Error {
+        case missingTunnelConfiguration
+    }
+
     private let logger = Logger.logger(for: PacketTunnelProvider.self)
-    private var client: Client?
+
+    private var client: TunnelClient {
+        get throws { try _client.get() }
+    }
+    private let _client: Result<TunnelClient, Swift.Error> = Result {
+        try TunnelClient.unix(socketURL: Constants.socketURL)
+    }
 
     override init() {
         do {
             libburrow.spawnInProcess(
                 socketPath: try Constants.socketURL.path(percentEncoded: false),
-                dbPath: try Constants.dbURL.path(percentEncoded: false)
+                databasePath: try Constants.databaseURL.path(percentEncoded: false)
             )
         } catch {
-            logger.error("Failed to spawn: \(error)")
+            logger.error("Failed to spawn networking thread: \(error)")
         }
     }
 
     override func startTunnel(options: [String: NSObject]? = nil) async throws {
         do {
-            let client = try Client()
-            self.client = client
-            register_events(client)
-
-            _ = try await self.loadTunSettings()
-            let startRequest = Start(
-                tun: Start.TunOptions(
-                    name: nil, no_pi: false, tun_excl: false, tun_retrieve: true, address: []
-                )
-            )
-            let response = try await client.request(startRequest, type: BurrowResult<AnyResponseData>.self)
-            self.logger.log("Received start server response: \(String(describing: response))")
+            let configuration = try await Array(client.tunnelConfiguration(.init()).prefix(1)).first
+            guard let settings = configuration?.settings else {
+                throw Error.missingTunnelConfiguration
+            }
+            try await setTunnelNetworkSettings(settings)
+            _ = try await client.tunnelStart(.init())
+            logger.log("Started tunnel with network settings: \(settings)")
         } catch {
-            self.logger.error("Failed to start tunnel: \(error)")
+            logger.error("Failed to start tunnel: \(error)")
             throw error
         }
     }
 
     override func stopTunnel(with reason: NEProviderStopReason) async {
         do {
-            let client = try Client()
-            _ = try await client.single_request("Stop", type: BurrowResult<AnyResponseData>.self)
-            self.logger.log("Stopped client.")
+            _ = try await client.tunnelStop(.init())
+            logger.log("Stopped client")
         } catch {
-            self.logger.error("Failed to stop tunnel: \(error)")
-        }
-    }
-    func loadTunSettings() async throws -> ServerConfig {
-        guard let client = self.client else {
-            throw BurrowError.noClient
-        }
-        let srvConfig = try await client.single_request("ServerConfig", type: BurrowResult<ServerConfig>.self)
-        guard let serverconfig = srvConfig.Ok else {
-            throw BurrowError.resultIsError
-        }
-        guard let tunNs = generateTunSettings(from: serverconfig) else {
-            throw BurrowError.addrDoesntExist
-        }
-        try await self.setTunnelNetworkSettings(tunNs)
-        self.logger.info("Set remote tunnel address to \(tunNs.tunnelRemoteAddress)")
-        return serverconfig
-    }
-    private func generateTunSettings(from: ServerConfig) -> NETunnelNetworkSettings? {
-        // Using a makeshift remote tunnel address
-        let nst = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: "1.1.1.1")
-        var v4Addresses = [String]()
-        var v6Addresses = [String]()
-        for addr in from.address {
-            if IPv4Address(addr) != nil {
-                v6Addresses.append(addr)
-            }
-            if IPv6Address(addr) != nil {
-                v4Addresses.append(addr)
-            }
-        }
-        nst.ipv4Settings = NEIPv4Settings(addresses: v4Addresses, subnetMasks: v4Addresses.map { _ in
-            "255.255.255.0"
-        })
-        nst.ipv6Settings = NEIPv6Settings(addresses: v6Addresses, networkPrefixLengths: v6Addresses.map { _ in 64 })
-        logger.log("Initialized ipv4 settings: \(nst.ipv4Settings)")
-        return nst
-    }
-    func register_events(_ client: Client) {
-        client.on_event(.ConfigChange) { (cfig: ServerConfig) in
-            self.logger.info("Config Change Notification: \(String(describing: cfig))")
-            self.setTunnelNetworkSettings(self.generateTunSettings(from: cfig))
-            self.logger.info("Updated Tunnel Network Settings.")
+            logger.error("Failed to stop tunnel: \(error)")
         }
     }
 }
+
+extension Burrow_TunnelConfigurationResponse {
+    fileprivate var settings: NEPacketTunnelNetworkSettings {
+        let ipv6Addresses = addresses.filter { IPv6Address($0) != nil }
+
+        let settings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: "1.1.1.1")
+        settings.mtu = NSNumber(value: mtu)
+        settings.ipv4Settings = NEIPv4Settings(
+            addresses: addresses.filter { IPv4Address($0) != nil },
+            subnetMasks: ["255.255.255.0"]
+        )
+        settings.ipv6Settings = NEIPv6Settings(
+            addresses: ipv6Addresses,
+            networkPrefixLengths: ipv6Addresses.map { _ in 64 }
+        )
+        return settings
+    }
+}

Apple/NetworkExtension/libburrow/build-rust.sh

@@ -68,9 +68,12 @@ else
     CARGO_PATH="$(dirname $(readlink -f $(which cargo))):/usr/bin"
 fi
 
+PROTOC=$(readlink -f $(which protoc))
+CARGO_PATH="$(dirname $PROTOC):$CARGO_PATH"
+
 # Run cargo without the various environment variables set by Xcode.
 # Those variables can confuse cargo and the build scripts it runs.
-env -i PATH="$CARGO_PATH" CARGO_TARGET_DIR="${CONFIGURATION_TEMP_DIR}/target" cargo build "${CARGO_ARGS[@]}"
+env -i PATH="$CARGO_PATH" PROTOC="$PROTOC" CARGO_TARGET_DIR="${CONFIGURATION_TEMP_DIR}/target" IPHONEOS_DEPLOYMENT_TARGET="$IPHONEOS_DEPLOYMENT_TARGET" MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" cargo build "${CARGO_ARGS[@]}"
 
 mkdir -p "${BUILT_PRODUCTS_DIR}"
 

Apple/NetworkExtension/libburrow/libburrow.h

@@ -1,2 +1,2 @@
-__attribute__((__swift_name__("spawnInProcess(socketPath:dbPath:)")))
+__attribute__((__swift_name__("spawnInProcess(socketPath:databasePath:)")))
 extern void spawn_in_process(const char * __nullable socket_path, const char * __nullable db_path);

Apple/Shared/Client.swift

@@ -1,106 +0,0 @@
-import Foundation
-import Network
-
-public final class Client {
-    let connection: NWConnection
-
-    private let logger = Logger.logger(for: Client.self)
-    private var generator = SystemRandomNumberGenerator()
-    private var continuations: [UInt: UnsafeContinuation<Data, Error>] = [:]
-    private var eventMap: [NotificationType: [(Data) throws -> Void]] = [:]
-    private var task: Task<Void, Error>?
-
-    public convenience init() throws {
-        self.init(url: try Constants.socketURL)
-    }
-
-    public init(url: URL) {
-        let endpoint: NWEndpoint
-        if url.isFileURL {
-            endpoint = .unix(path: url.path(percentEncoded: false))
-        } else {
-            endpoint = .url(url)
-        }
-
-        let parameters = NWParameters.tcp
-        parameters.defaultProtocolStack
-            .applicationProtocols
-            .insert(NWProtocolFramer.Options(definition: NewlineProtocolFramer.definition), at: 0)
-        let connection = NWConnection(to: endpoint, using: parameters)
-        connection.start(queue: .global())
-        self.connection = connection
-        self.task = Task { [weak self] in
-            while true {
-                let (data, _, _) = try await connection.receiveMessage()
-                let peek = try JSONDecoder().decode(MessagePeek.self, from: data)
-                switch peek.type {
-                case .Response:
-                    let response = try JSONDecoder().decode(ResponsePeek.self, from: data)
-                    self?.logger.info("Received response for \(response.id)")
-                    guard let continuations = self?.continuations else {return}
-                    self?.logger.debug("All keys in continuation table: \(continuations.keys)")
-                    guard let continuation = self?.continuations[response.id] else { return }
-                    self?.logger.debug("Got matching continuation")
-                    continuation.resume(returning: data)
-                case .Notification:
-                    let peek = try JSONDecoder().decode(NotificationPeek.self, from: data)
-                    guard let handlers = self?.eventMap[peek.method] else { continue }
-                    _ = try handlers.map { try $0(data) }
-                default:
-                    continue
-                }
-            }
-        }
-    }
-    private func send<T: Request, U: Decodable>(_ request: T) async throws -> U {
-        let data: Data = try await withUnsafeThrowingContinuation { continuation in
-            continuations[request.id] = continuation
-            do {
-                let data = try JSONEncoder().encode(request)
-                let completion: NWConnection.SendCompletion = .contentProcessed { error in
-                    guard let error = error else {
-                        return
-                    }
-                    continuation.resume(throwing: error)
-                }
-                connection.send(content: data, completion: completion)
-            } catch {
-                continuation.resume(throwing: error)
-                return
-            }
-        }
-        self.logger.debug("Got response data: \(String(describing: data.base64EncodedString()))")
-        let res = try JSONDecoder().decode(Response<U>.self, from: data)
-        self.logger.debug("Got response data decoded: \(String(describing: res))")
-        return res.result
-    }
-    public func request<T: Codable, U: Decodable>(_ request: T, type: U.Type = U.self) async throws -> U {
-        let req = BurrowRequest(
-            id: generator.next(upperBound: UInt.max),
-            command: request
-        )
-        return try await send(req)
-    }
-    public func single_request<U: Decodable>(_ request: String, type: U.Type = U.self) async throws -> U {
-        let req = BurrowSimpleRequest(
-            id: generator.next(upperBound: UInt.max),
-            command: request
-        )
-        return try await send(req)
-    }
-    public func on_event<T: Codable>(_ event: NotificationType, callable: @escaping (T) throws -> Void) {
-        let action = { data in
-            let decoded = try JSONDecoder().decode(Notification<T>.self, from: data)
-            try callable(decoded.params)
-        }
-        if eventMap[event] != nil {
-            eventMap[event]?.append(action)
-        } else {
-            eventMap[event] = [action]
-        }
-    }
-
-    deinit {
-        connection.cancel()
-    }
-}

Apple/Shared/DataTypes.swift

@@ -1,139 +0,0 @@
-import Foundation
-
-// swiftlint:disable identifier_name raw_value_for_camel_cased_codable_enum
-public enum BurrowError: Error {
-    case addrDoesntExist
-    case resultIsError
-    case cantParseResult
-    case resultIsNone
-    case noClient
-}
-
-public protocol Request: Codable where Params: Codable {
-    associatedtype Params
-
-    var id: UInt { get set }
-    var method: String { get set }
-    var params: Params? { get set }
-}
-
-public enum MessageType: String, Codable {
-    case Request
-    case Response
-    case Notification
-}
-
-public struct MessagePeek: Codable {
-    public var type: MessageType
-    public init(type: MessageType) {
-        self.type = type
-    }
-}
-
-public struct BurrowSimpleRequest: Request {
-    public var id: UInt
-    public var method: String
-    public var params: String?
-    public init(id: UInt, command: String, params: String? = nil) {
-        self.id = id
-        self.method = command
-        self.params = params
-    }
-}
-
-public struct BurrowRequest<T>: Request where T: Codable {
-    public var id: UInt
-    public var method: String
-    public var params: T?
-    public init(id: UInt, command: T) {
-        self.id = id
-        self.method = "\(T.self)"
-        self.params = command
-    }
-}
-
-public struct Response<T>: Decodable where T: Decodable {
-    public var id: UInt
-    public var result: T
-    public init(id: UInt, result: T) {
-        self.id = id
-        self.result = result
-    }
-}
-
-public struct ResponsePeek: Codable {
-    public var id: UInt
-    public init(id: UInt) {
-        self.id = id
-    }
-}
-
-public enum NotificationType: String, Codable {
-    case ConfigChange
-}
-
-public struct Notification<T>: Codable where T: Codable {
-    public var method: NotificationType
-    public var params: T
-    public init(method: NotificationType, params: T) {
-        self.method = method
-        self.params = params
-    }
-}
-
-public struct NotificationPeek: Codable {
-    public var method: NotificationType
-    public init(method: NotificationType) {
-        self.method = method
-    }
-}
-
-public struct AnyResponseData: Codable {
-    public var type: String
-    public init(type: String) {
-        self.type = type
-    }
-}
-
-public struct BurrowResult<T>: Codable where T: Codable {
-    public var Ok: T?
-    public var Err: String?
-    public init(Ok: T, Err: String? = nil) {
-        self.Ok = Ok
-        self.Err = Err
-    }
-}
-
-public struct ServerConfig: Codable {
-    public let address: [String]
-    public let name: String?
-    public let mtu: Int32?
-    public init(address: [String], name: String?, mtu: Int32?) {
-        self.address = address
-        self.name = name
-        self.mtu = mtu
-    }
-}
-
-public struct Start: Codable {
-    public struct TunOptions: Codable {
-        public let name: String?
-        public let no_pi: Bool
-        public let tun_excl: Bool
-        public let tun_retrieve: Bool
-        public let address: [String]
-        public init(name: String?, no_pi: Bool, tun_excl: Bool, tun_retrieve: Bool, address: [String]) {
-            self.name = name
-            self.no_pi = no_pi
-            self.tun_excl = tun_excl
-            self.tun_retrieve = tun_retrieve
-            self.address = address
-        }
-    }
-    public let tun: TunOptions
-    public init(tun: TunOptions) {
-        self.tun = tun
-    }
-}
-
-// swiftlint:enable identifier_name raw_value_for_camel_cased_codable_enum

Apple/Shared/NWConnection+Async.swift

@@ -1,32 +0,0 @@
-import Foundation
-import Network
-
-extension NWConnection {
-    // swiftlint:disable:next large_tuple
-    func receiveMessage() async throws -> (Data, NWConnection.ContentContext?, Bool) {
-        try await withUnsafeThrowingContinuation { continuation in
-            receiveMessage { completeContent, contentContext, isComplete, error in
-                if let error {
-                    continuation.resume(throwing: error)
-                } else {
-                    guard let completeContent = completeContent else {
-                        fatalError("Both error and completeContent were nil")
-                    }
-                    continuation.resume(returning: (completeContent, contentContext, isComplete))
-                }
-            }
-        }
-    }
-
-    func send(content: Data) async throws {
-        try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) in
-            send(content: content, completion: .contentProcessed { error in
-                if let error {
-                    continuation.resume(throwing: error)
-                } else {
-                    continuation.resume(returning: ())
-                }
-            })
-        }
-    }
-}

Apple/Shared/NewlineProtocolFramer.swift

@@ -1,54 +0,0 @@
-import Foundation
-import Network
-
-final class NewlineProtocolFramer: NWProtocolFramerImplementation {
-    private static let delimeter: UInt8 = 10 // `\n`
-
-    static let definition = NWProtocolFramer.Definition(implementation: NewlineProtocolFramer.self)
-    static let label = "Lines"
-
-    init(framer: NWProtocolFramer.Instance) { }
-
-    func start(framer: NWProtocolFramer.Instance) -> NWProtocolFramer.StartResult { .ready }
-    func stop(framer: NWProtocolFramer.Instance) -> Bool { true }
-
-    func wakeup(framer: NWProtocolFramer.Instance) { }
-    func cleanup(framer: NWProtocolFramer.Instance) { }
-
-    func handleInput(framer: NWProtocolFramer.Instance) -> Int {
-        while true {
-            var result: [Data] = []
-            let parsed = framer.parseInput(minimumIncompleteLength: 1, maximumLength: 16_000) { buffer, _ in
-                guard let buffer else { return 0 }
-                var lines = buffer
-                    .split(separator: Self.delimeter, omittingEmptySubsequences: false)
-                    .map { Data($0) }
-                guard lines.count > 1 else { return 0 }
-                _ = lines.popLast()
-
-                result = lines
-                return lines.reduce(lines.count) { $0 + $1.count }
-            }
-
-            guard parsed && !result.isEmpty else { break }
-
-            for line in result {
-                framer.deliverInput(data: line, message: .init(instance: framer), isComplete: true)
-            }
-        }
-        return 0
-    }
-
-    func handleOutput(
-        framer: NWProtocolFramer.Instance,
-        message: NWProtocolFramer.Message,
-        messageLength: Int,
-        isComplete: Bool
-    ) {
-        do {
-            try framer.writeOutputNoCopy(length: messageLength)
-            framer.writeOutput(data: [Self.delimeter])
-        } catch {
-        }
-    }
-}

Apple/UI/BurrowView.swift

@@ -2,11 +2,11 @@ import AuthenticationServices
 import SwiftUI
 
 #if !os(macOS)
-struct BurrowView: View {
+public struct BurrowView: View {
     @Environment(\.webAuthenticationSession)
     private var webAuthenticationSession
 
-    var body: some View {
+    public var body: some View {
         NavigationStack {
             VStack {
                 HStack {
@@ -35,6 +35,9 @@ struct BurrowView: View {
         }
     }
 
+    public init() {
+    }
+
     private func addHackClubNetwork() {
         Task {
             try await authenticateWithSlack()
@@ -42,7 +45,6 @@ struct BurrowView: View {
     }
 
     private func addWireGuardNetwork() {
-        
     }
 
     private func authenticateWithSlack() async throws {

Apple/UI/MenuItemToggleView.swift

@@ -7,11 +7,11 @@
 
 import SwiftUI
 
-struct MenuItemToggleView: View {
+public struct MenuItemToggleView: View {
     @Environment(\.tunnel)
     var tunnel: Tunnel
 
-    var body: some View {
+    public var body: some View {
         HStack {
             VStack(alignment: .leading) {
                 Text("Burrow")
@@ -30,10 +30,13 @@ struct MenuItemToggleView: View {
         .padding(10)
         .frame(minWidth: 300, minHeight: 32, maxHeight: 32)
     }
+
+    public init() {
+    }
 }
 
 extension Tunnel {
-    fileprivate var toggleDisabled: Bool {
+    @MainActor fileprivate var toggleDisabled: Bool {
         switch status {
         case .disconnected, .permissionRequired, .connected, .disconnecting:
             false
@@ -42,7 +45,7 @@ extension Tunnel {
         }
     }
 
-    var toggleIsOn: Binding<Bool> {
+    @MainActor var toggleIsOn: Binding<Bool> {
         Binding {
             switch status {
             case .connecting, .reasserting, .connected:

Apple/UI/NetworkCarouselView.swift

@@ -2,10 +2,10 @@ import SwiftUI
 
 struct NetworkCarouselView: View {
     var networks: [any Network] = [
-        HackClub(id: "1"),
-        HackClub(id: "2"),
-        WireGuard(id: "4"),
-        HackClub(id: "5"),
+        HackClub(id: 1),
+        HackClub(id: 2),
+        WireGuard(id: 4),
+        HackClub(id: 5)
     ]
 
     var body: some View {

Apple/UI/NetworkExtension+Async.swift

@@ -1,6 +1,6 @@
 import NetworkExtension
 
-extension NEVPNManager {
+extension NEVPNManager: @unchecked @retroactive Sendable {
     func remove() async throws {
         _ = try await withUnsafeThrowingContinuation { continuation in
             removeFromPreferences(completionHandler: completion(continuation))
@@ -14,7 +14,7 @@ extension NEVPNManager {
     }
 }
 
-extension NETunnelProviderManager {
+extension NETunnelProviderManager: @unchecked @retroactive Sendable {
     class var managers: [NETunnelProviderManager] {
         get async throws {
             try await withUnsafeThrowingContinuation { continuation in
@@ -34,7 +34,7 @@ private func completion(_ continuation: UnsafeContinuation<Void, Error>) -> (Err
     }
 }
 
-private func completion<T>(_ continuation: UnsafeContinuation<T, Error>) -> (T?, Error?) -> Void {
+private func completion<T: Sendable>(_ continuation: UnsafeContinuation<T, Error>) -> (T?, Error?) -> Void {
     return { value, error in
         if let error {
             continuation.resume(throwing: error)

Apple/UI/NetworkExtensionTunnel.swift

@@ -1,22 +1,23 @@
-import BurrowShared
+import BurrowCore
 import NetworkExtension
 
 @Observable
-class NetworkExtensionTunnel: Tunnel {
-    @MainActor private(set) var status: TunnelStatus = .unknown
-    private var error: NEVPNError?
+public final class NetworkExtensionTunnel: Tunnel {
+    @MainActor public private(set) var status: TunnelStatus = .unknown
+    @MainActor private var error: NEVPNError?
 
     private let logger = Logger.logger(for: Tunnel.self)
     private let bundleIdentifier: String
-    private var tasks: [Task<Void, Error>] = []
+    private let configurationChanged: Task<Void, Error>
+    private let statusChanged: Task<Void, Error>
 
     // Each manager corresponds to one entry in the Settings app.
     // Our goal is to maintain a single manager, so we create one if none exist and delete any extra.
-    private var managers: [NEVPNManager]? {
+    @MainActor private var managers: [NEVPNManager]? {
         didSet { Task { await updateStatus() } }
     }
 
-    private var currentStatus: TunnelStatus {
+    @MainActor private var currentStatus: TunnelStatus {
         guard let managers = managers else {
             guard let error = error else {
                 return .unknown
@@ -41,35 +42,40 @@ class NetworkExtensionTunnel: Tunnel {
         return manager.connection.tunnelStatus
     }
 
-    convenience init() {
-        self.init(Constants.networkExtensionBundleIdentifier)
-    }
-
-    init(_ bundleIdentifier: String) {
+    public init(bundleIdentifier: String) {
         self.bundleIdentifier = bundleIdentifier
 
         let center = NotificationCenter.default
-        let configurationChanged = Task { [weak self] in
-            for try await _ in center.notifications(named: .NEVPNConfigurationChange).map({ _ in () }) {
-                await self?.update()
+        let tunnel: OSAllocatedUnfairLock<NetworkExtensionTunnel?> = .init(initialState: .none)
+        configurationChanged = Task {
+            for try await _ in center.notifications(named: .NEVPNConfigurationChange) {
+                try Task.checkCancellation()
+                await tunnel.withLock { $0 }?.update()
             }
         }
-        let statusChanged = Task { [weak self] in
-            for try await _ in center.notifications(named: .NEVPNStatusDidChange).map({ _ in () }) {
-                await self?.updateStatus()
+        statusChanged = Task {
+            for try await _ in center.notifications(named: .NEVPNStatusDidChange) {
+                try Task.checkCancellation()
+                await tunnel.withLock { $0 }?.updateStatus()
             }
         }
-        tasks = [configurationChanged, statusChanged]
+        tunnel.withLock { $0 = self }
 
         Task { await update() }
     }
 
     private func update() async {
         do {
-            managers = try await NETunnelProviderManager.managers
+            let result = try await NETunnelProviderManager.managers
+            await MainActor.run {
+                managers = result
+                status = currentStatus
+            }
             await self.updateStatus()
         } catch let vpnError as NEVPNError {
-            error = vpnError
+            await MainActor.run {
+                error = vpnError
+            }
         } catch {
             logger.error("Failed to update VPN configurations: \(error)")
         }
@@ -82,12 +88,7 @@ class NetworkExtensionTunnel: Tunnel {
     }
 
     func configure() async throws {
-        if managers == nil {
-            await update()
-        }
-
-        guard let managers = managers else { return }
-
+        let managers = try await NETunnelProviderManager.managers
         if managers.count > 1 {
             try await withThrowingTaskGroup(of: Void.self, returning: Void.self) { group in
                 for manager in managers.suffix(from: 1) {
@@ -110,9 +111,9 @@ class NetworkExtensionTunnel: Tunnel {
         try await manager.save()
     }
 
-    func start() {
-        guard let manager = managers?.first else { return }
+    public func start() {
         Task {
+            guard let manager = try await NETunnelProviderManager.managers.first else { return }
             do {
                 if !manager.isEnabled {
                     manager.isEnabled = true
@@ -125,12 +126,14 @@ class NetworkExtensionTunnel: Tunnel {
         }
     }
 
-    func stop() {
-        guard let manager = managers?.first else { return }
-        manager.connection.stopVPNTunnel()
+    public func stop() {
+        Task {
+            guard let manager = try await NETunnelProviderManager.managers.first else { return }
+            manager.connection.stopVPNTunnel()
+        }
     }
 
-    func enable() {
+    public func enable() {
         Task {
             do {
                 try await configure()
@@ -141,7 +144,8 @@ class NetworkExtensionTunnel: Tunnel {
     }
 
     deinit {
-        tasks.forEach { $0.cancel() }
+        configurationChanged.cancel()
+        statusChanged.cancel()
     }
 }
 

Apple/UI/Networks/HackClub.swift

@@ -1,10 +1,14 @@
+import BurrowCore
 import SwiftUI
 
 struct HackClub: Network {
-    var id: String
+    typealias NetworkType = Burrow_WireGuardNetwork
+    static let type: Burrow_NetworkType = .hackClub
+
+    var id: Int32
     var backgroundColor: Color { .init("HackClub") }
 
-    var label: some View {
+    @MainActor var label: some View {
         GeometryReader { reader in
             VStack(alignment: .leading) {
                 Image("HackClub")

Apple/UI/Networks/Network.swift

@@ -0,0 +1,36 @@
+import Atomics
+import BurrowCore
+import SwiftProtobuf
+import SwiftUI
+
+protocol Network {
+    associatedtype NetworkType: Message
+    associatedtype Label: View
+
+    static var type: Burrow_NetworkType { get }
+
+    var id: Int32 { get }
+    var backgroundColor: Color { get }
+
+    @MainActor var label: Label { get }
+}
+
+@Observable
+@MainActor
+final class NetworkViewModel: Sendable {
+    private(set) var networks: [Burrow_Network] = []
+
+    private var task: Task<Void, Error>!
+
+    init(socketURL: URL) {
+        task = Task { [weak self] in
+            let client = NetworksClient.unix(socketURL: socketURL)
+            for try await networks in client.networkList(.init()) {
+                guard let viewModel = self else { continue }
+                Task { @MainActor in
+                    viewModel.networks = networks.network
+                }
+            }
+        }
+    }
+}