frida 16.7.14 → 16.7.16

package/meson.build

@@ -1,23 +1,23 @@
-project('frida-node', 'cpp',
+project('frida-node', 'c',
   version: run_command(find_program('python3'), files('scripts' / 'detect-version.py'),
     capture: true,
     check: true).stdout().strip(),
   meson_version: '>=1.1.0',
 )
 
-cpp = meson.get_compiler('cpp')
-strip = (cpp.get_argument_syntax() == 'msvc') ? '' : find_program('strip')
+cc = meson.get_compiler('c')
+strip = (cc.get_argument_syntax() == 'msvc') ? '' : find_program('strip')
 
 node = find_program('node')
 npm = find_program('npm')
 python = import('python').find_installation()
 
 version = meson.project_version()
-runtime = get_option('runtime')
-target = get_option('target')
 
 system = host_machine.system()
 
+napi_version = 8
+
 node_platforms = {
   'windows': 'win32',
 }
@@ -38,34 +38,17 @@ gyp_archs = {
 cpu_family = host_machine.cpu_family()
 gyp_arch = gyp_archs.get(cpu_family, cpu_family)
 
-fs = import('fs')
-if runtime == 'node-webkit'
-  host_binary = 'node'
-  if host_machine.system() == 'windows'
-    host_binary += '.dll'
-  endif
-else
-  host_binary = 'node'
-  if host_machine.system() == 'windows'
-    host_binary += '.exe'
-  endif
-endif
-
 message('Fetching ABI bits')
 metadata = run_command(python, files('scripts' / 'fetch-abi-bits.py'),
-  runtime, target, gyp_os, gyp_arch,
-  node, npm, meson.current_build_dir(),
+  gyp_os, gyp_arch, node, npm, meson.current_build_dir(),
   capture: true,
   check: true,
 ).stdout().strip().split('\n')
-abi = 0
 node_defines = []
 node_incdirs = []
 node_libs = []
 foreach item : metadata
-  if item.startswith('abi: ')
-    abi = item.substring(5)
-  elif item.startswith('node_defines: ')
+  if item.startswith('node_defines: ')
     node_defines += item.substring(14).split(' ')
   elif item.startswith('node_incdir: ')
     node_incdirs += item.substring(13)
@@ -76,68 +59,57 @@ foreach item : metadata
   endif
 endforeach
 
-extra_cpp_args = []
+extra_c_args = []
 extra_link_args = []
 extra_link_depends = []
 
 foreach d : node_defines
-  extra_cpp_args += '-D' + d
+  extra_c_args += '-D' + d
 endforeach
 
 if host_machine.system() == 'windows'
-  extra_cpp_args += [
-    '/Zc:__cplusplus',
-    '/Zc:inline',
-    '/Zc:threadSafeInit-',
+  extra_c_args += [
     '/wd4244',
-    '/wd4251',
-    '/wd4275',
-    '/wd5051',
-    '-DNOMINMAX',
   ]
   extra_link_args += [
-    '/DELAYLOAD:' + host_binary,
+    '/DELAYLOAD:node.exe',
     '-lDelayImp',
   ]
 endif
 
-nan_dep = dependency('nan')
-
 frida_core_dep = dependency('frida-core-1.0', default_options: [
   f'frida_version=@version@',
   'compiler_backend=disabled',
 ])
 
-subdir('src')
-
 pkg_install_dir = get_option('libdir') / 'node_modules' / 'frida'
 
+package_json = files('package.json')
+tsconfig_json = files('tsconfig.json')
+
+subdir('src')
+
 binding = shared_module('frida_binding', frida_binding_sources,
   name_prefix: '',
   name_suffix: 'node',
   include_directories: include_directories(node_incdirs),
   implicit_include_directories: false,
-  override_options: [
-    'cpp_std=c++17',
-    'cpp_eh=none',
-    'cpp_rtti=false',
-  ],
-  cpp_args: [
+  c_args: [
     '-DBUILDING_NODE_EXTENSION',
     '-DNODE_GYP_MODULE_NAME=frida_binding',
-    f'-DHOST_BINARY="@host_binary@"',
-    '-DFRIDA_' + runtime.underscorify().to_upper(),
-  ] + extra_cpp_args,
+    f'-DNAPI_VERSION=@napi_version@',
+  ] + extra_c_args,
   link_args: node_libs + extra_link_args,
   link_depends: extra_link_depends,
-  dependencies: [frida_core_dep, nan_dep],
+  dependencies: frida_core_dep,
   install: true,
   install_dir: pkg_install_dir / 'build',
+  vs_module_defs: 'src' / 'addon.def',
 )
 
 custom_target('prebuild',
   input: [binding],
-  output: [f'frida-v@version@-@runtime@-v@abi@-@node_platform@-@gyp_arch@.tar.gz'],
+  output: [f'frida-v@version@-napi-v@napi_version@-@node_platform@-@gyp_arch@.tar.gz'],
   command: [
     python,
     files('scripts' / 'package.py'),
@@ -147,20 +119,3 @@ custom_target('prebuild',
     '@OUTPUT@',
   ],
 )
-
-package_json = custom_target('package.json',
-  input: 'package.json',
-  output: 'package.json',
-  command: [
-    python,
-    files('scripts' / 'adjust-version.py'),
-    version,
-    '@INPUT@',
-    '@OUTPUT@',
-  ],
-  install: true,
-  install_dir: pkg_install_dir,
-)
-tsconfig_json = files('tsconfig.json')
-
-subdir('lib')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida",
-  "version": "16.7.14",
+  "version": "16.7.16",
   "authors": [
     "Frida Developers"
   ],
@@ -21,20 +21,24 @@
   ],
   "homepage": "https://frida.re",
   "engines": {
-    "node": ">=16 || 14 >=14.17"
+    "node": ">=16"
   },
-  "main": "./dist",
+  "main": "build/src/frida.js",
+  "exports": {
+    ".": "./build/src/frida.js"
+  },
+  "type": "module",
   "files": [
     "BSDmakefile",
     "Makefile",
+    "build/src/*.d.ts",
+    "build/src/*.js",
     "configure",
     "configure.bat",
-    "dist/",
     "make.bat",
     "meson.build",
     "meson.options",
     "tsconfig.json",
-    "lib/",
     "releng/*.py",
     "releng/*.toml",
     "releng/devkit-assets/",
@@ -51,30 +55,36 @@
   ],
   "dependencies": {
     "bindings": "^1.5.0",
-    "minimatch": "^9.0.3",
-    "nan": "^2.18.0",
-    "prebuild-install": "^7.1.1"
+    "minimatch": "^10.0.1",
+    "prebuild-install": "^7.1.3"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.18",
-    "@types/mocha": "^10.0.3",
-    "@types/node": "^20.8.8",
-    "chai": "^4.3.4",
-    "mocha": "^10.0.0",
-    "ts-node": "^10.0.0",
-    "typescript": "^5.2.2"
+    "@types/bindings": "^1.5.5",
+    "@types/chai": "^5.2.1",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^22.13.16",
+    "chai": "^5.2.0",
+    "mocha": "^11.1.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.8.2"
   },
   "scripts": {
-    "prepare": "npm run build",
-    "build": "tsc",
-    "watch": "tsc -w",
     "install": "node scripts/install.js",
-    "test": "node --expose-gc node_modules/mocha/bin/_mocha -r ts-node/register test/*.ts"
+    "test": "node --loader ts-node/esm --expose-gc node_modules/mocha/bin/_mocha --extension ts test/*.ts",
+    "examples:build": "tsc -p tsconfig.examples.json",
+    "examples:watch": "tsc -p tsconfig.examples.json -w"
   },
   "binary": {
     "host": "https://github.com",
     "remote_path": "frida/frida/releases/download/{version}",
-    "module_path": "build"
+    "module_path": "build",
+    "napi_versions": [
+      8
+    ]
+  },
+  "config": {
+    "runtime": "napi",
+    "target": "8"
   },
   "license": "LGPL-2.0 WITH WxWindows-exception-3.1",
   "repository": {

package/scripts/fetch-abi-bits.py

@@ -20,9 +20,9 @@ IMPORT_OBJECT_HDR_SIG2 = 0xffff
 
 
 def main(argv: list[str]):
-    runtime, target, gyp_os, gyp_arch = argv[1:5]
-    flavor = "|".join(argv[1:5])
-    node, npm, outdir = [Path(p) for p in argv[5:8]]
+    gyp_os, gyp_arch = argv[1:3]
+    flavor = "|".join(argv[1:3])
+    node, npm, outdir = [Path(p) for p in argv[3:6]]
 
     abidir = outdir / "abi-bits"
     metadata_file = abidir / "abi-bits.json"
@@ -37,24 +37,17 @@ def main(argv: list[str]):
         if abidir.exists():
             shutil.rmtree(abidir)
 
-        (node_incdirs, node_gypdir, node_libs) = load_dev_assets(runtime, target, gyp_os, gyp_arch,
-                                                                 node, outdir, abidir)
+        (node_incdirs, node_gypdir, node_libs) = load_dev_assets(gyp_os, gyp_arch, node, outdir, abidir)
 
         subprocess.run([npm, "init", "-y"],
                        capture_output=True,
                        cwd=abidir,
                        check=True)
-        subprocess.run([npm, "install", "node-abi", "node-gyp"],
+        subprocess.run([npm, "install", "node-gyp"],
                        capture_output=True,
                        cwd=abidir,
                        check=True)
 
-        abi = subprocess.run([node, "-e", f"import('node-abi').then(abi => {{ console.log(abi.getAbi('{target}', '{runtime}')); }})"],
-                             capture_output=True,
-                             encoding="utf-8",
-                             cwd=abidir,
-                             check=True).stdout.strip()
-
         node_defines = load_node_defines(gyp_os, gyp_arch, node_gypdir,
                                          abidir / "node_modules" / "node-gyp" / "gyp" / "pylib")
 
@@ -63,7 +56,6 @@ def main(argv: list[str]):
 
         metadata = {
             "flavor": flavor,
-            "abi": abi,
             "node_defines": node_defines,
             "node_incdirs": [str(d) for d in node_incdirs_rel],
             "node_libs": [str(l) for l in node_libs_rel],
@@ -74,7 +66,6 @@ def main(argv: list[str]):
 
 
 def print_metadata(metadata: dict[str, Union[str, list[str]]]):
-    print("abi:", metadata["abi"])
     print("node_defines:", " ".join(metadata["node_defines"]))
     for d in metadata["node_incdirs"]:
         print("node_incdir:", d)
@@ -82,45 +73,18 @@ def print_metadata(metadata: dict[str, Union[str, list[str]]]):
         print("node_lib:", l)
 
 
-def load_dev_assets(runtime: str,
-                    target: str,
-                    gyp_os: str,
+def load_dev_assets(gyp_os: str,
                     gyp_arch: str,
                     node: Path,
                     outdir: Path,
                     abidir: Path) -> tuple[list[Path], Path, list[Path]]:
-    if runtime == "node" and target == "" and gyp_os != "win":
-        node_incroot = node.parent.parent / "include"
-        node_incdir = node_incroot / "node"
-        if node_incdir.exists():
-            abidir.mkdir()
-            node_gypdir = node_incdir
-            node_libs = []
-            return ([node_incdir, node_incroot], node_gypdir, node_libs)
-
-    if target == "":
-        version = subprocess.run([node, "--version"], capture_output=True, encoding="utf-8").stdout.strip()
-    else:
-        version = f"v{target}"
-
+    version = f"v24.0.0"
     node_arch = "x86" if gyp_arch == "ia32" else gyp_arch
 
-    if runtime == "node":
-        base_url = f"https://nodejs.org/dist/{version}"
-        headers_stem = f"node-{version}-headers"
-        libs_subpath = f"/win-{node_arch}"
-        compression_formats = ["xz", "gz"]
-    elif runtime == "electron":
-        base_url = f"https://electronjs.org/headers/{version}"
-        headers_stem = f"node-{version}-headers"
-        libs_subpath = f"/win-{node_arch}"
-        compression_formats = ["gz"]
-    else:
-        assert runtime == "node-webkit"
-        base_url = f"https://node-webkit.s3.amazonaws.com/{version}"
-        headers_stem = f"nw-headers-{version}"
-        libs_subpath = "" if node_arch == "x86" else f"/{node_arch}"
-        compression_formats = ["gz"]
+    base_url = f"https://nodejs.org/dist/{version}"
+    headers_stem = f"node-{version}-headers"
+    libs_subpath = f"/win-{node_arch}"
+    compression_formats = ["xz", "gz"]
 
     download_error = None
     for compression in compression_formats:
@@ -158,25 +122,11 @@ def load_dev_assets(runtime: str,
             node_lib.write_bytes(redacted_lib.getvalue())
         node_libnames.append(node_lib.name)
 
-        if runtime == "node-webkit":
-            nw_lib = libdir / "nw.lib"
-            with urllib.request.urlopen(f"{base_url}{libs_subpath}/nw.lib") as response:
-                nw_lib.write_bytes(response.read())
-            node_libnames.append(nw_lib.name)
-
     os.rename(extracted_rootdir, abidir)
 
-    if runtime == "node-webkit":
-        node_incdirs = [
-            abidir / "src",
-            abidir / "deps" / "uv" / "include",
-            abidir / "deps" / "v8" / "include",
-        ]
-        node_gypdir = abidir
-    else:
-        incdir = abidir / "include" / "node"
-        node_incdirs = [incdir]
-        node_gypdir = incdir
+    incdir = abidir / "include" / "node"
+    node_incdirs = [incdir]
+    node_gypdir = incdir
 
     node_libs = [abidir / "lib" / name for name in node_libnames]
 
@@ -194,7 +144,7 @@ def load_node_defines(gyp_os: str, gyp_arch: str, node_gypdir: Path, gyp_pylib:
       "target_name": "frida_binding",
       "type": "loadable_module",
       "sources": [
-        "src/addon.cc",
+        "src/frida_binding.c",
       ],
     },
   ],

package/scripts/install.js

@@ -1,8 +1,9 @@
-const { execSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
+import { execSync } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
 
-const pkgRoot = path.dirname(path.dirname(__filename));
+const pkgRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
 const binding = path.join(pkgRoot, 'build', 'frida_binding.node');
 if (fs.existsSync(binding)) {
   process.exit(0);

package/src/addon.def

@@ -0,0 +1,3 @@
+EXPORTS
+	node_api_module_get_api_version_v1
+	napi_register_module_v1

package/src/addon.symbols

@@ -1 +1,2 @@
-# No exported symbols.
+_node_api_module_get_api_version_v1
+_napi_register_module_v1

package/src/addon.version

@@ -1,4 +1,8 @@
 {
+  global:
+    node_api_module_get_api_version_v1;
+    napi_register_module_v1;
+
   local:
     *;
 };

package/src/assets/meson.build

@@ -0,0 +1,13 @@
+adjusted_package_json = custom_target('package.json',
+  input: package_json,
+  output: 'package.json',
+  command: [
+    python,
+    files('adjust-version.py'),
+    version,
+    '@INPUT@',
+    '@OUTPUT@',
+  ],
+  install: true,
+  install_dir: pkg_install_dir,
+)

package/src/frida_bindgen/__main__.py

@@ -0,0 +1,4 @@
+from .cli import main
+
+if __name__ == "__main__":
+    main()