backendless 6.7.1-dev.2 → 7.0.0

package/es/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -160,13 +161,20 @@ var Backendless = /*#__PURE__*/function () {
       app.initConfig(config);
       app.resetRT();
       app.__removeService('LocalCache');
+      var loggingConfig = (0, _extends2["default"])({
+        loadLevels: true,
+        defaultLevel: 'all',
+        levels: {}
+      }, config.logging);
       if (app.__hasService('Logging')) {
         app.Logging.reset();
+        app.Logging.setConfig(loggingConfig);
       }
       if (app.__hasService('Users')) {
         app.Users.currentUser = null;
       }
       delete this.__device;
+      app.loggingConfig = loggingConfig;
       return app;
     }
   }, {

package/es/logging/index.js

@@ -16,8 +16,17 @@ var Logging = /*#__PURE__*/function () {
     (0, _classCallCheck2["default"])(this, Logging);
     this.app = app;
     this.reset();
+    this.setConfig(app.loggingConfig);
   }
   (0, _createClass2["default"])(Logging, [{
+    key: "setConfig",
+    value: function setConfig(config) {
+      this.config = config;
+      if (config.loadLevels) {
+        this.loadLoggingLevels();
+      }
+    }
+  }, {
     key: "reset",
     value: function reset() {
       this.loggers = {};
@@ -26,6 +35,21 @@ var Logging = /*#__PURE__*/function () {
       this.timeFrequency = 1;
       this.messagesLimit = 100;
     }
+  }, {
+    key: "loadLoggingLevels",
+    value: function loadLoggingLevels() {
+      var _this = this;
+      this.app.request.get({
+        url: this.app.urls.loggingLevels()
+      }).then(function (loggers) {
+        loggers.forEach(function (logger) {
+          _this.config.levels[logger.name] = logger.level;
+        });
+      })["catch"](function (error) {
+        // eslint-disable-next-line no-console
+        console.error('Could not load logging levels: ', error);
+      });
+    }
   }, {
     key: "getLogger",
     value: function getLogger(loggerName) {
@@ -41,7 +65,7 @@ var Logging = /*#__PURE__*/function () {
     key: "flush",
     value: function () {
       var _flush = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        var _this = this;
+        var _this2 = this;
         var messages;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -54,11 +78,11 @@ var Logging = /*#__PURE__*/function () {
                   url: this.app.urls.logging(),
                   data: messages
                 })["catch"](function (error) {
-                  _this.messages = [].concat((0, _toConsumableArray2["default"])(messages), (0, _toConsumableArray2["default"])(_this.messages));
-                  _this.checkMessagesLimit();
+                  _this2.messages = [].concat((0, _toConsumableArray2["default"])(messages), (0, _toConsumableArray2["default"])(_this2.messages));
+                  _this2.checkMessagesLimit();
                   throw error;
                 })["finally"](function () {
-                  return delete _this.flushRequest;
+                  return delete _this2.flushRequest;
                 });
               }
               return _context.abrupt("return", this.flushRequest);
@@ -106,10 +130,10 @@ var Logging = /*#__PURE__*/function () {
   }, {
     key: "startFlushInterval",
     value: function startFlushInterval() {
-      var _this2 = this;
+      var _this3 = this;
       if (!this.flushInterval) {
         this.flushInterval = setTimeout(function () {
-          return _this2.flush();
+          return _this3.flush();
         }, this.timeFrequency * 1000);
       }
     }

package/es/logging/logger.js

@@ -7,6 +7,16 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var LogLevelPriorities = {
+  off: 0,
+  fatal: 1,
+  error: 2,
+  warn: 3,
+  info: 4,
+  debug: 5,
+  trace: 6,
+  all: 6
+};
 var Logger = /*#__PURE__*/function () {
   function Logger(name, logging) {
     (0, _classCallCheck2["default"])(this, Logger);
@@ -16,32 +26,49 @@ var Logger = /*#__PURE__*/function () {
   (0, _createClass2["default"])(Logger, [{
     key: "debug",
     value: function debug(message) {
-      return this.logging.push(this.name, 'DEBUG', message);
+      return this.log('DEBUG', message);
     }
   }, {
     key: "info",
     value: function info(message) {
-      return this.logging.push(this.name, 'INFO', message);
+      return this.log('INFO', message);
     }
   }, {
     key: "warn",
     value: function warn(message, exception) {
-      return this.logging.push(this.name, 'WARN', message, exception);
+      return this.log('WARN', message, exception);
     }
   }, {
     key: "error",
     value: function error(message, exception) {
-      return this.logging.push(this.name, 'ERROR', message, exception);
+      return this.log('ERROR', message, exception);
     }
   }, {
     key: "fatal",
     value: function fatal(message, exception) {
-      return this.logging.push(this.name, 'FATAL', message, exception);
+      return this.log('FATAL', message, exception);
     }
   }, {
     key: "trace",
     value: function trace(message) {
-      return this.logging.push(this.name, 'TRACE', message);
+      return this.log('TRACE', message);
+    }
+  }, {
+    key: "log",
+    value: function log(level, message, exception) {
+      if (this.min(level)) {
+        return this.logging.push(this.name, level, message, exception);
+      }
+    }
+  }, {
+    key: "min",
+    value: function min(level) {
+      var configuredLevel = this.logging.config.levels[this.name];
+      if (!configuredLevel) {
+        var defaultLevel = this.logging.config.defaultLevel;
+        return LogLevelPriorities[defaultLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()];
+      }
+      return LogLevelPriorities[configuredLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()];
     }
   }]);
   return Logger;

package/es/urls.js

@@ -41,6 +41,11 @@ var Urls = /*#__PURE__*/function () {
     value: function logging() {
       return "".concat(this.root(), "/log");
     }
+  }, {
+    key: "loggingLevels",
+    value: function loggingLevels() {
+      return "".concat(this.logging(), "/logger");
+    }
 
     //cache
   }, {

package/lib/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -160,13 +161,20 @@ var Backendless = /*#__PURE__*/function () {
       app.initConfig(config);
       app.resetRT();
       app.__removeService('LocalCache');
+      var loggingConfig = (0, _extends2["default"])({
+        loadLevels: true,
+        defaultLevel: 'all',
+        levels: {}
+      }, config.logging);
       if (app.__hasService('Logging')) {
         app.Logging.reset();
+        app.Logging.setConfig(loggingConfig);
       }
       if (app.__hasService('Users')) {
         app.Users.currentUser = null;
       }
       delete this.__device;
+      app.loggingConfig = loggingConfig;
       return app;
     }
   }, {

package/lib/logging/index.js

@@ -16,8 +16,17 @@ var Logging = /*#__PURE__*/function () {
     (0, _classCallCheck2["default"])(this, Logging);
     this.app = app;
     this.reset();
+    this.setConfig(app.loggingConfig);
   }
   (0, _createClass2["default"])(Logging, [{
+    key: "setConfig",
+    value: function setConfig(config) {
+      this.config = config;
+      if (config.loadLevels) {
+        this.loadLoggingLevels();
+      }
+    }
+  }, {
     key: "reset",
     value: function reset() {
       this.loggers = {};
@@ -26,6 +35,21 @@ var Logging = /*#__PURE__*/function () {
       this.timeFrequency = 1;
       this.messagesLimit = 100;
     }
+  }, {
+    key: "loadLoggingLevels",
+    value: function loadLoggingLevels() {
+      var _this = this;
+      this.app.request.get({
+        url: this.app.urls.loggingLevels()
+      }).then(function (loggers) {
+        loggers.forEach(function (logger) {
+          _this.config.levels[logger.name] = logger.level;
+        });
+      })["catch"](function (error) {
+        // eslint-disable-next-line no-console
+        console.error('Could not load logging levels: ', error);
+      });
+    }
   }, {
     key: "getLogger",
     value: function getLogger(loggerName) {
@@ -41,7 +65,7 @@ var Logging = /*#__PURE__*/function () {
     key: "flush",
     value: function () {
       var _flush = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-        var _this = this;
+        var _this2 = this;
         var messages;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -54,11 +78,11 @@ var Logging = /*#__PURE__*/function () {
                   url: this.app.urls.logging(),
                   data: messages
                 })["catch"](function (error) {
-                  _this.messages = [].concat((0, _toConsumableArray2["default"])(messages), (0, _toConsumableArray2["default"])(_this.messages));
-                  _this.checkMessagesLimit();
+                  _this2.messages = [].concat((0, _toConsumableArray2["default"])(messages), (0, _toConsumableArray2["default"])(_this2.messages));
+                  _this2.checkMessagesLimit();
                   throw error;
                 })["finally"](function () {
-                  return delete _this.flushRequest;
+                  return delete _this2.flushRequest;
                 });
               }
               return _context.abrupt("return", this.flushRequest);
@@ -106,10 +130,10 @@ var Logging = /*#__PURE__*/function () {
   }, {
     key: "startFlushInterval",
     value: function startFlushInterval() {
-      var _this2 = this;
+      var _this3 = this;
       if (!this.flushInterval) {
         this.flushInterval = setTimeout(function () {
-          return _this2.flush();
+          return _this3.flush();
         }, this.timeFrequency * 1000);
       }
     }

package/lib/logging/logger.js

@@ -7,6 +7,16 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var LogLevelPriorities = {
+  off: 0,
+  fatal: 1,
+  error: 2,
+  warn: 3,
+  info: 4,
+  debug: 5,
+  trace: 6,
+  all: 6
+};
 var Logger = /*#__PURE__*/function () {
   function Logger(name, logging) {
     (0, _classCallCheck2["default"])(this, Logger);
@@ -16,32 +26,49 @@ var Logger = /*#__PURE__*/function () {
   (0, _createClass2["default"])(Logger, [{
     key: "debug",
     value: function debug(message) {
-      return this.logging.push(this.name, 'DEBUG', message);
+      return this.log('DEBUG', message);
     }
   }, {
     key: "info",
     value: function info(message) {
-      return this.logging.push(this.name, 'INFO', message);
+      return this.log('INFO', message);
     }
   }, {
     key: "warn",
     value: function warn(message, exception) {
-      return this.logging.push(this.name, 'WARN', message, exception);
+      return this.log('WARN', message, exception);
     }
   }, {
     key: "error",
     value: function error(message, exception) {
-      return this.logging.push(this.name, 'ERROR', message, exception);
+      return this.log('ERROR', message, exception);
     }
   }, {
     key: "fatal",
     value: function fatal(message, exception) {
-      return this.logging.push(this.name, 'FATAL', message, exception);
+      return this.log('FATAL', message, exception);
     }
   }, {
     key: "trace",
     value: function trace(message) {
-      return this.logging.push(this.name, 'TRACE', message);
+      return this.log('TRACE', message);
+    }
+  }, {
+    key: "log",
+    value: function log(level, message, exception) {
+      if (this.min(level)) {
+        return this.logging.push(this.name, level, message, exception);
+      }
+    }
+  }, {
+    key: "min",
+    value: function min(level) {
+      var configuredLevel = this.logging.config.levels[this.name];
+      if (!configuredLevel) {
+        var defaultLevel = this.logging.config.defaultLevel;
+        return LogLevelPriorities[defaultLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()];
+      }
+      return LogLevelPriorities[configuredLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()];
     }
   }]);
   return Logger;

package/lib/urls.js

@@ -41,6 +41,11 @@ var Urls = /*#__PURE__*/function () {
     value: function logging() {
       return "".concat(this.root(), "/log");
     }
+  }, {
+    key: "loggingLevels",
+    value: function loggingLevels() {
+      return "".concat(this.logging(), "/logger");
+    }
 
     //cache
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backendless",
-  "version": "6.7.1-dev.2",
+  "version": "7.0.0",
   "description": "Backendless JavaScript SDK for Node.js and the browser",
   "browser": "dist/backendless.js",
   "main": "lib/index.js",

package/src/index.js

@@ -146,8 +146,11 @@ class Backendless {
 
     app.__removeService('LocalCache')
 
+    const loggingConfig = Object.assign({ loadLevels: true, defaultLevel: 'all', levels: {} }, config.logging)
+
     if (app.__hasService('Logging')) {
       app.Logging.reset()
+      app.Logging.setConfig(loggingConfig)
     }
 
     if (app.__hasService('Users')) {
@@ -156,6 +159,8 @@ class Backendless {
 
     delete this.__device
 
+    app.loggingConfig = loggingConfig
+
     return app
   }
 

package/src/logging/index.js

@@ -6,6 +6,16 @@ export default class Logging {
     this.app = app
 
     this.reset()
+
+    this.setConfig(app.loggingConfig)
+  }
+
+  setConfig(config) {
+    this.config = config
+
+    if (config.loadLevels) {
+      this.loadLoggingLevels()
+    }
   }
 
   reset() {
@@ -16,6 +26,20 @@ export default class Logging {
     this.messagesLimit = 100
   }
 
+  loadLoggingLevels() {
+    this.app.request
+      .get({ url: this.app.urls.loggingLevels() })
+      .then(loggers => {
+        loggers.forEach(logger => {
+          this.config.levels[logger.name] = logger.level
+        })
+      })
+      .catch(error => {
+        // eslint-disable-next-line no-console
+        console.error('Could not load logging levels: ', error)
+      })
+  }
+
   getLogger(loggerName) {
     if (!loggerName || typeof loggerName !== 'string') {
       throw new Error('Logger Name must be provided and must be a string.')

package/src/logging/logger.js

@@ -1,3 +1,14 @@
+const LogLevelPriorities = {
+  off  : 0,
+  fatal: 1,
+  error: 2,
+  warn : 3,
+  info : 4,
+  debug: 5,
+  trace: 6,
+  all  : 6,
+}
+
 export default class Logger {
 
   constructor(name, logging) {
@@ -6,26 +17,44 @@ export default class Logger {
   }
 
   debug(message) {
-    return this.logging.push(this.name, 'DEBUG', message)
+    return this.log('DEBUG', message)
   }
 
   info(message) {
-    return this.logging.push(this.name, 'INFO', message)
+    return this.log('INFO', message)
   }
 
   warn(message, exception) {
-    return this.logging.push(this.name, 'WARN', message, exception)
+    return this.log('WARN', message, exception)
   }
 
   error(message, exception) {
-    return this.logging.push(this.name, 'ERROR', message, exception)
+    return this.log('ERROR', message, exception)
   }
 
   fatal(message, exception) {
-    return this.logging.push(this.name, 'FATAL', message, exception)
+    return this.log('FATAL', message, exception)
   }
 
   trace(message) {
-    return this.logging.push(this.name, 'TRACE', message)
+    return this.log('TRACE', message)
+  }
+
+  log(level, message, exception) {
+    if (this.min(level)) {
+      return this.logging.push(this.name, level, message, exception)
+    }
+  }
+
+  min(level) {
+    const configuredLevel = this.logging.config.levels[this.name]
+
+    if (!configuredLevel) {
+      const { defaultLevel } = this.logging.config
+
+      return LogLevelPriorities[defaultLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()]
+    }
+
+    return LogLevelPriorities[configuredLevel.toLowerCase()] >= LogLevelPriorities[level.toLowerCase()]
   }
 }

package/src/urls.js

@@ -27,6 +27,10 @@ export default class Urls {
     return `${this.root()}/log`
   }
 
+  loggingLevels() {
+    return `${this.logging()}/logger`
+  }
+
   //cache
 
   cache() {