@live-change/dao 0.3.6 → 0.3.10

package/lib/DaoPrerenderCache.js

@@ -6,6 +6,7 @@ class DaoPrerenderCache {
   constructor(dao, mode) {
     this.dao = dao
     this.cache = new Map()
+    this.extendedCache = new Map()
     this.mode = mode
     this.observables = new Map()
   }
@@ -16,7 +17,7 @@ class DaoPrerenderCache {
       const key = JSON.parse(keyJson)
       if(key.paths) {
         for(const { what, data } of value) {
-          this.cache.set(JSON.stringify(what), data)
+          this.extendedCache.set(JSON.stringify(what), data)
         }
       }
     }
@@ -43,7 +44,12 @@ class DaoPrerenderCache {
       observable = this.dao.observable(what)
     }
     this.observables.set(cacheKey, observable)
-    if (this.cache.has(cacheKey)) observable.restore(this.cache.get(cacheKey))
+    if(this.cache.has(cacheKey)) observable.restore(this.cache.get(cacheKey))
+    if(this.extendedCache.has(cacheKey)) {
+      observable.restore(this.extendedCache.get(cacheKey))
+      return observable
+      // do not save extended values
+    }
     if(observable.isInitialized && observable.isInitialized()) {
       if(this.mode == 'save') {
         this.cache.set(cacheKey, observable.save())
@@ -51,7 +57,8 @@ class DaoPrerenderCache {
       return observable
     }
     if(this.mode == 'load') {
-      //if (this.cache.has(cacheKey)) observable.restore(this.cache.get(cacheKey))
+      // if (this.cache.has(cacheKey)) observable.restore(this.cache.get(cacheKey))
+      // it was loaded earlier
     }
     return observable
   }
@@ -59,11 +66,16 @@ class DaoPrerenderCache {
   get(what) {
     const cacheKey = JSON.stringify(what)
     debug("GET", cacheKey)
-    if (this.cache.has(cacheKey)) {
+    if(this.cache.has(cacheKey)) {
       const value = this.cache.get(cacheKey)
       debug("GET FROM CACHE", cacheKey, " => ", value)
       return Promise.resolve(value)
     }
+    if(this.extendedCache.has(cacheKey)) {
+      const value = this.extendedCache.get(cacheKey)
+      debug("GET FROM EXTENDED CACHE", cacheKey, " => ", value)
+      return Promise.resolve(value)
+    }
     if(this.mode == 'load') {
     }
     const promise = this.dao.get(what)
@@ -72,13 +84,30 @@ class DaoPrerenderCache {
       promise.then(result => {
         let observable = this.observables.get(cacheKey)
         if(observable) {
-          if(typeof observable == 'function') return observable('set', result)
-          if(observable.notify) {
-            return observable.notify('set', result)
+          if(typeof observable == 'function') {
+            observable('set', result)
+          } else if(observable.notify) {
+            observable.notify('set', result)
+          } else {
+            observable.set(result)
           }
-          observable.set(result)
         }
         this.cache.set(cacheKey, result)
+        if(what.paths) {
+          for(const { what, data } of result) {
+            let observable = this.observables.get(cacheKey)
+            if(observable) {
+              if(typeof observable == 'function') {
+                observable('set', data)
+              } else if(observable.notify) {
+                observable.notify('set', data)
+              } else {
+                observable.set(data)
+              }
+            }
+            this.extendedCache.set(JSON.stringify(what), data)
+          }
+        }
       })
     }
     return promise

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.6"
+  "version": "0.3.10"
 }