use async/await, change bigsync callback to promise

Author: laggingreflex

src/big-sync.js

@@ -43,5 +43,11 @@ export function bigSync(project) {
     rsync.output(consoleLogFromBuffer, consoleLogFromBuffer);
   }
 
-  rsync.execute(onComplete);
+  return new Promise((resolve, reject) => {
+    rsync.execute((err, ...result) => {
+      onComplete(err, ...result);
+      if (err) reject(err);
+      else resolve(...result);
+    });
+  });
 }

src/local/index.js

@@ -26,16 +26,16 @@ const hostname = os.hostname();
 const wsEvents = eventsConf.WS.LOCAL;
 const fsEvents = eventsConf.FS.LOCAL;
 
-function triggerBigSync(project, params, cb) {
-  bigSync({
+function triggerBigSync(project, params) {
+  return bigSync({
     project: project.project,
     excludes: project.excludes,
     sourceLocation: ensureTrailingSlash(project.sourceLocation),
     destinationLocation: ensureTrailingSlash(project.destinationLocation),
     hostname: project.hostname,
     username: project.username,
     disableDeletion: project.disableDeletion,
-  }, params, cb);
+  }, params);
 }
 
 export function start(config, projects) {
@@ -80,18 +80,16 @@ function startProject(config, projectConf) {
   });
 
     // WS events
-  wsClient.on(wsEvents.READY, () => {
+  wsClient.on(wsEvents.READY, async () => {
     if (!(config.disableRsync || projectConf.disableRsync)) {
-      triggerBigSync(projectConf, _.pick(config, ['debug', 'delete']), () => {
-        fsHelper.watch();
-
-        localLog(
-          text.SYNC_ON_CONNECT,
-          projectConf.hostname, (projectConf.prefersEncrypted) ? 'using' : 'not using',
-          'encryption'
-        );
-      });
+      await triggerBigSync(projectConf, _.pick(config, ['debug', 'delete']));
     }
+    fsHelper.watch();
+    localLog(
+      text.SYNC_ON_CONNECT,
+      projectConf.hostname, (projectConf.prefersEncrypted) ? 'using' : 'not using',
+      'encryption'
+    );
   });
 
   wsClient.on(wsEvents.RECONNECTING, _.partial(_.ary(localLog, 1), text.SYNC_ON_RECONNECT));
@@ -124,16 +122,14 @@ function startProject(config, projectConf) {
     wsClient.send(fileChange);
   });
 
-  fsHelper.on(fsEvents.LARGE, () => {
+  fsHelper.on(fsEvents.LARGE, async () => {
     localLog(text.SYNC_ON_LARGE_CHANGE);
     fsHelper.pauseWatch();
-
     if (!(config.disableRsync || projectConf.disableRsync)) {
-      triggerBigSync(projectConf, { debug: config.debug }, () => {
-        localLog(text.SYNC_ON_LARGE_CHANGE_DONE);
-        fsHelper.watch();
-      });
+      await triggerBigSync(projectConf, { debug: config.debug });
     }
+    localLog(text.SYNC_ON_LARGE_CHANGE_DONE);
+    fsHelper.watch();
   });
 }
 
@@ -144,17 +140,18 @@ export function once(config, projects, opts) {
     return logProjectsNotFound(foundProjects);
   }
 
-  _.each(foundProjects, (project) => {
+  _.each(foundProjects, async (project) => {
     const localLog = generateLog(project.project, hostname);
 
     localLog(text.SYNC_ON_ONCE);
 
     if (!(config.disableRsync || project.disableRsync)) {
-      triggerBigSync(project, {
+      await triggerBigSync(project, {
         dry: opts.dryRun,
         debug: config.debug,
-      }, _.partial(localLog, text.SYNC_ON_ONCE_DONE));
+      });
     }
+    localLog(text.SYNC_ON_ONCE_DONE);
   });
 }