@live-change/dao 0.3.7 → 0.3.11

package/lib/DaoCache.js

@@ -83,6 +83,12 @@ class CacheState {
     }
     this.updateCacheState()
   }
+
+  dipose() {
+    if(this.cached) {
+      this.observable.unobserve(this.cache.dummyObserver)
+    }
+  }
 }
 
 const defaultSettings = {
@@ -133,6 +139,12 @@ class DaoCache extends EventEmitter {
     this.dummyObserver = () => 0
   }
 
+  clear() {
+    for(const [key, value] of this.cacheState.entries()) {
+      value.dispose()
+      this.cacheState.delete(key)
+    }
+  }
 
   clean() {
     //console.log("CACHE STATE:", this.cacheState)
@@ -165,6 +177,7 @@ 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)
       }
     }
@@ -253,6 +266,7 @@ class DaoCache extends EventEmitter {
   }
 
   dispose() {
+    clear()
     clearInterval(this.interval)
     this.dao.dispose()
   }

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/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/lib/collectPointers.js

@@ -4,7 +4,7 @@ function flatMap(source, fun) {
   let many = source.many
   for(let result of results) {
     count += result.length
-    many ||= result.many
+    many = many || result.many
   }
   if(count > 1 && !many) throw new Error("too many results from not many")
   let out = new Array(count)
@@ -48,7 +48,7 @@ function cross(lists) {
   let many = false
   for(let list of lists) {
     count *= list.length
-    many ||= list.many
+    many = many || list.many
   }
   let out = new Array(count)
   out.many = many

package/package.json

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