@mblaney/holster 1.0.26 → 1.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mblaney/holster",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "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/get.js

@@ -1,4 +1,4 @@
-import {match} from "./utils.js"
+import {match, userPublicKey} from "./utils.js"
 
 const Get = (lex, graph) => {
   if (!lex || typeof lex !== "object") {
@@ -34,7 +34,8 @@ const Get = (lex, graph) => {
     }
   } else {
     for (const key of Object.keys(graph[soul])) {
-      if (match(lex["."], key)) {
+      // Always include userPublicKey for verification, regardless of filter
+      if (key === userPublicKey || match(lex["."], key)) {
         node[key] = graph[soul][key]
         node._[">"][key] = graph[soul]._[">"][key]
         const state = graph[soul]._[">"][key]

package/src/radisk.js

@@ -34,6 +34,7 @@ const Radisk = opt => {
   if (!opt.write) opt.write = 1 // Wait time before write in milliseconds
   if (!opt.size) opt.size = 1024 * 1024 // File size on disk, default 1MB
   if (!opt.memoryLimit) opt.memoryLimit = 500 // Memory limit in MB
+  if (!opt.readTimeout) opt.readTimeout = 1000 // Read timeout in milliseconds
   if (typeof opt.cache === "undefined") opt.cache = true
 
   if (!opt.store) {
@@ -126,20 +127,34 @@ const Radisk = opt => {
       // Check if there's already a pending read for this key
       if (pendingReads.has(key)) {
         // Add callback to existing pending read
-        pendingReads.get(key).push(cb)
+        pendingReads.get(key).callbacks.push(cb)
         return
       }
 
-      // Start new read and create callback queue
-      pendingReads.set(key, [cb])
+      // Start new read and create callback queue with fired flag
+      const pending = {callbacks: [cb], fired: false, timeoutId: null}
+      pendingReads.set(key, pending)
+
+      // Set a timeout to fire callbacks if read takes too long
+      pending.timeoutId = setTimeout(() => {
+        if (!pending.fired) {
+          pending.fired = true
+          pendingReads.delete(key)
+          const err = new Error("radisk read timeout")
+          pending.callbacks.forEach(callback => callback(err, undefined))
+        }
+      }, opt.readTimeout)
 
       const readStart = Date.now()
       return radisk.read(key, (err, result) => {
+        clearTimeout(pending.timeoutId)
         perfLog("read", readStart, key)
-        // Execute all pending callbacks for this key
-        const callbacks = pendingReads.get(key) || []
-        pendingReads.delete(key)
-        callbacks.forEach(callback => callback(err, result))
+        // Execute all pending callbacks for this key if timeout hasn't fired
+        if (!pending.fired) {
+          pending.fired = true
+          pendingReads.delete(key)
+          pending.callbacks.forEach(callback => callback(err, result))
+        }
       })
     }
 

package/src/store.js

@@ -226,7 +226,8 @@ const Store = opt => {
       var node
       var signatures = {}
       const each = (value, key) => {
-        if (!utils.match(lex["."], key)) return
+        // Always include userPublicKey for verification, regardless of filter
+        if (key !== utils.userPublicKey && !utils.match(lex["."], key)) return
 
         if (!node) node = {_: {"#": soul, ">": {}}}
         node[key] = value[0]