Remove Responses enum

fetchSync/actionTypes.js

@@ -15,8 +15,3 @@ export const Requests = {
   CANCEL_SYNC: 'CANCEL_SYNC',
   CANCEL_ALL: 'CANCEL_ALL'
 }
-
-export const Responses = {
-  SUCCESS: 'SUCCESS',
-  FAILURE: 'FAILURE'
-}

fetchSync/client/createSync.js

@@ -14,7 +14,7 @@ export default function createSync (name, request, options = {}) {
     name,
     request,
     options,
-    id: uId(),
+    id: name || uId(),
     createdOn: Date.now(),
     syncedOn: null,
     response: null

fetchSync/client/store/requests.js

@@ -9,7 +9,6 @@ import { addSync, addSyncs, removeSync, setCommsOpen, removeAllSyncs, requestOpe
   requestCancelSync, requestRegisterSync, requestCancelAllSyncs } from './creators'
 
 import { CommsChannelStatus } from '../../constants'
-import { Responses } from '../../actionTypes'
 import store from './index'
 
 export function registerSync (sync) {
@@ -132,20 +131,11 @@ function postMessage (data) {
 function receiveFetchResponse (event) {
   return (dispatch, getState) => {
     const { syncs } = getState()
-    const { type, data } = JSON.parse(event.data)
+    const data = JSON.parse(event.data)
     const sync = syncs[data.id]
 
     if (sync) {
-      switch (type) {
-        case Responses.SUCCESS:
-          handleSyncSuccess(dispatch, sync, data)
-          return
-        case Responses.FAILURE:
-          handleSyncFailure(dispatch, sync, data)
-          return
-        default:
-          throw new Error(`Unknown response type '${type}'`)
-      }
+      handleSyncSuccess(dispatch, sync, data)
     }
   }
 }
@@ -161,13 +151,3 @@ function handleSyncSuccess (dispatch, sync, data) {
     dispatch(removeSync(sync))
   }
 }
-
-function handleSyncFailure (dispatch, sync, data) {
-  sync.reject(data.error)
-
-  if (sync.name) {
-    sync.response = null
-  } else {
-    dispatch(removeSync(sync))
-  }
-}

fetchSync/worker/Channel.js

@@ -1,7 +1,5 @@
 'use strict'
 
-import { Responses } from '../actionTypes'
-
 export default class Channel {
   constructor (worker, messageHandlers) {
     worker.onmessage = this.onMessageEvent.bind(this)
@@ -34,13 +32,6 @@ export default class Channel {
   onMessageEvent (event) {
     return this
       .handleMessage(event)
-      .catch((err) => this.postMessage({
-        type: Responses.FAILURE,
-        data: { error: err.message }
-      }, event.ports[0]))
-      .then((data) => this.postMessage({
-        type: Responses.SUCCESS,
-        data
-      }, event.ports[0]))
+      .then((data) => this.postMessage(data, event.ports[0]))
   }
 }

fetchSync/worker/index.js

@@ -8,7 +8,7 @@
   const serialiseResponse = require('serialise-response')
 
   const Channel = require('./Channel')
-  const { Requests, Responses } = require('../actionTypes')
+  const { Requests } = require('../actionTypes')
 
   const store = new IDBStore({
     dbVersion: 1,
@@ -71,17 +71,7 @@
             .then((response) => {
               const syncedOn = Date.now()
               store.put({ ...sync, response, syncedOn })
-              channel.postMessage({
-                type: Responses.SUCCESS,
-                data: { id, lastChance, response }
-              })
-            })
-            .catch((err) => {
-              store.remove(id)
-              channel.postMessage({
-                type: Responses.FAILURE,
-                data: { error: err.message }
-              })
+              channel.postMessage({ id, lastChance, response })
             })
         })
     )