ALTSign cleanup

# Conflicts:
#	AltStore/Operations/SendAppOperation.swift

.github/maintenance/cache.py

@@ -1,63 +0,0 @@
-import requests
-import sys
-import os
-
-# Your GitHub Personal Access Token
-GITHUB_TOKEN = os.getenv("GITHUB_TOKEN")
-
-# Repository details
-REPO_OWNER = "SideStore"
-REPO_NAME = "SideStore"
-
-
-API_URL = f"https://api.github.com/repos/{REPO_OWNER}/{REPO_NAME}/actions/caches"
-
-# Common headers for GitHub API calls
-HEADERS = {
-    "Accept": "application/vnd.github+json",
-    "Authorization": f"Bearer {GITHUB_TOKEN}"
-}
-
-def list_caches():
-    response = requests.get(API_URL, headers=HEADERS)
-    if response.status_code != 200:
-        print(f"Failed to list caches. HTTP {response.status_code}")
-        print("Response:", response.text)
-        sys.exit(1)
-    data = response.json()
-    return data.get("actions_caches", [])
-
-def delete_cache(cache_id):
-    delete_url = f"{API_URL}/{cache_id}"
-    response = requests.delete(delete_url, headers=HEADERS)
-    return response.status_code
-
-def main():
-    caches = list_caches()
-    if not caches:
-        print("No caches found.")
-        return
-
-    print("Found caches:")
-    for cache in caches:
-        print(f"ID: {cache.get('id')}, Key: {cache.get('key')}")
-    
-    print("\nDeleting caches...")
-    for cache in caches:
-        cache_id = cache.get("id")
-        status = delete_cache(cache_id)
-        if status == 204:
-            print(f"Successfully deleted cache with ID: {cache_id}")
-        else:
-            print(f"Failed to delete cache with ID: {cache_id}. HTTP status code: {status}")
-    
-    print("All caches processed.")
-
-if __name__ == "__main__":
-    main()
-
-
-### How to use
-'''
-just export the GITHUB_TOKEN and then run this script via `python3 cache.py' to delete the caches 
-'''

.github/workflows/alpha.yml

@@ -1,28 +1,220 @@
-name: Alpha SideStore build
+name: Alpha SideStore Build
+
 on:
   push:
-    branches:
-      - develop-alpha
+    branches: [staging]
+  workflow_dispatch:
 
-# cancel duplicate run if from same branch
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  Reusable-build:
-    uses: ./.github/workflows/reusable-sidestore-build.yml
-    with:
-      # bundle_id: "com.SideStore.SideStore.Alpha"
-      bundle_id: "com.SideStore.SideStore"
-      # bundle_id_suffix: ".Alpha"
-      is_beta: true
-      publish: ${{ vars.PUBLISH_ALPHA_UPDATES == 'true' }} 
-      is_shared_build_num: false
-      release_tag: "alpha"
-      release_name: "Alpha"
-      upstream_tag: "nightly"
-      upstream_name: "Nightly"
-    secrets:
-      CROSS_REPO_PUSH_KEY: ${{ secrets.CROSS_REPO_PUSH_KEY }}
-      BUILD_LOG_ZIP_PASSWORD: ${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+  build:
+    runs-on: macos-26
+    env:
+      DEPLOY_KEY: ${{ secrets.CROSS_REPO_PUSH_KEY }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      RELEASE_NAME: Alpha
+      CHANNEL: alpha
+      UPSTREAM_CHANNEL: "nightly"
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Find Last Successful commit
+        run: |
+          LAST_SUCCESSFUL_COMMIT=$(python3 scripts/ci/workflow.py last-successful-commit \
+            "false" "${{ env.CHANNEL }}" || echo "")
+          echo "LAST_SUCCESSFUL_COMMIT=$LAST_SUCCESSFUL_COMMIT" | tee -a $GITHUB_ENV
+
+      - run: brew install ldid xcbeautify
+
+      # --------------------------------------------------
+      # runtime env setup
+      # --------------------------------------------------
+      - name: Setup Env
+        run: |
+          BUILD_NUM="${{ github.run_number }}"
+          MARKETING_VERSION=$(python3 scripts/ci/workflow.py get-marketing-version)
+          SHORT_COMMIT=$(python3 scripts/ci/workflow.py commit-id)
+
+          NORMALIZED_VERSION=$(python3 scripts/ci/workflow.py compute-normalized \
+              "$MARKETING_VERSION" \
+              "$BUILD_NUM" \
+              "$SHORT_COMMIT")
+
+          python3 scripts/ci/workflow.py set-marketing-version "$NORMALIZED_VERSION"
+
+          echo "BUILD_NUM=$BUILD_NUM" | tee -a $GITHUB_ENV
+          echo "SHORT_COMMIT=$SHORT_COMMIT" | tee -a $GITHUB_ENV
+          echo "MARKETING_VERSION=$NORMALIZED_VERSION" | tee -a $GITHUB_ENV
+
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1.6.0
+        with:
+          xcode-version: "26.2"
+
+      - name: Restore Cache (exact)
+        id: xcode-cache-exact
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-build-cache-${{ github.ref_name }}-${{ github.sha }}
+
+      - name: Restore Cache (last)
+        if: steps.xcode-cache-exact.outputs.cache-hit != 'true'
+        id: xcode-cache-fallback
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-build-cache-${{ github.ref_name }}-
+
+      # --------------------------------------------------
+      # build and test
+      # --------------------------------------------------
+      - name: Clean
+        if: contains(github.event.head_commit.message, '[--clean-build]')
+        run: |
+          python3 scripts/ci/workflow.py clean
+          python3 scripts/ci/workflow.py clean-derived-data
+          python3 scripts/ci/workflow.py clean-spm-cache
+
+      - name: Boot simulator (async)
+        if: >
+          vars.ENABLE_TESTS == '1' &&
+          vars.ENABLE_TESTS_RUN == '1'
+        run: |
+          mkdir -p build/logs
+          python3 scripts/ci/workflow.py boot-sim-async "iPhone 17 Pro"
+
+      - name: Build
+        id: build
+        env:
+          BUILD_LOG_ZIP_PASSWORD: ${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+        run: |
+          python3 scripts/ci/workflow.py build; STATUS=$?
+          python3 scripts/ci/workflow.py encrypt-build
+          echo "encrypted=true" >> $GITHUB_OUTPUT
+          exit $STATUS
+
+      - name: Tests Build
+        id: test-build
+        if: >
+          vars.ENABLE_TESTS == '1' &&
+          vars.ENABLE_TESTS_BUILD == '1'
+        env:
+          BUILD_LOG_ZIP_PASSWORD: ${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+        run: |
+          python3 scripts/ci/workflow.py tests-build; STATUS=$?
+          python3 scripts/ci/workflow.py encrypt-tests-build
+          exit $STATUS
+
+      - name: Save Cache
+        if: ${{ steps.xcode-cache-fallback.outputs.cache-hit != 'true' }}
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-build-cache-${{ github.ref_name }}-${{ github.sha }}
+
+      - name: Tests Run
+        id: test-run
+        if: >
+          vars.ENABLE_TESTS == '1' &&
+          vars.ENABLE_TESTS_RUN == '1'
+        env:
+          BUILD_LOG_ZIP_PASSWORD: ${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+        run: |
+          python3 scripts/ci/workflow.py tests-run "iPhone 17 Pro"; STATUS=$?
+          python3 scripts/ci/workflow.py encrypt-tests-run
+          exit $STATUS
+
+      # --------------------------------------------------
+      # artifacts
+      # --------------------------------------------------
+      - uses: actions/upload-artifact@v4
+        with:
+          name: build-logs-${{ env.MARKETING_VERSION }}.zip
+          path: build-logs.zip
+
+      - uses: actions/upload-artifact@v4
+        if: >
+          vars.ENABLE_TESTS == '1' &&
+          vars.ENABLE_TESTS_BUILD == '1'
+        with:
+          name: tests-build-logs-${{ env.SHORT_COMMIT }}.zip
+          path: tests-build-logs.zip
+
+      - uses: actions/upload-artifact@v4
+        if: >
+          vars.ENABLE_TESTS == '1' &&
+          vars.ENABLE_TESTS_RUN == '1'
+        with:
+          name: tests-run-logs-${{ env.SHORT_COMMIT }}.zip
+          path: tests-run-logs.zip
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: SideStore-${{ env.MARKETING_VERSION }}.ipa
+          path: SideStore.ipa
+      - uses: actions/upload-artifact@v4
+        with:
+          name: SideStore-${{ env.MARKETING_VERSION }}-dSYMs.zip
+          path: SideStore.dSYMs.zip
+
+      - uses: actions/checkout@v4
+        if: env.DEPLOY_KEY != ''
+        with:
+          repository: "SideStore/apps-v2.json"
+          ref: "main"
+          token: ${{ secrets.CROSS_REPO_PUSH_KEY }}
+          path: "SideStore/apps-v2.json"
+
+      - name: Generate Metadata
+        run: |
+          python3 scripts/ci/workflow.py dump-project-settings
+          PRODUCT_NAME=$(python3 scripts/ci/workflow.py read-product-name)
+          BUNDLE_ID=$(python3 scripts/ci/workflow.py read-bundle-id)
+          IPA_NAME="$PRODUCT_NAME.ipa"
+
+          python3 scripts/ci/workflow.py generate-metadata \
+            "$CHANNEL" \
+            "$SHORT_COMMIT" \
+            "$MARKETING_VERSION" \
+            "$CHANNEL" \
+            "$BUNDLE_ID" \
+            "$IPA_NAME" \
+            "$LAST_SUCCESSFUL_COMMIT"
+
+      - name: Deploy
+        if: env.DEPLOY_KEY != ''
+        run: |
+          SOURCE_JSON="_includes/source.json"
+
+          python3 scripts/ci/workflow.py deploy \
+            SideStore/apps-v2.json \
+            "$SOURCE_JSON" \
+            "$CHANNEL" \
+            "$MARKETING_VERSION"
+      
+
+      # --------------------------------------------------
+      # upload release to GH
+      # --------------------------------------------------
+      - name: Upload Release
+        run: |
+          python3 scripts/ci/workflow.py upload-release \
+            "$RELEASE_NAME" \
+            "$CHANNEL" \
+            "$GITHUB_SHA" \
+            "$GITHUB_REPOSITORY" \
+            "$UPSTREAM_CHANNEL"

.github/workflows/beta.yml

@@ -1,103 +0,0 @@
-name: Beta SideStore build
-on:
-  push:
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+' # example: 1.0.0-beta.1
-
-jobs:
-  build:
-    name: Build and upload SideStore Beta
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'macos-14'
-            version: '15.4'
-
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - 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: Get version
-        id: version
-        run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT
-
-      - name: Echo version
-        run: echo "${{ steps.version.outputs.version }}"
-
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: ${{ matrix.version }}
-
-      
-      - name: Cache Build
-        uses: irgaly/xcode-cache@v1
-        with:
-          key: xcode-cache-deriveddata-${{ github.sha }}
-          restore-keys: xcode-cache-deriveddata
-
-      - name: Build SideStore
-        run: make build | xcpretty && exit ${PIPESTATUS[0]}
-
-      - name: Fakesign app
-        run: make fakesign
-
-      - name: Convert to IPA
-        run: make ipa
-
-      - name: Get current date
-        id: date
-        run: echo "date=$(date -u +'%c')" >> $GITHUB_OUTPUT
-
-      - name: Get current date in AltStore date form
-        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
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          name: ${{ steps.version.outputs.version }}
-          tag_name: ${{ github.ref_name }}
-          draft: true
-          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
-            
-            - TODO
-            
-            ## Build Info
-            
-            Built at (UTC): `${{ steps.date.outputs.date }}`
-            Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
-            Commit SHA: `${{ github.sha }}`
-            Version: `${{ steps.version.outputs.version }}`
-
-      - name: Add version to IPA file name
-        run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
-
-      - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: SideStore-${{ steps.version.outputs.version }}.ipa
-          path: SideStore-${{ steps.version.outputs.version }}.ipa
-
-      - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: SideStore-${{ steps.version.outputs.version }}-dSYM
-          path: ./*.dSYM/

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

@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-# Ensure we are in root directory
-cd "$(dirname "$0")/../.."
-
-DATE=`date -u +'%Y.%m.%d'`
-BUILD_NUM=1
-
-# Use RELEASE_CHANNEL from the environment variable or default to "beta"
-RELEASE_CHANNEL=${RELEASE_CHANNEL:-"beta"}
-
-write() {
-    sed -e "/MARKETING_VERSION = .*/s/$/-$RELEASE_CHANNEL.$DATE.$BUILD_NUM+$(git rev-parse --short HEAD)/" -i '' Build.xcconfig
-    echo "$DATE,$BUILD_NUM" > build_number.txt
-}
-
-if [ ! -f "build_number.txt" ]; then
-    write
-    exit 0
-fi
-
-LAST_DATE=`cat build_number.txt | perl -n -e '/([^,]*),([^ ]*)$/ && print $1'`
-LAST_BUILD_NUM=`cat build_number.txt | perl -n -e '/([^,]*),([^ ]*)$/ && print $2'`
-
-# if [[ "$DATE" != "$LAST_DATE" ]]; then
-#     write
-# else
-#     BUILD_NUM=`expr $LAST_BUILD_NUM + 1`
-#     write
-# fi
-
-# Build number is always incremental
-BUILD_NUM=`expr $LAST_BUILD_NUM + 1`
-write

.github/workflows/nightly.yml

@@ -1,82 +1,260 @@
 name: Nightly SideStore Build
+
 on:
   push:
-    branches:
-      - develop
+    branches: [develop]
   schedule:
-    - cron: '0 0 * * *' # Runs every night at midnight UTC
-  workflow_dispatch: # Allows manual trigger
+    - cron: "0 0 * * *"
+  workflow_dispatch:
 
-# cancel duplicate run if from same branch
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  check-changes:
-    if: github.event_name == 'schedule'
-    runs-on: ubuntu-latest
-    outputs:
-      has_changes: ${{ steps.check.outputs.has_changes }}
+  build:
+    runs-on: macos-26
+    env:
+      DEPLOY_KEY: ${{ secrets.CROSS_REPO_PUSH_KEY }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      RELEASE_NAME: Nightly
+      CHANNEL: nightly
+      UPSTREAM_CHANNEL: ""
+
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
-          fetch-depth: 0 # Ensure full history
+          submodules: recursive
+          fetch-depth: 0
 
-      - name: Get last successful workflow run
-        id: get_last_success
+      - name: Find Last Successful commit
         run: |
-          LAST_SUCCESS=$(gh run list --workflow "Nightly SideStore Build" --json createdAt,conclusion \
-            --jq '[.[] | select(.conclusion=="success")][0].createdAt' || echo "")
-          echo "Last successful run: $LAST_SUCCESS"
-          echo "last_success=$LAST_SUCCESS" >> $GITHUB_ENV
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          LAST_SUCCESSFUL_COMMIT=$(python3 scripts/ci/workflow.py last-successful-commit \
+            "false" "${{ env.CHANNEL }}" || echo "")
+          echo "LAST_SUCCESSFUL_COMMIT=$LAST_SUCCESSFUL_COMMIT" | tee -a $GITHUB_ENV
 
-      - name: Check for new commits since last successful build
-        id: check
+      - name: Check for new changes (on schedule)
+        id: check_changes
+        if: github.event_name == 'schedule'
         run: |
-          if [ -n "$LAST_SUCCESS" ]; then
-            NEW_COMMITS=$(git rev-list --count --since="$LAST_SUCCESS" origin/develop)
-            COMMIT_LOG=$(git log --since="$LAST_SUCCESS" --pretty=format:"%h %s" origin/develop)
-          else
-            NEW_COMMITS=1
-            COMMIT_LOG=$(git log -n 10 --pretty=format:"%h %s" origin/develop) # Show last 10 commits if no history
-          fi
-          
-          echo "Has changes: $NEW_COMMITS"
-          echo "New commits since last successful build:"
-          echo "$COMMIT_LOG"
-          
-          if [ "$NEW_COMMITS" -gt 0 ]; then
-            echo "has_changes=true" >> $GITHUB_OUTPUT
-          else
-            echo "has_changes=false" >> $GITHUB_OUTPUT
-          fi
+          NEW_COMMITS=$(python3 scripts/ci/workflow.py count-new-commits "$LAST_SUCCESSFUL_COMMIT")
+          SHOULD_BUILD=$([ "${NEW_COMMITS:-0}" -ge 1 ] && echo true || echo false)
+          echo "should_build=$SHOULD_BUILD" >> $GITHUB_OUTPUT
+          echo "NEW_COMMITS=$NEW_COMMITS" | tee -a $GITHUB_ENV
+
+      - name: Should Skip Building (on schedule)
+        id: build_gate
+        run: |
+          SHOULD_SKIP=$(
+            { [ "${{ github.event_name }}" = "schedule" ] && \
+              [ "${{ steps.check_changes.outputs.should_build }}" != "true" ]; \
+            } && echo true || echo false
+          )
+          echo "should_skip=$SHOULD_SKIP" >> $GITHUB_OUTPUT
+
+      - run: brew install ldid xcbeautify
+        if: steps.build_gate.outputs.should_skip != 'true'
+
+      # --------------------------------------------------
+      # runtime env setup
+      # --------------------------------------------------
+      - name: Setup Env
+        if: steps.build_gate.outputs.should_skip != 'true'
+        run: |
+          BUILD_NUM="${{ github.run_number }}"
+          MARKETING_VERSION=$(python3 scripts/ci/workflow.py get-marketing-version)
+          SHORT_COMMIT=$(python3 scripts/ci/workflow.py commit-id)
+
+          NORMALIZED_VERSION=$(python3 scripts/ci/workflow.py compute-normalized \
+              "$MARKETING_VERSION" \
+              "$BUILD_NUM" \
+              "$SHORT_COMMIT")
+
+          python3 scripts/ci/workflow.py set-marketing-version "$NORMALIZED_VERSION"
+
+          echo "BUILD_NUM=$BUILD_NUM" | tee -a $GITHUB_ENV
+          echo "SHORT_COMMIT=$SHORT_COMMIT" | tee -a $GITHUB_ENV
+          echo "MARKETING_VERSION=$NORMALIZED_VERSION" | tee -a $GITHUB_ENV
+
+      - name: Setup Xcode
+        if: steps.build_gate.outputs.should_skip != 'true'
+        uses: maxim-lobanov/setup-xcode@v1.6.0
+        with:
+          xcode-version: "26.2"
+
+      - name: Restore Cache (exact)
+        if: steps.build_gate.outputs.should_skip != 'true'
+        id: xcode-cache-exact
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-build-cache-${{ github.ref_name }}-${{ github.sha }}
+
+      - name: Restore Cache (last)
+        if: >
+          steps.build_gate.outputs.should_skip != 'true' &&
+          steps.xcode-cache-exact.outputs.cache-hit != 'true'
+        id: xcode-cache-fallback
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-build-cache-${{ github.ref_name }}-
+
+      # --------------------------------------------------
+      # build and test
+      # --------------------------------------------------
+      - name: Clean
+        if: steps.build_gate.outputs.should_skip != 'true' && contains(github.event.head_commit.message, '[--clean-build]')
+        run: |
+          python3 scripts/ci/workflow.py clean
+          python3 scripts/ci/workflow.py clean-derived-data
+          python3 scripts/ci/workflow.py clean-spm-cache
+
+      - name: Boot simulator (async)
+        if: >
+          steps.build_gate.outputs.should_skip != 'true' &&
+          vars.ENABLE_TESTS == '1' &&
+          vars.ENABLE_TESTS_RUN == '1'
+        run: |
+          mkdir -p build/logs
+          python3 scripts/ci/workflow.py boot-sim-async "iPhone 17 Pro"
+
+      - name: Build
+        if: steps.build_gate.outputs.should_skip != 'true'
+        id: build
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          LAST_SUCCESS: ${{ env.last_success }}
+          BUILD_LOG_ZIP_PASSWORD: ${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+        run: |
+          python3 scripts/ci/workflow.py build; STATUS=$?
+          python3 scripts/ci/workflow.py encrypt-build
+          echo "encrypted=true" >> $GITHUB_OUTPUT
+          exit $STATUS
 
-  Reusable-build:
-    if: |
-      always() &&
-      (github.event_name == 'push' || 
-      (github.event_name == 'schedule' && needs.check-changes.result == 'success' && needs.check-changes.outputs.has_changes == 'true'))
-    needs: check-changes
-    uses: ./.github/workflows/reusable-sidestore-build.yml
-    with:
-      # bundle_id: "com.SideStore.SideStore.Nightly"
-      bundle_id: "com.SideStore.SideStore"
-      # bundle_id_suffix: ".Nightly"
-      is_beta: true
-      publish: ${{ vars.PUBLISH_NIGHTLY_UPDATES == 'true' }} 
-      is_shared_build_num: false
-      release_tag: "nightly"
-      release_name: "Nightly"
-      upstream_tag: "0.5.10"
-      upstream_name: "Stable"
-    secrets:
-      CROSS_REPO_PUSH_KEY: ${{ secrets.CROSS_REPO_PUSH_KEY }}
-      BUILD_LOG_ZIP_PASSWORD: ${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+      - name: Tests Build
+        if: >
+          steps.build_gate.outputs.should_skip != 'true' &&
+          vars.ENABLE_TESTS == '1' &&
+          vars.ENABLE_TESTS_BUILD == '1'
+        id: test-build
+        env:
+          BUILD_LOG_ZIP_PASSWORD: ${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+        run: |
+          python3 scripts/ci/workflow.py tests-build; STATUS=$?
+          python3 scripts/ci/workflow.py encrypt-tests-build
+          exit $STATUS
 
+      - name: Save Cache
+        if: >
+          steps.build_gate.outputs.should_skip != 'true' &&
+          steps.xcode-cache-fallback.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v3
+        with:
+          path: |
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-build-cache-${{ github.ref_name }}-${{ github.sha }}
+
+      - name: Tests Run
+        if: >
+          steps.build_gate.outputs.should_skip != 'true' &&
+          vars.ENABLE_TESTS == '1' &&
+          vars.ENABLE_TESTS_RUN == '1'
+        id: test-run
+        env:
+          BUILD_LOG_ZIP_PASSWORD: ${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
+        run: |
+          python3 scripts/ci/workflow.py tests-run "iPhone 17 Pro"; STATUS=$?
+          python3 scripts/ci/workflow.py encrypt-tests-run
+          exit $STATUS
+
+      # --------------------------------------------------
+      # artifacts
+      # --------------------------------------------------
+      - uses: actions/upload-artifact@v4
+        if: steps.build_gate.outputs.should_skip != 'true'
+        with:
+          name: build-logs-${{ env.MARKETING_VERSION }}.zip
+          path: build-logs.zip
+
+      - uses: actions/upload-artifact@v4
+        if: >
+          steps.build_gate.outputs.should_skip != 'true' &&
+          vars.ENABLE_TESTS == '1' &&
+          vars.ENABLE_TESTS_BUILD == '1'
+        with:
+          name: tests-build-logs-${{ env.SHORT_COMMIT }}.zip
+          path: tests-build-logs.zip
+
+      - uses: actions/upload-artifact@v4
+        if: >
+          steps.build_gate.outputs.should_skip != 'true' &&
+          vars.ENABLE_TESTS == '1' &&
+          vars.ENABLE_TESTS_RUN == '1'
+        with:
+          name: tests-run-logs-${{ env.SHORT_COMMIT }}.zip
+          path: tests-run-logs.zip
+
+      - uses: actions/upload-artifact@v4
+        if: steps.build_gate.outputs.should_skip != 'true'
+        with:
+          name: SideStore-${{ env.MARKETING_VERSION }}.ipa
+          path: SideStore.ipa
+      - uses: actions/upload-artifact@v4
+        if: steps.build_gate.outputs.should_skip != 'true'
+        with:
+          name: SideStore-${{ env.MARKETING_VERSION }}-dSYMs.zip
+          path: SideStore.dSYMs.zip
+
+      - uses: actions/checkout@v4
+        if: steps.build_gate.outputs.should_skip != 'true' && env.DEPLOY_KEY != ''
+        with:
+          repository: "SideStore/apps-v2.json"
+          ref: "main"
+          token: ${{ secrets.CROSS_REPO_PUSH_KEY }}
+          path: "SideStore/apps-v2.json"
+
+      - name: Generate Metadata
+        if: steps.build_gate.outputs.should_skip != 'true'
+        run: |
+          python3 scripts/ci/workflow.py dump-project-settings
+          PRODUCT_NAME=$(python3 scripts/ci/workflow.py read-product-name)
+          BUNDLE_ID=$(python3 scripts/ci/workflow.py read-bundle-id)
+          IPA_NAME="$PRODUCT_NAME.ipa"
+
+          python3 scripts/ci/workflow.py generate-metadata \
+            "$CHANNEL" \
+            "$SHORT_COMMIT" \
+            "$MARKETING_VERSION" \
+            "$CHANNEL" \
+            "$BUNDLE_ID" \
+            "$IPA_NAME" \
+            "$LAST_SUCCESSFUL_COMMIT"
+
+      - name: Deploy
+        if: steps.build_gate.outputs.should_skip != 'true' && env.DEPLOY_KEY != ''
+        run: |
+          SOURCE_JSON="_includes/source.json"
+
+          python3 scripts/ci/workflow.py deploy \
+            SideStore/apps-v2.json \
+            "$SOURCE_JSON" \
+            "$CHANNEL" \
+            "$MARKETING_VERSION"
+      
+
+      # --------------------------------------------------
+      # upload release to GH
+      # --------------------------------------------------
+      - name: Upload Release
+        if: steps.build_gate.outputs.should_skip != 'true'
+        run: |
+          python3 scripts/ci/workflow.py upload-release \
+            "$RELEASE_NAME" \
+            "$CHANNEL" \
+            "$GITHUB_SHA" \
+            "$GITHUB_REPOSITORY" \
+            "$UPSTREAM_CHANNEL"

.github/workflows/pr.yml

@@ -1,143 +1,90 @@
 name: Pull Request SideStore build
+
 on:
   pull_request:
     # types: [opened, synchronize, reopened, ready_for_review, converted_to_draft]
     types: [opened, synchronize, reopened, ready_for_review]
 
+concurrency:
+  group: pr-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build and upload SideStore
     if: ${{ github.event.pull_request.draft == false }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'macos-14'
-            version: '16.1'
+    runs-on: macos-26
 
-    runs-on: ${{ matrix.os }}
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
+          fetch-depth: 1    # shallow clone just for PR
 
-      - name: Install dependencies
-        run: brew install ldid
+      - run: brew install ldid xcbeautify
 
-      - name: Install xcbeautify
-        run: brew install xcbeautify
-
-      - name: Add PR suffix to version
-        run: sed -e "/MARKETING_VERSION = .*/s/\$/-pr.${{ github.event.pull_request.number }}+$(git rev-parse --short ${COMMIT:-HEAD})/" -i '' Build.xcconfig
-        env:
-          COMMIT: ${{ github.event.pull_request.head.sha }}
-
-      - name: Get version
-        id: version
-        run: echo "version=$(grep MARKETING_VERSION Build.xcconfig | sed -e "s/MARKETING_VERSION = //g")" >> $GITHUB_OUTPUT
-
-      - name: Echo version
-        run: echo "${{ steps.version.outputs.version }}"
+      - name: Setup Env
+        run: |
+          MARKETING_VERSION=$(python3 scripts/ci/workflow.py get-marketing-version)
+          SHORT_COMMIT=$(git rev-parse --short ${{ github.event.pull_request.head.sha }})
+          NORMALIZED_VERSION="${MARKETING_VERSION}-pr.${{ github.event.pull_request.number }}+${SHORT_COMMIT}"
+          python3 scripts/ci/workflow.py set-marketing-version "$NORMALIZED_VERSION"
+          echo "SHORT_COMMIT=$SHORT_COMMIT" | tee -a $GITHUB_ENV
+          echo "MARKETING_VERSION=$NORMALIZED_VERSION" | tee -a $GITHUB_ENV
 
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1.6.0
         with:
-          xcode-version: ${{ matrix.version }}
+          xcode-version: "26.2"
 
-      - name: Cache Build
-        uses: irgaly/xcode-cache@v1
-        with:
-          key: xcode-cache-deriveddata-${{ github.sha }}
-          restore-keys: xcode-cache-deriveddata-
-          swiftpm-cache-key: xcode-cache-sourcedata-${{ github.sha }}
-          swiftpm-cache-restore-keys: |
-            xcode-cache-sourcedata-
-
-
-      - name: Restore Pods from Cache (Exact match)
-        id: pods-restore
+      - name: Restore Cache (exact)
+        id: xcode-cache-exact
         uses: actions/cache/restore@v3
         with:
           path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-${{ hashFiles('Podfile') }}
-          # restore-keys: |         # commented out to strictly check cache for this particular podfile
-          #   pods-cache-
-          
-      - name: Restore Pods from Cache (Last Available)
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }} 
-        id: pods-restore-recent
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-build-cache-${{ github.ref_name }}-${{ github.sha }}
+
+      - name: Restore Cache (last)
+        if: steps.xcode-cache-exact.outputs.cache-hit != 'true'
+        id: xcode-cache-fallback
         uses: actions/cache/restore@v3
         with:
           path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-build-cache-${{ github.ref_name }}-
 
-      - name: Install CocoaPods
-        # if: ${{ steps.pods-restore.outputs.cache-hit != 'true'}}
-        id: pods-install
+      - name: Build
+        env:
+          BUILD_LOG_ZIP_PASSWORD: ${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
         run: |
-          pod install
+          python3 scripts/ci/workflow.py build; STATUS=$?
+          python3 scripts/ci/workflow.py encrypt-build
+          mv SideStore.ipa SideStore-${{ env.MARKETING_VERSION }}.ipa
+          exit $STATUS
 
-      - name: Save Pods to Cache
-        id: save-pods
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
+      - name: Save Cache
+        if: ${{ steps.xcode-cache-fallback.outputs.cache-hit != 'true' }}
         uses: actions/cache/save@v3
         with:
           path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-${{ hashFiles('Podfile') }}
-    
-      - name: List Files and derived data
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-          
-          echo ">>>>>>>>> Pods <<<<<<<<<<"
-          find Pods -maxdepth 2 -exec ls -ld {} + || true  # List contents if directory exists    
-          echo ""
-          
-          echo ">>>>>>>>> SideStore <<<<<<<<<<"
-          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists    
-          echo ""
-          
-          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
-          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists    
-          echo ""
-          
-          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
-          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists    
-          echo ""
+            ~/Library/Developer/Xcode/DerivedData
+            ~/Library/Caches/org.swift.swiftpm
+          key: xcode-build-cache-${{ github.ref_name }}-${{ github.sha }}
 
-        
-      - name: Build SideStore
-        run: NSUnbufferedIO=YES make build 2>&1 | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
-
-      - name: Fakesign app
-        run: make fakesign
-
-      - name: Convert to IPA
-        run: make ipa
-
-      - name: Add version to IPA file name
-        run: mv SideStore.ipa SideStore-${{ steps.version.outputs.version }}.ipa
-
-      - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         with:
-          name: SideStore-${{ steps.version.outputs.version }}.ipa
-          path: SideStore-${{ steps.version.outputs.version }}.ipa
+          name: build-logs-${{ env.MARKETING_VERSION }}.zip
+          path: build-logs.zip
 
-      - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         with:
-          name: SideStore-${{ steps.version.outputs.version }}-dSYM
-          path: ./SideStore.xcarchive/dSYMs/*
+          name: SideStore-${{ env.MARKETING_VERSION }}.ipa
+          path: SideStore-${{ env.MARKETING_VERSION }}.ipa
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: SideStore-${{ env.MARKETING_VERSION }}-dSYMs.zip
+          path: SideStore.dSYMs.zip

.github/workflows/reusable-sidestore-build.yml

@@ -1,104 +0,0 @@
-name: Reusable SideStore Build
-
-on:
-  workflow_call:
-    inputs:
-      is_beta:
-        required: false
-        default: false
-        type: boolean
-      publish:
-        required: false
-        default: false
-        type: boolean
-      is_shared_build_num:
-        required: false
-        default: true
-        type: boolean
-      release_name:
-        required: true
-        type: string
-      release_tag:
-        required: true
-        type: string
-      upstream_tag:
-        required: true
-        type: string
-      upstream_name:
-        required: true
-        type: string
-      bundle_id:
-        default: com.SideStore.SideStore
-        required: true
-        type: string
-      bundle_id_suffix:
-        default: ''
-        required: false
-        type: string
-
-    secrets:
-    #   GITHUB_TOKEN:
-    #     required: true
-      CROSS_REPO_PUSH_KEY:
-        required: true
-      BUILD_LOG_ZIP_PASSWORD:
-        required: false
-
-
-# since build cache, test-build cache, test-run cache are involved, out of order exec if serialization is on individual jobs will wreak all sorts of havoc
-# so we serialize on the entire workflow
-concurrency:                  
-  group: serialize-workflow
-    
-jobs:
-  shared:
-    uses: ./.github/workflows/sidestore-shared.yml
-    secrets: inherit
-
-  build:
-    needs: shared
-    uses: ./.github/workflows/sidestore-build.yml
-    with:
-      is_beta: ${{ inputs.is_beta }}
-      is_shared_build_num: ${{ inputs.is_shared_build_num }}
-      release_tag: ${{ inputs.release_tag }}
-      short_commit: ${{ needs.shared.outputs.short-commit }}
-      bundle_id: ${{ inputs.bundle_id }}
-      bundle_id_suffix: ${{ inputs.bundle_id_suffix }}
-    secrets: inherit
-
-  tests-build:
-    if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_BUILD == '1' }}
-    needs: shared
-    uses: ./.github/workflows/sidestore-tests-build.yml
-    with:
-      release_tag: ${{ inputs.release_tag }}
-      short_commit: ${{ needs.shared.outputs.short-commit }}
-    secrets: inherit
-
-  tests-run:
-    if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_RUN == '1' }}
-    needs: [shared, tests-build]
-    uses: ./.github/workflows/sidestore-tests-run.yml
-    with:
-      release_tag: ${{ inputs.release_tag }}
-      short_commit: ${{ needs.shared.outputs.short-commit }}
-    secrets: inherit
-
-  deploy:
-    needs: [shared, build, tests-build, tests-run]  # Keep tests-run in needs
-    if: ${{ always() && (needs.tests-run.result == 'skipped' || needs.tests-run.result == 'success') }}
-    uses: ./.github/workflows/sidestore-deploy.yml
-    with:
-      is_beta: ${{ inputs.is_beta }}
-      publish: ${{ inputs.publish }}
-      release_name: ${{ inputs.release_name }}
-      release_tag: ${{ inputs.release_tag }}
-      upstream_tag: ${{ inputs.upstream_tag }}
-      upstream_name: ${{ inputs.upstream_name }}
-      version: ${{ needs.build.outputs.version }}
-      short_commit: ${{ needs.shared.outputs.short-commit }}
-      release_channel: ${{ needs.build.outputs.release-channel }}
-      marketing_version: ${{ needs.build.outputs.marketing-version }}
-      bundle_id: ${{ inputs.bundle_id }}
-    secrets: inherit

.github/workflows/sidestore-build.yml

@@ -1,401 +0,0 @@
-name: SideStore Build
-
-on:
-  workflow_call:
-    inputs:
-      is_beta:
-        type: boolean
-      is_shared_build_num:
-        type: boolean
-      release_tag:
-        type: string
-      bundle_id:
-        type: string
-      bundle_id_suffix:
-        type: string
-      short_commit:
-        type: string
-    secrets:
-      CROSS_REPO_PUSH_KEY:
-        required: true
-      BUILD_LOG_ZIP_PASSWORD:
-        required: false
-    outputs:
-      version: 
-        value: ${{ jobs.build.outputs.version }}
-      marketing-version: 
-        value: ${{ jobs.build.outputs.marketing-version }}
-      release-channel:
-        value: ${{ jobs.build.outputs.release-channel }}
-          
-jobs:
-  build:
-    name: Build SideStore - ${{ inputs.release_tag }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'macos-15'
-            version: '16.2'
-    runs-on: ${{ matrix.os }}
-    outputs:
-      version: ${{ steps.version.outputs.version }}
-      marketing-version: ${{ steps.marketing-version.outputs.MARKETING_VERSION }}
-      release-channel: ${{ steps.release-channel.outputs.RELEASE_CHANNEL }}
-
-    steps:
-      - name: Set beta status
-        run: echo "IS_BETA=${{ inputs.is_beta }}" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
-
-      - name: Install dependencies - ldid & xcbeautify
-        run: |
-          brew install ldid xcbeautify
-
-      - name: Set ref based on is_shared_build_num
-        if: ${{ inputs.is_beta }}
-        id: set_ref
-        run: |
-          if [ "${{ inputs.is_shared_build_num }}" == "true" ]; then
-            echo "ref=main" >> $GITHUB_ENV
-          else
-            echo "ref=${{ inputs.release_tag }}" >> $GITHUB_ENV
-          fi
-        shell: bash
-
-      - name: Checkout SideStore/beta-build-num repo
-        if: ${{ inputs.is_beta }}
-        uses: actions/checkout@v4
-        with:
-          repository: 'SideStore/beta-build-num'
-          ref: ${{ env.ref }}
-          token: ${{ secrets.CROSS_REPO_PUSH_KEY }}
-          path: 'SideStore/beta-build-num'
-
-      - name: Copy build_number.txt to repo root
-        if: ${{ inputs.is_beta }}
-        run: |
-          cp SideStore/beta-build-num/build_number.txt .
-          echo "cat build_number.txt"
-          cat build_number.txt
-        shell: bash
-
-      - name: Echo Build.xcconfig
-        run: |
-          echo "cat Build.xcconfig"
-          cat Build.xcconfig
-        shell: bash
-
-      - name: Set Release Channel info for build number bumper
-        id: release-channel
-        run: |
-          RELEASE_CHANNEL="${{ inputs.release_tag }}"
-          echo "RELEASE_CHANNEL=${RELEASE_CHANNEL}" >> $GITHUB_ENV
-          echo "RELEASE_CHANNEL=${RELEASE_CHANNEL}" >> $GITHUB_OUTPUT
-          echo "RELEASE_CHANNEL=${RELEASE_CHANNEL}"
-        shell: bash
-          
-      - name: Increase build number for beta builds
-        if: ${{ inputs.is_beta }}
-        run: |
-          bash .github/workflows/increase-beta-build-num.sh
-        shell: bash
-
-      - name: Extract MARKETING_VERSION from Build.xcconfig
-        id: version
-        run: |
-          version=$(grep MARKETING_VERSION Build.xcconfig | sed -e 's/MARKETING_VERSION = //g')
-          echo "version=$version" >> $GITHUB_OUTPUT
-          echo "version=$version"
-        shell: bash
-
-      - name: Set MARKETING_VERSION
-        if: ${{ inputs.is_beta }}
-        id: marketing-version
-        run: |
-          # Extract version number (e.g., "0.6.0")
-          version=$(echo "${{ steps.version.outputs.version }}" | sed -E 's/^[^0-9]*([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
-          # Extract date (YYYYMMDD) (e.g., "20250205")
-          date=$(echo "${{ steps.version.outputs.version }}" | sed -E 's/.*\.([0-9]{4})\.([0-9]{2})\.([0-9]{2})\..*/\1\2\3/')
-          # Extract build number (e.g., "2")
-          build_num=$(echo "${{ steps.version.outputs.version }}" | sed -E 's/.*\.([0-9]+)\+.*/\1/')
-
-          # Combine them into the final output
-          MARKETING_VERSION="${version}-${date}.${build_num}+${{ inputs.short_commit }}"
-
-          echo "MARKETING_VERSION=$MARKETING_VERSION" >> $GITHUB_ENV
-          echo "MARKETING_VERSION=$MARKETING_VERSION" >> $GITHUB_OUTPUT
-          echo "MARKETING_VERSION=$MARKETING_VERSION"
-        shell: bash
-
-      - name: Echo Updated Build.xcconfig, build_number.txt
-        if: ${{ inputs.is_beta }}
-        run: |
-          cat Build.xcconfig
-          cat build_number.txt
-        shell: bash
-
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
-        with:
-          xcode-version: ${{ matrix.version }}
-
-      - name: (Build) Restore Xcode & SwiftPM Cache (Exact match)
-        id: xcode-cache-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ~/Library/Developer/Xcode/DerivedData
-            ~/Library/Caches/org.swift.swiftpm
-          key: xcode-cache-build-${{ github.ref_name }}-${{ github.sha }}
-
-      - name: (Build) Restore Xcode & SwiftPM Cache (Last Available)
-        id: xcode-cache-restore-recent
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ~/Library/Developer/Xcode/DerivedData
-            ~/Library/Caches/org.swift.swiftpm
-          key: xcode-cache-build-${{ github.ref_name }}-
-
-      # - name: (Build) Cache Build
-      #   uses: irgaly/xcode-cache@v1.8.1
-      #   with:
-      #     key: xcode-cache-deriveddata-build-${{ github.ref_name }}-${{ github.sha }}
-      #     restore-keys: xcode-cache-deriveddata-build-${{ github.ref_name }}-
-      #     swiftpm-cache-key: xcode-cache-sourcedata-build-${{ github.ref_name }}-${{ github.sha }}
-      #     swiftpm-cache-restore-keys: |
-      #       xcode-cache-sourcedata-build-${{ github.ref_name }}-
-
-      - name: (Build) Restore Pods from Cache (Exact match)
-        id: pods-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-build-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-          # restore-keys: |         # commented out to strictly check cache for this particular podfile
-          #   pods-cache-
-
-      - name: (Build) Restore Pods from Cache (Last Available)
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        id: pods-restore-recent
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-build-${{ github.ref_name }}-
-
-
-      - name: (Build) Install CocoaPods
-        run: pod install
-        shell: bash
-
-      - name: (Build) Save Pods to Cache
-        id: save-pods
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-build-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-
-      - name: (Build) Clean previous build artifacts
-        # using 'tee' to intercept stdout and log for detailed build-log
-        run: |
-          make clean
-          mkdir -p build/logs
-        shell: bash
-
-      - name: (Build) List Files and derived data
-        if: always()
-        shell: bash
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Pods <<<<<<<<<<"
-          find Pods -maxdepth 2 -exec ls -ld {} + || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore <<<<<<<<<<"
-          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
-          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
-          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
-          echo ""
-
-      - name: Set BundleID Suffix for Sidestore build
-        run: |
-          echo "BUNDLE_ID_SUFFIX=${{ inputs.bundle_id_suffix }}" >> $GITHUB_ENV
-        shell: bash
-
-
-      - name: Build SideStore.xcarchive
-        # using 'tee' to intercept stdout and log for detailed build-log
-        run: |
-          NSUnbufferedIO=YES make -B build 2>&1 | tee -a build/logs/build.log | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
-        shell: bash
-
-      - name: Fakesign app
-        run: make fakesign | tee -a build/logs/build.log
-        shell: bash
-
-      - name: Convert to IPA
-        run: make ipa | tee -a build/logs/build.log
-        shell: bash
-
-      - name: (Build) Save Xcode & SwiftPM Cache
-        id: cache-save
-        if: ${{ steps.xcode-cache-restore.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v3
-        with:
-          path: |
-            ~/Library/Developer/Xcode/DerivedData
-            ~/Library/Caches/org.swift.swiftpm
-          key: xcode-cache-build-${{ github.ref_name }}-${{ github.sha }}
-        
-      - name: (Build) List Files and Build artifacts
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Build <<<<<<<<<<"
-          find build -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore <<<<<<<<<<"
-          find SideStore -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore.xcarchive <<<<<<<<<<"
-          find SideStore.xcarchive -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
-          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
-          echo ""
-        shell: bash
-
-      - name: Encrypt build-logs for upload
-        id: encrypt-build-log
-        run: |
-          DEFAULT_BUILD_LOG_PASSWORD=12345
-
-          BUILD_LOG_ZIP_PASSWORD=${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
-          BUILD_LOG_ZIP_PASSWORD=${BUILD_LOG_ZIP_PASSWORD:-$DEFAULT_BUILD_LOG_PASSWORD}
-
-          if [ "$BUILD_LOG_ZIP_PASSWORD" == "$DEFAULT_BUILD_LOG_PASSWORD" ]; then
-            echo "Warning: BUILD_LOG_ZIP_PASSWORD is not set. Defaulting to '${DEFAULT_BUILD_LOG_PASSWORD}'."
-          fi
-          
-          pushd build/logs && zip -e -P "$BUILD_LOG_ZIP_PASSWORD" ../../encrypted-build-logs.zip * || popd
-          echo "::set-output name=encrypted::true"
-        shell: bash
-
-      - name: Upload encrypted-build-logs.zip
-        id: attach-encrypted-build-log
-        if: ${{ always() && steps.encrypt-build-log.outputs.encrypted == 'true' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: encrypted-build-logs-${{ steps.version.outputs.version }}.zip
-          path: encrypted-build-logs.zip
-
-      - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: SideStore-${{ steps.version.outputs.version }}.ipa
-          path: SideStore.ipa
-
-      - name: Zip dSYMs
-        run: zip -r -9 ./SideStore.dSYMs.zip ./SideStore.xcarchive/dSYMs
-        shell: bash
-
-      - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: SideStore-${{ steps.version.outputs.version }}-dSYMs.zip
-          path: SideStore.dSYMs.zip
-
-      - name: Keep rolling the build numbers for each successful build
-        if: ${{ inputs.is_beta }}
-        run: |
-          pushd SideStore/beta-build-num/
-  
-          echo "Configure Git user (committer details)"
-          git config user.name "GitHub Actions"
-          git config user.email "github-actions@github.com"
-          
-          echo "Adding files to commit"
-          git add --verbose build_number.txt
-          git commit -m " - updated for ${{ inputs.release_tag }} - ${{ inputs.short_commit }} deployment" || echo "No changes to commit"
-
-          echo "Pushing to remote repo"
-          git push --verbose
-          popd
-        shell: bash
-
-      - name: Get last successful commit
-        id: get_last_commit
-        run: |
-          # Try to get the last successful workflow run commit
-          LAST_SUCCESS_SHA=$(gh run list --branch "${{ github.ref_name }}" --status success --json headSha --jq '.[0].headSha')
-          echo "LAST_SUCCESS_SHA=$LAST_SUCCESS_SHA" >> $GITHUB_OUTPUT
-          echo "LAST_SUCCESS_SHA=$LAST_SUCCESS_SHA" >> $GITHUB_ENV
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-
-      - name: Create release notes
-        run: |
-          LAST_SUCCESS_SHA=${{ steps.get_last_commit.outputs.LAST_SUCCESS_SHA}}
-          echo "Last successful commit SHA: $LAST_SUCCESS_SHA"
-          
-          FROM_COMMIT=$LAST_SUCCESS_SHA
-          # Check if we got a valid SHA
-          if [ -z "$LAST_SUCCESS_SHA" ] || [ "$LAST_SUCCESS_SHA" = "null" ]; then
-            echo "No successful run found, using initial commit of branch"
-            # Get the first commit of the branch (initial commit)
-            FROM_COMMIT=$(git rev-list --max-parents=0 HEAD)
-          fi
-  
-          python3 update_release_notes.py $FROM_COMMIT ${{ inputs.release_tag }} ${{ github.ref_name }}
-          # cat release-notes.md
-        shell: bash
-
-      - name: Upload release-notes.md
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-notes-${{ inputs.short_commit }}.md
-          path: release-notes.md
-
-      - name: Upload update_release_notes.py
-        uses: actions/upload-artifact@v4
-        with:
-          name: update_release_notes-${{ inputs.short_commit }}.py
-          path: update_release_notes.py
-
-      - name: Upload update_apps.py
-        uses: actions/upload-artifact@v4
-        with:
-          name: update_apps-${{ inputs.short_commit }}.py
-          path: update_apps.py

.github/workflows/sidestore-deploy.yml

@@ -1,235 +0,0 @@
-name: SideStore Deploy
-
-on:
-  workflow_call:
-    inputs:
-      is_beta:
-        type: boolean
-      publish:
-        type: boolean
-      release_name:
-        type: string
-      release_tag:
-        type: string
-      upstream_tag:
-        type: string
-      upstream_name:
-        type: string
-      version:
-        type: string
-      short_commit:
-        type: string
-      marketing_version:
-        type: string
-      release_channel:
-        type: string
-      bundle_id:
-        type: string
-    secrets:
-      CROSS_REPO_PUSH_KEY:
-        required: true
-      # GITHUB_TOKEN:
-        # required: true
-
-jobs:
-  deploy:
-    name: Deploy SideStore - ${{ inputs.release_tag }}
-    runs-on: macos-15
-    steps:
-      - name: Download IPA artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: SideStore-${{ inputs.version }}.ipa
-
-      - name: Download dSYM artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: SideStore-${{ inputs.version }}-dSYMs.zip
-
-      - name: Download encrypted-build-logs artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: encrypted-build-logs-${{ inputs.version }}.zip
-
-      - name: Download encrypted-tests-build-logs artifact
-        if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_BUILD == '1' }}
-        uses: actions/download-artifact@v4
-        with:
-          name: encrypted-tests-build-logs-${{ inputs.short_commit }}.zip
-
-      - name: Download encrypted-tests-run-logs artifact
-        if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_RUN == '1' }}
-        uses: actions/download-artifact@v4
-        with:
-          name: encrypted-tests-run-logs-${{ inputs.short_commit }}.zip
-
-      - name: Download tests-recording artifact
-        if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_RUN == '1' }}
-        uses: actions/download-artifact@v4
-        with:
-          name: tests-recording-${{ inputs.short_commit }}.mp4
-
-      - name: Download test-results artifact
-        if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_RUN == '1' }}
-        uses: actions/download-artifact@v4
-        with:
-          name: test-results-${{ inputs.short_commit }}.zip  
-  
-      - name: Download release-notes.md
-        uses: actions/download-artifact@v4
-        with:
-          name: release-notes-${{ inputs.short_commit }}.md
-
-      - name: Download update_release_notes.py
-        uses: actions/download-artifact@v4
-        with:
-          name: update_release_notes-${{ inputs.short_commit }}.py
-
-      - name: Download update_apps.py
-        uses: actions/download-artifact@v4
-        with:
-          name: update_apps-${{ inputs.short_commit }}.py
-
-      - name: Read release notes
-        id: release_notes
-        run: |
-          CONTENT=$(python3 update_release_notes.py --retrieve ${{ inputs.release_tag }})
-          echo "content<<EOF" >> $GITHUB_OUTPUT
-          echo "$CONTENT" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: List files before upload
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          find . -maxdepth 4 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-        shell: bash
-
-      - name: Get current date
-        id: date
-        run: echo "date=$(date -u +'%c')" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Get current date in AltStore date form
-        id: date_altstore
-        run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Upload to releases
-        uses: IsaacShelton/update-existing-release@v1.3.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          release: ${{ inputs.release_name }}
-          tag: ${{ inputs.release_tag }}
-          prerelease: ${{ inputs.is_beta }}
-          files: SideStore.ipa SideStore.dSYMs.zip encrypted-build-logs.zip encrypted-tests-build-logs.zip encrypted-tests-run-logs.zip test-results.zip tests-recording.mp4
-          body: |
-              This is an ⚠️ **EXPERIMENTAL** ⚠️ ${{ inputs.release_name }} build for commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }}).
-
-              ${{ inputs.release_name }} builds are **extremely experimental builds only meant to be used by developers and beta testers. They often contain bugs and experimental features. 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 ${{ inputs.upstream_name }}](https://github.com/${{ github.repository }}/releases?q=${{ inputs.upstream_tag }}).
-
-              ## Build Info
-
-              Built at (UTC): `${{ steps.date.outputs.date }}`
-              Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
-              Commit SHA: `${{ github.sha }}`
-              Version: `${{ inputs.version }}`
-
-              ${{ steps.release_notes.outputs.content }}
-
-      - name: Get formatted date
-        run: |
-          FORMATTED_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-          echo "Formatted date: $FORMATTED_DATE"
-          echo "FORMATTED_DATE=$FORMATTED_DATE" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Get size of IPA in bytes (macOS/Linux)
-        run: |
-          if [[ "$(uname)" == "Darwin" ]]; then
-            # macOS
-            IPA_SIZE=$(stat -f %z SideStore.ipa)
-          else
-            # Linux
-            IPA_SIZE=$(stat -c %s SideStore.ipa)
-          fi
-          echo "IPA size in bytes: $IPA_SIZE"
-          echo "IPA_SIZE=$IPA_SIZE" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Compute SHA-256 of IPA
-        run: |
-          SHA256_HASH=$(shasum -a 256 SideStore.ipa | awk '{ print $1 }')
-          echo "SHA-256 Hash: $SHA256_HASH"
-          echo "SHA256_HASH=$SHA256_HASH" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Set Release Info variables
-        run: |
-          # Format localized description
-          LOCALIZED_DESCRIPTION=$(cat <<EOF
-          This is release for:
-            - version: "${{ inputs.version }}"
-            - revision: "${{ inputs.short_commit }}"
-            - timestamp: "${{ steps.date.outputs.date }}"
-          
-          Release Notes:
-          ${{ steps.release_notes.outputs.content }}
-          EOF
-          )
-
-          echo "IS_BETA=${{ inputs.is_beta }}" >> $GITHUB_ENV
-          echo "BUNDLE_IDENTIFIER=${{ inputs.bundle_id }}" >> $GITHUB_ENV
-          echo "VERSION_IPA=${{ inputs.marketing_version }}" >> $GITHUB_ENV
-          echo "VERSION_DATE=$FORMATTED_DATE" >> $GITHUB_ENV
-          echo "RELEASE_CHANNEL=${{ inputs.release_channel }}" >> $GITHUB_ENV
-          echo "SIZE=$IPA_SIZE" >> $GITHUB_ENV
-          echo "SHA256=$SHA256_HASH" >> $GITHUB_ENV
-          echo "DOWNLOAD_URL=https://github.com/SideStore/SideStore/releases/download/${{ inputs.release_tag }}/SideStore.ipa" >> $GITHUB_ENV
-
-          # multiline strings
-          echo "LOCALIZED_DESCRIPTION<<EOF" >> $GITHUB_ENV
-          echo "$LOCALIZED_DESCRIPTION" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Check if Publish updates is set
-        id: check_publish
-        run: |
-          echo "Publish updates to source.json = ${{ inputs.publish }}"
-        shell: bash
-
-      - name: Checkout SideStore/apps-v2.json
-        if: ${{ inputs.is_beta && inputs.publish }}
-        uses: actions/checkout@v4
-        with:
-          repository: 'SideStore/apps-v2.json'
-          ref: 'main'   # this branch is shared by all beta builds, so beta build workflows are serialized
-          token: ${{ secrets.CROSS_REPO_PUSH_KEY }}
-          path: 'SideStore/apps-v2.json'
-
-      # for stable builds, let the user manually edit the source.json
-      - name: Publish to SideStore/apps-v2.json
-        if: ${{ inputs.is_beta && inputs.publish }}
-        id: publish-release
-        shell: bash
-        run: |
-          # Copy and execute the update script
-          pushd SideStore/apps-v2.json/
-
-          # Configure Git user (committer details)
-          git config user.name "GitHub Actions"
-          git config user.email "github-actions@github.com"
-
-          # update the source.json
-          python3 ../../update_apps.py "./_includes/source.json"
-
-          # Commit changes and push using SSH
-          git add --verbose ./_includes/source.json
-          git commit -m " - updated for ${{ inputs.short_commit }} deployment" || echo "No changes to commit"
-
-          git push --verbose
-          popd

.github/workflows/sidestore-shared.yml

@@ -1,24 +0,0 @@
-name: SideStore Shared
-
-on:
-  workflow_call:
-    outputs:
-      short-commit: 
-        value: ${{ jobs.shared.outputs.short-commit }}
-
-jobs:
-  shared:
-    name: Shared Steps
-    strategy:
-      fail-fast: false
-    runs-on: 'macos-15'
-    steps:
-      - name: Set short commit hash
-        id: commit-id
-        run: |
-          # SHORT_COMMIT="${{ github.sha }}"
-          SHORT_COMMIT=${GITHUB_SHA:0:7}
-          echo "Short commit hash: $SHORT_COMMIT"
-          echo "SHORT_COMMIT=$SHORT_COMMIT" >> $GITHUB_OUTPUT
-    outputs:
-      short-commit: ${{ steps.commit-id.outputs.SHORT_COMMIT }}

.github/workflows/sidestore-tests-build.yml

@@ -1,204 +0,0 @@
-name: SideStore Tests Build
-
-on:
-  workflow_call:
-    inputs:
-      release_tag:
-        type: string
-      short_commit:
-        type: string
-    secrets:
-      BUILD_LOG_ZIP_PASSWORD:
-        required: false
-
-jobs:
-  tests-build:
-    name: Tests-Build SideStore - ${{ inputs.release_tag }}
-    if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_BUILD == '1' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'macos-15'
-            version: '16.2'
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install dependencies - xcbeautify
-        run: |
-          brew install xcbeautify
-        shell: bash
-
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
-        with:
-          xcode-version: '16.2'
-
-      # - name: (Tests-Build) Cache Build
-      #   uses: irgaly/xcode-cache@v1.8.1
-      #   with:
-      #     key: xcode-cache-deriveddata-test-${{ github.ref_name }}-${{ github.sha }}
-      #     # tests shouldn't restore cache unless it is same build
-      #     # restore-keys: xcode-cache-deriveddata-test-${{ github.ref_name }}-
-      #     swiftpm-cache-key: xcode-cache-sourcedata-test-${{ github.ref_name }}-${{ github.sha }}
-      #     swiftpm-cache-restore-keys: |
-      #       xcode-cache-sourcedata-test-${{ github.ref_name }}-
-      #     delete-used-deriveddata-cache: true
-
-      - name: (Tests-Build) Restore Xcode & SwiftPM Cache (Exact match)
-        id: xcode-cache-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ~/Library/Developer/Xcode/DerivedData
-            ~/Library/Caches/org.swift.swiftpm
-          key: xcode-cache-tests-${{ github.ref_name }}-${{ github.sha }}
-
-      - name: (Tests-Build) Restore Xcode & SwiftPM Cache (Last Available)
-        id: xcode-cache-restore-recent
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ~/Library/Developer/Xcode/DerivedData
-            ~/Library/Caches/org.swift.swiftpm
-          key: xcode-cache-tests-${{ github.ref_name }}-
-
-      - name: (Tests-Build) Restore Pods from Cache (Exact match)
-        id: pods-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-
-      - name: (Tests-Build) Restore Pods from Cache (Last Available)
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        id: pods-restore-recent
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-
-
-      - name: (Tests-Build) Install CocoaPods
-        run: pod install
-        shell: bash
-
-      - name: (Tests-Build) Save Pods to Cache
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-
-      - name: Clean Derived Data (if required)
-        if: ${{ vars.PERFORM_CLEAN_TESTS_BUILD == '1' }}
-        run: |
-          rm -rf ~/Library/Developer/Xcode/DerivedData/
-          make clean
-          xcodebuild clean
-        shell: bash
-
-      - name: (Tests-Build) Clean previous build artifacts
-        run: |
-          make clean
-          mkdir -p build/logs
-        shell: bash
-
-      - name: (Tests-Build) List Files and derived data
-        shell: bash
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Pods <<<<<<<<<<"
-          find Pods -maxdepth 2 -exec ls -ld {} + || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore <<<<<<<<<<"
-          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
-          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
-          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
-          echo ""
-
-      - name: Build SideStore Tests
-        # using 'tee' to intercept stdout and log for detailed build-log
-        shell: bash
-        run: |
-          NSUnbufferedIO=YES make -B build-tests 2>&1 | tee -a build/logs/tests-build.log | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
-
-      - name: (Tests-Build) Save Xcode & SwiftPM Cache
-        id: cache-save
-        if: ${{ steps.xcode-cache-restore.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v3
-        with:
-          path: |
-            ~/Library/Developer/Xcode/DerivedData
-            ~/Library/Caches/org.swift.swiftpm
-          key: xcode-cache-tests-${{ github.ref_name }}-${{ github.sha }}
-        
-      - name: (Tests-Build) List Files and Build artifacts
-        if: always()
-        shell: bash
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Build <<<<<<<<<<"
-          find build -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
-          find ~/Library/Developer/Xcode/DerivedData -maxdepth 8 -exec ls -ld {} + | grep "Build/Products"  >> tests-build-deriveddata.txt || true
-          echo ""
-
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with: 
-          name: tests-build-deriveddata-${{ inputs.short_commit }}.txt
-          path: tests-build-deriveddata.txt
-
-      - name: Encrypt tests-build-logs for upload
-        id: encrypt-test-log
-        if: always()
-        shell: bash
-        run: |
-          DEFAULT_BUILD_LOG_PASSWORD=12345
-
-          BUILD_LOG_ZIP_PASSWORD=${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
-          BUILD_LOG_ZIP_PASSWORD=${BUILD_LOG_ZIP_PASSWORD:-$DEFAULT_BUILD_LOG_PASSWORD}
-
-          if [ "$BUILD_LOG_ZIP_PASSWORD" == "$DEFAULT_BUILD_LOG_PASSWORD" ]; then
-            echo "Warning: BUILD_LOG_ZIP_PASSWORD is not set. Defaulting to '${DEFAULT_BUILD_LOG_PASSWORD}'."
-          fi
-
-          pushd build/logs && zip -e -P "$BUILD_LOG_ZIP_PASSWORD" ../../encrypted-tests-build-logs.zip * || popd
-          echo "::set-output name=encrypted::true"
-      
-      - name: Upload encrypted-tests-build-logs.zip
-        id: attach-encrypted-test-log
-        if: always() && steps.encrypt-test-log.outputs.encrypted == 'true'
-        uses: actions/upload-artifact@v4
-        with:
-          name: encrypted-tests-build-logs-${{ inputs.short_commit }}.zip
-          path: encrypted-tests-build-logs.zip

.github/workflows/sidestore-tests-run.yml

@@ -1,235 +0,0 @@
-name: SideStore Tests Run
-
-on:
-  workflow_call:
-    inputs:
-      release_tag:
-        type: string
-      short_commit:
-        type: string
-    secrets:
-      BUILD_LOG_ZIP_PASSWORD:
-        required: false
-
-jobs:
-  tests-run:
-    name: Tests-Run SideStore - ${{ inputs.release_tag }}
-    if: ${{ vars.ENABLE_TESTS == '1' && vars.ENABLE_TESTS_RUN == '1' }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'macos-15'
-            version: '16.2'
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Boot Simulator async(nohup) for testing
-        run: |
-          mkdir -p build/logs
-          nohup make -B boot-sim-async </dev/null >> build/logs/tests-run.log 2>&1 &
-        shell: bash
-
-      - name: Setup Xcode
-        uses: maxim-lobanov/setup-xcode@v1.6.0
-        with:
-          xcode-version: '16.2'
-
-      # - name: (Tests-Run) Cache Build
-      #   uses: irgaly/xcode-cache@v1.8.1
-      #   with:
-      #     # This comes from 
-      #     key: xcode-cache-deriveddata-test-${{ github.ref_name }}-${{ github.sha }}
-      #     swiftpm-cache-key: xcode-cache-sourcedata-test-${{ github.ref_name }}-${{ github.sha }}
-      
-      - name: (Tests-Build) Restore Xcode & SwiftPM Cache (Exact match) [from tests-build job]
-        id: xcode-cache-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ~/Library/Developer/Xcode/DerivedData
-            ~/Library/Caches/org.swift.swiftpm
-          key: xcode-cache-tests-${{ github.ref_name }}-${{ github.sha }}
-
-      - name: (Tests-Run) Restore Pods from Cache (Exact match)
-        id: pods-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-
-      - name: (Tests-Run) Restore Pods from Cache (Last Available)
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        id: pods-restore-recent
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-
-
-      - name: (Tests-Run) Install CocoaPods
-        run: pod install
-        shell: bash
-
-      - name: (Tests-Run) Save Pods to Cache
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-test-${{ github.ref_name }}-${{ hashFiles('Podfile') }}
-
-      - name: (Tests-Run) Clean previous build artifacts
-        run: |
-          make clean
-          mkdir -p build/logs
-        shell: bash
-
-      - name: (Tests-Run) List Files and derived data
-        shell: bash
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Pods <<<<<<<<<<"
-          find Pods -maxdepth 2 -exec ls -ld {} + || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore <<<<<<<<<<"
-          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
-          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
-          find ~/Library/Developer/Xcode/DerivedData -maxdepth 8 -exec ls -ld {} + | grep "Build/Products" >> tests-run-deriveddata.txt || true
-          echo ""
-
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with: 
-          name: tests-run-deriveddata-${{ inputs.short_commit }}.txt
-          path: tests-run-deriveddata.txt
-
-      # we expect simulator to have been booted by now, so exit otherwise
-      - name: Simulator Boot Check
-        run: |
-          mkdir -p build/logs
-          make -B sim-boot-check | tee -a build/logs/tests-run.log
-          exit ${PIPESTATUS[0]}
-        shell: bash
-
-      - name: Start Recording UI tests (if DEBUG_RECORD_TESTS is set to 1)
-        if: ${{ vars.DEBUG_RECORD_TESTS == '1' }}
-        run: |
-          nohup xcrun simctl io booted recordVideo -f tests-recording.mp4 --codec h264 </dev/null > tests-recording.log 2>&1 &
-          RECORD_PID=$!
-          echo "RECORD_PID=$RECORD_PID" >> $GITHUB_ENV
-        shell: bash
-
-      - name: Run SideStore Tests
-        # using 'tee' to intercept stdout and log for detailed build-log
-        run: |
-          make run-tests 2>&1 | tee -a build/logs/tests-run.log && exit ${PIPESTATUS[0]}
-        # NSUnbufferedIO=YES make -B run-tests 2>&1 | tee build/logs/tests-run.log | xcpretty -r junit --output ./build/tests/test-results.xml && exit ${PIPESTATUS[0]}
-        shell: bash
-
-      - name: Stop Recording tests
-        if: ${{ always() && env.RECORD_PID != '' }}
-        run: |
-          kill -INT ${{ env.RECORD_PID }}
-        shell: bash
-
-      - name: (Tests-Run) List Files and Build artifacts
-        if: always()
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Build <<<<<<<<<<"
-          find build -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-        shell: bash
-
-      - name: Encrypt tests-run-logs for upload
-        id: encrypt-test-log
-        if: always()
-        run: |
-          DEFAULT_BUILD_LOG_PASSWORD=12345
-
-          BUILD_LOG_ZIP_PASSWORD=${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
-          BUILD_LOG_ZIP_PASSWORD=${BUILD_LOG_ZIP_PASSWORD:-$DEFAULT_BUILD_LOG_PASSWORD}
-
-          if [ "$BUILD_LOG_ZIP_PASSWORD" == "$DEFAULT_BUILD_LOG_PASSWORD" ]; then
-            echo "Warning: BUILD_LOG_ZIP_PASSWORD is not set. Defaulting to '${DEFAULT_BUILD_LOG_PASSWORD}'."
-          fi
-
-          pushd build/logs && zip -e -P "$BUILD_LOG_ZIP_PASSWORD" ../../encrypted-tests-run-logs.zip * || popd
-          echo "::set-output name=encrypted::true"
-        shell: bash
-
-      - name: Upload encrypted-tests-run-logs.zip
-        id: attach-encrypted-test-log
-        if: always() && steps.encrypt-test-log.outputs.encrypted == 'true'
-        uses: actions/upload-artifact@v4
-        with:
-          name: encrypted-tests-run-logs-${{ inputs.short_commit }}.zip
-          path: encrypted-tests-run-logs.zip
-
-      - name: Print tests-recording.log contents (if exists)
-        if: ${{ always() && env.RECORD_PID != '' }}
-        run: |
-          if [ -f tests-recording.log ]; then
-            echo "tests-recording.log found. Its contents:"
-            cat tests-recording.log
-          else
-            echo "tests-recording.log not found."
-          fi
-        shell: bash
-
-      - name: Check for tests-recording.mp4 presence
-        id: check-recording
-        if: ${{ always() && env.RECORD_PID != '' }}
-        run: |
-          if [ -f tests-recording.mp4 ]; then
-            echo "::set-output name=found::true"
-            echo "tests-recording.mp4 found."
-          else
-            echo "tests-recording.mp4 not found, skipping upload."
-            echo "::set-output name=found::false"
-          fi
-        shell: bash
-
-      - name: Upload tests-recording.mp4
-        id: upload-recording
-        if: ${{ always() && steps.check-recording.outputs.found == 'true' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: tests-recording-${{ inputs.short_commit }}.mp4
-          path: tests-recording.mp4
-
-      - name: Zip test-results
-        run: zip -r -9 ./test-results.zip ./build/tests
-        shell: bash
-
-      - name: Upload Test Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-results-${{ inputs.short_commit }}.zip
-          path: test-results.zip

.github/workflows/stable.yml

@@ -1,283 +1,135 @@
 name: Stable SideStore build
+
 on:
   push:
     tags:
-      - '[0-9]+.[0-9]+.[0-9]+' # example: 1.0.0
+      - '[0-9]+.[0-9]+.[0-9]+'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
-    name: Build SideStore - stable (on tag push)
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'macos-15'
-            version: '16.2'
-    runs-on: ${{ matrix.os }}
+    name: Build SideStore - stable
+    runs-on: macos-26
+
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      CHANNEL: stable
+      UPSTREAM_CHANNEL: ""
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
+          fetch-depth: 0
 
-      - name: Echo Build.xcconfig
+      - name: Find Last Successful commit
         run: |
-          echo "cat Build.xcconfig"
-          cat Build.xcconfig
-        shell: bash
+          LAST_SUCCESSFUL_COMMIT=$(python3 scripts/ci/workflow.py last-successful-commit \
+            "true" || echo "")
+          echo "LAST_SUCCESSFUL_COMMIT=$LAST_SUCCESSFUL_COMMIT" | tee -a $GITHUB_ENV
 
-      # - name: Change MARKETING_VERSION to the pushed tag that triggered this build
-      #   run: sed -e '/MARKETING_VERSION = .*/s/= .*/= ${{ github.ref_name }}/' -i '' Build.xcconfig
+      - run: brew install ldid xcbeautify
 
-      - name: Echo Updated Build.xcconfig
+      - name: Setup Env
         run: |
-          cat Build.xcconfig
-        shell: bash
+          MARKETING_VERSION=$(python3 scripts/ci/workflow.py get-marketing-version)
+          SHORT_COMMIT=$(python3 scripts/ci/workflow.py commit-id)
 
-      - name: Extract MARKETING_VERSION from Build.xcconfig
-        id: version
-        run: |
-          version=$(grep MARKETING_VERSION Build.xcconfig | sed -e 's/MARKETING_VERSION = //g')
-          echo "version=$version" >> $GITHUB_OUTPUT
-          echo "version=$version"
-
-          echo "MARKETING_VERSION=$version" >> $GITHUB_ENV
-          echo "MARKETING_VERSION=$version" >> $GITHUB_OUTPUT
-          echo "MARKETING_VERSION=$version"
-
-        shell: bash
-
-      - name: Fail the build if pushed tag and embedded MARKETING_VERSION in Build.xcconfig are mismatching
-        run: |
           if [ "$MARKETING_VERSION" != "${{ github.ref_name }}" ]; then
-            echo 'Version mismatch: $tag != $marketing_version ... '
-            echo "    expected-tag  : $MARKETING_VERSION"
-            echo "    pushed-tag    : ${{ github.ref_name }}"
+            echo "Version mismatch"
+            echo "Build.xcconfig: $MARKETING_VERSION"
+            echo "Tag: ${{ github.ref_name }}"
             exit 1
           fi
-          echo 'Version matches: $tag == $marketing_version ... '
-          echo "    expected-tag  : $MARKETING_VERSION"
-          echo "    pushed-tag    : ${{ github.ref_name }}"
-        shell: bash
 
-      - name: Install dependencies - ldid & xcbeautify
-        run: |
-          brew install ldid xcbeautify
+          echo "MARKETING_VERSION=$MARKETING_VERSION" | tee -a $GITHUB_ENV
+          echo "SHORT_COMMIT=$SHORT_COMMIT" | tee -a $GITHUB_ENV
 
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1.6.0
         with:
-          xcode-version: ${{ matrix.version }}
+          xcode-version: "26.0"
 
-      - name: (Build) Restore Xcode & SwiftPM Cache (Exact match)
-        id: xcode-cache-restore
+      - name: Restore Cache (exact)
+        id: xcode-cache-exact
         uses: actions/cache/restore@v3
         with:
           path: |
             ~/Library/Developer/Xcode/DerivedData
             ~/Library/Caches/org.swift.swiftpm
-          key: xcode-cache-build-stable-${{ github.sha }}
+          key: xcode-build-cache-stable-${{ github.sha }}
 
-      - name: (Build) Restore Xcode & SwiftPM Cache (Last Available)
-        id: xcode-cache-restore-recent
+      - name: Restore Cache (last)
+        if: steps.xcode-cache-exact.outputs.cache-hit != 'true'
+        id: xcode-cache-fallback
         uses: actions/cache/restore@v3
         with:
           path: |
             ~/Library/Developer/Xcode/DerivedData
             ~/Library/Caches/org.swift.swiftpm
-          key: xcode-cache-build-stable-
+          key: xcode-build-cache-stable-
 
-      - name: (Build) Restore Pods from Cache (Exact match)
-        id: pods-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-build-stable-${{ hashFiles('Podfile') }}
-
-      - name: (Build) Restore Pods from Cache (Last Available)
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        id: pods-restore-recent
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-build-stable-
-
-
-      - name: (Build) Install CocoaPods
-        run: pod install
-        shell: bash
-
-      - name: (Build) Save Pods to Cache
-        id: save-pods
-        if: ${{ steps.pods-restore.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v3
-        with:
-          path: |
-            ./Podfile.lock
-            ./Pods/
-            ./AltStore.xcworkspace/
-          key: pods-cache-build-stable-${{ hashFiles('Podfile') }}
-
-      - name: (Build) Clean previous build artifacts
+      - name: Build
+        id: build
+        env:
+          BUILD_LOG_ZIP_PASSWORD: ${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
         run: |
-          make clean
-          mkdir -p build/logs
-        shell: bash
+          python3 scripts/ci/workflow.py build; STATUS=$?
+          python3 scripts/ci/workflow.py encrypt-build
+          exit $STATUS
 
-      - name: (Build) List Files and derived data
-        if: always()
-        shell: bash
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
-
-          echo ">>>>>>>>> Pods <<<<<<<<<<"
-          find Pods -maxdepth 2 -exec ls -ld {} + || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore <<<<<<<<<<"
-          find SideStore -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Dependencies <<<<<<<<<<"
-          find Dependencies -maxdepth 2 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
-          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
-          echo ""
-
-      - name: Build SideStore.xcarchive
-        # using 'tee' to intercept stdout and log for detailed build-log
-        run: |
-          NSUnbufferedIO=YES make -B build 2>&1 | tee -a build/logs/build.log | xcbeautify --renderer github-actions && exit ${PIPESTATUS[0]}
-        shell: bash
-
-      - name: Fakesign app
-        run: make fakesign | tee -a build/logs/build.log
-        shell: bash
-
-      - name: Convert to IPA
-        run: make ipa | tee -a build/logs/build.log
-        shell: bash
-
-      - name: (Build) Save Xcode & SwiftPM Cache
-        id: cache-save
-        if: ${{ steps.xcode-cache-restore.outputs.cache-hit != 'true' }}
+      - name: Save Cache
+        if: ${{ steps.xcode-cache-fallback.outputs.cache-hit != 'true' }}
         uses: actions/cache/save@v3
         with:
           path: |
             ~/Library/Developer/Xcode/DerivedData
             ~/Library/Caches/org.swift.swiftpm
-          key: xcode-cache-build-stable-${{ github.sha }}
-        
-      - name: (Build) List Files and Build artifacts
-        run: |
-          echo ">>>>>>>>> Workdir <<<<<<<<<<"
-          ls -la .
-          echo ""
+          key: xcode-build-cache-stable-${{ github.sha }}
 
-          echo ">>>>>>>>> Build <<<<<<<<<<"
-          find build -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore <<<<<<<<<<"
-          find SideStore -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> SideStore.xcarchive <<<<<<<<<<"
-          find SideStore.xcarchive -maxdepth 3 -exec ls -ld {} +  || true  # List contents if directory exists
-          echo ""
-
-          echo ">>>>>>>>> Xcode-Derived-Data <<<<<<<<<<"
-          ls -la ~/Library/Developer/Xcode/DerivedData || true  # List contents if directory exists
-          echo ""
-        shell: bash
-
-      - name: Encrypt build-logs for upload
-        id: encrypt-build-log
-        run: |
-          DEFAULT_BUILD_LOG_PASSWORD=12345
-
-          BUILD_LOG_ZIP_PASSWORD=${{ secrets.BUILD_LOG_ZIP_PASSWORD }}
-          BUILD_LOG_ZIP_PASSWORD=${BUILD_LOG_ZIP_PASSWORD:-$DEFAULT_BUILD_LOG_PASSWORD}
-
-          if [ "$BUILD_LOG_ZIP_PASSWORD" == "$DEFAULT_BUILD_LOG_PASSWORD" ]; then
-            echo "Warning: BUILD_LOG_ZIP_PASSWORD is not set. Defaulting to '${DEFAULT_BUILD_LOG_PASSWORD}'."
-          fi
-          
-          pushd build/logs && zip -e -P "$BUILD_LOG_ZIP_PASSWORD" ../../encrypted-build-logs.zip * || popd
-          echo "::set-output name=encrypted::true"
-        shell: bash
-
-      - name: Upload encrypted-build-logs.zip
-        id: attach-encrypted-build-log
-        if: ${{ always() && steps.encrypt-build-log.outputs.encrypted == 'true' }}
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         with:
-          name: encrypted-build-logs-${{ steps.version.outputs.version }}.zip
-          path: encrypted-build-logs.zip
+          name: build-logs-${{ env.MARKETING_VERSION }}.zip
+          path: build-logs.zip
 
-      - name: Upload SideStore.ipa Artifact
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         with:
-          name: SideStore-${{ steps.version.outputs.version }}.ipa
+          name: SideStore-${{ env.MARKETING_VERSION }}.ipa
           path: SideStore.ipa
 
-      - name: Zip dSYMs
-        run: zip -r -9 ./SideStore.dSYMs.zip ./SideStore.xcarchive/dSYMs
-        shell: bash
-
-      - name: Upload *.dSYM Artifact
-        uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v4
         with:
-          name: SideStore-${{ steps.version.outputs.version }}-dSYMs.zip
+          name: SideStore-${{ env.MARKETING_VERSION }}-dSYMs.zip
           path: SideStore.dSYMs.zip
 
-      - name: Get current date
-        id: date
-        run: echo "date=$(date -u +'%c')" >> $GITHUB_OUTPUT
-        shell: bash
+      - name: Generate Metadata
+        run: |
+          python3 scripts/ci/workflow.py dump-project-settings
+          PRODUCT_NAME=$(python3 scripts/ci/workflow.py read-product-name)
+          BUNDLE_ID=$(python3 scripts/ci/workflow.py read-bundle-id)
+          IPA_NAME="$PRODUCT_NAME.ipa"
 
-      - name: Get current date in AltStore date form
-        id: date_altstore
-        run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-        shell: bash
+          python3 scripts/ci/workflow.py generate-metadata \
+            "${{ github.ref_name }}" \
+            "$SHORT_COMMIT" \
+            "$MARKETING_VERSION" \
+            "$CHANNEL" \
+            "$BUNDLE_ID" \
+            "$IPA_NAME" \
+            "$LAST_SUCCESSFUL_COMMIT"
 
       - name: Upload to releases
-        uses: IsaacShelton/update-existing-release@v1.3.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          draft: true
-          release: ${{ github.ref_name }}   # name
-          tag: ${{ github.ref_name  }}
-           # stick with what the user pushed, do not use latest commit or anything, 
-           # ex: if we want to go back to previous release due to hot issue, dev can create a new tag pointing to that older working tag/commit so as to keep it as an update (to revert major issue)
-           #     in this case we do not want the tag to be auto-updated to latest
-          updateTag: false 
-          prerelease: false
-          files: >
-            SideStore.ipa 
-            SideStore.dSYMs.zip 
-            encrypted-build-logs.zip
-          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
-              
-              ## Build Info
-
-              Built at (UTC): `${{ steps.date.outputs.date }}`
-              Built at (UTC date): `${{ steps.date_altstore.outputs.date }}`
-              Commit SHA: `${{ github.sha }}`
-              Version: `${{ steps.version.outputs.version }}`
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          python3 scripts/ci/workflow.py upload-release \
+            "${{ github.ref_name }}" \
+            "${{ github.ref_name }}" \
+            "$GITHUB_SHA" \
+            "$GITHUB_REPOSITORY" \
+            "$UPSTREAM_CHANNEL" \
+            "true"

.gitignore

@@ -69,4 +69,7 @@ SideStore/.skip-prebuilt-fetch-em_proxy
 test-recording.mp4
 test-recording.log
 altstore-sources.md
-local-build.sh
+local-build.sh
+
+source-metadata.json
+release-notes.md

.gitmodules

@@ -30,7 +30,7 @@
     url = https://github.com/rileytestut/Roxas.git
 [submodule "Dependencies/libimobiledevice"]
     path = Dependencies/libimobiledevice
-    url = https://github.com/libimobiledevice/libimobiledevice
+    url = https://github.com/SideStore/libimobiledevice
 [submodule "Dependencies/libusbmuxd"]
     path = Dependencies/libusbmuxd
     url = https://github.com/libimobiledevice/libusbmuxd.git
@@ -46,23 +46,23 @@
 
 
 #sidestore dependencies
-[submodule "SideStore/minimuxer"]
-    path = SideStore/minimuxer
+[submodule "Dependencies/minimuxer"]
+    path = Dependencies/minimuxer
     url = https://github.com/SideStore/minimuxer
     branch = master
-[submodule "SideStore/em_proxy"]
-    path = SideStore/em_proxy
-    url = https://github.com/SideStore/em_proxy
+[submodule "Dependencies/em_proxy"]
+	path = Dependencies/em_proxy
+	url = https://github.com/SideStore/em_proxy
     branch = master
-[submodule "SideStore/libfragmentzip"]
-    path = SideStore/libfragmentzip
+[submodule "Dependencies/libfragmentzip"]
+    path = Dependencies/libfragmentzip
     url = https://github.com/SideStore/libfragmentzip
     branch = master
-[submodule "SideStore/apps-v2.json"]
-    path = SideStore/apps-v2.json
+[submodule "Dependencies/apps-v2.json"]
+    path = Dependencies/apps-v2.json
     url = https://github.com/SideStore/apps-v2.json
     branch = main
-[submodule "SideStore/AltSign"]
-    path = SideStore/AltSign
+[submodule "Dependencies/AltSign"]
+    path = Dependencies/AltSign
     url = https://github.com/SideStore/AltSign
     branch = master

AltBackup/AltBackup.entitlements

@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.$(APP_GROUP_IDENTIFIER)</string>
+		<string>group.$(GROUP_ID)</string>
 	</array>
 </dict>
 </plist>

AltStore.xcodeproj/xcshareddata/xcschemes/AltStoreCore.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2620"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BF66EE7D2501AE50007EE018"
+               BuildableName = "AltStoreCore.framework"
+               BlueprintName = "AltStoreCore"
+               ReferencedContainer = "container:AltStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF66EE7D2501AE50007EE018"
+            BuildableName = "AltStoreCore.framework"
+            BlueprintName = "AltStoreCore"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

AltStore.xcodeproj/xcshareddata/xcschemes/AltWidgetExtension.xcscheme

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2620"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BF989166250AABF3002ACF50"
+               BuildableName = "AltWidgetExtension.appex"
+               BlueprintName = "AltWidgetExtension"
+               ReferencedContainer = "container:AltStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BFD247692284B9A500981D42"
+               BuildableName = "SideStore.app"
+               BlueprintName = "SideStore"
+               ReferencedContainer = "container:AltStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BFD247692284B9A500981D42"
+            BuildableName = "SideStore.app"
+            BlueprintName = "SideStore"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "_XCWidgetKind"
+            value = ""
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetDefaultView"
+            value = "timeline"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetFamily"
+            value = "systemMedium"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BFD247692284B9A500981D42"
+            BuildableName = "SideStore.app"
+            BlueprintName = "SideStore"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

AltStore.xcodeproj/xcshareddata/xcschemes/em_proxy-binding.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2610"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CA60C44C93D7A30E3695DD59"
+               BuildableName = "libem_proxy_static.a"
+               BlueprintName = "em_proxy-staticlib"
+               ReferencedContainer = "container:Dependencies/em_proxy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CA60C44C93D7A30E3695DD59"
+            BuildableName = "libem_proxy_static.a"
+            BlueprintName = "em_proxy-staticlib"
+            ReferencedContainer = "container:Dependencies/em_proxy.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

AltStore.xcodeproj/xcshareddata/xcschemes/libimobiledevice.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2620"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "BF45872A2298D31600BD7491"
+               BuildableName = "libimobiledevice.a"
+               BlueprintName = "libimobiledevice"
+               ReferencedContainer = "container:AltStore.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BF45872A2298D31600BD7491"
+            BuildableName = "libimobiledevice.a"
+            BlueprintName = "libimobiledevice"
+            ReferencedContainer = "container:AltStore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

AltStore.xcodeproj/xcshareddata/xcschemes/minimuxer-binding.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2610"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CA609C732349A560B9642892"
+               BuildableName = "libminimuxer_static.a"
+               BlueprintName = "minimuxer-staticlib"
+               ReferencedContainer = "container:Dependencies/minimuxer.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CA609C732349A560B9642892"
+            BuildableName = "libminimuxer_static.a"
+            BlueprintName = "minimuxer-staticlib"
+            ReferencedContainer = "container:Dependencies/minimuxer.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

AltStore.xcworkspace/contents.xcworkspacedata

@@ -5,12 +5,9 @@
       location = "group:AltStore.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:SideStore/AltSign">
+      location = "group:Dependencies/AltSign">
    </FileRef>
    <FileRef
       location = "group:Dependencies/Roxas/Roxas.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
 </Workspace>

AltStore.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<false/>
+</dict>
+</plist>

AltStore/AltStore.entitlements

@@ -2,24 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<!-- <key>com.apple.security.files.user-selected.read-write</key>
-	<array>
-		<string></string>
-	</array>
-	<key>com.apple.developer.applesignin</key>
-	<array>
-		<string></string>
-	</array> -->
+	<key>aps-environment</key>
+	<string>development</string>
 	<key>com.apple.developer.kernel.extended-virtual-addressing</key>
 	<true/>
 	<key>com.apple.developer.kernel.increased-debugging-memory-limit</key>
 	<true/>
 	<key>com.apple.developer.kernel.increased-memory-limit</key>
 	<true/>
-	<key>aps-environment</key>
-	<string>development</string>
-	<key>com.apple.developer.siri</key>
-	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.$(APP_GROUP_IDENTIFIER)</string>

AltStore/AltStoreFree.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.application-groups</key>
+    <array>
+        <string>group.$(APP_GROUP_IDENTIFIER)</string>
+    </array>
+</dict>
+</plist>

AltStore/Analytics/AnalyticsManager.swift

@@ -1,115 +0,0 @@
-//
-//  AnalyticsManager.swift
-//  AltStore
-//
-//  Created by Riley Testut on 3/31/20.
-//  Copyright © 2020 Riley Testut. All rights reserved.
-//
-
-import Foundation
-
-import AltStoreCore
-
-import AppCenter
-import AppCenterAnalytics
-import AppCenterCrashes
-
-#if DEBUG
-private let appCenterAppSecret = "73532d3e-e573-4693-99a4-9f85840bbb44"
-#elseif RELEASE
-private let appCenterAppSecret = "73532d3e-e573-4693-99a4-9f85840bbb44"
-#else
-private let appCenterAppSecret = "73532d3e-e573-4693-99a4-9f85840bbb44"
-#endif
-
-extension AnalyticsManager
-{
-    enum EventProperty: String
-    {
-        case name
-        case bundleIdentifier
-        case developerName
-        case version
-        case buildVersion
-        case size
-        case tintColor
-        case sourceIdentifier
-        case sourceURL
-        case patreonURL
-        case pledgeAmount
-        case pledgeCurrency
-    }
-    
-    enum Event
-    {
-        case installedApp(InstalledApp)
-        case updatedApp(InstalledApp)
-        case refreshedApp(InstalledApp)
-        
-        var name: String {
-            switch self
-            {
-            case .installedApp: return "installed_app"
-            case .updatedApp: return "updated_app"
-            case .refreshedApp: return "refreshed_app"
-            }
-        }
-        
-        var properties: [EventProperty: String] {
-            let properties: [EventProperty: String?]
-            
-            switch self
-            {
-            case .installedApp(let app), .updatedApp(let app), .refreshedApp(let app):
-                let appBundleURL = InstalledApp.fileURL(for: app)
-                let appBundleSize = FileManager.default.directorySize(at: appBundleURL)
-                
-                properties = [
-                    .name: app.name,
-                    .bundleIdentifier: app.bundleIdentifier,
-                    .developerName: app.storeApp?.developerName,
-                    .version: app.version,
-                    .buildVersion: app.buildVersion,
-                    .size: appBundleSize?.description,
-                    .tintColor: app.storeApp?.tintColor?.hexString,
-                    .sourceIdentifier: app.storeApp?.sourceIdentifier,
-                    .sourceURL: app.storeApp?.source?.sourceURL.absoluteString,
-                    .patreonURL: app.storeApp?.source?.patreonURL?.absoluteString,
-                    .pledgeAmount: app.storeApp?.pledgeAmount?.description,
-                    .pledgeCurrency: app.storeApp?.pledgeCurrency
-                ]
-            }
-            
-            return properties.compactMapValues { $0 }
-        }
-    }
-}
-
-final class AnalyticsManager
-{
-    static let shared = AnalyticsManager()
-    
-    private init()
-    {
-    }
-}
-
-extension AnalyticsManager
-{
-    func start()
-    {
-        AppCenter.start(withAppSecret: appCenterAppSecret, services: [
-            Analytics.self,
-            Crashes.self
-        ])
-    }
-    
-    func trackEvent(_ event: Event)
-    {
-        let properties = event.properties.reduce(into: [:]) { (properties, item) in
-            properties[item.key.rawValue] = item.value
-        }
-        
-        Analytics.trackEvent(event.name, withProperties: properties)
-    }
-}

AltStore/App Detail/AppContentViewController.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-
 import AltStoreCore
 import Roxas
 

AltStore/App Detail/AppDetailCollectionViewController.swift

@@ -8,7 +8,6 @@
 
 import UIKit
 import SwiftUI
-
 import AltStoreCore
 import Roxas
 

AltStore/App Detail/AppPermissionsCard.swift

@@ -7,7 +7,6 @@
 //
 
 import SwiftUI
-
 import AltStoreCore
 
 @available(iOS 16, *)

AltStore/App Detail/AppViewController.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-
 import AltStoreCore
 import Roxas
 
@@ -392,7 +391,6 @@ private extension AppViewController
     {
         var buttonAction: AppBannerView.AppAction?
         
-        // if let installedApp = self.app.installedApp, let latestVersion = self.app.latestAvailableVersion, !installedApp.matches(latestVersion), !self.app.isPledgeRequired || self.app.isPledged
         if let installedApp = self.app.installedApp, installedApp.hasUpdate
         {
             // Explicitly set button action to .update if there is an update available, even if it's not supported.
@@ -543,7 +541,6 @@ extension AppViewController
     {
         if let installedApp = self.app.installedApp
         {
-            // if let latestVersion = self.app.latestAvailableVersion, !installedApp.matches(latestVersion), !self.app.isPledgeRequired || self.app.isPledged
             if let latestVersion = self.app.latestAvailableVersion, installedApp.hasUpdate
             {
                 self.updateApp(installedApp, to: latestVersion)

AltStore/App Detail/PermissionPopoverViewController.swift

@@ -1,27 +0,0 @@
-//
-//  PermissionPopoverViewController.swift
-//  AltStore
-//
-//  Created by Riley Testut on 7/23/19.
-//  Copyright © 2019 Riley Testut. All rights reserved.
-//
-
-import UIKit
-
-import AltStoreCore
-
-final class PermissionPopoverViewController: UIViewController
-{
-    var permission: AppPermission!
-    
-    @IBOutlet private var nameLabel: UILabel!
-    @IBOutlet private var descriptionLabel: UILabel!
-    
-    override func viewDidLoad()
-    {
-        super.viewDidLoad()
-        
-        self.nameLabel.text = self.permission.localizedName ?? self.permission.permission.rawValue
-        self.descriptionLabel.text = self.permission.usageDescription
-    }
-}

AltStore/App Detail/Screenshots/AppScreenshotCollectionViewCell.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-
 import AltStoreCore
 
 extension AppScreenshotCollectionViewCell

AltStore/App Detail/Screenshots/AppScreenshotsViewController.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-
 import AltStoreCore
 import Roxas
 

AltStore/App Detail/Screenshots/PreviewAppScreenshotsViewController.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-
 import AltStoreCore
 import Roxas
 

AltStore/App IDs/AppIDsViewController.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-
 import AltStoreCore
 import Roxas
 

AltStore/AppConstants.swift

@@ -1,5 +1,5 @@
 //
-//  Proxy.swift
+//  AppConstants.swift
 //  SideStore
 //
 //  Created by Joseph Mattiello on 11/7/22.
@@ -8,7 +8,7 @@
 
 import Foundation
 
-public extension Consts {
+public enum AppConstants {
    enum Proxy {
         static let address = "127.0.0.1"
         static let port = "51820"

AltStore/AppDelegate.swift

@@ -10,11 +10,10 @@ import UIKit
 import UserNotifications
 import AVFoundation
 import Intents
-
 import AltStoreCore
 import AltSign
 import Roxas
-import EmotionalDamage
+
 
 import Nuke
 
@@ -27,10 +26,12 @@ extension AppDelegate
     static let addSourceDeepLinkNotification = Notification.Name(Bundle.Info.appbundleIdentifier + ".AddSourceDeepLinkNotification")
     
     static let appBackupDidFinish = Notification.Name(Bundle.Info.appbundleIdentifier + ".AppBackupDidFinish")
+    static let exportCertificateNotification = Notification.Name(Bundle.Info.appbundleIdentifier + ".ExportCertificateNotification")
     
     static let importAppDeepLinkURLKey = "fileURL"
     static let appBackupResultKey = "result"
     static let addSourceDeepLinkURLKey = "sourceURL"
+    static let exportCertificateCallbackTemplateKey = "callback"
 }
 
 @UIApplicationMain
@@ -91,13 +92,13 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
             }
         }
         
-        AnalyticsManager.shared.start()
-        
         self.setTintColor()
         self.prepareImageCache()
 
         // TODO: @mahee96: find if we need to start em_proxy as in altstore?
-        // start_em_proxy(bind_addr: Consts.Proxy.serverURL)
+        if UserDefaults.standard.enableEMPforWireguard {
+            startEMProxy(bind_addr: AppConstants.Proxy.serverURL)
+        }
 
         SecureValueTransformer.register()        
         
@@ -122,7 +123,9 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
     {
         // Make sure to update SceneDelegate.sceneDidEnterBackground() as well.
         // TODO: @mahee96: find if we need to stop em_proxy as in altstore?
-        // stop_em_proxy()
+        if UserDefaults.standard.enableEMPforWireguard {
+            stopEMProxy()
+        }
         guard let oneMonthAgo = Calendar.current.date(byAdding: .month, value: -1, to: Date()) else { return }
         
         let midnightOneMonthAgo = Calendar.current.startOfDay(for: oneMonthAgo)
@@ -139,9 +142,9 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillEnterForeground(_ application: UIApplication)
     {
         AppManager.shared.update()
-        start_em_proxy(bind_addr: Consts.Proxy.serverURL)
-
-        PatreonAPI.shared.refreshPatreonAccount()
+        if UserDefaults.standard.enableEMPforWireguard {
+            startEMProxy(bind_addr: AppConstants.Proxy.serverURL)
+        }
     }
     
     func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any]) -> Bool
@@ -241,13 +244,6 @@ private extension AppDelegate
             
             switch host
             {
-            case "patreon":
-                DispatchQueue.main.async {
-                    NotificationCenter.default.post(name: AppDelegate.openPatreonSettingsDeepLinkNotification, object: nil)
-                }
-                
-                return true
-                
             case "appbackupresponse":
                 let result: Result<Void, Error>
                 
@@ -292,6 +288,26 @@ private extension AppDelegate
                 
                 return true
                 
+            case "pairing":
+                let queryItems = components.queryItems?.reduce(into: [String: String]()) { $0[$1.name.lowercased()] = $1.value } ?? [:]
+                guard let callbackTemplate = queryItems["urlName"]?.removingPercentEncoding else { return false }
+                
+                DispatchQueue.main.async {
+                    exportPairingFile(callbackTemplate)
+                }
+                
+                return true
+            
+            case "certificate":
+                let queryItems = components.queryItems?.reduce(into: [String: String]()) { $0[$1.name.lowercased()] = $1.value } ?? [:]
+                guard let callbackTemplate = queryItems["callback_template"]?.removingPercentEncoding else { return false }
+                
+                DispatchQueue.main.async {
+                    NotificationCenter.default.post(name: AppDelegate.exportCertificateNotification, object: nil, userInfo: [AppDelegate.exportCertificateCallbackTemplateKey: callbackTemplate])
+                }
+                
+                return true
+                
             default: return false
             }
         }

AltStore/Authentication/Authentication.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -14,7 +14,7 @@
             <objects>
                 <navigationController storyboardIdentifier="navigationController" id="ZTo-53-dSL" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" barStyle="black" largeTitles="YES" id="Aej-RF-PfV" customClass="NavigationBar" customModule="SideStore" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <color key="barTintColor" name="SettingsBackground"/>
@@ -42,13 +42,13 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oyW-Fd-ojD" userLabel="Sizing View">
-                                <rect key="frame" x="0.0" y="44" width="375" height="623"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
                             </view>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" alwaysBounceVertical="YES" indicatorStyle="white" keyboardDismissMode="onDrag" translatesAutoresizingMaskIntoConstraints="NO" id="WXx-hX-AXv">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2wp-qG-f0Z">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" axis="vertical" spacing="50" translatesAutoresizingMaskIntoConstraints="NO" id="YmX-7v-pxh">
                                                 <rect key="frame" x="16" y="6" width="343" height="359.5"/>
@@ -57,13 +57,13 @@
                                                         <rect key="frame" x="0.0" y="0.0" width="343" height="67.5"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Welcome to SideStore." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="EI2-V3-zQZ">
-                                                                <rect key="frame" x="0.0" y="0.0" width="333.5" height="41"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="343" height="41"/>
                                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="34"/>
                                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sign in with your Apple ID to get started." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="SNU-tv-8Au">
-                                                                <rect key="frame" x="0.0" y="47" width="308.5" height="20.5"/>
+                                                                <rect key="frame" x="0.0" y="47" width="306.5" height="20.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                 <color key="textColor" white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -160,7 +160,7 @@
                                                                     </stackView>
                                                                 </subviews>
                                                             </stackView>
-                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2N5-zd-fUj">
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2N5-zd-fUj">
                                                                 <rect key="frame" x="0.0" y="191" width="343" height="51"/>
                                                                 <color key="backgroundColor" name="SettingsHighlighted"/>
                                                                 <constraints>
@@ -179,7 +179,7 @@
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" verticalCompressionResistancePriority="250" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="DBk-rT-ZE8">
-                                                <rect key="frame" x="16" y="518.5" width="343" height="96.5"/>
+                                                <rect key="frame" x="16" y="498.5" width="343" height="96.5"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Why do we need this?" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p9U-0q-Kn8">
                                                         <rect key="frame" x="0.0" y="0.0" width="343" height="20.5"/>
@@ -198,6 +198,10 @@
                                             </stackView>
                                         </subviews>
                                         <constraints>
+                                            <constraint firstItem="DBk-rT-ZE8" firstAttribute="leading" secondItem="2wp-qG-f0Z" secondAttribute="leadingMargin" id="5AT-nV-ZP9"/>
+                                            <constraint firstAttribute="bottomMargin" secondItem="DBk-rT-ZE8" secondAttribute="bottom" id="HgY-oY-8KM"/>
+                                            <constraint firstAttribute="trailingMargin" secondItem="DBk-rT-ZE8" secondAttribute="trailing" id="VCf-bW-2K4"/>
+                                            <constraint firstItem="YmX-7v-pxh" firstAttribute="top" secondItem="2wp-qG-f0Z" secondAttribute="top" constant="6" id="iUr-Nd-tkt"/>
                                             <constraint firstItem="DBk-rT-ZE8" firstAttribute="top" relation="greaterThanOrEqual" secondItem="YmX-7v-pxh" secondAttribute="bottom" constant="8" symbolic="YES" id="zTU-eY-DWd"/>
                                         </constraints>
                                     </view>
@@ -215,19 +219,15 @@
                         <constraints>
                             <constraint firstAttribute="bottom" secondItem="WXx-hX-AXv" secondAttribute="bottom" id="0jL-Ky-ju6"/>
                             <constraint firstAttribute="leadingMargin" secondItem="YmX-7v-pxh" secondAttribute="leading" id="2PO-lG-dmB"/>
-                            <constraint firstItem="DBk-rT-ZE8" firstAttribute="leading" secondItem="2wp-qG-f0Z" secondAttribute="leadingMargin" id="5AT-nV-ZP9"/>
                             <constraint firstItem="oyW-Fd-ojD" firstAttribute="top" secondItem="zMn-DV-fpy" secondAttribute="top" id="730-db-ukB"/>
-                            <constraint firstItem="2wp-qG-f0Z" firstAttribute="bottomMargin" secondItem="DBk-rT-ZE8" secondAttribute="bottom" id="HgY-oY-8KM"/>
                             <constraint firstItem="zMn-DV-fpy" firstAttribute="trailing" secondItem="oyW-Fd-ojD" secondAttribute="trailing" id="KGE-CN-SWf"/>
                             <constraint firstItem="WXx-hX-AXv" firstAttribute="top" secondItem="mjy-4S-hyH" secondAttribute="top" id="LPQ-bF-ic0"/>
                             <constraint firstItem="zMn-DV-fpy" firstAttribute="trailing" secondItem="WXx-hX-AXv" secondAttribute="trailing" id="MG7-A6-pKp"/>
                             <constraint firstAttribute="trailingMargin" secondItem="YmX-7v-pxh" secondAttribute="trailing" id="O4T-nu-o3e"/>
                             <constraint firstItem="zMn-DV-fpy" firstAttribute="bottom" secondItem="oyW-Fd-ojD" secondAttribute="bottom" id="PuX-ab-cEq"/>
                             <constraint firstItem="oyW-Fd-ojD" firstAttribute="leading" secondItem="zMn-DV-fpy" secondAttribute="leading" id="SzC-gC-Nvi"/>
-                            <constraint firstItem="2wp-qG-f0Z" firstAttribute="trailingMargin" secondItem="DBk-rT-ZE8" secondAttribute="trailing" id="VCf-bW-2K4"/>
                             <constraint firstItem="WXx-hX-AXv" firstAttribute="leading" secondItem="zMn-DV-fpy" secondAttribute="leading" id="d08-zF-5X6"/>
                             <constraint firstItem="2wp-qG-f0Z" firstAttribute="height" secondItem="oyW-Fd-ojD" secondAttribute="height" id="dFN-pw-TWt"/>
-                            <constraint firstItem="YmX-7v-pxh" firstAttribute="top" secondItem="2wp-qG-f0Z" secondAttribute="top" constant="6" id="iUr-Nd-tkt"/>
                             <constraint firstItem="2wp-qG-f0Z" firstAttribute="width" secondItem="oyW-Fd-ojD" secondAttribute="width" id="rYO-GN-0Lk"/>
                         </constraints>
                     </view>
@@ -264,7 +264,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" axis="vertical" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="bp6-55-IG2">
-                                <rect key="frame" x="0.0" y="44" width="375" height="564"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="544"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="FjP-tm-w7K">
                                         <rect key="frame" x="16" y="35" width="343" height="95.5"/>
@@ -298,7 +298,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="LpI-Jt-SzX">
-                                        <rect key="frame" x="16" y="168" width="343" height="95.5"/>
+                                        <rect key="frame" x="16" y="161" width="343" height="95.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0LW-eE-qHa">
                                                 <rect key="frame" x="0.0" y="0.0" width="59" height="95.5"/>
@@ -310,7 +310,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="dMu-eg-gIO">
-                                                <rect key="frame" x="79" y="15.5" width="264" height="64"/>
+                                                <rect key="frame" x="79" y="16" width="264" height="64"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connect to Wi-Fi and VPN" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="esj-pD-D4A">
                                                         <rect key="frame" x="0.0" y="0.0" width="264" height="20.5"/>
@@ -318,7 +318,7 @@
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable SideStore VPN in Wireguard and be able to use Sidestore on the go." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="4rk-ge-FSj">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable LocalDevVPN and use Sidestore on the go." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="4rk-ge-FSj">
                                                         <rect key="frame" x="0.0" y="25.5" width="264" height="38.5"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                         <color key="textColor" white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -329,7 +329,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="tfb-ja-9UC">
-                                        <rect key="frame" x="16" y="300.5" width="343" height="95.5"/>
+                                        <rect key="frame" x="16" y="287.5" width="343" height="95.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nVr-El-Csi">
                                                 <rect key="frame" x="0.0" y="0.0" width="59" height="95.5"/>
@@ -341,7 +341,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="z6Y-zi-teL">
-                                                <rect key="frame" x="79" y="16" width="264" height="64"/>
+                                                <rect key="frame" x="79" y="15.5" width="264" height="64"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Download Apps" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="JeJ-bk-UCA">
                                                         <rect key="frame" x="0.0" y="0.0" width="264" height="20.5"/>
@@ -360,7 +360,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="X3r-G1-vf2">
-                                        <rect key="frame" x="16" y="433.5" width="343" height="95.5"/>
+                                        <rect key="frame" x="16" y="413.5" width="343" height="95.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i2U-NL-plG">
                                                 <rect key="frame" x="0.0" y="0.0" width="59" height="95.5"/>
@@ -372,7 +372,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Xs6-pJ-PUz">
-                                                <rect key="frame" x="79" y="16" width="264" height="64"/>
+                                                <rect key="frame" x="79" y="17" width="264" height="62"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Apps Refresh Automatically" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="nvb-Aq-sYa">
                                                         <rect key="frame" x="0.0" y="0.0" width="264" height="20.5"/>
@@ -381,7 +381,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Apps are refreshed in the background while you are on SideStore VPN!" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="HU5-Hv-E3d">
-                                                        <rect key="frame" x="0.0" y="25.5" width="264" height="38.5"/>
+                                                        <rect key="frame" x="0.0" y="25.5" width="264" height="36.5"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                         <color key="textColor" white="1" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
@@ -431,7 +431,7 @@
             </objects>
             <point key="canvasLocation" x="1353" y="736"/>
         </scene>
-        <!--Refresh AltStore-->
+        <!--Refresh SideStore-->
         <scene sceneID="9Vh-dM-OqX">
             <objects>
                 <viewController storyboardIdentifier="refreshAltStoreViewController" id="aoK-yE-UVT" customClass="RefreshAltStoreViewController" customModule="SideStore" customModuleProvider="target" sceneMemberID="viewController">
@@ -485,7 +485,7 @@
                             <constraint firstItem="tDQ-ao-1Jg" firstAttribute="leading" secondItem="R83-kV-365" secondAttribute="leadingMargin" id="zEt-Xr-kJx"/>
                         </constraints>
                     </view>
-                    <navigationItem key="navigationItem" title="Refresh AltStore" largeTitleDisplayMode="always" id="5nk-NR-jtV"/>
+                    <navigationItem key="navigationItem" title="Refresh SideStore" largeTitleDisplayMode="always" id="5nk-NR-jtV"/>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                     <connections>
                         <outlet property="placeholderView" destination="fpO-Bf-gFY" id="q7d-au-d94"/>

AltStore/Authentication/RefreshAltStoreViewController.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-
 import AltStoreCore
 import AltSign
 import Roxas

AltStore/Base.lproj/Main.storyboard

@@ -532,6 +532,7 @@
                         <rect key="frame" x="0.0" y="20" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" name="Primary"/>
+                        <edgeInsets key="layoutMargins" top="8" left="20" bottom="8" right="8"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
@@ -561,6 +562,7 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="CzO-Kt-BlZ" customClass="NavigationBar" customModule="SideStore" customModuleProvider="target">
                         <rect key="frame" x="0.0" y="20" width="375" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <edgeInsets key="layoutMargins" top="8" left="20" bottom="8" right="8"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>
@@ -913,6 +915,7 @@
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" largeTitles="YES" id="9sB-f3-Fnk">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="108"/>
                         <autoresizingMask key="autoresizingMask"/>
+                        <edgeInsets key="layoutMargins" top="8" left="20" bottom="8" right="8"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <connections>

AltStore/Browse/BrowseViewController.swift

@@ -8,8 +8,6 @@
 
 import UIKit
 import Combine
-
-import minimuxer
 import AltStoreCore
 import Roxas
 
@@ -557,7 +555,7 @@ private extension BrowseViewController
             return
         }
 
-        if !minimuxer.ready() {
+        if !isMinimuxerReady {
             let toastView = ToastView(error: MinimuxerError.NoConnection)
             toastView.show(in: self)
             return

AltStore/Browse/FeaturedViewController.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-
 import AltStoreCore
 import Roxas
 
@@ -363,13 +362,13 @@ private extension FeaturedViewController
         let sourceHasRemainingAppsPredicate = NSPredicate(format:
             """
             SUBQUERY(%K, $app,
-                ($app.%K != %@) AND ($app.%K == nil) AND (($app.%K == NO) OR ($app.%K == NO) OR ($app.%K == YES))
+                ($app.%K != %@) AND ($app.%K == nil)
             ).@count > 0
             """,
-                                                          #keyPath(StoreApp._source._apps),
-                                                          #keyPath(StoreApp.bundleIdentifier), StoreApp.altstoreAppID,
-                                                          #keyPath(StoreApp.installedApp),
-                                                          #keyPath(StoreApp.isPledgeRequired), #keyPath(StoreApp.isHiddenWithoutPledge), #keyPath(StoreApp.isPledged)
+            #keyPath(StoreApp._source._apps),
+            #keyPath(StoreApp.bundleIdentifier),
+            StoreApp.altstoreAppID,
+            #keyPath(StoreApp.installedApp)
         )
         
         let primaryFetchRequest = fetchRequest.copy() as! NSFetchRequest<StoreApp>

AltStore/Components/AppBannerView.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-
 import AltStoreCore
 import Roxas
 
@@ -167,29 +166,7 @@ extension AppBannerView
             self.subtitleLabel.text = NSLocalizedString("Sideloaded", comment: "")
             self.accessibilityLabel = values.name
         }
-        
-        if let storeApp = app.storeApp, storeApp.isPledgeRequired
-        {
-            // Always show button label for Patreon apps.
-            self.buttonLabel.isHidden = false
-            
-            if storeApp.isPledged
-            {
-                self.buttonLabel.text = NSLocalizedString("Pledged", comment: "")
-            }
-            else if storeApp.installedApp != nil
-            {
-                self.buttonLabel.text = NSLocalizedString("Pledge Expired", comment: "")
-            }
-            else
-            {
-                self.buttonLabel.text = NSLocalizedString("Join Patreon", comment: "")
-            }
-        }
-        else
-        {
-            self.buttonLabel.isHidden = true
-        }
+        self.buttonLabel.isHidden = true
         
         if let source = app.storeApp?.source, showSourceIcon
         {
@@ -294,15 +271,6 @@ extension AppBannerView
                         self.button.accessibilityLabel = String(format: NSLocalizedString("Install %@", comment: ""), app.name)
                         self.button.accessibilityValue = buttonTitle
                     }
-                    else if let amount = storeApp.pledgeAmount, let currencyCode = storeApp.pledgeCurrency, !storeApp.prefersCustomPledge, #available(iOS 15, *)
-                    {
-                        let price = amount.formatted(.currency(code: currencyCode).presentation(.narrow).precision(.fractionLength(0...2)))
-                        
-                        let buttonTitle = String(format: NSLocalizedString("%@/mo", comment: ""), price)
-                        self.button.setTitle(buttonTitle, for: .normal)
-                        self.button.accessibilityLabel = String(format: NSLocalizedString("Pledge %@ a month", comment: ""), price)
-                        self.button.accessibilityValue = String(format: NSLocalizedString("%@ a month", comment: ""), price)
-                    }
                     else
                     {
                         let buttonTitle = NSLocalizedString("Pledge", comment: "")

AltStore/Components/AppCardCollectionViewCell.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-
 import AltStoreCore
 import Roxas
 

AltStore/Components/HeaderContentViewController.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-
 import AltStoreCore
 import Roxas
 

AltStore/Components/ToastView.swift

@@ -7,7 +7,6 @@
 //
 
 import Roxas
-
 import AltStoreCore
 
 extension TimeInterval

AltStore/Consts/Consts.swift

@@ -1,13 +0,0 @@
-//
-//  Consts.swift
-//  SideStore
-//
-//  Created by Joseph Mattiello on 11/7/22.
-//  Copyright © 2022 Riley Testut. All rights reserved.
-//
-
-import Foundation
-
-public enum Consts {
-
-}

AltStore/Intents/App Intents/RefreshAllAppsIntent.swift

@@ -8,7 +8,6 @@
 
 import AppIntents
 import WidgetKit
-
 import AltStoreCore
 
 // Shouldn't conform types we don't own to protocols we don't own, so make custom

AltStore/Intents/Legacy/IntentHandler.swift

@@ -7,8 +7,6 @@
 //
 
 import Foundation
-
-import minimuxer
 import AltStoreCore
 
 @available(iOS 14, *)
@@ -41,7 +39,7 @@ final class IntentHandler: NSObject, RefreshAllIntentHandling
         // Give ourselves 9 extra seconds before starting handle() timeout timer.
         // 10 seconds or longer results in timeout regardless.
         self.queue.asyncAfter(deadline: .now() + 8.0) {
-            if minimuxer.ready() {
+            if isMinimuxerReady {
                 self.finish(intent, response: RefreshAllIntentResponse(code: .success, userActivity: nil))
             } else {
                 self.finish(intent, response: RefreshAllIntentResponse(code: .failure, userActivity: nil))
@@ -90,7 +88,7 @@ final class IntentHandler: NSObject, RefreshAllIntentHandling
                     // We took too long to finish and return the final result,
                     // so we'll now present a normal notification when finished.
                     operation.presentsFinishedNotification = true
-                    if minimuxer.ready() {
+                    if isMinimuxerReady {
                         self.finish(intent, response: RefreshAllIntentResponse(code: .success, userActivity: nil))
                     } else {
                         self.finish(intent, response: RefreshAllIntentResponse(code: .failure, userActivity: nil))

AltStore/LaunchViewController.swift

@@ -8,88 +8,76 @@
 
 import UIKit
 import Roxas
-import EmotionalDamage
-import minimuxer
+
 import WidgetKit
 
+import AltSign
 import AltStoreCore
 import UniformTypeIdentifiers
 
 let pairingFileName = "ALTPairingFile.mobiledevicepairing"
 
-final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDelegate
-{
+final class LaunchViewController: UIViewController, UIDocumentPickerDelegate {
     private var didFinishLaunching = false
-    
-    private var destinationViewController: TabBarController!
-    
-    override var launchConditions: [RSTLaunchCondition] {
-        let isDatabaseStarted = RSTLaunchCondition(condition: { DatabaseManager.shared.isStarted }) { (completionHandler) in
-            DatabaseManager.shared.start(completionHandler: completionHandler)
-        }
+    private var retries = 0
+    private var maxRetries = 3
+    private var splashView: SplashView!
+    private var destinationViewController: TabBarController?
+    private var startTime: Date!
 
-        return [isDatabaseStarted]
-    }
-    
-    override var childForStatusBarStyle: UIViewController? {
-        return self.children.first
-    }
-    
-    override var childForStatusBarHidden: UIViewController? {
-        return self.children.first
-    }
-    
-    override func viewDidLoad()
-    {
-        defer {
-            // Create destinationViewController now so view controllers can register for receiving Notifications.
-            self.destinationViewController = self.storyboard!.instantiateViewController(withIdentifier: "tabBarController") as! TabBarController
-        }
+    override func viewDidLoad() {
         super.viewDidLoad()
+        splashView = SplashView(frame: view.bounds, appName: "SideStore")
+        destinationViewController = storyboard!.instantiateViewController(withIdentifier: "tabBarController") as? TabBarController
+        view.addSubview(splashView)
     }
-    
+
     override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(true)
-        if #available(iOS 17, *), !UserDefaults.standard.sidejitenable {
-            DispatchQueue.global().async {
-                self.isSideJITServerDetected() { result in
-                    DispatchQueue.main.async {
-                        switch result {
-                        case .success():
-                            let dialogMessage = UIAlertController(title: "SideJITServer Detected", message: "Would you like to enable SideJITServer", preferredStyle: .alert)
-                            
-                            // Create OK button with action handler
-                            let ok = UIAlertAction(title: "OK", style: .default, handler: { (action) -> Void in
-                                UserDefaults.standard.sidejitenable = true
-                            })
-                            
-                            let cancel = UIAlertAction(title: "Cancel", style: .cancel)
-                            //Add OK button to a dialog message
-                            dialogMessage.addAction(ok)
-                            dialogMessage.addAction(cancel)
-                            
-                            // Present Alert to
-                            self.present(dialogMessage, animated: true, completion: nil)
-                        case .failure(_):
-                            print("Cannot find sideJITServer")
+        super.viewDidAppear(animated)
+        guard !didFinishLaunching else { return }
+        Task {
+            startTime = Date()
+            await runLaunchSequence()
+            doPostLaunch()
+        }
+    }
+
+    private func runLaunchSequence() async {
+        guard retries < maxRetries else { return }
+        retries += 1
+
+        await Task.detached {
+            if !DatabaseManager.shared.isStarted {
+                await withCheckedContinuation { continuation in
+                    DatabaseManager.shared.start { error in
+                        if let error {
+                            Task { await self.handleLaunchError(error, retryCallback: self.runLaunchSequence) }
+                        } else {
+                            Task { await self.finishLaunching() }
                         }
+                        continuation.resume(returning: ())
                     }
                 }
+            } else {
+                await self.finishLaunching()
             }
-        }
-        
+        }.value
+    }
+
+    private func doPostLaunch() {
+        SideJITManager.shared.checkAndPromptIfNeeded(presentingVC: self)
         if #available(iOS 17, *), UserDefaults.standard.sidejitenable {
-            DispatchQueue.global().async {
-                self.askfornetwork()
-            }
+            DispatchQueue.global().async { SideJITManager.shared.askForNetwork() }
             print("SideJITServer Enabled")
         }
-        
-        
-        
+
         #if !targetEnvironment(simulator)
-        start_em_proxy(bind_addr: Consts.Proxy.serverURL)
         
+        detectAndImportAccountFile()
+        
+        if UserDefaults.standard.enableEMPforWireguard {
+            startEMProxy(bind_addr: AppConstants.Proxy.serverURL)
+        }
         guard let pf = fetchPairingFile() else {
             displayError("Device pairing file not found.")
             return
@@ -97,222 +85,124 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg
         start_minimuxer_threads(pf)
         #endif
     }
-    
-    func askfornetwork() {
-        let address = UserDefaults.standard.textInputSideJITServerurl ?? ""
-        
-        var SJSURL = address
-        
-        if (UserDefaults.standard.textInputSideJITServerurl ?? "").isEmpty {
-          SJSURL = "http://sidejitserver._http._tcp.local:8080"
+
+    func start_minimuxer_threads(_ pairing_file: String) {
+        targetMinimuxerAddress()
+        let documentsDirectory = FileManager.default.documentsDirectory.absoluteString
+        do {
+            let loggingEnabled = UserDefaults.standard.isMinimuxerConsoleLoggingEnabled
+            try minimuxerStartWithLogger(pairing_file, documentsDirectory, loggingEnabled)
+        } catch {
+            try! FileManager.default.removeItem(at: FileManager.default.documentsDirectory.appendingPathComponent(pairingFileName))
+            displayError("minimuxer failed to start, please restart SideStore. \((error as? LocalizedError)?.failureReason ?? "UNKNOWN ERROR")")
         }
-        
-        // Create a network operation at launch to Refresh SideJITServer
-        let url = URL(string: "\(SJSURL)/re/")!
-        let task = URLSession.shared.dataTask(with: url) { (data, response, error) in
-            print(data)
-        }
-        task.resume()
+        start_auto_mounter(documentsDirectory)
     }
-    
-    func isSideJITServerDetected(completion: @escaping (Result<Void, Error>) -> Void) {
-        let address = UserDefaults.standard.textInputSideJITServerurl ?? ""
-        
-        var SJSURL = address
-        
-        if (UserDefaults.standard.textInputSideJITServerurl ?? "").isEmpty {
-          SJSURL = "http://sidejitserver._http._tcp.local:8080"
-        }
-        
-        // Create a network operation at launch to Refresh SideJITServer
-        let url = URL(string: SJSURL)!
-        let task = URLSession.shared.dataTask(with: url) { (data, response, error) in
-            if let error = error {
-                print("No SideJITServer on Network")
-                completion(.failure(error))
-                return
-            }
-            completion(.success(()))
-        }
-        task.resume()
-        return
-    }
-    
-    func fetchPairingFile() -> String? {
-        let filename = "ALTPairingFile.mobiledevicepairing"
-        let fm = FileManager.default
-        let documentsPath = fm.documentsDirectory.appendingPathComponent("/\(filename)")
-        if fm.fileExists(atPath: documentsPath.path), let contents = try? String(contentsOf: documentsPath), !contents.isEmpty {
-            print("Loaded ALTPairingFile from \(documentsPath.path)")
-            return contents
-        } else if
-            let appResourcePath = Bundle.main.url(forResource: "ALTPairingFile", withExtension: "mobiledevicepairing"),
-            fm.fileExists(atPath: appResourcePath.path),
-            let data = fm.contents(atPath: appResourcePath.path),
-            let contents = String(data: data, encoding: .utf8),
-            !contents.isEmpty,
-            !UserDefaults.standard.isPairingReset {
-            print("Loaded ALTPairingFile from \(appResourcePath.path)")
-            return contents
-        } else if let plistString = Bundle.main.object(forInfoDictionaryKey: "ALTPairingFile") as? String, !plistString.isEmpty, !plistString.contains("insert pairing file here"), !UserDefaults.standard.isPairingReset{
-            print("Loaded ALTPairingFile from Info.plist")
-            return plistString
-        } else {
-            // Show an alert explaining the pairing file
-            // Create new Alert
-            let dialogMessage = UIAlertController(title: "Pairing File", message: "Select the pairing file or select \"Help\" for help.", preferredStyle: .alert)
-            
-            // Create OK button with action handler
-            let ok = UIAlertAction(title: "OK", style: .default, handler: { (action) -> Void in
-                // Try to load it from a file picker
-                var types = UTType.types(tag: "plist", tagClass: UTTagClass.filenameExtension, conformingTo: nil)
-                types.append(contentsOf: UTType.types(tag: "mobiledevicepairing", tagClass: UTTagClass.filenameExtension, conformingTo: UTType.data))
-                types.append(.xml)
-                let documentPickerController = UIDocumentPickerViewController(forOpeningContentTypes: types)
-                documentPickerController.shouldShowFileExtensions = true
-                documentPickerController.delegate = self
-                self.present(documentPickerController, animated: true, completion: nil)
-                UserDefaults.standard.isPairingReset = false
-             })
-            
-            //Add "help" button to take user to wiki
-            let wikiOption = UIAlertAction(title: "Help", style: .default) { (action) in
-                let wikiURL: String = "https://docs.sidestore.io/docs/getting-started/pairing-file"
-                if let url = URL(string: wikiURL) {
-                    UIApplication.shared.open(url)
-                }
-                sleep(2)
-                exit(0)
-            }
-            
-            //Add buttons to dialog message
-            dialogMessage.addAction(wikiOption)
-            dialogMessage.addAction(ok)
 
-            // Present Alert to
-            self.present(dialogMessage, animated: true, completion: nil)
-
-            let dialogMessage2 = UIAlertController(title: "Analytics", message: "This app contains anonymous analytics for research and project development. By continuing to use this app, you are consenting to this data collection", preferredStyle: .alert)
-
-            let ok2 = UIAlertAction(title: "OK", style: .default, handler: { (action) -> Void in})
-            
-            dialogMessage2.addAction(ok2)
-            self.present(dialogMessage2, animated: true, completion: nil)
-
-            return nil
-        }
-    }
+    func fetchPairingFile() -> String? { PairingFileManager.shared.fetchPairingFile(presentingVC: self) }
 
     func displayError(_ msg: String) {
         print(msg)
-        // Create a new alert
-        let dialogMessage = UIAlertController(title: "Error launching SideStore", message: msg, preferredStyle: .alert)
-
-        // Present alert to user
-        self.present(dialogMessage, animated: true, completion: nil)
+        let alert = UIAlertController(title: "Error launching SideStore", message: msg, preferredStyle: .alert)
+        self.present(alert, animated: true)
     }
-    
+
     func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
         let url = urls[0]
         let isSecuredURL = url.startAccessingSecurityScopedResource() == true
+        defer {
+            if (isSecuredURL) {
+                url.stopAccessingSecurityScopedResource()
+            }
+        }
 
         do {
-            // Read to a string
-            let data1 = try Data(contentsOf: urls[0])
-            let pairing_string = String(bytes: data1, encoding: .utf8)
-            if pairing_string == nil {
+            let data = try Data(contentsOf: url)
+            guard let pairingString = String(data: data, encoding: .utf8) else {
                 displayError("Unable to read pairing file")
+                return
             }
-            
-            // Save to a file for next launch
-            let pairingFile = FileManager.default.documentsDirectory.appendingPathComponent("\(pairingFileName)")
-            try pairing_string?.write(to: pairingFile, atomically: true, encoding: String.Encoding.utf8)
-            
-            // Start minimuxer now that we have a file
-            start_minimuxer_threads(pairing_string!)
+            try pairingString.write(to: FileManager.default.documentsDirectory.appendingPathComponent(pairingFileName), atomically: true, encoding: .utf8)
+            start_minimuxer_threads(pairingString)
         } catch {
             displayError("Unable to read pairing file")
         }
         
-        if (isSecuredURL) {
-            url.stopAccessingSecurityScopedResource()
-        }
         controller.dismiss(animated: true, completion: nil)
     }
-    
+
     func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) {
         displayError("Choosing a pairing file was cancelled. Please re-open the app and try again.")
     }
     
-    func start_minimuxer_threads(_ pairing_file: String) {
-        target_minimuxer_address()
-        let documentsDirectory = FileManager.default.documentsDirectory.absoluteString
-        do {
-            // enable minimuxer console logging only if enabled in settings
-            let isMinimuxerConsoleLoggingEnabled = UserDefaults.standard.isMinimuxerConsoleLoggingEnabled
-            try minimuxer.startWithLogger(pairing_file, documentsDirectory, isMinimuxerConsoleLoggingEnabled)
-        } catch {
-            try! FileManager.default.removeItem(at: FileManager.default.documentsDirectory.appendingPathComponent("\(pairingFileName)"))
-            displayError("minimuxer failed to start, please restart SideStore. \((error as? LocalizedError)?.failureReason ?? "UNKNOWN ERROR!!!!!! REPORT TO GITHUB ISSUES!")")
+    func importAccountAtFile(_ file: URL, remove: Bool = false) {
+        _ = file.startAccessingSecurityScopedResource()
+        defer { file.stopAccessingSecurityScopedResource() }
+        guard let accountD = try? Data(contentsOf: file) else {
+            return Logger.main.notice("Could not parse data from file \(file)")
         }
-        if #available(iOS 17, *) {
-            // TODO: iOS 17 and above have a new JIT implementation that is completely broken in SideStore :(
+        guard let account = try? Foundation.JSONDecoder().decode(ImportedAccount.self, from: accountD) else {
+            return Logger.main.notice("Could not parse data from file \(file)")
         }
-        else {
-            start_auto_mounter(documentsDirectory)
+        print("We want to import this account probably: \(account)")
+        if remove {
+            try? FileManager.default.removeItem(at: file)
         }
-        
-        // Create destinationViewController now so view controllers can register for receiving Notifications.
-        self.destinationViewController = self.storyboard!.instantiateViewController(withIdentifier: "tabBarController") as? TabBarController
-    }
-}
-
-extension LaunchViewController
-{
-    override func handleLaunchError(_ error: Error)
-    {
-        do
-        {
-            throw error
-        }
-        catch let error as NSError
-        {
-            let title = error.userInfo[NSLocalizedFailureErrorKey] as? String ?? NSLocalizedString("Unable to Launch SideStore", comment: "")
-            
-            let errorDescription: String
-            
-            if #available(iOS 14.5, *)
-            {
-                let errorMessages = [error.debugDescription] + error.underlyingErrors.map { ($0 as NSError).debugDescription }
-                errorDescription = errorMessages.joined(separator: "\n\n")
-            }
-            else
-            {
-                errorDescription = error.debugDescription
-            }
-            
-            let alertController = UIAlertController(title: title, message: errorDescription, preferredStyle: .alert)
-            alertController.addAction(UIAlertAction(title: NSLocalizedString("Retry", comment: ""), style: .default, handler: { (action) in
-                self.handleLaunchConditions()
-            }))
-            self.present(alertController, animated: true, completion: nil)
+        Keychain.shared.appleIDEmailAddress = account.email
+        Keychain.shared.appleIDPassword = account.password
+        Keychain.shared.adiPb = account.adiPB
+        Keychain.shared.identifier = account.local_user
+        if let altCert = ALTCertificate(p12Data: account.cert, password: account.certpass) {
+            Keychain.shared.signingCertificate = altCert.encryptedP12Data(withPassword: "")!
+            Keychain.shared.signingCertificatePassword = account.certpass
+            let toastView = ToastView(text: NSLocalizedString("Successfully imported '\(account.email)'!", comment: ""), detailText: "SideStore should be fully operational!")
+            return toastView.show(in: self)
+        } else {
+            let toastView = ToastView(text: NSLocalizedString("Failed to import account certificate!", comment: ""), detailText: "Failed to create ALTCertificate. Check if the password is correct. Still imported account/adi.pb details!")
+            return toastView.show(in: self)
         }
     }
     
-    override func finishLaunching()
-    {
-        super.finishLaunching()
-        
-        guard !self.didFinishLaunching else { return }
+    func detectAndImportAccountFile() {
+        let accountFileURL = FileManager.default.documentsDirectory.appendingPathComponent("Account.sideconf")
+        #if !DEBUG
+        importAccountAtFile(accountFileURL, remove: true)
+        #else
+        importAccountAtFile(accountFileURL)
+        #endif
+    }
+}
+
+extension LaunchViewController {
+    @MainActor
+    func handleLaunchError(_ error: Error, retryCallback: (() async -> Void)? = nil) {
+        do { throw error } catch let error as NSError {
+            let title = error.userInfo[NSLocalizedFailureErrorKey] as? String ?? NSLocalizedString("Unable to Launch SideStore", comment: "")
+            let desc: String
+            if #available(iOS 14.5, *) {
+                desc = ([error.debugDescription] + error.underlyingErrors.map { ($0 as NSError).debugDescription }).joined(separator: "\n\n")
+            } else {
+                desc = error.debugDescription
+            }
+            let alert = UIAlertController(title: title, message: desc, preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: NSLocalizedString("Retry", comment: ""), style: .default) { _ in
+                Task { await retryCallback?() }
+            })
+            present(alert, animated: true)
+        }
+    }
+
+    @MainActor
+    func finishLaunching() async {
+        guard !didFinishLaunching else { return }
+        didFinishLaunching = true
         
         AppManager.shared.update()
-        AppManager.shared.updatePatronsIfNeeded()
-        PatreonAPI.shared.refreshPatreonAccount()
-        
         AppManager.shared.updateAllSources { result in
             guard case .failure(let error) = result else { return }
             Logger.main.error("Failed to update sources on launch. \(error.localizedDescription, privacy: .public)")
             
+            
             let errorDesc = ErrorProcessing(.fullError).getDescription(error: error as NSError)
             print("Failed to update sources on launch. \(errorDesc)")
             
@@ -320,63 +210,64 @@ extension LaunchViewController
             if String(describing: error).contains("The Internet connection appears to be offline"){
                 mode = .localizedDescription    // dont make noise!
             }
-            
             let toastView = ToastView(error: error, mode: mode)
             toastView.addTarget(self.destinationViewController, action: #selector(TabBarController.presentSources), for: .touchUpInside)
-            toastView.show(in: self.destinationViewController.selectedViewController ?? self.destinationViewController)
+            toastView.show(in: self.destinationViewController!.selectedViewController ?? self.destinationViewController!)
         }
-        
-        self.updateKnownSources()
-        
-        // Ask widgets to be refreshed
+        updateKnownSources()
         WidgetCenter.shared.reloadAllTimelines()
+        didFinishLaunching = true
         
-        // Add view controller as child (rather than presenting modally)
-        // so tint adjustment + card presentations works correctly.
-        self.destinationViewController.view.frame = CGRect(x: 0, y: 0, width: self.view.bounds.width, height: self.view.bounds.height)
-        self.destinationViewController.view.alpha = 0.0
-        self.addChild(self.destinationViewController)
-        self.view.addSubview(self.destinationViewController.view, pinningEdgesWith: .zero)
-        self.destinationViewController.didMove(toParent: self)
+        let destinationVC = destinationViewController!
         
-        UIView.animate(withDuration: 0.2) {
-            self.destinationViewController.view.alpha = 1.0
-        }
+        let elapsed = abs(startTime.timeIntervalSinceNow)
+        let remaining = elapsed >= 1 ? 0 : 1 - elapsed
+        try? await Task.sleep(nanoseconds: UInt64(remaining * 1_000_000_000))
         
-        self.didFinishLaunching = true
-    }
-}
+        destinationVC.loadViewIfNeeded()
+        addChild(destinationVC)
+        destinationVC.view.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(destinationVC.view)
+        destinationVC.didMove(toParent: self)
+        
+        // Pin edges BEFORE animation
+        NSLayoutConstraint.activate([
+            destinationVC.view.topAnchor.constraint(equalTo: view.topAnchor),
+            destinationVC.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+            destinationVC.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            destinationVC.view.trailingAnchor.constraint(equalTo: view.trailingAnchor)
+        ])
 
-private extension LaunchViewController
-{
-    func updateKnownSources()
-    {
+        // Set initial alpha for fade-in
+        destinationVC.view.alpha = 0
+
+        UIView.transition(with: view, duration: 0.3, options: .transitionCrossDissolve) { [self] in
+            self.splashView.alpha = 0
+            destinationVC.view.alpha = 1
+        } completion: { _ in
+            self.splashView.removeFromSuperview()
+            self.destinationViewController = destinationVC
+        }
+    }
+
+    func updateKnownSources() {
         AppManager.shared.updateKnownSources { result in
-            switch result
-            {
+            switch result {
             case .failure(let error): print("[ALTLog] Failed to update known sources:", error)
             case .success((_, let blockedSources)):
                 DatabaseManager.shared.persistentContainer.performBackgroundTask { context in
                     let blockedSourceIDs = Set(blockedSources.lazy.map { $0.identifier })
                     let blockedSourceURLs = Set(blockedSources.lazy.compactMap { $0.sourceURL })
-                    
-                    let predicate = NSPredicate(format: "%K IN %@ OR %K IN %@",
-                                                #keyPath(Source.identifier), blockedSourceIDs,
-                                                #keyPath(Source.sourceURL), blockedSourceURLs)
-                    
-                    let sourceErrors = Source.all(satisfying: predicate, in: context).map { (source) in
-                        let blockedSource = blockedSources.first { $0.identifier == source.identifier }
-                        return SourceError.blocked(source, bundleIDs: blockedSource?.bundleIDs, existingSource: source)
+                    let predicate = NSPredicate(format: "%K IN %@ OR %K IN %@", #keyPath(Source.identifier), blockedSourceIDs, #keyPath(Source.sourceURL), blockedSourceURLs)
+                    let sourceErrors = Source.all(satisfying: predicate, in: context).map { source in
+                        let blocked = blockedSources.first { $0.identifier == source.identifier }
+                        return SourceError.blocked(source, bundleIDs: blocked?.bundleIDs, existingSource: source)
                     }
-                    
                     guard !sourceErrors.isEmpty else { return }
-                                        
                     Task {
-                        for error in sourceErrors
-                        {
+                        for error in sourceErrors {
                             let title = String(format: NSLocalizedString("“%@” Blocked", comment: ""), error.$source.name)
                             let message = [error.localizedDescription, error.recoverySuggestion].compactMap { $0 }.joined(separator: "\n\n")
-                            
                             await self.presentAlert(title: title, message: message)
                         }
                     }
@@ -385,3 +276,142 @@ private extension LaunchViewController
         }
     }
 }
+
+// MARK: - SplashView
+final class SplashView: UIView {
+    let iconView = UIImageView()
+    let titleLabel = UILabel()
+
+    init(frame: CGRect, appName: String) {
+        super.init(frame: frame)
+        backgroundColor = .systemBackground
+        setupIcon()
+        setupTitle(appName: appName)
+    }
+
+    required init?(coder: NSCoder) { fatalError() }
+
+    private func setupIcon() {
+        let container = UIView()
+        container.translatesAutoresizingMaskIntoConstraints = false
+        container.layer.shadowColor = UIColor.black.cgColor
+        container.layer.shadowOpacity = 0.25
+        container.layer.shadowOffset = CGSize(width: 0, height: 4)
+        container.layer.shadowRadius = 8
+        addSubview(container)
+
+        iconView.image = UIImage(named: "AppIcon") ?? UIImage(named: "AppIcon60x60") ?? UIImage(systemName: "app.fill")
+        iconView.contentMode = .scaleAspectFit
+        iconView.translatesAutoresizingMaskIntoConstraints = false
+        iconView.layer.cornerRadius = 24
+        iconView.clipsToBounds = true
+        container.addSubview(iconView)
+
+        NSLayoutConstraint.activate([
+            container.centerXAnchor.constraint(equalTo: centerXAnchor),
+            container.centerYAnchor.constraint(equalTo: centerYAnchor, constant: -20),
+            container.widthAnchor.constraint(equalToConstant: 120),
+            container.heightAnchor.constraint(equalToConstant: 120),
+            iconView.topAnchor.constraint(equalTo: container.topAnchor),
+            iconView.bottomAnchor.constraint(equalTo: container.bottomAnchor),
+            iconView.leadingAnchor.constraint(equalTo: container.leadingAnchor),
+            iconView.trailingAnchor.constraint(equalTo: container.trailingAnchor)
+        ])
+    }
+
+    private func setupTitle(appName: String) {
+        titleLabel.text = appName
+        titleLabel.font = .systemFont(ofSize: 24, weight: .bold)
+        titleLabel.textColor = .label
+        titleLabel.textAlignment = .center
+        titleLabel.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(titleLabel)
+        NSLayoutConstraint.activate([
+            titleLabel.topAnchor.constraint(equalTo: iconView.bottomAnchor, constant: 12),
+            titleLabel.centerXAnchor.constraint(equalTo: centerXAnchor)
+        ])
+    }
+}
+
+// MARK: - PairingFileManager
+final class PairingFileManager {
+    static let shared = PairingFileManager()
+    func fetchPairingFile(presentingVC: UIViewController) -> String? {
+        let fm = FileManager.default
+        let filename = pairingFileName
+        let documentsPath = fm.documentsDirectory.appendingPathComponent("/\(filename)")
+        if fm.fileExists(atPath: documentsPath.path),
+           let contents = try? String(contentsOf: documentsPath), !contents.isEmpty {
+            return contents
+        }
+        if let url = Bundle.main.url(forResource: "ALTPairingFile", withExtension: "mobiledevicepairing"),
+           fm.fileExists(atPath: url.path),
+           let data = fm.contents(atPath: url.path),
+           let contents = String(data: data, encoding: .utf8),
+           !contents.isEmpty, !UserDefaults.standard.isPairingReset { return contents }
+        if let plistString = Bundle.main.object(forInfoDictionaryKey: "ALTPairingFile") as? String,
+           !plistString.isEmpty, !plistString.contains("insert pairing file here"), !UserDefaults.standard.isPairingReset { return plistString }
+
+        presentPairingFileAlert(on: presentingVC)
+        return nil
+    }
+
+    private func presentPairingFileAlert(on vc: UIViewController) {
+        let alert = UIAlertController(title: "Pairing File", message: "Select the pairing file or select \"Help\" for help.", preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "Help", style: .default) { _ in
+            if let url = URL(string: "https://docs.sidestore.io/docs/advanced/pairing-file") { UIApplication.shared.open(url) }
+            sleep(2); exit(0)
+        })
+        alert.addAction(UIAlertAction(title: "OK", style: .default) { _ in
+            var types = UTType.types(tag: "plist", tagClass: .filenameExtension, conformingTo: nil)
+            types.append(contentsOf: UTType.types(tag: "mobiledevicepairing", tagClass: .filenameExtension, conformingTo: .data))
+            types.append(.xml)
+            let picker = UIDocumentPickerViewController(forOpeningContentTypes: types)
+            picker.delegate = vc as? UIDocumentPickerDelegate
+            picker.shouldShowFileExtensions = true
+            vc.present(picker, animated: true)
+            UserDefaults.standard.isPairingReset = false
+        })
+        vc.present(alert, animated: true)
+    }
+}
+
+// MARK: - SideJITManager
+final class SideJITManager {
+    static let shared = SideJITManager()
+    func checkAndPromptIfNeeded(presentingVC: UIViewController) {
+        guard #available(iOS 17, *), !UserDefaults.standard.sidejitenable else { return }
+        DispatchQueue.global().async {
+            self.isSideJITServerDetected { result in
+                DispatchQueue.main.async {
+                    switch result {
+                    case .success():
+                        let alert = UIAlertController(title: "SideJITServer Detected", message: "Would you like to enable SideJITServer", preferredStyle: .alert)
+                        alert.addAction(UIAlertAction(title: "OK", style: .default) { _ in UserDefaults.standard.sidejitenable = true })
+                        alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+                        presentingVC.present(alert, animated: true)
+                    case .failure(_): print("Cannot find sideJITServer")
+                    }
+                }
+            }
+        }
+    }
+
+    func askForNetwork() {
+        let address = UserDefaults.standard.textInputSideJITServerurl ?? ""
+        let SJSURL = address.isEmpty ? "http://sidejitserver._http._tcp.local:8080" : address
+        URLSession.shared.dataTask(with: URL(string: "\(SJSURL)/re/")!) { data, resp, err in
+            print("data: \(String(describing: data)), response: \(String(describing: resp)), error: \(String(describing: err))")
+        }.resume()
+    }
+
+    func isSideJITServerDetected(completion: @escaping (Result<Void, Error>) -> Void) {
+        let address = UserDefaults.standard.textInputSideJITServerurl ?? ""
+        let SJSURL = address.isEmpty ? "http://sidejitserver._http._tcp.local:8080" : address
+        guard let url = URL(string: SJSURL) else { return }
+        URLSession.shared.dataTask(with: url) { _, _, error in
+            if let error = error { completion(.failure(error)); return }
+            completion(.success(()))
+        }.resume()
+    }
+}

AltStore/Managing Apps/AppManager.swift

@@ -8,14 +8,11 @@
 
 import Foundation
 import UIKit
-import SwiftUI
 import UserNotifications
 import MobileCoreServices
 import Intents
 import Combine
 import WidgetKit
-
-import minimuxer
 import AltStoreCore
 import AltSign
 import Roxas
@@ -23,7 +20,6 @@ import Roxas
 extension AppManager
 {
     static let didFetchSourceNotification = Notification.Name("io.sidestore.AppManager.didFetchSource")
-    static let didUpdatePatronsNotification = Notification.Name("io.sidestore.AppManager.didUpdatePatrons")
     static let didAddSourceNotification = Notification.Name("io.sidestore.AppManager.didAddSource")
     static let didRemoveSourceNotification = Notification.Name("io.sidestore.AppManager.didRemoveSource")
     static let willInstallAppFromNewSourceNotification = Notification.Name("io.sidestore.AppManager.willInstallAppFromNewSource")
@@ -591,34 +587,6 @@ extension AppManager
         return updateKnownSourcesOperation
     }
     
-    func updatePatronsIfNeeded()
-    {
-//        guard self.operationQueue.operations.allSatisfy({ !($0 is UpdatePatronsOperation) }) else {
-//            // There's already an UpdatePatronsOperation running.
-//            return
-//        }
-//        
-//        self.updatePatronsResult = nil
-//        
-//        let updatePatronsOperation = UpdatePatronsOperation()
-//        updatePatronsOperation.resultHandler = { (result) in
-//            do
-//            {
-//                try result.get()
-//                self.updatePatronsResult = .success(())
-//            }
-//            catch
-//            {
-//                print("Error updating Friend Zone Patrons:", error)
-//                self.updatePatronsResult = .failure(error)
-//            }
-//            
-//            NotificationCenter.default.post(name: AppManager.didUpdatePatronsNotification, object: self)
-//        }
-//        
-//        self.run([updatePatronsOperation], context: nil)
-    }
-    
     func updateAllSources(completion: @escaping (Result<Void, Error>) -> Void)
     {
         self.updateSourcesResult = nil
@@ -705,9 +673,37 @@ extension AppManager
             }
         }
         
-        let operation = AppOperation.install(app)
-        self.perform([operation], presentingViewController: presentingViewController, group: group)
         
+        Task{
+            var app: AppProtocol = app
+            // ---- Preflight bundle ID resolution ----
+            if UserDefaults.standard.customizeAppId,      // only show prompt when enabled by user
+                let presentingViewController {
+                let originalBundleID = app.bundleIdentifier
+
+                let resolution = await self.resolveBundleID(
+                    initial: originalBundleID,
+                    presentingViewController: presentingViewController
+                )
+
+                switch resolution {
+                    case .cancelled:
+                        completionHandler(.failure(OperationError.cancelled))
+                        group.progress.cancel()
+
+                    case .resolved(let newBundleID):
+                        app = AnyApp(
+                            name: app.name,
+                            bundleIdentifier: newBundleID,
+                            url: app.url,
+                            storeApp: app.storeApp
+                        )
+                }
+            }
+            
+            await self.perform([.install(app)], presentingViewController: presentingViewController, group: group)
+            
+        }
         return group
     }
     
@@ -732,10 +728,11 @@ extension AppManager
             }
         }
         
-        let operation = AppOperation.update(appVersion)
-        assert(operation.app as AnyObject !== installedApp) // Make sure we never accidentally "update" to already installed app.
+        assert(appVersion as AnyObject !== installedApp) // Make sure we never accidentally "update" to already installed app.
         
-        self.perform([operation], presentingViewController: presentingViewController, group: group)
+        Task{
+            await self.perform([.update(appVersion)], presentingViewController: presentingViewController, group: group)
+        }
         
         return group.progress
     }
@@ -745,16 +742,20 @@ extension AppManager
     {
         let group = group ?? RefreshGroup()
         
-        let operations = installedApps.map { AppOperation.refresh($0) }
-        return self.perform(operations, presentingViewController: presentingViewController, group: group)
+        Task{
+            await self.perform(installedApps.map { .refresh($0) }, presentingViewController: presentingViewController, group: group)
+        }
+        
+        return group
     }
     
     func activate(_ installedApp: InstalledApp, presentingViewController: UIViewController?, completionHandler: @escaping (Result<InstalledApp, Error>) -> Void)
     {
         let group = RefreshGroup()
         
-        let operation = AppOperation.activate(installedApp)
-        self.perform([operation], presentingViewController: presentingViewController, group: group)
+        Task{
+            await self.perform([.activate(installedApp)], presentingViewController: presentingViewController, group: group)
+        }
         
         group.completionHandler = { (results) in
             do
@@ -812,8 +813,9 @@ extension AppManager
                 }
             }
             
-            let operation = AppOperation.deactivate(installedApp)
-            self.perform([operation], presentingViewController: presentingViewController, group: group)
+            Task{
+                await self.perform([.deactivate(installedApp)], presentingViewController: presentingViewController, group: group)
+            }
         }
     }
     
@@ -837,8 +839,9 @@ extension AppManager
             }
         }
         
-        let operation = AppOperation.backup(installedApp)
-        self.perform([operation], presentingViewController: presentingViewController, group: group)
+        Task{
+            await self.perform([.backup(installedApp)], presentingViewController: presentingViewController, group: group)
+        }
     }
     
     func restore(_ installedApp: InstalledApp, presentingViewController: UIViewController?, completionHandler: @escaping (Result<InstalledApp, Error>) -> Void)
@@ -863,8 +866,9 @@ extension AppManager
             }
         }
         
-        let operation = AppOperation.restore(installedApp)
-        self.perform([operation], presentingViewController: presentingViewController, group: group)
+        Task{
+            await self.perform([.restore(installedApp)], presentingViewController: presentingViewController, group: group)
+        }
     }
     
     func remove(_ installedApp: InstalledApp, completionHandler: @escaping (Result<Void, Error>) -> Void)
@@ -993,6 +997,7 @@ extension AppManager
             case .failure(let error): completionHandler(.failure(error))
             case .success(let installedApp): completionHandler(.success(installedApp))
             }
+            //UIApplication.shared.open(shortcutURLon, options: [:], completionHandler: nil)
         }
         installOperation.addDependency(sendAppOperation)
         
@@ -1091,7 +1096,7 @@ private extension AppManager
     }
     
     @discardableResult
-    private func perform(_ operations: [AppOperation], presentingViewController: UIViewController?, group: RefreshGroup) -> RefreshGroup
+    private func perform(_ operations: [AppOperation], presentingViewController: UIViewController?, group: RefreshGroup) async -> RefreshGroup
     {
         let operations = operations.filter { self.progress(for: $0) == nil || self.progress(for: $0)?.isCancelled == true }
         
@@ -1153,38 +1158,10 @@ private extension AppManager
                     
                 case .activate(let app) where UserDefaults.standard.isLegacyDeactivationSupported: fallthrough
                 case .refresh(let app):
-                    // Check if backup app is installed in place of real app.
-//                    let altBackupUti = UTTypeCopyDeclaration(app.installedBackupAppUTI as CFString)?.takeRetainedValue() as NSDictionary?
-
-//                    if app.certificateSerialNumber != group.context.certificate?.serialNumber ||
-//                        altBackupUti != nil ||        // why would altbackup requires reinstall? it shouldn't cause we are just renewing profiles
-//                        app.needsResign ||            // why would an app require resign during refresh? it shouldn't!
-                        // We need to reinstall ourselves on refresh to ensure the new provisioning profile is used
-                        //  => mahee96: jkcoxson confirmed misagent manages profiles independently without requiring lockdownd or installd intervention, so sidestore profile renewal shouldn't require reinstall
-//                        app.bundleIdentifier == StoreApp.altstoreAppID    
-//                    {
-                        // Resign app instead of just refreshing profiles because either:
-                        // * Refreshing using different certificate     // when can this happen?, lets assume, refreshing with different certificate, why not just ask user to re-install manually? (probably we need re-install button)
-                        // * Backup app is still installed              // but why? I mean the AltBackup was put in place for a reason? ie during refresh just renew appIDs don't care about the app itself.
-                        // * App explicitly needs resigning             // when can this happen?
-                        // * Device is jailbroken and using AltDaemon on iOS 14.0 or later (b/c refreshing with provisioning profiles is broken)
-                        
-//                        let installProgress = self._install(app, operation: operation, group: group) { (result) in
-//                            self.finish(operation, result: result, group: group, progress: progress)
-//                        }
-//                        progress?.addChild(installProgress, withPendingUnitCount: 80)
-//                    }
-//                    else
-//                    {
-                        // Refreshing with same certificate as last time, and backup app isn't still installed,
-                        // so we can just refresh provisioning profiles.
-                        
-                        let refreshProgress = self._refresh(app, operation: operation, group: group) { (result) in
-                            self.finish(operation, result: result, group: group, progress: progress)
-                        }
-                        progress?.addChild(refreshProgress, withPendingUnitCount: 80)
-//                    }
-                    
+                    let refreshProgress = self._refresh(app, operation: operation, group: group) { (result) in
+                        self.finish(operation, result: result, group: group, progress: progress)
+                    }
+                    progress?.addChild(refreshProgress, withPendingUnitCount: 80)
                 case .activate(let app):
                     let activateProgress = self._activate(app, operation: operation, group: group) { (result) in
                         self.finish(operation, result: result, group: group, progress: progress)
@@ -1254,21 +1231,10 @@ private extension AppManager
     {
         let progress = Progress.discreteProgress(totalUnitCount: 100)
         
-        let context = context ?? InstallAppOperationContext(bundleIdentifier: app.bundleIdentifier, authenticatedContext: group.context)
+        let context = InstallAppOperationContext(bundleIdentifier: app.bundleIdentifier, authenticatedContext: group.context)
         assert(context.authenticatedContext === group.context)
         
         context.beginInstallationHandler = { (installedApp) in
-            switch appOperation
-            {
-            case .update where installedApp.bundleIdentifier == StoreApp.altstoreAppID:
-                // AltStore will quit before installation finishes,
-                // so assume if we get this far the update will finish successfully.
-                let event = AnalyticsManager.Event.updatedApp(installedApp)
-                AnalyticsManager.shared.trackEvent(event)
-                
-            default: break
-            }
-            
             group.beginInstallationHandler?(installedApp)
         }
         
@@ -1289,20 +1255,6 @@ private extension AppManager
             }
         }
         
-        var verifyPledgeOperation: VerifyAppPledgeOperation?
-        if let storeApp = app.storeApp
-        {
-            verifyPledgeOperation = VerifyAppPledgeOperation(storeApp: storeApp, presentingViewController: context.presentingViewController)
-            verifyPledgeOperation?.resultHandler = { result in
-                switch result
-                {
-                case .failure(let error):
-                    context.error = error
-                case .success: break
-                }
-            }
-        }
-        
         /* Download */
         let downloadedAppURL = context.temporaryDirectory.appendingPathComponent("Cached.app")
         let downloadOperation = DownloadAppOperation(app: downloadingApp, destinationURL: downloadedAppURL, context: context)
@@ -1314,7 +1266,8 @@ private extension AppManager
                 
                 if cacheApp
                 {
-                    try FileManager.default.copyItem(at: app.fileURL, to: InstalledApp.fileURL(for: app), shouldReplace: true)
+                    let updatedApp = AnyApp(from: app, bundleId: context.bundleIdentifier)
+                    try FileManager.default.copyItem(at: app.fileURL, to: InstalledApp.fileURL(for: updatedApp), shouldReplace: true)
                 }
             }
             catch
@@ -1324,15 +1277,9 @@ private extension AppManager
         }
         progress.addChild(downloadOperation.progress, withPendingUnitCount: 25)
         
-        if let verifyPledgeOperation
-        {
-            downloadOperation.addDependency(verifyPledgeOperation)
-        }
-        
-        
         /* Verify App */
         let permissionsMode = UserDefaults.shared.permissionCheckingDisabled ? .none : permissionReviewMode
-        let verifyOperation = VerifyAppOperation(permissionsMode: permissionsMode, context: context)
+        let verifyOperation = VerifyAppOperation(permissionsMode: permissionsMode, context: context, customBundleId: app.bundleIdentifier)
         verifyOperation.resultHandler = { (result) in
             do
             {
@@ -1485,7 +1432,7 @@ private extension AppManager
                       let patchAppURL = URL(string: patchAppLink)
                 else { throw OperationError.invalidApp }
                 
-                let patchApp = AnyApp(name: app.name, bundleIdentifier: app.bundleIdentifier, url: patchAppURL, storeApp: nil)
+                let patchApp = AnyApp(name: app.name, bundleIdentifier: context.bundleIdentifier, url: patchAppURL, storeApp: nil)
                 
                 DispatchQueue.main.async {
                     let storyboard = UIStoryboard(name: "PatchApp", bundle: nil)
@@ -1507,7 +1454,7 @@ private extension AppManager
                             presentingViewController?.dismiss(animated: true, completion: nil)
                         }
                     }
-                    presentingViewController.present(navigationController, animated: true, completion: nil)                    
+                    presentingViewController.present(navigationController, animated: true, completion: nil)
                 }
             }
             catch
@@ -1519,6 +1466,24 @@ private extension AppManager
         patchAppOperation.addDependency(deactivateAppsOperation)
         
 
+        let modifyAppExBundleIdOperation = RSTAsyncBlockOperation { operation in
+            if !context.useMainProfile {
+                operation.finish()
+                return
+            }
+            
+            if let app = context.app, let profile = context.provisioningProfiles?[context.bundleIdentifier] {
+                var appexBundleIds: [String: String] = [:]
+                for appex in app.appExtensions {
+                    appexBundleIds[appex.bundleIdentifier] = appex.bundleIdentifier.replacingOccurrences(of: app.bundleIdentifier, with: profile.bundleIdentifier)
+                }
+                context.appexBundleIds = appexBundleIds
+            }
+            operation.finish()
+            
+        }
+        modifyAppExBundleIdOperation.addDependency(fetchProvisioningProfilesOperation)
+        
         /* Resign */
         let resignAppOperation = ResignAppOperation(context: context)
         resignAppOperation.resultHandler = { (result) in
@@ -1533,6 +1498,7 @@ private extension AppManager
             }
         }
         resignAppOperation.addDependency(patchAppOperation)
+        resignAppOperation.addDependency(modifyAppExBundleIdOperation)
         progress.addChild(resignAppOperation.progress, withPendingUnitCount: 20)
         
         
@@ -1578,7 +1544,6 @@ private extension AppManager
         
         // Operations picked for request
         var operations = [
-            verifyPledgeOperation,
             downloadOperation,
             verifyOperation,
             removeAppExtensionsOperation,
@@ -1586,6 +1551,7 @@ private extension AppManager
             patchAppOperation,
             refreshAnisetteDataOperation,
             fetchProvisioningProfilesOperation,
+            modifyAppExBundleIdOperation,
             resignAppOperation,
             sendAppOperation,
             installOperation
@@ -1595,8 +1561,6 @@ private extension AppManager
         
         if let storeApp = downloadingApp.storeApp, storeApp.isPledgeRequired
         {
-            // Patreon apps may require authenticating with WebViewController,
-            // so make sure to run DownloadAppOperation serially.
             self.run([downloadOperation], context: group.context, requiresSerialQueue: true)
             
             if let index = operations.firstIndex(of: downloadOperation)
@@ -1665,8 +1629,8 @@ private extension AppManager
         
         let context = AppOperationContext(bundleIdentifier: app.bundleIdentifier, authenticatedContext: group.context)
         context.app = ALTApplication(fileURL: app.fileURL)
-        
-       // Since this doesn't involve modifying app bundle which will cause re-install, this is safe  in refresh path 
+        context.useMainProfile = app.useMainProfile
+       // Since this doesn't involve modifying app bundle which will cause re-install, this is safe  in refresh path
        //App-Extensions: Ensure DB data and disk state must match
        let dbAppEx: Set<InstalledExtension> = Set(app.appExtensions)
        let diskAppEx: Set<ALTApplication> = Set(context.app!.appExtensions)
@@ -1716,7 +1680,7 @@ private extension AppManager
                 // Fall back to installation if AltServer doesn't support newer provisioning profile requests,
                 // OR if the cached app could not be found and we may need to redownload it.
                 app.managedObjectContext?.performAndWait { // Must performAndWait to ensure we add operations before we return.
-                    if minimuxer.ready() {
+                    if isMinimuxerReady {
                         let installProgress = self._install(app, operation: operation, group: group) { (result) in
                             completionHandler(result)
                         }
@@ -2125,27 +2089,6 @@ private extension AppManager
                 self.scheduleExpirationWarningLocalNotification(for: installedApp)
             }
             
-            let event: AnalyticsManager.Event?
-            
-            switch operation
-            {
-            case .install: event = .installedApp(installedApp)
-            case .refresh: event = .refreshedApp(installedApp)
-            case .update where installedApp.bundleIdentifier == StoreApp.altstoreAppID:
-                // AltStore quits before update finishes, so we've preemptively logged this update event.
-                // In case AltStore doesn't quit, such as when update has a different bundle identifier,
-                // make sure we don't log this update event a second time.
-                event = nil
-                
-            case .update: event = .updatedApp(installedApp)
-            case .activate, .deactivate, .backup, .restore: event = nil
-            }
-            
-            if let event = event
-            {
-                AnalyticsManager.shared.trackEvent(event)
-            }
-            
             // Ask widgets to be refreshed
             WidgetCenter.shared.reloadAllTimelines()
             
@@ -2230,7 +2173,7 @@ private extension AppManager
             switch operation
             {
             case _ where requiresSerialQueue: fallthrough
-            case is InstallAppOperation, is RefreshAppOperation, is BackupAppOperation, is VerifyAppPledgeOperation:
+            case is InstallAppOperation, is RefreshAppOperation, is BackupAppOperation:
                 if let installAltStoreOperation = operation as? InstallAppOperation, installAltStoreOperation.context.bundleIdentifier == StoreApp.altstoreAppID
                 {
                     // Add dependencies on previous serial operations in `context` to ensure re-installing AltStore goes last.
@@ -2282,3 +2225,126 @@ private extension AppManager
         }
     }
 }
+
+private enum BundleIDAlertKeys {
+    static var okAction: UInt8 = 0
+}
+
+private func _isValidBundleID(_ value: String) -> Bool {
+    let pattern = #"^[A-Za-z][A-Za-z0-9\-]*(\.[A-Za-z0-9\-]+)+$"#
+    return value.range(of: pattern, options: .regularExpression) != nil
+}
+
+private extension UIResponder {
+    @objc func _validateBundleIDText(_ sender: UITextField) {
+        let isValid = sender.text.map(_isValidBundleID) ?? false
+
+        sender.backgroundColor =
+            isValid || sender.text?.isEmpty == true
+            ? .clear
+            : UIColor.systemRed.withAlphaComponent(0.2)
+
+        if
+            let alert = sender.superview?.superview as? UIAlertController,
+            let okAction = objc_getAssociatedObject(alert, &BundleIDAlertKeys.okAction) as? UIAlertAction
+        {
+            okAction.isEnabled = isValid
+        }
+    }
+}
+
+
+
+private extension AppManager {
+
+    func _presentBundleIDOverrideDialog(
+        bundleIdentifier: String,
+        presentingViewController: UIViewController,
+        completion: @escaping (BundleIDResolution) -> Void
+    ) {
+        let alert = self._makeBundleIDOverrideAlert(
+            initialBundleID: bundleIdentifier,
+            completion: completion
+        )
+
+        presentingViewController.present(alert, animated: true)
+    }
+
+    func _makeBundleIDOverrideAlert(
+        initialBundleID: String,
+        completion: @escaping (BundleIDResolution) -> Void
+    ) -> UIAlertController {
+
+        let titleText = NSLocalizedString("AppID Customization", comment: "")
+        let messageText = NSLocalizedString("Customize the AppID if required and press 'Confirm' to proceed.", comment: "")
+        
+        let alert = UIAlertController(
+            title: titleText,
+            message: messageText,
+            preferredStyle: .alert
+        )
+
+        var okAction: UIAlertAction!
+
+        alert.addTextField { textField in
+            textField.text = initialBundleID
+            textField.autocapitalizationType = .none
+            textField.autocorrectionType = .no
+            textField.addTarget(
+                nil,
+                action: #selector(UIResponder._validateBundleIDText(_:)),
+                for: .editingChanged
+            )
+        }
+
+        okAction = UIAlertAction(title: NSLocalizedString("Confirm", comment: ""), style: .default) { _ in
+            completion(.resolved(alert.textFields?.first?.text ?? initialBundleID))
+        }
+
+        okAction.isEnabled = _isValidBundleID(initialBundleID)
+
+        let cancelAction = UIAlertAction(title: NSLocalizedString("Cancel", comment: ""), style: .cancel) { _ in
+            completion(.cancelled)
+        }
+
+        alert.addAction(cancelAction)
+        alert.addAction(okAction)
+
+        objc_setAssociatedObject(
+            alert,
+            &BundleIDAlertKeys.okAction,
+            okAction,
+            .OBJC_ASSOCIATION_ASSIGN
+        )
+
+        return alert
+    }
+}
+        
+
+// ---- Part 1: Add async resolver ----
+
+private extension AppManager {
+
+    enum BundleIDResolution {
+        case resolved(String)
+        case cancelled
+    }
+
+    @MainActor
+    func resolveBundleID(
+        initial: String,
+        presentingViewController: UIViewController
+    ) async -> BundleIDResolution {
+
+        await withCheckedContinuation { continuation in
+            let alert = self._makeBundleIDOverrideAlert(
+                initialBundleID: initial
+            ) { result in
+                continuation.resume(returning: result)
+            }
+
+            presentingViewController.present(alert, animated: true)
+        }
+    }
+}

AltStore/Managing Apps/AppManagerErrors.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import CoreData
-
 import AltStoreCore
 
 extension AppManager

AltStore/My Apps/MyAppsViewController.swift

@@ -11,11 +11,9 @@ import MobileCoreServices
 import Intents
 import Combine
 import UniformTypeIdentifiers
-
 import AltStoreCore
 import AltSign
 import Roxas
-import minimuxer
 import SemanticVersion
 
 import Nuke
@@ -120,7 +118,6 @@ class MyAppsViewController: UICollectionViewController, PeekPopPreviewing
     {
         super.viewIsAppearing(animated)
         
-        // Ensure the button for each app reflects correct Patreon status.
         self.collectionView.reloadData()
         
         self.update()
@@ -166,9 +163,11 @@ class MyAppsViewController: UICollectionViewController, PeekPopPreviewing
     @IBAction func unwindToMyAppsViewController(_ segue: UIStoryboardSegue)
     {
     }
+
     var minimuxerStatus: Bool {
-        guard minimuxer.ready() else {
-            ToastView(error: (OperationError.noWiFi as NSError).withLocalizedTitle("No WiFi or VPN!")).show(in: self)
+        // added isMinimuxerStatusCheckEnabled to forcefully ignore minimuxer status if status check is disabled in settings
+        guard !UserDefaults.standard.isMinimuxerStatusCheckEnabled || isMinimuxerReady else {
+            ToastView(error: (OperationError.noWiFi as NSError).withLocalizedTitle("No Wi-Fi or VPN!")).show(in: self)
             return false
         }
         return true
@@ -542,11 +541,6 @@ private extension MyAppsViewController
         {
             print("[ALTLog] Failed to fetch updates:", error)
         }
-        
-        if let patreonAccount = DatabaseManager.shared.patreonAccount(), patreonAccount.isAltStorePatron, PatreonAPI.shared.isAuthenticated
-        {
-            self.dataSource.predicate = nil
-        }
     }
 }
 
@@ -1485,15 +1479,6 @@ private extension MyAppsViewController
             guard minimuxerStatus else { return }
         }
         
-        if #available(iOS 17, *), !sidejitenabled {
-            let error = OperationError.tooNewError as NSError
-            let localizedError = error.withLocalizedTitle("No iOS 17 On Device JIT!")
-            
-            ToastView(error: localizedError, opensLog: true).show(in: self)
-            AppManager.shared.log(error, operation: .enableJIT, app: installedApp)
-            return
-        }
-        
         AppManager.shared.enableJIT(for: installedApp) { result in
             DispatchQueue.main.async {
                 switch result {
@@ -2002,8 +1987,6 @@ extension MyAppsViewController
             
             for action in actions where !allowedActions.contains(action)
             {
-                // Disable options for Patreon apps that we are no longer pledged to.
-                
                 if let action = action as? UIAction
                 {
                     action.attributes = .disabled

AltStore/News/NewsViewController.swift

@@ -9,7 +9,6 @@
 import UIKit
 import SafariServices
 import Combine
-
 import AltStoreCore
 import Roxas
 

AltStore/Operations/AuthenticationOperation.swift

@@ -9,10 +9,8 @@
 import Foundation
 import Roxas
 import Network
-
 import AltStoreCore
 import AltSign
-import minimuxer
 
 private extension UIColor
 {
@@ -84,71 +82,87 @@ final class AuthenticationOperation: ResultOperation<(ALTTeam, ALTCertificate, A
             self.finish(.failure(error))
             return
         }
-                
-        // Sign In
-        self.signIn() { (result) in
-            guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
-            
-            switch result
+
+        Task {
+            // try to use cached session
+            if
+                let certificate = Keychain.shared.certificate,
+                let session = Keychain.shared.session,
+                let team = Keychain.shared.team
             {
-            case .failure(let error): self.finish(.failure(error))
-            case .success((let account, let session)):
-                self.context.session = session
-                self.progress.completedUnitCount += 1
-                
-                // Fetch Team
-                self.fetchTeam(for: account, session: session) { (result) in
-                    guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
-                    
-                    switch result
-                    {
-                    case .failure(let error): self.finish(.failure(error))
-                    case .success(let team):
-                        self.context.team = team
-                        self.progress.completedUnitCount += 1
-                        
-                        // Fetch Certificate
-                        self.fetchCertificate(for: team, session: session) { (result) in
-                            guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
-                            
-                            switch result
-                            {
-                            case .failure(let error): self.finish(.failure(error))
-                            case .success(let certificate):
-                                self.context.certificate = certificate
-                                self.progress.completedUnitCount += 1
-                                       
-                                // Register Device
-                                self.registerCurrentDevice(for: team, session: session) { (result) in
-                                    guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
-                                    
-                                    switch result
-                                    {
-                                    case .failure(let error): self.finish(.failure(error))
-                                    case .success:
-                                        self.progress.completedUnitCount += 1
-                                        
-                                        // Save account/team to disk.
-                                        self.save(team) { (result) in
-                                            guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
-                                            
-                                            switch result
-                                            {
-                                            case .failure(let error): self.finish(.failure(error))
-                                            case .success:
-                                                // Must cache App IDs _after_ saving account/team to disk.
-                                                self.cacheAppIDs(team: team, session: session) { (result) in
-                                                    let result = result.map { _ in (team, certificate, session) }
-                                                    self.finish(result)
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
+                if session.anisetteData.date.timeIntervalSinceNow < -40.0 {
+                    let anisetteData = try await withUnsafeThrowingContinuation { (c: UnsafeContinuation<ALTAnisetteData, any Error>) in
+                        let fetchAnisetteDataOperation = FetchAnisetteDataOperation(context: self.context)
+                        fetchAnisetteDataOperation.resultHandler = { (result) in
+                            c.resume(with: result)
                         }
+                        self.operationQueue.addOperation(fetchAnisetteDataOperation)
+                    }
+                    session.anisetteData = anisetteData
+                }
+                self.context.team = team
+                self.context.session = session
+                self.context.certificate = certificate
+                self.finish(.success((team, certificate, session)))
+                return
+            }
+            
+            // new login
+            do {
+                let (account, session) = try await withUnsafeThrowingContinuation { c in
+                    self.signIn() { (result) in
+                        c.resume(with: result)
                     }
                 }
+                self.context.session = session
+                self.progress.completedUnitCount += 1
+                guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
+                
+                let team = try await withUnsafeThrowingContinuation { c in
+                    self.fetchTeam(for: account, session: session) { (result) in
+                        c.resume(with: result)
+                    }
+                }
+                self.context.team = team
+                self.progress.completedUnitCount += 1
+                guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
+                
+                let certificate = try await withUnsafeThrowingContinuation { c in
+                    self.fetchCertificate(for: team, session: session) { (result) in
+                        c.resume(with: result)
+                    }
+                }
+                self.context.certificate = certificate
+                self.progress.completedUnitCount += 1
+                guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
+                
+                let _ = try await withUnsafeThrowingContinuation { c in
+                    self.registerCurrentDevice(for: team, session: session) { (result) in
+                        c.resume(with: result)
+                    }
+                }
+                self.progress.completedUnitCount += 1
+                guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
+                
+                try await withUnsafeThrowingContinuation { c in
+                    self.save(team) { (result) in
+                        c.resume(with: result)
+                    }
+                }
+                guard !self.isCancelled else { return self.finish(.failure(OperationError.cancelled)) }
+                
+                try await withUnsafeThrowingContinuation { c in
+                    self.cacheAppIDs(team: team, session: session) { (result) in
+                        c.resume(with: result)
+                    }
+                }
+                Keychain.shared.team = team
+                Keychain.shared.certificate = certificate
+                Keychain.shared.session = session
+                self.finish(.success((team, certificate, session)))
+
+            } catch {
+                self.finish(.failure(error))
             }
         }
     }
@@ -359,6 +373,29 @@ private extension AuthenticationOperation
             }
         }
         
+        if let adsid = Keychain.shared.appleIDAdsid, let xcodeToken = Keychain.shared.appleIDXcodeToken {
+            Logger.sideload.notice("Authenticating Apple ID with tokens...")
+            let semaphore = DispatchSemaphore(value: 0)
+            var shouldContinue = true
+            Task {
+                defer {
+                    semaphore.signal()
+                }
+                do {
+                    let (account, session) = try await self.authenticateWithToken(adsid: adsid, xcodeToken: xcodeToken)
+                    completionHandler(.success((account, session)))
+                    shouldContinue = false
+                } catch {
+                    Logger.sideload.notice("Authentication failed with token. Fall back to email and password login: \(error)")
+                }
+            }
+            
+            semaphore.wait()
+            if !shouldContinue {
+                return
+            }
+        }
+        
         if let appleID = Keychain.shared.appleIDEmailAddress, let password = Keychain.shared.appleIDPassword
         {
             Logger.sideload.notice("Authenticating Apple ID...")
@@ -384,6 +421,25 @@ private extension AuthenticationOperation
         }
     }
     
+    func authenticateWithToken(adsid: String, xcodeToken: String) async throws -> (ALTAccount, ALTAppleAPISession) {
+        let anisetteData = try await withUnsafeThrowingContinuation { (c: UnsafeContinuation<ALTAnisetteData, any Error>) in
+            let fetchAnisetteDataOperation = FetchAnisetteDataOperation(context: self.context)
+            fetchAnisetteDataOperation.resultHandler = { (result) in
+                c.resume(with: result)
+            }
+            self.operationQueue.addOperation(fetchAnisetteDataOperation)
+        }
+        
+        let session = ALTAppleAPISession(dsid: adsid, authToken: xcodeToken, anisetteData: anisetteData)
+        let account = try await withUnsafeThrowingContinuation { (c: UnsafeContinuation<ALTAccount, any Error>) in
+            ALTAppleAPI.shared.fetchAccount2(session: session) { result in
+                c.resume(with: result)
+            }
+        }
+        
+        return (account, session)
+    }
+    
     func authenticate(appleID: String, password: String, completionHandler: @escaping (Result<(ALTAccount, ALTAppleAPISession), Swift.Error>) -> Void)
     {
         self.appleIDEmailAddress = appleID
@@ -444,6 +500,8 @@ private extension AuthenticationOperation
                                                 verificationHandler: verificationHandler) { (account, session, error) in
                     if let account = account, let session = session
                     {
+                        Keychain.shared.appleIDAdsid = session.dsid
+                        Keychain.shared.appleIDXcodeToken = session.authToken
                         completionHandler(.success((account, session)))
                     }
                     else
@@ -747,3 +805,30 @@ extension AuthenticationOperation
         self.submitCodeAction?.isEnabled = (textField.text ?? "").count == 6
     }
 }
+
+
+extension ALTAppleAPI {
+    func fetchAccount2(session: ALTAppleAPISession, completionHandler: @escaping (Result<ALTAccount, Error>) -> Void)
+    {
+        let url = URL(string: "viewDeveloper.action", relativeTo: self.baseURL)!
+        
+        self.sendRequest(with: url, additionalParameters: nil, session: session, team: nil) { (responseDictionary, requestError) in
+            do
+            {
+                guard let responseDictionary = responseDictionary else { throw requestError ?? ALTAppleAPIError.unknown() }
+                
+                guard let account = try self.processResponse(responseDictionary, parseHandler: { () -> Any? in
+                    guard let dictionary = responseDictionary["developer"] as? [String: Any] else { return nil }
+                    let account = ALTAccount(responseDictionary: dictionary)
+                    return account
+                }, resultCodeHandler: nil) as? ALTAccount else {
+                    throw ALTAppleAPIError.unknown()
+                }
+
+                completionHandler(.success(account))
+            } catch {
+                completionHandler(.failure(error))
+            }
+        }
+    }
+}

AltStore/Operations/BackgroundRefreshAppsOperation.swift

@@ -8,10 +8,8 @@
 
 import UIKit
 import CoreData
-
 import AltStoreCore
-import EmotionalDamage
-import minimuxer
+
 
 typealias RefreshError = RefreshErrorCode.Error
 enum RefreshErrorCode: Int, ALTErrorEnum, CaseIterable
@@ -99,14 +97,17 @@ final class BackgroundRefreshAppsOperation: ResultOperation<[String: Result<Inst
             self.finish(.failure(RefreshError(.noInstalledApps)))
             return
         }
-        start_em_proxy(bind_addr: Consts.Proxy.serverURL)
-        target_minimuxer_address()
+
+        if UserDefaults.standard.enableEMPforWireguard {
+            startEMProxy(bind_addr: AppConstants.Proxy.serverURL)
+        }
+        targetMinimuxerAddress()
         let documentsDirectory = FileManager.default.documentsDirectory.absoluteString
         do {
             // enable minimuxer console logging only if enabled in settings
             let isMinimuxerConsoleLoggingEnabled = UserDefaults.standard.isMinimuxerConsoleLoggingEnabled
 
-            try minimuxer.startWithLogger(
+            try minimuxerStartWithLogger(
                 try String(contentsOf: FileManager.default.documentsDirectory.appendingPathComponent("\(pairingFileName)")),
                 documentsDirectory,
                 isMinimuxerConsoleLoggingEnabled

AltStore/Operations/BackupAppOperation.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-
 import AltStoreCore
 import AltSign
 

AltStore/Operations/DeactivateAppOperation.swift

@@ -7,11 +7,9 @@
 //
 
 import Foundation
-
 import AltStoreCore
 import AltSign
 import Roxas
-import minimuxer
 
 @objc(DeactivateAppOperation)
 final class DeactivateAppOperation: ResultOperation<InstalledApp>

AltStore/Operations/DownloadAppOperation.swift

@@ -9,7 +9,6 @@
 import Foundation
 import WebKit
 import UniformTypeIdentifiers
-
 import AltStoreCore
 import AltSign
 import Roxas
@@ -30,15 +29,13 @@ final class DownloadAppOperation: ResultOperation<ALTApplication>
     private let session = URLSession(configuration: .default)
     private let temporaryDirectory = FileManager.default.uniqueTemporaryURL()
 
-    private var downloadPatreonAppContinuation: CheckedContinuation<URL, Error>?
-
     init(app: AppProtocol, destinationURL: URL, context: InstallAppOperationContext)
     {
         self.app = app
         self.context = context
 
         self.appName = app.name
-        self.bundleIdentifier = app.bundleIdentifier
+        self.bundleIdentifier = context.bundleIdentifier
         self.sourceURL = app.url
         self.destinationURL = destinationURL
 
@@ -77,7 +74,7 @@ final class DownloadAppOperation: ResultOperation<ALTApplication>
                     guard let latestVersion = storeApp.latestAvailableVersion else {
                         let failureReason = String(format: NSLocalizedString("The latest version of %@ could not be determined.", comment: ""), self.appName)
                         throw OperationError.unknown(failureReason: failureReason)
-        }
+                    }
 
                     // Attempt to download latest _available_ version, and fall back to older versions if necessary.
                     appVersion = latestVersion
@@ -224,12 +221,6 @@ private extension DownloadAppOperation
                         fileURL = sourceURL
                         self.progress.completedUnitCount += 3
                     }
-                    else if let host = sourceURL.host, host.lowercased().hasSuffix("patreon.com") && sourceURL.path.lowercased() == "/file"
-                    {
-                        // Patreon app
-                        fileURL = try await downloadPatreonApp(from: sourceURL)
-                        self.printWithTid("downloadPatreonApp: completed at \(fileURL.path)")
-                    }
                     else
                     {
                         // Regular app
@@ -323,162 +314,6 @@ private extension DownloadAppOperation
                 self.printWithTid("download started: \(downloadURL)")
             }
         }
-        
-        func downloadPatreonApp(from patreonURL: URL) async throws -> URL
-        {
-            guard !UserDefaults.shared.skipPatreonDownloads else {
-                // Skip all hacks, take user straight to Patreon post.
-                return try await downloadFromPatreonPost()
-            }
-            
-            do
-            {
-                // User is pledged to this app, attempt to download.
-                
-                let fileURL = try await downloadFile(from: patreonURL)
-                return fileURL
-            }
-            catch URLError.noPermissionsToReadFile
-            {
-                guard let presentingViewController = self.context.presentingViewController else { throw OperationError.pledgeRequired(appName: self.appName) }
-                
-                // Attempt to sign-in again in case our Patreon session has expired.
-                try await withCheckedThrowingContinuation { continuation in
-                    PatreonAPI.shared.authenticate(presentingViewController: presentingViewController) { result in
-                        do
-                        {
-                            let account = try result.get()
-                            try account.managedObjectContext?.save()
-                            
-                            continuation.resume()
-                        }
-                        catch
-                        {
-                            continuation.resume(throwing: error)
-                        }
-                    }
-                }
-                
-                do
-                {
-                    // Success, so try to download once more now that we're definitely authenticated.
-                    
-                    let fileURL = try await downloadFile(from: patreonURL)
-                    return fileURL
-                }
-                catch URLError.noPermissionsToReadFile
-                {
-                    // We know authentication succeeded, so failure must mean user isn't patron/on the correct tier,
-                    // or that our hacky workaround for downloading Patreon attachments has failed.
-                    // Either way, taking them directly to the post serves as a decent fallback.
-                    
-                    return try await downloadFromPatreonPost()
-                }
-            }
-            
-            func downloadFromPatreonPost() async throws -> URL
-            {
-                guard let presentingViewController = self.context.presentingViewController else { throw OperationError.pledgeRequired(appName: self.appName) }
-                
-                let downloadURL: URL
-                
-                if let components = URLComponents(url: patreonURL, resolvingAgainstBaseURL: false),
-                   let postItem = components.queryItems?.first(where: { $0.name == "h" }),
-                   let postID = postItem.value,
-                   let patreonPostURL = URL(string: "https://www.patreon.com/posts/" + postID)
-                {
-                    downloadURL = patreonPostURL
-                }
-                else
-                {
-                    downloadURL = patreonURL
-                }
-                
-                return try await downloadFromPatreon(downloadURL, presentingViewController: presentingViewController)
-            }
-        }
-        
-        @MainActor
-        func downloadFromPatreon(_ patreonURL: URL, presentingViewController: UIViewController) async throws -> URL
-        {
-            let webViewController = WebViewController(url: patreonURL)
-            webViewController.delegate = self
-            webViewController.webView.navigationDelegate = self
-            
-            let navigationController = UINavigationController(rootViewController: webViewController)
-            presentingViewController.present(navigationController, animated: true)
-            
-            let downloadURL: URL
-            
-            do
-            {
-                defer {
-                    navigationController.dismiss(animated: true)
-                }
-                
-                downloadURL = try await withCheckedThrowingContinuation { continuation in
-                    self.downloadPatreonAppContinuation = continuation
-                }
-            }
-            
-            let fileURL = try await downloadFile(from: downloadURL)
-            return fileURL
-        }
-    }
-}
-
-extension DownloadAppOperation: WebViewControllerDelegate
-{
-    func webViewControllerDidFinish(_ webViewController: WebViewController)
-    {
-        guard let continuation = self.downloadPatreonAppContinuation else { return }
-        self.downloadPatreonAppContinuation = nil
-
-        continuation.resume(throwing: CancellationError())
-    }
-}
-
-extension DownloadAppOperation: WKNavigationDelegate
-{
-    func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction) async -> WKNavigationActionPolicy
-    {
-        guard #available(iOS 14.5, *), navigationAction.shouldPerformDownload else { return .allow }
-
-        guard let continuation = self.downloadPatreonAppContinuation else { return .allow }
-        self.downloadPatreonAppContinuation = nil
-
-        if let downloadURL = navigationAction.request.url
-        {
-            continuation.resume(returning: downloadURL)
-        }
-        else
-        {
-            continuation.resume(throwing: URLError(.badURL))
-        }
-
-        return .cancel
-    }
-
-    func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse) async -> WKNavigationResponsePolicy
-    {
-        // Called for Patreon attachments
-
-        guard !navigationResponse.canShowMIMEType else { return .allow }
-
-        guard let continuation = self.downloadPatreonAppContinuation else { return .allow }
-        self.downloadPatreonAppContinuation = nil
-
-        guard let response = navigationResponse.response as? HTTPURLResponse, let responseURL = response.url,
-              let mimeType = response.mimeType, let type = UTType(mimeType: mimeType),
-              type.conforms(to: .ipa) || type.conforms(to: .zip) || type.conforms(to: .application)
-        else {
-            continuation.resume(throwing: OperationError.invalidApp)
-            return .cancel
-        }
-
-        continuation.resume(returning: responseURL)
-
-        return .cancel
     }
 }
 

AltStore/Operations/EnableJITOperation.swift

@@ -8,9 +8,7 @@
 
 import UIKit
 import Combine
-import minimuxer
 import UniformTypeIdentifiers
-
 import AltStoreCore
 
 enum SideJITServerErrorType: Error {

AltStore/Operations/Errors/OperationError.swift

@@ -9,7 +9,6 @@
 import Foundation
 import AltSign
 import AltStoreCore
-import minimuxer
 
 extension OperationError
 {
@@ -201,7 +200,7 @@ struct OperationError: ALTLocalizedError {
         case .unknownResult: return NSLocalizedString("The operation returned an unknown result.", comment: "")
         case .timedOut: return NSLocalizedString("The operation timed out.", comment: "")
         case .notAuthenticated: return NSLocalizedString("You are not signed in.", comment: "")
-        case .unknownUDID: return NSLocalizedString("SideStore could not determine this device's UDID.", comment: "")
+        case .unknownUDID: return NSLocalizedString("SideStore could not determine this device's UDID. Please replace your pairing using iloader.", comment: "")
         case .invalidApp: return NSLocalizedString("The app is in an invalid format.", comment: "")
         case .maximumAppIDLimitReached: return NSLocalizedString("Cannot register more than 10 App IDs within a 7 day period.", comment: "")
         case .noSources: return NSLocalizedString("There are no SideStore sources.", comment: "")
@@ -220,16 +219,16 @@ struct OperationError: ALTLocalizedError {
         case .openAppFailed:
             let appName = self.appName ?? NSLocalizedString("The app", comment: "")
             return String(format: NSLocalizedString("SideStore was denied permission to launch %@.", comment: ""), appName)
-        case .noWiFi: return NSLocalizedString("You do not appear to be connected to WiFi and/or the WireGuard VPN!\nSideStore will never be able to install or refresh applications without WiFi and the WireGuard VPN.", comment: "")
-        case .tooNewError: return NSLocalizedString("iOS 17 has changed how JIT is enabled therefore SideStore cannot enable it without SideJITServer at this time, sorry for any inconvenience.\nWe will let everyone know once we have a solution!", comment: "")
-        case .unableToConnectSideJIT: return NSLocalizedString("Unable to connect to SideJITServer Please check that you are on the Same Wi-Fi and your Firewall has been set correctly", comment: "")
-        case .unableToRespondSideJITDevice: return NSLocalizedString("SideJITServer is unable to connect to your iDevice Please make sure you have paired your Device by doing 'SideJITServer -y' or try Refreshing SideJITServer from Settings", comment: "")
-        case .wrongSideJITIP: return NSLocalizedString("Incorrect SideJITServer IP Please make sure that you are on the Samw Wifi as SideJITServer", comment: "")
-        case .refreshsidejit: return NSLocalizedString("Unable to find App Please try Refreshing SideJITServer from Settings", comment: "")
-        case .anisetteV1Error: return NSLocalizedString("An error occurred when getting anisette data from a V1 server: %@. Try using another anisette server.", comment: "")
-        case .provisioningError: return NSLocalizedString("An error occurred when provisioning: %@ %@. Please try again. If the issue persists, report it on GitHub Issues!", comment: "")
-        case .anisetteV3Error: return NSLocalizedString("An error occurred when getting anisette data from a V3 server: %@. Please try again. If the issue persists, report it on GitHub Issues!", comment: "")
-        case .cacheClearError: return NSLocalizedString("An error occurred while clearing cache: %@", comment: "")
+        case .noWiFi: return NSLocalizedString("You do not appear to be connected to Wi-Fi and/or LocalDevVPN!\nSideStore cannot install or refresh applications without Wi-Fi and LocalDevVPN. If both are connected, replace your pairing with iloader.", comment: "")
+        case .tooNewError: return NSLocalizedString("iOS 17.0-17.3.1 changed how JIT is enabled so SideStore cannot enable JIT without SideJITServer on these versions, sorry for any inconvenience.", comment: "")
+        case .unableToConnectSideJIT: return NSLocalizedString("Unable to connect to SideJITServer. Please check that you are on the same Wi-Fi of and your Firewall has been set correctly on your server.", comment: "")
+        case .unableToRespondSideJITDevice: return NSLocalizedString("SideJITServer is unable to connect to your iDevice. Please make sure you have paired your iDevice by running 'SideJITServer -y', or try refreshing SideJITServer from Settings.", comment: "")
+        case .wrongSideJITIP: return NSLocalizedString("Incorrect SideJITServer IP. Please make sure that you are on the same Wi-Fi as SideJITServer", comment: "")
+        case .refreshsidejit: return NSLocalizedString("Unable to find app; Please try refreshing SideJITServer from Settings.", comment: "")
+        case .anisetteV1Error: return NSLocalizedString("An error occurred while getting anisette data from a V1 server: %@. Try using another anisette server.", comment: "")
+        case .provisioningError: return NSLocalizedString("An error occurred while provisioning: %@ %@. Please try again. If the issue persists, report it on GitHub Issues!", comment: "")
+        case .anisetteV3Error: return NSLocalizedString("An error occurred while getting anisette data from a V3 server: %@. Please try again. If the issue persists, report it on GitHub Issues!", comment: "")
+        case .cacheClearError: return NSLocalizedString("An error occurred while clearing the cache: %@", comment: "")
         case .SideJITIssue: return NSLocalizedString("An error occurred while using SideJIT: %@", comment: "")
             
         case .refreshAppFailed:
@@ -260,7 +259,7 @@ struct OperationError: ALTLocalizedError {
     var recoverySuggestion: String? {
         switch self.code
         {
-        case .noWiFi: return NSLocalizedString("Make sure the VPN is toggled on and you are connected to any WiFi network!", comment: "")
+        case .noWiFi: return NSLocalizedString("Make sure LocalDevVPN is connected and that you are connected to any Wi-Fi network!", comment: "")
         case .serverNotFound: return NSLocalizedString("Make sure you're on the same Wi-Fi network as a computer running AltServer, or try connecting this device to your computer via USB.", comment: "")
         case .maximumAppIDLimitReached:
             let baseMessage = NSLocalizedString("Delete sideloaded apps to free up App ID slots.", comment: "")
@@ -301,67 +300,3 @@ struct OperationError: ALTLocalizedError {
         }
     }
 }
-
-extension MinimuxerError: LocalizedError {
-    public var failureReason: String? {
-        switch self {
-        case .NoDevice:
-            return NSLocalizedString("Cannot fetch the device from the muxer", comment: "")
-        case .NoConnection:
-            return NSLocalizedString("Unable to connect to the device, make sure Wireguard is enabled and you're connected to WiFi. This could mean an invalid pairing.", comment: "")
-        case .PairingFile:
-            return NSLocalizedString("Invalid pairing file. Your pairing file either didn't have a UDID, or it wasn't a valid plist. Please use jitterbugpair to generate it", comment: "")
-            
-        case .CreateDebug:
-            return self.createService(name: "debug")
-        case .LookupApps:
-            return self.getFromDevice(name: "installed apps")
-        case .FindApp:
-            return self.getFromDevice(name: "path to the app")
-        case .BundlePath:
-            return self.getFromDevice(name: "bundle path")
-        case .MaxPacket:
-            return self.setArgument(name: "max packet")
-        case .WorkingDirectory:
-            return self.setArgument(name: "working directory")
-        case .Argv:
-            return self.setArgument(name: "argv")
-        case .LaunchSuccess:
-            return self.getFromDevice(name: "launch success")
-        case .Detach:
-            return NSLocalizedString("Unable to detach from the app's process", comment: "")
-        case .Attach:
-            return NSLocalizedString("Unable to attach to the app's process", comment: "")
-            
-        case .CreateInstproxy:
-            return self.createService(name: "instproxy")
-        case .CreateAfc:
-            return self.createService(name: "AFC")
-        case .RwAfc:
-            return NSLocalizedString("AFC was unable to manage files on the device. This usually means an invalid pairing.", comment: "")
-        case .InstallApp(let message):
-            return NSLocalizedString("Unable to install the app: \(message.toString())", comment: "")
-        case .UninstallApp:
-            return NSLocalizedString("Unable to uninstall the app", comment: "")
-
-        case .CreateMisagent:
-            return self.createService(name: "misagent")
-        case .ProfileInstall:
-            return NSLocalizedString("Unable to manage profiles on the device", comment: "")
-        case .ProfileRemove:
-            return NSLocalizedString("Unable to manage profiles on the device", comment: "")
-        }
-    }
-    
-    fileprivate func createService(name: String) -> String {
-        return String(format: NSLocalizedString("Cannot start a %@ server on the device.", comment: ""), name)
-    }
-    
-    fileprivate func getFromDevice(name: String) -> String {
-        return String(format: NSLocalizedString("Cannot fetch %@ from the device.", comment: ""), name)
-    }
-    
-    fileprivate func setArgument(name: String) -> String {
-        return String(format: NSLocalizedString("Cannot set %@ on the device.", comment: ""), name)
-    }
-}

AltStore/Operations/Errors/SourceError.swift

@@ -5,7 +5,6 @@
 //  Created by Riley Testut on 5/3/23.
 //  Copyright © 2023 Riley Testut. All rights reserved.
 //
-
 import AltStoreCore
 
 extension SourceError

AltStore/Operations/Errors/VerificationError.swift

@@ -5,7 +5,6 @@
 //  Created by Riley Testut on 5/11/23.
 //  Copyright © 2023 Riley Testut. All rights reserved.
 //
-
 import AltStoreCore
 import AltSign
 

AltStore/Operations/FetchAnisetteDataOperation.swift

@@ -9,7 +9,6 @@
 import Foundation
 import CommonCrypto
 import Starscream
-
 import AltStoreCore
 import AltSign
 import Roxas
@@ -198,7 +197,7 @@ final class FetchAnisetteDataOperation: ResultOperation<ALTAnisetteData>, WebSoc
                 let formatter = DateFormatter()
                 formatter.locale = Locale(identifier: "en_US_POSIX")
                 formatter.calendar = Calendar(identifier: .gregorian)
-                formatter.timeZone = TimeZone.current
+                formatter.timeZone = TimeZone.init(secondsFromGMT: 0)
                 formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
                 let dateString = formatter.string(from: Date())
                 formattedJSON["date"] = dateString

AltStore/Operations/FetchAppIDsOperation.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-
 import AltStoreCore
 import AltSign
 import Roxas

AltStore/Operations/FetchProvisioningProfilesOperation.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-
 import AltStoreCore
 import AltSign
 import Roxas
@@ -54,7 +53,8 @@ class FetchProvisioningProfilesOperation: ResultOperation<[String: ALTProvisioni
         Logger.sideload.notice("Fetching provisioning profiles for app \(self.context.bundleIdentifier, privacy: .public)...")
         
         self.progress.totalUnitCount = Int64(1 + app.appExtensions.count)
-        
+        let effectiveBundleId = self.context.bundleIdentifier
+
         self.prepareProvisioningProfile(for: app, parentApp: nil, team: team, session: session) { (result) in
             do
             {
@@ -62,25 +62,27 @@ class FetchProvisioningProfilesOperation: ResultOperation<[String: ALTProvisioni
                 
                 let profile = try result.get()
                 
-                var profiles = [app.bundleIdentifier: profile]
+                var profiles = [effectiveBundleId: profile]
                 var error: Error?
                 
                 let dispatchGroup = DispatchGroup()
                 
-                for appExtension in app.appExtensions
-                {
-                    dispatchGroup.enter()
-                    
-                    self.prepareProvisioningProfile(for: appExtension, parentApp: app, team: team, session: session) { (result) in
-                        switch result
-                        {
-                        case .failure(let e): error = e
-                        case .success(let profile): profiles[appExtension.bundleIdentifier] = profile
+                if !self.context.useMainProfile {
+                    for appExtension in app.appExtensions
+                    {
+                        dispatchGroup.enter()
+                        
+                        self.prepareProvisioningProfile(for: appExtension, parentApp: app, team: team, session: session) { (result) in
+                            switch result
+                            {
+                            case .failure(let e): error = e
+                            case .success(let profile): profiles[appExtension.bundleIdentifier] = profile
+                            }
+                            
+                            dispatchGroup.leave()
+                            
+                            self.progress.completedUnitCount += 1
                         }
-                        
-                        dispatchGroup.leave()
-                        
-                        self.progress.completedUnitCount += 1
                     }
                 }
                 
@@ -218,19 +220,30 @@ extension FetchProvisioningProfilesOperation
                 // Or, if the app _is_ installed but with a different team, we need to create a new
                 // bundle identifier anyway to prevent collisions with the previous team.
                 let parentBundleID = parentApp?.bundleIdentifier ?? app.bundleIdentifier
+                let effectiveParentBundleID = self.context.bundleIdentifier
+
                 let updatedParentBundleID: String
-                
+
                 if app.isAltStoreApp
                 {
                     // Use legacy bundle ID format for AltStore (and its extensions).
-                    updatedParentBundleID = parentBundleID + "." + team.identifier // Append just team identifier to make it harder to track.
+                    updatedParentBundleID = effectiveParentBundleID + "." + team.identifier // Append just team identifier to make it harder to track.
                 }
                 else
                 {
-                    updatedParentBundleID = parentBundleID + "." + team.identifier // Append just team identifier to make it harder to track.
+                    updatedParentBundleID = effectiveParentBundleID + "." + team.identifier // Append just team identifier to make it harder to track.
+                }
+
+                if let parentApp = parentApp,
+                   app.bundleIdentifier.hasPrefix(parentBundleID + ".")
+                {
+                    let suffix = String(app.bundleIdentifier.dropFirst(parentBundleID.count))
+                    bundleID = updatedParentBundleID + suffix
+                }
+                else
+                {
+                    bundleID = updatedParentBundleID
                 }
-                
-                bundleID = app.bundleIdentifier.replacingOccurrences(of: parentBundleID, with: updatedParentBundleID)
             }
             
             let preferredName: String

AltStore/Operations/FetchSourceOperation.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import CoreData
-
 import AltStoreCore
 import Roxas
 import SemanticVersion
@@ -171,13 +170,7 @@ final class FetchSourceOperation: ResultOperation<Source>
                     
                     let identifier = source.identifier
                     
-                    if identifier == Source.altStoreIdentifier, let skipPatreonDownloads = source.userInfo?[.skipPatreonDownloads]
-                    {
-                        UserDefaults.shared.skipPatreonDownloads = (skipPatreonDownloads == "true")
-                    }
-                    
                     try self.verify(source, response: response)
-                    try self.verifyPledges(for: source, in: childContext)
                     
                     try childContext.save()
                     
@@ -264,63 +257,6 @@ private extension FetchSourceOperation
         }
     }
     
-    func verifyPledges(for source: Source, in context: NSManagedObjectContext) throws
-    {
-        guard let patreonURL = source.patreonURL, let patreonAccount = DatabaseManager.shared.patreonAccount(in: context) else { return }
-        
-        let normalizedPatreonURL = try patreonURL.normalized()
-        
-        guard let pledge = patreonAccount.pledges.first(where: { pledge in
-            do
-            {
-                let normalizedCampaignURL = try pledge.campaignURL.normalized()
-                return normalizedCampaignURL == normalizedPatreonURL
-            }
-            catch
-            {
-                Logger.main.error("Failed to normalize Patreon URL \(pledge.campaignURL, privacy: .public). \(error.localizedDescription, privacy: .public)")
-                return false
-            }
-        }) else { return }
-        
-        // User is pledged to this source's Patreon, so check which apps they're pledged to.
-        
-        // We only assign `isPledged = true` because false is already the default,
-        // and only one check needs to be true for isPledged to be true.
-        
-        for app in source.apps where app.isPledgeRequired
-        {
-            if let requiredAppPledge = app.pledgeAmount
-            {
-                if pledge.amount >= requiredAppPledge
-                {
-                    app.isPledged = true
-                    continue
-                }
-            }
-            
-            if let tierIDs = app._tierIDs
-            {
-                let tier = pledge.tiers.first { tierIDs.contains($0.identifier) }
-                if tier != nil
-                {
-                    app.isPledged = true
-                    continue
-                }
-            }
-                                
-            if let rewardID = app._rewardID
-            {
-                let reward = pledge.rewards.first { $0.identifier == rewardID }
-                if reward != nil
-                {
-                    app.isPledged = true
-                    continue
-                }
-            }
-        }
-    }
-    
     func verifySourceNotBlocked(_ source: Source, response: URLResponse?) throws
     {
         guard let blockedSources = UserDefaults.shared.blockedSources else { return }

AltStore/Operations/FetchTrustedSourcesOperation.swift

@@ -1,65 +0,0 @@
-//
-//  FetchTrustedSourcesOperation.swift
-//  AltStore
-//
-//  Created by Riley Testut on 4/13/22.
-//  Copyright © 2022 Riley Testut. All rights reserved.
-//
-
-import Foundation
-
-private extension URL
-{
-    #if STAGING
-    static let trustedSources = URL(string: "https://raw.githubusercontent.com/SideStore/SideStore/develop/trustedapps.json")!
-    #else
-    static let trustedSources = URL(string: "https://raw.githubusercontent.com/SideStore/SideStore/develop/trustedapps.json")!
-    #endif
-}
-
-extension FetchTrustedSourcesOperation
-{
-    struct TrustedSource: Decodable
-    {
-        var identifier: String
-        var sourceURL: URL?
-    }
-    
-    private struct Response: Decodable
-    {
-        var version: Int
-        var sources: [FetchTrustedSourcesOperation.TrustedSource]
-    }
-}
-
-final class FetchTrustedSourcesOperation: ResultOperation<[FetchTrustedSourcesOperation.TrustedSource]>
-{
-    override func main()
-    {
-        super.main()
-        
-        let dataTask = URLSession.shared.dataTask(with: .trustedSources) { (data, response, error) in
-            do
-            {
-                if let response = response as? HTTPURLResponse
-                {
-                    guard response.statusCode != 404 else {
-                        self.finish(.failure(URLError(.fileDoesNotExist, userInfo: [NSURLErrorKey: URL.trustedSources])))
-                        return
-                    }
-                }
-                
-                guard let data = data else { throw error! }
-                
-                let response = try Foundation.JSONDecoder().decode(Response.self, from: data)
-                self.finish(.success(response.sources))
-            }
-            catch
-            {
-                self.finish(.failure(error))
-            }
-        }
-        
-        dataTask.resume()
-    }
-}

AltStore/Operations/InstallAppOperation.swift

@@ -7,11 +7,11 @@
 //
 import Foundation
 import Network
-
 import AltStoreCore
 import AltSign
 import Roxas
-import minimuxer
+
+let shortcutURLonDelay = URL(string: "shortcuts://run-shortcut?name=TurnOnDataDelay")!
 
 @objc(InstallAppOperation)
 final class InstallAppOperation: ResultOperation<InstalledApp>
@@ -72,6 +72,8 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
             }
             
             installedApp.update(resignedApp: resignedApp, certificateSerialNumber: certificate.serialNumber, storeBuildVersion: storeBuildVersion)
+            installedApp.useMainProfile = self.context.useMainProfile
+
             installedApp.needsResign = false
             
             if let team = DatabaseManager.shared.activeTeam(in: backgroundContext)
@@ -96,22 +98,22 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
                     let resignedParentBundleID = resignedApp.bundleIdentifier
                     
                     let resignedBundleID = appExtension.bundleIdentifier
-                    let originalBundleID = resignedBundleID.replacingOccurrences(of: resignedParentBundleID, with: parentBundleID)
+                    let appExBundleID = resignedBundleID.replacingOccurrences(of: resignedParentBundleID, with: parentBundleID)
                     
                     print("`parentBundleID`: \(parentBundleID)")
                     print("`resignedParentBundleID`: \(resignedParentBundleID)")
-                    print("`resignedBundleID`: \(resignedBundleID)")
-                    print("`originalBundleID`: \(originalBundleID)")
+                    print("`appExBundleID`: \(appExBundleID)")
+                    print("`resignedAppExBundleID`: \(resignedBundleID)")
                     
                     let installedExtension: InstalledExtension
                     
-                    if let appExtension = installedApp.appExtensions.first(where: { $0.bundleIdentifier == originalBundleID })
+                    if let appExtension = installedApp.appExtensions.first(where: { $0.bundleIdentifier == appExBundleID })
                     {
                         installedExtension = appExtension
                     }
                     else
                     {
-                        installedExtension = InstalledExtension(resignedAppExtension: appExtension, originalBundleIdentifier: originalBundleID, context: backgroundContext)
+                        installedExtension = InstalledExtension(resignedAppExtension: appExtension, originalBundleIdentifier: appExBundleID, context: backgroundContext)
                     }
                     
                     installedExtension.update(resignedAppExtension: appExtension)
@@ -176,6 +178,13 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
             
             var installing = true
             if installedApp.storeApp?.bundleIdentifier.range(of: Bundle.Info.appbundleIdentifier) != nil {
+                do {
+                    // we need to flush changes to the disk now in case the changes are lost when iOS kills current process
+                    try installedApp.managedObjectContext?.save()
+                } catch {
+                    print("Failed to flush installedApp to disk: \(error)")
+                }
+                
                 // Reinstalling ourself will hang until we leave the app, so we need to exit it without force closing
                 DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
                     if UIApplication.shared.applicationState != .active {
@@ -204,6 +213,10 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
                             let alert = UIAlertController(title: "Finish Refresh", message: "Please reopen SideStore after the process is finished.To finish refreshing, SideStore must be moved to the background. To do this, you can either go to the Home Screen manually or by hitting Continue. Please reopen SideStore after doing this.", preferredStyle: .alert)
                             alert.addAction(UIAlertAction(title: NSLocalizedString("Continue", comment: ""), style: .default, handler: { _ in
                                 print("Going home")
+                                // Cell Shortcut
+                                UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in
+                                    print("Cell OFF Shortcut finished execution.")}
+                                    
                                 UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
                             }))
 
@@ -220,12 +233,14 @@ final class InstallAppOperation: ResultOperation<InstalledApp>
                             }
                         }
                     }
+                    // Cell Shortcut
+                    UIApplication.shared.open(shortcutURLonDelay, options: [:]) { _ in print("Cell OFF Shortcut finished execution.")}
                     UIApplication.shared.perform(#selector(NSXPCConnection.suspend))
                 }
             }
             
             do {
-                try install_ipa(installedApp.bundleIdentifier)
+                try installIPA(installedApp.bundleIdentifier)
                 installing = false
                 installedApp.refreshedDate = Date()
                 self.finish(.success(installedApp))

AltStore/Operations/OperationContexts.swift

@@ -9,7 +9,6 @@
 import Foundation
 import CoreData
 import Network
-
 import AltStoreCore
 import AltSign
 
@@ -66,6 +65,8 @@ class AppOperationContext
     
     var app: ALTApplication?
     var provisioningProfiles: [String: ALTProvisioningProfile]?
+    var appexBundleIds: [String: String]?
+    var useMainProfile = false
     
     var isFinished = false
     

AltStore/Operations/Patch App/PatchAppOperation.swift

@@ -10,7 +10,6 @@ import UIKit
 import Combine
 import AppleArchive
 import System
-
 import AltStoreCore
 import AltSign
 import Roxas
@@ -212,7 +211,6 @@ private extension PatchAppOperation
             #if targetEnvironment(simulator)
             throw PatchAppError.unsupportedOperatingSystemVersion(ProcessInfo.processInfo.operatingSystemVersion)
             #else
-            
             let spotlightPath = "Applications/Spotlight.app/Spotlight"
             let spotlightFileURL = self.patchDirectory.appendingPathComponent(spotlightPath)
             

AltStore/Operations/Patch App/PatchViewController.swift

@@ -8,7 +8,6 @@
 
 import UIKit
 import Combine
-
 import AltStoreCore
 import AltSign
 import Roxas

AltStore/Operations/RefreshAppOperation.swift

@@ -7,11 +7,9 @@
 //
 
 import Foundation
-
 import AltStoreCore
 import AltSign
 import Roxas
-import minimuxer
 
 @objc(RefreshAppOperation)
 final class RefreshAppOperation: ResultOperation<InstalledApp>
@@ -48,8 +46,8 @@ final class RefreshAppOperation: ResultOperation<InstalledApp>
 
             for p in profiles {
                 do {
-                    let bytes = p.value.data.toRustByteSlice()
-                    try install_provisioning_profile(bytes.forRust())
+                    let bytes =
+                    try installProvisioningProfiles(p.value.data)
                 } catch {
                     self.finish(.failure(MinimuxerError.ProfileInstall))
                 }

AltStore/Operations/RefreshGroup.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import CoreData
-
 import AltStoreCore
 import AltSign
 

AltStore/Operations/RemoveAppBackupOperation.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-
 import AltStoreCore
 
 @objc(RemoveAppBackupOperation)

AltStore/Operations/RemoveAppExtensionsOperation.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-
 import AltStoreCore
 import Roxas
 import AltSign
@@ -136,7 +135,11 @@ final class RemoveAppExtensionsOperation: ResultOperation<Void>
         alertController.addAction(UIAlertAction(title: UIAlertAction.cancel.title, style: UIAlertAction.cancel.style, handler: { (action) in
             self.finish(.failure(OperationError.cancelled))
         }))
-        alertController.addAction(UIAlertAction(title: NSLocalizedString("Keep App Extensions", comment: ""), style: .default) { (action) in
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("Keep App Extensions (Use Main Profile)", comment: ""), style: .default) { (action) in
+            self.context.useMainProfile = true
+            self.finish(.success(()))
+        })
+        alertController.addAction(UIAlertAction(title: NSLocalizedString("Keep App Extensions (Register App ID for Each Extension)", comment: ""), style: .default) { (action) in
             self.finish(.success(()))
         })
         alertController.addAction(UIAlertAction(title: NSLocalizedString("Remove App Extensions", comment: ""), style: .destructive) { (action) in

AltStore/Operations/RemoveAppOperation.swift

@@ -7,9 +7,7 @@
 //
 
 import Foundation
-
 import AltStoreCore
-import minimuxer
 
 @objc(RemoveAppOperation)
 final class RemoveAppOperation: ResultOperation<InstalledApp>
@@ -43,7 +41,7 @@ final class RemoveAppOperation: ResultOperation<InstalledApp>
             let resignedBundleIdentifier = installedApp.resignedBundleIdentifier
             
             do {
-                try remove_app(resignedBundleIdentifier)
+                try removeApp(resignedBundleIdentifier)
             } catch {
                 return self.finish(.failure(error))
             }

AltStore/Operations/ResignAppOperation.swift

@@ -8,10 +8,8 @@
 
 import Foundation
 import Roxas
-
 import AltStoreCore
 import AltSign
-import minimuxer
 
 @objc(ResignAppOperation)
 final class ResignAppOperation: ResultOperation<ALTApplication>
@@ -55,7 +53,8 @@ final class ResignAppOperation: ResultOperation<ALTApplication>
         let prepareAppProgress = Progress.discreteProgress(totalUnitCount: 2)
         self.progress.addChild(prepareAppProgress, withPendingUnitCount: 3)
         
-        let prepareAppBundleProgress = self.prepareAppBundle(for: app, profiles: profiles) { (result) in
+        let effectiveBundleId = self.context.bundleIdentifier
+        let prepareAppBundleProgress = self.prepareAppBundle(for: app, profiles: profiles, appexBundleIds: context.appexBundleIds ?? [:]) { (result) in
             guard let appBundleURL = self.process(result) else { return }
             
             // Resign app bundle
@@ -65,7 +64,13 @@ final class ResignAppOperation: ResultOperation<ALTApplication>
                 // Finish
                 do
                 {
-                    let destinationURL = InstalledApp.refreshedIPAURL(for: app)
+                    let updatedApp = AnyApp(
+                        name: app.name,
+                        bundleIdentifier: effectiveBundleId,
+                        url: app.fileURL,
+                        storeApp: app.storeApp
+                    )
+                    let destinationURL = InstalledApp.refreshedIPAURL(for: updatedApp)
                     try FileManager.default.copyItem(at: resignedURL, to: destinationURL, shouldReplace: true)
                     print("Successfully resigned app to \(destinationURL.absoluteString)")
                     
@@ -107,22 +112,26 @@ final class ResignAppOperation: ResultOperation<ALTApplication>
 
 private extension ResignAppOperation
 {
-    func prepareAppBundle(for app: ALTApplication, profiles: [String: ALTProvisioningProfile], completionHandler: @escaping (Result<URL, Error>) -> Void) -> Progress
+    func prepareAppBundle(for app: ALTApplication, profiles: [String: ALTProvisioningProfile], appexBundleIds: [String: String], completionHandler: @escaping (Result<URL, Error>) -> Void) -> Progress
     {
         let progress = Progress.discreteProgress(totalUnitCount: 1)
-        
-        let bundleIdentifier = app.bundleIdentifier
+
+        let bundleIdentifier = context.bundleIdentifier
         let openURL = InstalledApp.openAppURL(for: app)
-        
         let fileURL = app.fileURL
-        
-        func prepare(_ bundle: Bundle, additionalInfoDictionaryValues: [String: Any] = [:]) throws
+
+        func prepare(_ bundle: Bundle, bundleID identifier: String?, additionalInfoDictionaryValues: [String: Any] = [:]) throws
         {
-            guard let identifier = bundle.bundleIdentifier else { throw ALTError(.missingAppBundle) }
-            guard let profile = profiles[identifier] else { throw ALTError(.missingProvisioningProfile) }
+            guard let identifier else { throw ALTError(.missingAppBundle) }
+            guard let profile = context.useMainProfile ? profiles.values.first : profiles[identifier] else { throw ALTError(.missingProvisioningProfile) }
             guard var infoDictionary = bundle.completeInfoDictionary else { throw ALTError(.missingInfoPlist) }
             
-            infoDictionary[kCFBundleIdentifierKey as String] = profile.bundleIdentifier
+            if let forcedBundleIdentifier = appexBundleIds[identifier] {
+                infoDictionary[kCFBundleIdentifierKey as String] = forcedBundleIdentifier
+            } else {
+                infoDictionary[kCFBundleIdentifierKey as String] = profile.bundleIdentifier
+            }
+
             infoDictionary[Bundle.Info.altBundleID] = identifier
             infoDictionary[Bundle.Info.devicePairingString] = "<insert pairing file here>"
             infoDictionary.removeValue(forKey: "DTXcode")
@@ -193,7 +202,7 @@ private extension ResignAppOperation
                 if app.isAltStoreApp
                 {
                     guard let udid = fetch_udid()?.toString() as? String else { throw OperationError.unknownUDID }
-                    guard let pairingFileString = Bundle.main.object(forInfoDictionaryKey: Bundle.Info.devicePairingString) as? String else { throw OperationError.unknownUDID }                    
+                    guard Bundle.main.object(forInfoDictionaryKey: Bundle.Info.devicePairingString) is String else { throw OperationError.unknownUDID }
                     additionalValues[Bundle.Info.devicePairingString] = "<insert pairing file here>"
                     additionalValues[Bundle.Info.deviceID] = udid
                     additionalValues[Bundle.Info.serverID] = UserDefaults.standard.preferredServerID
@@ -213,7 +222,7 @@ private extension ResignAppOperation
                         // The embedded certificate + certificate identifier are already in app bundle, no need to update them.
                     }
                 }
-                else if infoDictionary.keys.contains(Bundle.Info.deviceID), let udid = fetch_udid()?.toString() as? String
+                else if infoDictionary.keys.contains(Bundle.Info.deviceID), let udid = fetchUDID()
                 {
                     // There is an ALTDeviceID entry, so assume the app is using AltKit and replace it with the device's UDID.
                     additionalValues[Bundle.Info.deviceID] = udid
@@ -237,7 +246,7 @@ private extension ResignAppOperation
                 }
                 
                 // Prepare app
-                try prepare(appBundle, additionalInfoDictionaryValues: additionalValues)
+                try prepare(appBundle, bundleID: bundleIdentifier, additionalInfoDictionaryValues: additionalValues)
                 try self.removeMissingAppExtensionReferences(from: appBundle)
                 
                 if let directory = appBundle.builtInPlugInsURL, let enumerator = FileManager.default.enumerator(at: directory, includingPropertiesForKeys: nil, options: [.skipsSubdirectoryDescendants])
@@ -254,7 +263,8 @@ private extension ResignAppOperation
                         #endif
                         
                         guard let appExtension = Bundle(url: fileURL) else { throw ALTError(.missingAppBundle) }
-                        try prepare(appExtension)
+                        let updatedAppExBundleId = appExtension.bundleIdentifier?.replacingOccurrences(of: app.bundleIdentifier, with: bundleIdentifier)
+                        try prepare(appExtension, bundleID: updatedAppExBundleId)
                     }
                 }
                 

AltStore/Operations/SendAppOperation.swift

@@ -7,9 +7,7 @@
 //
 import Foundation
 import Network
-
 import AltStoreCore
-import minimuxer
 
 @objc(SendAppOperation)
 final class SendAppOperation: ResultOperation<()>
@@ -27,39 +25,48 @@ final class SendAppOperation: ResultOperation<()>
         self.progress.totalUnitCount = 1
     }
     
-    override func main()
-    {
+    override func main() {
         super.main()
-        
-        if let error = self.context.error
-        {
+
+        if let error = self.context.error {
             return self.finish(.failure(error))
         }
-        
+
         guard let resignedApp = self.context.resignedApp else {
             return self.finish(.failure(OperationError.invalidParameters("SendAppOperation.main: self.resignedApp is nil")))
         }
-                
-        // self.context.resignedApp.fileURL points to the app bundle, but we want the .ipa.
+
+        let shortcutURLoff = URL(string: "shortcuts://run-shortcut?name=TurnOffData")!
+
         let app = AnyApp(name: resignedApp.name, bundleIdentifier: self.context.bundleIdentifier, url: resignedApp.fileURL, storeApp: nil)
         let fileURL = InstalledApp.refreshedIPAURL(for: app)
-        
         print("AFC App `fileURL`: \(fileURL.absoluteString)")
-        
-        if let data = NSData(contentsOf: fileURL) {
-            do {
-                let bytes = Data(data).toRustByteSlice()
-                try yeet_app_afc(app.bundleIdentifier, bytes.forRust())
-                self.progress.completedUnitCount += 1
-                self.finish(.success(()))
-            } catch {
-                self.finish(.failure(MinimuxerError.RwAfc))
-                self.progress.completedUnitCount += 1
-                self.finish(.success(()))
+
+        // Wait for Shortcut to Finish Before Proceeding
+        UIApplication.shared.open(shortcutURLoff, options: [:]) { _ in
+            print("Shortcut finished execution. Proceeding with file transfer.")
+
+            DispatchQueue.global().async {
+                self.processFile(at: fileURL, for: app.bundleIdentifier)
             }
-        } else {
+        }
+    }
+
+    private func processFile(at fileURL: URL, for bundleIdentifier: String) {
+        guard let data = NSData(contentsOf: fileURL) else {
             print("IPA doesn't exist????")
-            self.finish(.failure(OperationError(.appNotFound(name: resignedApp.name))))
+            return self.finish(.failure(OperationError(.appNotFound(name: bundleIdentifier))))
+        }
+
+        do {
+            let bytes = Data(data)
+            try yeetAppAFC(bundleIdentifier, bytes)
+            self.progress.completedUnitCount += 1
+            self.finish(.success(()))
+        } catch {
+            self.finish(.failure(MinimuxerError.RwAfc))
+            self.progress.completedUnitCount += 1
+            self.finish(.success(()))
         }
     }
 }

AltStore/Operations/UpdateKnownSourcesOperation.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-
 import AltStoreCore
 
 private extension URL

AltStore/Operations/UpdatePatronsOperation.swift

@@ -1,108 +0,0 @@
-//
-//  UpdatePatronsOperation.swift
-//  AltStore
-//
-//  Created by Riley Testut on 4/11/22.
-//  Copyright © 2022 Riley Testut. All rights reserved.
-//
-
-import Foundation
-import CoreData
-
-import AltStoreCore
-
-private extension URL
-{
-    #if STAGING
-    static let patreonInfo = URL(string: "https://f000.backblazeb2.com/file/altstore-staging/altstore/patreon.json")!
-    #else
-    static let patreonInfo = URL(string: "https://cdn.altstore.io/file/altstore/altstore/patreon.json")!
-    #endif
-}
-
-extension UpdatePatronsOperation
-{
-    private struct Response: Decodable
-    {
-        var version: Int
-        var accessToken: String
-        var refreshID: String
-    }
-}
-
-final class UpdatePatronsOperation: ResultOperation<Void>
-{
-    let context: NSManagedObjectContext
-    
-    init(context: NSManagedObjectContext = DatabaseManager.shared.persistentContainer.newBackgroundContext())
-    {
-        self.context = context
-    }
-    
-    override func main()
-    {
-        super.main()
-        
-        let dataTask = URLSession.shared.dataTask(with: .patreonInfo) { (data, response, error) in
-            do
-            {
-                if let response = response as? HTTPURLResponse
-                {
-                    guard response.statusCode != 404 else {
-                        self.finish(.failure(URLError(.fileDoesNotExist, userInfo: [NSURLErrorKey: URL.patreonInfo])))
-                        return
-                    }
-                }
-                
-                guard let data = data else { throw error! }
-                
-                let response = try AltStoreCore.JSONDecoder().decode(Response.self, from: data)
-                Keychain.shared.patreonCreatorAccessToken = response.accessToken
-                
-                let previousRefreshID = UserDefaults.shared.patronsRefreshID
-                guard response.refreshID != previousRefreshID else {
-                    self.finish(.success(()))
-                    return
-                }
-                
-                PatreonAPI.shared.fetchPatrons { (result) in
-                    self.context.perform {
-                        do
-                        {
-                            let patrons = try result.get()
-                            let managedPatrons = patrons.compactMap { ManagedPatron(patron: $0, context: self.context) }
-                            
-                            let patronIDs = Set(managedPatrons.map { $0.identifier })
-                            let nonFriendZonePredicate = NSPredicate(format: "NOT (%K IN %@)", #keyPath(ManagedPatron.identifier), patronIDs)
-                            
-                            let nonFriendZonePatrons = ManagedPatron.all(satisfying: nonFriendZonePredicate, in: self.context)
-                            for managedPatron in nonFriendZonePatrons
-                            {
-                                self.context.delete(managedPatron)
-                            }
-                            
-                            try self.context.save()
-                            
-                            UserDefaults.shared.patronsRefreshID = response.refreshID
-                            
-                            self.finish(.success(()))
-                            
-                            Logger.main.notice("Updated Friend Zone Patrons! Refresh ID: \(response.refreshID, privacy: .public)")
-                        }
-                        catch let error as NSError
-                        {
-                            Logger.main.error("Failed to update Friend Zone Patrons. \(error.localizedDebugDescription ?? error.localizedDescription, privacy: .public)")
-                            self.finish(.failure(error))
-                        }
-                    }
-                }
-            }
-            catch
-            {
-                self.finish(.failure(error))
-            }
-        }
-        
-        dataTask.resume()
-    }
-}

AltStore/Operations/VerifyAppOperation.swift

@@ -8,7 +8,6 @@
 
 import Foundation
 import CryptoKit
-
 import AltStoreCore
 import AltSign
 import Roxas
@@ -38,11 +37,13 @@ final class VerifyAppOperation: ResultOperation<Void>
 {
     let permissionsMode: PermissionReviewMode
     let context: InstallAppOperationContext
+    var customBundleId: String?
     
-    init(permissionsMode: PermissionReviewMode, context: InstallAppOperationContext)
+    init(permissionsMode: PermissionReviewMode, context: InstallAppOperationContext, customBundleId: String? = nil)
     {
         self.permissionsMode = permissionsMode
         self.context = context
+        self.customBundleId = customBundleId
         
         super.init()
     }
@@ -65,7 +66,8 @@ final class VerifyAppOperation: ResultOperation<Void>
             }
             
             if !["ny.litritt.ignited", "com.litritt.ignited"].contains(where: { $0 == app.bundleIdentifier }) {
-                guard app.bundleIdentifier == self.context.bundleIdentifier else {
+                let bundleId = customBundleId ?? app.bundleIdentifier
+                guard bundleId == self.context.bundleIdentifier else {
                     throw VerificationError.mismatchedBundleIdentifiers(sourceBundleID: self.context.bundleIdentifier, app: app)
                 }
             }

AltStore/Operations/VerifyAppPledgeOperation.swift

@@ -1,281 +0,0 @@
-//
-//  VerifyAppPledgeOperation.swift
-//  AltStore
-//
-//  Created by Riley Testut on 12/6/23.
-//  Copyright © 2023 Riley Testut. All rights reserved.
-//
-
-import Combine
-
-import AltStoreCore
-
-class VerifyAppPledgeOperation: ResultOperation<Void>
-{
-    @AsyncManaged
-    private(set) var storeApp: StoreApp
-    
-    private let presentingViewController: UIViewController?
-    private var openPatreonPageContinuation: CheckedContinuation<Void, Never>?
-    
-    private var cancellable: AnyCancellable?
-    
-    init(storeApp: StoreApp, presentingViewController: UIViewController?)
-    {
-        self.storeApp = storeApp
-        self.presentingViewController = presentingViewController
-    }
-    
-    override func main()
-    {
-        super.main()
-        
-        // _Don't_ rethrow earlier errors, or else user will only be taken to Patreon post if connected to same Wi-Fi as AltServer.
-        // if let error = self.context.error
-        // {
-        //     self.finish(.failure(error))
-        //     return
-        // }
-        
-        Task<Void, Never>.detached(priority: .medium) {
-            do
-            {
-                guard await self.$storeApp.isPledgeRequired else { return self.finish(.success(())) }
-                
-                if let presentingViewController = self.presentingViewController
-                {
-                    // Ask user to connect Patreon account if they are signed-in to Patreon inside WebViewController, but haven't yet signed in through AltStore settings.
-                    // This is most likely because the user joined a Patreon campaign directly through WebViewController before connecting Patreon account in settings.
-                    try await self.connectPatreonAccountIfNeeded(presentingViewController: presentingViewController)
-                }
-                
-                do
-                {
-                    try await self.verifyPledge()
-                }
-                catch let error as OperationError where error.code == .pledgeRequired || error.code == .pledgeInactive
-                {
-                    guard 
-                        let presentingViewController = self.presentingViewController,
-                        let source = await self.$storeApp.source,
-                        let patreonURL = await self.$storeApp.perform({ _ in source.patreonURL })
-                    else { throw error }
-                    
-                    let components = URLComponents(url: patreonURL, resolvingAgainstBaseURL: false)
-                    let lastPathComponent = components?.path.components(separatedBy: "/").last
-                    
-                    let username = lastPathComponent ?? patreonURL.lastPathComponent
-                    
-                    let checkoutURL: URL
-                    if await self.$storeApp.prefersCustomPledge, let customPledgeURL = URL(string: "https://www.patreon.com/checkout/" + username + "?rid=0&custom=1")
-                    {
-                        checkoutURL = customPledgeURL
-                        
-                        let action = await UIAlertAction(title: NSLocalizedString("Continue", comment: ""), style: .default)
-                        try await presentingViewController.presentConfirmationAlert(title: NSLocalizedString("Custom Pledge", comment: ""),
-                                                                                message: NSLocalizedString("This app supports custom pledges. Pledge any amount on Patreon to receive access.", comment: ""),
-                                                                                primaryAction: action)
-                    }
-                    else if !username.isEmpty, let url = URL(string: "https://www.patreon.com/join/" + username)
-                    {
-                        // Prefer /join URL over campaign homepage.
-                        // URL format from https://support.patreon.com/hc/en-us/articles/360044376211-Managing-members-with-custom-pledges
-                        checkoutURL = url
-                    }
-                    else
-                    {
-                        checkoutURL = patreonURL
-                    }
-                    
-                    // Direct user to Patreon page if they're not already pledged.
-                    await self.openPatreonPage(checkoutURL, presentingViewController: presentingViewController)
-                                        
-                    let context = DatabaseManager.shared.persistentContainer.newBackgroundContext()
-                    if let patreonAccount = await context.performAsync({ DatabaseManager.shared.patreonAccount(in: context) })
-                    {
-                        // Patreon account is connected, so we'll update it via API to see if pledges changed.
-                        // If so, we'll re-fetch the source to update pledge statuses.
-                        try await self.updatePledges(for: source, account: patreonAccount)
-                    }
-                    else
-                    {
-                        // Patreon account is not connected, so prompt user to connect it.
-                        try await self.connectPatreonAccountIfNeeded(presentingViewController: presentingViewController)
-                    }
-                    
-                    do
-                    {
-                        try await self.verifyPledge()
-                    }
-                    catch
-                    {
-                        // Ignore error, but cancel remainder of operation.
-                        throw CancellationError()
-                    }
-                }
-                
-                self.finish(.success(()))
-            }
-            catch
-            {
-                self.finish(.failure(error))
-            }
-        }
-    }
-}
-
-private extension VerifyAppPledgeOperation
-{
-    func verifyPledge() async throws
-    {
-        let (appName, isPledged) = await self.$storeApp.perform { ($0.name, $0.isPledged) }
-        
-        if !PatreonAPI.shared.isAuthenticated || !isPledged
-        {
-            let isInstalled = await self.$storeApp.installedApp != nil
-            if isInstalled
-            {
-                // Assume if there is an InstalledApp, the user had previously pledged to this app.
-                throw OperationError.pledgeInactive(appName: appName)
-            }
-            else
-            {
-                throw OperationError.pledgeRequired(appName: appName)
-            }
-        }
-    }
-    
-    func connectPatreonAccountIfNeeded(presentingViewController: UIViewController) async throws
-    {
-        guard !PatreonAPI.shared.isAuthenticated, let authCookie = PatreonAPI.shared.authCookies.first(where: { $0.name.lowercased() == "session_id" }) else { return }
-        
-        Logger.sideload.debug("Patreon Auth cookie: \(authCookie.name)=\(authCookie.value)")
-        
-        let message = NSLocalizedString("You're signed into Patreon but haven't connected your account with SideStore.\n\nPlease connect your account to download Patreon-exclusive apps.", comment: "")
-        let action = await UIAlertAction(title: NSLocalizedString("Connect Patreon Account", comment: ""), style: .default)
-        
-        do
-        {
-            _ = try await presentingViewController.presentConfirmationAlert(title: NSLocalizedString("Patreon Account Detected", comment: ""),
-                                                                            message: message, actions: [action])
-        }
-        catch
-        {
-            // Ignore and continue
-            return
-        }
-        
-        try await withCheckedThrowingContinuation { continuation in
-            PatreonAPI.shared.authenticate(presentingViewController: presentingViewController) { result in
-                do
-                {
-                    let account = try result.get()
-                    try account.managedObjectContext?.save()
-                    
-                    continuation.resume()
-                }
-                catch
-                {
-                    continuation.resume(throwing: error)
-                }
-            }
-        }
-                
-        if let source = await self.$storeApp.source
-        {
-            // Fetch source to update pledge status now that account is connected.
-            try await self.update(source)
-        }
-    }
-    
-    func updatePledges(@AsyncManaged for source: Source, @AsyncManaged account: PatreonAccount) async throws
-    {
-        guard PatreonAPI.shared.isAuthenticated else { return }
-        
-        let previousPledgeIDs = Set(await $account.perform { $0.pledges.map(\.identifier) })
-        
-        let updatedPledgeIDs = try await withCheckedThrowingContinuation { continuation in
-            PatreonAPI.shared.fetchAccount { (result: Result<PatreonAccount, Swift.Error>) in
-                do
-                {
-                    let account = try result.get()
-                    let pledgeIDs = Set(account.pledges.map(\.identifier))
-                    
-                    try account.managedObjectContext?.save()
-                    
-                    continuation.resume(returning: pledgeIDs)
-                }
-                catch
-                {
-                    Logger.sideload.error("Failed to update Patreon account. \(error.localizedDescription, privacy: .public)")
-                    continuation.resume(throwing: error)
-                }
-            }
-        }
-                
-        if updatedPledgeIDs != previousPledgeIDs
-        {
-            // Active pledges changed, so fetch source to update pledge status.
-            try await self.update(source)
-        }
-    }
-    
-    func update(@AsyncManaged _ source: Source) async throws
-    {
-        let context = DatabaseManager.shared.persistentContainer.newBackgroundContext()
-        _ = try await AppManager.shared.fetchSource(sourceURL: $source.sourceURL, managedObjectContext: context)
-        
-        try await context.performAsync {
-            try context.save()
-        }
-    }
-    
-    @MainActor
-    func openPatreonPage(_ patreonURL: URL, presentingViewController: UIViewController) async
-    {
-        let webViewController = WebViewController(url: patreonURL)
-        webViewController.delegate = self
-
-        let navigationController = UINavigationController(rootViewController: webViewController)
-        presentingViewController.present(navigationController, animated: true)
-        
-        // Automatically dismiss if user completes checkout flow.
-        self.cancellable = webViewController.webView.publisher(for: \.url, options: [.new])
-            .compactMap { $0 }
-            .compactMap { URLComponents(url: $0, resolvingAgainstBaseURL: false) }
-            .compactMap { components in
-                let lastPathComponent = components.path.components(separatedBy: "/").last
-                return lastPathComponent?.lowercased()
-            }
-            .filter { $0 == "membership" }
-            .receive(on: RunLoop.main)
-            .sink { [weak self] url in
-                guard let continuation = self?.openPatreonPageContinuation else { return }
-                self?.openPatreonPageContinuation = nil
-                
-                continuation.resume()
-            }
-
-        await withCheckedContinuation { continuation in
-            self.openPatreonPageContinuation = continuation
-        }
-        
-        // Cache auth cookies just in case user signed in.
-        await PatreonAPI.shared.saveAuthCookies()
-
-        navigationController.dismiss(animated: true)
-        
-        self.cancellable = nil
-    }
-}
-
-extension VerifyAppPledgeOperation: WebViewControllerDelegate
-{
-    func webViewControllerDidFinish(_ webViewController: WebViewController)
-    {
-        guard let continuation = self.openPatreonPageContinuation else { return }
-        self.openPatreonPageContinuation = nil
-
-        continuation.resume()
-    }
-}

AltStore/Permissions/AppPermissionProtocol.swift

@@ -5,7 +5,6 @@
 //  Created by Riley Testut on 5/23/23.
 //  Copyright © 2023 Riley Testut. All rights reserved.
 //
-
 import AltStoreCore
 
 @dynamicMemberLookup

AltStore/Resources/AltIcons.plist

@@ -8,6 +8,8 @@
 			<key>name</key>
 			<string>Original</string>
 			<key>imageName</key>
+			<string>App</string>
+			<key>iconName</key>
 			<string>AppIcon</string>
 		</dict>
 	</array>
@@ -18,66 +20,88 @@
 			<string>Blue</string>
 			<key>imageName</key>
 			<string>Blue</string>
+			<key>iconName</key>
+			<string>BlueIcon</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Dark</string>
 			<key>imageName</key>
 			<string>Dark</string>
+			<key>iconName</key>
+			<string>DarkIcon</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Honeydew</string>
 			<key>imageName</key>
 			<string>Honeydew</string>
+			<key>iconName</key>
+			<string>HoneydewIcon</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Pride</string>
 			<key>imageName</key>
 			<string>Pride</string>
+			<key>iconName</key>
+			<string>PrideIcon</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Sandy</string>
 			<key>imageName</key>
 			<string>Sandy</string>
+			<key>iconName</key>
+			<string>SandyIcon</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Sky</string>
 			<key>imageName</key>
 			<string>Sky</string>
+			<key>iconName</key>
+			<string>SkyIcon</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Snow</string>
 			<key>imageName</key>
 			<string>Snow</string>
+			<key>iconName</key>
+			<string>SnowIcon</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Starburst</string>
 			<key>imageName</key>
 			<string>Starburst</string>
+			<key>iconName</key>
+			<string>StarburstIcon</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Storm</string>
 			<key>imageName</key>
 			<string>Storm</string>
+			<key>iconName</key>
+			<string>StormIcon</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Vista</string>
 			<key>imageName</key>
 			<string>Vista</string>
+			<key>iconName</key>
+			<string>VistaIcon</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Winter</string>
 			<key>imageName</key>
 			<string>Winter</string>
+			<key>iconName</key>
+			<string>WinterIcon</string>
 		</dict>
 	</array>
 </dict>

AltStore/Resources/Icons.xcassets/Classic/App.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "App.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AltStore/Resources/Icons.xcassets/Classic/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AltStore/Resources/Icons.xcassets/Modern/Blue.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Blue.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AltStore/Resources/Icons.xcassets/Modern/Dark.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Dark.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AltStore/Resources/Icons.xcassets/Modern/Honeydew.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Honeydew.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}