@subiz/widget-v4 4.1.199 → 4.1.201

package/examples/track.js

@@ -0,0 +1,41 @@
+// place order
+subiz('track', {
+	type: 'order_created',
+	data: {
+		order: {
+			items: [
+				{
+					name: 'box for a cat',
+					sku: '45350835',
+					quantity: 1,
+				},
+			],
+			currency: 'VND',
+			total: 100000,
+		},
+	},
+})
+
+// created item
+subiz('track', {
+	type: 'item_created',
+	custom_data: {
+		name: {
+			type: 'string',
+			string: 'cat box',
+		},
+		url: {
+			type: 'url',
+			url: 'https://example.com',
+		},
+	},
+})
+
+// created item
+subiz('track', {
+	type: 'item_created',
+	custom_data: {
+		name: 'cat box',
+		url: 'https://example.com',
+	},
+})

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.199",
+	"version": "4.1.201",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -13,26 +13,27 @@
 		"@subiz/flow": "^1.1.0",
 		"@subiz/wsclient": "^4.0.34",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.48.0",
+		"core-js": "^3.49.0",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
-		"less": "^4.5.1",
-		"less-loader": "^12.3.0",
+		"less": "^4.6.4",
+		"less-loader": "^12.3.2",
 		"preact": "10.19.3"
 	},
 	"devDependencies": {
+		"tape": "^5.9.0",
 		"@babel/cli": "^7.28.6",
 		"@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.0",
-		"babel-loader": "^10.0.0",
+		"@babel/preset-env": "^7.29.2",
+		"babel-loader": "^10.1.1",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.6.6",
-		"puppeteer": "^24.37.0",
-		"webpack": "^5.105.0",
+		"puppeteer": "^24.40.0",
+		"webpack": "^5.105.4",
 		"webpack-bundle-analyzer": "^5.2.0",
-		"webpack-cli": "^6.0.1",
+		"webpack-cli": "^7.0.2",
 		"webpack-dev-server": "^5.2.3"
 	}
 }

package/src/bot.js

@@ -13,6 +13,16 @@ export default function (store) {
 			if (!match) return
 
 			let welcomMessages = bot.welcome_messages
+			welcomMessages = sb.filter(welcomMessages, (msg) => {
+				if (!sb.size(msg.attachments)) {
+					if (msg.block || msg.format === 'block') {
+						if (sb.isBlockEmpty(msg.block)) return false
+					} else {
+						if (!(msg.text || '').trim()) return false
+					}
+				}
+				return true
+			})
 			if (sb.size(welcomMessages)) {
 				let {error} = await store.startLightConvo(
 					bot.id,

package/src/chatbox/Event.js

@@ -451,7 +451,7 @@ export default class Event extends Com {
 						<div class='message-event-action-btn-svg dislike' />
 					</div>
 				</div>
-				{sb.get(this.props.event, 'is_end') && (
+				{sb.get(this.props.event, 'is_end') && !this.props.isConvoEnded && (
 					<div class='message-event-actions-static'>
 						<div class={likecls} onClick={() => this.onSendReaction(hasLike ? 'remove_like' : 'like')}>
 							<div class='message-event-action-btn-svg like' />

package/src/chatbox/Events.js

@@ -148,7 +148,7 @@ export default class Events extends Com {
 		events.push(fakeev)
 
 		let $events = sb.map(events, (ev) => {
-			let isLast = ev.is_last_message_send
+			let isLast = ev.is_last_message_send && sb.get(convo, 'state') !== 'ended'
 			return (
 				<Event
 					isLast={isLast}
@@ -160,6 +160,7 @@ export default class Events extends Com {
 					onPostback={this.props.onPostback}
 					onFocusSourceEventFromQuote={this.onFocusSourceEventFromQuote}
 					ref={(ele) => this.setEventChildRef(ele, ev.ev.id)}
+					isConvoEnded={sb.get(convo, 'state') === 'ended'}
 					event={ev}
 					t={this.props.t}
 					key={ev.ev.id}

package/src/chatbox/Widget.js

@@ -27,6 +27,8 @@ export default class Widget extends Com {
 	constructor(props) {
 		super(props)
 		this.userSent = {}
+
+		this.debugAgentSentEvIds = {}
 		// check user had input form
 		this.wasFormInputed = false
 		this.setState({
@@ -69,10 +71,12 @@ export default class Widget extends Com {
 				if (sb.get(ev, 'by.type') === 'user') return
 
 				console.log('check ev pass condition', ev)
-				if (!messageSentDict[ev.id]) {
+				if (!messageSentDict[ev.id] && !this.debugAgentSentEvIds[ev.id]) {
+					let accid = sb.get(this.props.store.matchAccount(), 'id')
 					this.props.store.sendBugReport(
-						'[WIDGET ' + accid + '] Missing agent message sent evid ' + ev.id + ', cid ' + sb.convoOfEv(ev),
+						`[WIDGET ${accid}] Missing agent message sent evid ${ev.id}, cid ${sb.convoOfEv(ev)}, ev_created ${ev.created}, FE timestamp ${Date.now()}, Init Debug timestamp ${started}`,
 					)
+					this.debugAgentSentEvIds[ev.id] = true
 				}
 			})
 		})

package/src/lib.js

@@ -84,6 +84,8 @@ class Widget {
 		let ref = param.ref
 
 		let user = await this.store.init(accid, undefined, ref, param)
+
+		if (this.store.isDead()) return user
 		sb.setTimeout(() => window.postMessage({type: 'widget_loaded', account_id: accid}, '*'), 0) // send to chrome extension
 
 		// add container to client site

package/src/plugin.js

@@ -12,6 +12,7 @@ function Plugin(plugin, store, $container, lib) {
 	if (!$container) throw '$div must is a valid html node'
 	var $div = document.createElement('div')
 	$div.id = plugin.id
+	if (store.isDead()) return
 	let acc = store.matchAccount()
 	$div.setAttribute('sbz-plugin-type', plugin.type)
 	$div.setAttribute('sbz-plugin-account-id', acc.id)

package/src/store/store.js

@@ -904,18 +904,23 @@ export default class Store {
 	}
 
 	// send the content view, the first presence and record domain
-	async track() {
-		let out = await this.api.sendContentView(
-			this.device,
-			location.href,
-			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 traffic_source = sb.get(out, 'body.by.device.source', '')
+			if (traffic_source) this.kv.put('traffic_source', traffic_source)
+			return
+		}
 
-		let traffic_source = sb.get(out, 'body.by.device.source', '')
-		if (traffic_source) this.kv.put('traffic_source', traffic_source)
+		return this.api.sendEvent(e)
 	}
 
 	matchTrafficSource = () => this.kv.match('traffic_source')
@@ -1474,6 +1479,9 @@ export default class Store {
 		this.pubsub.publish('destroy')
 	}
 
+	isDead() {
+		return this._die
+	}
 	destroy() {
 		this._die = true
 		this.clearBrowserData()

package/src/util/common.js

@@ -950,22 +950,8 @@ export function checkRunConditions(freq, conds, lastrun, store) {
 		var cond = conds[i]
 		switch (cond.key) {
 			case 'url':
-				let exclude_urls = filter(cond.exclude_urls, (url) => norm(url))
-				if (size(exclude_urls) > 0) {
-					let found = find(exclude_urls, (url) => {
-						return norm(window.location.href).indexOf(norm(url)) > -1
-					})
-					if (found) return false
-				}
-
-				// ignore empty url
-				let urls = filter(cond.urls, (url) => norm(url))
-				if (size(urls) > 0) {
-					let found = find(urls, (url) => {
-						return norm(window.location.href).indexOf(norm(url)) > -1
-					})
-					if (!found) return false
-				}
+				//  url = qlhd.minvoice.com.vn, exclude_urls ["minvoice.com.vn","minvoice.net","hdt.minvoice.com.vn"], urls ["qlhd.minvoice.com.vn"]  => must pass
+				if (!checkUrlCondition(cond, window.location.href)) return false
 				break
 			case 'url_path':
 				let excludePaths = filter(cond.exclude_url_paths, (url) => norm(url))
@@ -1616,3 +1602,32 @@ function isEmptyAttachment(msg) {
 		) == 0
 	)
 }
+export function checkUrlCondition(cond, href) {
+	//  url = qlhd.minvoice.com.vn, exclude_urls ["minvoice.com.vn","minvoice.net","hdt.minvoice.com.vn"], urls ["qlhd.minvoice.com.vn"]  => must pass
+	let exclude_urls = filter(cond.exclude_urls, (url) => norm(url))
+	let foundExclude = false
+	let excludeLen = 0
+	map(exclude_urls, (url) => {
+		if (norm(href).indexOf(url) > -1) {
+			if (excludeLen < size(url)) excludeLen = size(url)
+			foundExclude = true
+		}
+	})
+
+	// ignore empty url
+	let includeLen = 0
+	let urls = filter(cond.urls, (url) => norm(url))
+	let foundInclude = size(urls) == 0
+	map(urls, (url) => {
+		if (norm(href).indexOf(url) > -1) {
+			if (includeLen < size(url)) includeLen = size(url)
+			foundInclude = true
+		}
+	})
+	if (foundExclude) {
+		if (excludeLen >= includeLen) return false
+	}
+
+	if (!foundInclude) return false
+	return true
+}