Merge pull request #170 from brave/staging

v1.4.2

client/config.js

@@ -7,5 +7,5 @@ module.exports = {
   // 2-byte encryption nonce counter, rotated periodically
   nonceCounter: 0,
   // Sync library version, updated every brave/sync release
-  syncVersion: 'v1.4.1'
+  syncVersion: 'v1.4.2'
 }

client/recordUtil.js

@@ -1,9 +1,9 @@
 'use strict'
 
+const deepEqual = require('deep-equal')
 const merge = require('lodash.merge')
 const proto = require('./constants/proto')
 const serializer = require('../lib/serializer')
-const valueEquals = require('../lib/valueEquals')
 const {api} = require('../lib/api.proto.js')
 const syncTypes = require('../lib/syncTypes.js')
 
@@ -144,7 +144,7 @@ const resolveRecordWithObject = (record, existingObject) => {
     return resolveSiteSettingsRecordWithObject(record, existingObject)
   }
   if (record.action === proto.actions.UPDATE) {
-    if (valueEquals(record[type], existingObject[type])) {
+    if (deepEqual(record[type], existingObject[type])) {
       // no-op
       return null
     }
@@ -174,7 +174,7 @@ const resolveSiteSettingsRecordWithObject = (record, existingObject) => {
   if (record.action === proto.actions.UPDATE) {
     resolveField = (field) => {
       return !commonFields.includes(field) &&
-      (!existingFields.has(field) || !valueEquals(existingObject[type][field], record[type][field]))
+      (!existingFields.has(field) || !deepEqual(existingObject[type][field], record[type][field]))
     }
   } else if (record.action === proto.actions.DELETE) {
     resolveField = (field) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "brave-sync",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "Brave sync server and client",
   "main": "server/index.js",
   "scripts": {
@@ -57,6 +57,7 @@
     "config": "^1.24.0",
     "cors": "^2.8.1",
     "crc": "^3.4.4",
+    "deep-equal": "^1.0.1",
     "express": "^4.14.0",
     "lodash.merge": "^4.6.0",
     "protobufjs": "^6.8.0",
@@ -72,8 +73,7 @@
       "test/client/fixtures/*.js",
       "bundles/*.js",
       "client/polyfill/*.js",
-      "lib/api.proto.js",
-      "lib/valueEquals.js"
+      "lib/api.proto.js"
     ]
   }
 }