@subiz/widget-v4 4.1.202 → 4.1.204

package/compiled_src/chatbox/ChatButton.js

@@ -28,21 +28,8 @@ class ChatButton extends _common.Com {
       if (_index.default.get(ev, 'type') !== 'message_sent') return;
       let bytype = _index.default.get(ev, 'by.type');
       if (bytype !== 'system' && bytype !== 'agent' && bytype !== 'bot') return;
-      let isquickreplies = false;
-      _index.default.map(_index.default.get(ev, 'data.message.attachments', []), att => {
-        if (!att) return;
-        if (att.type === 'quick_replies') {
-          isquickreplies = true;
-        }
-      });
-      let format = _index.default.get(ev, 'data.message.format');
-      let block = _index.default.get(ev, 'data.message.block');
-      if (block || format == 'block') {
-        if (_index.default.isBlockEmpty(block) && isquickreplies) return;
-      } else {
-        let message = _index.default.get(ev, 'data.message.text') || '';
-        if (!message && isquickreplies) return;
-      }
+      let message = _index.default.get(ev, 'data.message') || {};
+      if (_index.default.isEmptyMessage(message)) return;
       let screen = _index.default.get(this.props.store.matchLastview(), 'screen');
       let minimized = _index.default.get(this.props.store.matchLastview(), 'minimized');
       if (screen === 'widget') return;
@@ -401,6 +388,9 @@ class ChatButton extends _common.Com {
     imgurl = this.props.store.replaceFileUrl(imgurl);
     imgsrc = this.props.store.replaceFileUrl(imgsrc);
     maskurl = this.props.store.replaceFileUrl(maskurl);
+    imgurl = addVersionParam(imgurl);
+    imgsrc = addVersionParam(imgsrc);
+    maskurl = addVersionParam(maskurl);
     if (!imgurl && !maskurl) {
       whitebgcls += ' chat-button--white-bg--mask-only';
       imgcontainerstyle = `
@@ -532,4 +522,17 @@ function randomAgent(agentM) {
 }
 const Ms30Mins = 30 * 60 * 1000;
 const DEF_BG_URL = 'https://vcdn.subiz-cdn.com/file/bubble_11.svg?v=5';
-const DEF_BG = 'linear-gradient(280.16deg, #0053d3 22.03%, #0265ff 78.2%)';
+const DEF_BG = 'linear-gradient(280.16deg, #0053d3 22.03%, #0265ff 78.2%)';
+function addVersionParam(url, version = 8) {
+  if (!url) return url;
+  try {
+    const u = new URL(url);
+    u.searchParams.set('v', version);
+    return u.toString();
+  } catch (e) {
+    const [base, hash] = url.split('#');
+    const hasQuery = base.includes('?');
+    const newUrl = base + (hasQuery ? '&' : '?') + `v=${version}`;
+    return hash ? newUrl + '#' + hash : newUrl;
+  }
+}

package/compiled_src/chatbox/MessageInput.js

@@ -33,6 +33,7 @@ class MessageInput extends _common.Com {
     }, 500);
     this.resizeInput = _index.default.throttle(function () {
       const input = this.refMessageInput.current;
+      if (!input) return;
       input.style.setProperty('height', '1em', 'important');
       const height = Math.min(200, input.scrollHeight);
       input.style.setProperty('height', `${height}px`, 'important');

package/compiled_src/chatbox/main.js

@@ -11,9 +11,16 @@ var _common = require("../common.js");
 var _preact = require("preact");
 var _css = _interopRequireDefault(require("./css.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 class Main extends _common.Com {
   constructor(props) {
     super(props);
+    _defineProperty(this, "state", {
+      cssReady: false,
+      changing: false
+    });
     this.refButton = (0, _preact.createRef)();
     this.refWidget = (0, _preact.createRef)();
   }
@@ -41,9 +48,6 @@ class Main extends _common.Com {
       this.$cssStyleDiv.type = 'text/css';
       this.$cssStyleDiv.id = 'subiz-style-for-' + this.props.plugin.id;
     }
-    this.setState({
-      cssReady: false
-    });
     this.checkExpand();
     this.props.store.onResetCSS(this, () => this.refreshCSS());
     this.props.store.onConvoEvent(this, ev => this.onConvoEvent(ev));
@@ -55,11 +59,32 @@ class Main extends _common.Com {
       });
     });
     this.refreshCSS();
+    let lastview = this.props.store.matchLastview() || {};
+    let cid = _index.default.get(lastview, 'opts.cid');
+    if (cid) {
+      this._last_cid = cid;
+      this.setState({
+        changing: true
+      }, () => {
+        this.props.store.fetchConvo(cid).then(() => {
+          let convo = this.props.store.matchConvo(cid);
+          if (cid != this._last_cid) return;
+          this.setState({
+            changing: false
+          });
+          if (!convo) return this.showWidget({});
+        });
+      });
+    }
     this.setState({
       cssReady: true
     });
   }
   render() {
+    if (this.state.changing) {
+      if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_changing_ready = _index.default.Date.now();
+      return null;
+    }
     if (!this.state.cssReady) {
       if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_css_not_ready = _index.default.Date.now();
       return null;

package/compiled_src/lib.js

@@ -21,6 +21,11 @@ class Widget {
     _defineProperty(this, "setViewingProduct", p => this.store.linkProduct(p));
     _defineProperty(this, "getViewingProduct", () => this.store.getLinkedProduct());
     _defineProperty(this, "track", v => this.store.track(v));
+    _defineProperty(this, "event", async (type, payload, options) => {
+      await this.store.readyGate.entry();
+      return this.store.api.sendEvent(normalizeCdpEvent(type, payload, options));
+    });
+    _defineProperty(this, "pageview", v => this.store.sendPageview(v));
     this.impressionTokens = {};
     this.domGate = new _index.default.Gate();
     this.store = new _store.default(ApiURL, FileURL, RealtimeURL, inmem, fake);
@@ -364,5 +369,14 @@ class Widget {
     this.store.doNotStartBot();
   }
 }
+function normalizeCdpEvent(type, payload, options) {
+  if (type && typeof type === 'object') return type;
+  let data = {
+    type: type
+  };
+  if (payload !== undefined) data.payload = payload;
+  if (options && typeof options === 'object') data = Object.assign({}, options, data);
+  return data;
+}
 window.__sbz_WIDGET = Widget;
 var _default = exports.default = Widget;

package/compiled_src/store/api.js

@@ -170,12 +170,31 @@ 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", p => {
+    _defineProperty(this, "getAccountSetting", async p => {
       let href = _index.default.get(document, 'location.href');
+      let res = {};
       if (p && p.bot_id) {
-        return this.apireq.addQuery('url', href).addQuery('bot_id', p.bot_id).get(`/accounts/${this.accid}/settings`);
+        res = await this.apireq.addQuery('url', href).addQuery('bot_id', p.bot_id).get(`/accounts/${this.accid}/settings`);
+      } else {
+        res = await this.apireq.addQuery('url', href).get(`/accounts/${this.accid}/settings`);
       }
-      return this.apireq.addQuery('url', href).get(`/accounts/${this.accid}/settings`);
+      if (res.error) return res;
+      let plugins = _index.default.get(res, 'body.plugins') || [];
+      _index.default.map(plugins, plugin => {
+        if (plugin.type === 'popup') {
+          let pages = _index.default.get(plugin, 'popup.pages') || [];
+          _index.default.map(pages, page => {
+            _index.default.map(page.components, com => {
+              if (com.type === 'image') {
+                let url = _index.default.get(com, 'image.url');
+                _index.default.set(com, 'image.url', fallbackGCSUrl(url));
+              }
+            });
+          });
+        }
+      });
+      _index.default.set(res, 'body.plugins', plugins);
+      return res;
     });
     _defineProperty(this, "sendImpression", impression => this.apireq.post(`/accounts/${this.accid}/campaigns/${impression.campaign_id}/impressions`, impression));
     _defineProperty(this, "sendConversion", conversion => this.apireq.post(`/accounts/${this.accid}/campaigns/${conversion.campaign_id}/conversions`, conversion));
@@ -361,4 +380,17 @@ class _default {
     });
   }
 }
-exports.default = _default;
+exports.default = _default;
+function fallbackGCSUrl(url) {
+  try {
+    const u = new URL(url);
+    const isGCS = u.hostname === 'storage.googleapis.com';
+    const isSubizBucket = u.pathname.startsWith('/public-gcs.subiz-cdn.com/');
+    if (isGCS && isSubizBucket) {
+      return `https://${u.pathname.slice(1)}`;
+    }
+    return url;
+  } catch (e) {
+    return url;
+  }
+}

package/compiled_src/store/store.js

@@ -176,14 +176,14 @@ class Store {
     _defineProperty(this, "checkFormToken", (accid, token) => this.api.checkFormToken(accid, token));
     _defineProperty(this, "submitForm2", (accid, token, data) => this.api.submitForm2(accid, token, data));
     _defineProperty(this, "sendPresence", _index.default.throttle(async () => {
+      if (!this._track_page_view) return;
       if (this._die) return dieErr;
       await this.readyGate.entry();
       if (!_index.default.get(this.cache.match('user'), 'id')) return;
       if (_index.default.isUserBanned(this.cache.match('user'))) return;
-      if (!this._track_page_view) return;
       let hasfocus = this.browserVisibility === 'visible' && document.hasFocus();
       if (!hasfocus) return this.api.sendLostFocus();
-      this.api.sendContentView(this.device, location.href, document.title, this._currentViewingProduct.id, this._currentViewingProduct.source_id, this._currentViewingProduct.sku);
+      this.sendPageview();
     }, 1000, {
       leading: false
     }));
@@ -277,6 +277,13 @@ class Store {
       this.sendPresence();
     });
     window.addEventListener('beforeunload', () => this.api.sendLostFocus());
+    this._lastPresenceURL = window.location.href;
+    this._urlCheckInterval = _index.default.setInterval(() => {
+      if (this._die) return _index.default.clearInterval(this._urlCheckInterval);
+      if (this._lastPresenceURL === window.location.href) return;
+      this._lastPresenceURL = window.location.href;
+      this.sendPresence();
+    }, 2_000);
     this.doNotStartBot = () => {
       this._donotstartbot = true;
     };
@@ -798,12 +805,20 @@ class Store {
     this.cache.put('payment_methods', pms);
     this.pubsub.publish('account');
   }
+  async sendPageview(p) {
+    if (!p) p = {};
+    let device = Object.assign({}, this.device);
+    if (p.referrer) device.source_referrer = p.referrer;
+    device.page_url = p.url || location.href;
+    device.page_title = p.title || document.title;
+    return this.api.sendContentView(device, p.url || location.href, p.title || document.title, this._currentViewingProduct.id, this._currentViewingProduct.source_id, this._currentViewingProduct.sku);
+  }
   async track(e) {
     if (!e) {
-      let out = await this.api.sendContentView(this.device, location.href, document.title, this._currentViewingProduct.id, this._currentViewingProduct.source_id, this._currentViewingProduct.sku);
+      let out = await this.sendPageview();
       let traffic_source = _index.default.get(out, 'body.by.device.source', '');
       if (traffic_source) this.kv.put('traffic_source', traffic_source);
-      return;
+      return out;
     }
     if (typeof e === 'object') {
       if (!e.data) e.data = {};
@@ -1306,6 +1321,7 @@ class Store {
     this._die = true;
     this.clearBrowserData();
     _index.default.clearInterval(this._seenInterval);
+    _index.default.clearInterval(this._urlCheckInterval);
     if (this.realtime) this.realtime.stop();
     this.readyGate.close();
     window.removeEventListener('blur', this.sendPresence);

package/compiled_src/util/event.test.js

@@ -0,0 +1,38 @@
+"use strict";
+
+var test = require('tape');
+var {
+  normalizeCdpEvent
+} = require('./event.js');
+test('normalize cdp event new signature', t => {
+  t.deepEqual(normalizeCdpEvent('content_viewed', {
+    url: 'https://example.com/products/pd2345',
+    title: 'Bàn phím cơ không dây'
+  }, {
+    event_source_id: 'evt_1234'
+  }), {
+    type: 'content_viewed',
+    payload: {
+      url: 'https://example.com/products/pd2345',
+      title: 'Bàn phím cơ không dây'
+    },
+    event_source_id: 'evt_1234'
+  });
+  t.end();
+});
+test('normalize cdp event without payload', t => {
+  t.deepEqual(normalizeCdpEvent('login'), {
+    type: 'login'
+  });
+  t.end();
+});
+test('normalize cdp event keeps old object signature', t => {
+  let event = {
+    type: 'product_viewed',
+    payload: {
+      id: 'pd2345'
+    }
+  };
+  t.equal(normalizeCdpEvent(event), event);
+  t.end();
+});