@wiotp/sdk 0.7.8 → 0.8.0

package/dist/application/ApplicationConfig.js

@@ -1,83 +1,68 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _BaseConfig2 = _interopRequireDefault(require("../BaseConfig"));
-
 var _loglevel = _interopRequireDefault(require("loglevel"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } /**
+ *****************************************************************************
+ Copyright (c) 2019 IBM Corporation and other Contributors.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+ *****************************************************************************
+ *
+ */
 var YAML = require('yaml');
-
 var fs = require('fs');
-
-var uuidv4 = require('uuid/v4');
-
-var ApplicationConfig = /*#__PURE__*/function (_BaseConfig) {
+var _require = require('uuid'),
+  uuidv4 = _require.v4;
+var ApplicationConfig = exports["default"] = /*#__PURE__*/function (_BaseConfig) {
   _inherits(ApplicationConfig, _BaseConfig);
-
-  var _super = _createSuper(ApplicationConfig);
-
   function ApplicationConfig(identity, auth, options) {
     var _this;
-
     _classCallCheck(this, ApplicationConfig);
+    _this = _callSuper(this, ApplicationConfig, [identity, auth, options]);
 
-    _this = _super.call(this, identity, auth, options); // Authentication is not supported for quickstart
+    // Authentication is not supported for quickstart
     // and not required when auth.useLtpa is set
-
     if (_this.auth != null && !_this.auth.useLtpa) {
       if (!("key" in _this.auth) || _this.auth.key == null) {
         throw new Error("Missing auth.key from configuration");
       }
-
       if (!("token" in _this.auth) || _this.auth.token == null) {
         throw new Error("Missing auth.token from configuration");
       }
-    } // Set defaults for optional configuration
-
+    }
 
+    // Set defaults for optional configuration
     if (_this.identity == null) {
       _this.identity = {};
     }
-
     if (!("appId" in _this.identity)) {
       _this.identity.appId = uuidv4();
     }
-
     if (!("sharedSubscription" in _this.options.mqtt)) {
       _this.options.mqtt.sharedSubscription = false;
     }
-
     return _this;
   }
-
   _createClass(ApplicationConfig, [{
     key: "getOrgId",
     value: function getOrgId() {
@@ -88,8 +73,9 @@ var ApplicationConfig = /*#__PURE__*/function (_BaseConfig) {
       } else {
         return null;
       }
-    } // Returns options.apiRoot if set, 'api/v0002' otherwiss
+    }
 
+    // Returns options.apiRoot if set, 'api/v0002' otherwiss
   }, {
     key: "getApiRoot",
     value: function getApiRoot() {
@@ -104,11 +90,9 @@ var ApplicationConfig = /*#__PURE__*/function (_BaseConfig) {
     key: "getClientId",
     value: function getClientId() {
       var clientIdPrefix = "a";
-
       if (this.options.mqtt.sharedSubscription == true) {
         clientIdPrefix = "A";
       }
-
       return clientIdPrefix + ":" + this.getOrgId() + ":" + this.identity.appId;
     }
   }, {
@@ -138,16 +122,18 @@ var ApplicationConfig = /*#__PURE__*/function (_BaseConfig) {
     value: function parseEnvVars() {
       // Auth
       var authKey = process.env.WIOTP_AUTH_KEY || null;
-      var authToken = process.env.WIOTP_AUTH_TOKEN || null; // Also support WIOTP_API_KEY / WIOTP_API_TOKEN usage
+      var authToken = process.env.WIOTP_AUTH_TOKEN || null;
 
+      // Also support WIOTP_API_KEY / WIOTP_API_TOKEN usage
       if (authKey == null && authToken == null) {
         authKey = process.env.WIOTP_API_KEY || null;
         authToken = process.env.WIOTP_API_TOKEN || null;
-      } // Identity
-
+      }
 
-      var appId = process.env.WIOTP_IDENTITY_APPID || uuidv4(); // Options
+      // Identity
+      var appId = process.env.WIOTP_IDENTITY_APPID || uuidv4();
 
+      // Options
       var domain = process.env.WIOTP_OPTIONS_DOMAIN || null;
       var apiRoot = process.env.WIOTP_OPTIONS_API_ROOT || null;
       var logLevel = process.env.WIOTP_OPTIONS_LOGLEVEL || "info";
@@ -158,13 +144,14 @@ var ApplicationConfig = /*#__PURE__*/function (_BaseConfig) {
       var sessionExpiry = process.env.WIOTP_OPTIONS_MQTT_SESSIONEXPIRY || 3600;
       var keepAlive = process.env.WIOTP_OPTIONS_MQTT_KEEPALIVE || 60;
       var sharedSubs = process.env.WIOTP_OPTIONS_MQTT_SHAREDSUBSCRIPTION || "false";
-      var verifyCert = process.env.WIOTP_OPTIONS_HTTP_VERIFY || "true"; // TODO: add environment variable parsing for options.http.additionalHeaders
-      // String to int conversions
+      var verifyCert = process.env.WIOTP_OPTIONS_HTTP_VERIFY || "true";
+
+      // TODO: add environment variable parsing for options.http.additionalHeaders
 
+      // String to int conversions
       if (port != null) {
         port = parseInt(port);
       }
-
       sessionExpiry = parseInt(sessionExpiry);
       keepAlive = parseInt(keepAlive);
       var identity = {
@@ -187,15 +174,14 @@ var ApplicationConfig = /*#__PURE__*/function (_BaseConfig) {
           verify: ["True", "true", "1"].includes(verifyCert)
         }
       };
-      var auth = null; // Quickstart doesn't support auth, so ensure we only add this if it's defined
-
+      var auth = null;
+      // Quickstart doesn't support auth, so ensure we only add this if it's defined
       if (authToken != null) {
         auth = {
           key: authKey,
           token: authToken
         };
       }
-
       return new ApplicationConfig(identity, auth, options);
     }
   }, {
@@ -227,36 +213,29 @@ var ApplicationConfig = /*#__PURE__*/function (_BaseConfig) {
                   X-Csrf-Token: sdfsdfsdf
                   X-myheader: hello
       */
+
       var configFile = fs.readFileSync(configFilePath, 'utf8');
       var data = YAML.parse(configFile);
-
       if (!fs.existsSync(configFilePath)) {
         throw new Error("File not found");
       } else {
         try {
           var _configFile = fs.readFileSync(configFilePath, 'utf8');
-
           var data = YAML.parse(_configFile);
         } catch (err) {
           throw new Error("Error reading device configuration file: " + err.code);
         }
       }
-
       if ("options" in data & "logLevel" in data["options"]) {
         var validLevels = ["error", "warning", "info", "debug"];
-
         if (!validLevels.includes(data["options"]["logLevel"])) {
           throw new Error("Optional setting options.logLevel (Currently: " + data["options"]["logLevel"] + ") must be one of error, warning, info, debug");
         }
       } else {
         data["options"]["logLevel"] = _loglevel["default"].GetLogger(data["options"]["logLevel"].toUpperCase());
       }
-
       return new ApplicationConfig(data['identity'], data['auth'], data['options']);
     }
   }]);
-
   return ApplicationConfig;
-}(_BaseConfig2["default"]);
-
-exports["default"] = ApplicationConfig;
+}(_BaseConfig2["default"]);

package/dist/application/index.js

@@ -15,9 +15,6 @@ Object.defineProperty(exports, "ApplicationConfig", {
     return _ApplicationConfig["default"];
   }
 });
-
 var _ApplicationClient = _interopRequireDefault(require("./ApplicationClient"));
-
 var _ApplicationConfig = _interopRequireDefault(require("./ApplicationConfig"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }