Ally Founder
dba11af542
- Fix BunnyLog compile error in Sideloading.x (leftover from Bunny->Revenge rename; only RevengeLog is defined) - Remove duplicated -loadConfig/+defaultConfig methods in LoaderConfig.m - Repoint CI's ipa-patcher download at a live mirror with a pinned checksum (Cristiandis/ipa-patcher was deleted upstream) - Add a second injection hook on RCTInstance/-_loadScriptFromSource: for React Native's Bridgeless mode, alongside the existing RCTCxxBridge hook. Discord's Android build already runs Bridgeless (confirmed via revenge-xposed's hook targets) and revenge-bundle now pins RN 0.81, which defaults to it - so the legacy bridge hook this tweak relied on was very likely dead. Unverified against a real device; see AUDIT.md. See AUDIT.md for the full iOS-vs-Android comparison and remaining gaps.
222 lines
9.5 KiB
Text
222 lines
9.5 KiB
Text
#import <Foundation/Foundation.h>
|
|
#import <UIKit/UIKit.h>
|
|
#import "Utils.h"
|
|
#import "Logger.h"
|
|
#import "Theme.h"
|
|
#import "Fonts.h"
|
|
#import "LoaderConfig.h"
|
|
|
|
static NSURL *source;
|
|
static BOOL isJailbroken;
|
|
static NSString *revengePatchesBundlePath;
|
|
static NSURL *pyoncordDirectory;
|
|
static LoaderConfig *loaderConfig;
|
|
|
|
/**
|
|
* Runs the full Revenge injection sequence (loader payload, downloaded bundle, stored theme,
|
|
* fonts, preloads) and hands each script off to `execute`, then finally executes the host's
|
|
* own `script`/`url`/`async` once everything else has run.
|
|
*
|
|
* Factored out so it can be driven by either the legacy-bridge hook (RCTCxxBridge, used when
|
|
* the host app runs React Native's old bridge) or the bridgeless-mode hook (RCTInstance, used
|
|
* under React Native's New Architecture) below - both eventually funnel through here.
|
|
*/
|
|
static BOOL runRevengeInjection(NSData *script, NSURL *url, BOOL async, void (^execute)(NSData *data, NSURL *url, BOOL async)) {
|
|
NSBundle *revengePatchesBundle = [NSBundle bundleWithPath:revengePatchesBundlePath];
|
|
if (!revengePatchesBundle) {
|
|
RevengeLog(@"Failed to load RevengePatches bundle from path: %@", revengePatchesBundlePath);
|
|
showErrorAlert(@"Loader Error", @"Failed to initialize mod loader. Please reinstall the tweak.");
|
|
return NO;
|
|
}
|
|
|
|
NSURL *patchPath = [revengePatchesBundle URLForResource:@"payload-base" withExtension:@"js"];
|
|
if (!patchPath) {
|
|
RevengeLog(@"Failed to find payload-base.js in bundle");
|
|
showErrorAlert(@"Loader Error", @"Failed to initialize mod loader. Please reinstall the tweak.");
|
|
return NO;
|
|
}
|
|
|
|
NSData *patchData = [NSData dataWithContentsOfURL:patchPath];
|
|
RevengeLog(@"Injecting loader");
|
|
execute(patchData, source, YES);
|
|
|
|
__block NSData *bundle = [NSData dataWithContentsOfURL:[pyoncordDirectory URLByAppendingPathComponent:@"bundle.js"]];
|
|
|
|
dispatch_group_t group = dispatch_group_create();
|
|
dispatch_group_enter(group);
|
|
|
|
NSURL *bundleUrl;
|
|
if (loaderConfig.customLoadUrlEnabled && loaderConfig.customLoadUrl) {
|
|
bundleUrl = loaderConfig.customLoadUrl;
|
|
RevengeLog(@"Using custom load URL: %@", bundleUrl.absoluteString);
|
|
} else {
|
|
bundleUrl = [NSURL URLWithString:@"https://github.com/revenge-mod/revenge-bundle/releases/latest/download/revenge.min.js"];
|
|
RevengeLog(@"Using default bundle URL: %@", bundleUrl.absoluteString);
|
|
}
|
|
|
|
NSMutableURLRequest *bundleRequest = [NSMutableURLRequest requestWithURL:bundleUrl
|
|
cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData
|
|
timeoutInterval:3.0];
|
|
|
|
NSString *bundleEtag = [NSString stringWithContentsOfURL:[pyoncordDirectory URLByAppendingPathComponent:@"etag.txt"]
|
|
encoding:NSUTF8StringEncoding
|
|
error:nil];
|
|
if (bundleEtag && bundle) {
|
|
[bundleRequest setValue:bundleEtag forHTTPHeaderField:@"If-None-Match"];
|
|
}
|
|
|
|
NSURLSession *session = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]];
|
|
[[session dataTaskWithRequest:bundleRequest completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
|
|
if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
|
|
NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
|
|
if (httpResponse.statusCode == 200) {
|
|
bundle = data;
|
|
[bundle writeToURL:[pyoncordDirectory URLByAppendingPathComponent:@"bundle.js"] atomically:YES];
|
|
|
|
NSString *etag = [httpResponse.allHeaderFields objectForKey:@"Etag"];
|
|
if (etag) {
|
|
[etag writeToURL:[pyoncordDirectory URLByAppendingPathComponent:@"etag.txt"]
|
|
atomically:YES
|
|
encoding:NSUTF8StringEncoding
|
|
error:nil];
|
|
}
|
|
}
|
|
}
|
|
dispatch_group_leave(group);
|
|
}] resume];
|
|
|
|
dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
|
|
|
|
NSString *themeString = [NSString stringWithContentsOfURL:[pyoncordDirectory URLByAppendingPathComponent:@"current-theme.json"]
|
|
encoding:NSUTF8StringEncoding
|
|
error:nil];
|
|
if (themeString) {
|
|
NSString *jsCode = [NSString stringWithFormat:@"globalThis.__PYON_LOADER__.storedTheme=%@", themeString];
|
|
execute([jsCode dataUsingEncoding:NSUTF8StringEncoding], source, async);
|
|
}
|
|
|
|
NSData *fontData = [NSData dataWithContentsOfURL:[pyoncordDirectory URLByAppendingPathComponent:@"fonts.json"]];
|
|
if (fontData) {
|
|
NSError *jsonError;
|
|
NSDictionary *fontDict = [NSJSONSerialization JSONObjectWithData:fontData options:0 error:&jsonError];
|
|
if (!jsonError && fontDict[@"main"]) {
|
|
RevengeLog(@"Found font configuration, applying...");
|
|
patchFonts(fontDict[@"main"], fontDict[@"name"]);
|
|
}
|
|
}
|
|
|
|
if (bundle) {
|
|
RevengeLog(@"Executing JS bundle");
|
|
execute(bundle, source, async);
|
|
}
|
|
|
|
NSURL *preloadsDirectory = [pyoncordDirectory URLByAppendingPathComponent:@"preloads"];
|
|
if ([[NSFileManager defaultManager] fileExistsAtPath:preloadsDirectory.path]) {
|
|
NSError *error = nil;
|
|
NSArray *contents = [[NSFileManager defaultManager] contentsOfDirectoryAtURL:preloadsDirectory
|
|
includingPropertiesForKeys:nil
|
|
options:0
|
|
error:&error];
|
|
if (!error) {
|
|
for (NSURL *fileURL in contents) {
|
|
if ([[fileURL pathExtension] isEqualToString:@"js"]) {
|
|
RevengeLog(@"Executing preload JS file %@", fileURL.absoluteString);
|
|
NSData *data = [NSData dataWithContentsOfURL:fileURL];
|
|
if (data) {
|
|
execute(data, source, async);
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
RevengeLog(@"Error reading contents of preloads directory");
|
|
}
|
|
}
|
|
|
|
return YES;
|
|
}
|
|
|
|
%hook RCTCxxBridge
|
|
|
|
// Legacy-bridge entry point. Fires when the host app runs React Native's old (non-Bridgeless) bridge.
|
|
- (void)executeApplicationScript:(NSData *)script url:(NSURL *)url async:(BOOL)async {
|
|
if (![url.absoluteString containsString:@"main.jsbundle"]) {
|
|
return %orig;
|
|
}
|
|
|
|
BOOL injected = runRevengeInjection(script, url, async, ^(NSData *data, NSURL *scriptUrl, BOOL scriptAsync) {
|
|
%orig(data, scriptUrl, scriptAsync);
|
|
});
|
|
if (!injected) return %orig;
|
|
|
|
%orig(script, url, async);
|
|
}
|
|
|
|
%end
|
|
|
|
%hook RCTInstance
|
|
|
|
/**
|
|
* Bridgeless-mode (React Native's New Architecture) entry point. Discord's Android build moved
|
|
* to this architecture (see RevengeXposed's `com.facebook.react.runtime.ReactInstance$loadJSBundle$1`
|
|
* and `BridgelessDevSupportManager` hook targets), and the JS bundle now pins react-native 0.81,
|
|
* which defaults to it too - so this is likely the entry point that actually fires on current
|
|
* Discord iOS builds, not `RCTCxxBridge` above.
|
|
*
|
|
* `RCTInstance` has no public initializer for `RCTSource`, so `makeRCTSource` pokes its private
|
|
* ivars directly to build synthetic sources for the loader payload/bundle/theme/preload scripts.
|
|
* UNVERIFIED against a real device/current Discord binary - test before shipping.
|
|
*/
|
|
- (void)_loadScriptFromSource:(id)source {
|
|
NSURL *url = [source valueForKey:@"url"];
|
|
NSData *script = [source valueForKey:@"data"];
|
|
|
|
if (![url.absoluteString containsString:@"main.jsbundle"]) {
|
|
return %orig;
|
|
}
|
|
|
|
BOOL injected = runRevengeInjection(script, url, YES, ^(NSData *data, NSURL *scriptUrl, BOOL scriptAsync) {
|
|
id syntheticSource = makeRCTSource(scriptUrl, data);
|
|
if (syntheticSource) %orig(syntheticSource);
|
|
});
|
|
if (!injected) return %orig;
|
|
|
|
%orig(source);
|
|
}
|
|
|
|
%end
|
|
|
|
%ctor {
|
|
@autoreleasepool {
|
|
source = [NSURL URLWithString:@"revenge"];
|
|
|
|
NSString *install_prefix = @"/var/jb";
|
|
isJailbroken = [[NSFileManager defaultManager] fileExistsAtPath:install_prefix];
|
|
|
|
NSString *bundlePath = [NSString stringWithFormat:@"%@/Library/Application Support/RevengeResources.bundle", install_prefix];
|
|
RevengeLog(@"Is jailbroken: %d", isJailbroken);
|
|
RevengeLog(@"Bundle path for jailbroken: %@", bundlePath);
|
|
|
|
NSString *jailedPath = [[NSBundle mainBundle].bundleURL.path stringByAppendingPathComponent:@"RevengeResources.bundle"];
|
|
RevengeLog(@"Bundle path for jailed: %@", jailedPath);
|
|
|
|
revengePatchesBundlePath = isJailbroken ? bundlePath : jailedPath;
|
|
RevengeLog(@"Selected bundle path: %@", revengePatchesBundlePath);
|
|
|
|
BOOL bundleExists = [[NSFileManager defaultManager] fileExistsAtPath:revengePatchesBundlePath];
|
|
RevengeLog(@"Bundle exists at path: %d", bundleExists);
|
|
|
|
NSError *error = nil;
|
|
NSArray *bundleContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:revengePatchesBundlePath error:&error];
|
|
if (error) {
|
|
RevengeLog(@"Error listing bundle contents: %@", error);
|
|
} else {
|
|
RevengeLog(@"Bundle contents: %@", bundleContents);
|
|
}
|
|
|
|
pyoncordDirectory = getPyoncordDirectory();
|
|
loaderConfig = [[LoaderConfig alloc] init];
|
|
[loaderConfig loadConfig];
|
|
|
|
%init;
|
|
}
|
|
}
|