qiscus-sdk-core 2.15.0 → 2.16.0

package/lib/lib/adapters/custom-event.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = CustomEventAdapter;
-var _is_js = _interopRequireDefault(require("is_js"));
+var _is = _interopRequireDefault(require("../is"));
 var _mitt = _interopRequireDefault(require("mitt"));
 function CustomEventAdapter(mqttAdapter, userId) {
   var events = (0, _mitt["default"])();
@@ -19,10 +19,10 @@ function CustomEventAdapter(mqttAdapter, userId) {
   };
   return {
     publishEvent: function publishEvent(roomId, payload) {
-      if (_is_js["default"].undefined(roomId)) throw new Error('`roomId` required');
-      if (_is_js["default"].not.string(roomId)) throw new TypeError('`roomId` must have type of string');
-      if (_is_js["default"].undefined(payload)) throw new Error('`payload` required');
-      if (_is_js["default"].not.object(payload)) throw new TypeError('`payload` must have type of object');
+      if (_is["default"].undefined(roomId)) throw new Error('`roomId` required');
+      if (_is["default"].not.string(roomId)) throw new TypeError('`roomId` must have type of string');
+      if (_is["default"].undefined(payload)) throw new Error('`payload` required');
+      if (_is["default"].not.object(payload)) throw new TypeError('`payload` must have type of object');
       var _payload = JSON.stringify({
         sender: userId,
         // ?
@@ -31,10 +31,10 @@ function CustomEventAdapter(mqttAdapter, userId) {
       mqttAdapter.publish(getTopic(roomId), _payload);
     },
     subscribeEvent: function subscribeEvent(roomId, callback) {
-      if (_is_js["default"].undefined(roomId)) throw new Error('`roomId` required');
-      if (_is_js["default"].not.string(roomId)) throw new TypeError('`roomId` must have type of string');
-      if (_is_js["default"].undefined(callback)) throw new Error('`callback` required');
-      if (_is_js["default"].not["function"](callback)) throw new TypeError('`callback` must have type of function');
+      if (_is["default"].undefined(roomId)) throw new Error('`roomId` required');
+      if (_is["default"].not.string(roomId)) throw new TypeError('`roomId` must have type of string');
+      if (_is["default"].undefined(callback)) throw new Error('`callback` required');
+      if (_is["default"].not["function"](callback)) throw new TypeError('`callback` must have type of function');
       var topic = getTopic(roomId);
       // Only allow 1 subcription for now
       if (subscribedTopics[topic]) return;
@@ -47,8 +47,8 @@ function CustomEventAdapter(mqttAdapter, userId) {
       subscribedTopics[topic] = cb;
     },
     unsubscribeEvent: function unsubscribeEvent(roomId) {
-      if (_is_js["default"].undefined(roomId)) throw new Error('`roomId` required');
-      if (_is_js["default"].not.string(roomId)) throw new TypeError('`roomId` must have type of string');
+      if (_is["default"].undefined(roomId)) throw new Error('`roomId` required');
+      if (_is["default"].not.string(roomId)) throw new TypeError('`roomId` must have type of string');
       var topic = getTopic(roomId);
       if (!subscribedTopics[topic]) return;
       mqttAdapter.unsubscribe(topic);

package/lib/lib/adapters/mqtt.js

@@ -44,9 +44,7 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
       shouldConnect = _ref$shouldConnect === void 0 ? true : _ref$shouldConnect,
       brokerLbUrl = _ref.brokerLbUrl,
       enableLb = _ref.enableLb,
-      getClientId = _ref.getClientId,
-      mqttUsername = _ref.mqttUsername,
-      mqttPassword = _ref.mqttPassword;
+      getClientId = _ref.getClientId;
     (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());
@@ -87,8 +85,6 @@ 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);
@@ -195,10 +191,7 @@ 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,
@@ -215,11 +208,6 @@ 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;
@@ -243,16 +231,9 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
         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:
+            case 1:
             case "end":
               return _context2.stop();
           }
@@ -276,20 +257,13 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               this.shouldConnect = false;
-              _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();
-                  }
-                });
+              this.mqtt.end(true, function (err) {
+                if (err) {
+                  _this2.logger('error when close connection', err.message);
+                }
               });
-            case 1:
               this.mqtt = null;
-            case 2:
+            case 1:
             case "end":
               return _context3.stop();
           }
@@ -304,20 +278,17 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
     key: "getMqttNode",
     value: function () {
       var _getMqttNode = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var res, mqttUsername, mqttPassword, mqttURL;
+        var res, url, port;
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _context4.next = 1;
-              return this.http.get('api/v2/sdk/mqtt_config');
+              return _superagent["default"].get(this.brokerLbUrl);
             case 1:
               res = _context4.sent;
-              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);
+              url = res.body.data.url;
+              port = res.body.data.wss_port;
+              return _context4.abrupt("return", "wss://".concat(url, ":").concat(port, "/mqtt"));
             case 2:
             case "end":
               return _context4.stop();
@@ -410,7 +381,7 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "logger",
     get: function get() {
-      if (!this.logEnabled) return this.noop;
+      if (!this.core.debugMQTTMode) return this.noop;
       return console.log.bind(console, 'QRealtime ->');
     }
 

package/lib/lib/is.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+// Minimal internal replacement for the `is_js` package.
+//
+// We only port the handful of type predicates the SDK actually uses, with the
+// exact same semantics as `is_js@0.9.0`. The prototype-pollution surface of
+// is_js (CVE-2020-26302) lives in unused helpers (`propertyDefined`,
+// `propertyCount`, the regex-namespace plumbing), which are intentionally not
+// reimplemented here.
+
+var toString = Object.prototype.toString;
+var is = {};
+is.array = Array.isArray;
+is.undefined = function (value) {
+  return value === undefined;
+};
+is.string = function (value) {
+  return toString.call(value) === '[object String]';
+};
+is.object = function (value) {
+  return Object(value) === value;
+};
+is['function'] = function (value) {
+  return toString.call(value) === '[object Function]' || typeof value === 'function';
+};
+is.json = function (value) {
+  return toString.call(value) === '[object Object]';
+};
+is.not = {
+  array: function array(value) {
+    return !is.array(value);
+  },
+  string: function string(value) {
+    return !is.string(value);
+  },
+  object: function object(value) {
+    return !is.object(value);
+  },
+  "function": function _function(value) {
+    return !is['function'](value);
+  },
+  json: function json(value) {
+    return !is.json(value);
+  }
+};
+var _default = exports["default"] = is;
+module.exports = exports.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qiscus-sdk-core",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "description": "Qiscus Web SDK Core",
   "license": "MIT",
   "main": "lib/index.js",
@@ -28,8 +28,7 @@
     "prepublishOnly": "npm-run-all clean build",
     "serve": "http-server -p 1234 -c-1 dist",
     "dev:serve": "run-p serve watch",
-    "release:patch": "np patch --any-branch --yolo",
-    "release:minor": "np minor --any-branch --yolo"
+    "release:patch": "np patch --any-branch --yolo"
   },
   "devDependencies": {
     "@babel/cli": "^7.10.5",
@@ -66,7 +65,6 @@
   "dependencies": {
     "@babel/runtime": "^7.11.2",
     "date-fns": "^1.30.1",
-    "is_js": "^0.9.0",
     "lodash.debounce": "^4.0.8",
     "lodash.throttle": "^4.1.1",
     "mitt": "^1.2.0",
@@ -96,5 +94,5 @@
   "engines": {
     "node": "16.15.1"
   },
-  "packageManager": "pnpm@10.32.1+sha512.a706938f0e89ac1456b6563eab4edf1d1faf3368d1191fc5c59790e96dc918e4456ab2e67d613de1043d2e8c81f87303e6b40d4ffeca9df15ef1ad567348f2be"
+  "packageManager": "pnpm@8.15.9"
 }