Merge pull request #22 from castdrian/fix-loader-config

fix: loader config oversight
bunny-mod · Nov 15, 2024 · 9b645f8 · 9b645f8
2 parents 2f8999c + 2fd7b27
commit 9b645f8
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 1 deletion.
diff --git a/Headers/LoaderConfig.h b/Headers/LoaderConfig.h
@@ -5,4 +5,6 @@
 @property (nonatomic, strong) NSURL *customLoadUrl;
 + (instancetype)defaultConfig;
 + (instancetype)getLoaderConfig;
+- (instancetype)init;
+- (BOOL)loadConfig;
 @end 
diff --git a/Sources/LoaderConfig.m b/Sources/LoaderConfig.m
@@ -4,6 +4,50 @@
 
 @implementation LoaderConfig
 
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.customLoadUrlEnabled = NO;
+        self.customLoadUrl = [NSURL URLWithString:@"http://localhost:4040/bunny.js"];
+    }
+    return self;
+}
+
+- (BOOL)loadConfig {
+    NSURL *loaderConfigUrl = [getPyoncordDirectory() URLByAppendingPathComponent:@"loader.json"];
+    BunnyLog(@"Attempting to load config from: %@", loaderConfigUrl.path);
+
+    if ([[NSFileManager defaultManager] fileExistsAtPath:loaderConfigUrl.path]) {
+        NSError *error = nil;
+        NSData *data = [NSData dataWithContentsOfURL:loaderConfigUrl];
+        NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+
+        if (error) {
+            BunnyLog(@"Error parsing loader config: %@", error);
+            return NO;
+        }
+
+        if (json) {
+            NSDictionary *customLoadUrl = json[@"customLoadUrl"];
+            if (customLoadUrl) {
+                self.customLoadUrlEnabled = [customLoadUrl[@"enabled"] boolValue];
+                NSString *urlString = customLoadUrl[@"url"];
+                if (urlString) {
+                    self.customLoadUrl = [NSURL URLWithString:urlString];
+                }
+            }
+
+            BunnyLog(@"Loader config loaded - Custom URL %@: %@", 
+                    self.customLoadUrlEnabled ? @"enabled" : @"disabled",
+                    self.customLoadUrl.absoluteString);
+            return YES;
+        }
+    }
+
+    BunnyLog(@"Using default loader config: %@", self.customLoadUrl.absoluteString);
+    return NO;
+}
+
 + (instancetype)defaultConfig {
     LoaderConfig *config = [[LoaderConfig alloc] init];
     config.customLoadUrlEnabled = NO;

diff --git a/Sources/Tweak.x b/Sources/Tweak.x
@@ -162,8 +162,9 @@ static LoaderConfig *loaderConfig;
             BunnyLog(@"Bundle contents: %@", bundleContents);
         }
 
-        pyoncordDirectory = getPyoncordDirectory();
+pyoncordDirectory = getPyoncordDirectory();
         loaderConfig = [[LoaderConfig alloc] init];
+        [loaderConfig loadConfig];
 
         %init;
     }