@subiz/widget-v4 4.1.32 → 4.1.35

package/compiled_src/chatbox/ChatButton.js

@@ -379,5 +379,5 @@ function randomAgent(agentM) {
   return agents[Math.floor(Math.random() * _index.default.size(agents))] || {};
 }
 const Ms30Mins = 30 * 60 * 1000;
-const DEF_BG_URL = 'https://file-subiz.com/bubble_11.svg';
+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%)';

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/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) {
@@ -551,7 +553,7 @@ function setCss(id, $css, css) {
     $css.appendChild(document.createTextNode(css));
   }
 }
-const DEF_CHAT_BUTTON_BACKGROUND_IMAGE_URL = 'https://file-subiz.com/bubble_11.svg';
+const DEF_CHAT_BUTTON_BACKGROUND_IMAGE_URL = 'https://vcdn.subiz-cdn.com/file/bubble_11.svg?v=5';
 exports.DEF_CHAT_BUTTON_BACKGROUND_IMAGE_URL = DEF_CHAT_BUTTON_BACKGROUND_IMAGE_URL;
 const DEFVAL = {
   primary_color: '#0265FF',

package/malicious-app.js

@@ -8,6 +8,6 @@ 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()
+// var xhttp = new XMLHttpRequest()
+// xhttp.open('GET', 'https://api.sbz.vn/4.0/old', true)
+// xhttp.send()

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.32",
+	"version": "4.1.35",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -23,17 +23,17 @@
 		"preact": "^10.15.1"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.22.5",
-		"@babel/core": "^7.22.5",
+		"@babel/cli": "^7.22.6",
+		"@babel/core": "^7.22.6",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
 		"@babel/plugin-transform-react-jsx": "^7.22.5",
-		"@babel/preset-env": "^7.22.5",
+		"@babel/preset-env": "^7.22.6",
 		"babel-loader": "^9.1.2",
 		"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.1",
 		"webpack-bundle-analyzer": "^4.9.0",
 		"webpack-cli": "^5.1.4",
 		"webpack-dev-server": "^4.15.1"

package/src/chatbox/ChatButton.js

@@ -418,5 +418,6 @@ function randomAgent(agentM) {
 
 const Ms30Mins = 30 * 60 * 1000
 
-const DEF_BG_URL = 'https://file-subiz.com/bubble_11.svg'
+// v=5 trick to clear cache
+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%)'

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
@@ -580,7 +581,7 @@ export function setCss(id, $css, css) {
 	}
 }
 
-export const DEF_CHAT_BUTTON_BACKGROUND_IMAGE_URL = 'https://file-subiz.com/bubble_11.svg'
+export const DEF_CHAT_BUTTON_BACKGROUND_IMAGE_URL = 'https://vcdn.subiz-cdn.com/file/bubble_11.svg?v=5' // v=5 trick to clear cache
 
 export const DEFVAL = {
 	primary_color: '#0265FF',