@subiz/widget-v4 4.1.202 → 4.1.203

package/dist/HASH

@@ -1 +1 @@
-19d8a41ce33
+19df158c2ea

package/dist/screenshoot.js

@@ -4389,12 +4389,31 @@ let trackResponseFn = (param, done) => {
     _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 = util/* default */.A.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`);
-      }
-      return this.apireq.addQuery('url', href).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`);
+      }
+      if (res.error) return res;
+      let plugins = util/* default */.A.get(res, 'body.plugins') || [];
+      util/* default */.A.map(plugins, plugin => {
+        if (plugin.type === 'popup') {
+          let pages = util/* default */.A.get(plugin, 'popup.pages') || [];
+          util/* default */.A.map(pages, page => {
+            util/* default */.A.map(page.components, com => {
+              if (com.type === 'image') {
+                let url = util/* default */.A.get(com, 'image.url');
+                util/* default */.A.set(com, 'image.url', fallbackGCSUrl(url));
+              }
+            });
+          });
+        }
+      });
+      util/* default */.A.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));
@@ -4580,6 +4599,19 @@ let trackResponseFn = (param, done) => {
     });
   }
 });
+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;
+  }
+}
 ;// ./src/store/lsdb.js
 let memlocalStorage = __webpack_require__(450);
 
@@ -6853,21 +6885,8 @@ class ChatButton extends common/* Com */.Mw {
       if (util/* default */.A.get(ev, 'type') !== 'message_sent') return;
       let bytype = util/* default */.A.get(ev, 'by.type');
       if (bytype !== 'system' && bytype !== 'agent' && bytype !== 'bot') return;
-      let isquickreplies = false;
-      util/* default */.A.map(util/* default */.A.get(ev, 'data.message.attachments', []), att => {
-        if (!att) return;
-        if (att.type === 'quick_replies') {
-          isquickreplies = true;
-        }
-      });
-      let format = util/* default */.A.get(ev, 'data.message.format');
-      let block = util/* default */.A.get(ev, 'data.message.block');
-      if (block || format == 'block') {
-        if (util/* default */.A.isBlockEmpty(block) && isquickreplies) return;
-      } else {
-        let message = util/* default */.A.get(ev, 'data.message.text') || '';
-        if (!message && isquickreplies) return;
-      }
+      let message = util/* default */.A.get(ev, 'data.message') || {};
+      if (util/* default */.A.isEmptyMessage(message)) return;
       let screen = util/* default */.A.get(this.props.store.matchLastview(), 'screen');
       let minimized = util/* default */.A.get(this.props.store.matchLastview(), 'minimized');
       if (screen === 'widget') return;
@@ -7226,6 +7245,9 @@ class ChatButton extends common/* Com */.Mw {
     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 = `
@@ -7357,6 +7379,19 @@ 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%)';
+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;
+  }
+}
 ;// ./src/chatbox/PoweredBy.js
 var logo = __webpack_require__(9529);
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.202",
+	"version": "4.1.203",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -11,7 +11,7 @@
 	"dependencies": {
 		"@subiz/ajax": "^3.0.22",
 		"@subiz/flow": "^1.1.0",
-		"@subiz/wsclient": "^4.0.34",
+		"@subiz/wsclient": "^4.0.35",
 		"cookie_js": "1.4.2",
 		"core-js": "^3.49.0",
 		"css-loader": "5.2.7",
@@ -26,14 +26,14 @@
 		"@babel/core": "^7.29.0",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
 		"@babel/plugin-transform-react-jsx": "^7.28.6",
-		"@babel/preset-env": "^7.29.2",
+		"@babel/preset-env": "^7.29.5",
 		"babel-loader": "^10.1.1",
 		"babel-plugin-syntax-jsx": "^6.18.0",
-		"html-webpack-plugin": "^5.6.6",
-		"puppeteer": "^24.40.0",
-		"webpack": "^5.105.4",
-		"webpack-bundle-analyzer": "^5.2.0",
+		"html-webpack-plugin": "^5.6.7",
+		"puppeteer": "^24.43.1",
+		"webpack": "^5.106.2",
+		"webpack-bundle-analyzer": "^5.3.0",
 		"webpack-cli": "^7.0.2",
-		"webpack-dev-server": "^5.2.3"
+		"webpack-dev-server": "^5.2.4"
 	}
 }

package/src/chatbox/ChatButton.js

@@ -27,21 +27,8 @@ export default class ChatButton extends Com {
 			let bytype = sb.get(ev, 'by.type')
 			if (bytype !== 'system' && bytype !== 'agent' && bytype !== 'bot') return
 
-			let isquickreplies = false
-			sb.map(sb.get(ev, 'data.message.attachments', []), (att) => {
-				if (!att) return
-				if (att.type === 'quick_replies') {
-					isquickreplies = true
-				}
-			})
-			let format = sb.get(ev, 'data.message.format')
-			let block = sb.get(ev, 'data.message.block')
-			if (block || format == 'block') {
-				if (sb.isBlockEmpty(block) && isquickreplies) return
-			} else {
-				let message = sb.get(ev, 'data.message.text') || ''
-				if (!message && isquickreplies) return
-			}
+			let message = sb.get(ev, 'data.message') || {}
+			if (sb.isEmptyMessage(message)) return
 			let screen = sb.get(this.props.store.matchLastview(), 'screen')
 			let minimized = sb.get(this.props.store.matchLastview(), 'minimized')
 			if (screen === 'widget') return
@@ -453,6 +440,9 @@ export default class ChatButton extends 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'
@@ -595,3 +585,18 @@ const Ms30Mins = 30 * 60 * 1000
 // 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%)'
+
+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) {
+		// fallback nếu url không hợp lệ hoàn toàn
+		const [base, hash] = url.split('#')
+		const hasQuery = base.includes('?')
+		const newUrl = base + (hasQuery ? '&' : '?') + `v=${version}`
+		return hash ? newUrl + '#' + hash : newUrl
+	}
+}

package/src/chatbox/MessageInput.js

@@ -25,6 +25,7 @@ export default class MessageInput extends Com {
 		this.resizeInput = sb.throttle(function () {
 			// TODO: ctrl+A then press backspace dont reset size rightaway
 			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/src/chatbox/main.js

@@ -17,6 +17,11 @@ export default class Main extends Com {
 		this.refWidget = createRef()
 	}
 
+	state = {
+		cssReady: false,
+		changing: false,
+	}
+
 	refreshCSS() {
 		// make sure you are still alive
 		let plugins = this.props.store.matchPlugin()
@@ -45,10 +50,6 @@ export default class Main extends Com {
 			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))
@@ -60,10 +61,29 @@ export default class Main extends Com {
 			})
 		})
 		this.refreshCSS()
+
+		let lastview = this.props.store.matchLastview() || {}
+		let cid = sb.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 // outdated
+					this.setState({changing: false})
+					if (!convo) return this.showWidget({}) // invalid convo, must redirect
+				})
+			})
+		}
+
 		this.setState({cssReady: true})
 	}
 
 	render() {
+		if (this.state.changing) {
+			if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_changing_ready = sb.Date.now()
+			return null
+		}
 		if (!this.state.cssReady) {
 			if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_css_not_ready = sb.Date.now()
 			return null

package/src/lib.js

@@ -317,6 +317,21 @@ class Widget {
 	getViewingProduct = () => this.store.getLinkedProduct()
 
 	track = (v) => this.store.track(v)
+	event = async (v) => {
+		await this.store.readyGate.entry()
+		return this.store.api.sendEvent(v)
+	}
+	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,
+			},
+		})
+	}
 
 	async setLocale(locale) {
 		await this.domGate.entry()

package/src/store/api.js

@@ -394,12 +394,33 @@ export default class {
 	updateUser = (data) => this.apireq.post(`/accounts/${this.accid}/users/${this.uid}`, data)
 
 	getUser = (_) => this.apireq.get(`/accounts/${this.accid}/users/${this.uid}`)
-	getAccountSetting = (p) => {
+	getAccountSetting = async (p) => {
 		let href = sb.get(document, 'location.href') // send full href, this could be used to select which bot (ai-agent) should be returned
+		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
+
+		// fix image error image url link in popup
+		let plugins = sb.get(res, 'body.plugins') || []
+		sb.map(plugins, (plugin) => {
+			if (plugin.type === 'popup') {
+				let pages = sb.get(plugin, 'popup.pages') || []
+				sb.map(pages, (page) => {
+					sb.map(page.components, (com) => {
+						if (com.type === 'image') {
+							let url = sb.get(com, 'image.url')
+							sb.set(com, 'image.url', fallbackGCSUrl(url))
+						}
+					})
+				})
+			}
+		})
+		sb.set(res, 'body.plugins', plugins)
+		return res
 	}
 
 	sendImpression = (impression) =>
@@ -432,3 +453,20 @@ export default class {
 	suggest_address = (keyword) => this.apireq.setQuery({keyword: keyword}).get(`/accounts/${this.accid}/addresses`)
 	create_ticket = (ticket) => this.apireq.post(`/accounts/${this.accid}/tickets`, ticket)
 }
+
+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
+	}
+}