refs #103 use redirected url as source url

Signed-off-by: Joseph Mattello <mail@joemattiello.com>

.github/workflows/beta.yml

@@ -1,12 +1,16 @@
 name: Beta SideStore build
 on:
   push:
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+' # example: 1.0.0-beta.1
+    branches:
+      - develop
 
 jobs:
   build:
     name: Build and upload SideStore Beta
+    if: startsWith(github.event.head_commit.message, '[beta]')
+    concurrency:
+      group: ${{ github.ref }}
+      cancel-in-progress: true
     strategy:
       fail-fast: false
       matrix:
@@ -21,11 +25,63 @@ jobs:
         with:
           submodules: recursive
 
+      # - name: Cache rust cargo
+      #   id: cache-rust-cargo
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-cargo
+      #   with:
+      #     path: ~/.cargo
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
+      # - name: Cache rust minimuxer
+      #   id: cache-rust-minimuxer
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-minimuxer
+      #   with:
+      #     path: ./Dependencies/minimuxer/target
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
+      # - name: Cache rust em_proxy
+      #   id: cache-rust-em_proxy
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-em_proxy
+      #   with:
+      #     path: ./Dependencies/em_proxy/target
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
       - name: Install dependencies
         run: brew install ldid
 
-      - name: Change version to tag
-        run: sed -e '/MARKETING_VERSION = .*/s/= .*/= ${{ github.ref_name }}/' -i '' Build.xcconfig
+      - name: Install rustup
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+          target: aarch64-apple-ios
+
+      # - name: Create emotional damage
+      #   run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios
+
+      # - name: Build minimuxer
+      #   run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios
+
+      - name: Add beta suffix to version
+        run: sed -e '/MARKETING_VERSION = .*/s/$/-beta.${{ github.run_number }}/' -i '' Build.xcconfig
 
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1.4.1
@@ -33,13 +89,29 @@ jobs:
           xcode-version: ${{ matrix.version }}
 
       - name: Build SideStore
-        run: make build | xcpretty && exit ${PIPESTATUS[0]}
+        run: |
+          xcodebuild -project AltStore.xcodeproj \
+          -scheme AltStore \
+          -sdk iphoneos \
+          archive -archivePath ./archive \
+          CODE_SIGNING_REQUIRED=NO \
+          AD_HOC_CODE_SIGNING_ALLOWED=YES \
+          CODE_SIGNING_ALLOWED=NO \
+          DEVELOPMENT_TEAM=XYZ0123456 \
+          ORG_IDENTIFIER=com.SideStore \
+          | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
-        run: make fakesign
+        run: |
+          rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/
+          ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore
 
       - name: Convert to IPA
-        run: make ipa
+        run: |
+          mkdir Payload
+          mkdir Payload/SideStore.app
+          cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/
+          zip -r SideStore.ipa Payload
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3.1.0
@@ -59,22 +131,22 @@ jobs:
         id: date_altstore
         run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT
 
-      - name: Upload to new beta release
-        uses: softprops/action-gh-release@v1
+      - name: Upload to beta release
+        uses: IsaacShelton/update-existing-release@v1.3.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          name: ${{ steps.version.outputs.version }}
-          tag_name: ${{ github.ref_name }}
-          draft: true
+          release: "Beta"
+          tag: "beta"
           prerelease: true
           files: SideStore.ipa
           body: |
-            <!-- NOTE: to reset SideSource cache, go to `https://apps.sidestore.io/reset-cache/nightly/<sidesource key>`. This is not included in the GitHub Action since it makes draft releases so they can be edited and have a changelog. -->
-            Beta builds are hand-picked builds from development commits that will allow you to try out new features earlier than normal. However, **they might contain bugs and other issues. Use at your own risk!**
-
-            ## Changelog
+            This is an ⚠️ **EXPERIMENTAL** ⚠️ beta build for commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}).
             
-            - TODO
+            Beta builds are hand-picked builds from development commits that will allow you to try out new features earlier than normal, but with a lower chance of bugs than if you used nightly builds. However, since these changes are newer and less tested, they still have a good chance of bugs, so **use at your own risk**.
+            
+            If you want to be on the bleeding edge and use the latest development builds, you can look at [SideStore Nightly](https://github.com/${{ github.repository }}/releases/tag/nightly). **Please be aware that these builds have a much higher chance of bugs than beta or stable**.
+            
+            If you use the `SideStore (Beta)` app, it will use the latest beta build (make sure to update it in "My Apps").
             
             ## Build Info
             

.github/workflows/increase-nightly-build-num.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# Ensure we are in root directory
-cd "$(dirname "$0")/../.."
-
-DATE=`date -u +'%Y.%m.%d'`
-BUILD_NUM=1
-
-write() {
-    sed -e "/MARKETING_VERSION = .*/s/$/-nightly.$DATE.$BUILD_NUM/" -i '' Build.xcconfig
-    echo "$DATE,$BUILD_NUM" > .nightly-build-num
-}
-
-if [ ! -f ".nightly-build-num" ]; then
-    write
-    exit 0
-fi
-
-LAST_DATE=`cat .nightly-build-num | perl -n -e '/([^,]*),([^ ]*)$/ && print $1'`
-LAST_BUILD_NUM=`cat .nightly-build-num | perl -n -e '/([^,]*),([^ ]*)$/ && print $2'`
-
-if [[ "$DATE" != "$LAST_DATE" ]]; then
-    write
-else
-    BUILD_NUM=`expr $LAST_BUILD_NUM + 1`
-    write
-fi
-

.github/workflows/nightly.yml

@@ -24,17 +24,63 @@ jobs:
         with:
           submodules: recursive
 
+      # - name: Cache rust cargo
+      #   id: cache-rust-cargo
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-cargo
+      #   with:
+      #     path: ~/.cargo
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
+      # - name: Cache rust minimuxer
+      #   id: cache-rust-minimuxer
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-minimuxer
+      #   with:
+      #     path: ./Dependencies/minimuxer/target
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
+      # - name: Cache rust em_proxy
+      #   id: cache-rust-em_proxy
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-em_proxy
+      #   with:
+      #     path: ./Dependencies/em_proxy/target
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
       - name: Install dependencies
         run: brew install ldid
 
-      - name: Cache .nightly-build-num
-        uses: actions/cache@v3
+      - name: Install rustup
+        uses: actions-rs/toolchain@v1
         with:
-          path: .nightly-build-num
-          key: nightly-build-num
+          toolchain: stable
+          override: true
+          target: aarch64-apple-ios
 
-      - name: Increase nightly build number and set as version
-        run: bash .github/workflows/increase-nightly-build-num.sh
+      # - name: Create emotional damage
+      #   run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios
+
+      # - name: Build minimuxer
+      #   run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios
+
+      - name: Add nightly suffix to version
+        run: sed -e '/MARKETING_VERSION = .*/s/$/-nightly.${{ github.run_number }}/' -i '' Build.xcconfig
 
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1.4.1
@@ -42,13 +88,29 @@ jobs:
           xcode-version: ${{ matrix.version }}
 
       - name: Build SideStore
-        run: make build | xcpretty && exit ${PIPESTATUS[0]}
+        run: |
+          xcodebuild -project AltStore.xcodeproj \
+          -scheme AltStore \
+          -sdk iphoneos \
+          archive -archivePath ./archive \
+          CODE_SIGNING_REQUIRED=NO \
+          AD_HOC_CODE_SIGNING_ALLOWED=YES \
+          CODE_SIGNING_ALLOWED=NO \
+          DEVELOPMENT_TEAM=XYZ0123456 \
+          ORG_IDENTIFIER=com.SideStore \
+          | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
-        run: make fakesign
+        run: |
+          rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/
+          ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore
 
       - name: Convert to IPA
-        run: make ipa
+        run: |
+          mkdir Payload
+          mkdir Payload/SideStore.app
+          cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/
+          zip -r SideStore.ipa Payload
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3.1.0
@@ -79,9 +141,11 @@ jobs:
           body: |
             This is an ⚠️ **EXPERIMENTAL** ⚠️ nightly build for commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}).
             
-            Nightly builds are **extremely experimental builds only meant to be used by developers and alpha testers. They often contain bugs and experimental features. Use at your own risk!**
+            Nightly builds are built from the most recent commit which means you'll be able to try out new features very early. However, since these changes are much newer and less tested, they have a much higher chance of bugs, so **use at your own risk**.
             
-            If you want to try out new features early but want a lower chance of bugs, you can look at [SideStore Beta](https://github.com/${{ github.repository }}/releases?q=beta).
+            If you want to try out new features early but want a lower chance of bugs, you can look at [SideStore Beta](https://github.com/${{ github.repository }}/releases/tag/beta).
+            
+            If you use the `SideStore (Nightly)` app, it will use the latest nightly build (make sure to update it in "My Apps").
             
             ## Build Info
             
@@ -89,6 +153,3 @@ jobs:
             Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
             Commit SHA: `${{ github.sha }}`
             Version: `${{ steps.version.outputs.version }}`
-
-      - name: Reset cache for apps.sidestore.io/nightly
-        run: sleep 10 && curl https://apps.sidestore.io/reset-cache/nightly/${{ secrets.SIDESOURCE_KEY }}

.github/workflows/pr.yml

@@ -19,9 +19,61 @@ jobs:
         with:
           submodules: recursive
 
+      # - name: Cache rust cargo
+      #   id: cache-rust-cargo
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-cargo
+      #   with:
+      #     path: ~/.cargo
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
+      # - name: Cache rust minimuxer
+      #   id: cache-rust-minimuxer
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-minimuxer
+      #   with:
+      #     path: ./Dependencies/minimuxer/target
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
+      # - name: Cache rust em_proxy
+      #   id: cache-rust-em_proxy
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-em_proxy
+      #   with:
+      #     path: ./Dependencies/em_proxy/target
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
       - name: Install dependencies
         run: brew install ldid
 
+      - name: Install rustup
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+          target: aarch64-apple-ios
+
+      # - name: Create emotional damage
+      #   run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios
+
+      # - name: Build minimuxer
+      #   run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios
+
       - name: Add PR suffix to version
         run: sed -e '/MARKETING_VERSION = .*/s/$/-pr.${{ github.event.pull_request.number }}/' -i '' Build.xcconfig
 
@@ -31,13 +83,29 @@ jobs:
           xcode-version: ${{ matrix.version }}
 
       - name: Build SideStore
-        run: make build | xcpretty && exit ${PIPESTATUS[0]}
+        run: |
+          xcodebuild -project AltStore.xcodeproj \
+          -scheme AltStore \
+          -sdk iphoneos \
+          archive -archivePath ./archive \
+          CODE_SIGNING_REQUIRED=NO \
+          AD_HOC_CODE_SIGNING_ALLOWED=YES \
+          CODE_SIGNING_ALLOWED=NO \
+          DEVELOPMENT_TEAM=XYZ0123456 \
+          ORG_IDENTIFIER=com.SideStore \
+          | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
-        run: make fakesign
+        run: |
+          rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/
+          ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore
 
       - name: Convert to IPA
-        run: make ipa
+        run: |
+          mkdir Payload
+          mkdir Payload/SideStore.app
+          cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/
+          zip -r SideStore.ipa Payload
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3.1.0

.github/workflows/stable.yml

@@ -2,7 +2,7 @@ name: Stable SideStore build
 on:
   push:
     tags:
-      - '[0-9]+.[0-9]+.[0-9]+' # example: 1.0.0
+      - '[0-9]+.[0-9]+.[0-9]+*'
 
 jobs:
   build:
@@ -21,11 +21,60 @@ jobs:
         with:
           submodules: recursive
 
+      # - name: Cache rust cargo
+      #   id: cache-rust-cargo
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-cargo
+      #   with:
+      #     path: ~/.cargo
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
+      # - name: Cache rust minimuxer
+      #   id: cache-rust-minimuxer
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-minimuxer
+      #   with:
+      #     path: ./Dependencies/minimuxer/target
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
+      # - name: Cache rust em_proxy
+      #   id: cache-rust-em_proxy
+      #   uses: actions/cache@v3
+      #   env:
+      #     cache-name: cache-rust-em_proxy
+      #   with:
+      #     path: ./Dependencies/em_proxy/target
+      #     key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-build-${{ env.cache-name }}-
+      #       ${{ runner.os }}-build-
+      #       ${{ runner.os }}-
+
       - name: Install dependencies
         run: brew install ldid
 
-      - name: Change version to tag
-        run: sed -e '/MARKETING_VERSION = .*/s/= .*/= ${{ github.ref_name }}/' -i '' Build.xcconfig
+      - name: Install rustup
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+          target: aarch64-apple-ios
+
+      # - name: Create emotional damage
+      #   run: cd Dependencies/em_proxy && cargo build --release --target aarch64-apple-ios
+
+      # - name: Build minimuxer
+      #   run: cd Dependencies/minimuxer && cargo build --release --target aarch64-apple-ios
 
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1.4.1
@@ -33,13 +82,29 @@ jobs:
           xcode-version: ${{ matrix.version }}
 
       - name: Build SideStore
-        run: make build | xcpretty && exit ${PIPESTATUS[0]}
+        run: |
+          xcodebuild -project AltStore.xcodeproj \
+          -scheme AltStore \
+          -sdk iphoneos \
+          archive -archivePath ./archive \
+          CODE_SIGNING_REQUIRED=NO \
+          AD_HOC_CODE_SIGNING_ALLOWED=YES \
+          CODE_SIGNING_ALLOWED=NO \
+          DEVELOPMENT_TEAM=XYZ0123456 \
+          ORG_IDENTIFIER=com.SideStore \
+          | xcpretty && exit ${PIPESTATUS[0]}
 
       - name: Fakesign app
-        run: make fakesign
+        run: |
+          rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/
+          ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore
 
       - name: Convert to IPA
-        run: make ipa
+        run: |
+          mkdir Payload
+          mkdir Payload/SideStore.app
+          cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/
+          zip -r SideStore.ipa Payload
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3.1.0
@@ -64,11 +129,10 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ steps.version.outputs.version }}
-          tag_name: ${{ github.ref_name }}
+          tag_name: ${{ github.ref }}
           draft: true
           files: SideStore.ipa
           body: |
-            <!-- NOTE: to reset SideSource cache, go to `https://apps.sidestore.io/reset-cache/nightly/<sidesource key>`. This is not included in the GitHub Action since it makes draft releases so they can be edited and have a changelog. -->
             ## Changelog
             
             - TODO

.gitignore

@@ -33,12 +33,4 @@ xcuserdata
 /.vscode
 
 ## AppCode specific
-.idea/
-
-Payload/
-SideStore.ipa
-Dependencies/.*-prebuilt-fetch-*
-Dependencies/minimuxer/*
-Dependencies/em_proxy/*
-!Dependencies/**/.gitkeep
-.nightly-build-num
+.idea/

.gitmodules

@@ -13,9 +13,15 @@
 [submodule "Dependencies/MarkdownAttributedString"]
 	path = Dependencies/MarkdownAttributedString
 	url = https://github.com/chockenberry/MarkdownAttributedString.git
+[submodule "Dependencies/em_proxy"]
+	path = Dependencies/em_proxy
+	url = https://github.com/jkcoxson/em_proxy
 [submodule "Dependencies/libimobiledevice-glue"]
 	path = Dependencies/libimobiledevice-glue
 	url = https://github.com/libimobiledevice/libimobiledevice-glue
+[submodule "Dependencies/minimuxer"]
+	path = Dependencies/minimuxer
+	url = https://github.com/SideStore/minimuxer
 [submodule "Dependencies/libfragmentzip"]
 	path = Dependencies/libfragmentzip
 	url = https://github.com/SideStore/libfragmentzip.git

AltStore.xcodeproj/project.pbxproj

@@ -43,6 +43,7 @@
 		B39575F5284F29E20080B4FF /* Roxas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B39575F4284F29E20080B4FF /* Roxas.framework */; };
 		B39F16132918D7C5002E9404 /* Consts.swift in Sources */ = {isa = PBXBuildFile; fileRef = B39F16122918D7C5002E9404 /* Consts.swift */; };
 		B39F16152918D7DA002E9404 /* Consts+Proxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B39F16142918D7DA002E9404 /* Consts+Proxy.swift */; };
+		B3C053B7295F921E0079DB81 /* NetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3C053B6295F921E0079DB81 /* NetworkService.swift */; };
 		B3C395F1284F2DE700DA9E2F /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = B3C395F0284F2DE700DA9E2F /* KeychainAccess */; };
 		B3C395F4284F35DD00DA9E2F /* Nuke in Frameworks */ = {isa = PBXBuildFile; productRef = B3C395F3284F35DD00DA9E2F /* Nuke */; };
 		B3C395F7284F362400DA9E2F /* AppCenterAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = B3C395F6284F362400DA9E2F /* AppCenterAnalytics */; };
@@ -501,6 +502,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		19104DA92909BC7100C49C7B /* em_proxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = em_proxy.h; sourceTree = "<group>"; };
 		19104DB22909C06C00C49C7B /* libEmotionalDamage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libEmotionalDamage.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		19104DB42909C06D00C49C7B /* EmotionalDamage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmotionalDamage.swift; sourceTree = "<group>"; };
 		191E5FAB290A5D92001A3B7C /* libminimuxer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminimuxer.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -509,6 +511,7 @@
 		191E5FCF290A651D001A3B7C /* jplist.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jplist.c; path = Dependencies/libplist/src/jplist.c; sourceTree = SOURCE_ROOT; };
 		191E5FD0290A651D001A3B7C /* jsmn.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jsmn.c; path = Dependencies/libplist/src/jsmn.c; sourceTree = SOURCE_ROOT; };
 		191E5FD1290A651D001A3B7C /* jsmn.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jsmn.h; path = Dependencies/libplist/src/jsmn.h; sourceTree = SOURCE_ROOT; };
+		191E5FD7290A6EFB001A3B7C /* minimuxer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = minimuxer.h; path = ../Dependencies/minimuxer/minimuxer.h; sourceTree = "<group>"; };
 		1920B04E2924AC8300744F60 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectTeamViewController.swift; sourceTree = "<group>"; };
 		B3146EC6284F580500BBC3FD /* Roxas.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Roxas.xcodeproj; path = Dependencies/Roxas/Roxas.xcodeproj; sourceTree = "<group>"; };
@@ -531,6 +534,7 @@
 		B39575F4284F29E20080B4FF /* Roxas.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Roxas.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B39F16122918D7C5002E9404 /* Consts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Consts.swift; sourceTree = "<group>"; };
 		B39F16142918D7DA002E9404 /* Consts+Proxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Consts+Proxy.swift"; sourceTree = "<group>"; };
+		B3C053B6295F921E0079DB81 /* NetworkService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkService.swift; sourceTree = "<group>"; };
 		B3C39606284F4C8400DA9E2F /* CodeSigning.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = CodeSigning.xcconfig; sourceTree = "<group>"; };
 		B3C39607284F4C8400DA9E2F /* Build.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Build.xcconfig; sourceTree = "<group>"; };
 		B3C39608284F4C8400DA9E2F /* CodeSigning.xcconfig.sample */ = {isa = PBXFileReference; lastKnownFileType = text; path = CodeSigning.xcconfig.sample; sourceTree = "<group>"; };
@@ -937,6 +941,7 @@
 			isa = PBXGroup;
 			children = (
 				B343F84D295F6323002B1159 /* em_proxy.xcodeproj */,
+				19104DA92909BC7100C49C7B /* em_proxy.h */,
 				19104DB42909C06D00C49C7B /* EmotionalDamage.swift */,
 			);
 			path = EmotionalDamage;
@@ -946,6 +951,7 @@
 			isa = PBXGroup;
 			children = (
 				B343F847295F6321002B1159 /* minimuxer.xcodeproj */,
+				191E5FD7290A6EFB001A3B7C /* minimuxer.h */,
 				191E5FAD290A5D92001A3B7C /* minimuxer.swift */,
 			);
 			path = minimuxer;
@@ -1022,6 +1028,14 @@
 			path = Consts;
 			sourceTree = "<group>";
 		};
+		B3C053B5295F921E0079DB81 /* Services */ = {
+			isa = PBXGroup;
+			children = (
+				B3C053B6295F921E0079DB81 /* NetworkService.swift */,
+			);
+			path = Services;
+			sourceTree = "<group>";
+		};
 		BF0DCA642433BDE200E3A595 /* Analytics */ = {
 			isa = PBXGroup;
 			children = (
@@ -1556,6 +1570,7 @@
 				BF3D648922E79A7700E9056B /* Types */,
 				BFD2479D2284FBBD00981D42 /* Extensions */,
 				BFD247962284D7C100981D42 /* Resources */,
+				B3C053B5295F921E0079DB81 /* Services */,
 				BF6C8FA8242935CA00125131 /* Dependencies */,
 				BFD247972284D7D800981D42 /* Supporting Files */,
 				1920B04E2924AC8300744F60 /* Settings.bundle */,
@@ -2469,6 +2484,7 @@
 				BF88F97224F8727D00BB75DF /* AppManagerErrors.swift in Sources */,
 				B39F16152918D7DA002E9404 /* Consts+Proxy.swift in Sources */,
 				BF6C8FAE2429597900125131 /* BannerCollectionViewCell.swift in Sources */,
+				B3C053B7295F921E0079DB81 /* NetworkService.swift in Sources */,
 				BF6F439223644C6E00A0B879 /* RefreshAltStoreViewController.swift in Sources */,
 				BFE60742231B07E6002B0E8E /* SettingsHeaderFooterView.swift in Sources */,
 				BFE338E822F10E56002E24B9 /* LaunchViewController.swift in Sources */,
@@ -2615,14 +2631,15 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Dependencies/em_proxy",
+					"$(PROJECT_DIR)/Dependencies/em_proxy/target/aarch64-apple-ios/release",
+					"$(PROJECT_DIR)/Dependencies/em_proxy/target/aarch64-apple-ios/debug",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OBJC_BRIDGING_HEADER = Dependencies/em_proxy/em_proxy.h;
+				SWIFT_OBJC_BRIDGING_HEADER = EmotionalDamage/em_proxy.h;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 14.0;
@@ -2641,13 +2658,14 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Dependencies/em_proxy",
+					"$(PROJECT_DIR)/Dependencies/em_proxy/target/aarch64-apple-ios/release",
+					"$(PROJECT_DIR)/Dependencies/em_proxy/target/aarch64-apple-ios/debug",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = Dependencies/em_proxy/em_proxy.h;
+				SWIFT_OBJC_BRIDGING_HEADER = EmotionalDamage/em_proxy.h;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 14.0;
@@ -2667,13 +2685,14 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Dependencies/minimuxer",
+					"$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/release",
+					"$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/debug",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OBJC_BRIDGING_HEADER = Dependencies/minimuxer/minimuxer.h;
+				SWIFT_OBJC_BRIDGING_HEADER = minimuxer/minimuxer.h;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -2690,12 +2709,13 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Dependencies/minimuxer",
+					"$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/release",
+					"$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/debug",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_OBJC_BRIDGING_HEADER = Dependencies/minimuxer/minimuxer.h;
+				SWIFT_OBJC_BRIDGING_HEADER = minimuxer/minimuxer.h;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -3195,6 +3215,8 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Dependencies/fragmentzip",
 					"$(PROJECT_DIR)/Dependencies/libcurl",
+					"$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/debug",
+					"$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/release",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3229,6 +3251,8 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Dependencies/fragmentzip",
 					"$(PROJECT_DIR)/Dependencies/libcurl",
+					"$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/debug",
+					"$(PROJECT_DIR)/Dependencies/minimuxer/target/aarch64-apple-ios/release",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";

AltStore/LaunchViewController.swift

@@ -79,7 +79,7 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg
         } else {
             // Show an alert explaining the pairing file
             // Create new Alert
-            let dialogMessage = UIAlertController(title: "Pairing File", message: "Select the pairing file for your device. For more information, go to https://wiki.sidestore.io/guides/install#pairing-process", preferredStyle: .alert)
+            let dialogMessage = UIAlertController(title: "Pairing File", message: "Select the pairing file for your device. For more information, go to https://youtu.be/dQw4w9WgXcQ", preferredStyle: .alert)
             
             // Create OK button with action handler
             let ok = UIAlertAction(title: "OK", style: .default, handler: { (action) -> Void in

AltStore/Managing Apps/AppManager.swift

@@ -392,8 +392,7 @@ extension AppManager
     func fetchAppIDs(completionHandler: @escaping (Result<([AppID], NSManagedObjectContext), Error>) -> Void)
     {
         let authenticationOperation = self.authenticate(presentingViewController: nil) { (result) in
-            // result contains name, email, auth token, OTP and other possibly personal/account specific info. we don't want this logged
-            //print("Authenticated for fetching App IDs with result:", result)
+            print("Authenticated for fetching App IDs with result:", result)
         }
         
         let fetchAppIDsOperation = FetchAppIDsOperation(context: authenticationOperation.context)

AltStore/My Apps/MyAppsViewController.swift

@@ -754,7 +754,7 @@ private extension MyAppsViewController
         {
             let downloadProgress = Progress.discreteProgress(totalUnitCount: 100)
             downloadOperation = RSTAsyncBlockOperation { (operation) in
-                let downloadTask = URLSession.shared.downloadTask(with: url) { (fileURL, response, error) in
+                let downloadTask = AppServices.network.session.downloadTask(with: url) { (fileURL, response, error) in
                     do
                     {
                         let (fileURL, _) = try Result((fileURL, response), error).get()

AltStore/Operations/DownloadAppOperation.swift

@@ -39,8 +39,8 @@ final class DownloadAppOperation: ResultOperation<ALTApplication>
     private var sourceURL: URL?
     private let destinationURL: URL
     
-    private let session = URLSession(configuration: .default)
-    private let temporaryDirectory = FileManager.default.uniqueTemporaryURL()
+    private let session: URLSession = AppServices.network.backgroundSession
+    private let temporaryDirectory: URL = FileManager.default.uniqueTemporaryURL()
     
     init(app: AppProtocol, destinationURL: URL, context: AppOperationContext)
     {

AltStore/Operations/FetchAnisetteDataOperation.swift

@@ -34,30 +34,31 @@ final class FetchAnisetteDataOperation: ResultOperation<ALTAnisetteData>
         
         let url = AnisetteManager.currentURL
         DLOG("Anisette URL: %@", url.absoluteString)
-        
-        let task = URLSession.shared.dataTask(with: url) { data, response, error in
-            guard let data = data, error == nil else { return }
-            
-            do {
-                // make sure this JSON is in the format we expect
-                // convert data to json
-                if let json = try JSONSerialization.jsonObject(with: data, options: []) as? [String: String] {
-                    // try to read out a dictionary
-                    //for some reason serial number isn't needed but it doesn't work unless it has a value
-                    let formattedJSON: [String: String] = ["machineID": json["X-Apple-I-MD-M"]!, "oneTimePassword": json["X-Apple-I-MD"]!, "localUserID": json["X-Apple-I-MD-LU"]!, "routingInfo": json["X-Apple-I-MD-RINFO"]!, "deviceUniqueIdentifier": json["X-Mme-Device-Id"]!, "deviceDescription": json["X-MMe-Client-Info"]!, "date": json["X-Apple-I-Client-Time"]!, "locale": json["X-Apple-Locale"]!, "timeZone": json["X-Apple-I-TimeZone"]!, "deviceSerialNumber": "1"]
-                    
-                    if let anisette = ALTAnisetteData(json: formattedJSON) {
+
+        let task = AppServices.network.session.dataTask(with: url) { data, response, error in
+
+               guard let data = data, error == nil else { return }
+
+               do {
+                   // make sure this JSON is in the format we expect
+                   // convert data to json
+                   if let json = try JSONSerialization.jsonObject(with: data, options: []) as? [String: String] {
+                       // try to read out a dictionary
+                           //for some reason serial number isn't needed but it doesn't work unless it has a value
+                       let formattedJSON: [String: String] = ["machineID": json["X-Apple-I-MD-M"]!, "oneTimePassword": json["X-Apple-I-MD"]!, "localUserID": json["X-Apple-I-MD-LU"]!, "routingInfo": json["X-Apple-I-MD-RINFO"]!, "deviceUniqueIdentifier": json["X-Mme-Device-Id"]!, "deviceDescription": json["X-MMe-Client-Info"]!, "date": json["X-Apple-I-Client-Time"]!, "locale": json["X-Apple-Locale"]!, "timeZone": json["X-Apple-I-TimeZone"]!, "deviceSerialNumber": "1"]
+                       
+                       if let anisette = ALTAnisetteData(json: formattedJSON) {
                         DLOG("Anisette used: %@", formattedJSON)
-                        self.finish(.success(anisette))
-                    }
-                }
-            } catch let error as NSError {
-                print("Failed to load: \(error.localizedDescription)")
-                self.finish(.failure(error))
-            }
-            
-        }
-        
-        task.resume()
+                           self.finish(.success(anisette))
+                       }
+                   }
+               } catch let error as NSError {
+                   print("Failed to load: \(error.localizedDescription)")
+                   self.finish(.failure(error))
+               }
+
+           }
+
+           task.resume()
     }
 }

AltStore/Operations/FetchSourceOperation.swift

@@ -12,13 +12,51 @@ import CoreData
 import AltStoreCore
 import Roxas
 
+func matches(for regex: String, in text: String) -> [String] {
+
+    do {
+        let regex = try NSRegularExpression(pattern: regex)
+        let results = regex.matches(in: text,
+                                    range: NSRange(text.startIndex..., in: text))
+        return results.map {
+            String(text[Range($0.range, in: text)!])
+        }
+    } catch let error {
+        print("invalid regex: \(error.localizedDescription)")
+        return []
+    }
+}
+
+func containsRedirect(_ response: URLResponse?, data: Data?) -> String? {
+    if let httpResponse = response as? HTTPURLResponse {
+        print("Request status code: \(httpResponse.statusCode)")
+        print("Request headers: \(httpResponse.allHeaderFields.debugDescription)")
+
+        guard let data = data else {
+            print("Request error: missing data")
+            return nil
+        }
+        let rawHttp = String(decoding: data, as: UTF8.self)
+        let regex = "url=((https|http):\\/\\/[\\S]*)\">"
+        guard var redirectURL = matches(for: regex, in: rawHttp).first else {
+            return nil
+        }
+        redirectURL = redirectURL.replacingOccurrences(of: "url=", with: "")
+        redirectURL = redirectURL.replacingOccurrences(of: "\">", with: "")
+        print("redirectURL: \(redirectURL)")
+        return redirectURL
+    } else {
+        return nil
+    }
+}
+
 @objc(FetchSourceOperation)
 final class FetchSourceOperation: ResultOperation<Source>
 {
     let sourceURL: URL
     let managedObjectContext: NSManagedObjectContext
     
-    private let session: URLSession
+    private let session: URLSession = AppServices.network.sessionNoCache
     
     private lazy var dateFormatter: ISO8601DateFormatter = {
         let dateFormatter = ISO8601DateFormatter()
@@ -29,79 +67,98 @@ final class FetchSourceOperation: ResultOperation<Source>
     {
         self.sourceURL = sourceURL
         self.managedObjectContext = managedObjectContext
-        
-        let configuration = URLSessionConfiguration.default
-        configuration.requestCachePolicy = .reloadIgnoringLocalCacheData
-        configuration.urlCache = nil
-        
-        self.session = URLSession(configuration: configuration)
     }
     
     override func main()
     {
         super.main()
-        
-        let dataTask = self.session.dataTask(with: self.sourceURL) { (data, response, error) in
-            
-            let childContext = DatabaseManager.shared.persistentContainer.newBackgroundContext(withParent: self.managedObjectContext)
-            childContext.mergePolicy = NSOverwriteMergePolicy
-            childContext.perform {
-                do
-                {
-                    let (data, _) = try Result((data, response), error).get()
-                    
-                    let decoder = AltStoreCore.JSONDecoder()
-                    decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
-                        let container = try decoder.singleValueContainer()
-                        let text = try container.decode(String.self)
-                        
-                        // Full ISO8601 Format.
-                        self.dateFormatter.formatOptions = [.withFullDate, .withFullTime, .withTimeZone]
-                        if let date = self.dateFormatter.date(from: text)
-                        {
-                            return date
-                        }
-                        
-                        // Just date portion of ISO8601.
-                        self.dateFormatter.formatOptions = [.withFullDate]
-                        if let date = self.dateFormatter.date(from: text)
-                        {
-                            return date
-                        }
-                        
-                        throw DecodingError.dataCorruptedError(in: container, debugDescription: "Date is in invalid format.")
-                    })
-                    
-                    decoder.managedObjectContext = childContext
-                    decoder.sourceURL = self.sourceURL
-                    
-                    let source = try decoder.decode(Source.self, from: data)
-                    let identifier = source.identifier
-                    
-                    try childContext.save()
-                    
-                    self.managedObjectContext.perform {
-                        if let source = Source.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(Source.identifier), identifier), in: self.managedObjectContext)
-                        {
-                            self.finish(.success(source))
-                        }
-                        else
-                        {
-                            self.finish(.failure(OperationError.noSources))
-                        }
-                    }
-                }
-                catch
-                {
-                    self.managedObjectContext.perform {
-                        self.finish(.failure(error))
-                    }
-                }
-            }
-        }
-        
+        loadSource(self.sourceURL)
+    }
+    
+    private func loadSource(_ url: URL) {
+        let dataTask = createDataTask(with: url)
         self.progress.addChild(dataTask.progress, withPendingUnitCount: 1)
         
         dataTask.resume()
     }
+    
+    private func createDataTask(with url: URL) -> URLSessionDataTask {
+        let dataTask = self.session.dataTask(with: url) { (data, response, error) in
+            // Test code for http redirect HTML, though seems I got jekyll/sidestore to work without this now - @JoeMatt
+            if let error = error {
+                print("Request error: \(error)")
+                // TODO: Handle error
+                self.finish(.failure(error))
+                return
+            }
+            
+            if let redirect = containsRedirect(response, data: data), let redirectURL = URL(string: redirect) {
+                DispatchQueue.main.async {
+                    self.loadSource(redirectURL)
+                }
+            } else {
+                self.processJSON(data: data, response: response, error: error)
+            }
+        }
+        return dataTask
+    }
+    
+    private func processJSON(data: Data?, response: URLResponse?, error: Error?) {
+        let childContext = DatabaseManager.shared.persistentContainer.newBackgroundContext(withParent: self.managedObjectContext)
+        childContext.mergePolicy = NSOverwriteMergePolicy
+        childContext.perform {
+            do
+            {
+                let (data, _) = try Result((data, response), error).get()
+                
+                let decoder = AltStoreCore.JSONDecoder()
+                decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
+                    let container = try decoder.singleValueContainer()
+                    let text = try container.decode(String.self)
+                    
+                    // Full ISO8601 Format.
+                    self.dateFormatter.formatOptions = [.withFullDate, .withFullTime, .withTimeZone]
+                    if let date = self.dateFormatter.date(from: text)
+                    {
+                        return date
+                    }
+                    
+                    // Just date portion of ISO8601.
+                    self.dateFormatter.formatOptions = [.withFullDate]
+                    if let date = self.dateFormatter.date(from: text)
+                    {
+                        return date
+                    }
+                    
+                    throw DecodingError.dataCorruptedError(in: container, debugDescription: "Date is in invalid format.")
+                })
+                
+                decoder.managedObjectContext = childContext
+                // Note: This may need to be response.url instead, to handle redirects @JoeMatt
+                decoder.sourceURL = response?.url ?? self.sourceURL
+                
+                let source = try decoder.decode(Source.self, from: data)
+                let identifier = source.identifier
+                
+                try childContext.save()
+                
+                self.managedObjectContext.perform {
+                    if let source = Source.first(satisfying: NSPredicate(format: "%K == %@", #keyPath(Source.identifier), identifier), in: self.managedObjectContext)
+                    {
+                        self.finish(.success(source))
+                    }
+                    else
+                    {
+                        self.finish(.failure(OperationError.noSources))
+                    }
+                }
+            }
+            catch
+            {
+                self.managedObjectContext.perform {
+                    self.finish(.failure(error))
+                }
+            }
+        }
+    }
 }

AltStore/Operations/FetchTrustedSourcesOperation.swift

@@ -37,8 +37,8 @@ final class FetchTrustedSourcesOperation: ResultOperation<[FetchTrustedSourcesOp
     override func main()
     {
         super.main()
-        
-        let dataTask = URLSession.shared.dataTask(with: .trustedSources) { (data, response, error) in
+        let session: URLSession = AppServices.network.session
+        let dataTask = session.dataTask(with: .trustedSources) { (data, response, error) in
             do
             {
                 if let response = response as? HTTPURLResponse

AltStore/Operations/UpdatePatronsOperation.swift

@@ -43,7 +43,7 @@ final class UpdatePatronsOperation: ResultOperation<Void>
     {
         super.main()
         
-        let dataTask = URLSession.shared.dataTask(with: .patreonInfo) { (data, response, error) in
+        let dataTask = AppServices.network.session.dataTask(with: .patreonInfo) { (data, response, error) in
             do
             {
                 if let response = response as? HTTPURLResponse

AltStore/Services/NetworkService.swift

@@ -0,0 +1,94 @@
+//
+//  NetworkService.swift
+//  SideStore
+//
+//  Created by Joseph Mattiello on 11/6/22.
+//  Copyright © 2022 Riley Testut. All rights reserved.
+//
+
+import Foundation
+
+public protocol Services {
+    var network: any NetworkService { get }
+}
+
+public protocol NetworkService {
+    var session: URLSession { get }
+    var sessionNoCache: URLSession { get }
+    var backgroundSession: URLSession { get }
+}
+ 
+public struct DefaultServices: Services {
+    public var network: NetworkService = AltNetworkService()
+}
+
+let AppServices = DefaultServices()
+
+final public class AltNetworkDelegate: NSObject, URLSessionDelegate, URLSessionTaskDelegate  {
+    public override init() {
+        super.init()
+    }
+    
+    public struct Options: OptionSet {
+        public let rawValue: Int
+        public init(rawValue: Int) {
+            self.rawValue = rawValue
+        }
+        
+        public static let redirect = Options(rawValue: 1 << 0)
+        public static let all: Options = [.redirect]
+    }
+    
+    var options: Options = .all
+    
+//    public func urlSession(_ session: URLSession, task: URLSessionTask, willPerformHTTPRedirection response: HTTPURLResponse, newRequest request: URLRequest, completionHandler: @escaping (URLRequest?) -> Void) {
+//        if options.contains(.redirect) {
+//            completionHandler(request)
+//        } else {
+//            completionHandler(nil)
+//        }
+//    }
+    
+    public func urlSession(_ session: URLSession, task: URLSessionTask, willPerformHTTPRedirection response: HTTPURLResponse, newRequest request: URLRequest) async -> URLRequest? {
+        if options.contains(.redirect) {
+            return request
+        } else {
+            return nil
+        }
+    }
+}
+
+public final class AltNetworkService: NetworkService {
+    let delegate = AltNetworkDelegate()
+    
+    lazy var delegateQueue: OperationQueue = {
+        let queue = OperationQueue.init()
+        queue.name = "com.sidestore.NetworkService.serialOperationQueue"
+        queue.maxConcurrentOperationCount = 1
+        return queue
+    }()
+    
+    public lazy var session: URLSession = {
+        let configuration: URLSessionConfiguration = URLSessionConfiguration.default
+        configuration.httpShouldSetCookies = true
+        configuration.httpShouldUsePipelining = true
+        let session = URLSession.init(configuration: configuration, delegate: delegate, delegateQueue: delegateQueue)
+        return session
+    }()
+    
+    public lazy var sessionNoCache: URLSession = {
+        let configuration: URLSessionConfiguration = URLSessionConfiguration.default
+        configuration.requestCachePolicy = .reloadIgnoringLocalCacheData
+        configuration.urlCache = nil
+        let session = URLSession.init(configuration: configuration, delegate: delegate, delegateQueue: delegateQueue)
+        return session
+    }()
+    
+    static let backgroundSessionIdentifier = "SideStoreBackgroundSession"
+    
+    public lazy var backgroundSession: URLSession = {
+        let configuration: URLSessionConfiguration = URLSessionConfiguration.background(withIdentifier: AltNetworkService.backgroundSessionIdentifier)
+        let session = URLSession.init(configuration: configuration, delegate: delegate, delegateQueue: nil)
+        return session
+    }()
+}

AltStore/Sources/SourcesViewController.swift

@@ -381,12 +381,13 @@ private extension SourcesViewController
                 dispatchGroup.notify(queue: .main) {
                     if let error = fetchError
                     {
-                        print(error)
-                        // 1 error doesn't mean all trusted sources failed to load! Riley, why did you do this???????
-//                        finish(.failure(error))
+                        finish(.failure(error))
+                    }
+                    else
+                    {
+                        let sources = featuredSourceURLs.compactMap { sourcesByURL[$0] }
+                        finish(.success(sources))
                     }
-                    let sources = featuredSourceURLs.compactMap { sourcesByURL[$0] }
-                    finish(.success(sources))
                 }
             }
         }

Build.xcconfig

@@ -1,8 +1,8 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-MARKETING_VERSION = 0.3.1
-CURRENT_PROJECT_VERSION = 3021
+MARKETING_VERSION = 0.3.0
+CURRENT_PROJECT_VERSION = 3020
 
 // Vars to be overwritten by `CodeSigning.xcconfig` if exists
 DEVELOPMENT_TEAM = S32Z3HMYVQ

CONTRIBUTING.md

@@ -1,61 +0,0 @@
-# Contributing to SideStore
-
-Thank you for your interest in contributing to SideStore! SideStore is a community driven project, and it's made possible by people like you.
-
-There are many ways to contribute to SideStore, so if you aren't a developer, there are still many other ways you can help out:
-
--   [Writing documentation](https://github.com/SideStore/SideStore-Docs)
--   [Submitting detailed bug reports and suggesting new features](https://github.com/SideStore/SideStore/issues/new/choose)
--   Helping out with support
-    -   [Discord](https://discord.gg/RgpFBX3Q3k)
-    -   [GitHub Discussions](https://github.com/SideStore/SideStore/discussions)
-
-However, this guide will focus on the development side of things. For now, we will only have setup information here, but you can [join our Discord](https://discord.gg/RgpFBX3Q3k) if you need help
-after setup.
-
-## Requirements
-
-This guide assumes you:
-
--   are on a Mac
--   have Xcode installed
--   have basic command line knowledge (know how to run commands, cd into a directory)
--   have basic Git knowledge ([GitHub Desktop](https://desktop.github.com) is a great tool for beginners, and greatly simplifies working with Git)
--   have basic Swift/iOS development knowledge
-
-## Setup
-
-1. Fork the SideStore repo on GitHub.
-2. Clone the fork: `git clone https://github.com/<your github username>/SideStore.git --recurse-submodules`
-
-    If you are using GitHub Desktop, refer to
-    [this guide](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop).
-
-3. Copy `CodeSigning.xcconfig.sample` to `CodeSigning.xcconfig` and fill in the values.
-4. **(Development only)** Change the value for `ALTDeviceID` in the Info.plist to your device's UDID. Normally, SideServer embeds the device's UDID in SideStore's Info.plist during installation. When
-   running through Xcode you'll need to set the value yourself or else SideStore won't resign (or even install) apps for the proper device. You can achieve this by changing a few things to be able to
-   build and use SideStore.
-5. Finally, open `AltStore.xcodeproj` in Xcode.
-
-Next, make and test your changes. Then, commit and push your changes using git and make a pull request.
-
-## Prebuilt binary information
-
-minimuxer and em_proxy use prebuilt static library binaries built by GitHub Actions to speed up builds and remove the need for Rust to be installed when working on SideStore.
-[`Dependencies/fetch-prebuilt.sh`](./Dependencies/fetch-prebuilt.sh) will be run before each build by Xcode, and it will check if the downloaded binaries are up-to-date once every 6 hours. If you want
-to force it to check for new binaries, run `bash ./Dependencies/fetch-prebuilt.sh force`.
-
-## Building an IPA for distribution
-
-You can use the Makefile: `make build fakesign ipa`
-
-This will create SideStore.ipa.
-
-> **Warning**
->
-> The binary created will contain paths to Xcode's DerivedData, and if you built minimuxer on your machine, paths to $HOME/.cargo. This will include your username. If you want to keep your user's
-> username private, you might want to get GitHub Actions to build the IPA instead.
-
-## Developing minimuxer alongside SideStore
-
-Please see [minimuxer's README](https://github.com/SideStore/minimuxer) for development instructions.

Dependencies/em_proxy.xcodeproj/project.pbxproj

@@ -1,343 +1,371 @@
 // !$*UTF8*$!
 {
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 53;
-	objects = {
-
+    /* generated with cargo-xcode 1.5.0 */
+    archiveVersion = 1;
+    classes = {
+    };
+    objectVersion = 53;
+    objects = {
 /* Begin PBXBuildFile section */
-		9987603429A4555300818586 /* em_proxy.h in Sources */ = {isa = PBXBuildFile; fileRef = 9999259129A45319005CF020 /* em_proxy.h */; };
+        
+                CA60E4E02AAAA30E3695DD59 /* Cargo.toml in Sources */ = {
+                    isa = PBXBuildFile;
+                    fileRef = CA6094FFF6923EF4668187A5 /* Cargo.toml */;
+                    settings = {
+                        COMPILER_FLAGS = "--lib"; /* == OTHER_INPUT_FILE_FLAGS */
+                    };
+                };
+                
+                CA60E4E02AAA37FC563E4BCC /* Cargo.toml in Sources */ = {
+                    isa = PBXBuildFile;
+                    fileRef = CA6094FFF6923EF4668187A5 /* Cargo.toml */;
+                    settings = {
+                        COMPILER_FLAGS = "--bin 'run'"; /* == OTHER_INPUT_FILE_FLAGS */
+                    };
+                };
+                
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildRule section */
-		CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */ = {
-			isa = PBXBuildRule;
-			compilerSpec = com.apple.compilers.proxy.script;
-			filePatterns = "*/em_proxy.h";
-			fileType = pattern.proxy;
-			inputFiles = (
-			);
-			isEditable = 0;
-			name = "Cargo project build";
-			outputFiles = (
-				"$(OBJECT_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME)",
-			);
-			script = "# generated with cargo-xcode 1.5.0\n# modified to use prebuilt binaries\n\nset -eu;\n\nBUILT_SRC=\"./em_proxy/$LIB_FILE_NAME.a\"\nln -f -- \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\" || cp \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\necho \"$BUILT_SRC -> $TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\n#DEP_FILE_SRC=\"minimuxer/target/${CARGO_XCODE_TARGET_TRIPLE}/release/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\n#if [ -f \"$DEP_FILE_SRC\" ]; then\n#    DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n#    cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n#    echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\n#fi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don't stay around after archs change\n# must match input for LipoScript\n#FILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\n#touch \"$FILE_LIST\"\n#if ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n#    echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\n#fi\n";
-		};
+        CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */ = {
+            isa = PBXBuildRule;
+            compilerSpec = com.apple.compilers.proxy.script;
+            dependencyFile = "$(DERIVED_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME).d";
+            filePatterns = "*/Cargo.toml"; /* must contain asterisk */
+            fileType = pattern.proxy;
+            inputFiles = ();
+            isEditable = 0;
+            name = "Cargo project build";
+            outputFiles = (
+                "$(OBJECT_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME)",
+            );
+            script = "# generated with cargo-xcode 1.5.0\n\nset -eu; export PATH=\"$PATH:$HOME/.cargo/bin:/usr/local/bin\";\nif [ \"${IS_MACCATALYST-NO}\" = YES ]; then\n    CARGO_XCODE_TARGET_TRIPLE=\"${CARGO_XCODE_TARGET_ARCH}-apple-ios-macabi\"\nelse\n    CARGO_XCODE_TARGET_TRIPLE=\"${CARGO_XCODE_TARGET_ARCH}-apple-${CARGO_XCODE_TARGET_OS}\"\nfi\nif [ \"$CARGO_XCODE_TARGET_OS\" != \"darwin\" ]; then\n    PATH=\"${PATH/\\/Contents\\/Developer\\/Toolchains\\/XcodeDefault.xctoolchain\\/usr\\/bin:/xcode-provided-ld-cant-link-lSystem-for-the-host-build-script:}\"\nfi\nPATH=\"$PATH:/opt/homebrew/bin\" # Rust projects often depend on extra tools like nasm, which Xcode lacks\nif [ \"$CARGO_XCODE_BUILD_MODE\" == release ]; then\n    OTHER_INPUT_FILE_FLAGS=\"${OTHER_INPUT_FILE_FLAGS} --release\"\nfi\nif command -v rustup &> /dev/null; then\n    if ! rustup target list --installed | egrep -q \"${CARGO_XCODE_TARGET_TRIPLE}\"; then\n        echo \"warning: this build requires rustup toolchain for $CARGO_XCODE_TARGET_TRIPLE, but it isn\'t installed\"\n        rustup target add \"${CARGO_XCODE_TARGET_TRIPLE}\" || echo >&2 \"warning: can\'t install $CARGO_XCODE_TARGET_TRIPLE\"\n    fi\nfi\nif [ \"$ACTION\" = clean ]; then\n ( set -x; cargo clean --manifest-path=\"$SCRIPT_INPUT_FILE\" ${OTHER_INPUT_FILE_FLAGS} --target=\"${CARGO_XCODE_TARGET_TRIPLE}\"; );\nelse\n ( set -x; cargo build --manifest-path=\"$SCRIPT_INPUT_FILE\" --features=\"${CARGO_XCODE_FEATURES:-}\" ${OTHER_INPUT_FILE_FLAGS} --target=\"${CARGO_XCODE_TARGET_TRIPLE}\"; );\nfi\n# it\'s too hard to explain Cargo\'s actual exe path to Xcode build graph, so hardlink to a known-good path instead\nBUILT_SRC=\"${CARGO_TARGET_DIR}/${CARGO_XCODE_TARGET_TRIPLE}/${CARGO_XCODE_BUILD_MODE}/${CARGO_XCODE_CARGO_FILE_NAME}\"\nln -f -- \"$BUILT_SRC\" \"$SCRIPT_OUTPUT_FILE_0\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\nDEP_FILE_SRC=\"${CARGO_TARGET_DIR}/${CARGO_XCODE_TARGET_TRIPLE}/${CARGO_XCODE_BUILD_MODE}/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\nif [ -f \"$DEP_FILE_SRC\" ]; then\n    DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n    cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n    echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\nfi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don\'t stay around after archs change\n# must match input for LipoScript\nFILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\ntouch \"$FILE_LIST\"\nif ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n    echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\nfi\n";
+        };
 /* End PBXBuildRule section */
 
 /* Begin PBXFileReference section */
-		9999259129A45319005CF020 /* em_proxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = em_proxy.h; path = em_proxy/em_proxy.h; sourceTree = "<group>"; };
-		ADDEDBA66A6E1 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
-		CA60058A9FBE4D17AF51A7D5 /* run */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = run; sourceTree = BUILT_PRODUCTS_DIR; };
-		CA60C44C93D7916DE57E6EBD /* libem_proxy_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libem_proxy_static.a; sourceTree = BUILT_PRODUCTS_DIR; };
+        
+        CA60C44C93D7916DE57E6EBD /* staticlib */ = {
+            isa = PBXFileReference;
+            explicitFileType = "archive.ar";
+            includeInIndex = 0;
+            name = "libem_proxy_static.a";
+            sourceTree = TARGET_BUILD_DIR;
+        };
+        CA60058A9FBE4D17AF51A7D5 /* bin */ = {
+            isa = PBXFileReference;
+            explicitFileType = "compiled.mach-o.executable";
+            includeInIndex = 0;
+            name = "run";
+            sourceTree = TARGET_BUILD_DIR;
+        };
+                CA6094FFF6923EF4668187A5 /* Cargo.toml */ = {
+                    isa = PBXFileReference;
+                    lastKnownFileType = text;
+                    fileEncoding = 4;
+                    name = "Cargo.toml";
+                    path = "em_proxy/Cargo.toml";
+                    sourceTree = "<group>";
+            };
+                    /* Rust needs libresolv */
+                    ADDEDBA66A6E1 = {
+                        isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
+                        name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT;
+                    };
+                
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
-		ADDEDBA66A6E2 /* Required for static linking */ = {
-			isa = PBXGroup;
-			children = (
-				ADDEDBA66A6E1 /* libresolv.tbd */,
-			);
-			name = "Required for static linking";
-			sourceTree = "<group>";
-		};
-		CA6094FFF69222869D176AE5 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				CA60C44C93D7916DE57E6EBD /* libem_proxy_static.a */,
-				CA60058A9FBE4D17AF51A7D5 /* run */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		CA6094FFF69298AF0B5890DB /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				ADDEDBA66A6E2 /* Required for static linking */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		CA6094FFF692D65BC3C892A8 = {
-			isa = PBXGroup;
-			children = (
-				9999259129A45319005CF020 /* em_proxy.h */,
-				CA6094FFF69222869D176AE5 /* Products */,
-				CA6094FFF69298AF0B5890DB /* Frameworks */,
-			);
-			sourceTree = "<group>";
-		};
+        CA6094FFF69298AF0B5890DB /* Frameworks */ = {
+            isa = PBXGroup;
+            children = (
+                ADDEDBA66A6E2,
+
+            );
+            name = Frameworks;
+            sourceTree = "<group>";
+        };
+
+        
+                ADDEDBA66A6E2 /* Required for static linking */ = {
+                    isa = PBXGroup;
+                    children = (
+                        ADDEDBA66A6E1
+                    );
+                    name = "Required for static linking";
+                    sourceTree = "<group>";
+                };
+
+        CA6094FFF69222869D176AE5 /* Products */ = {
+            isa = PBXGroup;
+            children = (
+                CA60C44C93D7916DE57E6EBD,
+CA60058A9FBE4D17AF51A7D5,
+
+            );
+            name = Products;
+            sourceTree = "<group>";
+        };
+
+        CA6094FFF692D65BC3C892A8 /* Main */ = {
+            isa = PBXGroup;
+            children = (
+                CA6094FFF6923EF4668187A5,
+CA6094FFF69222869D176AE5,
+CA6094FFF69298AF0B5890DB,
+
+            );
+            sourceTree = "<group>";
+        };
+
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		CA60058A9FBE37FC563E4BCC /* run-bin */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = CA603DD75FB437FC563E4BCC /* Build configuration list for PBXNativeTarget "run-bin" */;
-			buildPhases = (
-				CA60445C303637FC563E4BCC /* Sources */,
-				CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */,
-			);
-			buildRules = (
-				CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */,
-			);
-			dependencies = (
-			);
-			name = "run-bin";
-			productName = run;
-			productReference = CA60058A9FBE4D17AF51A7D5 /* run */;
-			productType = "com.apple.product-type.tool";
-		};
-		CA60C44C93D7A30E3695DD59 /* em_proxy-staticlib */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = CA603DD75FB4A30E3695DD59 /* Build configuration list for PBXNativeTarget "em_proxy-staticlib" */;
-			buildPhases = (
-				9987603529A4610700818586 /* ShellScript */,
-				CA60445C3036A30E3695DD59 /* Sources */,
-				CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */,
-			);
-			buildRules = (
-				CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */,
-			);
-			dependencies = (
-			);
-			name = "em_proxy-staticlib";
-			productName = libem_proxy_static.a;
-			productReference = CA60C44C93D7916DE57E6EBD /* libem_proxy_static.a */;
-			productType = "com.apple.product-type.library.static";
-		};
+        CA60C44C93D7A30E3695DD59 /* em_proxy-staticlib */ = {
+            isa = PBXNativeTarget;
+            buildConfigurationList = CA603DD75FB4A30E3695DD59;
+            buildPhases = (
+                CA60445C3036A30E3695DD59 /* Sources */,
+                CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */,
+            );
+            buildRules = (
+                CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */,
+            );
+            dependencies = (
+            );
+            name = "em_proxy-staticlib";
+            productName = "libem_proxy_static.a";
+            productReference = CA60C44C93D7916DE57E6EBD;
+            productType = "com.apple.product-type.library.static";
+        };
+        CA60058A9FBE37FC563E4BCC /* run-bin */ = {
+            isa = PBXNativeTarget;
+            buildConfigurationList = CA603DD75FB437FC563E4BCC;
+            buildPhases = (
+                CA60445C303637FC563E4BCC /* Sources */,
+                CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */,
+            );
+            buildRules = (
+                CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */,
+            );
+            dependencies = (
+            );
+            name = "run-bin";
+            productName = "run";
+            productReference = CA60058A9FBE4D17AF51A7D5;
+            productType = "com.apple.product-type.tool";
+        };
+        
 /* End PBXNativeTarget section */
 
-/* Begin PBXProject section */
-		CA6094FFF692E04653AD465F /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 1300;
-				TargetAttributes = {
-					CA60058A9FBE37FC563E4BCC = {
-						CreatedOnToolsVersion = 9.2;
-						ProvisioningStyle = Automatic;
-					};
-					CA60C44C93D7A30E3695DD59 = {
-						CreatedOnToolsVersion = 9.2;
-						ProvisioningStyle = Automatic;
-					};
-				};
-			};
-			buildConfigurationList = CA6094FFF69280E02D6C7F57 /* Build configuration list for PBXProject "em_proxy" */;
-			compatibilityVersion = "Xcode 11.4";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = CA6094FFF692D65BC3C892A8;
-			productRefGroup = CA6094FFF69222869D176AE5 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				CA60C44C93D7A30E3695DD59 /* em_proxy-staticlib */,
-				CA60058A9FBE37FC563E4BCC /* run-bin */,
-			);
-		};
-/* End PBXProject section */
+        CA60445C3036A30E3695DD59 = {
+                    isa = PBXSourcesBuildPhase;
+                    buildActionMask = 2147483647;
+                    files = (
+                        CA60E4E02AAAA30E3695DD59
+                    );
+                    runOnlyForDeploymentPostprocessing = 0;
+                };
+                
+        CA603DD75FB4A30E3695DD59 /* staticlib */ = {
+            isa = XCConfigurationList;
+            buildConfigurations = (
+                CA604DFE779BA30E3695DD59 /* Release */,
+                CA60DE07A83FA30E3695DD59 /* Debug */,
+            );
+            defaultConfigurationIsVisible = 0;
+            defaultConfigurationName = Release;
+        };
+            CA604DFE779BA30E3695DD59 /* staticlib */ = {
+                isa = XCBuildConfiguration;
+                buildSettings = {
+                    PRODUCT_NAME = "em_proxy_static";
+                    "CARGO_XCODE_CARGO_FILE_NAME" = "libem_proxy.a";
+                    "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "libem_proxy.d";
+                    SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
+                    SKIP_INSTALL = YES;
+                INSTALL_GROUP = "";
+                INSTALL_MODE_FLAG = "";
+                INSTALL_OWNER = "";
+                    
+                };
+                name = Release;
+            };
+            CA60DE07A83FA30E3695DD59 /* staticlib */ = {
+                isa = XCBuildConfiguration;
+                buildSettings = {
+                    PRODUCT_NAME = "em_proxy_static";
+                    "CARGO_XCODE_CARGO_FILE_NAME" = "libem_proxy.a";
+                    "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "libem_proxy.d";
+                    SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
+                    SKIP_INSTALL = YES;
+                INSTALL_GROUP = "";
+                INSTALL_MODE_FLAG = "";
+                INSTALL_OWNER = "";
+                    
+                };
+                name = Debug;
+            };CA60445C303637FC563E4BCC = {
+                    isa = PBXSourcesBuildPhase;
+                    buildActionMask = 2147483647;
+                    files = (
+                        CA60E4E02AAA37FC563E4BCC
+                    );
+                    runOnlyForDeploymentPostprocessing = 0;
+                };
+                
+        CA603DD75FB437FC563E4BCC /* bin */ = {
+            isa = XCConfigurationList;
+            buildConfigurations = (
+                CA604DFE779B37FC563E4BCC /* Release */,
+                CA60DE07A83F37FC563E4BCC /* Debug */,
+            );
+            defaultConfigurationIsVisible = 0;
+            defaultConfigurationName = Release;
+        };
+            CA604DFE779B37FC563E4BCC /* bin */ = {
+                isa = XCBuildConfiguration;
+                buildSettings = {
+                    PRODUCT_NAME = "run";
+                    "CARGO_XCODE_CARGO_FILE_NAME" = "run";
+                    "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "run.d";
+                    SUPPORTED_PLATFORMS = "macosx";
+                    
+                    
+                };
+                name = Release;
+            };
+            CA60DE07A83F37FC563E4BCC /* bin */ = {
+                isa = XCBuildConfiguration;
+                buildSettings = {
+                    PRODUCT_NAME = "run";
+                    "CARGO_XCODE_CARGO_FILE_NAME" = "run";
+                    "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "run.d";
+                    SUPPORTED_PLATFORMS = "macosx";
+                    
+                    
+                };
+                name = Debug;
+            };
 
-/* Begin PBXShellScriptBuildPhase section */
-		9987603529A4610700818586 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				./em_proxy/em_proxy.h,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "bash ./fetch-prebuilt.sh em_proxy\n";
-		};
-		CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"$(DERIVED_FILE_DIR)/$(ARCHS)-$(EXECUTABLE_NAME).xcfilelist",
-			);
-			name = "Universal Binary lipo";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# generated with cargo-xcode 1.5.0\n\n#set -eux; cat \"$DERIVED_FILE_DIR/$ARCHS-$EXECUTABLE_NAME.xcfilelist\" | tr '\\n' '\\0' | xargs -0 lipo -create -output \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n#if [ ${LD_DYLIB_INSTALL_NAME:+1} ]; then\n#    install_name_tool -id \"$LD_DYLIB_INSTALL_NAME\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n#fi\n";
-		};
-/* End PBXShellScriptBuildPhase section */
+        CA6094FFF692AF6EBB7F357C /* LipoScript */ = {
+            name = "Universal Binary lipo";
+            isa = PBXShellScriptBuildPhase;
+            buildActionMask = 2147483647;
+            files = ();
+            inputFileListPaths = ();
+            inputPaths = (
+                "$(DERIVED_FILE_DIR)/$(ARCHS)-$(EXECUTABLE_NAME).xcfilelist",
+            );
+            outputFileListPaths = ();
+            outputPaths = (
+                "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)"
+            );
+            runOnlyForDeploymentPostprocessing = 0;
+            shellPath = /bin/sh;
+            shellScript = "# generated with cargo-xcode 1.5.0\n\n            set -eux; cat \"$DERIVED_FILE_DIR/$ARCHS-$EXECUTABLE_NAME.xcfilelist\" | tr \'\\n\' \'\\0\' | xargs -0 lipo -create -output \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n            if [ ${LD_DYLIB_INSTALL_NAME:+1} ]; then\n                install_name_tool -id \"$LD_DYLIB_INSTALL_NAME\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n            fi\n        ";
+        };
 
-/* Begin PBXSourcesBuildPhase section */
-		CA60445C303637FC563E4BCC /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CA60445C3036A30E3695DD59 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				9987603429A4555300818586 /* em_proxy.h in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
+        CA6094FFF69280E02D6C7F57 = {
+            isa = XCConfigurationList;
+            buildConfigurations = (
+                CA609A5173513CC16B37690B /* Release */,
+                CA609A517351228BE02872F8 /* Debug */,
+            );
+            defaultConfigurationIsVisible = 0;
+            defaultConfigurationName = Release;
+        };
 
-/* Begin XCBuildConfiguration section */
-		CA604DFE779B37FC563E4BCC /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CARGO_XCODE_CARGO_DEP_FILE_NAME = run.d;
-				CARGO_XCODE_CARGO_FILE_NAME = run;
-				PRODUCT_NAME = run;
-				SUPPORTED_PLATFORMS = macosx;
-			};
-			name = Release;
-		};
-		CA604DFE779BA30E3695DD59 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CARGO_XCODE_CARGO_DEP_FILE_NAME = libem_proxy.d;
-				CARGO_XCODE_CARGO_FILE_NAME = libem_proxy.a;
-				INSTALL_GROUP = "";
-				INSTALL_MODE_FLAG = "";
-				INSTALL_OWNER = "";
-				LIB_FILE_NAME = "";
-				"LIB_FILE_NAME[sdk=iphoneos*]" = libem_proxy;
-				"LIB_FILE_NAME[sdk=iphonesimulator*]" = "libem_proxy-sim";
-				PRODUCT_NAME = em_proxy_static;
-				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
-			};
-			name = Release;
-		};
-		CA609A517351228BE02872F8 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target";
-				CARGO_XCODE_BUILD_MODE = debug;
-				CARGO_XCODE_FEATURES = "";
-				"CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = aarch64;
-				"CARGO_XCODE_TARGET_ARCH[arch=i386]" = i686;
-				"CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = x86_64;
-				"CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = tvos;
-				"CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = tvos;
-				"CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = ios;
-				"CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim";
-				"CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = ios;
-				"CARGO_XCODE_TARGET_OS[sdk=macosx*]" = darwin;
-				CURRENT_PROJECT_VERSION = 0.1;
-				MARKETING_VERSION = 0.1.0;
-				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = em_proxy;
-				SDKROOT = macosx;
-				SUPPORTS_MACCATALYST = YES;
-			};
-			name = Debug;
-		};
-		CA609A5173513CC16B37690B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target";
-				CARGO_XCODE_BUILD_MODE = release;
-				CARGO_XCODE_FEATURES = "";
-				"CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = aarch64;
-				"CARGO_XCODE_TARGET_ARCH[arch=i386]" = i686;
-				"CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = x86_64;
-				"CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = tvos;
-				"CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = tvos;
-				"CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = ios;
-				"CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim";
-				"CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = ios;
-				"CARGO_XCODE_TARGET_OS[sdk=macosx*]" = darwin;
-				CURRENT_PROJECT_VERSION = 0.1;
-				MARKETING_VERSION = 0.1.0;
-				PRODUCT_NAME = em_proxy;
-				SDKROOT = macosx;
-				SUPPORTS_MACCATALYST = YES;
-			};
-			name = Release;
-		};
-		CA60DE07A83F37FC563E4BCC /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CARGO_XCODE_CARGO_DEP_FILE_NAME = run.d;
-				CARGO_XCODE_CARGO_FILE_NAME = run;
-				PRODUCT_NAME = run;
-				SUPPORTED_PLATFORMS = macosx;
-			};
-			name = Debug;
-		};
-		CA60DE07A83FA30E3695DD59 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CARGO_XCODE_CARGO_DEP_FILE_NAME = libem_proxy.d;
-				CARGO_XCODE_CARGO_FILE_NAME = libem_proxy.a;
-				INSTALL_GROUP = "";
-				INSTALL_MODE_FLAG = "";
-				INSTALL_OWNER = "";
-				LIB_FILE_NAME = "";
-				"LIB_FILE_NAME[sdk=iphoneos*]" = libem_proxy;
-				"LIB_FILE_NAME[sdk=iphonesimulator*]" = "libem_proxy-sim";
-				PRODUCT_NAME = em_proxy_static;
-				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
-			};
-			name = Debug;
-		};
-/* End XCBuildConfiguration section */
+        CA609A5173513CC16B37690B = {
+            isa = XCBuildConfiguration;
+            buildSettings = {
+                
+            ALWAYS_SEARCH_USER_PATHS = NO;
+            SUPPORTS_MACCATALYST = YES;
+            CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; /* for cargo */
+            CARGO_XCODE_FEATURES = ""; /* configure yourself */
+            "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = "aarch64";
+            "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = "x86_64"; /* catalyst adds h suffix */
+            "CARGO_XCODE_TARGET_ARCH[arch=i386]" = "i686";
+            "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = "darwin";
+            "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim";
+            "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = "ios";
+            "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = "ios";
+            "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = "tvos";
+            "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = "tvos";
+            PRODUCT_NAME = "em_proxy";
+            MARKETING_VERSION = "0.1.0";
+            CURRENT_PROJECT_VERSION = "0.1";
+            SDKROOT = macosx;
+        
+                "CARGO_XCODE_BUILD_MODE" = "release"; /* for xcode scripts */
+            };
+            name = Release;
+        };
 
-/* Begin XCConfigurationList section */
-		CA603DD75FB437FC563E4BCC /* Build configuration list for PBXNativeTarget "run-bin" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CA604DFE779B37FC563E4BCC /* Release */,
-				CA60DE07A83F37FC563E4BCC /* Debug */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		CA603DD75FB4A30E3695DD59 /* Build configuration list for PBXNativeTarget "em_proxy-staticlib" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CA604DFE779BA30E3695DD59 /* Release */,
-				CA60DE07A83FA30E3695DD59 /* Debug */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		CA6094FFF69280E02D6C7F57 /* Build configuration list for PBXProject "em_proxy" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CA609A5173513CC16B37690B /* Release */,
-				CA609A517351228BE02872F8 /* Debug */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = CA6094FFF692E04653AD465F /* Project object */;
+        CA609A517351228BE02872F8 = {
+            isa = XCBuildConfiguration;
+            buildSettings = {
+                
+            ALWAYS_SEARCH_USER_PATHS = NO;
+            SUPPORTS_MACCATALYST = YES;
+            CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; /* for cargo */
+            CARGO_XCODE_FEATURES = ""; /* configure yourself */
+            "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = "aarch64";
+            "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = "x86_64"; /* catalyst adds h suffix */
+            "CARGO_XCODE_TARGET_ARCH[arch=i386]" = "i686";
+            "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = "darwin";
+            "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim";
+            "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = "ios";
+            "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = "ios";
+            "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = "tvos";
+            "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = "tvos";
+            PRODUCT_NAME = "em_proxy";
+            MARKETING_VERSION = "0.1.0";
+            CURRENT_PROJECT_VERSION = "0.1";
+            SDKROOT = macosx;
+        
+                "CARGO_XCODE_BUILD_MODE" = "debug"; /* for xcode scripts */
+                ONLY_ACTIVE_ARCH = YES;
+            };
+            name = Debug;
+        };
+
+        CA6094FFF692E04653AD465F = {
+            isa = PBXProject;
+            attributes = {
+                LastUpgradeCheck = 1300;
+                TargetAttributes = {
+                    CA60C44C93D7A30E3695DD59 = {
+                        CreatedOnToolsVersion = 9.2;
+                        ProvisioningStyle = Automatic;
+                    };
+                    CA60058A9FBE37FC563E4BCC = {
+                        CreatedOnToolsVersion = 9.2;
+                        ProvisioningStyle = Automatic;
+                    };
+                                    };
+            };
+            buildConfigurationList = CA6094FFF69280E02D6C7F57;
+            compatibilityVersion = "Xcode 11.4";
+             developmentRegion = en;
+            hasScannedForEncodings = 0;
+            knownRegions = (
+                    en,
+                    Base,
+            );
+            mainGroup = CA6094FFF692D65BC3C892A8;
+            productRefGroup = CA6094FFF69222869D176AE5 /* Products */;
+            projectDirPath = "";
+            projectRoot = "";
+            targets = (
+                CA60C44C93D7A30E3695DD59,
+CA60058A9FBE37FC563E4BCC,
+
+            );
+        };
+
+    };
+    rootObject = CA6094FFF692E04653AD465F;
 }
+    

Dependencies/em_proxy/.gitkeep

@@ -1 +0,0 @@
-Use ../fetch-prebuilt.sh to fetch prebuilt Rust dependencies

Dependencies/fetch-prebuilt.sh

@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-# Ensure we are in Dependencies directory
-cd "$(dirname "$0")"
-
-check_for_update() {
-    if [ -f ".skip-prebuilt-fetch-$1" ]; then
-        echo "Skipping prebuilt fetch for $1 since .skip-prebuilt-fetch-$1 exists. If you are developing $1 alongside SideStore, don't remove this file, or this script will replace your locally built binaries with the ones built by GitHub Actions."
-        return
-    fi
-
-    if [ ! -f ".last-prebuilt-fetch-$1" ]; then
-        echo "0,none" > ".last-prebuilt-fetch-$1"
-    fi
-
-    LAST_FETCH=`cat .last-prebuilt-fetch-$1 | perl -n -e '/([0-9]*),([^ ]*)$/ && print $1'`
-    LAST_COMMIT=`cat .last-prebuilt-fetch-$1 | perl -n -e '/([0-9]*),([^ ]*)$/ && print $2'`
-
-    # fetch if last fetch was over 6 hours ago
-    if [[ $LAST_FETCH -lt $(expr $(date +%s) - 21600) ]] || [[ "$2" == "force" ]]; then
-        echo "Checking $1 for update"
-        echo
-        LATEST_COMMIT=`curl https://api.github.com/repos/SideStore/$1/releases/latest | perl -n -e '/Commit: https:\\/\\/github\\.com\\/[^\\/]*\\/[^\\/]*\\/commit\\/([^"]*)/ && print $1'`
-        echo
-        echo "Last commit: $LAST_COMMIT"
-        echo "Latest commit: $LATEST_COMMIT"
-        if [[ "$LAST_COMMIT" != "$LATEST_COMMIT" ]]; then
-            echo "Found update, downloading binaries"
-            echo
-            wget -O "$1/lib$1.a" "https://github.com/SideStore/$1/releases/latest/download/lib$1.a"
-            wget -O "$1/lib$1-sim.a" "https://github.com/SideStore/$1/releases/latest/download/lib$1-sim.a"
-            wget -O "$1/$1.h" "https://github.com/SideStore/$1/releases/latest/download/$1.h"
-            echo
-        else
-            echo "Up-to-date"
-        fi
-        echo "$(date +%s),$LATEST_COMMIT" > ".last-prebuilt-fetch-$1"
-    else
-        echo "It hasn't been 6 hours and force was not specified, skipping update check for $1"
-    fi
-}
-
-# Allow for Xcode to check minimuxer and em_proxy separately by skipping the update check if the other one is specified as an argument
-if [[ "$1" != "em_proxy" ]]; then
-    check_for_update minimuxer "$1"
-    if [[ "$1" != "minimuxer" ]]; then
-        echo
-    fi
-fi
-if [[ "$1" != "minimuxer" ]]; then
-    check_for_update em_proxy "$1"
-fi

Dependencies/minimuxer.xcodeproj/project.pbxproj

@@ -1,283 +1,292 @@
 // !$*UTF8*$!
 {
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 53;
-	objects = {
-
+    /* generated with cargo-xcode 1.5.0 */
+    archiveVersion = 1;
+    classes = {
+    };
+    objectVersion = 53;
+    objects = {
 /* Begin PBXBuildFile section */
-		9987603329A454B500818586 /* minimuxer.h in Sources */ = {isa = PBXBuildFile; fileRef = 9987603229A454B500818586 /* minimuxer.h */; };
+        
+                CA6038F2DF2FA560B9642892 /* Cargo.toml in Sources */ = {
+                    isa = PBXBuildFile;
+                    fileRef = CA6012A875F93EF4668187A5 /* Cargo.toml */;
+                    settings = {
+                        COMPILER_FLAGS = "--lib"; /* == OTHER_INPUT_FILE_FLAGS */
+                    };
+                };
+                
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildRule section */
-		CA6012A875F9AC6C1400ACA8 /* PBXBuildRule */ = {
-			isa = PBXBuildRule;
-			compilerSpec = com.apple.compilers.proxy.script;
-			filePatterns = "*/minimuxer.h";
-			fileType = pattern.proxy;
-			inputFiles = (
-			);
-			isEditable = 0;
-			name = "Cargo project build";
-			outputFiles = (
-				"$(OBJECT_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME)",
-			);
-			script = "# generated with cargo-xcode 1.5.0\n# modified to use prebuilt binaries\n\nset -eu;\n\nBUILT_SRC=\"./minimuxer/$LIB_FILE_NAME.a\"\nln -f -- \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\" || cp \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\necho \"$BUILT_SRC -> $TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\n#DEP_FILE_SRC=\"minimuxer/target/${CARGO_XCODE_TARGET_TRIPLE}/release/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\n#if [ -f \"$DEP_FILE_SRC\" ]; then\n#    DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n#    cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n#    echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\n#fi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don't stay around after archs change\n# must match input for LipoScript\n#FILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\n#touch \"$FILE_LIST\"\n#if ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n#    echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\n#fi\n";
-		};
+        CA6012A875F9AC6C1400ACA8 /* PBXBuildRule */ = {
+            isa = PBXBuildRule;
+            compilerSpec = com.apple.compilers.proxy.script;
+            dependencyFile = "$(DERIVED_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME).d";
+            filePatterns = "*/Cargo.toml"; /* must contain asterisk */
+            fileType = pattern.proxy;
+            inputFiles = ();
+            isEditable = 0;
+            name = "Cargo project build";
+            outputFiles = (
+                "$(OBJECT_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME)",
+            );
+            script = "# generated with cargo-xcode 1.5.0\n\nset -eu; export PATH=\"$PATH:$HOME/.cargo/bin:/usr/local/bin\";\nif [ \"${IS_MACCATALYST-NO}\" = YES ]; then\n    CARGO_XCODE_TARGET_TRIPLE=\"${CARGO_XCODE_TARGET_ARCH}-apple-ios-macabi\"\nelse\n    CARGO_XCODE_TARGET_TRIPLE=\"${CARGO_XCODE_TARGET_ARCH}-apple-${CARGO_XCODE_TARGET_OS}\"\nfi\nif [ \"$CARGO_XCODE_TARGET_OS\" != \"darwin\" ]; then\n    PATH=\"${PATH/\\/Contents\\/Developer\\/Toolchains\\/XcodeDefault.xctoolchain\\/usr\\/bin:/xcode-provided-ld-cant-link-lSystem-for-the-host-build-script:}\"\nfi\nPATH=\"$PATH:/opt/homebrew/bin\" # Rust projects often depend on extra tools like nasm, which Xcode lacks\nif [ \"$CARGO_XCODE_BUILD_MODE\" == release ]; then\n    OTHER_INPUT_FILE_FLAGS=\"${OTHER_INPUT_FILE_FLAGS} --release\"\nfi\nif command -v rustup &> /dev/null; then\n    if ! rustup target list --installed | egrep -q \"${CARGO_XCODE_TARGET_TRIPLE}\"; then\n        echo \"warning: this build requires rustup toolchain for $CARGO_XCODE_TARGET_TRIPLE, but it isn\'t installed\"\n        rustup target add \"${CARGO_XCODE_TARGET_TRIPLE}\" || echo >&2 \"warning: can\'t install $CARGO_XCODE_TARGET_TRIPLE\"\n    fi\nfi\nif [ \"$ACTION\" = clean ]; then\n ( set -x; cargo clean --manifest-path=\"$SCRIPT_INPUT_FILE\" ${OTHER_INPUT_FILE_FLAGS} --target=\"${CARGO_XCODE_TARGET_TRIPLE}\"; );\nelse\n ( set -x; cargo build --manifest-path=\"$SCRIPT_INPUT_FILE\" --features=\"${CARGO_XCODE_FEATURES:-}\" ${OTHER_INPUT_FILE_FLAGS} --target=\"${CARGO_XCODE_TARGET_TRIPLE}\"; );\nfi\n# it\'s too hard to explain Cargo\'s actual exe path to Xcode build graph, so hardlink to a known-good path instead\nBUILT_SRC=\"${CARGO_TARGET_DIR}/${CARGO_XCODE_TARGET_TRIPLE}/${CARGO_XCODE_BUILD_MODE}/${CARGO_XCODE_CARGO_FILE_NAME}\"\nln -f -- \"$BUILT_SRC\" \"$SCRIPT_OUTPUT_FILE_0\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\nDEP_FILE_SRC=\"${CARGO_TARGET_DIR}/${CARGO_XCODE_TARGET_TRIPLE}/${CARGO_XCODE_BUILD_MODE}/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\nif [ -f \"$DEP_FILE_SRC\" ]; then\n    DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n    cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n    echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\nfi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don\'t stay around after archs change\n# must match input for LipoScript\nFILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\ntouch \"$FILE_LIST\"\nif ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n    echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\nfi\n";
+        };
 /* End PBXBuildRule section */
 
 /* Begin PBXFileReference section */
-		9987603229A454B500818586 /* minimuxer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = minimuxer.h; path = minimuxer/minimuxer.h; sourceTree = "<group>"; };
-		ADDEDBA66A6E1 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
-		CA609C732349C7AAD9FA67C4 /* libminimuxer_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminimuxer_static.a; sourceTree = BUILT_PRODUCTS_DIR; };
+        
+        CA609C732349C7AAD9FA67C4 /* staticlib */ = {
+            isa = PBXFileReference;
+            explicitFileType = "archive.ar";
+            includeInIndex = 0;
+            name = "libminimuxer_static.a";
+            sourceTree = TARGET_BUILD_DIR;
+        };
+                CA6012A875F93EF4668187A5 /* Cargo.toml */ = {
+                    isa = PBXFileReference;
+                    lastKnownFileType = text;
+                    fileEncoding = 4;
+                    name = "Cargo.toml";
+                    path = "minimuxer/Cargo.toml";
+                    sourceTree = "<group>";
+            };
+                    /* Rust needs libresolv */
+                    ADDEDBA66A6E1 = {
+                        isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition";
+                        name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT;
+                    };
+                
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
-		ADDEDBA66A6E2 /* Required for static linking */ = {
-			isa = PBXGroup;
-			children = (
-				ADDEDBA66A6E1 /* libresolv.tbd */,
-			);
-			name = "Required for static linking";
-			sourceTree = "<group>";
-		};
-		CA6012A875F922869D176AE5 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				CA609C732349C7AAD9FA67C4 /* libminimuxer_static.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		CA6012A875F998AF0B5890DB /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				ADDEDBA66A6E2 /* Required for static linking */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		CA6012A875F9D65BC3C892A8 = {
-			isa = PBXGroup;
-			children = (
-				9987603229A454B500818586 /* minimuxer.h */,
-				CA6012A875F922869D176AE5 /* Products */,
-				CA6012A875F998AF0B5890DB /* Frameworks */,
-			);
-			sourceTree = "<group>";
-		};
+        CA6012A875F998AF0B5890DB /* Frameworks */ = {
+            isa = PBXGroup;
+            children = (
+                ADDEDBA66A6E2,
+
+            );
+            name = Frameworks;
+            sourceTree = "<group>";
+        };
+
+        
+                ADDEDBA66A6E2 /* Required for static linking */ = {
+                    isa = PBXGroup;
+                    children = (
+                        ADDEDBA66A6E1
+                    );
+                    name = "Required for static linking";
+                    sourceTree = "<group>";
+                };
+
+        CA6012A875F922869D176AE5 /* Products */ = {
+            isa = PBXGroup;
+            children = (
+                CA609C732349C7AAD9FA67C4,
+
+            );
+            name = Products;
+            sourceTree = "<group>";
+        };
+
+        CA6012A875F9D65BC3C892A8 /* Main */ = {
+            isa = PBXGroup;
+            children = (
+                CA6012A875F93EF4668187A5,
+CA6012A875F922869D176AE5,
+CA6012A875F998AF0B5890DB,
+
+            );
+            sourceTree = "<group>";
+        };
+
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		CA609C732349A560B9642892 /* minimuxer-staticlib */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = CA600589A243A560B9642892 /* Build configuration list for PBXNativeTarget "minimuxer-staticlib" */;
-			buildPhases = (
-				9987603629A4611D00818586 /* ShellScript */,
-				CA600F638141A560B9642892 /* Sources */,
-				CA6012A875F9AF6EBB7F357C /* Universal Binary lipo */,
-			);
-			buildRules = (
-				CA6012A875F9AC6C1400ACA8 /* PBXBuildRule */,
-			);
-			dependencies = (
-			);
-			name = "minimuxer-staticlib";
-			productName = libminimuxer_static.a;
-			productReference = CA609C732349C7AAD9FA67C4 /* libminimuxer_static.a */;
-			productType = "com.apple.product-type.library.static";
-		};
+        CA609C732349A560B9642892 /* minimuxer-staticlib */ = {
+            isa = PBXNativeTarget;
+            buildConfigurationList = CA600589A243A560B9642892;
+            buildPhases = (
+                CA600F638141A560B9642892 /* Sources */,
+                CA6012A875F9AF6EBB7F357C /* Universal Binary lipo */,
+            );
+            buildRules = (
+                CA6012A875F9AC6C1400ACA8 /* PBXBuildRule */,
+            );
+            dependencies = (
+            );
+            name = "minimuxer-staticlib";
+            productName = "libminimuxer_static.a";
+            productReference = CA609C732349C7AAD9FA67C4;
+            productType = "com.apple.product-type.library.static";
+        };
+        
 /* End PBXNativeTarget section */
 
-/* Begin PBXProject section */
-		CA6012A875F9E04653AD465F /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 1300;
-				TargetAttributes = {
-					CA609C732349A560B9642892 = {
-						CreatedOnToolsVersion = 9.2;
-						ProvisioningStyle = Automatic;
-					};
-				};
-			};
-			buildConfigurationList = CA6012A875F980E02D6C7F57 /* Build configuration list for PBXProject "minimuxer" */;
-			compatibilityVersion = "Xcode 11.4";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = CA6012A875F9D65BC3C892A8;
-			productRefGroup = CA6012A875F922869D176AE5 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				CA609C732349A560B9642892 /* minimuxer-staticlib */,
-			);
-		};
-/* End PBXProject section */
+        CA600F638141A560B9642892 = {
+                    isa = PBXSourcesBuildPhase;
+                    buildActionMask = 2147483647;
+                    files = (
+                        CA6038F2DF2FA560B9642892
+                    );
+                    runOnlyForDeploymentPostprocessing = 0;
+                };
+                
+        CA600589A243A560B9642892 /* staticlib */ = {
+            isa = XCConfigurationList;
+            buildConfigurations = (
+                CA602DE9FCEDA560B9642892 /* Release */,
+                CA6008D36272A560B9642892 /* Debug */,
+            );
+            defaultConfigurationIsVisible = 0;
+            defaultConfigurationName = Release;
+        };
+            CA602DE9FCEDA560B9642892 /* staticlib */ = {
+                isa = XCBuildConfiguration;
+                buildSettings = {
+                    PRODUCT_NAME = "minimuxer_static";
+                    "CARGO_XCODE_CARGO_FILE_NAME" = "libminimuxer.a";
+                    "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "libminimuxer.d";
+                    SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
+                    SKIP_INSTALL = YES;
+                INSTALL_GROUP = "";
+                INSTALL_MODE_FLAG = "";
+                INSTALL_OWNER = "";
+                    
+                };
+                name = Release;
+            };
+            CA6008D36272A560B9642892 /* staticlib */ = {
+                isa = XCBuildConfiguration;
+                buildSettings = {
+                    PRODUCT_NAME = "minimuxer_static";
+                    "CARGO_XCODE_CARGO_FILE_NAME" = "libminimuxer.a";
+                    "CARGO_XCODE_CARGO_DEP_FILE_NAME" = "libminimuxer.d";
+                    SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
+                    SKIP_INSTALL = YES;
+                INSTALL_GROUP = "";
+                INSTALL_MODE_FLAG = "";
+                INSTALL_OWNER = "";
+                    
+                };
+                name = Debug;
+            };
 
-/* Begin PBXShellScriptBuildPhase section */
-		9987603629A4611D00818586 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				./minimuxer/minimuxer.h,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "bash ./fetch-prebuilt.sh minimuxer\n";
-		};
-		CA6012A875F9AF6EBB7F357C /* Universal Binary lipo */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"$(DERIVED_FILE_DIR)/$(ARCHS)-$(EXECUTABLE_NAME).xcfilelist",
-			);
-			name = "Universal Binary lipo";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# generated with cargo-xcode 1.5.0\n\n#set -eux; cat \"$DERIVED_FILE_DIR/$ARCHS-$EXECUTABLE_NAME.xcfilelist\" | tr '\\n' '\\0' | xargs -0 lipo -create -output \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n#if [ ${LD_DYLIB_INSTALL_NAME:+1} ]; then\n#    install_name_tool -id \"$LD_DYLIB_INSTALL_NAME\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n#fi\n";
-		};
-/* End PBXShellScriptBuildPhase section */
+        CA6012A875F9AF6EBB7F357C /* LipoScript */ = {
+            name = "Universal Binary lipo";
+            isa = PBXShellScriptBuildPhase;
+            buildActionMask = 2147483647;
+            files = ();
+            inputFileListPaths = ();
+            inputPaths = (
+                "$(DERIVED_FILE_DIR)/$(ARCHS)-$(EXECUTABLE_NAME).xcfilelist",
+            );
+            outputFileListPaths = ();
+            outputPaths = (
+                "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)"
+            );
+            runOnlyForDeploymentPostprocessing = 0;
+            shellPath = /bin/sh;
+            shellScript = "# generated with cargo-xcode 1.5.0\n\n            set -eux; cat \"$DERIVED_FILE_DIR/$ARCHS-$EXECUTABLE_NAME.xcfilelist\" | tr \'\\n\' \'\\0\' | xargs -0 lipo -create -output \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n            if [ ${LD_DYLIB_INSTALL_NAME:+1} ]; then\n                install_name_tool -id \"$LD_DYLIB_INSTALL_NAME\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n            fi\n        ";
+        };
 
-/* Begin PBXSourcesBuildPhase section */
-		CA600F638141A560B9642892 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				9987603329A454B500818586 /* minimuxer.h in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
+        CA6012A875F980E02D6C7F57 = {
+            isa = XCConfigurationList;
+            buildConfigurations = (
+                CA60A20F8EA63CC16B37690B /* Release */,
+                CA60A20F8EA6228BE02872F8 /* Debug */,
+            );
+            defaultConfigurationIsVisible = 0;
+            defaultConfigurationName = Release;
+        };
 
-/* Begin XCBuildConfiguration section */
-		CA6008D36272A560B9642892 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CARGO_XCODE_CARGO_DEP_FILE_NAME = libminimuxer.d;
-				CARGO_XCODE_CARGO_FILE_NAME = libminimuxer.a;
-				INSTALL_GROUP = "";
-				INSTALL_MODE_FLAG = "";
-				INSTALL_OWNER = "";
-				LIB_FILE_NAME = "";
-				"LIB_FILE_NAME[sdk=iphoneos*]" = libminimuxer;
-				"LIB_FILE_NAME[sdk=iphonesimulator*]" = "libminimuxer-sim";
-				PRODUCT_NAME = minimuxer_static;
-				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
-			};
-			name = Debug;
-		};
-		CA602DE9FCEDA560B9642892 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CARGO_XCODE_CARGO_DEP_FILE_NAME = libminimuxer.d;
-				CARGO_XCODE_CARGO_FILE_NAME = libminimuxer.a;
-				INSTALL_GROUP = "";
-				INSTALL_MODE_FLAG = "";
-				INSTALL_OWNER = "";
-				LIB_FILE_NAME = "";
-				"LIB_FILE_NAME[sdk=iphoneos*]" = libminimuxer;
-				"LIB_FILE_NAME[sdk=iphonesimulator*]" = "libminimuxer-sim";
-				PRODUCT_NAME = minimuxer_static;
-				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
-			};
-			name = Release;
-		};
-		CA60A20F8EA6228BE02872F8 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target";
-				CARGO_XCODE_BUILD_MODE = debug;
-				CARGO_XCODE_FEATURES = "";
-				"CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = aarch64;
-				"CARGO_XCODE_TARGET_ARCH[arch=i386]" = i686;
-				"CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = x86_64;
-				"CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = tvos;
-				"CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = tvos;
-				"CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = ios;
-				"CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim";
-				"CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = ios;
-				"CARGO_XCODE_TARGET_OS[sdk=macosx*]" = darwin;
-				CURRENT_PROJECT_VERSION = 0.1;
-				MARKETING_VERSION = 0.1.0;
-				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = minimuxer;
-				SDKROOT = macosx;
-				SUPPORTS_MACCATALYST = YES;
-			};
-			name = Debug;
-		};
-		CA60A20F8EA63CC16B37690B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target";
-				CARGO_XCODE_BUILD_MODE = release;
-				CARGO_XCODE_FEATURES = "";
-				"CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = aarch64;
-				"CARGO_XCODE_TARGET_ARCH[arch=i386]" = i686;
-				"CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = x86_64;
-				"CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = tvos;
-				"CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = tvos;
-				"CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = ios;
-				"CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim";
-				"CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = ios;
-				"CARGO_XCODE_TARGET_OS[sdk=macosx*]" = darwin;
-				CURRENT_PROJECT_VERSION = 0.1;
-				MARKETING_VERSION = 0.1.0;
-				PRODUCT_NAME = minimuxer;
-				SDKROOT = macosx;
-				SUPPORTS_MACCATALYST = YES;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
+        CA60A20F8EA63CC16B37690B = {
+            isa = XCBuildConfiguration;
+            buildSettings = {
+                
+            ALWAYS_SEARCH_USER_PATHS = NO;
+            SUPPORTS_MACCATALYST = YES;
+            CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; /* for cargo */
+            CARGO_XCODE_FEATURES = ""; /* configure yourself */
+            "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = "aarch64";
+            "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = "x86_64"; /* catalyst adds h suffix */
+            "CARGO_XCODE_TARGET_ARCH[arch=i386]" = "i686";
+            "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = "darwin";
+            "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim";
+            "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = "ios";
+            "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = "ios";
+            "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = "tvos";
+            "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = "tvos";
+            PRODUCT_NAME = "minimuxer";
+            MARKETING_VERSION = "0.1.0";
+            CURRENT_PROJECT_VERSION = "0.1";
+            SDKROOT = macosx;
+        
+                "CARGO_XCODE_BUILD_MODE" = "release"; /* for xcode scripts */
+            };
+            name = Release;
+        };
 
-/* Begin XCConfigurationList section */
-		CA600589A243A560B9642892 /* Build configuration list for PBXNativeTarget "minimuxer-staticlib" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CA602DE9FCEDA560B9642892 /* Release */,
-				CA6008D36272A560B9642892 /* Debug */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		CA6012A875F980E02D6C7F57 /* Build configuration list for PBXProject "minimuxer" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CA60A20F8EA63CC16B37690B /* Release */,
-				CA60A20F8EA6228BE02872F8 /* Debug */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = CA6012A875F9E04653AD465F /* Project object */;
+        CA60A20F8EA6228BE02872F8 = {
+            isa = XCBuildConfiguration;
+            buildSettings = {
+                
+            ALWAYS_SEARCH_USER_PATHS = NO;
+            SUPPORTS_MACCATALYST = YES;
+            CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; /* for cargo */
+            CARGO_XCODE_FEATURES = ""; /* configure yourself */
+            "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = "aarch64";
+            "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = "x86_64"; /* catalyst adds h suffix */
+            "CARGO_XCODE_TARGET_ARCH[arch=i386]" = "i686";
+            "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = "darwin";
+            "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim";
+            "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = "ios";
+            "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = "ios";
+            "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = "tvos";
+            "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = "tvos";
+            PRODUCT_NAME = "minimuxer";
+            MARKETING_VERSION = "0.1.0";
+            CURRENT_PROJECT_VERSION = "0.1";
+            SDKROOT = macosx;
+        
+                "CARGO_XCODE_BUILD_MODE" = "debug"; /* for xcode scripts */
+                ONLY_ACTIVE_ARCH = YES;
+            };
+            name = Debug;
+        };
+
+        CA6012A875F9E04653AD465F = {
+            isa = PBXProject;
+            attributes = {
+                LastUpgradeCheck = 1300;
+                TargetAttributes = {
+                    CA609C732349A560B9642892 = {
+                        CreatedOnToolsVersion = 9.2;
+                        ProvisioningStyle = Automatic;
+                    };
+                                    };
+            };
+            buildConfigurationList = CA6012A875F980E02D6C7F57;
+            compatibilityVersion = "Xcode 11.4";
+             developmentRegion = en;
+            hasScannedForEncodings = 0;
+            knownRegions = (
+                    en,
+                    Base,
+            );
+            mainGroup = CA6012A875F9D65BC3C892A8;
+            productRefGroup = CA6012A875F922869D176AE5 /* Products */;
+            projectDirPath = "";
+            projectRoot = "";
+            targets = (
+                CA609C732349A560B9642892,
+
+            );
+        };
+
+    };
+    rootObject = CA6012A875F9E04653AD465F;
 }
+    

Dependencies/minimuxer/.gitkeep

@@ -1 +0,0 @@
-Use ../fetch-prebuilt.sh to fetch prebuilt Rust dependencies

Dependencies/update.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash 
+set -e; set -o pipefail; set -x;
+
+echo "Building Rust projects..."
+cd em_proxy
+cargo xcode --output-dir ../
+cd ../
+cd minimuxer
+cargo xcode --output-dir ../
+echo "Done!"

EmotionalDamage/em_proxy.h

@@ -0,0 +1,40 @@
+// Jackson Coxson
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+
+/**
+ * Starts your emotional damage
+ * # Arguments
+ * * `bind_addr` - The UDP socket to listen to
+ * # Returns
+ * A handle to stop further emotional damage.
+ * Null on failure
+ * # Safety
+ * Don't be stupid
+ */
+int start_emotional_damage(const char *bind_addr);
+
+/**
+ * Stops further emotional damage
+ * # Arguments
+ * * `handle` - The coping mechanism generated by start_emotional_damage
+ * # Returns
+ * The knowledge of knowing that you couldn't handle failure
+ * # Safety
+ * Don't be stupid
+ */
+void stop_emotional_damage(void);
+
+/**
+ * Blocks until Wireguard is ready
+ * # Arguments
+ * * `timeout` - The timeout in miliseconds to wait for Wireguard
+ * # Returns
+ * 0 on success, -1 on failure
+ */
+int test_emotional_damage(int timeout);

Makefile

@@ -2,6 +2,8 @@ SHELL := /bin/bash
 .PHONY: help ios update tvos
 
 RUBY := $(shell command -v ruby 2>/dev/null)
+RUST := $(shell command -v rust 2>/dev/null)
+RUSTUP := $(shell command -v rustup 2>/dev/null)
 HOMEBREW := $(shell command -v brew 2>/dev/null)
 BUNDLER := $(shell command -v bundle 2>/dev/null)
 
@@ -70,7 +72,11 @@ help:
 
 ## Install dependencies.
 setup: \
-	pre_setup
+	pre_setup \
+	install_rust \
+	install_rustup \
+	install_rust_toolchain \
+	build_rust_dependencies
 
 # check_for_homebrew \
 # update_homebrew \
@@ -83,6 +89,20 @@ pull_request: \
 pre_setup:
 	$(info Project setup…)
 
+check_for_rust:
+	$(info Checking for Rust…)
+
+ifeq ($(RUST),)
+	$(error Rust is not installed.)
+endif
+
+check_for_rustup:
+	$(info Checking for Rustup…)
+
+ifeq ($(RUSTUP),)
+	$(error Rust is not installed.)
+endif
+
 check_for_ruby:
 	$(info Checking for Ruby…)
 
@@ -133,12 +153,79 @@ pull:
 ## -- Source Code Tasks --
 
 ## Pull upstream and update 3rd party frameworks
-update: submodules
+# update: pull submodules build_rust_dependencies
+update: submodules build_rust_dependencies
 
 submodules:
 	$(info Updating submodules…)
 
-	git submodule update --init --recursive --remote
+	git submodule update --init --recursive
+
+build_rust_dependencies:
+	$(info Building Rust dependencies…)
+
+	pushd Dependencies/em_proxy
+	cargo build --release --target aarch64-apple-ios
+	popd
+	pushd Dependencies/minimuxer
+	cargo build --release --target aarch64-apple-ios
+	popd
+
+install_rustup:
+	$(info Installing Rustup…)
+
+	curl https://sh.rustup.rs -sSf | sh
+	source "$(HOME)/.cargo/env"
+	rustup target add aarch64-apple-ios
+
+# TODO: Add x86, armv7? toolchains
+# https://doc.rust-lang.org/nightly/rustc/platform-support.html
+
+install_cbindgen:
+	$(info Installing cbindgen…)
+
+	cargo install cbindgen
+
+install_rust_toolchain:
+	$(info Installing Rust toolchain…)
+
+	rustup target add aarch64-apple-ios
+
+install_rust_toolchain_ios_sim:
+	$(info Installing Rust iOS Sim toolchain…)
+
+	rustup target add aarch64-apple-ios-sim
+
+install_rust_toolchain_tvos:
+	$(info Installing Rust tvOS toolchain…)
+
+	rustup target add aarch64-apple-tvos
+
+install_rust_toolchain_tvos_sim:
+	$(info Installing Rust tvOS Sim toolchain…)
+
+	rustup target add aarch64-apple-tvos-sim
+
+install_rust_toolchain_watchos_sim:
+	$(info Installing Rust watchOS Sim toolchain…)
+
+	rustup target add aarch64-apple-watchos-sim
+
+install_rust_toolchain_watchos:
+	$(info Installing Rust watchOS toolchain…)
+
+	rustup target add aarch64-apple-watchos
+
+install_rust_toolchain_catalyst:
+	$(info Installing Rust macOS Catalyst toolchain…)
+
+	rustup target add aarch64-apple-ios-macabi
+
+install_rust:
+	$(info Installing Rust…)
+
+	curl https://sh.rustup.rs -sSf | sh
+	source "$(HOME)/.cargo/env"
 
 ## -- QA Task Runners --
 
@@ -156,24 +243,32 @@ test:
 
 ## -- Building --
 
-build:
-	@xcodebuild -project AltStore.xcodeproj \
-				-scheme AltStore \
-				-sdk iphoneos \
-				archive -archivePath ./archive \
-				CODE_SIGNING_REQUIRED=NO \
-				AD_HOC_CODE_SIGNING_ALLOWED=YES \
-				CODE_SIGNING_ALLOWED=NO \
-				DEVELOPMENT_TEAM=XYZ0123456 \
-				ORG_IDENTIFIER=com.SideStore
+developer_ios:
+	$(info Building iOS for Developer profile…)
 
-fakesign:
-	rm -rf archive.xcarchive/Products/Applications/SideStore.app/Frameworks/AltStoreCore.framework/Frameworks/
-	ldid -SAltStore/Resources/tempEnt.plist archive.xcarchive/Products/Applications/SideStore.app/SideStore
+	 xcodebuild -project AltStore.xcodeproj -scheme AltStore -sdk iphoneos archive -archivePath ./archive CODE_SIGNING_REQUIRED=NO AD_HOC_CODE_SIGNING_ALLOWED=YES CODE_SIGNING_ALLOWED=NO DEVELOPMENT_TEAM=XYZ0123456 ORG_IDENTIFIER=com.SideStore | xcpretty
 
-ipa:
-	mkdir Payload
-	mkdir Payload/SideStore.app
-	cp -R archive.xcarchive/Products/Applications/SideStore.app/ Payload/SideStore.app/
-	zip -r SideStore.ipa Payload
+developer_tvos:
+	$(info Building tvOS for Developer profile…)
 
+	 xcodebuild -project AltStore.xcodeproj -scheme AltStore -sdk tvos archive -archivePath ./archive CODE_SIGNING_REQUIRED=NO AD_HOC_CODE_SIGNING_ALLOWED=YES CODE_SIGNING_ALLOWED=NO DEVELOPMENT_TEAM=XYZ0123456 ORG_IDENTIFIER=com.SideStore | xcpretty
+
+## Update & build for iOS
+ios: | update developer_ios
+
+## Update & build for tvOS
+tvos: | update developer_tvos
+
+## Open the workspace
+open:
+	open AltStore.xcodeproj
+
+## tag and release to github
+release: | _var_VERSION
+	@if ! git diff --quiet HEAD; then \
+		( $(call _error,refusing to release with uncommitted changes) ; exit 1 ); \
+	fi
+	test
+	package
+	make --no-print-directory _tag VERSION=$(VERSION)
+	make --no-print-directory _push VERSION=$(VERSION)

README.md

@@ -35,9 +35,21 @@ SideStore is a just regular, sandboxed iOS application. The AltStore app target
 
 We're hoping to eventually eliminate our dependency on it, as it increases the amount of unnecessary Objective-C in the project.
 
-## Contributing/Compilation Instructions
+## Compilation Instructions
+SideStore is fairly straightforward to compile and run if you're already an iOS or macOS developer. Here are some basic instructions to get you started:
 
-Please see [CONTRIBUTING.md](./CONTRIBUTING.md)
+1. Clone the repository 
+	```
+	git clone https://github.com/SideStore/SideStore.git --recurse-submodules
+	```
+2. After installing Rustup, run `rustup target add aarch64-apple-ios`
+12. Within the Dependencies/em_proxy and Dependencies/minimuxer directories, run `cargo build --release --target aarch64-apple-ios`
+2. Open `AltStore.xcodeproj` and select the AltStore project in the project navigator. On the `Signing & Capabilities` tab, change the team from to your own account.
+3. **(Development only)** Change the value for `ALTDeviceID` in the Info.plist to your device's UDID. Normally, SideServer embeds the device's UDID in SideStore's Info.plist during installation. When running through Xcode you'll need to set the value yourself or else SideStore won't resign (or even install) apps for the proper device. You can achieve this by changing a few things to be able to build and use SideStore.
+5. Copy `CodeSigning.xcconfig.sample` to `CodeSigning.xcconfig`
+6. Fill out all of the properties in `CodeSigning.xcconfig` to match your account.
+7. In `Shared/Extensions/Bundle+AltStore.swift`, replace "group.com.rileytestut.AltStore" with your own App Group ID. 
+8. Build + run app! 🎉
 
 ## Licensing
 

minimuxer/minimuxer.h

@@ -0,0 +1,76 @@
+// Jackson Coxson
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+
+/**
+ * Mount iOS's developer DMG
+ * # Safety
+ * Don't be stupid
+ */
+void minimuxer_auto_mount(char *docs_path);
+
+/**
+ * Starts the muxer and heartbeat client
+ * # Arguments
+ * Pairing file as a list of chars and the length
+ * # Safety
+ * Don't be stupid
+ */
+int minimuxer_c_start(char *pairing_file, char *log_path);
+
+/**
+ * Debugs an app from an app ID
+ * # Safety
+ * Don't be stupid
+ */
+int minimuxer_debug_app(char *app_id);
+
+/**
+ * Installs an ipa with a bundle ID
+ * Expects the ipa to be in the afc jail from yeet_app_afc
+ * # Safety
+ * Don't be stupid
+ */
+int minimuxer_install_ipa(char *bundle_id);
+
+/**
+ * Installs a provisioning profile on the device
+ * # Arguments
+ * Pass a pointer to a plist
+ * # Returns
+ * 0 on success
+ * # Safety
+ * Don't be stupid
+ */
+int minimuxer_install_provisioning_profile(uint8_t *pointer, unsigned int len);
+
+/**
+ * Removes an app from the device
+ * # Safety
+ * Don't be stupid
+ */
+int minimuxer_remove_app(char *bundle_id);
+
+/**
+ * Removes a provisioning profile
+ * # Safety
+ * Don't be stupid
+ */
+int minimuxer_remove_provisioning_profile(char *id);
+
+/**
+ * Yeets an ipa to the afc jail
+ * # Safety
+ * Don't be stupid
+ */
+int minimuxer_yeet_app_afc(char *bundle_id, uint8_t *bytes_ptr, unsigned long bytes_len);
+
+/**
+ * Sets the current environment variable for libusbmuxd to localhost
+ */
+void target_minimuxer_address(void);

trustedapps.json

@@ -26,7 +26,7 @@
     },
     {
       "identifier": "dev.crystall1ne.repos.PojavLauncher",
-      "sourceURL": "https://alt.crystall1ne.dev"
+      "sourceURL": "https://alt.crystall1ne.software/"
     },
     {
       "identifier": "eu.pokemmo.altstore",