@live-change/dao 0.3.8 → 0.3.12

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,7 +84,7 @@ class CacheState {
     if(delta > 0) {
       this.score += delta * this.settings.singleReadScore
     }
-    this.updateCacheState()
+    setTimeout(() => this.updateCacheState(), 0)
   }
 }
 
@@ -133,6 +136,15 @@ class DaoCache extends EventEmitter {
     this.dummyObserver = () => 0
   }
 
+  clear() {
+    const now = Date.now()
+    for(const cacheState of this.cache) {
+      cacheState.score = 0
+      cacheState.scoreTime = now
+      if(cacheState.cached) cacheState.turnOff()
+    }
+    this.cache = []
+  }
 
   clean() {
     //console.log("CACHE STATE:", this.cacheState)
@@ -184,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) {
@@ -253,6 +266,7 @@ class DaoCache extends EventEmitter {
   }
 
   dispose() {
+    clear()
     clearInterval(this.interval)
     this.dao.dispose()
   }

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.target = newObservable
+      } else if(this.dao) {
+        observable.target = this.dao.observable(what)
+      } else {
+        observable.target = null
+      }
+      oldRespawn.call(observable, ...args)
+    }
     this.observables.set(JSON.stringify(what), observable)
     return observable
   }

package/lib/ExtendedObservableList.js

@@ -1,17 +1,17 @@
 const ObservableList = require("./ObservableList.js")
 
 class ExtendedObservableList extends ObservableList {
-  constructor(observableList, elementActivator, elementDispose) {
+  constructor(observableList, elementActivator, elementDispose, valueActivator = observableList.valueActivator) {
     let list = observableList.list
     if(elementActivator) {
       list = Array.isArray(list) ? list.map(elementActivator) : elementActivator(list)
     }
-    super(list)
+    super(list, undefined, undefined, valueActivator)
 
     this.observableList = observableList
     this.elementActivator = elementActivator
     this.elementDispose = elementDispose
-    this.valueActivator = observableList.valueActivator
+    this.valueActivator = valueActivator
 
     this.savedError = null
     this.properties = []

package/lib/LoopbackConnection.js

@@ -56,7 +56,7 @@ class LoopbackConnection extends Connection {
   }
 
   dispose() {
-    this.finished = true
+    super.dispose()
     this.handleDisconnect()
     this.emit('close')
   }

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)

package/lib/ObservableProxy.js

@@ -15,6 +15,7 @@ class ObservableProxy extends Observable {
   }
 
   setTarget(observable) {
+    if(this === observable) throw new Error('infinite loop')
     if(!this.disposed && this.observable) {
       this.observable.unobserve(this.observer)
       for(let [object, property] of this.properties) {
@@ -80,8 +81,8 @@ class ObservableProxy extends Observable {
   unbindProperty(object, property) {
     for(var i = 0; i < this.properties.length; i++) {
       var prop = this.properties[i]
-      if(prop[0] == object && prop[1] == property) {
-        this.properties.splice(i,1)
+      if(prop[0] === object && prop[1] === property) {
+        this.properties.splice(i, 1)
         if(this.observable) this.observable.unbindProperty(object, property)
         if(this.isUseless()) this.dispose()
         return

package/lib/ReactiveConnection.js

@@ -123,6 +123,8 @@ class Connection extends EventEmitter {
     this.remoteObserveSent = new Map()
     this.remoteUnobserveSent = new Map()
 
+    this.activeTimeouts = new Set()
+
     this.autoReconnect = true
 
     this.finished = false
@@ -173,7 +175,8 @@ class Connection extends EventEmitter {
       }
 
       if (settings.requestTimeout && settings.requestTimeout < Infinity) {
-        setTimeout(() => {
+        const timeout = setTimeout(() => {
+          this.activeTimeouts.delete(timeout)
           let waiting = this.waitingRequests.get(msg.requestId)
           if (waiting) {
             waiting.handler('timeout')
@@ -189,6 +192,7 @@ class Connection extends EventEmitter {
             }
           }
         }, settings.requestTimeout)
+        this.activeTimeouts.add(timeout)
       }
 
       if(this.connected) {
@@ -443,6 +447,12 @@ class Connection extends EventEmitter {
     })
   }
 
+  dispose() {
+    console.log("DISPOSE REACTIVE CONNECTION")
+    this.finished = true
+    for(const timeout of this.activeTimeouts) clearTimeout(timeout)
+  }
+
 }
 
 module.exports = Connection

package/package.json

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