Merge pull request #358 from brave/put-cb

Add SENT_SYNC_RECORDS which is the callback of SEND_SYNC_RECORDS

client/constants/messages.js

@@ -84,6 +84,12 @@ const messages = {
    * to the sync server.
    */
   SEND_SYNC_RECORDS: _, /* @param {string=} categoryName, @param {Array.<Object>} records */
+  /**
+   * webview ->  browser
+   * browser can check whether the records in SEND_SYNC_RECORDS get uploaded
+   * successfully.
+   */
+  SENT_SYNC_RECORDS: _, /* @param {string=} categoryName, @param {Array.<Object>} records */
   /**
    * browser -> webview
    * browser sends this to delete the current user.

client/sync.js

@@ -152,6 +152,8 @@ const startSync = (requester) => {
   ipc.on(messages.SEND_SYNC_RECORDS, (e, category, records) => {
     logSync(`Sending ${records.length} records`)
     const categoryId = proto.categories[category]
+    const promisePuts = []
+    const sentRecords = []
     records.forEach((record) => {
       if (!record) {
         logSync(`could not send empty record`, ERROR)
@@ -163,11 +165,17 @@ const startSync = (requester) => {
       if (record.bookmark && record.bookmark.parentFolderObjectId) {
         record.bookmark.parentFolderObjectId = new Uint8Array(record.bookmark.parentFolderObjectId)
       }
-      requester.bufferedPut(categoryId, record).then(() => {
-        logSync(`sending record: ${JSON.stringify(record)}`)
-      }).catch((e) => {
-        logSync(`could not send record ${JSON.stringify(record)}: ${e}`, ERROR)
-      })
+      promisePuts.push(
+        requester.bufferedPut(categoryId, record).then(() => {
+          logSync(`sending record: ${JSON.stringify(record)}`)
+          sentRecords.push(record)
+        }).catch((e) => {
+          logSync(`could not send record ${JSON.stringify(record)}: ${e}`, ERROR)
+        })
+      )
+    })
+    Promise.all(promisePuts).then(() => {
+      ipc.send(messages.SENT_SYNC_RECORDS, category, sentRecords)
     })
   })
   ipc.on(messages.DELETE_SYNC_USER, (e) => {