frida 16.7.14 → 16.7.16

package/src/meson.build

@@ -1,33 +1,100 @@
-frida_binding_sources = files(
-  'addon.cc',
-  'device_manager.cc',
-  'device.cc',
-  'application.cc',
-  'process.cc',
-  'spawn.cc',
-  'child.cc',
-  'crash.cc',
-  'bus.cc',
-  'service.cc',
-  'session.cc',
-  'script.cc',
-  'relay.cc',
-  'portal_membership.cc',
-  'portal_service.cc',
-  'endpoint_parameters.cc',
-  'authentication.cc',
-  'iostream.cc',
-  'cancellable.cc',
-  'signals.cc',
-  'glib_object.cc',
-  'runtime.cc',
-  'uv_context.cc',
-  'glib_context.cc',
-  'win_delay_load_hook.cc',
+subdir('assets')
+
+if frida_core_dep.type_name() == 'internal'
+  frida_core_subprj = subproject('frida-core')
+  frida_gir = frida_core_subprj.get_variable('core_public_gir')
+  glib_gir = frida_core_subprj.get_variable('glib_gir')
+  gobject_gir = frida_core_subprj.get_variable('gobject_gir')
+  gio_gir = frida_core_subprj.get_variable('gio_gir')
+else
+  girdir = frida_core_dep.get_variable('frida_girdir')
+  frida_gir = girdir / 'Frida-1.0.gir'
+  glib_gir = girdir / 'GLib-2.0.gir'
+  gobject_gir = girdir / 'GObject-2.0.gir'
+  gio_gir = girdir / 'Gio-2.0.gir'
+endif
+
+env = environment()
+env.set('PYTHONPATH', meson.current_source_dir())
+
+code = custom_target('binding-code',
+  output: [
+    'frida.ts',
+    'frida_binding.d.ts',
+    'frida_binding.c',
+  ],
+  input: [
+    frida_gir,
+    glib_gir,
+    gobject_gir,
+    gio_gir,
+    files(
+      'frida_bindgen' / '__init__.py',
+      'frida_bindgen' / '__main__.py',
+      'frida_bindgen' / 'cli.py',
+      'frida_bindgen' / 'codegen.py',
+      'frida_bindgen' / 'customization.py',
+      'frida_bindgen' / 'loader.py',
+      'frida_bindgen' / 'model.py',
+      'frida_bindgen' / 'assets' / 'codegen_helpers.c',
+      'frida_bindgen' / 'assets' / 'codegen_helpers.ts',
+      'frida_bindgen' / 'assets' / 'codegen_prototypes.h',
+      'frida_bindgen' / 'assets' / 'codegen_types.h',
+      'frida_bindgen' / 'assets' / 'customization_facade.exports',
+      'frida_bindgen' / 'assets' / 'customization_facade.ts',
+      'frida_bindgen' / 'assets' / 'customization_helpers.imports',
+      'frida_bindgen' / 'assets' / 'customization_helpers.ts',
+    )
+  ],
+  command: [
+    python, '-m', 'frida_bindgen',
+    '--frida-gir=@INPUT0@',
+    '--glib-gir=@INPUT1@',
+    '--gobject-gir=@INPUT2@',
+    '--gio-gir=@INPUT3@',
+    '--output-ts=@OUTPUT0@',
+    '--output-dts=@OUTPUT1@',
+    '--output-c=@OUTPUT2@',
+  ],
+  env: env,
+  install: true,
+  install_dir: [
+    false,
+    pkg_install_dir / 'build' / 'src',
+    false,
+  ],
+)
+
+custom_target('js',
+  input: [
+    code[0],
+    code[1],
+  ],
+  output: [
+    'frida.js',
+    'frida.d.ts',
+  ],
+  command: [
+    python,
+    files('tsc.py'),
+    '@OUTDIR@',
+    '@PRIVATE_DIR@',
+    npm,
+    adjusted_package_json,
+    tsconfig_json,
+    '@INPUT@',
+  ],
+  install: true,
+  install_dir: pkg_install_dir / 'build' / 'src',
 )
 
+frida_binding_sources = [
+  code[2],
+  files('win_delay_load_hook.c'),
+]
+
 if system == 'windows'
-  if cpp.get_argument_syntax() != 'msvc'
+  if cc.get_argument_syntax() != 'msvc'
     symfile = 'addon.symbols'
     extra_link_args += '-Wl,--retain-symbols-file,' + meson.current_source_dir() / symfile
     extra_link_depends += files(symfile)

package/{lib/build.py → src/tsc.py}

@@ -12,16 +12,16 @@ def main(argv: list[str]):
         for asset in [package_json, tsconfig]:
             shutil.copy(asset, privdir)
 
-        libdir = privdir / "lib"
-        if libdir.exists():
-            shutil.rmtree(libdir)
-        libdir.mkdir()
+        srcdir = privdir / "src"
+        if srcdir.exists():
+            shutil.rmtree(srcdir)
+        srcdir.mkdir()
         for asset in sources:
-            shutil.copy(asset, libdir)
+            shutil.copy(asset, srcdir)
 
-        distdir = privdir / "dist"
-        if distdir.exists():
-            shutil.rmtree(distdir)
+        srcoutdir = privdir / "build" / "src"
+        if srcoutdir.exists():
+            shutil.rmtree(srcoutdir)
 
         run_kwargs = {
             "stdout": subprocess.PIPE,
@@ -32,13 +32,13 @@ def main(argv: list[str]):
         subprocess.run([npm, "install", "--ignore-scripts"],
                        cwd=privdir,
                        **run_kwargs)
-        subprocess.run([npm, "run", "build"],
+        subprocess.run([npm, "exec", "tsc"],
                        cwd=privdir,
                        **run_kwargs)
 
-        for asset in sources:
-            for ext in [".js", ".d.ts"]:
-                shutil.copy(distdir / (asset.stem + ext), outdir)
+        for asset in (s for s in sources if not s.name.endswith(".d.ts")):
+            shutil.copy(srcoutdir / (asset.stem + ".js"), outdir)
+            shutil.copy(srcoutdir / (asset.stem + ".d.ts"), outdir)
     except subprocess.CalledProcessError as e:
         print(e, file=sys.stderr)
         print("Output:\n\t| " + "\n\t| ".join(e.output.strip().split("\n")), file=sys.stderr)

package/src/win_delay_load_hook.c

@@ -0,0 +1,56 @@
+/*
+ * When this file is linked to a DLL, it sets up a delay-load hook that
+ * intervenes when the DLL is trying to load the host executable
+ * dynamically. Instead of trying to locate the .exe file it'll just
+ * return a handle to the process image.
+ *
+ * This allows compiled addons to work when the host executable is renamed.
+ */
+
+#ifdef _MSC_VER
+
+#pragma managed(push, off)
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <windows.h>
+
+#include <delayimp.h>
+#include <string.h>
+
+static FARPROC WINAPI
+load_exe_hook (unsigned int event,
+               DelayLoadInfo * info)
+{
+  static HMODULE node_dll = NULL;
+
+  switch (event)
+  {
+    case dliNoteStartProcessing:
+      if (node_dll == NULL)
+      {
+        HMODULE m = GetModuleHandle (NULL);
+        if (GetProcAddress (m, "napi_define_class") != NULL)
+          node_dll = m;
+        else
+          node_dll = GetModuleHandle ("node.dll");
+      }
+      return NULL;
+    case dliNotePreLoadLibrary:
+      if (_stricmp (info->szDll, "node.exe") == 0)
+        return (FARPROC) node_dll;
+      return NULL;
+    case dliNotePreGetProcAddress:
+      return GetProcAddress (node_dll, info->dlp.szProcName);
+    default:
+      return NULL;
+  }
+}
+
+const PfnDliHook __pfnDliNotifyHook2 = load_exe_hook;
+
+#pragma managed(pop)
+
+#endif

package/subprojects/frida-core.wrap

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

package/test/data/index.ts

@@ -3,10 +3,10 @@ export function targetProgram() {
     if (platform === "win32") {
         return "C:\\Windows\\notepad.exe";
     } else if (platform === "darwin") {
-        return __dirname + "/unixvictim-macos";
+        return new URL("./unixvictim-macos", import.meta.url).pathname;
     } else if (platform === "linux" && ["ia32", "x64"].includes(process.arch)) {
         const fridaArch = (process.arch === "x64") ? "x86_64" : "x86";
-        return __dirname + "/unixvictim-linux-" + fridaArch;
+        return new URL("./unixvictim-linux-" + fridaArch, import.meta.url).pathname;
     } else {
         return "/bin/cat";
     }

package/test/device.ts

@@ -1,6 +1,5 @@
-import * as frida from "../lib";
-
 import { expect } from "chai";
+import frida from "frida";
 import "mocha";
 
 declare function gc(): void;

package/test/device_manager.ts

@@ -1,6 +1,5 @@
-import * as frida from "../lib";
-
 import { expect } from "chai";
+import frida from "frida";
 import "mocha";
 
 declare function gc(): void;

package/test/labrat.ts

@@ -1,5 +1,5 @@
-import * as frida from "../lib";
-import { targetProgram } from "./data";
+import frida from "frida";
+import { targetProgram } from "./data/index.js";
 
 export class LabRat {
     private constructor(private _pid: number) {

package/test/script.ts

@@ -1,7 +1,7 @@
-import * as frida from "../lib";
-import { LabRat } from "./labrat";
+import { LabRat } from "./labrat.js";
 
 import { expect } from "chai";
+import frida from "frida";
 import "mocha";
 
 declare function gc(): void;
@@ -56,10 +56,10 @@ describe("Script", function () {
         try {
             await agent.add(1, -2);
         } catch (e) {
-            thrownException = e;
+            thrownException = e as Error;
         }
         expect(thrownException).to.not.be.equal(null);
-        expect(thrownException.message).to.equal("no");
+        expect(thrownException!.message).to.equal("no");
 
         const buf = await agent.speak();
         expect(buf.toJSON().data).to.deep.equal([0x59, 0x6f]);
@@ -88,10 +88,10 @@ describe("Script", function () {
         try {
             await script.exports.init();
         } catch (e) {
-            thrownException = e;
+            thrownException = e as Error;
         }
         expect(thrownException).to.not.equal(null);
-        expect(thrownException.message).to.equal("Script is destroyed");
+        expect(thrownException!.message).to.equal("Script is destroyed");
     });
 
     it("should fail rpc request if script is unloaded mid-request", async () => {
@@ -110,10 +110,10 @@ describe("Script", function () {
         try {
             await script.exports.waitForever();
         } catch (e) {
-            thrownException = e;
+            thrownException = e as Error;
         }
         expect(thrownException).to.not.equal(null);
-        expect(thrownException.message).to.equal("Script is destroyed");
+        expect(thrownException!.message).to.equal("Script is destroyed");
     });
 
     it("should fail rpc request if session gets detached mid-request", async () => {
@@ -132,10 +132,10 @@ describe("Script", function () {
         try {
             await script.exports.waitForever();
         } catch (e) {
-            thrownException = e;
+            thrownException = e as Error;
         }
         expect(thrownException).to.not.equal(null);
-        expect(thrownException.message).to.equal("Script is destroyed");
+        expect(thrownException!.message).to.equal("Script is destroyed");
     });
 
     it("should fail rpc request if cancelled mid-request", async () => {
@@ -156,10 +156,10 @@ describe("Script", function () {
         try {
             await script.exports.waitForever(cancellable);
         } catch (e) {
-            thrownException = e;
+            thrownException = e as Error;
         }
         expect(thrownException).to.not.equal(null);
-        expect(thrownException.message).to.equal("Operation was cancelled");
+        expect(thrownException!.message).to.equal("Operation was cancelled");
     });
 
     it("should support returning rpc exports object from async method", async () => {

package/test/session.ts

@@ -1,7 +1,7 @@
-import * as frida from "../lib";
-import { LabRat } from "./labrat";
+import { LabRat } from "./labrat.js";
 
 import { expect } from "chai";
+import frida from "frida";
 import "mocha";
 
 declare function gc(): void;
@@ -32,7 +32,7 @@ describe("Session", () => {
         try {
             await evaluteScript("Script.runtime", { runtime: frida.ScriptRuntime.V8 });
         } catch (e) {
-            if (/V8 runtime not available due to build configuration/.test(e.message)) {
+            if (/V8 runtime not available due to build configuration/.test((e as Error).message)) {
                 return;
             }
             throw e;

package/tsconfig.json

@@ -1,18 +1,13 @@
 {
     "compilerOptions": {
-        "lib": ["es2017"],
-        "target": "es2017",
-        "module": "commonjs",
+        "lib": ["ES2022"],
+        "target": "ES2022",
+        "module": "Node16",
         "declaration": true,
-        "outDir": "./dist",
-        "typeRoots": [
-            "node_modules/@types"
-        ],
-        "types": [
-            "node"
-        ]
+        "outDir": "./build/src",
+        "strict": true
     },
     "include": [
-        "lib/**/*"
+        "src/**/*.ts"
     ]
 }

package/dist/application.d.ts

@@ -1,81 +0,0 @@
-import { Icon } from "./icon";
-import { SystemParameters } from "./system_parameters";
-export interface Application {
-    identifier: string;
-    name: string;
-    pid: number;
-    parameters: ApplicationParameters;
-}
-/**
- * Application parameters typically obtained through `enumerateApplications({ scope })`,
- * where `scope` is either `Scope.Metadata` or `Scope.Full`. The default of `Scope.Minimal`
- * means no parameters will be included.
- */
-export interface ApplicationParameters {
-    /**
-     * Version. Exposes `CFBundleShortVersionString` on Apple OSes, `versionName` on Android.
-     */
-    version?: string;
-    /**
-     * Build stamp. Exposes `CFBundleVersion` on Apple OSes, `versionCode` on Android.
-     */
-    build?: string;
-    /**
-     * Filesystem path of application. On Apple OSes this is where the bundle is.
-     */
-    path?: string;
-    /**
-     * Apple storage container locations.
-     */
-    containers?: {
-        /**
-         * Data container location.
-         */
-        data?: string;
-        /**
-         * App group container locations.
-         */
-        [name: string]: string | undefined;
-    };
-    /**
-     * Android source APKs. Exposes `publicSourceDir` followed by `splitPublicSourceDirs`.
-     */
-    sources?: string[];
-    /**
-     * Android data directory location.
-     */
-    dataDir?: string;
-    /**
-     * Android target SDK.
-     */
-    targetSdk?: number;
-    /**
-     * Whether the application is debuggable. Applicable on e.g. iOS and Android.
-     */
-    debuggable?: boolean;
-    /**
-     * If application is running, whether it is currently frontmost.
-     */
-    frontmost?: boolean;
-    /**
-     * If application is running, name of user that it is running as.
-     */
-    user?: string;
-    /**
-      * If application is running, PID of its parent process.
-      */
-    ppid?: number;
-    /**
-      * If application is running, when it was started.
-      */
-    started?: Date;
-    /**
-     * One or more icons. Only included when `scope` is set to `Scope.Full`.
-     */
-    icons?: Icon[];
-    /**
-     * System parameters, available for applications accessed through a portal.
-     */
-    system?: SystemParameters;
-    [name: string]: any;
-}

package/dist/application.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/authentication.d.ts

@@ -1,3 +0,0 @@
-export interface AuthenticatedSessionInfo {
-    [key: string]: any;
-}

package/dist/authentication.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/bus.d.ts

@@ -1,16 +0,0 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { Cancellable } from "./cancellable";
-import { Signal } from "./signals";
-import { inspect } from "util";
-export declare class Bus {
-    private impl;
-    detached: Signal<BusDetachedHandler>;
-    message: Signal<BusMessageHandler>;
-    constructor(impl: any);
-    attach(cancellable?: Cancellable): Promise<void>;
-    post(message: any, data?: Buffer | null): void;
-    [inspect.custom](depth: any, options: any): string;
-}
-export type BusDetachedHandler = () => void;
-export type BusMessageHandler = (message: any, data: Buffer | null) => void;

package/dist/bus.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Bus = void 0;
-const signals_1 = require("./signals");
-const util_1 = require("util");
-class Bus {
-    constructor(impl) {
-        this.impl = impl;
-        const signals = impl.signals;
-        this.detached = new signals_1.Signal(signals, "detached");
-        this.message = new signals_1.Signal(signals, "message");
-    }
-    attach(cancellable) {
-        return this.impl.attach(cancellable);
-    }
-    post(message, data = null) {
-        this.impl.post(message, data);
-    }
-    [util_1.inspect.custom](depth, options) {
-        return "Bus {}";
-    }
-}
-exports.Bus = Bus;

package/dist/cancellable.d.ts

@@ -1,15 +0,0 @@
-/// <reference types="node" />
-import { Signal } from "./signals";
-import { inspect } from "util";
-export declare class Cancellable {
-    private impl;
-    cancelled: Signal<CancelledHandler>;
-    constructor();
-    get isCancelled(): boolean;
-    throwIfCancelled(): void;
-    cancel(): void;
-    [inspect.custom](): string;
-    combine(other: Cancellable): Cancellable;
-    static withTimeout(ms: any): Cancellable;
-}
-export type CancelledHandler = () => void;

package/dist/cancellable.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Cancellable = void 0;
-const native_1 = require("./native");
-const signals_1 = require("./signals");
-const util_1 = require("util");
-class Cancellable {
-    constructor() {
-        this.impl = new native_1.binding.Cancellable();
-        const { signals } = this.impl;
-        this.cancelled = new signals_1.Signal(signals, "cancelled");
-    }
-    get isCancelled() {
-        return this.impl.isCancelled;
-    }
-    throwIfCancelled() {
-        this.impl.throwIfCancelled();
-    }
-    cancel() {
-        return this.impl.cancel();
-    }
-    [util_1.inspect.custom]() {
-        return "Cancellable {}";
-    }
-    combine(other) {
-        const cancel = new Cancellable();
-        this.cancelled.connect(() => cancel.cancel());
-        other.cancelled.connect(() => cancel.cancel());
-        if (this.isCancelled)
-            cancel.cancel();
-        if (other.isCancelled)
-            cancel.cancel();
-        return cancel;
-    }
-    static withTimeout(ms) {
-        const cancel = new Cancellable();
-        setTimeout(() => cancel.cancel(), ms).unref();
-        return cancel;
-    }
-}
-exports.Cancellable = Cancellable;

package/dist/child.d.ts

@@ -1,16 +0,0 @@
-export interface Child {
-    pid: number;
-    parentPid: number;
-    origin: ChildOrigin;
-    identifier: string | null;
-    path: string | null;
-    argv: string[] | null;
-    envp: {
-        [name: string]: string;
-    } | null;
-}
-export declare enum ChildOrigin {
-    Fork = "fork",
-    Exec = "exec",
-    Spawn = "spawn"
-}

package/dist/child.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChildOrigin = void 0;
-var ChildOrigin;
-(function (ChildOrigin) {
-    ChildOrigin["Fork"] = "fork";
-    ChildOrigin["Exec"] = "exec";
-    ChildOrigin["Spawn"] = "spawn";
-})(ChildOrigin || (exports.ChildOrigin = ChildOrigin = {}));

package/dist/crash.d.ts

@@ -1,10 +0,0 @@
-export interface Crash {
-    pid: number;
-    processName: string;
-    summary: string;
-    report: string;
-    parameters: CrashParameters;
-}
-export interface CrashParameters {
-    [name: string]: string | number | boolean;
-}

package/dist/crash.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });