@subiz/widget-v4 4.1.32 → 4.1.33

package/compiled_src/plugin.js

@@ -32,6 +32,7 @@ function Plugin(plugin, store, $container, lib) {
     if (plugin.type === 'popup' && store.isConverted(plugin.id)) return;
     let lastrun = store.matchLastPluginRun(plugin.id);
     if (plugin.type === 'chatbox' || plugin.type === 'notification') lastrun = undefined;
+    if (!plugin.enabled) return;
     let match = _index.default.checkRunConditions(plugin.initiative_frequency, plugin.conditions, lastrun, store);
     if (!match) return;
     state = 'running';

package/compiled_src/store/api.js

@@ -10,7 +10,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const ajax = require('@subiz/ajax/src/ajax.js');
-ajax.env.XMLHttpRequest = window.XMLHttpRequest;
+ajax.env.XMLHttpRequest = _index.default.XMLHttpRequest;
 function jsonifyTextPlain(param, done) {
   let req = param.request;
   if (req.content_type === 'text/plain' && req.body !== undefined) req.body = _index.default.stringify(req.body);
@@ -41,7 +41,7 @@ class _default {
     _defineProperty(this, "markAsSeen", (cid, messageId) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/messages/${messageId}/seen`));
     _defineProperty(this, "getConversation", cid => this.apireq.get(`/accounts/${this.accid}/conversations/${cid}`));
     _defineProperty(this, "getLocaleContent", locale => this.apireq.get(`/accounts/${this.accid}/locales/${locale}`));
-    _defineProperty(this, "sendEvent", data => this.apireq.post(`/accounts/${this.accid}/users/${this.uid}/events`, data));
+    _defineProperty(this, "sendEvent", data => this.apireq.addQuery('shorten', true).post(`/accounts/${this.accid}/users/${this.uid}/events`, data));
     _defineProperty(this, "sendTyping", cid => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/typing`));
     _defineProperty(this, "sendLostFocus", (device, productid, source_id, sku) => this.sendEvent({
       by: {

package/compiled_src/store/store.js

@@ -367,7 +367,7 @@ class Store {
       account_id: accid,
       user_ref: userRef,
       user_mask: mask
-    });
+    }, xhrsend);
     this.realtime.onEvent(this.onWs.bind(this));
     this.realtime.onInterrupted(() => this.reconnectWs(accid, user.id));
     this.seenLoop();
@@ -1080,4 +1080,29 @@ let cleanMyLocalStorage = () => {
       }
     }
   });
+};
+function dofetch(method, url, body, cb) {
+  let headers = {};
+  if (body) headers['content-type'] = 'text/plain';
+  fetch(url, {
+    method: method,
+    headers: headers,
+    body: body
+  }).then(res => res.text().then(text => cb && cb(text, res.status))).catch(err => cb && cb(err, -1));
+}
+var xhrsend = function (method, url, body, cb) {
+  if (typeof _index.default.XMLHttpRequest === 'undefined') return dofetch(method, url, body, cb);
+  var request = new _index.default.XMLHttpRequest();
+  request.onreadystatechange = function (e) {
+    if (request.readyState !== 4) return;
+    cb && cb(request.responseText, request.status);
+    cb = undefined;
+  };
+  request.onerror = function () {
+    cb && cb(request.responseText, -1);
+    cb = undefined;
+  };
+  request.open(method, url);
+  if (body) request.setRequestHeader('content-type', 'text/plain');
+  request.send(body);
 };

package/compiled_src/util/campaign.js

@@ -37,9 +37,7 @@ function trackAreaClicked(selector, cb) {
     on('click', selector, cb);
   });
 }
-function trackInactivity() {
-  let seconds = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-  let cb = arguments.length > 1 ? arguments[1] : undefined;
+function trackInactivity(seconds = 0, cb) {
   let events = ['scroll', 'keyup', 'keydown', 'mousemove', 'mousewheel', 'mouseenter', 'mouseover', 'mousedown', 'touchstart', 'touchmove', 'touchenter'];
   let inactiveSeconds = 0;
   let resetTime = () => {
@@ -62,9 +60,7 @@ let timeOnPage = 0;
 common.setInterval(() => {
   timeOnPage += 5;
 }, 5000);
-function trackTimeOnPage() {
-  let seconds = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-  let cb = arguments.length > 1 ? arguments[1] : undefined;
+function trackTimeOnPage(seconds = 0, cb) {
   if (seconds < 1) {
     return common.setTimeout(function () {
       cb(seconds);

package/compiled_src/util/common.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Date = exports.DEF_CHAT_BUTTON_BACKGROUND_IMAGE_URL = exports.DEFVAL = void 0;
+exports.XMLHttpRequest = exports.Date = exports.DEF_CHAT_BUTTON_BACKGROUND_IMAGE_URL = exports.DEFVAL = void 0;
 exports.agentsOfConvo = agentsOfConvo;
 exports.checkRunConditions = checkRunConditions;
 exports.clearTimeout = exports.clearInterval = void 0;
@@ -90,6 +90,8 @@ var clearInterval = f.contentWindow.clearInterval.bind(f.contentWindow);
 exports.clearInterval = clearInterval;
 var clearTimeout = f.contentWindow.clearTimeout.bind(f.contentWindow);
 exports.clearTimeout = clearTimeout;
+var XMLHttpRequest = f.contentWindow.XMLHttpRequest;
+exports.XMLHttpRequest = XMLHttpRequest;
 function convoOfEv(ev) {
   if (!ev) return '';
   switch (ev.type) {
@@ -157,10 +159,7 @@ function getMsgField(ev, fieldName) {
 function isObject(item) {
   return item && typeof item === 'object' && !Array.isArray(item);
 }
-function merge(target) {
-  for (var _len = arguments.length, sources = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    sources[_key - 1] = arguments[_key];
-  }
+function merge(target, ...sources) {
   if (!sources.length) return target;
   const source = sources.shift();
   if (isObject(target) && isObject(source)) {
@@ -959,8 +958,7 @@ function getUrlParameter() {
 }
 var sleep = ms => new Promise(res => setTimeout(res, ms));
 exports.sleep = sleep;
-function formatCurrency(val) {
-  let currency = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'VND';
+function formatCurrency(val, currency = 'VND') {
   let currencyObj = ALL_CURRENCIES.find(cur => cur.code === currency) || {
     name: 'Dong',
     code: 'VND',

package/compiled_src/util/order.js

@@ -14,8 +14,7 @@ op.map = common.map;
 op.each = common.each;
 op.size = common.size;
 op.find = common.find;
-function getProductPropName(product) {
-  let seperator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ' - ';
+function getProductPropName(product, seperator = ' - ') {
   let options = op.get(product, 'options', []);
   let props = op.get(product, 'props', []);
   let multiPropsOptions = op.filter(options, option => op.size(option.values) > 1);
@@ -26,8 +25,7 @@ function getProductPropName(product) {
   });
   return names.join(seperator);
 }
-function getOrderDisplayName() {
-  let order = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+function getOrderDisplayName(order = {}) {
   return order.number || order.id || '';
 }
 function displayOrderShippingAddress(order, isShorten) {

package/compiled_src/util/pubsub.js

@@ -14,12 +14,9 @@ class Pubsub {
   }
   publish(topic, payload, payload2, payload3) {
     this.listeners[topic] = filter(this.listeners[topic], sub => sub.obj._isMounted);
-    map(this.listeners[topic], _ref => {
-      let {
-        cb
-      } = _ref;
-      return cb(payload, payload2, payload3);
-    });
+    map(this.listeners[topic], ({
+      cb
+    }) => cb(payload, payload2, payload3));
   }
   on2(obj, topic, cb) {
     if (!this.listeners[topic]) this.listeners[topic] = [];

package/dist/HASH

@@ -0,0 +1 @@
+188ffa9633f

package/dist/malicious-app.js

@@ -0,0 +1,13 @@
+let hash = 'XXXXXXXX' // do not change, will be replaced to real hash
+
+window._subiz_init_2094850928430 = true
+window._subiz_init_2094850928430_keep_loading = true
+var tag = document.createElement('script')
+tag.async = 1
+tag.src = 'https://public-gcs.subiz-cdn.com/widget-v4/public/' + hash + '.app.js'
+document.body.appendChild(tag)
+
+// record which domain still use old code
+var xhttp = new XMLHttpRequest()
+xhttp.open('GET', 'https://api.sbz.vn/4.0/old', true)
+xhttp.send()

package/dist/screenshoot.js

@@ -1373,6 +1373,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   DEFVAL: () => (/* binding */ DEFVAL),
 /* harmony export */   DEF_CHAT_BUTTON_BACKGROUND_IMAGE_URL: () => (/* binding */ DEF_CHAT_BUTTON_BACKGROUND_IMAGE_URL),
 /* harmony export */   Date: () => (/* binding */ Date),
+/* harmony export */   XMLHttpRequest: () => (/* binding */ XMLHttpRequest),
 /* harmony export */   agentsOfConvo: () => (/* binding */ agentsOfConvo),
 /* harmony export */   checkRunConditions: () => (/* binding */ checkRunConditions),
 /* harmony export */   clearInterval: () => (/* binding */ clearInterval),
@@ -1454,6 +1455,7 @@ var setTimeout = f.contentWindow.setTimeout.bind(f.contentWindow);
 var setInterval = f.contentWindow.setInterval.bind(f.contentWindow);
 var clearInterval = f.contentWindow.clearInterval.bind(f.contentWindow);
 var clearTimeout = f.contentWindow.clearTimeout.bind(f.contentWindow);
+var XMLHttpRequest = f.contentWindow.XMLHttpRequest;
 function convoOfEv(ev) {
   if (!ev) return '';
   switch (ev.type) {
@@ -4038,7 +4040,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 
 const ajax = __webpack_require__(7460);
-ajax.env.XMLHttpRequest = window.XMLHttpRequest;
+ajax.env.XMLHttpRequest = util/* default */.Z.XMLHttpRequest;
 function jsonifyTextPlain(param, done) {
   let req = param.request;
   if (req.content_type === 'text/plain' && req.body !== undefined) req.body = util/* default */.Z.stringify(req.body);
@@ -4069,7 +4071,7 @@ function jsonifyTextPlain(param, done) {
     _defineProperty(this, "markAsSeen", (cid, messageId) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/messages/${messageId}/seen`));
     _defineProperty(this, "getConversation", cid => this.apireq.get(`/accounts/${this.accid}/conversations/${cid}`));
     _defineProperty(this, "getLocaleContent", locale => this.apireq.get(`/accounts/${this.accid}/locales/${locale}`));
-    _defineProperty(this, "sendEvent", data => this.apireq.post(`/accounts/${this.accid}/users/${this.uid}/events`, data));
+    _defineProperty(this, "sendEvent", data => this.apireq.addQuery('shorten', true).post(`/accounts/${this.accid}/users/${this.uid}/events`, data));
     _defineProperty(this, "sendTyping", cid => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/typing`));
     _defineProperty(this, "sendLostFocus", (device, productid, source_id, sku) => this.sendEvent({
       by: {
@@ -5079,7 +5081,7 @@ class Store {
       account_id: accid,
       user_ref: userRef,
       user_mask: mask
-    });
+    }, xhrsend);
     this.realtime.onEvent(this.onWs.bind(this));
     this.realtime.onInterrupted(() => this.reconnectWs(accid, user.id));
     this.seenLoop();
@@ -5792,6 +5794,31 @@ let cleanMyLocalStorage = () => {
     }
   });
 };
+function dofetch(method, url, body, cb) {
+  let headers = {};
+  if (body) headers['content-type'] = 'text/plain';
+  fetch(url, {
+    method: method,
+    headers: headers,
+    body: body
+  }).then(res => res.text().then(text => cb && cb(text, res.status))).catch(err => cb && cb(err, -1));
+}
+var xhrsend = function (method, url, body, cb) {
+  if (typeof util/* default */.Z.XMLHttpRequest === 'undefined') return dofetch(method, url, body, cb);
+  var request = new util/* default */.Z.XMLHttpRequest();
+  request.onreadystatechange = function (e) {
+    if (request.readyState !== 4) return;
+    cb && cb(request.responseText, request.status);
+    cb = undefined;
+  };
+  request.onerror = function () {
+    cb && cb(request.responseText, -1);
+    cb = undefined;
+  };
+  request.open(method, url);
+  if (body) request.setRequestHeader('content-type', 'text/plain');
+  request.send(body);
+};
 // EXTERNAL MODULE: ./src/common.js
 var common = __webpack_require__(2493);
 // EXTERNAL MODULE: ./node_modules/preact/dist/preact.module.js

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.32",
+	"version": "4.1.33",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -32,8 +32,8 @@
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.3",
 		"prettier": "^2.8.8",
-		"puppeteer": "^20.7.2",
-		"webpack": "^5.87.0",
+		"puppeteer": "^20.7.3",
+		"webpack": "^5.88.0",
 		"webpack-bundle-analyzer": "^4.9.0",
 		"webpack-cli": "^5.1.4",
 		"webpack-dev-server": "^4.15.1"

package/src/store/api.js

@@ -1,6 +1,6 @@
 import sb from '../util/index.js'
 const ajax = require('@subiz/ajax/src/ajax.js')
-ajax.env.XMLHttpRequest = window.XMLHttpRequest
+ajax.env.XMLHttpRequest = sb.XMLHttpRequest
 
 function jsonifyTextPlain(param, done) {
 	let req = param.request
@@ -216,7 +216,8 @@ export default class {
 
 	getConversation = (cid) => this.apireq.get(`/accounts/${this.accid}/conversations/${cid}`)
 	getLocaleContent = (locale) => this.apireq.get(`/accounts/${this.accid}/locales/${locale}`)
-	sendEvent = (data) => this.apireq.post(`/accounts/${this.accid}/users/${this.uid}/events`, data)
+	sendEvent = (data) =>
+		this.apireq.addQuery('shorten', true).post(`/accounts/${this.accid}/users/${this.uid}/events`, data)
 	sendTyping = (cid) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/typing`)
 
 	sendLostFocus = (device, productid, source_id, sku) =>

package/src/store/store.js

@@ -420,7 +420,8 @@ export default class Store {
 
 		if (this.realtime) this.realtime.stop()
 		if (this.fake) this.realtime = new RealtimeFake()
-		else this.realtime = new Realtime(this.RealtimeURL, {account_id: accid, user_ref: userRef, user_mask: mask})
+		else
+			this.realtime = new Realtime(this.RealtimeURL, {account_id: accid, user_ref: userRef, user_mask: mask}, xhrsend)
 
 		this.realtime.onEvent(this.onWs.bind(this))
 		this.realtime.onInterrupted(() => this.reconnectWs(accid, user.id))
@@ -654,7 +655,7 @@ export default class Store {
 
 	// send the content view, the first presence and record domain
 	async track() {
-		let out = await this.api.sendContentView(
+			let out = await this.api.sendContentView(
 			this.device,
 			location.href,
 			document.title,
@@ -1302,3 +1303,31 @@ let cleanMyLocalStorage = () => {
 		}
 	})
 }
+
+function dofetch(method, url, body, cb) {
+	let headers = {}
+	if (body) headers['content-type'] = 'text/plain'
+	fetch(url, {method: method, headers: headers, body: body})
+		.then((res) => res.text().then((text) => cb && cb(text, res.status)))
+		.catch((err) => cb && cb(err, -1))
+}
+
+// xhrsend sends an HTTP request
+var xhrsend = function (method, url, body, cb) {
+	if (typeof sb.XMLHttpRequest === 'undefined') return dofetch(method, url, body, cb)
+	var request = new sb.XMLHttpRequest()
+	request.onreadystatechange = function (e) {
+		if (request.readyState !== 4) return
+		cb && cb(request.responseText, request.status)
+		cb = undefined // dont call cb anymore
+	}
+
+	request.onerror = function () {
+		cb && cb(request.responseText, -1) // network error
+		cb = undefined // dont call cb anymore
+	}
+
+	request.open(method, url)
+	if (body) request.setRequestHeader('content-type', 'text/plain')
+	request.send(body)
+}

package/src/util/common.js

@@ -18,6 +18,7 @@ export var setTimeout = f.contentWindow.setTimeout.bind(f.contentWindow)
 export var setInterval = f.contentWindow.setInterval.bind(f.contentWindow)
 export var clearInterval = f.contentWindow.clearInterval.bind(f.contentWindow)
 export var clearTimeout = f.contentWindow.clearTimeout.bind(f.contentWindow)
+export var XMLHttpRequest = f.contentWindow.XMLHttpRequest
 
 // convoOfEv extracts the ID of the conversation
 // that event is sent to