frida-fs 4.0.2 → 5.0.2

package/index.js

@@ -1,4 +1,5 @@
 import {Buffer} from 'buffer';
+import process from 'process';
 import stream from 'stream';
 
 const {platform, pointerSize} = Process;
@@ -100,14 +101,24 @@ class ReadStream extends stream.Readable {
     const pathStr = Memory.allocUtf8String(path);
     const fd = getApi().open(pathStr, constants.O_RDONLY, 0);
     if (fd.value === -1) {
-      this.emit('error', new Error(`Unable to open file (${getErrorString(fd.errno)})`));
-      this.push(null);
+      process.nextTick(() => {
+        this.destroy(new Error(getErrorString(fd.errno)));
+      });
       return;
     }
 
     this._input = new UnixInputStream(fd.value, { autoClose: true });
   }
 
+  _destroy(err, callback) {
+    if (this._input !== null) {
+      this._input.close();
+      this._input = null;
+    }
+
+    callback(err);
+  }
+
   _read(size) {
     if (this._readRequest !== null)
       return;
@@ -117,7 +128,6 @@ class ReadStream extends stream.Readable {
       this._readRequest = null;
 
       if (buffer.byteLength === 0) {
-        this._closeInput();
         this.push(null);
         return;
       }
@@ -127,18 +137,9 @@ class ReadStream extends stream.Readable {
     })
     .catch(error => {
       this._readRequest = null;
-      this._closeInput();
-      this.emit('error', error);
-      this.push(null);
+      this.destroy(error);
     });
   }
-
-  _closeInput() {
-    if (this._input !== null) {
-      this._input.close();
-      this._input = null;
-    }
-  }
 }
 
 class WriteStream extends stream.Writable {
@@ -155,14 +156,22 @@ class WriteStream extends stream.Writable {
     const mode = constants.S_IRUSR | constants.S_IWUSR | constants.S_IRGRP | constants.S_IROTH;
     const fd = getApi().open(pathStr, flags, mode);
     if (fd.value === -1) {
-      this.emit('error', new Error(`Unable to open file (${getErrorString(fd.errno)})`));
-      this.push(null);
+      process.nextTick(() => {
+        this.destroy(new Error(getErrorString(fd.errno)));
+      });
       return;
     }
 
     this._output = new UnixOutputStream(fd.value, { autoClose: true });
-    this.on('finish', () => this._closeOutput());
-    this.on('error', () => this._closeOutput());
+  }
+
+  _destroy(err, callback) {
+    if (this._output !== null) {
+      this._output.close();
+      this._output = null;
+    }
+
+    callback(err);
   }
 
   _write(chunk, encoding, callback) {
@@ -181,13 +190,6 @@ class WriteStream extends stream.Writable {
       callback(error);
     });
   }
-
-  _closeOutput() {
-    if (this._output !== null) {
-      this._output.close();
-      this._output = null;
-    }
-  }
 }
 
 const direntSpecs = {
@@ -240,7 +242,7 @@ function enumerateDirectoryEntries(path, callback) {
   const dir = opendirImpl(Memory.allocUtf8String(path));
   const dirHandle = dir.value;
   if (dirHandle.isNull())
-    throw new Error(`Unable to open directory (${getErrorString(dir.errno)})`);
+    throw new Error(getErrorString(dir.errno));
 
   try {
     let entry;
@@ -275,7 +277,7 @@ function readFileSync(path, options = {}) {
   const openResult = open(pathStr, constants.O_RDONLY, 0);
   const fd = openResult.value;
   if (fd === -1)
-    throw new Error(`Unable to open file (${getErrorString(openResult.errno)})`);
+    throw new Error(getErrorString(openResult.errno));
 
   try {
     const fileSize = lseek(fd, 0, SEEK_END).valueOf();
@@ -291,7 +293,7 @@ function readFileSync(path, options = {}) {
     } while (readFailed && readResult.errno === EINTR);
 
     if (readFailed)
-      throw new Error(`Unable to read ${path} (${getErrorString(readResult.errno)})`);
+      throw new Error(getErrorString(readResult.errno));
 
     if (n !== fileSize.valueOf())
       throw new Error('Short read');
@@ -322,7 +324,7 @@ function readlinkSync(path) {
   const result = api.readlink(pathStr, buf, linkSize);
   const n = result.value.valueOf();
   if (n === -1)
-    throw new Error(`Unable to read link (${getErrorString(result.errno)})`);
+    throw new Error(getErrorString(result.errno));
 
   return buf.readUtf8String(n);
 }
@@ -334,7 +336,7 @@ function unlinkSync(path) {
 
   const result = unlink(pathStr);
   if (result.value === -1)
-    throw new Error(`Unable to unlink (${getErrorString(result.errno)})`);
+    throw new Error(getErrorString(result.errno));
 }
 
 const statFields = new Set([
@@ -521,7 +523,7 @@ function performStat(impl, path) {
   const buf = Memory.alloc(statBufSize);
   const result = impl(Memory.allocUtf8String(path), buf);
   if (result.value !== 0)
-    throw new Error(`Unable to stat ${path} (${getErrorString(result.errno)})`);
+    throw new Error(getErrorString(result.errno));
 
   return new Proxy(new Stats(), {
     has(target, property) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-fs",
-  "version": "4.0.2",
+  "version": "5.0.2",
   "description": "Create a stream from a filesystem resource",
   "main": "index.js",
   "type": "module",