@mblaney/holster 1.0.6 → 1.0.8

package/src/store.js

@@ -49,6 +49,12 @@ const fileSystem = opt => {
       },
       list: cb => {
         fs.readdir(dir, (err, files) => {
+          if (err) {
+            console.log("fs.readdir error:", err)
+            cb()
+            return
+          }
+
           files.forEach(cb)
           cb()
         })
@@ -206,10 +212,14 @@ const Store = opt => {
 
   return {
     get: (lex, cb) => {
-      if (!lex) {
+      if (!lex || !utils.obj.is(lex)) {
         cb("lex required")
         return
       }
+      if (!lex["#"]) {
+        cb("soul required in lex")
+        return
+      }
 
       var soul = lex["#"]
       var key = typeof lex["."] === "string" ? lex["."] : ""
@@ -241,18 +251,22 @@ const Store = opt => {
         return
       }
 
-      var count = 0
+      let count = 0
+      let finished = false
       const ack = err => {
         count--
-        if (ack.err) return
+        if (finished) return
 
-        ack.err = err
-        if (ack.err) {
-          cb(ack.err)
+        if (err) {
+          finished = true
+          cb(err)
           return
         }
 
-        if (count === 0) cb(null)
+        if (count === 0) {
+          finished = true
+          cb(null)
+        }
       }
 
       Object.keys(graph).forEach(soul => {

package/src/utils.js

@@ -1,18 +1,25 @@
 export const num = {
-  is: n =>
-    !(n instanceof Array) &&
-    (n - parseFloat(n) + 1 >= 0 || Infinity === n || -Infinity === n),
+  is: n => {
+    if (n instanceof Array) return false
+
+    if (typeof n === "number") return !isNaN(n)
+
+    if (typeof n === "string") {
+      const parsed = parseFloat(n)
+      return !isNaN(parsed) && isFinite(parsed)
+    }
+
+    return false
+  },
 }
 
 export const obj = {
   is: o => {
-    if (!o) return false
+    if (!o || typeof o !== "object") return false
 
-    return (
-      (o instanceof Object && o.constructor === Object) ||
-      Object.prototype.toString.call(o).match(/^\[object (\w+)\]$/)[1] ===
-        "Object"
-    )
+    const toString = Object.prototype.toString.call(o)
+    const match = toString.match(/^\[object (\w+)\]$/)
+    return o.constructor === Object || (match && match[1] === "Object")
   },
   map: (list, cb, o) => {
     var keys = Object.keys(list)
@@ -74,11 +81,13 @@ export const userPublicKey = "_holster_user_public_key"
 // graph converts objects to graph format with updated states,
 // with optional meta data to verify signed data.
 export const graph = (soul, data, sig, pub) => {
+  const timestamp = Date.now()
   const g = {[soul]: {_: {"#": soul, ">": {}}}}
+
   for (const [key, value] of Object.entries(data)) {
-    if (key !== "_" && key != userPublicKey && key != userSignature) {
+    if (key !== "_" && key !== userPublicKey && key !== userSignature) {
       g[soul][key] = value
-      g[soul]._[">"][key] = Date.now()
+      g[soul]._[">"][key] = timestamp
     }
   }
   // If a signature and public key are provided they also need to be stored on
@@ -87,9 +96,9 @@ export const graph = (soul, data, sig, pub) => {
   // broadcast the data as a put, which other devices will need to verify.
   if (sig && pub) {
     g[soul][userSignature] = sig
-    g[soul]._[">"][userSignature] = Date.now()
+    g[soul]._[">"][userSignature] = timestamp
     g[soul][userPublicKey] = pub
-    g[soul]._[">"][userPublicKey] = Date.now()
+    g[soul]._[">"][userPublicKey] = timestamp
   }
   return g
 }
@@ -121,7 +130,7 @@ export const match = (lex, key) => {
 export const text = {
   random: length => {
     var s = ""
-    const c = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXZabcdefghijklmnopqrstuvwxyz"
+    const c = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
     if (!length) length = 24
     for (let i = 0; i < length; i++) {
       s += c.charAt(Math.floor(Math.random() * c.length))

package/src/wire.js

@@ -164,7 +164,13 @@ const Wire = opt => {
         // across the network.
         const update = await Ham.mix(data, graph, opt.secure, listen)
         const none = Object.keys(update.now).length === 0
-        if (none || !(await check(update.now, send, cb))) return
+        if (none) {
+          // Nothing to do.
+          cb(null)
+          return
+        }
+
+        if (!(await check(update.now, send, cb))) return
 
         store.put(update.now, cb)
         // Also put data on the wire spec.