frida 17.9.0 → 17.9.2

package/build/src/frida.d.ts

@@ -1,7 +1,7 @@
-import type { DeviceManager as _DeviceManager, DeviceAddedHandler as _DeviceAddedHandler, DeviceRemovedHandler as _DeviceRemovedHandler, DeviceChangedHandler as _DeviceChangedHandler, Device as _Device, SpawnAddedHandler as _SpawnAddedHandler, SpawnRemovedHandler as _SpawnRemovedHandler, ChildAddedHandler as _ChildAddedHandler, ChildRemovedHandler as _ChildRemovedHandler, ProcessCrashedHandler as _ProcessCrashedHandler, OutputHandler as _OutputHandler, UninjectedHandler as _UninjectedHandler, DeviceLostHandler as _DeviceLostHandler, RemoteDeviceOptions as _RemoteDeviceOptions, Application as _Application, Process as _Process, ProcessMatchOptions as _ProcessMatchOptions, RawSpawnOptions as _RawSpawnOptions, Spawn as _Spawn, Child as _Child, Crash as _Crash, Bus as _Bus, BusDetachedHandler as _BusDetachedHandler, BusMessageHandler as _BusMessageHandler, Service as _Service, ServiceCloseHandler as _ServiceCloseHandler, ServiceMessageHandler as _ServiceMessageHandler, Session as _Session, SessionDetachedHandler as _SessionDetachedHandler, Script as _Script, ScriptDestroyedHandler as _ScriptDestroyedHandler, ScriptMessageHandler as _ScriptMessageHandler, PortalMembership as _PortalMembership, PackageManager as _PackageManager, PackageManagerInstallProgressHandler as _PackageManagerInstallProgressHandler, Package as _Package, PackageSearchOptions as _PackageSearchOptions, PackageSearchResult as _PackageSearchResult, PackageInstallOptions as _PackageInstallOptions, PackageInstallResult as _PackageInstallResult, ControlService as _ControlService, ControlServiceOptions as _ControlServiceOptions, PortalService as _PortalService, PortalNodeConnectedHandler as _PortalNodeConnectedHandler, PortalNodeJoinedHandler as _PortalNodeJoinedHandler, PortalNodeLeftHandler as _PortalNodeLeftHandler, PortalNodeDisconnectedHandler as _PortalNodeDisconnectedHandler, PortalControllerConnectedHandler as _PortalControllerConnectedHandler, PortalControllerDisconnectedHandler as _PortalControllerDisconnectedHandler, PortalAuthenticatedHandler as _PortalAuthenticatedHandler, PortalSubscribeHandler as _PortalSubscribeHandler, PortalMessageHandler as _PortalMessageHandler, FileMonitor as _FileMonitor, FileMonitorChangeHandler as _FileMonitorChangeHandler, Compiler as _Compiler, CompilerStartingHandler as _CompilerStartingHandler, CompilerFinishedHandler as _CompilerFinishedHandler, CompilerOutputHandler as _CompilerOutputHandler, CompilerDiagnosticsHandler as _CompilerDiagnosticsHandler, CompilerOptions as _CompilerOptions, BuildOptions as _BuildOptions, WatchOptions as _WatchOptions, StaticAuthenticationService as _StaticAuthenticationService, FrontmostQueryOptions as _FrontmostQueryOptions, ApplicationQueryOptions as _ApplicationQueryOptions, ProcessQueryOptions as _ProcessQueryOptions, SessionOptions as _SessionOptions, ScriptOptions as _ScriptOptions, SnapshotOptions as _SnapshotOptions, PortalOptions as _PortalOptions, PeerOptions as _PeerOptions, Relay as _Relay, EndpointParameters as _EndpointParameters, AuthenticationService as _AuthenticationService, AbstractAuthenticationService as _AbstractAuthenticationService, BaseObject as _BaseObject, Cancellable as _Cancellable, CancelledHandler as _CancelledHandler, IOStream as _IOStream, InputStream as _InputStream, OutputStream as _OutputStream, InetSocketAddress as _InetSocketAddress, InetAddress as _InetAddress, UnixSocketAddress as _UnixSocketAddress, BaseSocketAddress as _BaseSocketAddress, SocketAddressEnumerator as _SocketAddressEnumerator, SocketConnectable as _SocketConnectable, Runtime as _Runtime, DeviceType as _DeviceType, PackageInstallPhase as _PackageInstallPhase, PackageRole as _PackageRole, OutputFormat as _OutputFormat, BundleFormat as _BundleFormat, TypeCheckMode as _TypeCheckMode, SourceMaps as _SourceMaps, JsCompression as _JsCompression, JsPlatform as _JsPlatform, GadgetBreakpointAction as _GadgetBreakpointAction, Realm as _Realm, SessionDetachReason as _SessionDetachReason, Scope as _Scope, Stdio as _Stdio, ChildOrigin as _ChildOrigin, SnapshotTransport as _SnapshotTransport, ScriptRuntime as _ScriptRuntime, RelayKind as _RelayKind, XnuMachTrap as _XnuMachTrap, XnuBsdSyscall as _XnuBsdSyscall, FileMonitorEvent as _FileMonitorEvent, SocketFamily as _SocketFamily, UnixSocketAddressType as _UnixSocketAddressType, TargetProcess as _TargetProcess, ProcessID as _ProcessID, InjecteeID as _InjecteeID, FileDescriptor as _FileDescriptor, ProcessName as _ProcessName, SystemParameters as _SystemParameters, SystemInterface as _SystemInterface, NetworkInterface as _NetworkInterface, CellularInterface as _CellularInterface, SpawnOptions as _SpawnOptions, RelayProperties as _RelayProperties, Message as _Message, MessageType as _MessageType, SendMessage as _SendMessage, ErrorMessage as _ErrorMessage, ScriptLogHandler as _ScriptLogHandler, ScriptExports as _ScriptExports, LogLevel as _LogLevel, EnableDebuggerOptions as _EnableDebuggerOptions, PortalServiceOptions as _PortalServiceOptions, PortalConnectionId as _PortalConnectionId, PortalConnectionTag as _PortalConnectionTag, EndpointParametersSubset as _EndpointParametersSubset, AuthenticationScheme as _AuthenticationScheme, TokenAuthenticationScheme as _TokenAuthenticationScheme, CallbackAuthenticationScheme as _CallbackAuthenticationScheme, AuthenticationCallback as _AuthenticationCallback, AuthenticatedSessionInfo as _AuthenticatedSessionInfo, SocketAddress as _SocketAddress, IPV4SocketAddress as _IPV4SocketAddress, IPV6SocketAddress as _IPV6SocketAddress, AnonymousUnixSocketAddress as _AnonymousUnixSocketAddress, PathUnixSocketAddress as _PathUnixSocketAddress, AbstractUnixSocketAddress as _AbstractUnixSocketAddress, Variant as _Variant, VariantValue as _VariantValue, VariantDict as _VariantDict } from "./frida_binding.d.ts";
+import type { DeviceManager as _DeviceManager, DeviceAddedHandler as _DeviceAddedHandler, DeviceRemovedHandler as _DeviceRemovedHandler, DeviceChangedHandler as _DeviceChangedHandler, Device as _Device, SpawnAddedHandler as _SpawnAddedHandler, SpawnRemovedHandler as _SpawnRemovedHandler, ChildAddedHandler as _ChildAddedHandler, ChildRemovedHandler as _ChildRemovedHandler, ProcessCrashedHandler as _ProcessCrashedHandler, OutputHandler as _OutputHandler, UninjectedHandler as _UninjectedHandler, DeviceLostHandler as _DeviceLostHandler, RemoteDeviceOptions as _RemoteDeviceOptions, Application as _Application, Process as _Process, ProcessMatchOptions as _ProcessMatchOptions, RawSpawnOptions as _RawSpawnOptions, Spawn as _Spawn, Child as _Child, Crash as _Crash, Bus as _Bus, BusDetachedHandler as _BusDetachedHandler, BusMessageHandler as _BusMessageHandler, Service as _Service, ServiceCloseHandler as _ServiceCloseHandler, ServiceMessageHandler as _ServiceMessageHandler, Session as _Session, SessionDetachedHandler as _SessionDetachedHandler, Script as _Script, ScriptDestroyedHandler as _ScriptDestroyedHandler, ScriptMessageHandler as _ScriptMessageHandler, PortalMembership as _PortalMembership, PackageManager as _PackageManager, PackageManagerInstallProgressHandler as _PackageManagerInstallProgressHandler, Package as _Package, PackageSearchOptions as _PackageSearchOptions, PackageSearchResult as _PackageSearchResult, PackageInstallOptions as _PackageInstallOptions, PackageInstallResult as _PackageInstallResult, ControlService as _ControlService, ControlServiceOptions as _ControlServiceOptions, PortalService as _PortalService, PortalNodeConnectedHandler as _PortalNodeConnectedHandler, PortalNodeJoinedHandler as _PortalNodeJoinedHandler, PortalNodeLeftHandler as _PortalNodeLeftHandler, PortalNodeDisconnectedHandler as _PortalNodeDisconnectedHandler, PortalControllerConnectedHandler as _PortalControllerConnectedHandler, PortalControllerDisconnectedHandler as _PortalControllerDisconnectedHandler, PortalAuthenticatedHandler as _PortalAuthenticatedHandler, PortalSubscribeHandler as _PortalSubscribeHandler, PortalMessageHandler as _PortalMessageHandler, FileMonitor as _FileMonitor, FileMonitorChangeHandler as _FileMonitorChangeHandler, Compiler as _Compiler, CompilerStartingHandler as _CompilerStartingHandler, CompilerFinishedHandler as _CompilerFinishedHandler, CompilerOutputHandler as _CompilerOutputHandler, CompilerDiagnosticsHandler as _CompilerDiagnosticsHandler, CompilerOptions as _CompilerOptions, BuildOptions as _BuildOptions, WatchOptions as _WatchOptions, StaticAuthenticationService as _StaticAuthenticationService, FrontmostQueryOptions as _FrontmostQueryOptions, ApplicationQueryOptions as _ApplicationQueryOptions, ProcessQueryOptions as _ProcessQueryOptions, SessionOptions as _SessionOptions, ScriptOptions as _ScriptOptions, SnapshotOptions as _SnapshotOptions, PortalOptions as _PortalOptions, PeerOptions as _PeerOptions, Relay as _Relay, EndpointParameters as _EndpointParameters, WebRequest as _WebRequest, WebResponse as _WebResponse, AuthenticationService as _AuthenticationService, AbstractAuthenticationService as _AbstractAuthenticationService, WebRequestHandler as _WebRequestHandler, AbstractWebRequestHandler as _AbstractWebRequestHandler, BaseObject as _BaseObject, Cancellable as _Cancellable, CancelledHandler as _CancelledHandler, IOStream as _IOStream, InputStream as _InputStream, OutputStream as _OutputStream, InetSocketAddress as _InetSocketAddress, InetAddress as _InetAddress, UnixSocketAddress as _UnixSocketAddress, BaseSocketAddress as _BaseSocketAddress, SocketAddressEnumerator as _SocketAddressEnumerator, SocketConnectable as _SocketConnectable, Runtime as _Runtime, DeviceType as _DeviceType, PackageInstallPhase as _PackageInstallPhase, PackageRole as _PackageRole, OutputFormat as _OutputFormat, BundleFormat as _BundleFormat, TypeCheckMode as _TypeCheckMode, SourceMaps as _SourceMaps, JsCompression as _JsCompression, JsPlatform as _JsPlatform, GadgetBreakpointAction as _GadgetBreakpointAction, Realm as _Realm, SessionDetachReason as _SessionDetachReason, Scope as _Scope, Stdio as _Stdio, ChildOrigin as _ChildOrigin, SnapshotTransport as _SnapshotTransport, ScriptRuntime as _ScriptRuntime, RelayKind as _RelayKind, XnuMachTrap as _XnuMachTrap, XnuBsdSyscall as _XnuBsdSyscall, FileMonitorEvent as _FileMonitorEvent, SocketFamily as _SocketFamily, UnixSocketAddressType as _UnixSocketAddressType, TargetProcess as _TargetProcess, ProcessID as _ProcessID, InjecteeID as _InjecteeID, FileDescriptor as _FileDescriptor, ProcessName as _ProcessName, SystemParameters as _SystemParameters, SystemInterface as _SystemInterface, NetworkInterface as _NetworkInterface, CellularInterface as _CellularInterface, SpawnOptions as _SpawnOptions, RelayProperties as _RelayProperties, Message as _Message, MessageType as _MessageType, SendMessage as _SendMessage, ErrorMessage as _ErrorMessage, ScriptLogHandler as _ScriptLogHandler, ScriptExports as _ScriptExports, LogLevel as _LogLevel, EnableDebuggerOptions as _EnableDebuggerOptions, PortalServiceOptions as _PortalServiceOptions, PortalConnectionId as _PortalConnectionId, PortalConnectionTag as _PortalConnectionTag, EndpointParametersSubset as _EndpointParametersSubset, AuthenticationScheme as _AuthenticationScheme, TokenAuthenticationScheme as _TokenAuthenticationScheme, CallbackAuthenticationScheme as _CallbackAuthenticationScheme, AuthenticationCallback as _AuthenticationCallback, AuthenticatedSessionInfo as _AuthenticatedSessionInfo, SocketAddress as _SocketAddress, IPV4SocketAddress as _IPV4SocketAddress, IPV6SocketAddress as _IPV6SocketAddress, AnonymousUnixSocketAddress as _AnonymousUnixSocketAddress, PathUnixSocketAddress as _PathUnixSocketAddress, AbstractUnixSocketAddress as _AbstractUnixSocketAddress, Variant as _Variant, VariantValue as _VariantValue, VariantDict as _VariantDict } from "./frida_binding.d.ts";
 export declare const MessageType: typeof _MessageType;
 export declare const LogLevel: typeof _LogLevel;
-export declare const DeviceManager: typeof _DeviceManager, Device: typeof _Device, RemoteDeviceOptions: _RemoteDeviceOptions, Application: typeof _Application, Process: typeof _Process, ProcessMatchOptions: _ProcessMatchOptions, RawSpawnOptions: _RawSpawnOptions, Spawn: typeof _Spawn, Child: typeof _Child, Crash: typeof _Crash, Bus: typeof _Bus, Service: typeof _Service, Session: typeof _Session, Script: typeof _Script, PortalMembership: typeof _PortalMembership, PackageManager: typeof _PackageManager, Package: typeof _Package, PackageSearchOptions: _PackageSearchOptions, PackageSearchResult: typeof _PackageSearchResult, PackageInstallOptions: _PackageInstallOptions, PackageInstallResult: typeof _PackageInstallResult, ControlService: typeof _ControlService, ControlServiceOptions: _ControlServiceOptions, PortalService: typeof _PortalService, FileMonitor: typeof _FileMonitor, Compiler: typeof _Compiler, CompilerOptions: _CompilerOptions, BuildOptions: _BuildOptions, WatchOptions: _WatchOptions, StaticAuthenticationService: typeof _StaticAuthenticationService, FrontmostQueryOptions: _FrontmostQueryOptions, ApplicationQueryOptions: _ApplicationQueryOptions, ProcessQueryOptions: _ProcessQueryOptions, SessionOptions: _SessionOptions, ScriptOptions: _ScriptOptions, SnapshotOptions: _SnapshotOptions, PortalOptions: _PortalOptions, PeerOptions: _PeerOptions, Relay: typeof _Relay, EndpointParameters: typeof _EndpointParameters, AbstractAuthenticationService: typeof _AbstractAuthenticationService, BaseObject: typeof _BaseObject, Cancellable: typeof _Cancellable, IOStream: typeof _IOStream, InputStream: typeof _InputStream, OutputStream: typeof _OutputStream, InetSocketAddress: typeof _InetSocketAddress, InetAddress: typeof _InetAddress, UnixSocketAddress: typeof _UnixSocketAddress, BaseSocketAddress: typeof _BaseSocketAddress, SocketAddressEnumerator: typeof _SocketAddressEnumerator, Runtime: typeof _Runtime, DeviceType: typeof _DeviceType, PackageInstallPhase: typeof _PackageInstallPhase, PackageRole: typeof _PackageRole, OutputFormat: typeof _OutputFormat, BundleFormat: typeof _BundleFormat, TypeCheckMode: typeof _TypeCheckMode, SourceMaps: typeof _SourceMaps, JsCompression: typeof _JsCompression, JsPlatform: typeof _JsPlatform, GadgetBreakpointAction: typeof _GadgetBreakpointAction, Realm: typeof _Realm, SessionDetachReason: typeof _SessionDetachReason, Scope: typeof _Scope, Stdio: typeof _Stdio, ChildOrigin: typeof _ChildOrigin, SnapshotTransport: typeof _SnapshotTransport, ScriptRuntime: typeof _ScriptRuntime, RelayKind: typeof _RelayKind, XnuMachTrap: typeof _XnuMachTrap, XnuBsdSyscall: typeof _XnuBsdSyscall, FileMonitorEvent: typeof _FileMonitorEvent, SocketFamily: typeof _SocketFamily, UnixSocketAddressType: typeof _UnixSocketAddressType;
+export declare const DeviceManager: typeof _DeviceManager, Device: typeof _Device, RemoteDeviceOptions: _RemoteDeviceOptions, Application: typeof _Application, Process: typeof _Process, ProcessMatchOptions: _ProcessMatchOptions, RawSpawnOptions: _RawSpawnOptions, Spawn: typeof _Spawn, Child: typeof _Child, Crash: typeof _Crash, Bus: typeof _Bus, Service: typeof _Service, Session: typeof _Session, Script: typeof _Script, PortalMembership: typeof _PortalMembership, PackageManager: typeof _PackageManager, Package: typeof _Package, PackageSearchOptions: _PackageSearchOptions, PackageSearchResult: typeof _PackageSearchResult, PackageInstallOptions: _PackageInstallOptions, PackageInstallResult: typeof _PackageInstallResult, ControlService: typeof _ControlService, ControlServiceOptions: _ControlServiceOptions, PortalService: typeof _PortalService, FileMonitor: typeof _FileMonitor, Compiler: typeof _Compiler, CompilerOptions: _CompilerOptions, BuildOptions: _BuildOptions, WatchOptions: _WatchOptions, StaticAuthenticationService: typeof _StaticAuthenticationService, FrontmostQueryOptions: _FrontmostQueryOptions, ApplicationQueryOptions: _ApplicationQueryOptions, ProcessQueryOptions: _ProcessQueryOptions, SessionOptions: _SessionOptions, ScriptOptions: _ScriptOptions, SnapshotOptions: _SnapshotOptions, PortalOptions: _PortalOptions, PeerOptions: _PeerOptions, Relay: typeof _Relay, EndpointParameters: typeof _EndpointParameters, WebRequest: typeof _WebRequest, WebResponse: typeof _WebResponse, AbstractAuthenticationService: typeof _AbstractAuthenticationService, AbstractWebRequestHandler: typeof _AbstractWebRequestHandler, BaseObject: typeof _BaseObject, Cancellable: typeof _Cancellable, IOStream: typeof _IOStream, InputStream: typeof _InputStream, OutputStream: typeof _OutputStream, InetSocketAddress: typeof _InetSocketAddress, InetAddress: typeof _InetAddress, UnixSocketAddress: typeof _UnixSocketAddress, BaseSocketAddress: typeof _BaseSocketAddress, SocketAddressEnumerator: typeof _SocketAddressEnumerator, Runtime: typeof _Runtime, DeviceType: typeof _DeviceType, PackageInstallPhase: typeof _PackageInstallPhase, PackageRole: typeof _PackageRole, OutputFormat: typeof _OutputFormat, BundleFormat: typeof _BundleFormat, TypeCheckMode: typeof _TypeCheckMode, SourceMaps: typeof _SourceMaps, JsCompression: typeof _JsCompression, JsPlatform: typeof _JsPlatform, GadgetBreakpointAction: typeof _GadgetBreakpointAction, Realm: typeof _Realm, SessionDetachReason: typeof _SessionDetachReason, Scope: typeof _Scope, Stdio: typeof _Stdio, ChildOrigin: typeof _ChildOrigin, SnapshotTransport: typeof _SnapshotTransport, ScriptRuntime: typeof _ScriptRuntime, RelayKind: typeof _RelayKind, XnuMachTrap: typeof _XnuMachTrap, XnuBsdSyscall: typeof _XnuBsdSyscall, FileMonitorEvent: typeof _FileMonitorEvent, SocketFamily: typeof _SocketFamily, UnixSocketAddressType: typeof _UnixSocketAddressType;
 declare const frida: {
     readonly DeviceManager: typeof _DeviceManager;
     readonly Device: typeof _Device;
@@ -43,7 +43,10 @@ declare const frida: {
     readonly PeerOptions: _PeerOptions;
     readonly Relay: typeof _Relay;
     readonly EndpointParameters: typeof _EndpointParameters;
+    readonly WebRequest: typeof _WebRequest;
+    readonly WebResponse: typeof _WebResponse;
     readonly AbstractAuthenticationService: typeof _AbstractAuthenticationService;
+    readonly AbstractWebRequestHandler: typeof _AbstractWebRequestHandler;
     readonly BaseObject: typeof _BaseObject;
     readonly Cancellable: typeof _Cancellable;
     readonly IOStream: typeof _IOStream;
@@ -169,8 +172,12 @@ declare namespace frida {
     type PeerOptions = _PeerOptions;
     type Relay = _Relay;
     type EndpointParameters = _EndpointParameters;
+    type WebRequest = _WebRequest;
+    type WebResponse = _WebResponse;
     type AuthenticationService = _AuthenticationService;
     type AbstractAuthenticationService = _AbstractAuthenticationService;
+    type WebRequestHandler = _WebRequestHandler;
+    type AbstractWebRequestHandler = _AbstractWebRequestHandler;
     type BaseObject = _BaseObject;
     type Cancellable = _Cancellable;
     type CancelledHandler = _CancelledHandler;
@@ -318,8 +325,12 @@ export type PortalOptions = _PortalOptions;
 export type PeerOptions = _PeerOptions;
 export type Relay = _Relay;
 export type EndpointParameters = _EndpointParameters;
+export type WebRequest = _WebRequest;
+export type WebResponse = _WebResponse;
 export type AuthenticationService = _AuthenticationService;
 export type AbstractAuthenticationService = _AbstractAuthenticationService;
+export type WebRequestHandler = _WebRequestHandler;
+export type AbstractWebRequestHandler = _AbstractWebRequestHandler;
 export type BaseObject = _BaseObject;
 export type Cancellable = _Cancellable;
 export type CancelledHandler = _CancelledHandler;

package/build/src/frida.js

@@ -713,7 +713,7 @@ export const LogLevel = binding.LogLevel;
     }
     binding.Relay = Relay;
     binding._EndpointParameters.prototype[inspect.custom] = function (depth, options) {
-        return inspectWrapper(this, "EndpointParameters", ["address", "port", "certificate", "origin", "authService", "assetRoot"], depth, options);
+        return inspectWrapper(this, "EndpointParameters", ["address", "port", "certificate", "origin", "authService", "assetRoot", "requestHandler"], depth, options);
     };
     class EndpointParameters extends binding._EndpointParameters {
         constructor(params) {
@@ -736,9 +736,18 @@ export const LogLevel = binding.LogLevel;
         }
     }
     binding.EndpointParameters = EndpointParameters;
+    binding.WebRequest.prototype[inspect.custom] = function (depth, options) {
+        return inspectWrapper(this, "WebRequest", ["method", "path", "queryString", "body"], depth, options);
+    };
+    binding.WebResponse.prototype[inspect.custom] = function (depth, options) {
+        return inspectWrapper(this, "WebResponse", ["status", "body"], depth, options);
+    };
     binding.AuthenticationService.prototype[inspect.custom] = function (depth, options) {
         return inspectWrapper(this, "AuthenticationService", [], depth, options);
     };
+    binding.WebRequestHandler.prototype[inspect.custom] = function (depth, options) {
+        return inspectWrapper(this, "WebRequestHandler", [], depth, options);
+    };
     binding.BaseObject.prototype[inspect.custom] = function (depth, options) {
         return inspectWrapper(this, "BaseObject", [], depth, options);
     };
@@ -795,7 +804,7 @@ export const LogLevel = binding.LogLevel;
     };
 }
 binding.commitConstructors();
-export const { DeviceManager, Device, RemoteDeviceOptions, Application, Process, ProcessMatchOptions, RawSpawnOptions, Spawn, Child, Crash, Bus, Service, Session, Script, PortalMembership, PackageManager, Package, PackageSearchOptions, PackageSearchResult, PackageInstallOptions, PackageInstallResult, ControlService, ControlServiceOptions, PortalService, FileMonitor, Compiler, CompilerOptions, BuildOptions, WatchOptions, StaticAuthenticationService, FrontmostQueryOptions, ApplicationQueryOptions, ProcessQueryOptions, SessionOptions, ScriptOptions, SnapshotOptions, PortalOptions, PeerOptions, Relay, EndpointParameters, AbstractAuthenticationService, BaseObject, Cancellable, IOStream, InputStream, OutputStream, InetSocketAddress, InetAddress, UnixSocketAddress, BaseSocketAddress, SocketAddressEnumerator, Runtime, DeviceType, PackageInstallPhase, PackageRole, OutputFormat, BundleFormat, TypeCheckMode, SourceMaps, JsCompression, JsPlatform, GadgetBreakpointAction, Realm, SessionDetachReason, Scope, Stdio, ChildOrigin, SnapshotTransport, ScriptRuntime, RelayKind, XnuMachTrap, XnuBsdSyscall, FileMonitorEvent, SocketFamily, UnixSocketAddressType, } = binding;
+export const { DeviceManager, Device, RemoteDeviceOptions, Application, Process, ProcessMatchOptions, RawSpawnOptions, Spawn, Child, Crash, Bus, Service, Session, Script, PortalMembership, PackageManager, Package, PackageSearchOptions, PackageSearchResult, PackageInstallOptions, PackageInstallResult, ControlService, ControlServiceOptions, PortalService, FileMonitor, Compiler, CompilerOptions, BuildOptions, WatchOptions, StaticAuthenticationService, FrontmostQueryOptions, ApplicationQueryOptions, ProcessQueryOptions, SessionOptions, ScriptOptions, SnapshotOptions, PortalOptions, PeerOptions, Relay, EndpointParameters, WebRequest, WebResponse, AbstractAuthenticationService, AbstractWebRequestHandler, BaseObject, Cancellable, IOStream, InputStream, OutputStream, InetSocketAddress, InetAddress, UnixSocketAddress, BaseSocketAddress, SocketAddressEnumerator, Runtime, DeviceType, PackageInstallPhase, PackageRole, OutputFormat, BundleFormat, TypeCheckMode, SourceMaps, JsCompression, JsPlatform, GadgetBreakpointAction, Realm, SessionDetachReason, Scope, Stdio, ChildOrigin, SnapshotTransport, ScriptRuntime, RelayKind, XnuMachTrap, XnuBsdSyscall, FileMonitorEvent, SocketFamily, UnixSocketAddressType, } = binding;
 const frida = {
     DeviceManager,
     Device,
@@ -837,7 +846,10 @@ const frida = {
     PeerOptions,
     Relay,
     EndpointParameters,
+    WebRequest,
+    WebResponse,
     AbstractAuthenticationService,
+    AbstractWebRequestHandler,
     BaseObject,
     Cancellable,
     IOStream,

package/build/src/frida_binding.d.ts

@@ -46,7 +46,10 @@ export interface FridaBinding {
     _Relay: typeof _Relay;
     EndpointParameters: typeof EndpointParameters;
     _EndpointParameters: typeof _EndpointParameters;
+    WebRequest: typeof WebRequest;
+    WebResponse: typeof WebResponse;
     AbstractAuthenticationService: typeof AbstractAuthenticationService;
+    AbstractWebRequestHandler: typeof AbstractWebRequestHandler;
     BaseObject: typeof BaseObject;
     Cancellable: typeof Cancellable;
     _Cancellable: typeof _Cancellable;
@@ -387,6 +390,8 @@ export type PortalMessageHandler = (connectionId: PortalConnectionId, message: a
 
 export class _PortalService extends BaseObject {
     constructor(clusterParams: EndpointParameters, controlParams?: EndpointParameters | null);
+    addClusterEndpoint(endpointParams: EndpointParameters): void;
+    addControlEndpoint(endpointParams: EndpointParameters): void;
     start(cancellable?: Cancellable | null): Promise<void>;
     stop(cancellable?: Cancellable | null): Promise<void>;
     kick(connectionId: number): void;
@@ -535,6 +540,21 @@ export class _EndpointParameters extends BaseObject {
     origin: string;
     authService: AuthenticationService;
     assetRoot: string;
+    requestHandler: WebRequestHandler;
+}
+
+export class WebRequest extends BaseObject {
+    method: string;
+    path: string;
+    queryString: string;
+    body: Buffer;
+}
+
+export class WebResponse extends BaseObject {
+    constructor(status: number, body: Buffer);
+    addHeader(name: string, val: string): void;
+    status: number;
+    body: Buffer;
 }
 
 export interface AuthenticationService extends BaseObject {
@@ -545,6 +565,14 @@ export abstract class AbstractAuthenticationService extends BaseObject implement
     authenticate(token: string, cancellable: Cancellable | null): Promise<string>;
 }
 
+export interface WebRequestHandler extends BaseObject {
+    handleRequest(request: WebRequest, cancellable?: Cancellable | null): Promise<WebResponse | null>;
+}
+
+export abstract class AbstractWebRequestHandler extends BaseObject implements WebRequestHandler {
+    handleRequest(request: WebRequest, cancellable: Cancellable | null): Promise<WebResponse | null>;
+}
+
 export class BaseObject {
     notify(propertyName: string): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida",
-  "version": "17.9.0",
+  "version": "17.9.2",
   "authors": [
     "Frida Developers"
   ],

package/releng/deps.toml

@@ -114,7 +114,7 @@ dependencies = [
 [libdwarf]
 when = "machine.os in {'linux', 'android', 'freebsd', 'qnx'}"
 name = "libdwarf"
-version = "50e3115b340c6a58d2f61af96f120a9d111ac024"
+version = "61ff154ae803d2b0202dbc1bf385cda1ac3ece54"
 url = "https://github.com/frida/libdwarf.git"
 options = [
     "-Ddecompression=false",
@@ -196,7 +196,7 @@ dependencies = [
 [glib-networking]
 when = "machine.os != 'none'"
 name = "glib-networking"
-version = "af4b017028e695528951c749a7096e96359521d8"
+version = "92c89e3188436d576825e6db6003f17ff6964486"
 url = "https://github.com/frida/glib-networking.git"
 options = [
     "-Dgnutls=disabled",
@@ -213,12 +213,12 @@ dependencies = [
 [libnice]
 when = "machine.os != 'none'"
 name = "libnice"
-version = "e12567b0a16a0c2eb5dfe5e0782baba8496772ff"
+version = "9a3da6e3e5bbcf935fd85b6b8557ff8c7dd9032c"
 url = "https://github.com/frida/libnice.git"
 options = [
     "-Dgupnp=disabled",
     "-Dgstreamer=disabled",
-    "-Dcrypto-library=openssl",
+    "-Dcrypto-library=auto",
     "-Dexamples=disabled",
     "-Dtests=disabled",
     "-Dintrospection=disabled",
@@ -254,7 +254,7 @@ dependencies = [
 [usrsctp]
 when = "machine.os != 'none'"
 name = "usrsctp"
-version = "f459ae9d3700c06e59d709901e92c08e31c6e623"
+version = "377fecfe06bb766c69cc0e1e1f6d5c72cf7704e6"
 url = "https://github.com/frida/usrsctp.git"
 options = [
     "-Dsctp_inet=false",
@@ -314,7 +314,7 @@ options = [
 [ngtcp2]
 when = "machine.os != 'none'"
 name = "ngtcp2"
-version = "828dcaed498b40954e1b496664a3309796968db6"
+version = "5b21d4418ff668d9b5ddc4f744b7a28af4196abf"
 url = "https://github.com/frida/ngtcp2.git"
 dependencies = [
     "openssl",

package/releng/devkit.py

@@ -197,7 +197,8 @@ class CompilerApplication:
 
         library_dirs = infer_library_dirs(library_flags)
         library_names = infer_library_names(library_flags)
-        library_paths, extra_flags = resolve_library_paths(library_names, library_dirs, self.machine)
+        library_paths, extra_flags = resolve_library_paths(library_names, library_dirs, self.machine,
+                                                           self._build_root())
         extra_flags += infer_linker_flags(library_flags)
 
         if self.compiler_argument_syntax == "msvc":
@@ -207,6 +208,12 @@ class CompilerApplication:
 
         return (extra_flags, thirdparty_symbol_mappings)
 
+    def _build_root(self):
+        for candidate in [self.output_dir, *self.output_dir.parents]:
+            if is_meson_build_root(candidate):
+                return candidate
+        return None
+
     def _do_generate_library_msvc(self, library_paths):
         subprocess.run(self.meson_config["lib"] + ["/nologo", "/out:" + str(self.output_dir / self.library_filename)] + library_paths,
                        capture_output=True,
@@ -407,7 +414,10 @@ def infer_linker_flags(flags):
     return [flag for flag in flags if flag.startswith("-Wl") or flag == "-pthread"]
 
 
-def resolve_library_paths(names, dirs, machine):
+def resolve_library_paths(names, dirs, machine, build_root=None):
+    if build_root is not None:
+        dirs = wrap_overrides_first(dirs, build_root)
+
     paths = []
     flags = []
     for name in names:
@@ -424,12 +434,22 @@ def resolve_library_paths(names, dirs, machine):
     return (deduplicate(paths), flags)
 
 
+def wrap_overrides_first(dirs, build_root):
+    prefix = build_root.resolve()
+    inside_build_tree = lambda d: d.resolve() == prefix or prefix in d.resolve().parents
+    return [d for d in dirs if inside_build_tree(d)] + [d for d in dirs if not inside_build_tree(d)]
+
+
 def is_os_library(path, machine):
     if machine.os == "linux":
         return path.name in {"libdl.a", "libm.a", "libpthread.a"}
     return False
 
 
+def is_meson_build_root(path):
+    return (path / "meson-info").is_dir()
+
+
 def query_pkgconfig_cflags(package, meson_config):
     raw_flags = call_pkgconfig(["--cflags", package], meson_config)
     return shlex.split(raw_flags)

package/releng/env.py

@@ -69,7 +69,8 @@ def generate_machine_configs(build_machine: MachineSpec,
                              host_sdk_prefix: Optional[Path],
                              call_selected_meson: Callable,
                              default_library: DefaultLibrary,
-                             outdir: Path) -> Tuple[MachineConfig, MachineConfig]:
+                             outdir: Path,
+                             apple_min_os: Optional[Dict[str, str]] = None) -> Tuple[MachineConfig, MachineConfig]:
     is_cross_build = host_machine != build_machine
 
     if is_cross_build:
@@ -86,7 +87,8 @@ def generate_machine_configs(build_machine: MachineSpec,
                                     build_sdk_prefix,
                                     call_selected_meson,
                                     default_library,
-                                    outdir)
+                                    outdir,
+                                    apple_min_os)
 
     if is_cross_build:
         host_config = generate_machine_config(host_machine,
@@ -97,7 +99,8 @@ def generate_machine_configs(build_machine: MachineSpec,
                                               host_sdk_prefix,
                                               call_selected_meson,
                                               default_library,
-                                              outdir)
+                                              outdir,
+                                              apple_min_os)
     else:
         host_config = build_config
 
@@ -112,7 +115,8 @@ def generate_machine_config(machine: MachineSpec,
                             sdk_prefix: Optional[Path],
                             call_selected_meson: Callable,
                             default_library: DefaultLibrary,
-                            outdir: Path) -> MachineConfig:
+                            outdir: Path,
+                            apple_min_os: Optional[Dict[str, str]] = None) -> MachineConfig:
     config = ConfigParser(dict_type=OrderedDict)
     config["constants"] = OrderedDict()
     config["binaries"] = OrderedDict()
@@ -152,7 +156,8 @@ def generate_machine_config(machine: MachineSpec,
                              config,
                              outpath,
                              outenv,
-                             outdir)
+                             outdir,
+                             apple_min_os=apple_min_os)
 
     if machine.toolchain_is_msvc:
         builtin_options["b_vscrt"] = str_to_meson(machine.config)
@@ -186,35 +191,46 @@ def generate_machine_config(machine: MachineSpec,
             if tool_path is not None:
                 binaries[tool_name] = strv_to_meson([str(tool_path)])
 
-        pkg_config_binary = toolchain_bindir / f"pkg-config{exe_suffix}"
-        if not pkg_config_binary.exists():
-            pkg_config_binary = shutil.which("pkg-config")
+        if machine == build_machine:
+            pkg_config_binary = find_usable_system_pkg_config()
+        else:
+            pkg_config_binary = None
+        if pkg_config_binary is None:
+            pkg_config_binary = toolchain_bindir / f"pkg-config{exe_suffix}"
+            if not pkg_config_binary.exists():
+                pkg_config_binary = None
         if pkg_config_binary is not None:
             pkg_config = [
                 str(pkg_config_binary),
             ]
-            if default_library == "static":
-                pkg_config += ["--static"]
             if sdk_prefix is not None:
+                if default_library == "static":
+                    pkg_config += ["--static"]
                 pkg_config += [f"--define-variable=frida_sdk_prefix={sdk_prefix}"]
-            binaries["pkg-config"] = strv_to_meson(pkg_config)
 
         vala_compiler = detect_toolchain_vala_compiler(toolchain_prefix, build_machine)
 
     pkg_config_path = shlex.split(environ.get("PKG_CONFIG_PATH", "").replace("\\", "\\\\"))
+    pkg_config_libdir = None
 
     if sdk_prefix is not None:
         builtin_options["vala_args"] = strv_to_meson([
             "--vapidir=" + str(sdk_prefix / "share" / "vala" / "vapi")
         ])
 
-        pkg_config_path += [str(sdk_prefix / machine.libdatadir / "pkgconfig")]
+        pkg_config_libdir = str(sdk_prefix / machine.libdatadir / "pkgconfig")
 
         sdk_bindir = sdk_prefix / "bin" / build_machine.os_dash_arch
         if sdk_bindir.exists():
             for f in sdk_bindir.iterdir():
                 binaries[f.stem] = strv_to_meson([str(f)])
 
+    if pkg_config is not None:
+        wrapper = outdir / f"frida-pkg-config-{machine.identifier}.py"
+        wrapper.write_text(make_pkg_config_wrapper(pkg_config, pkg_config_path, pkg_config_libdir), encoding="utf-8")
+        pkg_config = [sys.executable, str(wrapper)]
+        binaries["pkg-config"] = strv_to_meson(pkg_config)
+
     if vala_compiler is not None:
         valac, vapidir = vala_compiler
         vala = [
@@ -222,8 +238,6 @@ def generate_machine_config(machine: MachineSpec,
             f"--vapidir={vapidir}",
         ]
         if pkg_config is not None:
-            wrapper = outdir / "frida-pkg-config.py"
-            wrapper.write_text(make_pkg_config_wrapper(pkg_config, pkg_config_path), encoding="utf-8")
             vala += [f"--pkg-config={quote(sys.executable)} {quote(str(wrapper))}"]
         binaries["vala"] = strv_to_meson(vala)
 
@@ -297,8 +311,25 @@ def find_exe_wrapper(machine: MachineSpec,
     return [qemu_binary, "-L", qemu_sysroot]
 
 
-def make_pkg_config_wrapper(pkg_config: List[str], pkg_config_path: List[str]) -> str:
-    return "\n".join([
+def find_usable_system_pkg_config() -> Optional[str]:
+    binary = shutil.which("pkg-config")
+    if binary is None:
+        return None
+    try:
+        helptext = subprocess.run([binary, "--help"],
+                                  capture_output=True,
+                                  text=True,
+                                  timeout=5).stdout
+    except (OSError, subprocess.SubprocessError):
+        return None
+    is_strawberry_perl_stub = "Pure-Perl" in helptext
+    if is_strawberry_perl_stub:
+        return None
+    return binary
+
+
+def make_pkg_config_wrapper(pkg_config: List[str], pkg_config_path: List[str], pkg_config_libdir: Optional[str] = None) -> str:
+    lines = [
         "import os",
         "import subprocess",
         "import sys",
@@ -307,13 +338,20 @@ def make_pkg_config_wrapper(pkg_config: List[str], pkg_config_path: List[str]) -
         f" {pprint.pformat(pkg_config, indent=4)[1:-1]},",
         "    *sys.argv[1:],",
         "]",
-        "env = {",
-        "    **os.environ,",
-        f"    'PKG_CONFIG_PATH': {repr(os.pathsep.join(pkg_config_path))},",
-        "}",
-        f"p = subprocess.run(args, env=env)",
-        "sys.exit(p.returncode)"
-    ])
+        "env = {**os.environ}",
+    ]
+    if pkg_config_path:
+        joined = os.pathsep.join(pkg_config_path)
+        sep = os.pathsep
+        lines.append(f"env['PKG_CONFIG_PATH'] = {joined!r} + {sep!r}"
+                     f" + env.get('PKG_CONFIG_PATH', '')")
+    if pkg_config_libdir is not None:
+        lines.append(f"env['PKG_CONFIG_LIBDIR'] = {pkg_config_libdir!r}")
+    lines += [
+        "p = subprocess.run(args, env=env)",
+        "sys.exit(p.returncode)",
+    ]
+    return "\n".join(lines)
 
 
 def detect_toolchain_vala_compiler(toolchain_prefix: Path,

package/releng/env_android.py

@@ -17,7 +17,8 @@ def init_machine_config(machine: MachineSpec,
                         config: ConfigParser,
                         outpath: List[str],
                         outenv: Dict[str, str],
-                        outdir: Path):
+                        outdir: Path,
+                        apple_min_os: Optional[Dict[str, str]] = None):
     ndk_found = False
     try:
         ndk_root = Path(environ["ANDROID_NDK_ROOT"])

package/releng/env_apple.py

@@ -18,7 +18,8 @@ def init_machine_config(machine: MachineSpec,
                         config: ConfigParser,
                         outpath: List[str],
                         outenv: Dict[str, str],
-                        outdir: Path):
+                        outdir: Path,
+                        apple_min_os: Optional[Dict[str, str]] = None):
     xcenv = {**environ}
     if machine.arch == "arm64eoabi":
         try:
@@ -38,8 +39,11 @@ def init_machine_config(machine: MachineSpec,
 
     clang_arch = APPLE_CLANG_ARCHS.get(machine.arch, machine.arch)
 
-    os_minver = APPLE_MINIMUM_OS_VERSIONS.get(machine.os_dash_arch,
-                                              APPLE_MINIMUM_OS_VERSIONS[machine.os])
+    overrides = apple_min_os or {}
+    os_minver = (overrides.get(machine.os_dash_arch)
+                 or overrides.get(machine.os)
+                 or APPLE_MINIMUM_OS_VERSIONS.get(machine.os_dash_arch,
+                                                  APPLE_MINIMUM_OS_VERSIONS[machine.os]))
 
     target = f"{clang_arch}-apple-{machine.os}{os_minver}"
     if machine.config is not None:

package/releng/env_generic.py

@@ -22,7 +22,8 @@ def init_machine_config(machine: MachineSpec,
                         config: ConfigParser,
                         outpath: List[str],
                         outenv: Dict[str, str],
-                        outdir: Path):
+                        outdir: Path,
+                        apple_min_os: Optional[Dict[str, str]] = None):
     allow_undefined_symbols = machine.os == "freebsd"
 
     options = config["built-in options"]
@@ -109,7 +110,10 @@ def init_machine_config(machine: MachineSpec,
     if cc is not None \
             and machine.os == "windows" \
             and machine.toolchain_is_msvc:
-        linker_flavor = detect_linker_flavor(cc)
+        try:
+            linker_flavor = detect_linker_flavor(cc)
+        except LinkerDetectionError:
+            pass
         detected_wrong_toolchain = linker_flavor != "msvc"
         if detected_wrong_toolchain:
             cc = None

package/releng/meson_configure.py

@@ -8,7 +8,7 @@ import shlex
 import shutil
 import subprocess
 import sys
-from typing import Any, Callable, Dict, List, Optional, Set
+from typing import Any, Callable, Dict, List, Optional, Set, Tuple
 
 RELENG_DIR = Path(__file__).resolve().parent
 SCRIPTS_DIR = RELENG_DIR / "meson-scripts"
@@ -18,7 +18,7 @@ import mesonbuild.interpreter
 from mesonbuild.coredata import UserArrayOption, UserBooleanOption, \
         UserComboOption, UserFeatureOption, UserOption, UserStringOption
 
-from . import deps, env
+from . import deps, env, env_apple
 from .machine_spec import MachineSpec
 from .progress import ProgressCallback, print_progress
 
@@ -69,6 +69,14 @@ def main():
                       metavar="{" + ",".join(query_supported_bundle_types(include_wildcards=True)) + "}",
                       type=parse_bundle_type_set,
                       default=set())
+    opts.add_argument("--with-apple-min-os",
+                      help="override Apple deployment target floor for one platform;\n"
+                           "may be given multiple times. Defaults:\n"
+                           "  " + ", ".join(f"{k}={v}" for k, v in env_apple.APPLE_MINIMUM_OS_VERSIONS.items()),
+                      metavar="PLATFORM=VERSION",
+                      type=parse_apple_min_os_override,
+                      action="append",
+                      default=[])
     opts.add_argument("extra_meson_options",
                       nargs="*",
                       help=argparse.SUPPRESS)
@@ -103,7 +111,8 @@ def main():
                   default_library,
                   allowed_prebuilds,
                   options.meson,
-                  collect_meson_options(options))
+                  collect_meson_options(options),
+                  apple_min_os=dict(options.with_apple_min_os))
     except Exception as e:
         print(e, file=sys.stderr)
         if isinstance(e, subprocess.CalledProcessError):
@@ -126,7 +135,8 @@ def configure(sourcedir: Path,
               meson: str = "internal",
               extra_meson_options: List[str] = [],
               call_meson: Callable = env.call_meson,
-              on_progress: ProgressCallback = print_progress):
+              on_progress: ProgressCallback = print_progress,
+              apple_min_os: Optional[Dict[str, str]] = None):
     if prefix is None:
         prefix = env.detect_default_prefix()
 
@@ -209,7 +219,8 @@ def configure(sourcedir: Path,
                                          host_sdk_prefix,
                                          call_selected_meson,
                                          default_library,
-                                         builddir)
+                                         builddir,
+                                         apple_min_os)
 
     meson_options += [f"--native-file={build_config.machine_file}"]
     if host_config is not build_config:
@@ -232,6 +243,7 @@ def configure(sourcedir: Path,
         "meson": meson,
         "build": build_config,
         "host": host_config if host_config is not build_config else None,
+        "default_library": default_library,
         "allowed_prebuilds": allowed_prebuilds,
         "deps": deps_dir,
     }))
@@ -276,6 +288,19 @@ def parse_bundle_type_set(raw_array: str) -> List[str]:
     return result
 
 
+def parse_apple_min_os_override(raw_value: str) -> Tuple[str, str]:
+    platform, _, version = raw_value.partition("=")
+    if not version:
+        raise argparse.ArgumentTypeError(
+                f"invalid Apple min OS override: '{raw_value}' (expected PLATFORM=VERSION)")
+    valid_platforms = list(env_apple.APPLE_MINIMUM_OS_VERSIONS.keys())
+    if platform not in valid_platforms:
+        pretty_choices = "', '".join(valid_platforms)
+        raise argparse.ArgumentTypeError(
+                f"invalid Apple platform: '{platform}' (choose from '{pretty_choices}')")
+    return (platform, version)
+
+
 def raise_toolchain_not_found(e: Exception):
     raise ToolchainNotFoundError("\n".join([
         f"Unable to download toolchain: {e}",

package/releng/meson_make.py

@@ -53,16 +53,20 @@ def make(sourcedir: Path,
 
     test_options = shlex.split(environ.get("FRIDA_TEST_OPTIONS", "-v"))
 
+    env_state = pickle.loads((builddir / "frida-env.dat").read_bytes())
+
+    install_options = []
+    if env_state.get("default_library") == "shared":
+        install_options += ["--skip-subprojects"]
+
     standard_targets = {
         "all": ["compile"] + compile_options,
         "clean": ["compile", "--clean"] + compile_options,
         "distclean": lambda: distclean(sourcedir, builddir),
-        "install": ["install"],
+        "install": ["install"] + install_options,
         "test": ["test"] + test_options,
     }
 
-    env_state = pickle.loads((builddir / "frida-env.dat").read_bytes())
-
     machine_config = env_state["host"]
     if machine_config is None:
         machine_config = env_state["build"]

package/src/frida_bindgen/codegen.py

@@ -2021,7 +2021,7 @@ if (!fdn_{retval.type.nick}_from_value (env, js_retval, &retval))
 raw_result = {result_conversion};"""
 
         if retval.nullable:
-            code = f"if (!fdn_is_null (js_result))\n{{  {indent_c_code(code, 1)}\n}} else {{\n  raw_result = NULL;\n }}"
+            code = f"if (!fdn_is_null (env, js_retval))\n{{\n{indent_c_code(code, 1)}\n}} else {{\n  raw_result = NULL;\n}}"
 
     else:
         code = "raw_result = NULL;"

package/subprojects/frida-core.wrap

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