use ras 3 (#32)

Author: mafintosh

index.js

@@ -24,7 +24,7 @@ module.exports = class RandomAccessFile extends RandomAccessStorage {
   constructor (filename, opts = {}) {
     const size = opts.size || (opts.truncate ? 0 : -1)
 
-    super({ createAlways: size >= 0 })
+    super()
 
     if (opts.directory) filename = path.join(opts.directory, path.resolve('/', filename).replace(/^\w+:\\/, ''))
 
@@ -44,20 +44,20 @@ module.exports = class RandomAccessFile extends RandomAccessStorage {
     this._lock = opts.lock === true
     this._sparse = opts.sparse === true
     this._alloc = opts.alloc || Buffer.allocUnsafe
+    this._alwaysCreate = size >= 0
   }
 
   _open (req) {
+    const create = this._alwaysCreate || this.writing // .writing comes from RAS
     const self = this
-    const mode = this.mode | (req.create ? CREAT : 0)
+    const mode = this.mode | (create ? CREAT : 0)
 
-    if (req.create) fs.mkdir(path.dirname(this.filename), { recursive: true }, ondir)
+    if (create) fs.mkdir(path.dirname(this.filename), { recursive: true }, ondir)
     else ondir(null)
 
     function ondir (err) {
       if (err) return req.callback(err)
-
-      if (self.fd) fs.close(self.fd, oncloseold)
-      else fs.open(self.filename, mode, onopen)
+      fs.open(self.filename, mode, onopen)
     }
 
     function onopen (err, fd) {
@@ -90,13 +90,6 @@ module.exports = class RandomAccessFile extends RandomAccessStorage {
       fs.ftruncate(self.fd, self._size, ontruncate)
     }
 
-    function oncloseold (err) {
-      if (err) return onerrorafteropen(err)
-
-      self.fd = 0
-      fs.open(self.filename, mode, onopen)
-    }
-
     function ontruncate (err) {
       if (err) return onerrorafteropen(err)
 
@@ -192,7 +185,7 @@ module.exports = class RandomAccessFile extends RandomAccessStorage {
     }
   }
 
-  _destroy (req) {
+  _unlink (req) {
     const self = this
 
     const root = this.directory && path.resolve(path.join(this.directory, '.'))

package.json

@@ -12,7 +12,7 @@
     "browser.js"
   ],
   "dependencies": {
-    "random-access-storage": "^2.2.0"
+    "random-access-storage": "^3.0.0"
   },
   "optionalDependencies": {
     "fs-native-extensions": "^1.1.0"

test/basic.js

@@ -19,7 +19,7 @@ test('write and read', function (t) {
     file.read(0, 5, function (err, buf) {
       t.absent(err, 'no error')
       t.alike(buf, Buffer.from('hello'))
-      file.destroy(() => t.pass())
+      file.unlink(() => t.pass())
     })
   })
 })
@@ -31,7 +31,7 @@ test('read before write', function (t) {
 
   file.read(0, 0, function (err, buf) {
     t.ok(err, 'not created')
-    file.destroy(() => t.pass())
+    file.unlink(() => t.pass())
   })
 })
 
@@ -42,7 +42,7 @@ test('read range before write', function (t) {
 
   file.read(0, 5, function (err, buf) {
     t.ok(err, 'not created')
-    file.destroy(() => t.pass())
+    file.unlink(() => t.pass())
   })
 })
 
@@ -55,7 +55,7 @@ test('read range > file', function (t) {
     t.absent(err, 'no error')
     file.read(0, 10, function (err, buf) {
       t.ok(err, 'not satisfiable')
-      file.destroy(() => t.pass())
+      file.unlink(() => t.pass())
     })
   })
 })
@@ -130,7 +130,7 @@ test('truncate with size', function (t) {
   file.stat(function (err, st) {
     t.absent(err, 'no error')
     t.is(st.size, 100)
-    file.destroy(() => t.pass())
+    file.unlink(() => t.pass())
   })
 })
 
@@ -159,7 +159,7 @@ test('mkdir path', function (t) {
     file.read(0, 5, function (err, buf) {
       t.absent(err, 'no error')
       t.alike(buf, Buffer.from('hello'))
-      file.destroy(() => t.pass())
+      file.unlink(() => t.pass())
     })
   })
 })
@@ -192,7 +192,7 @@ test('write/read big chunks', async function (t) {
 
   await io
 
-  file.destroy(() => t.pass())
+  file.unlink(() => t.pass())
 })
 
 test('rmdir option', function (t) {
@@ -206,11 +206,11 @@ test('rmdir option', function (t) {
     file.read(0, 2, function (err, buf) {
       t.absent(err, 'no error')
       t.alike(buf, Buffer.from('hi'))
-      file.destroy(ondestroy)
+      file.unlink(onunlink)
     })
   })
 
-  function ondestroy (err) {
+  function onunlink (err) {
     t.absent(err, 'no error')
     fs.stat(path.join(tmp, 'rmdir'), function (err) {
       t.is(err && err.code, 'ENOENT', 'should be removed')
@@ -231,11 +231,11 @@ test('rmdir option with non empty parent', function (t) {
     file.read(0, 2, function (err, buf) {
       t.absent(err, 'no error')
       t.alike(buf, Buffer.from('hi'))
-      file.destroy(ondestroy)
+      file.unlink(onunlink)
     })
   })
 
-  function ondestroy (err) {
+  function onunlink (err) {
     t.absent(err, 'no error')
     fs.stat(path.join(tmp, 'rmdir'), function (err) {
       t.absent(err, 'should not be removed')
@@ -264,7 +264,7 @@ test('del, partial file block', function (t) {
           file.read(50, 50, function (err, buf) {
             t.absent(err, 'no error')
             t.alike(buf, Buffer.alloc(50))
-            file.destroy(() => t.pass())
+            file.unlink(() => t.pass())
           })
         })
       })
@@ -289,7 +289,7 @@ test('del, whole file block', function (t) {
             t.absent(err, 'no error')
             t.comment(before.blocks + ' -> ' + after.blocks + ' blocks')
             t.ok(after.blocks < before.blocks, 'fewer blocks')
-            file.destroy(() => t.pass())
+            file.unlink(() => t.pass())
           })
         })
       })
@@ -314,7 +314,7 @@ test('del, partial and whole', function (t) {
             t.absent(err, 'no error')
             t.comment(before.blocks + ' -> ' + after.blocks + ' blocks')
             t.ok(after.blocks < before.blocks, 'fewer blocks')
-            file.destroy(() => t.pass())
+            file.unlink(() => t.pass())
           })
         })
       })
@@ -333,7 +333,7 @@ test('del, infinity', function (t) {
     file.stat(function (err, st) {
       t.absent(err, 'no error')
       t.is(st.size, 0)
-      file.destroy(() => t.pass())
+      file.unlink(() => t.pass())
     })
   })
 })
@@ -353,7 +353,7 @@ test('truncate', function (t) {
         file.stat(function (err, st) {
           t.absent(err, 'no error')
           t.is(st.size, 20)
-          file.destroy(() => t.pass())
+          file.unlink(() => t.pass())
         })
       })
     })
@@ -397,21 +397,6 @@ test('open and close many times', function (t) {
   }
 })
 
-test('trigger bad open', function (t) {
-  t.plan(3)
-
-  const file = new RAF(gen(), { truncate: true })
-
-  file.fd = 10000
-  file.open(function (err) {
-    t.ok(err, 'should error trying to close old fd')
-    file.open(function (err) {
-      t.absent(err, 'no error')
-      file.destroy(() => t.pass())
-    })
-  })
-})
-
 test('cannot escape directory', function (t) {
   t.plan(2)
 
@@ -430,7 +415,7 @@ test('directory filename resolves correctly', function (t) {
   t.is(file.filename, path.join(tmp, name))
 })
 
-test('destroy', async function (t) {
+test('unlink', async function (t) {
   t.plan(5)
 
   const name = gen()
@@ -441,11 +426,11 @@ test('destroy', async function (t) {
     file.read(0, 2, function (err, buf) {
       t.absent(err, 'no error')
       t.alike(buf, Buffer.from('hi'))
-      file.destroy(ondestroy)
+      file.unlink(onunlink)
     })
   })
 
-  function ondestroy (err) {
+  function onunlink (err) {
     t.absent(err, 'no error')
     fs.stat(name, function (err) {
       t.is(err && err.code, 'ENOENT', 'should be removed')