@live-change/dao 0.4.12 → 0.5.1

package/browser.js

@@ -34,6 +34,10 @@ import DaoCache from "./lib/DaoCache.js"
 rd.DaoCache = DaoCache
 export { DaoCache }
 
+import InboxReader from "./lib/InboxReader.js"
+rd.InboxReader = InboxReader
+export { InboxReader }
+
 import ReactiveConnection from "./lib/ReactiveConnection.js"
 rd.ReactiveConnection = ReactiveConnection
 export { ReactiveConnection }

package/index.js

@@ -55,6 +55,9 @@ Dao.DaoProxy = DaoProxy
 const DaoCache = require("./lib/DaoCache.js")
 Dao.DaoCache = DaoCache
 
+const InboxReader = require("./lib/InboxReader.js")
+Dao.InboxReader = InboxReader
+
 const Path = require("./lib/Path.js")
 Dao.Path = Path
 

package/lib/InboxReader.js

@@ -0,0 +1,97 @@
+
+class InboxReader {
+  constructor(observableFunction, callback, start = '', bucketSize = 32) {
+    this.observableFunction = observableFunction
+    this.position = start
+    this.callback = callback
+    this.bucketSize = bucketSize
+
+    this.observable = null
+    this.queue = []
+    this.processingPromise = null
+    this.finished = false
+    this.readPromise = null
+    this.readPromiseResolve = null
+
+    this.observer = (signal, ...args) => {
+      if(signal == 'error') {
+        const error = args[0]
+        console.error("PEER MESSAGE ERROR", error.stack || error)
+        return
+      }
+      if(signal == 'putByField') {
+        const [field, id, message] = args
+        this.handleMessage(message)
+      } else if(signal == 'set') {
+        const value = args[0]
+        for (const message of value) {
+          this.handleMessage(message)
+        }
+      } else if(signal == 'push') {
+        const [message] = args
+        this.handleMessage(message)
+      } else {
+        console.error("INBOX READER SIGNAL NOT HANDLED", signal)
+      }
+      this.startProcessing()
+      this.observeNext()
+    }
+    this.observeNext()
+  }
+
+  observeNext() {
+    if(this.queue.length > this.bucketSize) return // no need to observe, there is work to do
+    if(this.observable) {
+      const observableValue = this.observable.getValue()
+      if(!observableValue) return // still loading data
+      if(observableValue.length < this.bucketSize) return // we are waiting for more
+    }
+    if(this.observable) {
+      this.observable.unobserve(this.observer)
+      this.observable = null
+    }
+    this.readPromise = new Promise(resolve => this.readPromiseResolve = resolve)
+    this.observable = this.observableFunction(this.position, this.bucketSize)
+    this.observable.observe(this.observer)
+  }
+
+  handleMessage(message) {
+    if(message.id <= this.position) return // ignore
+    this.position = message.id
+    this.queue.push(message)
+  }
+
+  startProcessing() {
+    if(!this.processingPromise) {
+      this.processingPromise = this.doProcessing()
+      this.processingPromise.then(() => this.processingPromise = null)
+    }
+    return this.processingPromise
+  }
+
+  async doProcessing() {
+    while(this.queue.length > 0 && !this.finished) {
+      const message = this.queue.shift()
+      await this.callback(message)
+      this.observeNext() // observe if needed
+    }
+  }
+
+  async sync() {
+    while(this.queue.length > 0 || this.readPromise) {
+      if(this.queue.length > 0) await this.startProcessing()
+      if(this.readPromise) await this.readPromise
+    }
+  }
+
+  dispose() {
+    this.finished = true
+    if(this.observable) {
+      this.observable.unobserve(this.observer)
+      this.observable = null
+    }
+  }
+
+}
+
+module.exports = InboxReader

package/lib/Observable.js

@@ -35,7 +35,8 @@ class Observable {
 
   handleError(error) {
     let handled = false
-    for (var observer of this.errorObservers) {
+    if(!error) return true /// ignore null errors!
+    for (let observer of this.errorObservers) {
       handled = true
       observer(error)
     }
@@ -98,6 +99,8 @@ class Observable {
 
     const waitPromise = new Promise((resolve, reject) => {
       errorObserver = (error) => {
+        console.log("ERROR SIGNAL", error)
+        console.trace("WEER")
         if(resultObserver) this.unobserve(resultObserver)
         resultObserver = undefined
         if(errorObserver) this.uncatch(errorObserver)

package/lib/ObservableList.js

@@ -18,6 +18,7 @@ class ObservableList extends Observable {
   }
 
   set(list) {
+    this.handleError(null)
     if(list === this.list) return
     try {
       if (JSON.stringify(list) == JSON.stringify(this.list)) return
@@ -30,26 +31,32 @@ class ObservableList extends Observable {
   }
 
   push(value) {
+    this.handleError(null)
     this.list.push(value)
     this.fireObservers('push', value)
   }
   unshift(value) {
+    this.handleError(null)
     this.list.unshift(value)
     this.fireObservers('unshift', value)
   }
   pop() {
+    this.handleError(null)
     this.list.pop()
     this.fireObservers('pop')
   }
   shift() {
+    this.handleError(null)
     this.list.shift()
     this.fireObservers('shift')
   }
   splice(at, del, ...values) {
+    this.handleError(null)
     this.list.splice(at, del, ...values)
     this.fireObservers('splice', at, del, ...values)
   }
   putByField(field, value, element, reverse = false, oldElement) {
+    this.handleError(null)
     if(!reverse) {
       let i, l
       for(i = 0, l = this.list.length; i < l; i++) {
@@ -80,6 +87,7 @@ class ObservableList extends Observable {
     this.fireObservers('putByField', field, value, element, reverse, oldElement)
   }
   remove(exact) {
+    this.handleError(null)
     let json = JSON.stringify(exact)
     for(let i = 0, l = this.list.length; i < l; i++) {
       if(JSON.stringify(this.list[i]) == json) this.list.splice(i, 1)
@@ -87,6 +95,7 @@ class ObservableList extends Observable {
     this.fireObservers('remove', exact)
   }
   removeByField(field, value, oldElement) {
+    this.handleError(null)
     let json = JSON.stringify(value)
     for(let i = 0, l = this.list.length; i < l; i++) {
       if(JSON.stringify(this.list[i][field]) == json) {
@@ -99,8 +108,9 @@ class ObservableList extends Observable {
     this.fireObservers('removeByField', field, value, oldElement)
   }
   removeBy(fields) {
+    this.handleError(null)
     let jsonf = []
-    for(var k in fields) {
+    for(let k in fields) {
       jsonf.push([k, JSON.stringify(fields[k])])
     }
     for(let i = 0, l = this.list.length; i < l; i++) {
@@ -118,6 +128,7 @@ class ObservableList extends Observable {
   }
 
   update(exact, element) {
+    this.handleError(null)
     let json = JSON.stringify(exact)
     for(let i = 0, l = this.list.length; i < l; i++) {
       if(JSON.stringify(this.list[i]) == json) this.list.splice(i, 1, element)
@@ -125,6 +136,7 @@ class ObservableList extends Observable {
     this.fireObservers('update', exact, element)
   }
   updateByField(field, value, element) {
+    this.handleError(null)
     let json = JSON.stringify(value)
     for(let i = 0, l = this.list.length; i < l; i++) {
       if(JSON.stringify(this.list[i][field]) == json) this.list.splice(i, 1, element)
@@ -132,6 +144,7 @@ class ObservableList extends Observable {
     this.fireObservers('updateByField', field, value, element)
   }
   updateBy(fields, element) {
+    this.handleError(null)
     let jsonf = []
     for(const k in fields) {
       jsonf.push([k, JSON.stringify(fields[k])])

package/lib/ObservableValue.js

@@ -17,6 +17,7 @@ class ObservableValue extends Observable {
   }
 
   set(value) {
+    this.handleError(null)
     if(value === this.value) return;
     try {
       if (JSON.stringify(value) == JSON.stringify(this.value)) return;
@@ -35,7 +36,7 @@ class ObservableValue extends Observable {
   }
   unbindProperty(object, property) {
     for(let i = 0; i < this.properties.length; i++) {
-      var prop = this.properties[i]
+      let prop = this.properties[i]
       if(prop[0] == object && prop[1] == property) {
         this.properties.splice(i,1)
         if(this.isUseless()) this.dispose()
@@ -51,8 +52,8 @@ class ObservableValue extends Observable {
     if(this.savedError !== undefined) object[property] = this.savedError
   }
   unbindErrorProperty(object, property) {
-    for(var i = 0; i < this.errorProperties.length; i++) {
-      var prop = this.errorProperties[i]
+    for(let i = 0; i < this.errorProperties.length; i++) {
+      let prop = this.errorProperties[i]
       if(prop[0] == object && prop[1] == property) {
         this.errorProperties.splice(i,1)
         if(this.isUseless()) this.dispose()
@@ -65,7 +66,7 @@ class ObservableValue extends Observable {
   handleError(error) {
     this.savedError = error
     let handled = super.handleError(error)
-    for(var [object, property] of this.errorProperties) {
+    for(let [object, property] of this.errorProperties) {
       handled = true
       object[property] = error
     }

package/package.json

@@ -35,6 +35,6 @@
   "scripts": {
     "test": "NODE_ENV=test blue-tape tests/*"
   },
-  "version": "0.4.12",
-  "gitHead": "49986db53465eb08a50e6090343fc8cbaf230670"
+  "version": "0.5.1",
+  "gitHead": "32ec172307a4583d4ec5d997f676ffc666e5fc41"
 }