@subiz/widget-v4 4.1.170 → 4.1.173

package/chat.js

@@ -27,9 +27,13 @@ function runChatbox(subiz) {
 
 async function run() {
 	let accid = getUrlParameter('id') || getUrlParameter('acc_id') || getUrlParameter('account_id')
+	let botid = getUrlParameter('bot-id')
 
 	let subiz = new ApiV4(config.ApiURL, config.FileURL, config.RealtimeURL, true, false)
 	window.subiz = subiz
+	if (botid) {
+		await subiz.overrideBotId(botid)
+	}
 	subiz._overrideDeviceType('mobile')
 	if (window.innerWidth > 760) {
 		// table or wider screen
@@ -42,8 +46,21 @@ async function run() {
 		document.querySelector('#result_text').textContent = `ERROR: ${res.error} with account id "${accid}"`
 		return
 	}
-	setTimeout(() => {
+	setTimeout(async () => {
 		subiz.showWidget()
+		if (botid) {
+			let botM = subiz.store.matchBot() || {}
+			let bot = botM[botid] || {}
+			console.log('matchbottt', botM)
+			subiz.startConvo({
+				state: 'active',
+				locale: 'vi-VN',
+				is_testing: true,
+				bot_version: bot.version,
+				bot_id: botid,
+				welcome_message: bot.welcome_message,
+			})
+		}
 	}, 1)
 }
 

package/compiled_src/chatbox/ChatButton.js

@@ -252,6 +252,7 @@ class ChatButton extends _common.Com {
     this._buttonLoaded = true;
   }
   renderButton() {
+    if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_button = _index.default.Date.now();
     let accountSetting = this.props.plugin.chatbox;
     accountSetting = this.fixMissingSetting(accountSetting);
     let imgsrc = _index.default.get(accountSetting, 'desktop_button.background_image_url') || _index.default.get(accountSetting, 'desktop_button.background_mask_url') || defaultBubble;

package/compiled_src/chatbox/main.js

@@ -68,9 +68,19 @@ class Main extends _common.Com {
     }
   }
   render() {
-    if (!this.state.cssready) return null;
-    if (_index.default.isUserBanned(this.props.store.matchUser())) return null;
-    if (!this.props.t) return null;
+    if (!this.state.cssready) {
+      if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_css_not_ready = _index.default.Date.now();
+      return null;
+    }
+    if (_index.default.isUserBanned(this.props.store.matchUser())) {
+      if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_user_is_banned = _index.default.Date.now();
+      return null;
+    }
+    if (!this.props.t) {
+      if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_no_t = _index.default.Date.now();
+      return null;
+    }
+    if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_main = _index.default.Date.now();
     return (0, _preact.h)("div", {
       class: this.props.store.isMobile() ? 'mobile' : 'desktop'
     }, (0, _preact.h)(_ChatButton.default, {

package/compiled_src/lib.js

@@ -69,6 +69,9 @@ class Widget {
   logout(userref) {
     return this.store.logout(userref);
   }
+  overrideBotId(botid) {
+    this.store.overrideBotId(botid);
+  }
   async init(param, $container) {
     param = param || {};
     let accid = param.account_id;

package/compiled_src/plugin.js

@@ -225,6 +225,7 @@ class PluginMgr {
       });
     });
     let pluginM = this.lib.store.matchPlugin();
+    if (typeof sbz_info != 'undefined') sbz_info['plugins'] = pluginM;
     let foundchatbox = false;
     _index.default.each(pluginM, conf => {
       if (conf.type === 'chatbox') {

package/compiled_src/store/api.js

@@ -145,8 +145,11 @@ class _default {
     _defineProperty(this, "time", _ => ajax.setBaseUrl(this.ApiURL).withCredentials(true).setParser('json').get('/time'));
     _defineProperty(this, "updateUser", data => this.apireq.post(`/accounts/${this.accid}/users/${this.uid}`, data));
     _defineProperty(this, "getUser", _ => this.apireq.get(`/accounts/${this.accid}/users/${this.uid}`));
-    _defineProperty(this, "getAccountSetting", () => {
+    _defineProperty(this, "getAccountSetting", p => {
       let href = _index.default.get(document, 'location.href');
+      if (p && p.bot_id) {
+        return this.apireq.addQuery('url', href).addQuery('bot_id', p.bot_id).get(`/accounts/${this.accid}/settings`);
+      }
       return this.apireq.addQuery('url', href).get(`/accounts/${this.accid}/settings`);
     });
     _defineProperty(this, "sendImpression", impression => this.apireq.post(`/accounts/${this.accid}/campaigns/${impression.campaign_id}/impressions`, impression));

package/compiled_src/store/store.js

@@ -355,6 +355,10 @@ class Store {
     await this.readyGate.entry();
     this.reconnect();
   }
+  async overrideBotId(botid) {
+    this.forceBotId = botid;
+    await this.readyGate.entry();
+  }
   async overrideChatbox(chatbox) {
     this.forceChatbox = chatbox;
     await this.readyGate.entry();
@@ -599,7 +603,9 @@ class Store {
     let fetchuser = p && p.user ? Promise.resolve({
       body: p.user
     }) : this.api.getUser();
-    let outs = await Promise.all([fetchuser, this.api.getAccountSetting()]);
+    let outs = await Promise.all([fetchuser, this.api.getAccountSetting({
+      bot_id: this.forceBotId
+    })]);
     let error = _index.default.find(outs, out => out.error);
     if (error) return console.error(error);
     let set = outs[1].body;
@@ -833,17 +839,17 @@ class Store {
       this.chain.put(cid, oldev.id, _index.default.getMs(oldev.created), oldev);
       this.pubsub.publish('events', oldev);
     }
-    if (ev.type === 'message_sent') {
-      let idemkey = _index.default.get(ev, 'data.message.idempotency_key');
-      let found = _index.default.find(this.listEvents(cid), oldev => oldev.id === idemkey);
-      if (found) {
-        this.chain.del(cid, found.id);
-        ev.created = found.created;
-      }
-      convo.last_message_sent = ev;
-    }
     if (ev.type !== 'message_pong' && ev.type !== 'conversation_typing') {
       this.chain.put(cid, ev.id, _index.default.getMs(ev.created), ev);
+      if (ev.type === 'message_sent') {
+        let idemkey = _index.default.get(ev, 'data.message.idempotency_key');
+        let found = _index.default.find(this.listEvents(cid), oldev => oldev.id === idemkey);
+        if (found) {
+          this.chain.del(cid, found.id);
+          ev.created = found.created;
+        }
+        convo.last_message_sent = ev;
+      }
     }
     this._setConvo(convo);
     this.pubsub.publish('account');
@@ -1172,6 +1178,7 @@ class Store {
     src = src.replace('http://file.subiz.com/', this.FileURL);
     src = src.replace('https://file.mysubiz.com/', this.FileURL);
     src = src.replace('http://file.mysubiz.com/', this.FileURL);
+    return src;
     return src.replace('vcdn.subiz-cdn.com', 'cdn.subiz.net');
   }
   clearBrowserData() {

package/compiled_src/util/common.js

@@ -285,7 +285,7 @@ XMLHttpRequest.prototype.send = function (body) {
         response: this.responseText
       });
     }
-    old(a, b, c);
+    if (typeof old == 'function') old(a, b, c);
   };
   return _originalSend.apply(this, arguments);
 };