qiscus-sdk-core 2.14.2 → 2.15.0

package/lib/lib/adapters/expired-token.js

@@ -90,15 +90,15 @@ var ExpiredTokenAdapter = exports.ExpiredTokenAdapter = /*#__PURE__*/function ()
     value: function () {
       var _refreshAuthToken = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var _this2 = this;
-        return _regenerator["default"].wrap(function _callee$(_context) {
+        return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!(this._getAuthenticationStatus() == false || this._refreshToken == null)) {
-                _context.next = 2;
+                _context.next = 1;
                 break;
               }
               return _context.abrupt("return");
-            case 2:
+            case 1:
               return _context.abrupt("return", this._http.post('api/v2/sdk/refresh_user_token', {
                 user_id: this._userId,
                 refresh_token: this._refreshToken
@@ -116,7 +116,7 @@ var ExpiredTokenAdapter = exports.ExpiredTokenAdapter = /*#__PURE__*/function ()
                 _this2._setTimer(_this2._expiredAt);
                 return res;
               }));
-            case 3:
+            case 2:
             case "end":
               return _context.stop();
           }
@@ -131,7 +131,7 @@ var ExpiredTokenAdapter = exports.ExpiredTokenAdapter = /*#__PURE__*/function ()
     key: "logout",
     value: function () {
       var _logout = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
+        return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               return _context2.abrupt("return", this._http.post('api/v2/sdk/logout', {

package/lib/lib/adapters/http.js

@@ -41,14 +41,14 @@ var HttpAdapter = exports["default"] = /*#__PURE__*/function () {
       var options = arguments.length > 2 ? arguments[2] : undefined;
       return this._retryHelper(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var req;
-        return _regenerator["default"].wrap(function _callee$(_context) {
+        return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               req = _superagent["default"].get("".concat(_this.baseURL, "/").concat(path));
               if (options && options.baseURL) req = _superagent["default"].get("".concat(options.baseURL, "/").concat(path));
               req = _this.setupHeaders(req, headers);
               return _context.abrupt("return", req);
-            case 4:
+            case 1:
             case "end":
               return _context.stop();
           }
@@ -62,13 +62,13 @@ var HttpAdapter = exports["default"] = /*#__PURE__*/function () {
       var _this2 = this;
       return this._retryHelper(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
         var req;
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
+        return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               req = _superagent["default"].get("".concat(_this2.baseURL, "/").concat(path));
               req = _this2.setupHeaders(req, {});
               return _context2.abrupt("return", req);
-            case 3:
+            case 1:
             case "end":
               return _context2.stop();
           }
@@ -83,13 +83,13 @@ var HttpAdapter = exports["default"] = /*#__PURE__*/function () {
       var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       return this._retryHelper(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
         var req;
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
+        return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               req = _superagent["default"].post("".concat(_this3.baseURL, "/").concat(path));
               req = _this3.setupHeaders(req, headers);
               return _context3.abrupt("return", req.send(body).set('Content-Type', 'application/x-www-form-urlencoded'));
-            case 3:
+            case 1:
             case "end":
               return _context3.stop();
           }
@@ -106,14 +106,14 @@ var HttpAdapter = exports["default"] = /*#__PURE__*/function () {
       var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       return this._retryHelper(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
         var req;
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
+        return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               req = _superagent["default"].post("".concat(_this4.baseURL, "/").concat(path));
               req = _this4.setupHeaders(req, headers);
               req.send(body);
               return _context4.abrupt("return", req);
-            case 4:
+            case 1:
             case "end":
               return _context4.stop();
           }
@@ -128,13 +128,13 @@ var HttpAdapter = exports["default"] = /*#__PURE__*/function () {
       var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       return this._retryHelper(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
         var req;
-        return _regenerator["default"].wrap(function _callee5$(_context5) {
+        return _regenerator["default"].wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               req = _superagent["default"].put("".concat(_this5.baseURL, "/").concat(path));
               req = _this5.setupHeaders(req, headers);
               return _context5.abrupt("return", req.send(body).set('Content-Type', 'application/x-www-form-urlencoded'));
-            case 3:
+            case 1:
             case "end":
               return _context5.stop();
           }
@@ -149,13 +149,13 @@ var HttpAdapter = exports["default"] = /*#__PURE__*/function () {
       var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       return this._retryHelper(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6() {
         var req;
-        return _regenerator["default"].wrap(function _callee6$(_context6) {
+        return _regenerator["default"].wrap(function (_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               req = _superagent["default"].patch("".concat(_this6.baseURL, "/").concat(path));
               req = _this6.setupHeaders(req, headers);
               return _context6.abrupt("return", req.send(body).set('Content-Type', 'application/x-www-form-urlencoded'));
-            case 3:
+            case 1:
             case "end":
               return _context6.stop();
           }
@@ -170,13 +170,13 @@ var HttpAdapter = exports["default"] = /*#__PURE__*/function () {
       var headers = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       return this._retryHelper(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7() {
         var req;
-        return _regenerator["default"].wrap(function _callee7$(_context7) {
+        return _regenerator["default"].wrap(function (_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               req = _superagent["default"].del("".concat(_this7.baseURL, "/").concat(path));
               req = _this7.setupHeaders(req, headers);
               return _context7.abrupt("return", req.send(body).set('Content-Type', 'application/json'));
-            case 3:
+            case 1:
             case "end":
               return _context7.stop();
           }
@@ -226,38 +226,38 @@ var HttpAdapter = exports["default"] = /*#__PURE__*/function () {
     key: "_retryHelper",
     value: (function () {
       var _retryHelper2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(fn) {
-        var _err$response, _err$response2, _body$error, status, body;
-        return _regenerator["default"].wrap(function _callee8$(_context8) {
+        var _err$response, _err$response2, _body$error, status, body, _t;
+        return _regenerator["default"].wrap(function (_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               _context8.prev = 0;
-              _context8.next = 3;
+              _context8.next = 1;
               return fn();
-            case 3:
+            case 1:
               return _context8.abrupt("return", _context8.sent);
-            case 6:
-              _context8.prev = 6;
-              _context8.t0 = _context8["catch"](0);
-              status = _context8.t0 === null || _context8.t0 === void 0 || (_err$response = _context8.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status;
-              body = _context8.t0 === null || _context8.t0 === void 0 || (_err$response2 = _context8.t0.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.body;
+            case 2:
+              _context8.prev = 2;
+              _t = _context8["catch"](0);
+              status = _t === null || _t === void 0 || (_err$response = _t.response) === null || _err$response === void 0 ? void 0 : _err$response.status;
+              body = _t === null || _t === void 0 || (_err$response2 = _t.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.body;
               if (!(status === 403 && ((_body$error = body.error) === null || _body$error === void 0 || (_body$error = _body$error.message) === null || _body$error === void 0 ? void 0 : _body$error.toLowerCase()) === 'unauthorized. token is expired')) {
-                _context8.next = 18;
+                _context8.next = 5;
                 break;
               }
-              _context8.next = 13;
+              _context8.next = 3;
               return this._expiredTokenAdapterGetter().refreshAuthToken();
-            case 13:
-              _context8.next = 15;
+            case 3:
+              _context8.next = 4;
               return fn();
-            case 15:
+            case 4:
               return _context8.abrupt("return", _context8.sent);
-            case 18:
-              throw _context8.t0;
-            case 19:
+            case 5:
+              throw _t;
+            case 6:
             case "end":
               return _context8.stop();
           }
-        }, _callee8, this, [[0, 6]]);
+        }, _callee8, this, [[0, 2]]);
       }));
       function _retryHelper(_x) {
         return _retryHelper2.apply(this, arguments);

package/lib/lib/adapters/mqtt.js

@@ -44,7 +44,9 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
       shouldConnect = _ref$shouldConnect === void 0 ? true : _ref$shouldConnect,
       brokerLbUrl = _ref.brokerLbUrl,
       enableLb = _ref.enableLb,
-      getClientId = _ref.getClientId;
+      getClientId = _ref.getClientId,
+      mqttUsername = _ref.mqttUsername,
+      mqttPassword = _ref.mqttPassword;
     (0, _classCallCheck2["default"])(this, MqttAdapter);
     (0, _defineProperty2["default"])(this, "_getClientId", function () {
       if (_this.getClientId == null) return "".concat(_this.core.AppId, "_").concat(_this.core.user_id, "_").concat(Date.now());
@@ -85,6 +87,8 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
         // reconnectPeriod: 0,
         // connectTimeout: 1 * 1000,
       };
+      if (_this.mqttUsername != null) opts.username = _this.mqttUsername;
+      if (_this.mqttPassword != null) opts.password = _this.mqttPassword;
       if (brokerUrl == null) brokerUrl = _this.cacheRealtimeURL;
       if (_this.mqtt != null) {
         var _topics = Object.keys(_this.mqtt._resubscribeTopics);
@@ -112,7 +116,7 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
     });
     (0, _defineProperty2["default"])(this, "_on_close_handler", (0, _lodash["default"])(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var shouldReconnect, _yield$wrapP, _yield$wrapP2, url, err;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             shouldReconnect = _this.enableLb === true &&
@@ -132,15 +136,15 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
               console.groupEnd();
             }
             if (shouldReconnect) {
-              _context.next = 4;
+              _context.next = 1;
               break;
             }
             return _context.abrupt("return");
-          case 4:
+          case 1:
             _this.willConnectToRealtime = true;
-            _context.next = 7;
+            _context.next = 2;
             return (0, _util.wrapP)(_this.getMqttNode());
-          case 7:
+          case 2:
             _yield$wrapP = _context.sent;
             _yield$wrapP2 = (0, _slicedToArray2["default"])(_yield$wrapP, 2);
             url = _yield$wrapP2[0];
@@ -154,7 +158,7 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
               _this.mqtt = _this.__mqtt_conneck(url);
             }
             _this.willConnectToRealtime = false;
-          case 13:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -191,7 +195,10 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
     }), (0, _match2.when)(), function (topic) {
       return _this.logger('topic not handled', topic);
     }));
+    this.mqttUsername = mqttUsername;
+    this.mqttPassword = mqttPassword;
     var _mqtt = this.__mqtt_conneck(_url);
+    this.cacheRealtimeURL = _url;
     this.mqtt = _mqtt;
 
     // if appConfig set realtimeEnabled to false,
@@ -208,6 +215,11 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
     // })
   }
   return (0, _createClass2["default"])(MqttAdapter, [{
+    key: "http",
+    get: function get() {
+      return this.core.HTTPAdapter;
+    }
+  }, {
     key: "cacheRealtimeURL",
     get: function get() {
       return this.core.mqttURL;
@@ -228,9 +240,16 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
     key: "openConnection",
     value: (function () {
       var _openConnection = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        return _regenerator["default"].wrap(function _callee2$(_context2) {
+        return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              if (!(this.mqtt != null)) {
+                _context2.next = 1;
+                break;
+              }
+              _context2.next = 1;
+              return this.closeConnection();
+            case 1:
               this.shouldConnect = true;
               this.mqtt = this.__mqtt_conneck();
             case 2:
@@ -253,17 +272,24 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
     value: (function () {
       var _closeConnection = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
         var _this2 = this;
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
+        return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               this.shouldConnect = false;
-              this.mqtt.end(true, function (err) {
-                if (err) {
-                  _this2.logger('error when close connection', err.message);
-                }
+              _context3.next = 1;
+              return new Promise(function (resolve, reject) {
+                _this2.mqtt.end(true, null, function (err) {
+                  if (err) {
+                    _this2.logger('error when close connection', err.message);
+                    reject(err);
+                  } else {
+                    resolve();
+                  }
+                });
               });
+            case 1:
               this.mqtt = null;
-            case 3:
+            case 2:
             case "end":
               return _context3.stop();
           }
@@ -278,18 +304,21 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
     key: "getMqttNode",
     value: function () {
       var _getMqttNode = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var res, url, port;
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
+        var res, mqttUsername, mqttPassword, mqttURL;
+        return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context4.next = 2;
-              return _superagent["default"].get(this.brokerLbUrl);
-            case 2:
+              _context4.next = 1;
+              return this.http.get('api/v2/sdk/mqtt_config');
+            case 1:
               res = _context4.sent;
-              url = res.body.data.url;
-              port = res.body.data.wss_port;
-              return _context4.abrupt("return", "wss://".concat(url, ":").concat(port, "/mqtt"));
-            case 6:
+              mqttUsername = res.body.results.username;
+              mqttPassword = res.body.results.password;
+              mqttURL = "wss://".concat(res.body.results.url, ":1886/mqtt");
+              this.mqttUsername = mqttUsername;
+              this.mqttPassword = mqttPassword;
+              return _context4.abrupt("return", mqttURL);
+            case 2:
             case "end":
               return _context4.stop();
           }
@@ -381,7 +410,7 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "logger",
     get: function get() {
-      if (!this.core.debugMQTTMode) return this.noop;
+      if (!this.logEnabled) return this.noop;
       return console.log.bind(console, 'QRealtime ->');
     }