@live-change/dao 0.3.9 → 0.3.10

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