@live-change/dao 0.3.11 → 0.3.15

package/lib/DaoCache.js

@@ -30,14 +30,17 @@ class CacheState {
 
   turnOff() {
     if(!this.cached) throw new Error("uncache of not cached")
+    if(!this.observable) throw new Error("race condition")
     this.cached = false
     this.cache.cachedCount --
-    this.observable.unobserve(this.cache.dummyObserver)
+    const observable = this.observable
     this.observable = null
+    observable.unobserve(this.cache.dummyObserver)
   }
 
   turnOn() {
     if(this.cached) throw new Error("already cached")
+    if(this.observable) throw new Error("race condition")
     this.cached = true
     this.cache.cachedCount ++
     this.cache.cache.push(this)
@@ -81,13 +84,7 @@ class CacheState {
     if(delta > 0) {
       this.score += delta * this.settings.singleReadScore
     }
-    this.updateCacheState()
-  }
-
-  dipose() {
-    if(this.cached) {
-      this.observable.unobserve(this.cache.dummyObserver)
-    }
+    setTimeout(() => this.updateCacheState(), 0)
   }
 }
 
@@ -140,10 +137,13 @@ class DaoCache extends EventEmitter {
   }
 
   clear() {
-    for(const [key, value] of this.cacheState.entries()) {
-      value.dispose()
-      this.cacheState.delete(key)
+    const now = Date.now()
+    for(const cacheState of this.cache) {
+      cacheState.score = 0
+      cacheState.scoreTime = now
+      if(cacheState.cached) cacheState.turnOff()
     }
+    this.cache = []
   }
 
   clean() {
@@ -177,7 +177,6 @@ class DaoCache extends EventEmitter {
     }
     for(const [key, value] of this.cacheState.entries()) {
       if(value.score < value.settings.deleteStatsScore) {
-        this.cacheState.dispose()
         this.cacheState.delete(key)
       }
     }
@@ -197,8 +196,9 @@ class DaoCache extends EventEmitter {
 
   noticeObserverCount(what, count, delta) {
     //console.log("OBSERVER COUNT", JSON.stringify(what), count, "D", delta)
-    const cacheState = this.getOrCreateCacheState(what)
-    if(!cacheState) return
+    let cacheState = this.getOrCreateCacheState(what)
+    if(!cacheState && delta <= 0) return
+    cacheState = this.getOrCreateCacheState(what)
     if(delta > 0) {
       //console.log("CACHE TEST", cacheState.cached)
       if(cacheState.observable) {

package/lib/DaoProxy.js

@@ -20,9 +20,11 @@ class DaoProxy extends EventEmitter {
     this.dao = dao
     if(this.dao) {
       for(let [id, observable] of this.observables.entries()) {
-        let what = JSON.parse(id)
-        const target = this.dao.observable(what)
-        observable.setTarget(target)
+        if(!observable.disposed) {
+          let what = JSON.parse(id)
+          const target = this.dao.observable(what)
+          observable.setTarget(target)
+        }
       }
       if(this.dao.on) {
         this.dao.on('connect', this.onConnect)
@@ -45,11 +47,23 @@ class DaoProxy extends EventEmitter {
     } else {
       observable = new ObservableProxy()
     }
-    /*const oldDispose = observable.dispose
+    const oldDispose = observable.dispose
     observable.dispose = (...args) => {
-      //this.observables.delete(spath)
+      this.observables.delete(spath)
       oldDispose.call(observable, ...args)
-    }*/
+    }
+    const oldRespawn = observable.respawn
+    observable.respawn = (...args) => {
+      const newObservable = this.observables.get(spath)
+      if(newObservable && newObservable !== observable) {
+        observable.observable = newObservable
+      } else if(this.dao) {
+        observable.observable = this.dao.observable(what)
+      } else {
+        observable.observable = null
+      }
+      oldRespawn.call(observable, ...args)
+    }
     this.observables.set(JSON.stringify(what), observable)
     return observable
   }

package/lib/ExtendedObservableList.js

@@ -30,11 +30,11 @@ class ExtendedObservableList extends ObservableList {
       }
       this.list = undefined
     }
-    ObservableList.dispose.apply(this)
+    super.dispose.apply(this)
   }
 
   respawn() {
-    ObservableList.respawn.apply(this)
+    super.respawn.apply(this)
     this.observableList.observe(this)
   }
 

package/lib/Observable.js

@@ -22,7 +22,10 @@ class Observable {
   fireObservers(signal, ...args) {
     if(this.disposed) return
     let handled = false
-    for(var observer of this.observers) handled = this.fireObserver(observer, signal, ...args) || handled
+    const observersToFire = this.observers
+    for(const observer of observersToFire) {
+      handled = this.fireObserver(observer, signal, ...args) || handled
+    }
     if(signal == 'error') {
       let error = args[0]
       handled = this.handleError(error) || handled
@@ -90,27 +93,38 @@ class Observable {
 
   wait() {
     let finished = false
+    let resultObserver
+    let errorObserver
 
     const waitPromise = new Promise((resolve, reject) => {
-      const resultObserver = (signal) => {
+      errorObserver = (error) => {
+        if(resultObserver) this.unobserve(resultObserver)
+        resultObserver = undefined
+        if(errorObserver) this.uncatch(errorObserver)
+        errorObserver = undefined
+        if(finished) return
         finished = true
-        this.unobserve(resultObserver)
-        this.uncatch(errorObserver)
-        resolve(signal)
-      }
-      const errorObserver = (error) => {
-        finished = true
-        this.unobserve(resultObserver)
-        this.uncatch(errorObserver)
         reject(error)
       }
       if(!finished) this.catch(errorObserver)
+      resultObserver = (signal) => {
+        if(resultObserver) this.unobserve(resultObserver)
+        resultObserver = undefined
+        if(errorObserver) this.uncatch(errorObserver)
+        errorObserver = undefined
+        if(finished) return
+        finished = true
+        resolve(signal)
+      }
       if(!finished) this.observe(resultObserver)
     })
     waitPromise.cancel = () => {
-      finished = true
       this.unobserve(resultObserver)
+      resultObserver = undefined
       this.uncatch(errorObserver)
+      errorObserver = undefined
+      if(finished) return
+      finished = true
       reject('canceled')
     }
     return waitPromise

package/lib/ObservableList.js

@@ -176,7 +176,7 @@ class ObservableList extends Observable {
         this.errorProperties.splice(i, 1)
         i--
         if(this.isUseless()) this.dispose()
-        return;
+        return
       }
     }
     throw new Error("cannot unbind not bound property "+property)
@@ -282,6 +282,9 @@ class ObservableList extends Observable {
   getValue() {
     return this.list
   }
+  getError() {
+    return this.savedError
+  }
 }
 
 module.exports = ObservableList

package/lib/ObservablePromiseProxy.js

@@ -10,7 +10,8 @@ class ObservablePromiseProxy extends Observable {
     this.observer = (signal, ...args) => {
       this.fireObservers(signal, ...args)
     }
-    promise.then((result) => {
+    this.promise = promise
+    this.promise.then((result) => {
       if(result.observe) {
         this.init(result)
       } else {
@@ -51,7 +52,9 @@ class ObservablePromiseProxy extends Observable {
     }
   }
   getValue() {
-    return promise.then(r => r.getValue())
+    if(!this.observable) return undefined
+    if(!this.observable.getValue) return undefined
+    return this.observable.getValue()
   }
 }
 

package/lib/ObservableProxy.js

@@ -17,6 +17,7 @@ class ObservableProxy extends Observable {
   setTarget(observable) {
     if(this === observable) throw new Error('infinite loop')
     if(!this.disposed && this.observable) {
+      //console.log("SET TARGET UNOBSERVE TARGET")
       this.observable.unobserve(this.observer)
       for(let [object, property] of this.properties) {
         this.observable.unbindProperty(object, property)
@@ -27,6 +28,7 @@ class ObservableProxy extends Observable {
     }
     this.observable = observable
     if(!this.disposed && this.observable) {
+      //console.log("SET TARGET OBSERVE TARGET")
       this.observable.observe(this.observer)
       for(let [object, property] of this.properties) {
         this.observable.bindProperty(object, property)
@@ -51,6 +53,7 @@ class ObservableProxy extends Observable {
 
   reobserveTarget() {
     if(!this.disposed && this.observable) {
+      //console.log("REOBSERVE TARGET!", this.observable)
       this.observable.unobserve(this.observer)
       this.observable.observe(this.observer)
     }
@@ -64,13 +67,27 @@ class ObservableProxy extends Observable {
   catch(...args) {
     let beenDisposed = this.disposed
     Observable.prototype.catch.apply(this, args)
-    if(!beenDisposed) this.reobserveTarget()
+    if(!beenDisposed) {
+      if(this.observable.getError) {
+        const error = this.observable.getError()
+        if(error) this.fireObserver(args[0], 'error', error)
+      } else {
+        this.reobserveTarget()
+      }
+    }
   }
 
   observe(...args) {
     let beenDisposed = this.disposed
     Observable.prototype.observe.apply(this, args)
-    if(!beenDisposed) this.reobserveTarget()
+    if(!beenDisposed) {
+      if(this.observable.getValue) {
+        const value = this.observable.getValue()
+        if(value !== undefined) this.fireObserver(args[0], 'set', value)
+      } else {
+        this.reobserveTarget()
+      }
+    }
   }
 
   bindProperty(object, property) {

package/lib/ObservableValue.js

@@ -160,6 +160,10 @@ class ObservableValue extends Observable {
   getValue() {
     return this.value
   }
+
+  getError() {
+    return this.savedError
+  }
 }
 
 module.exports = ObservableValue

package/lib/ReactiveServerConnection.js

@@ -389,8 +389,7 @@ class ReactiveServerConnection extends EventEmitter {
 
     if(this.settings.fastAuth) {
       try {
-        this.credentials = {}
-        this.daoPromise = this.daoFactory(this.credentials, this.connection, this)
+        this.handleDaoPromise(this.daoFactory(this.credentials, this.connection, this))
       } catch(error) {
         return this.handleDaoFactoryError(error)
       }
@@ -515,9 +514,11 @@ class ReactiveServerConnection extends EventEmitter {
   handleUnobserve(message) {
     const path = message.what
     const spath = JSON.stringify(path)
-    //debug('handle unobserve', spath)
+    debug('handle unobserve', spath)
     const observation = this.observations.get(spath)
-    if(!observation) throw new Error("Unobserve of not observed "+spath)
+    if(!observation) {
+      throw new Error("Unobserve of not observed "+spath)
+    }
     observation.unobserve(message.pushed)
   }
 
@@ -696,6 +697,21 @@ class ReactiveServerConnection extends EventEmitter {
     this.closeConnection()
   }
 
+  handleDaoPromise(daoPromise) {
+    this.daoPromise = daoPromise
+    if(!this.daoPromise.then) {
+      this.dao = this.daoPromise
+      this.daoPromise = null
+    } else {
+      this.daoPromise.catch(error => this.handleDaoFactoryError(error)).then(dd => {
+        if(!dd) return this.handleDaoFactoryError("dao not defined")
+        this.dao = dd
+        this.daoPromise = null
+        for(const message of this.daoGenerationQueue) this.handleAuthorizedMessage(message)
+      })
+    }
+  }
+
   handleMessage(message) {
     if (!this.dao && !this.daoPromise) {
       if (!message) {
@@ -704,21 +720,10 @@ class ReactiveServerConnection extends EventEmitter {
       }
       try {
         this.credentials = message
-        this.daoPromise = this.daoFactory(this.credentials, this.connection, this)
+        this.handleDaoPromise(this.daoFactory(this.credentials, this.connection, this))
       } catch(error) {
         return this.handleDaoFactoryError(error)
       }
-      if(!this.daoPromise.then) {
-        this.dao = this.daoPromise
-        this.daoPromise = null
-      } else {
-        this.daoPromise.catch(error => this.handleDaoFactoryError(error)).then(dd => {
-          if(!dd) return this.handleDaoFactoryError("dao not defined")
-          this.dao = dd
-          this.daoPromise = null
-          for(const message of this.daoGenerationQueue) this.handleAuthorizedMessage(message)
-        })
-      }
     } else if(this.daoPromise && !this.dao) {
       this.daoGenerationQueue.push(message)
     } else {

package/package.json

@@ -36,5 +36,5 @@
   "scripts": {
     "test": "NODE_ENV=test blue-tape tests/*"
   },
-  "version": "0.3.11"
+  "version": "0.3.15"
 }