@subiz/widget-v4 4.1.122 → 4.1.124

package/compiled_src/store/store.js

@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _index = _interopRequireDefault(require("../util/index.js"));
-var _storage = _interopRequireDefault(require("@subiz/storage"));
 var _api = _interopRequireDefault(require("./api.js"));
+var _lsdb = _interopRequireDefault(require("./lsdb.js"));
+var _chain = _interopRequireDefault(require("./chain.js"));
+var _kv = _interopRequireDefault(require("./kv.js"));
 var _api_fake = _interopRequireDefault(require("./api_fake.js"));
 var _realtime_fake = _interopRequireDefault(require("./realtime_fake.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -205,9 +207,9 @@ class Store {
     }
     cleanLocalStorage();
     this.pubsub = new _index.default.Pubsub();
-    this.kv = new _storage.default.kv(new _storage.default.lsdb('sbz2023', this.inmem), 'kv');
-    this.cache = new _storage.default.kv(new _storage.default.lsdb('sbz2023', true), 'kv');
-    this.chain = new _storage.default.chain(new _storage.default.lsdb('cbz2023', true), 'ch');
+    this.kv = new _kv.default(new _lsdb.default('sbz2023', this.inmem), 'kv');
+    this.cache = new _kv.default(new _lsdb.default('sbz2023', true), 'kv');
+    this.chain = new _chain.default(new _lsdb.default('cbz2023', true), 'ch');
     this.getLocaleContent = this.api.getLocaleContent;
     this.g_haveSentSeenM = {};
     this.last_focused = _index.default.Date.now();
@@ -306,13 +308,11 @@ class Store {
   async overrideAcc(acc) {
     this.forceAcc = _index.default.cloneDeep(acc);
     await this.readyGate.entry();
-    this.disconnect('account');
     this.reconnect();
   }
   async overrideChatbox(chatbox) {
     this.forceChatbox = chatbox;
     await this.readyGate.entry();
-    this.disconnect('account');
     await this.reconnect();
     _index.default.setTimeout(this.pubsub.publish('resetCSS'), 10);
   }
@@ -435,9 +435,14 @@ class Store {
       user_mask: mask
     }, xhrsend);
     this.realtime.onEvent(this.onWs.bind(this));
-    this.realtime.onInterrupted(() => this.reconnectWs(accid, user.id));
+    this.realtime.onInterrupted(async () => {
+      await this.reconnectWs(accid, user.id);
+      this.reconnect();
+    });
     this.seenLoop();
-    await this.reconnect();
+    await this.reconnect({
+      user: user
+    });
     this.readyGate.open();
     this.reconnectWs(accid, user.id);
     return user;
@@ -460,7 +465,10 @@ class Store {
       getAccessToken: () => this.api.token_generator()
     });
     this.realtime.onEvent(this.onWs.bind(this));
-    this.realtime.onInterrupted(() => this.reconnectWs(accid, user.id));
+    this.realtime.onInterrupted(async () => {
+      await this.reconnectWs(accid, user.id);
+      this.reconnect();
+    });
     this.seenLoop();
     await this.reconnect();
     this.readyGate.open();
@@ -516,20 +524,20 @@ class Store {
     }, 1000);
   }
   async reconnectWs(accid, userid) {
-    await this.realtime.subscribe([`conversation_state_updated.account.${accid}.user.${userid}`, `conversation_joined.account.${accid}.user.${userid}`, `conversation_typing.account.${accid}.user.${userid}`, `message_sent.account.${accid}.user.${userid}`, `conversation_pending.account.${accid}.user.${userid}`, `user_info_updated.account.${accid}.user.${userid}`, `message_pong.account.${accid}.user.${userid}`, `conversation_rating_requested.account.${accid}.user.${userid}`, `conversation_rated.account.${accid}.user.${userid}`]);
+    await this.realtime.subscribe([`conversation_state_updated.account.${accid}.user.${userid}`, `conversation_joined.account.${accid}.user.${userid}`, `conversation_typing.account.${accid}.user.${userid}`, `message_sent.account.${accid}.user.${userid}`, `message_pong.account.${accid}.user.${userid}`, `conversation_rating_requested.account.${accid}.user.${userid}`, `conversation_rated.account.${accid}.user.${userid}`]);
     await this.readyGate.entry();
-    this.disconnect('account');
-    return this.reconnect();
   }
-  async reconnect() {
+  async reconnect(p) {
     if (this._die) return;
     await this.reconnectGate.entry(undefined, true);
-    if (this.isInsync('account')) return this.reconnectGate.open();
     this.markSync('account');
-    let outs = await Promise.all([this.api.getUser(), this.api.getAccountSetting(), this.api.getIsOnline()]);
+    let fetchuser = p && p.user ? Promise.resolve({
+      body: p.user
+    }) : this.api.getUser();
+    let outs = await Promise.all([fetchuser, this.api.getAccountSetting()]);
     let error = _index.default.find(outs, out => out.error);
     if (error) return console.error(error);
-    let set = Object.assign(outs[1].body, outs[2].body);
+    let set = outs[1].body;
     set.user = outs[0].body;
     await this._setSetting(set);
     let convob = await this.api.listConversations();
@@ -653,6 +661,7 @@ class Store {
     if (!ev || !ev.type) return;
     ev.created = _index.default.getMs(ev.created);
     if (ev.type === 'user_info_updated') {
+      return;
       let user = _index.default.cloneDeep(this.cache.match('user'));
       let attrs = _index.default.get(ev, 'data.user.attributes') || [];
       _index.default.map(attrs, attr => _index.default.setUserAttr(user, attr));
@@ -677,8 +686,6 @@ class Store {
       }
     }
     if (!convo) return;
-    let channel = _index.default.get(ev, 'touchpoint.channel', '');
-    if (channel && channel != 'subiz') return;
     this.pubsub.publish('events', ev);
     if (ev.type === 'conversation_joined') {
       let members = _index.default.get(ev, 'data.conversation.members', []);
@@ -1035,9 +1042,9 @@ class Store {
       if ((k || '').startsWith('__sb')) this.cookie.remove(k);
     });
     this.kv.destroy();
-    this.kv = new _storage.default.kv(new _storage.default.lsdb('sbz2023', this.inmem), 'kv');
+    this.kv = new _kv.default(new _lsdb.default('sbz2023', this.inmem), 'kv');
     this.chain.destroy();
-    this.chain = new _storage.default.chain(new _storage.default.lsdb('cbz2023', true), 'ch');
+    this.chain = new _chain.default(new _lsdb.default('cbz2023', true), 'ch');
   }
   destroy() {
     this._die = true;