majjo/PurrfectSnap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(composer): runtime migration

Browse Source 
Signed-off-by: rhunk <101876869+rhunk@users.noreply.github.com>
This commit is contained in:
rhunk
2025-05-17 16:21:49 +02:00
parent 5c87df9b9a
commit 3ff163c600
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
composer/src/main/ts/composer.ts
View File

@@ -1,4 +1,6 @@
export const jsx = require('composer_core/src/JSX').jsx;
export const assetCatalog = require("composer_core/src/AssetCatalog")
export const style = require("composer_core/src/Style");
import { runtimeName } from "./imports"
export const jsx = require(runtimeName + '_core/src/JSX').jsx;
export const assetCatalog = require(runtimeName + "_core/src/AssetCatalog")
export const style = require(runtimeName + "_core/src/Style");
export const colors = require("coreui/src/styles/semanticColors");

5
composer/src/main/ts/imports.ts
View File

@@ -1,7 +1,10 @@
import { Config, FriendInfo } from "./types";
declare var _getImportsFunctionName: string;
const remoteImports = require('composer_core/src/DeviceBridge')[_getImportsFunctionName]();
declare var _runtimeName: boolean;
export const runtimeName = _runtimeName;
const remoteImports = require(_runtimeName + '_core/src/DeviceBridge')[_getImportsFunctionName]();
function callRemoteFunction(method: string, ...args: any[]): any | null {
return remoteImports[method](...args);

23
core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/ComposerHooks.kt
View File

@@ -104,6 +104,8 @@ class ComposerHooks: Feature("ComposerHooks") {
override fun init() {
if (config.globalState != true) return
val nativeBridgeClass = runCatching { findClass("com.snapchat.client.valdi.NativeBridge") }.getOrNull() ?: findClass("com.snapchat.client.composer.NativeBridge")
val importedFunctions = mutableMapOf<String, Any?>()
fun composerFunction(name: String, block: ComposerMarshaller.() -> Unit) {
@@ -172,7 +174,8 @@ class ComposerHooks: Feature("ComposerHooks") {
context.native.setComposerLoader("""
const i = setInterval(() => {
try {
require('composer_core/src/DeviceBridge').getDisplayWidth();
const _runtimeName = "${if (nativeBridgeClass.name == "com.snapchat.client.valdi.NativeBridge") "valdi" else "composer"}";
require(_runtimeName + '_core/src/DeviceBridge').getDisplayWidth();
clearInterval(i);
(() => { const _getImportsFunctionName = "$getImportsFunctionName"; $loaderScript })();
} catch (e) {}
@@ -195,16 +198,14 @@ class ComposerHooks: Feature("ComposerHooks") {
}
}
findClass("com.snapchat.client.composer.NativeBridge").apply {
hook("registerNativeModuleFactory", HookStage.BEFORE) { param ->
val moduleFactory = param.argNullable<Any>(1) ?: return@hook
if (moduleFactory.javaClass.getMethod("getModulePath").invoke(moduleFactory)?.toString()?.contains("DeviceBridge") != true) return@hook
Hooker.ephemeralHookObjectMethod(moduleFactory.javaClass, moduleFactory, "loadModule", HookStage.AFTER) { methodParam ->
val result = methodParam.getResult() as? MutableMap<String, Any?> ?: return@ephemeralHookObjectMethod
result[getImportsFunctionName] = newComposerFunction {
pushUntyped(importedFunctions)
true
}
nativeBridgeClass.hook("registerNativeModuleFactory", HookStage.BEFORE) { param ->
val moduleFactory = param.argNullable<Any>(1) ?: return@hook
if (moduleFactory.javaClass.getMethod("getModulePath").invoke(moduleFactory)?.toString()?.contains("DeviceBridge") != true) return@hook
Hooker.ephemeralHookObjectMethod(moduleFactory.javaClass, moduleFactory, "loadModule", HookStage.AFTER) { methodParam ->
val result = methodParam.getResult() as? MutableMap<String, Any?> ?: return@ephemeralHookObjectMethod
result[getImportsFunctionName] = newComposerFunction {
pushUntyped(importedFunctions)
true
}
}
}