frida-fs 6.0.0 → 7.0.1

package/dist/index.d.ts

@@ -1,8 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="frida-gum" />
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Buffer } from "buffer";
 import stream from "stream";
 declare const constants: {
@@ -69,14 +64,14 @@ declare class Stats {
 type AsyncCallback<T> = (error: Error | null, result?: T) => void;
 export declare function createReadStream(path: string): ReadStream;
 export declare function createWriteStream(path: string): WriteStream;
-export declare const readdir: (args_0: string, args_1: AsyncCallback<string[]>) => void;
-export declare const readFile: (args_0: string, args_1: ReadFileOptions | undefined, args_2: AsyncCallback<string | Buffer>) => void;
-export declare const writeFile: (args_0: string, args_1: string | NodeJS.ArrayBufferView, args_2: WriteFileOptions | undefined, args_3: AsyncCallback<void>) => void;
-export declare const readlink: (args_0: string, args_1: AsyncCallback<string>) => void;
-export declare const rmdir: (args_0: string, args_1: AsyncCallback<void>) => void;
-export declare const unlink: (args_0: string, args_1: AsyncCallback<void>) => void;
-export declare const stat: (args_0: string, args_1: AsyncCallback<Stats>) => void;
-export declare const lstat: (args_0: string, args_1: AsyncCallback<Stats>) => void;
+export declare const readdir: (path: string, args_1: AsyncCallback<string[]>) => void;
+export declare const readFile: (path: string, options: ReadFileOptions | undefined, args_2: AsyncCallback<string | Buffer<ArrayBufferLike>>) => void;
+export declare const writeFile: (path: string, data: string | NodeJS.ArrayBufferView<ArrayBufferLike>, options: WriteFileOptions | undefined, args_3: AsyncCallback<void>) => void;
+export declare const readlink: (path: string, args_1: AsyncCallback<string>) => void;
+export declare const rmdir: (path: string, args_1: AsyncCallback<void>) => void;
+export declare const unlink: (path: string, args_1: AsyncCallback<void>) => void;
+export declare const stat: (path: string, args_1: AsyncCallback<Stats>) => void;
+export declare const lstat: (path: string, args_1: AsyncCallback<Stats>) => void;
 export { constants, readdirSync, list, readFileSync, writeFileSync, readlinkSync, rmdirSync, unlinkSync, statSync, lstatSync, Stats, };
 declare const _default: {
     constants: {
@@ -84,22 +79,22 @@ declare const _default: {
     };
     createReadStream: typeof createReadStream;
     createWriteStream: typeof createWriteStream;
-    readdir: (args_0: string, args_1: AsyncCallback<string[]>) => void;
+    readdir: (path: string, args_1: AsyncCallback<string[]>) => void;
     readdirSync: typeof readdirSync;
     list: typeof list;
-    readFile: (args_0: string, args_1: ReadFileOptions | undefined, args_2: AsyncCallback<string | Buffer>) => void;
-    readFileSync: (path: string, options?: ReadFileOptions | undefined) => string | Buffer;
-    writeFile: (args_0: string, args_1: string | NodeJS.ArrayBufferView, args_2: WriteFileOptions | undefined, args_3: AsyncCallback<void>) => void;
+    readFile: (path: string, options: ReadFileOptions | undefined, args_2: AsyncCallback<string | Buffer<ArrayBufferLike>>) => void;
+    readFileSync: (path: string, options?: ReadFileOptions) => string | Buffer;
+    writeFile: (path: string, data: string | NodeJS.ArrayBufferView<ArrayBufferLike>, options: WriteFileOptions | undefined, args_3: AsyncCallback<void>) => void;
     writeFileSync: typeof writeFileSync;
-    readlink: (args_0: string, args_1: AsyncCallback<string>) => void;
+    readlink: (path: string, args_1: AsyncCallback<string>) => void;
     readlinkSync: (path: string) => string;
-    rmdir: (args_0: string, args_1: AsyncCallback<void>) => void;
+    rmdir: (path: string, args_1: AsyncCallback<void>) => void;
     rmdirSync: (path: string) => void;
-    unlink: (args_0: string, args_1: AsyncCallback<void>) => void;
+    unlink: (path: string, args_1: AsyncCallback<void>) => void;
     unlinkSync: (path: string) => void;
-    stat: (args_0: string, args_1: AsyncCallback<Stats>) => void;
+    stat: (path: string, args_1: AsyncCallback<Stats>) => void;
     statSync: (path: string) => Stats;
-    lstat: (args_0: string, args_1: AsyncCallback<Stats>) => void;
+    lstat: (path: string, args_1: AsyncCallback<Stats>) => void;
     lstatSync: (path: string) => Stats;
     Stats: typeof Stats;
 };

package/dist/index.js

@@ -815,8 +815,10 @@ function statsReadField(name, path) {
         return undefined;
     }
     const [offset, type] = field;
-    const read = (typeof type === "string") ? NativePointer.prototype["read" + type] : type;
-    const value = read.call(this.buffer.add(offset), path);
+    const address = this.buffer.add(offset);
+    const value = (typeof type === "string")
+        ? NativePointer.prototype["read" + type].call(address)
+        : type.call(address, path);
     if (value instanceof Int64 || value instanceof UInt64)
         return value.valueOf();
     return value;
@@ -964,7 +966,7 @@ function makeApi(spec) {
         return api;
     }, {});
 }
-const kernel32 = isWindows ? Process.getModuleByName("kernel32.dll") : null;
+let kernel32 = null;
 const nativeOpts = (isWindows && pointerSize === 4) ? { abi: "stdcall" } : {};
 function addApiPlaceholder(api, entry) {
     const [name] = entry;
@@ -972,6 +974,8 @@ function addApiPlaceholder(api, entry) {
         configurable: true,
         get() {
             const [, Ctor, retType, argTypes, wrapper] = entry;
+            if (isWindows && kernel32 === null)
+                kernel32 = Process.getModuleByName("kernel32.dll");
             let impl = null;
             const address = isWindows
                 ? kernel32.findExportByName(name)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-fs",
-  "version": "6.0.0",
+  "version": "7.0.1",
   "description": "Create a stream from a filesystem resource",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,6 +25,6 @@
   "devDependencies": {
     "@types/frida-gum": "^19.0.0",
     "@types/node": "^18.15.3",
-    "typescript": "^5.1.3"
+    "typescript": "^5.8.3"
   }
 }