frida-fs 5.2.5 → 7.0.0

package/dist/index.d.ts

@@ -1,7 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="frida-gum" />
-/// <reference types="node" resolution-mode="require"/>
 import { Buffer } from "buffer";
 import stream from "stream";
 declare const constants: {
@@ -68,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: {
@@ -83,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

@@ -1,15 +1,3 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _ReadStream_input, _ReadStream_readRequest, _WriteStream_output, _WriteStream_writeRequest;
 import { Buffer } from "buffer";
 import fsPath from "path";
 import process from "process";
@@ -119,12 +107,12 @@ const SEEK_CUR = 1;
 const SEEK_END = 2;
 const EINTR = 4;
 class ReadStream extends stream.Readable {
+    #input = null;
+    #readRequest = null;
     constructor(path) {
         super({
             highWaterMark: 4 * 1024 * 1024
         });
-        _ReadStream_input.set(this, null);
-        _ReadStream_readRequest.set(this, null);
         if (isWindows) {
             const api = getWindowsApi();
             const result = api.CreateFileW(Memory.allocUtf16String(path), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
@@ -135,7 +123,7 @@ class ReadStream extends stream.Readable {
                 });
                 return;
             }
-            __classPrivateFieldSet(this, _ReadStream_input, new Win32InputStream(handle, { autoClose: true }), "f");
+            this.#input = new Win32InputStream(handle, { autoClose: true });
         }
         else {
             const api = getPosixApi();
@@ -147,20 +135,20 @@ class ReadStream extends stream.Readable {
                 });
                 return;
             }
-            __classPrivateFieldSet(this, _ReadStream_input, new UnixInputStream(fd, { autoClose: true }), "f");
+            this.#input = new UnixInputStream(fd, { autoClose: true });
         }
     }
     _destroy(error, callback) {
-        __classPrivateFieldGet(this, _ReadStream_input, "f")?.close();
-        __classPrivateFieldSet(this, _ReadStream_input, null, "f");
+        this.#input?.close();
+        this.#input = null;
         callback(error);
     }
     _read(size) {
-        if (__classPrivateFieldGet(this, _ReadStream_readRequest, "f") !== null)
+        if (this.#readRequest !== null)
             return;
-        __classPrivateFieldSet(this, _ReadStream_readRequest, __classPrivateFieldGet(this, _ReadStream_input, "f").read(size)
+        this.#readRequest = this.#input.read(size)
             .then(buffer => {
-            __classPrivateFieldSet(this, _ReadStream_readRequest, null, "f");
+            this.#readRequest = null;
             if (buffer.byteLength === 0) {
                 this.push(null);
                 return;
@@ -169,19 +157,18 @@ class ReadStream extends stream.Readable {
                 this._read(size);
         })
             .catch(error => {
-            __classPrivateFieldSet(this, _ReadStream_readRequest, null, "f");
+            this.#readRequest = null;
             this.destroy(error);
-        }), "f");
+        });
     }
 }
-_ReadStream_input = new WeakMap(), _ReadStream_readRequest = new WeakMap();
 class WriteStream extends stream.Writable {
+    #output = null;
+    #writeRequest = null;
     constructor(path) {
         super({
             highWaterMark: 4 * 1024 * 1024
         });
-        _WriteStream_output.set(this, null);
-        _WriteStream_writeRequest.set(this, null);
         if (isWindows) {
             const api = getWindowsApi();
             const result = api.CreateFileW(Memory.allocUtf16String(path), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL);
@@ -192,7 +179,7 @@ class WriteStream extends stream.Writable {
                 });
                 return;
             }
-            __classPrivateFieldSet(this, _WriteStream_output, new Win32OutputStream(handle, { autoClose: true }), "f");
+            this.#output = new Win32OutputStream(handle, { autoClose: true });
         }
         else {
             const api = getPosixApi();
@@ -207,29 +194,28 @@ class WriteStream extends stream.Writable {
                 });
                 return;
             }
-            __classPrivateFieldSet(this, _WriteStream_output, new UnixOutputStream(fd, { autoClose: true }), "f");
+            this.#output = new UnixOutputStream(fd, { autoClose: true });
         }
     }
     _destroy(error, callback) {
-        __classPrivateFieldGet(this, _WriteStream_output, "f")?.close();
-        __classPrivateFieldSet(this, _WriteStream_output, null, "f");
+        this.#output?.close();
+        this.#output = null;
         callback(error);
     }
     _write(chunk, encoding, callback) {
-        if (__classPrivateFieldGet(this, _WriteStream_writeRequest, "f") !== null)
+        if (this.#writeRequest !== null)
             return;
-        __classPrivateFieldSet(this, _WriteStream_writeRequest, __classPrivateFieldGet(this, _WriteStream_output, "f").writeAll(chunk)
+        this.#writeRequest = this.#output.writeAll(chunk)
             .then(size => {
-            __classPrivateFieldSet(this, _WriteStream_writeRequest, null, "f");
+            this.#writeRequest = null;
             callback();
         })
             .catch(error => {
-            __classPrivateFieldSet(this, _WriteStream_writeRequest, null, "f");
+            this.#writeRequest = null;
             callback(error);
-        }), "f");
+        });
     }
 }
-_WriteStream_output = new WeakMap(), _WriteStream_writeRequest = new WeakMap();
 const windowsBackend = {
     enumerateDirectoryEntries(path, callback) {
         enumerateWindowsDirectoryEntriesMatching(path + "\\*", callback);
@@ -728,6 +714,25 @@ function getStatSpec() {
     return statSpec;
 }
 class Stats {
+    dev;
+    mode;
+    nlink;
+    uid;
+    gid;
+    rdev;
+    blksize;
+    ino;
+    size;
+    blocks;
+    atimeMs;
+    mtimeMs;
+    ctimeMs;
+    birthtimeMs;
+    atime;
+    mtime;
+    ctime;
+    birthtime;
+    buffer;
     isFile() {
         return (this.mode & S_IFMT) === S_IFREG;
     }
@@ -770,10 +775,13 @@ function makeStatsProxy(path, buf) {
                     return receiver;
                 case "buffer":
                     return buf;
-                default:
-                    if (typeof property === "symbol" || property in target)
-                        return target[property];
+                default: {
+                    let val;
+                    if (typeof property === "symbol" || (val = target[property]) !== undefined) {
+                        return val;
+                    }
                     return statsReadField.call(receiver, property, path);
+                }
             }
         },
         set(target, property, value, receiver) {
@@ -956,6 +964,7 @@ function makeApi(spec) {
         return api;
     }, {});
 }
+let kernel32 = null;
 const nativeOpts = (isWindows && pointerSize === 4) ? { abi: "stdcall" } : {};
 function addApiPlaceholder(api, entry) {
     const [name] = entry;
@@ -963,10 +972,12 @@ 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
-                ? Module.findExportByName("kernel32.dll", name)
-                : Module.findExportByName(null, name);
+                ? kernel32.findExportByName(name)
+                : Module.findGlobalExportByName(name);
             if (address !== null)
                 impl = new Ctor(address, retType, argTypes, nativeOpts);
             if (wrapper !== undefined)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-fs",
-  "version": "5.2.5",
+  "version": "7.0.0",
   "description": "Create a stream from a filesystem resource",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/nowsecure/frida-fs#readme",
   "devDependencies": {
-    "@types/frida-gum": "^18.3.2",
-    "@types/node": "^20.3.1",
-    "typescript": "^5.1.3"
+    "@types/frida-gum": "^19.0.0",
+    "@types/node": "^18.15.3",
+    "typescript": "^5.8.3"
   }
 }