frida-fs 5.2.0 → 5.2.2

package/dist/index.js

@@ -16,7 +16,8 @@ import process from "process";
 import stream from "stream";
 const getWindowsApi = memoize(_getWindowsApi);
 const getPosixApi = memoize(_getPosixApi);
-const { platform, pointerSize } = Process;
+const platform = Process.platform;
+const pointerSize = Process.pointerSize;
 const isWindows = platform === "windows";
 const S_IFMT = 0xf000;
 const S_IFREG = 0x8000;
@@ -96,7 +97,7 @@ const constants = {
     ...universalConstants,
     ...platformConstants[platform]
 };
-const INVALID_HANDLE_VALUE = ptr(-1);
+const INVALID_HANDLE_VALUE = -1;
 const GENERIC_READ = 0x80000000;
 const GENERIC_WRITE = 0x40000000;
 const FILE_SHARE_READ = 0x1;
@@ -536,6 +537,24 @@ const statFields = new Set([
     "ctime",
     "birthtime",
 ]);
+const statSpecGenericLinux32 = {
+    size: 88,
+    fields: {
+        "dev": [0, "U64"],
+        "mode": [16, "U32"],
+        "nlink": [20, "U32"],
+        "ino": [12, "U32"],
+        "uid": [24, "U32"],
+        "gid": [28, "U32"],
+        "rdev": [32, "U64"],
+        "atime": [56, readTimespec32],
+        "mtime": [64, readTimespec32],
+        "ctime": [72, readTimespec32],
+        "size": [44, "S32"],
+        "blocks": [52, "S32"],
+        "blksize": [48, "S32"],
+    }
+};
 const statSpecs = {
     "windows": {
         size: 36,
@@ -594,25 +613,45 @@ const statSpecs = {
             "blksize": [112, "S32"],
         }
     },
-    "linux-32": {
-        size: 88,
+    "linux-ia32": statSpecGenericLinux32,
+    "linux-ia32-stat64": {
+        size: 96,
         fields: {
             "dev": [0, "U64"],
             "mode": [16, "U32"],
             "nlink": [20, "U32"],
-            "ino": [12, "U32"],
+            "ino": [88, "U64"],
             "uid": [24, "U32"],
             "gid": [28, "U32"],
             "rdev": [32, "U64"],
-            "atime": [56, readTimespec32],
-            "mtime": [64, readTimespec32],
-            "ctime": [72, readTimespec32],
-            "size": [44, "S32"],
-            "blocks": [52, "S32"],
-            "blksize": [48, "S32"],
-        }
+            "atime": [64, readTimespec32],
+            "mtime": [72, readTimespec32],
+            "ctime": [80, readTimespec32],
+            "size": [44, "S64"],
+            "blocks": [56, "S64"],
+            "blksize": [52, "S32"],
+        },
     },
-    "linux-32-stat64": {
+    "linux-x64": {
+        size: 144,
+        fields: {
+            "dev": [0, "U64"],
+            "mode": [24, "U32"],
+            "nlink": [16, "U64"],
+            "ino": [8, "U64"],
+            "uid": [28, "U32"],
+            "gid": [32, "U32"],
+            "rdev": [40, "U64"],
+            "atime": [72, readTimespec64],
+            "mtime": [88, readTimespec64],
+            "ctime": [104, readTimespec64],
+            "size": [48, "S64"],
+            "blocks": [64, "S64"],
+            "blksize": [56, "S64"],
+        },
+    },
+    "linux-arm": statSpecGenericLinux32,
+    "linux-arm-stat64": {
         size: 104,
         fields: {
             "dev": [0, "U64"],
@@ -630,22 +669,22 @@ const statSpecs = {
             "blksize": [56, "S32"],
         }
     },
-    "linux-64": {
-        size: 144,
+    "linux-arm64": {
+        size: 128,
         fields: {
             "dev": [0, "U64"],
-            "mode": [24, "U32"],
-            "nlink": [16, "U64"],
+            "mode": [16, "U32"],
+            "nlink": [20, "U32"],
             "ino": [8, "U64"],
-            "uid": [28, "U32"],
-            "gid": [32, "U32"],
-            "rdev": [40, "U64"],
+            "uid": [24, "U32"],
+            "gid": [28, "U32"],
+            "rdev": [32, "U64"],
             "atime": [72, readTimespec64],
             "mtime": [88, readTimespec64],
             "ctime": [104, readTimespec64],
             "size": [48, "S64"],
             "blocks": [64, "S64"],
-            "blksize": [56, "S64"],
+            "blksize": [56, "S32"],
         },
     },
 };
@@ -661,14 +700,19 @@ function getStatSpec() {
     else {
         const api = getPosixApi();
         const stat64Impl = api.stat64 ?? api.__xstat64;
-        let platformId = `${platform}-${pointerSize * 8}`;
-        if (platformId === "linux-32") {
-            if (stat64Impl !== undefined)
+        let platformId;
+        if (platform === "darwin") {
+            platformId = `darwin-${pointerSize * 8}`;
+        }
+        else {
+            platformId = `${platform}-${Process.arch}`;
+            if (pointerSize === 4 && stat64Impl !== undefined) {
                 platformId += "-stat64";
+            }
         }
         statSpec = statSpecs[platformId];
         if (statSpec === undefined)
-            throw new Error("Current OS is not yet supported; please open a PR");
+            throw new Error("Current OS/arch combo is not yet supported; please open a PR");
         statSpec._stat = stat64Impl ?? api.stat;
         statSpec._lstat = api.lstat64 ?? api.__lxstat64 ?? api.lstat;
     }
@@ -849,12 +893,12 @@ function callbackify(original) {
         });
     };
 }
-const SF = SystemFunction;
-const NF = NativeFunction;
 const ssizeType = (pointerSize === 8) ? "int64" : "int32";
 const sizeType = "u" + ssizeType;
 const offsetType = (platform === "darwin" || pointerSize === 8) ? "int64" : "int32";
 function _getWindowsApi() {
+    const SF = SystemFunction;
+    const NF = NativeFunction;
     return makeApi([
         ["CreateFileW", SF, "pointer", ["pointer", "uint", "uint", "pointer", "uint", "uint", "pointer"]],
         ["DeleteFileW", SF, "uint", ["pointer"]],
@@ -871,6 +915,8 @@ function _getWindowsApi() {
     ]);
 }
 function _getPosixApi() {
+    const SF = SystemFunction;
+    const NF = NativeFunction;
     return makeApi([
         ["open", SF, "int", ["pointer", "int", "...", "int"]],
         ["close", NF, "int", ["int"]],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-fs",
-  "version": "5.2.0",
+  "version": "5.2.2",
   "description": "Create a stream from a filesystem resource",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",