Add MessageBroker for QML and native communication

Introduces MessageBroker to enable communication between the dylib and QML via signals. Updates CMakeLists.txt to include Qml components and conditionally add MessageBroker sources in qmlrebuild mode. reMarkable.m is updated to register the QML type, set up native callbacks, and demonstrate broadcasting signals.

CMakeLists.txt

@@ -8,10 +8,10 @@ set(CMAKE_CXX_STANDARD 17)
 
 # Build mode options
 # - rmfakecloud: Redirect reMarkable cloud to rmfakecloud server (default)
-# - qmldiff: Qt resource data registration hooking (WIP)
+# - qmlrebuild: Qt resource data registration hooking
 # - dev: Development/reverse engineering mode with all hooks
 option(BUILD_MODE_RMFAKECLOUD "Build with rmfakecloud support" ON)
-option(BUILD_MODE_QMLDIFF "Build with QML diff/resource hooking" OFF)
+option(BUILD_MODE_QMLREBUILD "Build with QML resource rebuilding" OFF)
 option(BUILD_MODE_DEV "Build with dev/reverse engineering hooks" OFF)
 
 # Compiler settings for macOS
@@ -28,6 +28,8 @@ set(PROJECT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(
     ${PROJECT_ROOT_DIR}/src/core
     ${PROJECT_ROOT_DIR}/src/utils
+    ${PROJECT_ROOT_DIR}/src/reMarkable
+    ${PROJECT_ROOT_DIR}/libs/include
 )
 
 # Find required libraries
@@ -55,13 +57,13 @@ foreach(_qt_root ${_qt_candidate_roots})
     endif()
 endforeach()
 
-find_package(Qt6 COMPONENTS Core Network WebSockets QUIET)
+find_package(Qt6 COMPONENTS Core Network WebSockets Qml QUIET)
 if(Qt6_FOUND)
-    set(QT_LIB_TARGETS Qt6::Core Qt6::Network Qt6::WebSockets)
+    set(QT_LIB_TARGETS Qt6::Core Qt6::Network Qt6::WebSockets Qt6::Qml)
 else()
-    find_package(Qt5 COMPONENTS Core Network WebSockets QUIET)
+    find_package(Qt5 COMPONENTS Core Network WebSockets Qml QUIET)
     if(Qt5_FOUND)
-        set(QT_LIB_TARGETS Qt5::Core Qt5::Network Qt5::WebSockets)
+        set(QT_LIB_TARGETS Qt5::Core Qt5::Network Qt5::WebSockets Qt5::Qml)
     endif()
 endif()
 
@@ -79,6 +81,7 @@ set(COMMON_SOURCES
 # reMarkable dylib
 set(REMARKABLE_SOURCES
     ${PROJECT_ROOT_DIR}/src/reMarkable/reMarkable.m
+    ${PROJECT_ROOT_DIR}/src/reMarkable/DevHooks.m
 )
 
 add_library(reMarkable SHARED 
@@ -102,15 +105,23 @@ set_target_properties(reMarkable PROPERTIES
 
 add_definitions(-DQT_NO_VERSION_TAGGING)
 
-# Add build mode compile definitions
+# Add build mode compile definitions and conditionally add sources
 if(BUILD_MODE_RMFAKECLOUD)
     target_compile_definitions(reMarkable PRIVATE BUILD_MODE_RMFAKECLOUD=1)
     message(STATUS "Build mode: rmfakecloud (cloud redirection)")
 endif()
 
-if(BUILD_MODE_QMLDIFF)
-    target_compile_definitions(reMarkable PRIVATE BUILD_MODE_QMLDIFF=1)
-    message(STATUS "Build mode: qmldiff (resource hooking)")
+if(BUILD_MODE_QMLREBUILD)
+    target_compile_definitions(reMarkable PRIVATE BUILD_MODE_QMLREBUILD=1)
+    
+    # Enable Qt MOC for MessageBroker
+    set_target_properties(reMarkable PROPERTIES AUTOMOC ON)
+    
+    # Add MessageBroker source (needs MOC processing)
+    target_sources(reMarkable PRIVATE 
+        ${PROJECT_ROOT_DIR}/src/utils/MessageBroker.mm
+    )
+    message(STATUS "Build mode: qmlrebuild (resource hooking)")
 endif()
 
 if(BUILD_MODE_DEV)

README.md

@@ -122,6 +122,9 @@ If the config file doesn't exist, it will be created automatically with default
 
 ## Credits
 - xovi-rmfakecloud: [asivery/xovi-rmfakecloud](https://github.com/asivery/xovi-rmfakecloud) - Original hooking information
+- rm-xovi-extensions: [asivery/rm-xovi-extensions](https://github.com/asivery/rm-xovi-extensions) - Extension framework for reMarkable, used as reference for hooking Qt functions
+  - [qt-resource-rebuilder](https://github.com/asivery/rm-xovi-extensions/tree/master/qt-resource-rebuilder)
+  - [xovi-message-broker](https://github.com/asivery/rm-xovi-extensions/tree/master/xovi-message-broker)
 - tinyhook: [Antibioticss/tinyhook](https://github.com/Antibioticss/tinyhook/) - Function hooking framework
 - rmfakecloud: [ddvk/rmfakecloud](https://github.com/ddvk/rmfakecloud) - Self-hosted reMarkable cloud
 - optool: [alexzielenski/optool](https://github.com/alexzielenski/optool) - Mach-O binary modification tool
@@ -159,10 +162,16 @@ The build script supports different modes for various use cases:
 | Mode | Description |
 |------|-------------|
 | `rmfakecloud` | Redirect reMarkable cloud to rmfakecloud server (default) |
-| `qmldiff` | Qt resource data registration hooking (WIP) |
+| `qmlrebuild` | Qt resource data registration hooking for QML replacement |
 | `dev` | Development/reverse engineering mode with all hooks |
 | `all` | Enable all modes |
 
+**Note (qmlrebuild mode):** When using the `qmlrebuild` feature, you must clear the Qt QML cache before launching the app:
+```bash
+rm -rf ~/Library/Caches/remarkable
+```
+Qt caches compiled QML files, so changes to QML resources won't take effect until the cache is cleared.
+
 Examples:
 ```bash
 ./scripts/build.sh              # Build with rmfakecloud mode (default)

scripts/build.sh

@@ -3,7 +3,7 @@
 
 # Build modes:
 #   rmfakecloud - Redirect reMarkable cloud to rmfakecloud server (default)
-#   qmldiff     - Qt resource data registration hooking (WIP)
+#   qmlrebuild     - Qt resource data registration hooking
 #   dev         - Development/reverse engineering mode with all hooks
 
 PROJECT_DIR=$(cd "$(dirname "$0")/.." && pwd)
@@ -19,8 +19,8 @@ case "$BUILD_MODE" in
     rmfakecloud)
         DYLIB_NAME="rmfakecloud.dylib"
         ;;
-    qmldiff)
-        DYLIB_NAME="qmldiff.dylib"
+    qmlrebuild)
+        DYLIB_NAME="qmlrebuild.dylib"
         ;;
     dev)
         DYLIB_NAME="dev.dylib"
@@ -37,20 +37,20 @@ esac
 CMAKE_OPTIONS=""
 case "$BUILD_MODE" in
     rmfakecloud)
-        CMAKE_OPTIONS="-DBUILD_MODE_RMFAKECLOUD=ON -DBUILD_MODE_QMLDIFF=OFF -DBUILD_MODE_DEV=OFF"
+        CMAKE_OPTIONS="-DBUILD_MODE_RMFAKECLOUD=ON -DBUILD_MODE_QMLREBUILD=OFF -DBUILD_MODE_DEV=OFF"
         ;;
-    qmldiff)
-        CMAKE_OPTIONS="-DBUILD_MODE_RMFAKECLOUD=OFF -DBUILD_MODE_QMLDIFF=ON -DBUILD_MODE_DEV=OFF"
+    qmlrebuild)
+        CMAKE_OPTIONS="-DBUILD_MODE_RMFAKECLOUD=OFF -DBUILD_MODE_QMLREBUILD=ON -DBUILD_MODE_DEV=OFF"
         ;;
     dev)
-        CMAKE_OPTIONS="-DBUILD_MODE_RMFAKECLOUD=OFF -DBUILD_MODE_QMLDIFF=OFF -DBUILD_MODE_DEV=ON"
+        CMAKE_OPTIONS="-DBUILD_MODE_RMFAKECLOUD=OFF -DBUILD_MODE_QMLREBUILD=OFF -DBUILD_MODE_DEV=ON"
         ;;
     all)
-        CMAKE_OPTIONS="-DBUILD_MODE_RMFAKECLOUD=ON -DBUILD_MODE_QMLDIFF=ON -DBUILD_MODE_DEV=ON"
+        CMAKE_OPTIONS="-DBUILD_MODE_RMFAKECLOUD=ON -DBUILD_MODE_QMLREBUILD=ON -DBUILD_MODE_DEV=ON"
         ;;
     *)
         echo "❌ Unknown build mode: $BUILD_MODE"
-        echo "Available modes: rmfakecloud (default), qmldiff, dev, all"
+        echo "Available modes: rmfakecloud (default), qmlrebuild, dev, all"
         exit 1
         ;;
 esac

src/reMarkable/DevHooks.h

@@ -0,0 +1,47 @@
+#ifndef DEV_HOOKS_H
+#define DEV_HOOKS_H
+
+#ifdef BUILD_MODE_DEV
+
+#import <Foundation/Foundation.h>
+#include <stdint.h>
+
+// Forward declarations for Qt types
+class QIODevice;
+class QObject;
+namespace QtSharedPointer {
+    struct ExternalRefCountData;
+}
+
+extern ssize_t (*original_qIODevice_write)(QIODevice *self, const char *data, int64_t maxSize);
+extern int64_t (*original_qmlregister)(int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int, int64_t, int, int64_t);
+extern int64_t (*original_function_at_0x100011790)(uint64_t *a1);
+extern int64_t (*original_function_at_0x100011CE0)(int64_t, const QObject *, unsigned char, int64_t, QtSharedPointer::ExternalRefCountData *);
+extern int64_t (*original_function_at_0x10015A130)(int64_t, int64_t);
+extern void (*original_function_at_0x10015BC90)(int64_t, int64_t);
+extern int64_t (*original_function_at_0x10016D520)(int64_t, int64_t *, unsigned int, int64_t);
+extern void (*original_function_at_0x1001B6EE0)(int64_t, int64_t *, unsigned int);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ssize_t hooked_qIODevice_write(QIODevice *self, const char *data, int64_t maxSize);
+int64_t hooked_qmlregister(int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int, int64_t, int, int64_t);
+int64_t hooked_function_at_0x100011790(uint64_t *a1);
+int64_t hooked_function_at_0x100011CE0(int64_t, const QObject *, unsigned char, int64_t, QtSharedPointer::ExternalRefCountData *);
+int64_t hooked_function_at_0x10015A130(int64_t, int64_t);
+void hooked_function_at_0x10015BC90(int64_t, int64_t);
+int64_t hooked_function_at_0x10016D520(int64_t, int64_t *, unsigned int, int64_t);
+void hooked_function_at_0x1001B6EE0(int64_t, int64_t *, unsigned int);
+
+#ifdef __cplusplus
+}
+#endif
+
+void logMemory(const char *label, void *address, size_t length);
+void logStackTrace(const char *label);
+
+#endif // BUILD_MODE_DEV
+
+#endif // DEV_HOOKS_H

src/reMarkable/DevHooks.m

@@ -0,0 +1,389 @@
+#ifdef BUILD_MODE_DEV
+
+#import "DevHooks.h"
+#import "Logger.h"
+#import <Foundation/Foundation.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <QtCore/QIODevice>
+#include <QtCore/QObject>
+
+// Original function pointers
+ssize_t (*original_qIODevice_write)(QIODevice *self, const char *data, int64_t maxSize) = NULL;
+
+int64_t (*original_qmlregister)(
+    int64_t a1,
+    int64_t a2,
+    int64_t a3,
+    int64_t a4,
+    int64_t a5,
+    int64_t a6,
+    int a7,
+    int64_t a8,
+    int a9,
+    int64_t a10) = NULL;
+
+int64_t (*original_function_at_0x100011790)(uint64_t *a1) = NULL;
+int64_t (*original_function_at_0x100011CE0)(int64_t a1, const QObject *a2, unsigned char a3, int64_t a4, QtSharedPointer::ExternalRefCountData *a5) = NULL;
+int64_t (*original_function_at_0x10015A130)(int64_t a1, int64_t a2) = NULL;
+void (*original_function_at_0x10015BC90)(int64_t a1, int64_t a2) = NULL;
+int64_t (*original_function_at_0x10016D520)(int64_t a1, int64_t *a2, unsigned int a3, int64_t a4) = NULL;
+void (*original_function_at_0x1001B6EE0)(int64_t a1, int64_t *a2, unsigned int a3) = NULL;
+
+#pragma mark - Helper Functions
+
+void logMemory(const char *label, void *address, size_t length) {
+    if (!address) {
+        NSLogger(@"[reMarkable]   %s: (null)", label);
+        return;
+    }
+    
+    unsigned char *ptr = (unsigned char *)address;
+    NSMutableString *hexLine = [NSMutableString stringWithFormat:@"[reMarkable]   %s: ", label];
+    
+    for (size_t i = 0; i < length; i++) {
+        [hexLine appendFormat:@"%02x ", ptr[i]];
+        if ((i + 1) % 16 == 0 && i < length - 1) {
+            NSLogger(@"%@", hexLine);
+            hexLine = [NSMutableString stringWithString:@"[reMarkable]                    "];
+        }
+    }
+    
+    // Log remaining bytes if any
+    if ([hexLine length] > 28) {  // More than just the prefix
+        NSLogger(@"%@", hexLine);
+    }
+}
+
+void logStackTrace(const char *label) {
+    NSLogger(@"[reMarkable] %s - Stack trace:", label);
+    NSArray<NSString *> *callStack = [NSThread callStackSymbols];
+    NSUInteger count = [callStack count];
+    
+    for (NSUInteger i = 0; i < count; i++) {
+        NSString *frame = callStack[i];
+        NSLogger(@"[reMarkable]   #%lu: %@", (unsigned long)i, frame);
+    }
+}
+
+#pragma mark - Hook Implementations
+
+extern "C" ssize_t hooked_qIODevice_write(
+    QIODevice *self,
+    const char *data,
+    int64_t maxSize) {
+    NSLogger(@"[reMarkable] QIODevice::write called with maxSize: %lld", (long long)maxSize);
+    
+    logStackTrace("QIODevice::write call stack");
+    logMemory("Data to write", (void *)data, (size_t)(maxSize < 64 ? maxSize : 64));
+    
+    if (original_qIODevice_write) {
+        ssize_t result = original_qIODevice_write(self, data, maxSize);
+        NSLogger(@"[reMarkable] QIODevice::write result: %zd", result);
+        return result;
+    }
+    NSLogger(@"[reMarkable] WARNING: Original QIODevice::write not available, returning 0");
+    return 0;
+}
+
+extern "C" int64_t hooked_function_at_0x100011790(uint64_t *a1) {
+    NSLogger(@"[reMarkable] Hook at 0x100011790 called!");
+    NSLogger(@"[reMarkable]   a1 = %p", a1);
+
+    if (a1) {
+        NSLogger(@"[reMarkable]   *a1 = 0x%llx", (unsigned long long)*a1);
+        logMemory("Memory at a1", (void *)a1, 64);
+        logMemory("Memory at *a1", (void *)(*a1), 64);
+    } else {
+        NSLogger(@"[reMarkable]   a1 is NULL");
+    }
+
+    if (original_function_at_0x100011790) {
+        int64_t result = original_function_at_0x100011790(a1);
+        NSLogger(@"[reMarkable]   result = 0x%llx", (unsigned long long)result);
+        return result;
+    }
+
+    NSLogger(@"[reMarkable] WARNING: Original function at 0x100011790 not available, returning 0");
+    return 0;
+}
+
+extern "C" int64_t hooked_function_at_0x100011CE0(
+    int64_t a1,
+    const QObject *a2,
+    unsigned char a3,
+    int64_t a4,
+    QtSharedPointer::ExternalRefCountData *a5) {
+    // This function appears to be a QML type registration wrapper
+    // It calls QQmlPrivate::qmlregister(3, &registrationData)
+    // 
+    // Based on IDA analysis:
+    // - a1: stored at offset +0x8 in registration struct (likely type metadata ptr)
+    // - a2: NOT actually a QObject* - low bits used as: ((_WORD)a2 << 8) | a3
+    //       This suggests a2's low 16 bits are a version/revision number
+    // - a3: combined with a2 to form v17 (flags/version field)
+    // - a4: stored at offset +0x18 (likely URI or type info pointer)
+    // - a5: ExternalRefCountData* for shared pointer ref counting
+    
+    NSLogger(@"[reMarkable] ========================================");
+    NSLogger(@"[reMarkable] Hook at 0x100011CE0 (QML Type Registration)");
+    NSLogger(@"[reMarkable] ========================================");
+    
+    NSLogger(@"[reMarkable]   a1 (typeMetadata?)  = 0x%llx", (unsigned long long)a1);
+    
+    uint16_t a2_low = (uint16_t)(uintptr_t)a2;
+    uint16_t combined_v17 = (a2_low << 8) | a3;
+    NSLogger(@"[reMarkable]   a2 (raw)            = %p (0x%llx)", a2, (unsigned long long)(uintptr_t)a2);
+    NSLogger(@"[reMarkable]   a2 low 16 bits      = 0x%04x (%u)", a2_low, a2_low);
+    NSLogger(@"[reMarkable]   a3 (flags/version)  = 0x%02x (%u)", a3, a3);
+    NSLogger(@"[reMarkable]   v17 = (a2<<8)|a3    = 0x%04x (%u)", combined_v17, combined_v17);
+    NSLogger(@"[reMarkable]   a4 (typeInfo/URI?)  = 0x%llx", (unsigned long long)a4);
+    NSLogger(@"[reMarkable]   a5 (refCountData)   = %p", a5);
+    
+    if (a1) {
+        logMemory("Memory at a1 (typeMetadata)", (void *)a1, 64);
+        void **vtable = (void **)a1;
+        NSLogger(@"[reMarkable]   a1 vtable/first ptr = %p", *vtable);
+    }
+    
+    if (a4) {
+        logMemory("Memory at a4 (typeInfo)", (void *)a4, 64);
+        const char *maybeStr = (const char *)a4;
+        bool isPrintable = true;
+        int len = 0;
+        for (int i = 0; i < 64 && maybeStr[i]; i++) {
+            if (maybeStr[i] < 0x20 || maybeStr[i] > 0x7e) {
+                isPrintable = false;
+                break;
+            }
+            len++;
+        }
+        if (isPrintable && len > 0) {
+            NSLogger(@"[reMarkable]   a4 as string: \"%.*s\"", len, maybeStr);
+        }
+    }
+    
+    if (a5) {
+        logMemory("Memory at a5 (refCountData)", (void *)a5, 32);
+    }
+    
+    logStackTrace("QML Registration context");
+
+    if (original_function_at_0x100011CE0) {
+        int64_t result = original_function_at_0x100011CE0(a1, a2, a3, a4, a5);
+        NSLogger(@"[reMarkable]   result (qmlregister return) = %u (0x%x)", (unsigned int)result, (unsigned int)result);
+        NSLogger(@"[reMarkable] ========================================");
+        return result;
+    }
+
+    NSLogger(@"[reMarkable] WARNING: Original function at 0x100011CE0 not available, returning 0");
+    return 0;
+}
+
+extern "C" int64_t hooked_function_at_0x10015A130(int64_t a1, int64_t a2) {
+    NSLogger(@"[reMarkable] Hook at 0x10015A130 called!");
+    NSLogger(@"[reMarkable]   a1 = 0x%llx", (unsigned long long)a1);
+    NSLogger(@"[reMarkable]   a2 = 0x%llx", (unsigned long long)a2);
+
+    logMemory("Memory at a1", (void *)a1, 64);
+    logMemory("Memory at a2", (void *)a2, 64);
+
+    if (original_function_at_0x10015A130) {
+        int64_t result = original_function_at_0x10015A130(a1, a2);
+        NSLogger(@"[reMarkable]   result = 0x%llx", (unsigned long long)result);
+        return result;
+    }
+
+    NSLogger(@"[reMarkable] WARNING: Original function at 0x10015A130 not available, returning 0");
+    return 0;
+}
+
+extern "C" void hooked_function_at_0x10015BC90(int64_t a1, int64_t a2) {
+    NSLogger(@"[reMarkable] Hook at 0x10015BC90 called!");
+    NSLogger(@"[reMarkable]   a1 = 0x%llx", (unsigned long long)a1);
+    NSLogger(@"[reMarkable]   a2 = 0x%llx", (unsigned long long)a2);
+
+    logMemory("Memory at a1", (void *)a1, 64);
+    logMemory("Memory at a2", (void *)a2, 64);
+
+    if (original_function_at_0x10015BC90) {
+        original_function_at_0x10015BC90(a1, a2);
+        NSLogger(@"[reMarkable]   original function returned (void)");
+        return;
+    }
+
+    NSLogger(@"[reMarkable] WARNING: Original function at 0x10015BC90 not available");
+}
+
+extern "C" int64_t hooked_function_at_0x10016D520(int64_t a1, int64_t *a2, unsigned int a3, int64_t a4) {
+    NSLogger(@"[reMarkable] Hook at 0x10016D520 called!");
+    NSLogger(@"[reMarkable]   a1 = 0x%llx", (unsigned long long)a1);
+    NSLogger(@"[reMarkable]   a2 = %p", a2);
+    if (a2) {
+        NSLogger(@"[reMarkable]   *a2 = 0x%llx", (unsigned long long)*a2);
+    }
+    NSLogger(@"[reMarkable]   a3 = %u (0x%x)", a3, a3);
+    NSLogger(@"[reMarkable]   a4 = 0x%llx", (unsigned long long)a4);
+    
+    logMemory("Memory at a1", (void *)a1, 64);
+    logMemory("Memory at a2", (void *)a2, 64);
+    
+    if (a2 && *a2 != 0) {
+        logMemory("Memory at *a2", (void *)*a2, 64);
+    }
+    
+    logMemory("Memory at a4", (void *)a4, 64);
+    
+    if (original_function_at_0x10016D520) {
+        int64_t result = original_function_at_0x10016D520(a1, a2, a3, a4);
+        NSLogger(@"[reMarkable]   result = 0x%llx", (unsigned long long)result);
+        return result;
+    }
+    
+    NSLogger(@"[reMarkable] WARNING: Original function not available, returning 0");
+    return 0;
+}
+
+extern "C" void hooked_function_at_0x1001B6EE0(int64_t a1, int64_t *a2, unsigned int a3) {
+    NSLogger(@"[reMarkable] Hook at 0x1001B6EE0 called!");
+    NSLogger(@"[reMarkable]   a1 = 0x%llx", (unsigned long long)a1);
+    
+    // At a1 (PdfExporter object):
+    // +0x10 contains a QString (likely document name)
+    NSLogger(@"[reMarkable] Reading QString at a1+0x10:");
+    logMemory("a1 + 0x10 (raw)", (void *)(a1 + 0x10), 64);
+
+    void **qstrPtr = (void **)(a1 + 0x10);
+    void *dataPtr = *qstrPtr;
+
+    if (!dataPtr) {
+        NSLogger(@"[reMarkable] QString has null data pointer");
+        return;
+    }
+
+    // Try reading potential size fields near dataPtr
+    int32_t size = 0;
+    for (int delta = 4; delta <= 32; delta += 4) {
+        int32_t candidate = *(int32_t *)((char *)dataPtr - delta);
+        if (candidate > 0 && candidate < 10000) {
+            size = candidate;
+            NSLogger(@"[reMarkable] QString plausible size=%d (found at -%d)", size, delta);
+            break;
+        }
+    }
+
+    if (size > 0) {
+        NSString *qstringValue = [[NSString alloc] initWithCharacters:(unichar *)dataPtr length:size];
+        NSLogger(@"[reMarkable] QString value: \"%@\"", qstringValue);
+    } else {
+        NSLogger(@"[reMarkable] QString: could not find valid size");
+    }
+    
+    NSLogger(@"[reMarkable]   a2 = %p", a2);
+    if (a2) {
+        NSLogger(@"[reMarkable]   *a2 = 0x%llx", (unsigned long long)*a2);
+    }
+    NSLogger(@"[reMarkable]   a3 = %u (0x%x)", a3, a3);
+    
+    if (original_function_at_0x1001B6EE0) {
+        original_function_at_0x1001B6EE0(a1, a2, a3);
+        NSLogger(@"[reMarkable] Original function at 0x1001B6EE0 executed");
+    } else {
+        NSLogger(@"[reMarkable] WARNING: Original function not available");
+    }
+}
+
+extern "C" int64_t hooked_qmlregister(
+    int64_t a1,
+    int64_t a2,
+    int64_t a3,
+    int64_t a4,
+    int64_t a5,
+    int64_t a6,
+    int a7,
+    int64_t a8,
+    int a9,
+    int64_t a10) {
+    
+    NSLogger(@"[reMarkable] ========================================");
+    NSLogger(@"[reMarkable] QQmlPrivate::qmlregister called!");
+    NSLogger(@"[reMarkable] ========================================");
+    NSLogger(@"[reMarkable]   a1 (RegistrationType) = 0x%llx (%lld)", (unsigned long long)a1, (long long)a1);
+    NSLogger(@"[reMarkable]   a2  = 0x%llx (%lld)", (unsigned long long)a2, (long long)a2);
+    NSLogger(@"[reMarkable]   a3  = 0x%llx (%lld)", (unsigned long long)a3, (long long)a3);
+    NSLogger(@"[reMarkable]   a4  = 0x%llx (%lld)", (unsigned long long)a4, (long long)a4);
+    NSLogger(@"[reMarkable]   a5  = 0x%llx (%lld)", (unsigned long long)a5, (long long)a5);
+    NSLogger(@"[reMarkable]   a6  = 0x%llx (%lld)", (unsigned long long)a6, (long long)a6);
+    NSLogger(@"[reMarkable]   a7  = 0x%x (%d)", a7, a7);
+    NSLogger(@"[reMarkable]   a8  = 0x%llx (%lld)", (unsigned long long)a8, (long long)a8);
+    NSLogger(@"[reMarkable]   a9  = 0x%x (%d)", a9, a9);
+    NSLogger(@"[reMarkable]   a10 = 0x%llx (%lld)", (unsigned long long)a10, (long long)a10);
+    
+    // Check for PlatformHelpers registration
+    // a1 == 0 means TypeRegistration (object registration)
+    // a4 must be a valid pointer (not a small integer like 0, 1, 2, etc.)
+    if (a1 == 0 && a4 > 0x10000) {
+        const char *typeName = (const char *)a4;
+        
+        int len = 0;
+        bool isValid = true;
+        for (int i = 0; i < 256; i++) {
+            char c = typeName[i];
+            if (c == '\0') {
+                break;
+            }
+            if (c < 0x20 || c > 0x7e) {
+                isValid = false;
+                break;
+            }
+            len++;
+        }
+        
+        if (isValid && len > 0) {
+            NSLogger(@"[reMarkable]   typeName (a4) = \"%.*s\"", len, typeName);
+            
+            if (len == 15 && strncmp(typeName, "PlatformHelpers", 15) == 0) {
+                NSLogger(@"[reMarkable] !!! FOUND PlatformHelpers type registration !!!");
+                NSLogger(@"[reMarkable]   factory ptr (a2) = %p", (void *)a2);
+                NSLogger(@"[reMarkable]   a3 (metaObject?) = %p", (void *)a3);
+                NSLogger(@"[reMarkable]   a5 = %p", (void *)a5);
+                NSLogger(@"[reMarkable]   a6 = %p", (void *)a6);
+                logMemory("Factory ptr memory", (void *)a2, 64);
+                logMemory("a3 memory (metaObject?)", (void *)a3, 64);
+                logStackTrace("PlatformHelpers registration");
+            }
+        }
+    }
+    
+    // Try to interpret a2 as memory region for other registration types
+    if (a2 > 0x10000 && a1 != 0) {
+        logMemory("Memory at a2", (void *)a2, 64);
+        const char *maybeStr = (const char *)a2;
+        bool isPrintable = true;
+        int len = 0;
+        for (int i = 0; i < 128 && maybeStr[i]; i++) {
+            if (maybeStr[i] < 0x20 || maybeStr[i] > 0x7e) {
+                isPrintable = false;
+                break;
+            }
+            len++;
+        }
+        if (isPrintable && len > 0) {
+            NSLogger(@"[reMarkable]   a2 as string: \"%.*s\"", len, maybeStr);
+        }
+    }
+    
+    int64_t result = 0;
+    if (original_qmlregister) {
+        result = original_qmlregister(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
+        NSLogger(@"[reMarkable]   result = 0x%llx (%lld)", (unsigned long long)result, (long long)result);
+    } else {
+        NSLogger(@"[reMarkable] WARNING: Original qmlregister not available!");
+    }
+    
+    NSLogger(@"[reMarkable] ========================================");
+    return result;
+}
+
+#endif // BUILD_MODE_DEV

src/reMarkable/reMarkable.m

@@ -4,6 +4,12 @@
 #import "MemoryUtils.h"
 #import "Logger.h"
 #import "ResourceUtils.h"
+#ifdef BUILD_MODE_DEV
+#import "DevHooks.h"
+#endif
+#ifdef BUILD_MODE_QMLREBUILD
+#import "MessageBroker.h"
+#endif
 #import <objc/runtime.h>
 #import <Cocoa/Cocoa.h>
 #include <stdint.h>
@@ -26,6 +32,7 @@
 #include <QtCore/QVariant>
 #include <QtCore/QAnyStringView>
 
+
 static NSString *const kReMarkableConfigFileName = @"rmfakecloud.config";
 static NSString *const kReMarkableConfigHostKey = @"host";
 static NSString *const kReMarkableConfigPortKey = @"port";
@@ -240,7 +247,7 @@ static void (*original_qWebSocket_open)(
     const QNetworkRequest &request) = NULL;
 #endif
 
-#ifdef BUILD_MODE_QMLDIFF
+#ifdef BUILD_MODE_QMLREBUILD
 static int (*original_qRegisterResourceData)(
     int,
     const unsigned char *,
@@ -248,63 +255,7 @@ static int (*original_qRegisterResourceData)(
     const unsigned char *) = NULL;
 #endif
 
-#ifdef BUILD_MODE_DEV
-static ssize_t (*original_qIODevice_write)(
-    QIODevice *self,
-    const char *data,
-    qint64 maxSize) = NULL;
 
-// Hook for function at 0x10015A130
-static int64_t (*original_function_at_0x10015A130)(int64_t a1, int64_t a2) = NULL;
-
-// Hook for function at 0x10015BC90
-static void (*original_function_at_0x10015BC90)(int64_t a1, int64_t a2) = NULL;
-
-// Hook for function at 0x10016D520
-static int64_t (*original_function_at_0x10016D520)(int64_t a1, int64_t *a2, unsigned int a3, int64_t a4) = NULL;
-
-// Hook for function at 0x1001B6EE0
-static void (*original_function_at_0x1001B6EE0)(int64_t a1, int64_t *a2, unsigned int a3) = NULL;
-#endif
-
-#if defined(BUILD_MODE_DEV)
-// Memory logging helper function
-static void logMemory(const char *label, void *address, size_t length) {
-    if (!address) {
-        NSLogger(@"[reMarkable]   %s: (null)", label);
-        return;
-    }
-    
-    unsigned char *ptr = (unsigned char *)address;
-    NSMutableString *hexLine = [NSMutableString stringWithFormat:@"[reMarkable]   %s: ", label];
-    
-    for (size_t i = 0; i < length; i++) {
-        [hexLine appendFormat:@"%02x ", ptr[i]];
-        if ((i + 1) % 16 == 0 && i < length - 1) {
-            NSLogger(@"%@", hexLine);
-            hexLine = [NSMutableString stringWithString:@"[reMarkable]                    "];
-        }
-    }
-    
-    // Log remaining bytes if any
-    if ([hexLine length] > 28) {  // More than just the prefix
-        NSLogger(@"%@", hexLine);
-    }
-}
-
-// Stack trace logging helper function
-static void logStackTrace(const char *label) {
-    NSLogger(@"[reMarkable] %s - Stack trace:", label);
-    NSArray<NSString *> *callStack = [NSThread callStackSymbols];
-    NSUInteger count = [callStack count];
-    
-    // Skip first 2 frames (this function and the immediate caller's logging statement)
-    for (NSUInteger i = 0; i < count; i++) {
-        NSString *frame = callStack[i];
-        NSLogger(@"[reMarkable]   #%lu: %@", (unsigned long)i, frame);
-    }
-}
-#endif
 
 #ifdef BUILD_MODE_RMFAKECLOUD
 static inline bool shouldPatchURL(const QString &host) {
@@ -352,23 +303,30 @@ static inline bool shouldPatchURL(const QString &host) {
                          logPrefix:@"[reMarkable]"];
 #endif
 
-#ifdef BUILD_MODE_QMLDIFF
-    NSLogger(@"[reMarkable] Build mode: qmldiff");
+#ifdef BUILD_MODE_QMLREBUILD
+    NSLogger(@"[reMarkable] Build mode: qmlrebuild");
+    
+    // Register MessageBroker QML type for dylib <-> QML communication
+    messagebroker::registerQmlType();
+    
+    // Register native callback to receive signals from QML
+    messagebroker::setNativeCallback([](const char *signal, const char *value) {
+        NSLogger(@"[reMarkable] Native callback received signal '%s' with value '%s'", signal, value);
+    });
+    
     [MemoryUtils hookSymbol:@"QtCore"
                         symbolName:@"__Z21qRegisterResourceDataiPKhS0_S0_"
                       hookFunction:(void *)hooked_qRegisterResourceData
                   originalFunction:(void **)&original_qRegisterResourceData
                          logPrefix:@"[reMarkable]"];
+
+    // Send a delayed broadcast to QML (after UI has loaded)
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        messagebroker::broadcast("signalName", "Hello from dylib!");
+    });
 #endif
 
 #ifdef BUILD_MODE_DEV
-    // // Hook function at address 0x1????
-    // [MemoryUtils hookAddress:@"reMarkable"
-    //            staticAddress:0x????
-    //             hookFunction:(void *)hooked_function_at_0x????
-    //         originalFunction:(void **)&original_function_at_0x????
-    //                logPrefix:@"[reMarkable]"];
-    
     NSLogger(@"[reMarkable] Build mode: dev/reverse engineering");
     // [MemoryUtils hookSymbol:@"QtCore"
     //                 symbolName:@"__ZN9QIODevice5writeEPKcx"
@@ -403,6 +361,29 @@ static inline bool shouldPatchURL(const QString &host) {
     //             hookFunction:(void *)hooked_function_at_0x1001B6EE0
     //         originalFunction:(void **)&original_function_at_0x1001B6EE0
     //                logPrefix:@"[reMarkable]"];
+
+    // PlatformHelpers.exportFile implementation WIP
+
+    // // Hook function at address 0x100011790
+    // [MemoryUtils hookAddress:@"reMarkable"
+    //            staticAddress:0x100011790
+    //             hookFunction:(void *)hooked_function_at_0x100011790
+    //         originalFunction:(void **)&original_function_at_0x100011790
+    //                logPrefix:@"[reMarkable]"];
+
+    // // Hook function at address 0x100011CE0
+    // [MemoryUtils hookAddress:@"reMarkable"
+    //            staticAddress:0x100011CE0
+    //             hookFunction:(void *)hooked_function_at_0x100011CE0
+    //         originalFunction:(void **)&original_function_at_0x100011CE0
+    //                logPrefix:@"[reMarkable]"];
+
+    // [MemoryUtils hookSymbol:@"QtQml"
+    //                 symbolName:@"__ZN11QQmlPrivate11qmlregisterENS_16RegistrationTypeEPv"
+    //               hookFunction:(void *)hooked_qmlregister
+    //           originalFunction:(void **)&original_qmlregister
+    //                  logPrefix:@"[reMarkable]"];
+
 #endif
 
     return YES;
@@ -463,9 +444,9 @@ extern "C" void hooked_qWebSocket_open(
 }
 #endif // BUILD_MODE_RMFAKECLOUD
 
-#ifdef BUILD_MODE_QMLDIFF
+#ifdef BUILD_MODE_QMLREBUILD
 
-// See https://deepwiki.com/search/once-the-qrr-file-parsed-take_871f24a0-8636-4aee-bddf-7405b6e32584 for details on qmldiff replacement strategy
+// See https://deepwiki.com/search/once-the-qrr-file-parsed-take_871f24a0-8636-4aee-bddf-7405b6e32584 for details on qmlrebuild replacement strategy
 
 extern "C" int hooked_qRegisterResourceData(
     int version,
@@ -478,172 +459,92 @@ extern "C" int hooked_qRegisterResourceData(
     }
 
     pthread_mutex_lock(&gResourceMutex);
-
     struct ResourceRoot resource = {
         .data = (uint8_t *)data,
         .name = (uint8_t *)name,
         .tree = (uint8_t *)tree,
+
         .treeSize = 0,
         .dataSize = 0,
         .originalDataSize = 0,
         .nameSize = 0,
+
         .entriesAffected = 0,
     };
 
+    NSLogger(@"[reMarkable] Registering Qt resource version %d tree:%p name:%p data:%p",
+             version, tree, name, data);
+
     statArchive(&resource, 0);
-    processNode(&resource, 0, "");
+    
+    // Make a writable copy of the tree (we need to modify offsets)
     resource.tree = (uint8_t *)malloc(resource.treeSize);
-    if (resource.tree) {
-        memcpy(resource.tree, tree, resource.treeSize);
+    if (!resource.tree) {
+        NSLogger(@"[reMarkable] Failed to allocate tree buffer");
+        pthread_mutex_unlock(&gResourceMutex);
+        return original_qRegisterResourceData(version, tree, name, data);
+    }
+    memcpy(resource.tree, tree, resource.treeSize);
+
+    // Process nodes and mark replacements
+    processNode(&resource, 0, "");
+    NSLogger(@"[reMarkable] Processing done! Entries affected: %d, dataSize: %zu, originalDataSize: %zu", 
+             resource.entriesAffected, resource.dataSize, resource.originalDataSize);
+
+    const unsigned char *finalTree = tree;
+    const unsigned char *finalData = data;
+    uint8_t *newDataBuffer = NULL;
+
+    if (resource.entriesAffected > 0) {
+        NSLogger(@"[reMarkable] Rebuilding data tables... (entries: %d)", resource.entriesAffected);
+        
+        // Allocate new data buffer (original size + space for replacements)
+        newDataBuffer = (uint8_t *)malloc(resource.dataSize);
+        if (!newDataBuffer) {
+            NSLogger(@"[reMarkable] Failed to allocate new data buffer (%zu bytes)", resource.dataSize);
+            free(resource.tree);
+            clearReplacementEntries();
+            pthread_mutex_unlock(&gResourceMutex);
+            return original_qRegisterResourceData(version, tree, name, data);
+        }
+        
+        // Copy original data
+        memcpy(newDataBuffer, data, resource.originalDataSize);
+        
+        // Copy replacement entries to their designated offsets
+        struct ReplacementEntry *entry = getReplacementEntries();
+        while (entry) {
+            // Write size prefix (4 bytes, big-endian)
+            writeUint32(newDataBuffer, (int)entry->copyToOffset, (uint32_t)entry->size);
+            // Write data after size prefix
+            memcpy(newDataBuffer + entry->copyToOffset + 4, entry->data, entry->size);
+            
+            NSLogger(@"[reMarkable] Copied replacement for node %d at offset %zu (%zu bytes)", 
+                     entry->node, entry->copyToOffset, entry->size);
+            
+            entry = entry->next;
+        }
+        
+        finalTree = resource.tree;
+        finalData = newDataBuffer;
+        
+        NSLogger(@"[reMarkable] Data buffer rebuilt: original %zu bytes -> new %zu bytes", 
+                 resource.originalDataSize, resource.dataSize);
     }
 
-    NSLogger(@"[reMarkable] Registering Qt resource version %d tree:%p (size:%zu) name:%p (size:%zu) data:%p (size:%zu)",
-             version, tree, resource.treeSize, name, resource.nameSize, data, resource.dataSize);
-
-    int status = original_qRegisterResourceData(version, tree, name, data);
-    pthread_mutex_unlock(&gResourceMutex);
-    if (resource.tree) {
+    int status = original_qRegisterResourceData(version, finalTree, name, finalData);
+    
+    // Cleanup
+    clearReplacementEntries();
+    if (resource.tree && resource.entriesAffected == 0) {
         free(resource.tree);
     }
+    // Note: We intentionally don't free newDataBuffer or resource.tree when entriesAffected > 0
+    // because Qt will use these buffers for the lifetime of the application
+    
+    pthread_mutex_unlock(&gResourceMutex);
     return status;
 }
-#endif // BUILD_MODE_QMLDIFF
-
-#ifdef BUILD_MODE_DEV
-extern "C" ssize_t hooked_qIODevice_write(
-    QIODevice *self,
-    const char *data,
-    qint64 maxSize) {
-    NSLogger(@"[reMarkable] QIODevice::write called with maxSize: %lld", (long long)maxSize);
-    
-    // Log the call stack
-    logStackTrace("QIODevice::write call stack");
-    
-    // Log the data to write
-    logMemory("Data to write", (void *)data, (size_t)(maxSize < 64 ? maxSize : 64));
-    
-    if (original_qIODevice_write) {
-        ssize_t result = original_qIODevice_write(self, data, maxSize);
-        NSLogger(@"[reMarkable] QIODevice::write result: %zd", result);
-        return result;
-    }
-    NSLogger(@"[reMarkable] WARNING: Original QIODevice::write not available, returning 0");
-    return 0;
-}
-
-extern "C" int64_t hooked_function_at_0x10015A130(int64_t a1, int64_t a2) {
-    NSLogger(@"[reMarkable] Hook at 0x10015A130 called!");
-    NSLogger(@"[reMarkable]   a1 = 0x%llx", (unsigned long long)a1);
-    NSLogger(@"[reMarkable]   a2 = 0x%llx", (unsigned long long)a2);
-
-    logMemory("Memory at a1", (void *)a1, 64);
-    logMemory("Memory at a2", (void *)a2, 64);
-
-    if (original_function_at_0x10015A130) {
-        int64_t result = original_function_at_0x10015A130(a1, a2);
-        NSLogger(@"[reMarkable]   result = 0x%llx", (unsigned long long)result);
-        return result;
-    }
-
-    NSLogger(@"[reMarkable] WARNING: Original function at 0x10015A130 not available, returning 0");
-    return 0;
-}
-
-extern "C" void hooked_function_at_0x10015BC90(int64_t a1, int64_t a2) {
-    NSLogger(@"[reMarkable] Hook at 0x10015BC90 called!");
-    NSLogger(@"[reMarkable]   a1 = 0x%llx", (unsigned long long)a1);
-    NSLogger(@"[reMarkable]   a2 = 0x%llx", (unsigned long long)a2);
-
-    logMemory("Memory at a1", (void *)a1, 64);
-    logMemory("Memory at a2", (void *)a2, 64);
-
-    if (original_function_at_0x10015BC90) {
-        original_function_at_0x10015BC90(a1, a2);
-        NSLogger(@"[reMarkable]   original function returned (void)");
-        return;
-    }
-
-    NSLogger(@"[reMarkable] WARNING: Original function at 0x10015BC90 not available");
-}
-
-extern "C" int64_t hooked_function_at_0x10016D520(int64_t a1, int64_t *a2, unsigned int a3, int64_t a4) {
-    NSLogger(@"[reMarkable] Hook at 0x10016D520 called!");
-    NSLogger(@"[reMarkable]   a1 = 0x%llx", (unsigned long long)a1);
-    NSLogger(@"[reMarkable]   a2 = %p", a2);
-    if (a2) {
-        NSLogger(@"[reMarkable]   *a2 = 0x%llx", (unsigned long long)*a2);
-    }
-    NSLogger(@"[reMarkable]   a3 = %u (0x%x)", a3, a3);
-    NSLogger(@"[reMarkable]   a4 = 0x%llx", (unsigned long long)a4);
-    
-    // Log memory contents using helper function
-    logMemory("Memory at a1", (void *)a1, 64);
-    logMemory("Memory at a2", (void *)a2, 64);
-    
-    if (a2 && *a2 != 0) {
-        logMemory("Memory at *a2", (void *)*a2, 64);
-    }
-    
-    logMemory("Memory at a4", (void *)a4, 64);
-    
-    if (original_function_at_0x10016D520) {
-        int64_t result = original_function_at_0x10016D520(a1, a2, a3, a4);
-        NSLogger(@"[reMarkable]   result = 0x%llx", (unsigned long long)result);
-        return result;
-    }
-    
-    NSLogger(@"[reMarkable] WARNING: Original function not available, returning 0");
-    return 0;
-}
-
-extern "C" void hooked_function_at_0x1001B6EE0(int64_t a1, int64_t *a2, unsigned int a3) {
-    NSLogger(@"[reMarkable] Hook at 0x1001B6EE0 called!");
-    NSLogger(@"[reMarkable]   a1 = 0x%llx", (unsigned long long)a1);
-    
-    // At a1 (PdfExporter object at 0x7ff4c17391e0):
-    // +0x10   0x000600043EC10    QString (likely document name)
-    NSLogger(@"[reMarkable] Reading QString at a1+0x10:");
-    logMemory("a1 + 0x10 (raw)", (void *)(a1 + 0x10), 64);
-
-    void **qstrPtr = (void **)(a1 + 0x10);
-    void *dataPtr = *qstrPtr;
-
-    if (!dataPtr) {
-        NSLogger(@"[reMarkable] QString has null data pointer");
-        return;
-    }
-
-    // try reading potential size fields near dataPtr
-    int32_t size = 0;
-    for (int delta = 4; delta <= 32; delta += 4) {
-        int32_t candidate = *(int32_t *)((char *)dataPtr - delta);
-        if (candidate > 0 && candidate < 10000) {
-            size = candidate;
-            NSLogger(@"[reMarkable] QString plausible size=%d (found at -%d)", size, delta);
-            break;
-        }
-    }
-
-    if (size > 0) {
-        NSString *qstringValue = [[NSString alloc] initWithCharacters:(unichar *)dataPtr length:size];
-        NSLogger(@"[reMarkable] QString value: \"%@\"", qstringValue);
-    } else {
-        NSLogger(@"[reMarkable] QString: could not find valid size");
-    }
-    
-    NSLogger(@"[reMarkable]   a2 = %p", a2);
-    if (a2) {
-        NSLogger(@"[reMarkable]   *a2 = 0x%llx", (unsigned long long)*a2);
-    }
-    NSLogger(@"[reMarkable]   a3 = %u (0x%x)", a3, a3);
-    
-    if (original_function_at_0x1001B6EE0) {
-        original_function_at_0x1001B6EE0(a1, a2, a3);
-        NSLogger(@"[reMarkable] Original function at 0x1001B6EE0 executed");
-    } else {
-        NSLogger(@"[reMarkable] WARNING: Original function not available");
-    }
-}
-#endif // BUILD_MODE_DEV
+#endif // BUILD_MODE_QMLREBUILD
 
 @end

src/utils/MessageBroker.h

@@ -0,0 +1,63 @@
+// Credits: asivery/rm-xovi-extensions 
+// (https://github.com/asivery/rm-xovi-extensions/blob/master/xovi-message-broker/src/XoviMessageBroker.h)
+// Simplified for RMHook dylib <-> QML communication
+
+#pragma once
+
+#include <QObject>
+#include <QStringList>
+#include <QString>
+#include <QDebug>
+#include <QtQml/QQmlEngine>
+
+// Forward declaration
+class MessageBroker;
+
+// Native callback type for C++ listeners
+typedef void (*NativeSignalCallback)(const char *signal, const char *value);
+
+namespace messagebroker {
+    void addBroadcastListener(MessageBroker *ref);
+    void removeBroadcastListener(MessageBroker *ref);
+    void broadcast(const char *signal, const char *value);
+    void registerQmlType();
+    
+    // Register a native C++ callback to receive all signals
+    void setNativeCallback(NativeSignalCallback callback);
+}
+
+class MessageBroker : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QStringList listeningFor READ getListeningFor WRITE setListeningFor)
+
+public:
+    explicit MessageBroker(QObject *parent = nullptr) : QObject(parent) {
+        messagebroker::addBroadcastListener(this);
+    }
+
+    ~MessageBroker() {
+        messagebroker::removeBroadcastListener(this);
+    }
+
+    // Send a signal from QML to all listeners (including C++ side)
+    Q_INVOKABLE void sendSignal(const QString &signal, const QString &message) {
+        QByteArray signalUtf8 = signal.toUtf8();
+        QByteArray messageUtf8 = message.toUtf8();
+        messagebroker::broadcast(signalUtf8.constData(), messageUtf8.constData());
+    }
+
+    void setListeningFor(const QStringList &l) {
+        _listeningFor = l;
+    }
+
+    const QStringList& getListeningFor() const {
+        return _listeningFor;
+    }
+
+signals:
+    void signalReceived(const QString &signal, const QString &message);
+
+private:
+    QStringList _listeningFor;
+};

src/utils/MessageBroker.mm

@@ -0,0 +1,58 @@
+// Credits: asivery/rm-xovi-extensions 
+// (https://github.com/asivery/rm-xovi-extensions/blob/master/xovi-message-broker/src/XoviMessageBroker.h)
+
+#import <Foundation/Foundation.h>
+#include "MessageBroker.h"
+#include "Logger.h"
+#include <vector>
+#include <cstring>
+#include <algorithm>
+
+static std::vector<MessageBroker *> brokers;
+static NativeSignalCallback nativeCallback = nullptr;
+
+void messagebroker::setNativeCallback(NativeSignalCallback callback) {
+    nativeCallback = callback;
+    NSLogger(@"[MessageBroker] Native callback registered");
+}
+
+void messagebroker::addBroadcastListener(MessageBroker *ref) {
+    // Cannot have more than one.
+    if(std::find(brokers.begin(), brokers.end(), ref) == brokers.end()) {
+        brokers.push_back(ref);
+        NSLogger(@"[MessageBroker] Added broadcast listener, total: %zu", brokers.size());
+    }
+}
+
+void messagebroker::removeBroadcastListener(MessageBroker *ref) {
+    std::vector<MessageBroker *>::iterator iter;
+    if((iter = std::find(brokers.begin(), brokers.end(), ref)) != brokers.end()) {
+        brokers.erase(iter);
+        NSLogger(@"[MessageBroker] Removed broadcast listener, remaining: %zu", brokers.size());
+    }
+}
+
+void messagebroker::broadcast(const char *signal, const char *value) {
+    QString qSignal(signal), qValue(value);
+    NSLogger(@"[MessageBroker] Broadcasting signal '%s' with value '%s'", signal, value);
+    
+    // Call native C++ callback if registered
+    if (nativeCallback) {
+        nativeCallback(signal, value);
+    }
+    
+    // Notify QML listeners
+    for(auto &ref : brokers) {
+        if(ref->getListeningFor().contains(qSignal)) {
+            emit ref->signalReceived(qSignal, qValue);
+        }
+    }
+}
+
+void messagebroker::registerQmlType() {
+    qmlRegisterType<MessageBroker>("net.noham.MessageBroker", 1, 0, "MessageBroker");
+    NSLogger(@"[MessageBroker] Registered QML type net.noham.MessageBroker");
+}
+
+// Include MOC output for MessageBroker class (generated by Qt's Meta-Object Compiler)
+#include "moc_MessageBroker.cpp"

src/utils/ResourceUtils.h

@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,6 +20,16 @@ struct ResourceRoot {
     int entriesAffected;
 };
 
+// Replacement entry for storing new data to be appended
+struct ReplacementEntry {
+    int node;
+    uint8_t *data;
+    size_t size;
+    size_t copyToOffset;
+    bool freeAfterwards;
+    struct ReplacementEntry *next;
+};
+
 #define TREE_ENTRY_SIZE 22
 #define DIRECTORY 0x02
 
@@ -35,8 +46,14 @@ void statArchive(struct ResourceRoot *root, int node);
 void processNode(struct ResourceRoot *root, int node, const char *rootName);
 void ReMarkableDumpResourceFile(struct ResourceRoot *root, int node, const char *rootName, const char *fileName, uint16_t flags);
 
+// Replacement utilities
+void addReplacementEntry(struct ReplacementEntry *entry);
+struct ReplacementEntry *getReplacementEntries(void);
+void clearReplacementEntries(void);
+void replaceNode(struct ResourceRoot *root, int node, const char *fullPath, int treeOffset);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* ResourceUtils_h */
+#endif

src/utils/ResourceUtils.m

@@ -36,7 +36,7 @@ static NSString *ReMarkableDumpRootDirectory(void) {
     return dumpDirectory;
 }
 
-#ifdef BUILD_MODE_QMLDIFF
+#ifdef BUILD_MODE_QMLREBUILD
 uint32_t readUInt32(uint8_t *addr, int offset) {
     return (uint32_t)(addr[offset + 0] << 24) |
            (uint32_t)(addr[offset + 1] << 16) |
@@ -344,6 +344,147 @@ void ReMarkableDumpResourceFile(struct ResourceRoot *root, int node, const char
     }
 }
 
+// List of files to process with replaceNode
+static const char *kFilesToReplace[] = {
+    "/qml/client/dialogs/ExportDialog.qml",
+    "/qml/client/settings/GeneralSettings.qml",
+    NULL  // Sentinel to mark end of list
+};
+
+static bool shouldReplaceFile(const char *fullPath) {
+    if (!fullPath) return false;
+    for (int i = 0; kFilesToReplace[i] != NULL; i++) {
+        if (strcmp(fullPath, kFilesToReplace[i]) == 0) {
+            return true;
+        }
+    }
+    return false;
+}
+
+// Get the path to replacement files directory
+static NSString *ReMarkableReplacementDirectory(void) {
+    static NSString *replacementDirectory = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        NSString *preferencesDir = ReMarkablePreferencesDirectory();
+        NSString *candidate = [preferencesDir stringByAppendingPathComponent:@"replacements"];
+        NSFileManager *fileManager = [NSFileManager defaultManager];
+        NSError *error = nil;
+        if (![fileManager fileExistsAtPath:candidate]) {
+            if (![fileManager createDirectoryAtPath:candidate withIntermediateDirectories:YES attributes:nil error:&error]) {
+                NSLogger(@"[reMarkable] Failed to create replacements directory %@: %@", candidate, error);
+            }
+        }
+        replacementDirectory = [candidate copy];
+    });
+    return replacementDirectory;
+}
+
+// Global linked list of replacement entries
+static struct ReplacementEntry *g_replacementEntries = NULL;
+
+void addReplacementEntry(struct ReplacementEntry *entry) {
+    entry->next = g_replacementEntries;
+    g_replacementEntries = entry;
+}
+
+struct ReplacementEntry *getReplacementEntries(void) {
+    return g_replacementEntries;
+}
+
+void clearReplacementEntries(void) {
+    struct ReplacementEntry *current = g_replacementEntries;
+    while (current) {
+        struct ReplacementEntry *next = current->next;
+        if (current->freeAfterwards && current->data) {
+            free(current->data);
+        }
+        free(current);
+        current = next;
+    }
+    g_replacementEntries = NULL;
+}
+
+void replaceNode(struct ResourceRoot *root, int node, const char *fullPath, int treeOffset) {
+    NSLogger(@"[reMarkable] replaceNode called for: %s", fullPath);
+    
+    if (!root || !root->tree || !fullPath) {
+        NSLogger(@"[reMarkable] replaceNode: invalid parameters");
+        return;
+    }
+    
+    // Build path to replacement file on disk
+    NSString *replacementDir = ReMarkableReplacementDirectory();
+    if (![replacementDir length]) {
+        NSLogger(@"[reMarkable] replaceNode: no replacement directory");
+        return;
+    }
+    
+    NSString *relativePath = [NSString stringWithUTF8String:fullPath];
+    if ([relativePath hasPrefix:@"/"]) {
+        relativePath = [relativePath substringFromIndex:1];
+    }
+    
+    NSString *replacementFilePath = [replacementDir stringByAppendingPathComponent:relativePath];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    
+    if (![fileManager fileExistsAtPath:replacementFilePath]) {
+        NSLogger(@"[reMarkable] replaceNode: replacement file not found at %@", replacementFilePath);
+        return;
+    }
+    
+    // Read the replacement file
+    NSError *readError = nil;
+    NSData *replacementData = [NSData dataWithContentsOfFile:replacementFilePath options:0 error:&readError];
+    if (!replacementData || readError) {
+        NSLogger(@"[reMarkable] replaceNode: failed to read replacement file %@: %@", replacementFilePath, readError);
+        return;
+    }
+    
+    size_t dataSize = [replacementData length];
+    NSLogger(@"[reMarkable] replaceNode: loaded replacement file %@ (%zu bytes)", replacementFilePath, dataSize);
+    
+    // Allocate and copy the replacement data
+    uint8_t *newData = (uint8_t *)malloc(dataSize);
+    if (!newData) {
+        NSLogger(@"[reMarkable] replaceNode: failed to allocate %zu bytes", dataSize);
+        return;
+    }
+    memcpy(newData, [replacementData bytes], dataSize);
+    
+    // Create a replacement entry
+    struct ReplacementEntry *entry = (struct ReplacementEntry *)malloc(sizeof(struct ReplacementEntry));
+    if (!entry) {
+        NSLogger(@"[reMarkable] replaceNode: failed to allocate replacement entry");
+        free(newData);
+        return;
+    }
+    
+    entry->node = node;
+    entry->data = newData;
+    entry->size = dataSize;
+    entry->freeAfterwards = true;
+    entry->copyToOffset = root->dataSize;  // Will be appended at the end of data
+    entry->next = NULL;
+    
+    // Update the tree entry:
+    writeUint16(root->tree, treeOffset - 2, 0);  // Set flag to raw (uncompressed)
+    writeUint32(root->tree, treeOffset + 4, (uint32_t)entry->copyToOffset);  // Update data offset
+    
+    NSLogger(@"[reMarkable] replaceNode: updated tree - flags at offset %d, dataOffset at offset %d -> %zu", 
+             treeOffset - 2, treeOffset + 4, entry->copyToOffset);
+    
+    // Update dataSize to account for the new data (size prefix + data)
+    root->dataSize += entry->size + 4;
+    root->entriesAffected++;
+    
+    // Add to replacement entries list
+    addReplacementEntry(entry);
+    
+    NSLogger(@"[reMarkable] replaceNode: marked for replacement - %s (new offset: %zu, size: %zu)", 
+             fullPath, entry->copyToOffset, entry->size);
+}
+
 void processNode(struct ResourceRoot *root, int node, const char *rootName) {
     int offset = findOffset(node) + 4;
     uint16_t flags = readUInt16(root->tree, offset);
@@ -375,9 +516,42 @@ void processNode(struct ResourceRoot *root, int node, const char *rootName) {
 
         free(tempRoot);
     } else {
-        NSLogger(@"[reMarkable] Processing node %d: %s%s", (int)node, rootName ? rootName : "", nameBuffer);
-        uint16_t fileFlags = readUInt16(root->tree, offset - 2);
-        ReMarkableDumpResourceFile(root, node, rootName ? rootName : "", nameBuffer, fileFlags);
+        uint16_t fileFlag = readUInt16(root->tree, offset - 2);
+        const char *type;
+        if (fileFlag == 1) {
+            type = "zlib";
+        } else if (fileFlag == 4) {
+            type = "zstd";
+        } else if (fileFlag == 0) {
+            type = "raw";
+        } else {
+            type = "unknown";
+        }
+        
+        // Build full path: rootName + nameBuffer
+        const size_t rootLen = rootName ? strlen(rootName) : 0;
+        const size_t nameLen = strlen(nameBuffer);
+        char *fullPath = (char *)malloc(rootLen + nameLen + 1);
+        if (fullPath) {
+            if (rootLen > 0) {
+                memcpy(fullPath, rootName, rootLen);
+            }
+            memcpy(fullPath + rootLen, nameBuffer, nameLen);
+            fullPath[rootLen + nameLen] = '\0';
+            
+            NSLogger(@"[reMarkable] Processing node %d: %s (type: %s)", (int)node, fullPath, type);
+            
+            // Check if this file should be replaced
+            if (shouldReplaceFile(fullPath)) {
+                replaceNode(root, node, fullPath, offset);
+            }
+            
+            free(fullPath);
+        } else {
+            NSLogger(@"[reMarkable] Processing node %d: %s%s (type: %s)", (int)node, rootName ? rootName : "", nameBuffer, type);
+        }
+        
+        // ReMarkableDumpResourceFile(root, node, rootName ? rootName : "", nameBuffer, fileFlag);
     }
 }
-#endif // BUILD_MODE_QMLDIFF
+#endif // BUILD_MODE_QMLREBUILD