@live-change/dao 0.8.37 → 0.8.39

package/lib/ReactiveServerConnection.js

@@ -118,7 +118,7 @@ class PushObservableTrigger {
     added.filter(pointer => this.pointers.get(pointer))
     for(let [pointer, count] of this.pointers.entries()) {
       if(count < 0) throw new Error("deleted not existing pointer: "+ pointer)
-      if(count == 0) removed.push(pointer)
+      if(count === 0) removed.push(pointer)
     }
     for(let rm of removed) this.pointers.delete(rm)
     this.commitPointersUpdate(added, removed)
@@ -264,7 +264,7 @@ class PushObservable extends ObservableList {
     const trigger = this.triggers.get(key)
     if(!trigger) throw new Error("could not remove not existing trigger")
     trigger.uses --
-    if(trigger.uses == 0) {
+    if(trigger.uses === 0) {
       trigger.dispose()
       this.triggers.delete(key)
     }
@@ -288,7 +288,7 @@ class PushObservable extends ObservableList {
     let observationInfo = this.observations.get(whatId)
     if(!observationInfo) throw new Error("could not unpush not existing observation")
     observationInfo.uses--
-    if(observationInfo.uses == 0) {
+    if(observationInfo.uses === 0) {
       this.observations.delete(whatId)
       observationInfo.observation.unpush()
       this.remove(what)
@@ -320,6 +320,9 @@ class Observation {
     if(!observed) this.push()
 
     this.observer = (signal, ...args) => {
+      if(signal === 'error' && args[0]) {
+        args[0] = utils.errorToJSON(args[0])
+      }
       this.connection.send({
         type: "notify",
         what, signal, args
@@ -343,7 +346,7 @@ class Observation {
     if(!this.observed) throw new Error("Unobserve of not observed "+JSON.stringify(this.what)+
         " pushed "+this.pushCount)
     this.observed = false
-    if(this.pushCount == 0) {
+    if(this.pushCount === 0) {
       this.dispose()
     } else if(!pushed) { // distributed race condition - client removed observation before received push
       /// Refresh observation - send fresh value
@@ -353,7 +356,7 @@ class Observation {
   }
   unpush() {
     this.pushCount--
-    if(this.pushCount == 0) {
+    if(this.pushCount === 0) {
       this.connection.send({
         type: "unpush",
         what: this.what
@@ -364,7 +367,7 @@ class Observation {
   }
   push() {
     this.pushCount++
-    if(this.pushCount == 1) {
+    if(this.pushCount === 1) {
       this.connection.send({
         type: "push",
         what: this.what
@@ -438,7 +441,7 @@ class ReactiveServerConnection extends EventEmitter {
     try {
       const serialized = JSON.stringify(message)
       this.connection.write(serialized)
-      if(message.signal == 'error') {
+      if(message.signal === 'error') {
         debug("sending error", JSON.stringify(message, null, 2))
       }
     } catch (error) {
@@ -608,7 +611,7 @@ class ReactiveServerConnection extends EventEmitter {
         moreDeps.push(dep)
         return undefined
       })
-      if(moreDeps.length == 0) return Promise.resolve(pointers)
+      if(moreDeps.length === 0) return Promise.resolve(pointers)
       return Promise.all(moreDeps.map(dep => {
         const result = fetch({ what: dep }).catch(error => {
           error.stack += `\nWhile fetching ${JSON.stringify(dep)} from source`

package/lib/utils.js

@@ -1,9 +1,14 @@
 export function errorToJSON(error) {
   if(typeof error == 'object') {
+    if(error instanceof Error && error.stack) return error.stack.toString()
+    if(error instanceof Error && error.message) return error.message.toString()
     let obj = {}
+    //obj.string = error.toString()
     Object.getOwnPropertyNames(error).forEach(function (key) {
       obj[key] = error[key]
     })
+    if(error.message) obj.message = error.message.toString()
+    if(error.stack) obj.stack = error.stack.toString()
     return obj
   }
   return error

package/package.json

@@ -35,6 +35,6 @@
   "scripts": {
     "test": "NODE_ENV=test tape tests/*"
   },
-  "version": "0.8.37",
-  "gitHead": "8b97a83258a3eccd08534d0376015781c4eefdec"
+  "version": "0.8.39",
+  "gitHead": "153d139ad9785b0b2fcbfbf2c35a999a499f2168"
 }