frida 16.3.1 → 16.4.0

package/dist/device.js

@@ -97,11 +97,8 @@ class Device {
         return this.impl.spawn(program, argv, envp, env, cwd, stdio, aux, cancellable);
         function consumeOption(name) {
             const value = pendingOptions[name];
-            if (value === undefined) {
-                return null;
-            }
             delete pendingOptions[name];
-            return value;
+            return value !== null && value !== void 0 ? value : null;
         }
     }
     async input(target, data, cancellable) {

package/dist/system_parameters.d.ts

@@ -15,6 +15,10 @@ export interface SystemParameters {
          * Human-readable version string, e.g. `"11.2.2"`.
          */
         version?: string;
+        /**
+         * Build version, e.g. `"21B91"`.
+         */
+        build?: string;
     };
     /**
      * Platform, same as `Process.platform` in GumJS.
@@ -24,6 +28,23 @@ export interface SystemParameters {
      * Architecture, same as `Process.arch` in GumJS.
      */
     arch: "ia32" | "x64" | "arm" | "arm64" | "mips";
+    /**
+     * Hardware details.
+     */
+    hardware?: {
+        /**
+         * Product type, e.g. `"iPad6,3"`.
+         */
+        product?: string;
+        /**
+         * Hardware platform, e.g. `"t8010"`.
+         */
+        platform?: string;
+        /**
+         * Hardware model, e.g. `"J71bAP"`.
+         */
+        model?: string;
+    };
     /**
      * Level of access.
      */

package/lib/device.ts

@@ -141,11 +141,8 @@ export class Device {
 
         function consumeOption(name) {
             const value = pendingOptions[name];
-            if (value === undefined) {
-                return null;
-            }
             delete pendingOptions[name];
-            return value;
+            return value ?? null;
         }
     }
 

package/lib/system_parameters.ts

@@ -17,6 +17,11 @@ export interface SystemParameters {
          * Human-readable version string, e.g. `"11.2.2"`.
          */
         version?: string;
+
+        /**
+         * Build version, e.g. `"21B91"`.
+         */
+        build?: string;
     }
 
     /**
@@ -29,6 +34,26 @@ export interface SystemParameters {
      */
     arch: "ia32" | "x64" | "arm" | "arm64" | "mips";
 
+    /**
+     * Hardware details.
+     */
+    hardware?: {
+        /**
+         * Product type, e.g. `"iPad6,3"`.
+         */
+        product?: string;
+
+        /**
+         * Hardware platform, e.g. `"t8010"`.
+         */
+        platform?: string;
+
+        /**
+         * Hardware model, e.g. `"J71bAP"`.
+         */
+        model?: string;
+    }
+
     /**
      * Level of access.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida",
-  "version": "16.3.1",
+  "version": "16.4.0",
   "authors": [
     "Frida Developers"
   ],
@@ -21,7 +21,7 @@
   ],
   "homepage": "https://frida.re",
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=16 || 14 >=14.17"
   },
   "main": "./dist",
   "files": [

package/releng/deps.py

@@ -497,7 +497,7 @@ class Builder:
 
         if sourcedir.exists():
             self._print_status(pkg.name, "Reusing existing checkout")
-            current_rev = git("rev-parse", "FETCH_HEAD", check=True).stdout.strip()
+            current_rev = git("rev-parse", "FETCH_HEAD", cwd=sourcedir, check=True).stdout.strip()
             if current_rev != pkg.version:
                 self._print_status(pkg.name, "WARNING: Checkout does not match version in deps.toml")
         else:

package/releng/deps.toml

@@ -1,6 +1,6 @@
 [dependencies]
-version = "20240601"
-bootstrap_version = "20240531"
+version = "20240627"
+bootstrap_version = "20240625"
 
 [ninja]
 scope = "toolchain"
@@ -20,7 +20,7 @@ dependencies = [
 [vala]
 scope = "toolchain"
 name = "Vala"
-version = "2e32b7d182494094111808103efa5d4a06e6fda8"
+version = "2c7a02d29332dedfdf803ce21b0540bc8461a035"
 url = "https://github.com/frida/vala.git"
 dependencies = [
     "glib",
@@ -158,7 +158,7 @@ url = "https://github.com/frida/sqlite.git"
 [libunwind]
 when = "machine.os in {'linux', 'android', 'freebsd', 'qnx'}"
 name = "libunwind"
-version = "ccd3a38597a8397a3382e4e58fdabb26a6f0be13"
+version = "4d0abea0effd3c80916e70abe38c2a6156596f05"
 url = "https://github.com/frida/libunwind.git"
 options = [
     "-Dgeneric_library=disabled",
@@ -207,6 +207,12 @@ dependencies = [
     "openssl",
 ]
 
+[libusb]
+when = "machine.os in {'windows', 'macos', 'linux'}"
+name = "libusb"
+version = "be4d8ec1012f35ff6ce9474ed8d7c3ec4182ac55"
+url = "https://github.com/frida/libusb.git"
+
 [lwip]
 name = "lwIP"
 version = "9f64c40cac2e77eddf6b3913961fdd056d307716"
@@ -216,7 +222,7 @@ options = [
     "-Dipv6=enabled",
     "-Ddns=disabled",
     "-Darp=disabled",
-    "-Dethernet=disabled",
+    "-Dethernet=enabled",
     "-Dtcp_mss=1360",
     "-Dtcp_snd_buf=65535",
     "-Dtcp_wnd=65535",

package/src/device.cc

@@ -759,11 +759,19 @@ NAN_METHOD(Device::Spawn) {
       for (uint32_t i = 0; i != n; i++) {
         auto key = Nan::Get(keys, i).ToLocalChecked();
         auto value = Nan::Get(object, key).ToLocalChecked();
+        if (value->IsUndefined()) {
+          continue;
+        }
 
-        Nan::Utf8String key_str(key);
+        Nan::Utf8String k(key);
 
-        g_hash_table_insert(aux, g_strdup(*key_str),
-            g_variant_ref_sink(Runtime::ValueToVariant(value)));
+        auto v = Runtime::ValueToVariant(value);
+        if (v == NULL) {
+          valid = false;
+          break;
+        }
+
+        g_hash_table_insert(aux, g_strdup(*k), g_variant_ref_sink(v));
       }
     } else {
       Nan::ThrowTypeError("Bad argument, 'aux' must be an object");

package/src/iostream.cc

@@ -5,7 +5,6 @@
 
 #define IOSTREAM_DATA_CONSTRUCTOR "iostream:ctor"
 
-using v8::CopyablePersistentTraits;
 using v8::DEFAULT;
 using v8::External;
 using v8::Function;
@@ -185,12 +184,9 @@ class WriteOperation : public Operation<GIOStream> {
  public:
   WriteOperation(Isolate* isolate, Local<Value> buffer)
     : stream_(NULL),
-      buffer_(isolate, buffer),
       data_(node::Buffer::Data(buffer)),
       count_(node::Buffer::Length(buffer)) {
-  }
-
-  ~WriteOperation() {
+    buffer_.Reset(buffer);
   }
 
  protected:
@@ -211,7 +207,7 @@ class WriteOperation : public Operation<GIOStream> {
 
  private:
   GOutputStream* stream_;
-  Persistent<Value, CopyablePersistentTraits<Value>> buffer_;
+  Nan::Persistent<Value, Nan::CopyablePersistentTraits<Value>> buffer_;
   const void* data_;
   gsize count_;
 };

package/src/runtime.cc

@@ -16,6 +16,7 @@ using v8::Local;
 using v8::Number;
 using v8::Object;
 using v8::String;
+using v8::Symbol;
 using v8::Value;
 
 namespace frida {
@@ -274,14 +275,39 @@ GVariant* Runtime::ValueToVariant(Local<Value> value) {
   }
 
   if (value->IsArray()) {
+    auto array = Local<Array>::Cast(value);
+    uint32_t n = array->Length();
+    if (n == 2) {
+      auto first = Nan::Get(array, 0).ToLocalChecked();
+      if (first->IsSymbol()) {
+        auto sym = first.As<Symbol>();
+        auto desc = sym->Description(
+#if V8_MAJOR_VERSION > 9 || (V8_MAJOR_VERSION == 9 && V8_MINOR_VERSION >= 5)
+            Isolate::GetCurrent()
+#endif
+        );
+        Nan::Utf8String type(desc);
+
+        auto val = ValueToVariant(Nan::Get(array, 1).ToLocalChecked());
+        if (val == NULL) {
+          return NULL;
+        }
+
+        GVariant* t[2] = { g_variant_new_string(*type), val };
+        return g_variant_new_tuple(t, G_N_ELEMENTS(t));
+      }
+    }
+
     GVariantBuilder builder;
     g_variant_builder_init(&builder, G_VARIANT_TYPE ("av"));
 
-    auto array = Local<Array>::Cast(value);
-    uint32_t n = array->Length();
     for (uint32_t i = 0; i != n; i++) {
-      auto element_value = Nan::Get(array, i).ToLocalChecked();
-      g_variant_builder_add(&builder, "v", ValueToVariant(element_value));
+      auto v = ValueToVariant(Nan::Get(array, i).ToLocalChecked());
+      if (v == NULL) {
+        g_variant_builder_clear(&builder);
+        return NULL;
+      }
+      g_variant_builder_add(&builder, "v", v);
     }
 
     return g_variant_builder_end(&builder);
@@ -302,9 +328,19 @@ GVariant* Runtime::ValueToVariant(Local<Value> value) {
     for (uint32_t i = 0; i != n; i++) {
       auto key = Nan::Get(names, i).ToLocalChecked();
       auto val = Nan::Get(object, key).ToLocalChecked();
+      if (val->IsUndefined()) {
+        continue;
+      }
+
+      Nan::Utf8String k(key);
+
+      auto v = ValueToVariant(val);
+      if (v == NULL) {
+        g_variant_builder_clear(&builder);
+        return NULL;
+      }
 
-      Nan::Utf8String key_str(key);
-      g_variant_builder_add(&builder, "{sv}", *key_str, ValueToVariant(val));
+      g_variant_builder_add(&builder, "{sv}", *k, v);
     }
 
     return g_variant_builder_end(&builder);

package/subprojects/frida-core.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/frida/frida-core.git
-revision = 16.3.1
+revision = 16.4.0
 depth = 1
 
 [provide]

package/subprojects/nan.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/nodejs/nan.git
-revision = 56585a1cd21f25b4d56168063cedaf0831c63fef
+revision = 4d1d74e0a9ea8fa8091b88e45dc57e4c7eb9cdf7
 depth = 1
 diff_files = nan.patch