From 6532d3c64702dcf91b8ccd4da3f5a12ac7493238 Mon Sep 17 00:00:00 2001 From: Juan Tejada Date: Tue, 14 Mar 2017 13:56:20 -0700 Subject: [PATCH] [client-sync] Add error handling when creating syncback requests Summary: see title. also convert to es6 Test Plan: manual Reviewers: evan, halla Reviewed By: halla Differential Revision: https://phab.nylas.com/D4225 --- .../{route-helpers.js => route-helpers.es6} | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) rename packages/client-sync/src/local-api/{route-helpers.js => route-helpers.es6} (63%) diff --git a/packages/client-sync/src/local-api/route-helpers.js b/packages/client-sync/src/local-api/route-helpers.es6 similarity index 63% rename from packages/client-sync/src/local-api/route-helpers.js rename to packages/client-sync/src/local-api/route-helpers.es6 index a12fb7d7f..5a381d4a5 100644 --- a/packages/client-sync/src/local-api/route-helpers.js +++ b/packages/client-sync/src/local-api/route-helpers.es6 @@ -1,14 +1,15 @@ -const _ = require('underscore') -const Serialization = require('./serialization'); -const SyncProcessManager = require('../local-sync-worker/sync-process-manager') +import _ from 'underscore' +import Boom from 'boom'; +import Serialization from './serialization'; +import SyncProcessManager from '../local-sync-worker/sync-process-manager' const wakeSyncWorker = _.debounce((accountId, reason) => { SyncProcessManager.wakeWorkerForAccount(accountId, {interrupt: true, reason}) }, 500) -module.exports = { - async createAndReplyWithSyncbackRequest(request, reply, syncRequestArgs = {}) { +export async function createAndReplyWithSyncbackRequest(request, reply, syncRequestArgs = {}) { + try { const account = request.auth.credentials const {wakeSync = true} = syncRequestArgs syncRequestArgs.accountId = account.id @@ -21,5 +22,8 @@ module.exports = { } reply(Serialization.jsonStringify(syncbackRequest)) return syncbackRequest - }, + } catch (err) { + reply(Boom.wrap(err)) + return null + } }