Merge pull request #9 from DougAnderson444/master

bring code up to speed
random-access-storage · Nov 18, 2020 · dbbef46 · dbbef46
2 parents 1826bbf + 01d8e98
commit dbbef46
Show file tree

Hide file tree

Showing 9 changed files with 1,579 additions and 1,480 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 node_modules
+example/bundle.js
diff --git a/example/hello.js b/example/hello.js
@@ -1,9 +1,17 @@
-var random = require('../')('dbname')
-var cool = random('cool.txt')
+var RAI = require('../')
+const storage = RAI('dbname')
+var cool = storage('cool.txt')
+
 cool.write(100, Buffer.from('GREETINGS'), function (err) {
   if (err) return console.error(err)
   cool.read(104, 3, function (err, buf) {
     if (err) return console.error(err)
     console.log(buf.toString()) // TIN
   })
+
+  cool.read(100, 9, function (err, buf) {
+    if (err) return console.error(err)
+    console.log(buf.toString()) // GREETINGS
+  })
+
 })
diff --git a/example/index.html b/example/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+    Example: Open dev console to see output<br />
+    <script src="bundle.js"></script>
+  </body>
+</html>
diff --git a/index.js b/index.js
@@ -1,4 +1,4 @@
-var Abstract = require('random-access-storage')
+var RandomAccess = require('random-access-storage')
 var inherits = require('inherits')
 var nextTick = require('next-tick')
 var once = require('once')
@@ -10,11 +10,13 @@ var DELIM = '\0'
 
 module.exports = function (dbname, xopts) {
   if (!xopts) xopts = {}
-  var idb = xopts.idb || (typeof window !== 'undefined'
-    ? window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB
-    : !indexedDB
-      ? null
-      : indexedDB)
+
+  var win = typeof window !== 'undefined' ? window
+  : (typeof self !== 'undefined' ? self : {})
+
+  var idb = xopts.idb || (typeof win !== 'undefined'
+    ? win.indexedDB || win.mozIndexedDB || win.webkitIndexedDB || win.msIndexedDB
+    : null)
   if (!idb) throw new Error('indexedDB not present and not given')
   var db = null
   var dbqueue = []
@@ -51,15 +53,15 @@ module.exports = function (dbname, xopts) {
 
 function Store (opts) {
   if (!(this instanceof Store)) return new Store(opts)
-  Abstract.call(this)
+  RandomAccess.call(this)
   if (!opts) opts = {}
   if (typeof opts === 'string') opts = { name: opts }
   this.size = opts.size || 4096
   this.name = opts.name
   this.length = opts.length || 0
   this._getdb = opts.db
 }
-inherits(Store, Abstract)
+inherits(Store, RandomAccess)
 
 Store.prototype._blocks = function (i, j) {
   return blocks(this.size, i, j)
@@ -116,7 +118,7 @@ Store.prototype._write = function (req) {
       var o = offsets[i]
       var len = o.end - o.start
       if (len === self.size) {
-        block = req.data.slice(j, j + len)
+        block = bufferFrom(req.data.slice(j, j + len))
       } else {
         block = buffers[i]
         req.data.copy(block, o.start, j, j + len)
@@ -131,7 +133,9 @@ Store.prototype._write = function (req) {
       self.length = length
       req.callback(null)
     })
-    store.transaction.addEventListener('error', req.callback)
+    store.transaction.addEventListener('error', function (err) {
+      req.callback(err)
+    })
   }
 }
 
@@ -160,6 +164,20 @@ Store.prototype._open = function (req) {
   })
 }
 
+Store.prototype._close = function (req) {
+  this._getdb(function (db) {
+    //db.close() // TODO: reopen gracefully. Close breaks with corestore, as innercorestore closes the db
+    req.callback()
+  })
+}
+
+Store.prototype._stat = function (req) {
+  var self = this
+  nextTick(function () {
+    req.callback(null, { size: self.length })
+  })
+}
+
 function backify (r, cb) {
   r.addEventListener('success', function (ev) { cb(null, ev) })
   r.addEventListener('error', cb)