@live-change/dao 0.9.147 → 0.9.149

package/lib/ReactiveConnection.js

@@ -151,8 +151,8 @@ class Connection extends EventEmitter {
     this.on('connect', () => this.settings.onConnect && this.settings.onConnect() )
   }
 
-  sendRequest(msg, settings) {
-    settings = { ...this.settings, ...settings }
+  sendRequest(msg, userSettings) {
+    const settings = { ...this.settings, ...userSettings }
     return new Promise((resolve, reject) => {
       msg.requestId = (++this.lastRequestId)
       let handler = (err, resp) => {
@@ -197,7 +197,7 @@ class Connection extends EventEmitter {
           this.activeTimeouts.delete(timeout)
           let waiting = this.waitingRequests.get(msg.requestId)
           if (waiting) {
-            console.error("TIMEOUT WHILE WAITING FOR REQUEST", msg, 'WITH SETTINGS', settings)
+            console.error("TIMEOUT WHILE WAITING FOR REQUEST", msg, 'WITH SETTINGS', settings, "WITH USER SETTINGS", userSettings)
             console.trace("TIMEOUT WHILE WAITING FOR REQUEST")
             waiting.handler('timeout')            
             this.waitingRequests.delete(msg.requestId)
@@ -208,7 +208,7 @@ class Connection extends EventEmitter {
             if(req.msg.requestId === msg.requestId) {
               const req = this.requestsQueue[i]
               this.requestsQueue[i] = null
-              console.error("TIMEOUT WHILE WAITING FOR REQUEST", msg, 'WITH SETTINGS', settings)
+              console.error("TIMEOUT WHILE WAITING FOR REQUEST", msg, 'WITH SETTINGS', settings, "WITH USER SETTINGS", userSettings)
               console.trace("TIMEOUT WHILE WAITING FOR REQUEST")
               req.handler('timeout')
             }

package/package.json

@@ -35,6 +35,6 @@
   "scripts": {
     "test": "NODE_ENV=test tape tests/*"
   },
-  "version": "0.9.147",
-  "gitHead": "17e8644b55d23a7c727b6aba17d4c4e41bd4f236"
+  "version": "0.9.149",
+  "gitHead": "debaada27fa6c2cc177bf28c699fa2da91979dbb"
 }