refactor (promises) put backendless promisifier to util/promises class

Author: vengrov

lib/server-code/api/persistence-item.js

@@ -1,17 +1,7 @@
 'use strict';
 
-const Backendless = require('backendless');
-
-function promisify(fn, context) {
-  return function() {
-    return new Promise((resolve, reject) => {
-      const args = Array.prototype.slice.call(arguments);
-      args.push(new Backendless.Async(resolve, reject));
-
-      fn.apply(context, args);
-    });
-  };
-}
+const Backendless = require('backendless'),
+      promisify   = require('../../util/promise').promisifyBackendless;
 
 class PersistenceItem {
   constructor() {

lib/server-code/runners/cloud.js

@@ -3,14 +3,15 @@
 const logger        = require('../../util/logger'),
       DriverService = require('../services/driver'),
       tasksExecutor = require('./tasks/executor'),
+      promisify     = require('../../util/promise').promisifyBackendless,
       Backendless   = require('backendless');
 
+function flushPendingLogs() {
+  return promisify(Backendless.Logging.flush, Backendless.Logging)();
+}
+
 function finalize() {
-  if (Backendless.Logging.messagesCount) {
-    return new Promise((resolve, reject) => {
-      return Backendless.Logging.flush(new Backendless.Async(resolve, reject));
-    });
-  }
+  flushPendingLogs();
 }
 
 exports.start = function(opts) {

lib/server-code/runners/debug.js

@@ -4,7 +4,7 @@ const logger           = require('../../util/logger'),
       file             = require('../../util/file'),
       redis            = require('redis'),
       promiseWhile     = require('../../util/promise').promiseWhile,
-      denodeify        = require('../../util/promise').denodeify,
+      denodeify        = require('../../util/promise').promisifyNode,
       ApiServerService = require('../services/api-server'),
       tasksExecutor    = require('./tasks/executor'),
       ServerCodeModel  = require('../model');

lib/server-code/services/api-server.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const denodeify = require('../../util/promise').denodeify,
+const denodeify = require('../../util/promise').promisifyNode,
       logger    = require('../../util/logger'),
       request   = denodeify(require('request'));
 

lib/util/promise.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const Backendless = require('backendless');
+
 /**
  * Wraps a NodeJS continuation passing function and returns an equivalent version that returns a promise.
  * An analogue to the Q.denodeify
@@ -9,7 +11,7 @@
  *
  * @returns {function}
  */
-exports.denodeify = function(fn, context) {
+exports.promisifyNode = function(fn, context) {
   return function() {
     return new Promise((resolve, reject) => {
       const args = Array.prototype.slice.call(arguments);
@@ -20,6 +22,21 @@ exports.denodeify = function(fn, context) {
   };
 };
 
+exports.promisifyBackendless = function(fn, context) {
+  if (Backendless.promisesEnabled()) {
+    return fn.bind(context);
+  }
+  
+  return function() {
+    return new Promise((resolve, reject) => {
+      const args = Array.prototype.slice.call(arguments);
+      args.push(new Backendless.Async(resolve, reject));
+
+      fn.apply(context, args);
+    });
+  };
+};
+
 exports.promiseWhile = function(predicate, action) {
   function loop() {
     return predicate() && Promise.resolve(action()).then(loop);