@subiz/widget-v4 4.1.203 → 4.1.204

package/compiled_src/lib.js

@@ -21,21 +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 v => {
+    _defineProperty(this, "event", async (type, payload, options) => {
       await this.store.readyGate.entry();
-      return this.store.api.sendEvent(v);
-    });
-    _defineProperty(this, "pageview", v => {
-      v = v || {};
-      return this.event({
-        type: 'content_viewed',
-        payload: {
-          url: v.url || location.href,
-          title: v.title || document.title,
-          referrer: v.referrer || document.referrer
-        }
-      });
+      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);
@@ -379,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/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();
+});