@mblaney/holster 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mblaney/holster",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "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

@@ -70,7 +70,7 @@ const Holster = opt => {
                 const data = await new Promise(res => {
                   const _ctxid = utils.text.random()
                   allctx.set(_ctxid, {chain: [{item: null, soul: id}]})
-                  api(_ctxid).next(null, res)
+                  api(_ctxid).next(null, res, _opt)
                 })
                 msg.put[soul][key] = data
               }
@@ -145,39 +145,65 @@ const Holster = opt => {
         // whole node for verification.
         const lex =
           ctx.user || opt.secure ? {"#": soul} : {"#": soul, ".": item}
-        wire.get(lex, async msg => {
-          if (msg.err) {
-            if (ctx.user || opt.secure) {
-              console.log(`error getting ${soul}: ${msg.err}`)
-            } else {
-              console.log(`error getting ${item} on ${soul}: ${msg.err}`)
+        wire.get(
+          lex,
+          async msg => {
+            if (msg.err) {
+              if (ctx.user || opt.secure) {
+                console.log(`error getting ${soul}: ${msg.err}`)
+              } else {
+                console.log(`error getting ${item} on ${soul}: ${msg.err}`)
+              }
+              if (cb) cb(null)
+              return
             }
-            if (cb) cb(null)
-            return
-          }
 
-          let node = msg.put && msg.put[soul]
-          if (node && typeof node[item] !== "undefined") {
-            let id = utils.rel.is(node[item])
-            if (id) {
-              ctx.chain[i].soul = id
-              allctx.set(ctxid, {...ctx})
-              // Call api again using the updated context.
-              if (get) {
-                api(ctxid).next(null, request.get, cb, request._opt)
+            let node = msg.put && msg.put[soul]
+            if (node && typeof node[item] !== "undefined") {
+              let id = utils.rel.is(node[item])
+              if (id) {
+                ctx.chain[i].soul = id
+                allctx.set(ctxid, {...ctx})
+                // Call api again using the updated context.
+                if (get) {
+                  api(ctxid).next(null, request.get, cb, request._opt)
+                } else if (put) {
+                  api(ctxid).put(request.put, cb)
+                } else if (on) {
+                  api(ctxid).on(request.on, cb, request._get, request._opt)
+                } else if (off) {
+                  api(ctxid).off(cb)
+                }
+              } else if (get) {
+                // Request was not for a node, return property on current soul.
+                cb(node[item])
               } else if (put) {
-                api(ctxid).put(request.put, cb)
+                // Request was chained before put, so rel doesn't exist yet.
+                id = utils.text.random()
+                node[item] = utils.rel.ify(id)
+                const g = await graph(soul, node, ctx.user, cb)
+                if (g === null) return
+
+                wire.put(g, err => {
+                  if (err) {
+                    cb(`error putting ${item} on ${soul}: ${err}`)
+                    return
+                  }
+
+                  ctx.chain[i].soul = id
+                  api(ctxid).put(request.put, cb)
+                })
               } else if (on) {
-                api(ctxid).on(request.on, cb, request._get, request._opt)
+                // Allow listening to a node that doesn't exist.
+                cb(null)
               } else if (off) {
-                api(ctxid).off(cb)
+                // Allow stop listening to a node that doesn't exist.
+                if (cb) cb(null)
               }
-            } else if (get) {
-              // Request was not for a node, return property on current soul.
-              cb(node[item])
             } else if (put) {
               // Request was chained before put, so rel doesn't exist yet.
-              id = utils.text.random()
+              const id = utils.text.random()
+              if (!node) node = {}
               node[item] = utils.rel.ify(id)
               const g = await graph(soul, node, ctx.user, cb)
               if (g === null) return
@@ -191,35 +217,13 @@ const Holster = opt => {
                 ctx.chain[i].soul = id
                 api(ctxid).put(request.put, cb)
               })
-            } else if (on) {
-              // Allow listening to a node that doesn't exist.
-              cb(null)
-            } else if (off) {
-              // Allow stop listening to a node that doesn't exist.
+            } else {
+              // Allow querying a node that doesn't exist.
               if (cb) cb(null)
             }
-          } else if (put) {
-            // Request was chained before put, so rel doesn't exist yet.
-            const id = utils.text.random()
-            if (!node) node = {}
-            node[item] = utils.rel.ify(id)
-            const g = await graph(soul, node, ctx.user, cb)
-            if (g === null) return
-
-            wire.put(g, err => {
-              if (err) {
-                cb(`error putting ${item} on ${soul}: ${err}`)
-                return
-              }
-
-              ctx.chain[i].soul = id
-              api(ctxid).put(request.put, cb)
-            })
-          } else {
-            // Allow querying a node that doesn't exist.
-            if (cb) cb(null)
-          }
-        })
+          },
+          request._opt,
+        )
         // Callback has been passed to next soul lookup or called above, so
         // return false as the calling code should not continue.
         return false
@@ -543,25 +547,29 @@ const Holster = opt => {
         allctx.set(ctxid, {chain: [{item: item, soul: soul}], on: true})
         // Map the user's callback because it can also be passed to off,
         // so need a reference to it to compare them.
-        map.set(cb, () => api(ctxid).next(null, cb))
+        map.set(cb, () => api(ctxid).next(null, cb, _opt))
         // Check if item is a rel and add event listener for the node.
-        wire.get({"#": soul, ".": item}, msg => {
-          if (msg.err) {
-            console.log(`error getting ${soul}.${item}: ${msg.err}`)
-            return
-          }
+        wire.get(
+          {"#": soul, ".": item},
+          msg => {
+            if (msg.err) {
+              console.log(`error getting ${soul}.${item}: ${msg.err}`)
+              return
+            }
 
-          const current = msg.put && msg.put[soul] && msg.put[soul][item]
-          const id = utils.rel.is(current)
-          if (id) {
-            if (lex) lex = utils.obj.put(lex, "#", id)
-            else lex = {"#": id, ".": null}
-          } else {
-            if (lex) lex = utils.obj.put(lex, "#", soul)
-            else lex = {"#": soul, ".": item}
-          }
-          wire.on(lex, map.get(cb), _get, _opt)
-        })
+            const current = msg.put && msg.put[soul] && msg.put[soul][item]
+            const id = utils.rel.is(current)
+            if (id) {
+              if (lex) lex = utils.obj.put(lex, "#", id)
+              else lex = {"#": id, ".": null}
+            } else {
+              if (lex) lex = utils.obj.put(lex, "#", soul)
+              else lex = {"#": soul, ".": item}
+            }
+            wire.on(lex, map.get(cb), _get, _opt)
+          },
+          _opt,
+        )
       },
       off: cb => {
         if (!ctxid) {

package/src/radisk.js

@@ -119,7 +119,6 @@ const Radisk = opt => {
   // 4. Read the previous file into memory
   // 5. Scan through in memory radix for all values lexically less than limit
   // 6. Merge and write all of those to the in-memory file and back to disk
-  // 7. If file is to large then split. More details needed here
   radisk.save = (rad, cb) => {
     const save = {
       find: (tree, key) => {
@@ -176,70 +175,47 @@ const Radisk = opt => {
     cache = null
     const write = {
       text: "",
+      limit: "",
+      done: false,
       count: 0,
-      file: file,
       each: (value, key, k, pre) => {
+        // each is called for all keys, but stop adding to write.text when
+        // write.slice is called, then the current contents of write.text
+        // will be written to file.
+        if (write.done) return
+
         write.count++
-        var enc =
-          Radisk.encode(pre.length) +
-          "#" +
-          Radisk.encode(k) +
-          (typeof value === "undefined" ? "" : "=" + Radisk.encode(value)) +
-          "\n"
+        value = typeof value === "undefined" ? "" : "=" + Radisk.encode(value)
+        const enc =
+          Radisk.encode(pre.length) + "#" + Radisk.encode(k) + value + "\n"
         // Cannot split the file if only have one entry to write. Also don't
         // start a split if in the middle of writing a node (pre > 0).
         if (
-          pre.length === 0 &&
           write.count > 1 &&
+          pre.length === 0 &&
           write.text.length + enc.length > opt.size
         ) {
-          write.text = ""
-          // Otherwise split the entries in half.
-          write.limit = Math.ceil(write.count / 2)
-          write.count = 0
+          const end = k.indexOf(enq)
+          write.limit = end === -1 ? k : k.substring(0, end)
+          write.done = true
           write.sub = Radix()
           Radix.map(rad, write.slice)
-          return true
+          radisk.write(write.limit, write.sub, cb)
+          return
         }
 
         write.text += enc
       },
-      put: () => {
-        opt.store.put(file, write.text, cb)
-      },
       slice: (value, key) => {
-        if (key < write.file) return
-
-        if (++write.count > write.limit) {
-          var name = write.file
-          // Use only the soul of the key as the filename so that all
-          // properties of a soul are written to the same file.
-          let end = key.indexOf(enq)
-          if (end === -1) {
-            write.file = key
-          } else {
-            write.file = key.substring(0, end)
-          }
-          write.count = 0
-          radisk.write(name, write.sub, write.next)
-          return true
-        }
+        if (key < write.limit) return
 
         write.sub(key, value)
       },
-      next: err => {
-        if (err) return cb(err)
-
-        write.sub = Radix()
-        if (!Radix.map(rad, write.slice)) {
-          radisk.write(write.file, write.sub, cb)
-        }
-      },
     }
-    // If Radix.map doesn't return true when called with write.each as a
-    // callback then didn't need to split the data. The accumulated write.text
-    // can then be stored with write.put().
-    if (!Radix.map(rad, write.each, true)) write.put()
+    Radix.map(rad, write.each, true)
+    // There is always accumulated write.text to store once write.each has
+    // finished.
+    opt.store.put(file, write.text, cb)
   }
 
   radisk.read = (key, cb) => {
@@ -248,11 +224,8 @@ const Radisk = opt => {
       if (typeof value !== "undefined") return cb(u, value)
     }
     // Only the soul of the key is compared to filenames (see radisk.write).
-    let soul = key
-    let end = key.indexOf(enq)
-    if (end !== -1) {
-      soul = key.substring(0, end)
-    }
+    const end = key.indexOf(enq)
+    const soul = end === -1 ? key : key.substring(0, end)
 
     const read = {
       lex: file => {

package/src/wire.js

@@ -231,10 +231,7 @@ const Wire = opt => {
               return
             }
 
-            if (retry++ > 5) {
-              clearInterval(interval)
-              console.log("websocket not available")
-            }
+            if (retry++ > 5) clearInterval(interval)
           }, 1000)
         }
       })
@@ -279,10 +276,7 @@ const Wire = opt => {
             return
           }
 
-          if (retry++ > 5) {
-            clearInterval(interval)
-            console.log("websocket not available")
-          }
+          if (retry++ > 5) clearInterval(interval)
         }, 1000)
       }
     })

package/test/radisk.test.js

@@ -1,8 +1,6 @@
 import {describe, test} from "node:test"
 import assert from "node:assert/strict"
 import Radisk from "../src/radisk.js"
-import Names from "./names.js"
-const names = Names()
 
 describe("radisk", () => {
   const puts = {}
@@ -175,8 +173,8 @@ describe("radisk", () => {
         "!":
           '\x1F+0\x1F#\x1F"key\x1F=\x1F"value\ncontinued\x0312345\x1F\n' +
           '\x1F+1\x1F#\x1F"A\x1F=\x1F"valueA\x1F\n' +
-          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n',
-        keyC: '\x1F+0\x1F#\x1F"keyC\x1F=\x1F"valueC\x1F\n',
+          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n' +
+          '\x1F+1\x1F#\x1F"C\x1F=\x1F"valueC\x1F\n',
         newFile: '\x1F+0\x1F#\x1F"newFile\x1F=\x1F"' + big + "\x1F\n",
       })
       radisk("newFile", (err, value) => {
@@ -198,8 +196,8 @@ describe("radisk", () => {
         "!":
           '\x1F+0\x1F#\x1F"key\x1F=\x1F"value\ncontinued\x0312345\x1F\n' +
           '\x1F+1\x1F#\x1F"A\x1F=\x1F"valueA\x1F\n' +
-          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n',
-        keyC: '\x1F+0\x1F#\x1F"keyC\x1F=\x1F"valueC\x1F\n',
+          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n' +
+          '\x1F+1\x1F#\x1F"C\x1F=\x1F"valueC\x1F\n',
         newFile: '\x1F+0\x1F#\x1F"newFile\x1F=\x1F"' + big + "\x1F\n",
         small: '\x1F+0\x1F#\x1F"small\x1F=\x1F"small value\x1F\n',
       })
@@ -220,8 +218,8 @@ describe("radisk", () => {
         "!":
           '\x1F+0\x1F#\x1F"key\x1F=\x1F"value\ncontinued\x0312345\x1F\n' +
           '\x1F+1\x1F#\x1F"A\x1F=\x1F"valueA\x1F\n' +
-          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n',
-        keyC: '\x1F+0\x1F#\x1F"keyC\x1F=\x1F"valueC\x1F\n',
+          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n' +
+          '\x1F+1\x1F#\x1F"C\x1F=\x1F"valueC\x1F\n',
         newFile: '\x1F+0\x1F#\x1F"newFile\x1F=\x1F"removed...\x1F\n',
         small: '\x1F+0\x1F#\x1F"small\x1F=\x1F"small value\x1F\n',
       })
@@ -244,8 +242,8 @@ describe("radisk", () => {
           '\x1F+1\x1F#\x1F"A\x1F=\x1F"' +
           big +
           "\x1F\n" +
-          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n',
-        keyC: '\x1F+0\x1F#\x1F"keyC\x1F=\x1F"valueC\x1F\n',
+          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n' +
+          '\x1F+1\x1F#\x1F"C\x1F=\x1F"valueC\x1F\n',
         newFile: '\x1F+0\x1F#\x1F"newFile\x1F=\x1F"removed...\x1F\n',
         small: '\x1F+0\x1F#\x1F"small\x1F=\x1F"small value\x1F\n',
       })
@@ -265,8 +263,8 @@ describe("radisk", () => {
           '\x1F+1\x1F#\x1F"A\x1F=\x1F"' +
           big +
           "\x1F\n" +
-          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n',
-        keyC: '\x1F+0\x1F#\x1F"keyC\x1F=\x1F"valueC\x1F\n',
+          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n' +
+          '\x1F+1\x1F#\x1F"C\x1F=\x1F"valueC\x1F\n',
         newFile: '\x1F+0\x1F#\x1F"newFile\x1F=\x1F"removed...\x1F\n',
         small:
           '\x1F+0\x1F#\x1F"small\x1F=\x1F"small value\x1F\n' +
@@ -292,9 +290,8 @@ describe("radisk", () => {
           '\x1F+1\x1F#\x1F"A\x1F=\x1F"' +
           big +
           "\x1F\n" +
-          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n',
-        keyC:
-          '\x1F+0\x1F#\x1F"key\x1F\n\x1F+1\x1F#\x1F"C\x1F=\x1F \x1F\n' +
+          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n' +
+          '\x1F+1\x1F#\x1F"C\x1F=\x1F \x1F\n' +
           '\x1F+1\x1F#\x1F"D\x1F=\x1F"valueD\x1F\n',
         newFile: '\x1F+0\x1F#\x1F"newFile\x1F=\x1F"removed...\x1F\n',
         small:
@@ -319,9 +316,8 @@ describe("radisk", () => {
         "!":
           '\x1F+0\x1F#\x1F"key\x1F=\x1F \x1F\n' +
           '\x1F+1\x1F#\x1F"A\x1F=\x1F \x1F\n' +
-          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n',
-        keyC:
-          '\x1F+0\x1F#\x1F"key\x1F\n\x1F+1\x1F#\x1F"C\x1F=\x1F \x1F\n' +
+          '\x1F+1\x1F#\x1F"B\x1F=\x1F"valueB\x1F\n' +
+          '\x1F+1\x1F#\x1F"C\x1F=\x1F \x1F\n' +
           '\x1F+1\x1F#\x1F"D\x1F=\x1F"valueD\x1F\n',
         newFile: '\x1F+0\x1F#\x1F"newFile\x1F=\x1F"removed...\x1F\n',
         small: