@mblaney/holster 1.0.32 → 1.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mblaney/holster",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "Holster is a service that allows synchronising data between devices using Node, Deno, Bun or the browser.",
   "type": "module",
   "main": "index.js",

package/src/holster.js

@@ -9,7 +9,7 @@ const Holster = opt => {
   else if (!utils.obj.is(opt)) opt = {}
 
   const wire = Wire(opt)
-  const user = User(null, wire)
+  const user = User(opt, wire)
   // Map callbacks since the user's callback is not passed to wire.on.
   const map = new Map()
   // Allow concurrent calls to the api by storing each context.

package/src/store.js

@@ -64,35 +64,46 @@ const fileSystem = opt => {
 
   if (opt.indexedDB) {
     let db
-    const o = indexedDB.open(dir, 1)
-    o.onupgradeneeded = event => {
-      event.target.result.createObjectStore(dir)
-    }
-    o.onerror = event => {
-      console.log(event)
-    }
-    o.onsuccess = () => {
-      db = o.result
-      // Create the root node if it doesn't exist.
-      if (db) {
-        const tx = db.transaction([dir], "readonly")
-        const req = tx.objectStore(dir).getKey("!")
-        req.onerror = () => {
-          console.log(`error getting key ${dir}/!`)
-        }
-        req.onsuccess = () => {
-          if (!req.result) {
-            const tx = db.transaction([dir], "readwrite")
-            const req = tx.objectStore(dir).put(root, "!")
-            req.onerror = () => {
-              console.log(`error putting root on ${dir}/!`)
+    const dbReady = new Promise((resolve, reject) => {
+      const o = indexedDB.open(dir, 1)
+      o.onupgradeneeded = event => {
+        event.target.result.createObjectStore(dir)
+      }
+      o.onerror = event => {
+        console.log(event)
+        reject(event)
+      }
+      o.onsuccess = () => {
+        db = o.result
+        // Create the root node if it doesn't exist.
+        if (db) {
+          const tx = db.transaction([dir], "readonly")
+          const req = tx.objectStore(dir).getKey("!")
+          req.onerror = () => {
+            console.log(`error getting key ${dir}/!`)
+            reject(req.error)
+          }
+          req.onsuccess = () => {
+            if (!req.result) {
+              const tx = db.transaction([dir], "readwrite")
+              const req = tx.objectStore(dir).put(root, "!")
+              req.onerror = () => {
+                console.log(`error putting root on ${dir}/!`)
+                reject(req.error)
+              }
+              req.onsuccess = () => {
+                resolve()
+              }
+            } else {
+              resolve()
             }
           }
+        } else {
+          console.log("error indexedDB not available")
+          reject(new Error("indexedDB not available"))
         }
-      } else {
-        console.log("error indexedDB not available")
       }
-    }
+    })
 
     return {
       get: (file, cb) => {
@@ -106,24 +117,14 @@ const fileSystem = opt => {
             cb(null, req.result)
           }
         }
-        if (db) {
-          _get(file, cb)
-          return
-        }
 
-        let retry = 0
-        const interval = setInterval(() => {
-          if (db) {
-            clearInterval(interval)
+        dbReady
+          .then(() => {
             _get(file, cb)
-            return
-          }
-
-          if (retry++ > 5) {
-            clearInterval(interval)
-            cb("error indexedDB not available")
-          }
-        }, 1000)
+          })
+          .catch(err => {
+            cb(err)
+          })
       },
       put: (file, data, cb) => {
         const _put = (file, data, cb) => {
@@ -136,24 +137,14 @@ const fileSystem = opt => {
             cb(null)
           }
         }
-        if (db) {
-          _put(file, data, cb)
-          return
-        }
 
-        let retry = 0
-        const interval = setInterval(() => {
-          if (db) {
-            clearInterval(interval)
+        dbReady
+          .then(() => {
             _put(file, data, cb)
-            return
-          }
-
-          if (retry++ > 5) {
-            clearInterval(interval)
-            cb("error indexedDB not available")
-          }
-        }, 1000)
+          })
+          .catch(err => {
+            cb(err)
+          })
       },
       list: cb => {
         const _list = cb => {
@@ -165,25 +156,15 @@ const fileSystem = opt => {
             cb()
           }
         }
-        if (db) {
-          _list(cb)
-          return
-        }
 
-        let retry = 0
-        const interval = setInterval(() => {
-          if (db) {
-            clearInterval(interval)
+        dbReady
+          .then(() => {
             _list(cb)
-            return
-          }
-
-          if (retry++ > 5) {
-            clearInterval(interval)
-            console.log("error indexedDB not available")
+          })
+          .catch(err => {
+            console.log("error indexedDB not available:", err)
             cb()
-          }
-        }, 1000)
+          })
       },
     }
   }

package/src/user.js

@@ -5,6 +5,7 @@ import {userPublicKey, userSignature} from "./utils.js"
 
 const User = (opt, wire) => {
   if (!wire) wire = Wire(opt)
+  const wait = opt?.wait ?? 5000
   let pubs = []
   let creating = false
   let authing = false
@@ -75,7 +76,7 @@ const User = (opt, wire) => {
 
           done(null)
         },
-        {wait: 5000},
+        {wait: wait},
       )
     }
 
@@ -102,7 +103,7 @@ const User = (opt, wire) => {
         pubs = Object.keys(data)
         next()
       },
-      {wait: 5000},
+      {wait: wait},
     )
   }
 
@@ -182,7 +183,7 @@ const User = (opt, wire) => {
             })
           })
         },
-        {wait: 5000},
+        {wait: wait},
       )
     },
     auth: (username, password, cb) => {

package/src/wire.js

@@ -589,11 +589,11 @@ const Wire = opt => {
           return
         }
 
-        const processMessage = () => {
+        const processMessage = async () => {
           dup.track(msg["#"])
 
           if (msg.get) get(msg, send)
-          if (msg.put) put(msg, send)
+          if (msg.put) await put(msg, send)
           send(data, isBinary)
 
           const id = msg["@"]
@@ -807,7 +807,7 @@ const Wire = opt => {
           if (Object.keys(filteredPut).length > 0) {
             // Create filtered message for Ham.mix with original message ID
             const filteredMsg = {put: filteredPut, "#": msg["#"]}
-            put(filteredMsg, send)
+            await put(filteredMsg, send)
           }
         }
 

package/test/holster.user.get.test.js

@@ -10,6 +10,7 @@ describe("holster.user.get", () => {
     file: "test/holster.user.get",
     wss: wss,
     maxAge: 100,
+    wait: 500,
   })
   const user = holster.user()
 

package/test/holster.user.lex.test.js

@@ -10,6 +10,7 @@ describe("holster.user.lex", () => {
     file: "test/holster.user.lex",
     wss: wss,
     maxAge: 100,
+    wait: 500,
   })
   const user = holster.user()
 

package/test/holster.user.off.test.js

@@ -10,6 +10,7 @@ describe("holster.user.off", () => {
     file: "test/holster.user.off",
     wss: wss,
     maxAge: 100,
+    wait: 500,
   })
   const user = holster.user()
 

package/test/holster.user.on.test.js

@@ -6,7 +6,12 @@ import Holster from "../src/holster.js"
 
 describe("holster.user.on", () => {
   const wss = new Server("ws://localhost:1234")
-  const holster = Holster({file: "test/holster.user.on", wss: wss, maxAge: 100})
+  const holster = Holster({
+    file: "test/holster.user.on",
+    wss: wss,
+    maxAge: 100,
+    wait: 500,
+  })
   const user = holster.user()
 
   test("user create", (t, done) => {

package/test/holster.user.put.test.js

@@ -10,6 +10,7 @@ describe("holster.user.put", () => {
     file: "test/holster.user.put",
     wss: wss,
     maxAge: 100,
+    wait: 500,
   })
   const user = holster.user()
   let alice = ""

package/test/system/user-chained-on.test.js

@@ -6,7 +6,11 @@ import Holster from "../../src/holster.js"
 
 describe("system - user chained get with on", () => {
   const wss = new Server("ws://localhost:9012")
-  const holster = Holster({file: "test/system/user-chained-on", wss: wss})
+  const holster = Holster({
+    file: "test/system/user-chained-on",
+    wss: wss,
+    wait: 500,
+  })
   const user = holster.user()
 
   test("user create and auth", (t, done) => {

package/test/system/user-concurrent-listeners.test.js

@@ -9,6 +9,7 @@ describe("system - user concurrent listeners", () => {
   const holster = Holster({
     file: "test/system/user-concurrent-listeners",
     wss: wss,
+    wait: 500,
   })
   const user = holster.user()
 

package/test/system/user-listener-before-data.test.js

@@ -9,6 +9,7 @@ describe("system - user listener before data", () => {
   const holster = Holster({
     file: "test/system/user-listener-before-data",
     wss: wss,
+    wait: 500,
   })
   const user = holster.user()
 

package/test/user.test.js

@@ -6,7 +6,7 @@ import User from "../src/user.js"
 
 describe("user", () => {
   const wss = new Server("ws://localhost:1234")
-  const user = User({file: "test/user", wss: wss, maxAge: 100})
+  const user = User({file: "test/user", wss: wss, maxAge: 100, wait: 500})
 
   test("create", (t, done) => {
     user.create("alice", "password", err => {