@mblaney/holster 1.0.31 → 1.0.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mblaney/holster",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "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/ham.js

@@ -11,11 +11,10 @@ const Ham = (state, currentState, value, currentValue, signed = false) => {
 
   if (state > currentState) return {incoming: true}
 
-  // state is equal to currentState
-  // If using signed timestamps then reject conflicting values because the
-  // owner can only create one value per timestamp.
+  // state is equal to currentState. Old data is expected to propagate through
+  // the network, but conflicting values with same signed timestamp are ignored
+  // since the owner can only create one value per timestamp.
   if (signed && value !== currentValue) {
-    console.log(`Signed timestamp ${state}: reject conflicting value`)
     return {historical: true}
   }
 
@@ -96,15 +95,36 @@ Ham.mix = async (change, graph, secure, listen) => {
       const signedTimestamps = new Set()
       const signedProperties = new Set()
 
-      // Verify timestamp signatures (numeric keys in node._["s"])
+      // Skip verification of timestamps that are older than what's in the graph
+      // to prevent old signatures from distributed messages causing conflicts
+      const incomingTimestamps = Object.entries(node._[">"] || {})
+
       for (const [key, sig] of Object.entries(node._["s"] || {})) {
         const asNumber = Number(key)
         if (!isNaN(asNumber) && asNumber > 0) {
+          // Check if this timestamp is for properties that already have newer
+          // versions in graph.
+          const hasNewerInGraph = incomingTimestamps.some(([prop, ts]) => {
+            if (Number(ts) === asNumber) {
+              const graphState =
+                graph[soul] && graph[soul]._[">"] ? graph[soul]._[">"][prop] : 0
+              // Skip verification if graph has a newer timestamp for property.
+              if (graphState > asNumber) {
+                return true
+              }
+            }
+            return false
+          })
+
+          if (hasNewerInGraph) {
+            continue
+          }
+
           const isValid = await SEA.verifyTimestamp(asNumber, sig, pub)
           if (isValid) {
             signedTimestamps.add(asNumber)
             // Add all properties with this timestamp to signed set
-            for (const [prop, ts] of Object.entries(node._[">"] || {})) {
+            for (const [prop, ts] of incomingTimestamps) {
               if (Number(ts) === asNumber) {
                 signedProperties.add(prop)
               }
@@ -113,9 +133,27 @@ Ham.mix = async (change, graph, secure, listen) => {
         }
       }
 
-      // Verify per-property signatures (backward compatibility)
-      const perPropertySignedProps = await SEA.verifyProperties(node, pub)
-      perPropertySignedProps.forEach(prop => signedProperties.add(prop))
+      // TODO: Remove per-property signature verification after old data has
+      // been cleared. Only check per-property signatures if there are
+      // properties without timestamp signatures.
+      const propertiesWithoutTimestampSigs = Object.keys(node).filter(k => {
+        if (k === "_" || k === utils.userPublicKey) return false
+        return !incomingTimestamps.some(
+          ([prop, ts]) => prop === k && signedTimestamps.has(Number(ts)),
+        )
+      })
+
+      if (propertiesWithoutTimestampSigs.length > 0) {
+        const nodeToVerify = {_: node._}
+        for (const prop of propertiesWithoutTimestampSigs) {
+          nodeToVerify[prop] = node[prop]
+        }
+        const perPropertySignedProps = await SEA.verifyProperties(
+          nodeToVerify,
+          pub,
+        )
+        perPropertySignedProps.forEach(prop => signedProperties.add(prop))
+      }
 
       // If no properties verified, skip this update
       if (signedProperties.size === 0) {

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/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/utils.js

@@ -89,21 +89,8 @@ export const graph = (soul, data, sig, pub, timestamp) => {
       g[soul]._[">"][key] = timestamp || Date.now()
     }
   }
-  // Store signatures in node._["s"]
-  // sig can be:
-  // - object: per-property signatures (legacy format)
-  // - string: timestamp signature (new format)
   if (sig && pub && timestamp) {
-    g[soul]._["s"] = {}
-    if (typeof sig === "string") {
-      // Timestamp signature: store with timestamp as key
-      g[soul]._["s"][timestamp] = sig
-    } else if (typeof sig === "object") {
-      // Per-property signatures: store with property names as keys
-      for (const [key, signature] of Object.entries(sig)) {
-        g[soul]._["s"][key] = signature
-      }
-    }
+    g[soul]._["s"] = {[timestamp]: sig}
     g[soul][userPublicKey] = pub
     g[soul]._[">"][userPublicKey] = timestamp
   }

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 => {