frida-java-bridge 5.0.0 → 5.2.2

package/lib/android.d.ts

@@ -0,0 +1,33 @@
+export function getApi(): Api;
+export function withRunnableArtThread(vm: VM, env: Env, callback: (thread: Thread) => void): void;
+export function translateMethod(methodId: NativePointerValue): NativePointer;
+
+export class ArtStackVisitor {
+    constructor(thread: Thread, context: Context, walkKind: WalkKind, numFrames?: number, checkSuspended?: boolean);
+    walkStack(includeTransitions?: boolean): void;
+    getMethod(): ArtMethod | null;
+    getCurrentQuickFramePc(): NativePointer;
+    getCurrentQuickFrame(): NativePointer;
+    getCurrentShadowFrame(): NativePointer;
+    describeLocation(): string;
+    getCurrentOatQuickMethodHeader(): NativePointer;
+    getCurrentQuickFrameInfo(): QuickFrameInfo;
+}
+
+export type WalkKind = "include-inlined-frames" | "skip-inlined-frames";
+
+export interface ArtMethod extends ObjectWrapper {
+    prettyMethod(withSignature?: boolean): string;
+}
+
+export interface QuickFrameInfo {
+    frameSizeInBytes: number;
+    coreSpillMask: number;
+    fpSpillMask: number;
+}
+
+export type Api = any;
+export type VM = any;
+export type Env = any;
+export type Thread = any;
+export type Context = any;

package/lib/android.js

@@ -1541,7 +1541,7 @@ set_replacement_method (gpointer original_method,
   g_mutex_lock (&lock);
 
   g_hash_table_insert (methods, original_method, replacement_method);
-  g_hash_table_add (replacements, replacement_method);
+  g_hash_table_insert (replacements, replacement_method, original_method);
 
   g_mutex_unlock (&lock);
 }
@@ -1563,6 +1563,20 @@ delete_replacement_method (gpointer original_method)
   g_mutex_unlock (&lock);
 }
 
+gpointer
+translate_method (gpointer method)
+{
+  gpointer translated_method;
+
+  g_mutex_lock (&lock);
+
+  translated_method = g_hash_table_lookup (replacements, method);
+
+  g_mutex_unlock (&lock);
+
+  return (translated_method != NULL) ? translated_method : method;
+}
+
 gpointer
 find_replacement_method_from_quick_code (gpointer method,
                                          gpointer thread)
@@ -1691,6 +1705,7 @@ on_leave_gc_concurrent_copying_copying_phase (GumInvocationContext * ic)
       get: new NativeFunction(cm.get_replacement_method, 'pointer', ['pointer'], fastOptions),
       set: new NativeFunction(cm.set_replacement_method, 'void', ['pointer', 'pointer'], fastOptions),
       delete: new NativeFunction(cm.delete_replacement_method, 'void', ['pointer'], fastOptions),
+      translate: new NativeFunction(cm.translate_method, 'pointer', ['pointer'], fastOptions),
       findReplacementFromQuickCode: cm.find_replacement_method_from_quick_code
     },
     getOatQuickMethodHeaderImpl,
@@ -1793,6 +1808,10 @@ function makeMethodMangler (methodId) {
   return new MethodMangler(methodId);
 }
 
+function translateMethod (methodId) {
+  return artController.replacedMethods.translate(methodId);
+}
+
 function revertGlobalPatches () {
   patchedClasses.forEach(entry => {
     entry.vtablePtr.writePointer(entry.vtable);
@@ -4045,6 +4064,7 @@ module.exports = {
   ArtStackVisitor,
   ArtMethod,
   makeMethodMangler,
+  translateMethod,
   revertGlobalPatches,
   deoptimizeEverything,
   deoptimizeBootImage,

package/lib/env.js

@@ -531,6 +531,10 @@ Env.prototype.monitorExit = proxy(218, 'int32', ['pointer', 'pointer'], function
   return impl(this.handle, obj);
 });
 
+Env.prototype.getDirectBufferAddress = proxy(230, 'pointer', ['pointer', 'pointer'], function (impl, obj) {
+  return impl(this.handle, obj);
+});
+
 Env.prototype.getObjectRefType = proxy(232, 'int32', ['pointer', 'pointer'], function (impl, ref) {
   return impl(this.handle, ref);
 });

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "frida-java-bridge",
-  "version": "5.0.0",
+  "version": "5.2.2",
   "description": "Java runtime interop from Frida",
   "main": "index.js",
   "files": [
     "/index.js",
-    "/lib/**/*.js"
+    "/lib/**/*.js",
+    "/lib/**/*.d.ts"
   ],
   "repository": {
     "type": "git",