frida-fs 5.0.0 → 5.1.0

package/index.js

@@ -1,7 +1,6 @@
 import {Buffer} from 'buffer';
 import process from 'process';
-import {Readable} from 'readable-stream/lib/readable.js';
-import {Writable} from 'readable-stream/lib/writable.js';
+import stream from 'stream';
 
 const {platform, pointerSize} = Process;
 
@@ -90,7 +89,7 @@ const SEEK_END = 2;
 
 const EINTR = 4;
 
-class ReadStream extends Readable {
+class ReadStream extends stream.Readable {
   constructor(path) {
     super({
       highWaterMark: 4 * 1024 * 1024
@@ -103,8 +102,7 @@ class ReadStream extends Readable {
     const fd = getApi().open(pathStr, constants.O_RDONLY, 0);
     if (fd.value === -1) {
       process.nextTick(() => {
-        this.emit('error', new Error(`Unable to open file (${getErrorString(fd.errno)})`));
-        this.push(null);
+        this.destroy(new Error(getErrorString(fd.errno)));
       });
       return;
     }
@@ -112,6 +110,15 @@ class ReadStream extends Readable {
     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;
@@ -121,7 +128,6 @@ class ReadStream extends Readable {
       this._readRequest = null;
 
       if (buffer.byteLength === 0) {
-        this._closeInput();
         this.push(null);
         return;
       }
@@ -131,21 +137,12 @@ class ReadStream extends 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 Writable {
+class WriteStream extends stream.Writable {
   constructor(path) {
     super({
       highWaterMark: 4 * 1024 * 1024
@@ -160,15 +157,21 @@ class WriteStream extends Writable {
     const fd = getApi().open(pathStr, flags, mode);
     if (fd.value === -1) {
       process.nextTick(() => {
-        this.emit('error', new Error(`Unable to open file (${getErrorString(fd.errno)})`));
-        this.push(null);
+        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) {
@@ -187,13 +190,6 @@ class WriteStream extends Writable {
       callback(error);
     });
   }
-
-  _closeOutput() {
-    if (this._output !== null) {
-      this._output.close();
-      this._output = null;
-    }
-  }
 }
 
 const direntSpecs = {
@@ -246,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;
@@ -281,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();
@@ -297,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');
@@ -328,19 +324,25 @@ 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);
 }
 
-function unlinkSync(path) {
-  const {unlink} = getApi();
+function rmdirSync(path) {
+  const pathStr = Memory.allocUtf8String(path);
 
+  const result = getApi().rmdir(pathStr);
+  if (result.value === -1)
+    throw new Error(getErrorString(result.errno));
+}
+
+function unlinkSync(path) {
   const pathStr = Memory.allocUtf8String(path);
 
-  const result = unlink(pathStr);
+  const result = getApi().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([
@@ -527,7 +529,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) {
@@ -653,6 +655,7 @@ const apiSpec = [
   ['readdir', NF, 'pointer', ['pointer']],
   ['readdir$INODE64', NF, 'pointer', ['pointer']],
   ['readlink', SF, ssizeType, ['pointer', 'pointer', sizeType]],
+  ['rmdir', SF, 'int', ['pointer']],
   ['unlink', SF, 'int', ['pointer']],
   ['stat', SF, 'int', ['pointer', 'pointer']],
   ['stat64', SF, 'int', ['pointer', 'pointer']],
@@ -713,6 +716,7 @@ export function createWriteStream(path) {
 export const readdir = callbackify(readdirSync);
 export const readFile = callbackify(readFileSync);
 export const readlink = callbackify(readlinkSync);
+export const rmdir = callbackify(rmdirSync);
 export const unlink = callbackify(unlinkSync);
 export const stat = callbackify(statSync);
 export const lstat = callbackify(lstatSync);
@@ -723,6 +727,7 @@ export {
   list,
   readFileSync,
   readlinkSync,
+  rmdirSync,
   unlinkSync,
   statSync,
   lstatSync,
@@ -740,6 +745,8 @@ export default {
   readFileSync,
   readlink,
   readlinkSync,
+  rmdir,
+  rmdirSync,
   unlink,
   unlinkSync,
   stat,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-fs",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "Create a stream from a filesystem resource",
   "main": "index.js",
   "type": "module",
@@ -15,8 +15,5 @@
   "bugs": {
     "url": "https://github.com/nowsecure/frida-fs/issues"
   },
-  "homepage": "https://github.com/nowsecure/frida-fs#readme",
-  "dependencies": {
-    "readable-stream": "^4.0.0"
-  }
+  "homepage": "https://github.com/nowsecure/frida-fs#readme"
 }