qiscus-sdk-core 2.14.0 → 2.14.2

package/lib/index.js

@@ -475,9 +475,12 @@ var QiscusSDK = /*#__PURE__*/function () {
                   return _this2._retrySendComment(m);
                 });
               });
+              this.syncAdapter.on('last-message-id.new', function (id) {
+                _this2.last_received_comment_id = id;
+              });
               this.customEventAdapter = (0, _customEvent["default"])(this.realtimeAdapter, this.user_id);
               this.setEventListeners();
-            case 56:
+            case 57:
             case "end":
               return _context3.stop();
           }
@@ -661,20 +664,28 @@ var QiscusSDK = /*#__PURE__*/function () {
         });
         _this3.HTTPAdapter.setToken(_this3.userData.token);
         var user = response.user;
+        _this3._delayedSync = (0, _utils.delayed)(function () {
+          _this3.synchronize();
+          _this3.synchronizeEvent();
+        }, 500);
         _this3.expiredTokenAdapter = new _expiredToken.ExpiredTokenAdapter({
           httpAdapter: _this3.HTTPAdapter,
           refreshToken: user.refresh_token,
           expiredAt: user.token_expires_at,
           userId: _this3.user_id,
-          onTokenRefreshed: function onTokenRefreshed(token, refreshToken, expiredAt) {
+          onTokenRefreshed: function onTokenRefreshed(token, refreshToken, expiredAt, oldToken) {
             _this3.userData.token = token;
             _this3.userData.refresh_token = refreshToken;
             _this3.userData.token_expires_at = expiredAt === null || expiredAt === void 0 ? void 0 : expiredAt.toJSON();
             _this3.events.emit('token-refreshed', {
               token: token,
               refreshToken: refreshToken,
-              expiredAt: expiredAt
+              expiredAt: expiredAt,
+              oldToken: oldToken
             });
+            _this3.realtimeAdapter.unsusbcribeUserChannelByToken(oldToken);
+            _this3.realtimeAdapter.subscribeUserChannelByToken(token);
+            _this3._delayedSync();
           },
           getAuthenticationStatus: function getAuthenticationStatus() {
             return _this3.user_id != null && _this3.isLogin;

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

@@ -21,7 +21,7 @@ var ExpiredTokenAdapter = exports.ExpiredTokenAdapter = /*#__PURE__*/function ()
    *  userId: string,
    *  refreshToken: string | null,
    *  expiredAt: string | null,
-   *  onTokenRefreshed: (token: string, refreshToken: string, expiredAt: Date) => void
+   *  onTokenRefreshed: (token: string, refreshToken: string, expiredAt: Date, oldToken: string) => void
    *  getAuthenticationStatus: () => boolean,
    * }} param
    */
@@ -41,7 +41,7 @@ var ExpiredTokenAdapter = exports.ExpiredTokenAdapter = /*#__PURE__*/function ()
     (0, _defineProperty2["default"])(this, "_expiredAt", null);
     /** @type {import('./http').default} */
     (0, _defineProperty2["default"])(this, "_http", void 0);
-    /** @type {(token: string, refreshToken: string, expiredAt: Date) => void | undefined} */
+    /** @type {(token: string, refreshToken: string, expiredAt: Date, oldToken: string) => void | undefined} */
     (0, _defineProperty2["default"])(this, "_onTokenRefreshed", void 0);
     /** @type {any} */
     (0, _defineProperty2["default"])(this, "_timerId", void 0);
@@ -107,13 +107,12 @@ var ExpiredTokenAdapter = exports.ExpiredTokenAdapter = /*#__PURE__*/function ()
                 var res = r.body.results;
                 var token = res.token;
                 _this2._refreshToken = res.refresh_token;
+                // @ts-ignore
+                (_this2$_onTokenRefres = _this2._onTokenRefreshed) === null || _this2$_onTokenRefres === void 0 || _this2$_onTokenRefres.call(_this2, token, _this2._refreshToken, _this2._expiredAt, _this2._http.token);
                 _this2._http.setToken(res.token);
                 if (res.token_expires_at != null) {
                   _this2._expiredAt = new Date(res.token_expires_at);
                 }
-
-                // @ts-ignore
-                (_this2$_onTokenRefres = _this2._onTokenRefreshed) === null || _this2$_onTokenRefres === void 0 || _this2$_onTokenRefres.call(_this2, token, _this2._refreshToken, _this2._expiredAt);
                 _this2._setTimer(_this2._expiredAt);
                 return res;
               }));

package/lib/lib/adapters/mqtt.js

@@ -222,7 +222,7 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
     }
 
     /**
-     * @return {Promise<boolean}
+     * @return {Promise<boolean>}
      */
   }, {
     key: "openConnection",
@@ -312,12 +312,12 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
-      this.logger('subscribe to', args);
       this.subscribtionBuffer.push(args);
       while (this.mqtt != null && this.subscribtionBuffer.length > 0) {
         var subs = this.subscribtionBuffer.shift();
         if (subs != null) {
           var _this$mqtt;
+          this.logger('subscribe topic', subs);
           (_this$mqtt = this.mqtt).subscribe.apply(_this$mqtt, (0, _toConsumableArray2["default"])(subs));
         }
       }
@@ -333,6 +333,7 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
         var subs = this.unsubscribtionBuffer.shift();
         if (subs != null) {
           var _this$mqtt2;
+          this.logger('unsubscribe topic', subs);
           (_this$mqtt2 = this.mqtt).unsubscribe.apply(_this$mqtt2, (0, _toConsumableArray2["default"])(subs));
         }
       }
@@ -349,6 +350,7 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
       while (this.mqtt != null && this.publishBuffer.length > 0) {
         var data = this.publishBuffer.shift();
         if (data != null) {
+          this.logger('publish to', data.topic, data.payload, data.options);
           this.mqtt.publish(data.topic, data.payload.toString(), data.options);
         }
       }
@@ -630,6 +632,27 @@ var MqttAdapter = exports["default"] = /*#__PURE__*/function () {
       this.subscribe("".concat(this.core.userData.token, "/n"));
       this.subscribe("".concat(this.core.userData.token, "/update"));
     }
+  }, {
+    key: "subscribeUserChannelByToken",
+    value: function subscribeUserChannelByToken(token) {
+      this.subscribe("".concat(token, "/c"));
+      this.subscribe("".concat(token, "/n"));
+      this.subscribe("".concat(token, "/update"));
+    }
+  }, {
+    key: "unsubscribeUserChannel",
+    value: function unsubscribeUserChannel() {
+      this.unsubscribe("".concat(this.core.userData.token, "/c"));
+      this.unsubscribe("".concat(this.core.userData.token, "/n"));
+      this.unsubscribe("".concat(this.core.userData.token, "/update"));
+    }
+  }, {
+    key: "unsusbcribeUserChannelByToken",
+    value: function unsusbcribeUserChannelByToken(token) {
+      this.unsubscribe("".concat(token, "/c"));
+      this.unsubscribe("".concat(token, "/n"));
+      this.unsubscribe("".concat(token, "/update"));
+    }
   }, {
     key: "publishPresence",
     value: function publishPresence(userId) {

package/lib/lib/adapters/sync.js

@@ -11,6 +11,9 @@ var _awaitAsyncGenerator2 = _interopRequireDefault(require("@babel/runtime/helpe
 var _wrapAsyncGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapAsyncGenerator"));
 var _mitt = _interopRequireDefault(require("mitt"));
 var _urlBuilder = _interopRequireDefault(require("../url-builder"));
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _asyncIterator(r) { var n, t, o, e = 2; for ("undefined" != typeof Symbol && (t = Symbol.asyncIterator, o = Symbol.iterator); e--;) { if (t && null != (n = r[t])) return n.call(r); if (o && null != (n = r[o])) return new AsyncFromSyncIterator(n.call(r)); t = "@@asyncIterator", o = "@@iterator"; } throw new TypeError("Object is not async iterable"); }
 function AsyncFromSyncIterator(r) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var n = r.done; return Promise.resolve(r.value).then(function (r) { return { value: r, done: n }; }); } return AsyncFromSyncIterator = function AsyncFromSyncIterator(r) { this.s = r, this.n = r.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function next() { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, "return": function _return(r) { var n = this.s["return"]; return void 0 === n ? Promise.resolve({ value: r, done: !0 }) : AsyncFromSyncIteratorContinuation(n.apply(this.s, arguments)); }, "throw": function _throw(r) { var n = this.s["return"]; return void 0 === n ? Promise.reject(r) : AsyncFromSyncIteratorContinuation(n.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(r); }
 var noop = function noop() {};
@@ -417,10 +420,76 @@ function SyncAdapter(getHttpAdapter, _ref) {
       return enableSync();
     },
     synchronize: function synchronize() {
-      syncFactory.synchronize();
+      return (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+        var _result$messages, _result$lastMessageId;
+        var id, result, messages, lastMessageId, _iterator3, _step3, message;
+        return _regenerator["default"].wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              id = lastCommentId();
+              _context5.next = 3;
+              return syncFactory.synchronize(id);
+            case 3:
+              result = _context5.sent;
+              messages = (_result$messages = result === null || result === void 0 ? void 0 : result.messages) !== null && _result$messages !== void 0 ? _result$messages : [];
+              lastMessageId = (_result$lastMessageId = result === null || result === void 0 ? void 0 : result.lastMessageId) !== null && _result$lastMessageId !== void 0 ? _result$lastMessageId : -1;
+              _iterator3 = _createForOfIteratorHelper(messages);
+              try {
+                for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                  message = _step3.value;
+                  emitter.emit('message.new', message);
+                }
+              } catch (err) {
+                _iterator3.e(err);
+              } finally {
+                _iterator3.f();
+              }
+              if (lastMessageId > 0) {
+                emitter.emit('last-message-id.new', lastMessageId);
+              }
+            case 9:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5);
+      }))();
     },
     synchronizeEvent: function synchronizeEvent() {
-      syncEventFactory.synchronize();
+      return (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6() {
+        var result, eventId;
+        return _regenerator["default"].wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _context6.next = 2;
+              return syncEventFactory.synchronize(lastEventId);
+            case 2:
+              result = _context6.sent;
+              try {
+                eventId = result.lastId;
+                if (eventId > getId()) {
+                  emitter.emit('last-event-id.new', eventId);
+                  result.messageDelivered.forEach(function (it) {
+                    return emitter.emit('message.delivered', it);
+                  });
+                  result.messageDeleted.forEach(function (it) {
+                    return emitter.emit('message.deleted', it);
+                  });
+                  result.messageRead.forEach(function (it) {
+                    return emitter.emit('message.read', it);
+                  });
+                  result.roomCleared.forEach(function (it) {
+                    return emitter.emit('room.cleared', it);
+                  });
+                }
+              } catch (e) {
+                logger('error when sync event', e.message);
+              }
+            case 4:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6);
+      }))();
     }
   };
 }

package/lib/lib/utils.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.GroupChatBuilder = void 0;
+exports.delayed = delayed;
 exports.escapeHTML = escapeHTML;
 exports.scrollToBottom = scrollToBottom;
 exports.searchAndReplace = searchAndReplace;
@@ -106,4 +107,17 @@ function scrollToBottom(latestCommentId) {
     // on entering the room, wait for data processed then focus on comment form
     document.getElementsByClassName('qcw-comment-form').item(0).getElementsByTagName('textarea').item(0).focus();
   });
+}
+function delayed(cb, timeout) {
+  var timer = null;
+  return function () {
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+    if (timer != null) clearTimeout(timer);
+    timer = setTimeout(function () {
+      cb.apply(void 0, args);
+      timer = null;
+    }, timeout);
+  };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qiscus-sdk-core",
-  "version": "2.14.0",
+  "version": "2.14.2",
   "description": "Qiscus Web SDK Core",
   "license": "MIT",
   "main": "lib/index.js",