refactor: construct preload data in memory

Author: castdrian

.vscode/settings.json

@@ -44,4 +44,4 @@
 	},
 	"editor.formatOnSave": true,
 	"markdown.validate.enabled": true
-}
+}

Makefile

@@ -27,8 +27,6 @@ before-all::
 		git submodule update --init --recursive || exit 1; \
 	fi
 
-	cp sources/preload.js resources/preload.js
-
 	@if [ -n "$$UNBOUND_PK" ]; then \
 		echo -n "$(COMMIT_HASH)" | openssl dgst -sha256 -sign <(printf '%s' "$$UNBOUND_PK" | tr -d '\r') -out resources/signature.bin 2>/dev/null; \
 	elif [ -f "private_key.pem" ]; then \
@@ -39,4 +37,4 @@ after-stage::
 	find $(THEOS_STAGING_DIR) -name ".DS_Store" -delete
 
 after-package::
-	rm -f resources/preload.js resources/signature.bin
+	rm -f resources/signature.bin

headers/Utilities.h

@@ -2,6 +2,7 @@
 #import <Security/Security.h>
 #import <AVFoundation/AVFoundation.h>
 #import <dlfcn.h>
+#import <mach-o/dyld.h>
 #import <rootless.h>
 #import <sys/utsname.h>
 #import <mach-o/fat.h>
@@ -139,10 +140,14 @@ extern const CGFloat DYNAMIC_ISLAND_TOP_INSET;
 + (NSArray<NSString *> *)getAvailableAppExtensions;
 + (BOOL)hasAppExtension:(NSString *)extensionName;
 
++ (NSString *)getCurrentDylibName;
+
 + (NSDictionary *)getApplicationEntitlements;
 + (NSDictionary *)getApplicationSignatureInfo;
 
 + (NSString *)formatEntitlementsAsPlist:(NSDictionary *)entitlements;
 + (BOOL)isVerifiedBuild;
 
++ (NSString *)JSONString:(NSString *)str;
+
 @end

sources/Unbound.x

@@ -60,17 +60,28 @@ id gBridge = nil;
     // Preload Unbound's settings, plugins, themes and fonts
     @try
     {
-        NSString *bundle         = [Utilities getResource:@"preload"];
         NSString *settings       = [Settings getSettings];
         NSString *plugins        = [Plugins makeJSON];
         NSString *themes         = [Themes makeJSON];
         NSString *availableFonts = [Fonts makeAvailableJSON];
         NSString *fonts          = [Fonts makeJSON];
 
-        NSString *version = PACKAGE_VERSION;
-
-        NSString *json = [NSString
-            stringWithFormat:bundle, settings, plugins, themes, fonts, availableFonts, version];
+        NSString *origin  = [Utilities JSONString:[Utilities getCurrentDylibName]];
+        NSString *version = [Utilities JSONString:PACKAGE_VERSION];
+
+        NSString *preloadScript = [NSString
+            stringWithFormat:@"this.UNBOUND_SETTINGS = %@;\n"
+                             @"this.UNBOUND_PLUGINS = %@;\n"
+                             @"this.UNBOUND_THEMES = %@;\n"
+                             @"this.UNBOUND_FONTS = %@;\n"
+                             @"this.UNBOUND_AVAILABLE_FONTS = %@;\n\n"
+                             @"this.UNBOUND_LOADER = {\n"
+                             @"    origin: %@,\n"
+                             @"    version: %@,\n"
+                             @"};",
+                             settings, plugins, themes, fonts, availableFonts, origin, version];
+
+        NSData *data = [preloadScript dataUsingEncoding:NSUTF8StringEncoding];
 
         [Logger info:LOG_CATEGORY_DEFAULT
               format:@"Pre-loading settings, plugins, fonts and themes..."];

sources/Utilities.m

@@ -1055,6 +1055,22 @@ + (BOOL)hasAppExtension:(NSString *)extensionName
     return exists;
 }
 
++ (NSString *)getCurrentDylibName
+{
+    Dl_info info;
+    memset(&info, 0, sizeof(info));
+
+    IMP implementation = [self methodForSelector:@selector(getCurrentDylibName)];
+
+    if (dladdr((const void *) implementation, &info) && info.dli_fname)
+    {
+        NSString *fullPath = [NSString stringWithUTF8String:info.dli_fname];
+        return [fullPath lastPathComponent];
+    }
+
+    return nil;
+}
+
 + (NSDictionary *)getApplicationEntitlements
 {
     NSDictionary *signatureInfo = [self getApplicationSignatureInfo];
@@ -1412,4 +1428,12 @@ + (UIAlertAction *)createDiscordInviteButton
                 }];
 }
 
++ (NSString *)JSONString:(NSString *)str
+{
+    if (!str)
+        return @"null";
+    NSString *escaped = [str stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
+    return [NSString stringWithFormat:@"\"%@\"", escaped];
+}
+
 @end