frida-java-bridge 7.0.0 → 7.0.2

package/index.js

@@ -334,7 +334,7 @@ class Runtime {
       }
 
       if (this._pollListener === null) {
-        this._pollListener = Interceptor.attach(Module.getExportByName('libc.so', 'epoll_wait'), this._makePollHook());
+        this._pollListener = Interceptor.attach(Process.getModuleByName('libc.so').getExportByName('epoll_wait'), this._makePollHook());
         Interceptor.flush();
       }
 
@@ -539,7 +539,7 @@ class Runtime {
         return result;
       }
 
-      const readlink = new NativeFunction(Module.getExportByName(null, 'readlink'), 'pointer', ['pointer', 'pointer', 'pointer'], {
+      const readlink = new NativeFunction(Module.getGlobalExportByName('readlink'), 'pointer', ['pointer', 'pointer', 'pointer'], {
         exceptions: 'propagate'
       });
 

package/lib/android.js

@@ -1271,7 +1271,11 @@ const PROP_VALUE_MAX = 92;
 
 function getAndroidSystemProperty (name) {
   if (systemPropertyGet === null) {
-    systemPropertyGet = new NativeFunction(Module.getExportByName('libc.so', '__system_property_get'), 'int', ['pointer', 'pointer'], nativeFunctionOptions);
+    systemPropertyGet = new NativeFunction(
+      Process.getModuleByName('libc.so').getExportByName('__system_property_get'),
+      'int',
+      ['pointer', 'pointer'],
+      nativeFunctionOptions);
   }
   const buf = Memory.alloc(PROP_VALUE_MAX);
   systemPropertyGet(Memory.allocUtf8String(name), buf);
@@ -2792,7 +2796,7 @@ std_string_get_data (StdString * str)
     translate_location: api['art::Monitor::TranslateLocation'],
     get_class_location: api['art::mirror::Class::GetLocation'],
     cxx_delete: api.$delete,
-    strtoul: Module.getExportByName('libc.so', 'strtoul')
+    strtoul: Process.getModuleByName('libc.so').getExportByName('strtoul')
   });
 
   const _create = new NativeFunction(cm._create, 'pointer', ['pointer', 'uint'], nativeFunctionOptions);
@@ -3748,8 +3752,9 @@ class JdwpSession {
      * We partially stub out the ADB JDWP transport to ensure we always
      * succeed in starting JDWP. Failure will crash the process.
      */
-    const acceptImpl = Module.getExportByName('libart.so', '_ZN3art4JDWP12JdwpAdbState6AcceptEv');
-    const receiveClientFdImpl = Module.getExportByName('libart.so', '_ZN3art4JDWP12JdwpAdbState15ReceiveClientFdEv');
+    const libart = Process.getModuleByName('libart.so');
+    const acceptImpl = libart.getExportByName('_ZN3art4JDWP12JdwpAdbState6AcceptEv');
+    const receiveClientFdImpl = libart.getExportByName('_ZN3art4JDWP12JdwpAdbState15ReceiveClientFdEv');
 
     const controlPair = makeSocketPair();
     const clientPair = makeSocketPair();
@@ -3836,7 +3841,7 @@ function makeJdwpOptions () {
 function makeSocketPair () {
   if (socketpair === null) {
     socketpair = new NativeFunction(
-      Module.getExportByName('libc.so', 'socketpair'),
+      Process.getModuleByName('libc.so').getExportByName('socketpair'),
       'int',
       ['int', 'int', 'int', 'pointer']);
   }

package/lib/class-model.js

@@ -1320,7 +1320,7 @@ function compileModule (env) {
       api['art::ClassLinker::VisitClasses'],
       api['art::mirror::Class::GetDescriptor'],
       api['art::ArtMethod::PrettyMethod'],
-      Module.getExportByName('libc.so', 'free')
+      Process.getModuleByName('libc.so').getExportByName('free')
     ]
       .forEach((value, i) => {
         if (value === undefined) {

package/lib/jvm.js

@@ -53,7 +53,7 @@ function _getApi () {
 
   const pending = Process.platform === 'windows'
     ? [{
-        module: vmModule.path,
+        module: vmModule,
         functions: {
           JNI_GetCreatedJavaVMs: ['JNI_GetCreatedJavaVMs', 'int', ['pointer', 'int', 'pointer']],
           JVM_Sleep: ['JVM_Sleep', 'void', ['pointer', 'pointer', 'long']],
@@ -94,7 +94,7 @@ function _getApi () {
       }]
   // If platform is not Windows
     : [{
-        module: vmModule.path,
+        module: vmModule,
         functions: {
           JNI_GetCreatedJavaVMs: ['JNI_GetCreatedJavaVMs', 'int', ['pointer', 'int', 'pointer']],
 
@@ -277,19 +277,18 @@ function _getApi () {
   const missing = [];
 
   pending.forEach(function (api) {
+    const module = api.module;
     const functions = api.functions || {};
     const variables = api.variables || {};
     const optionals = new Set(api.optionals || []);
 
-    const tmp = Module
-      .enumerateExports(api.module)
+    const tmp = module.enumerateExports()
       .reduce(function (result, exp) {
         result[exp.name] = exp;
         return result;
       }, {});
 
-    const exportByName = Module
-      .enumerateSymbols(api.module)
+    const exportByName = module.enumerateSymbols()
       .reduce(function (result, exp) {
         result[exp.name] = exp;
         return result;
@@ -350,7 +349,7 @@ function _getApi () {
       };
 
   for (const [name, [rawName, retType, argTypes]] of Object.entries(allocatorFunctions)) {
-    let address = Module.findExportByName(null, rawName);
+    let address = Module.findGlobalExportByName(rawName);
     if (address === null) {
       address = DebugSymbol.fromName(rawName).address;
       if (address.isNull()) {

package/lib/mkdex.js

@@ -1,4 +1,3 @@
-// import SHA1 from 'jssha/dist/sha1';
 import { Buffer } from 'buffer';
 
 const kAccPublic = 0x0001;

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "frida-java-bridge",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Java runtime interop from Frida",
+  "keywords": [
+    "frida-gum",
+    "frida-gum-bridge"
+  ],
   "type": "module",
   "main": "index.js",
   "files": [