@subiz/widget-v4 4.1.199 → 4.1.200

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.199",
+	"version": "4.1.200",
 	"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/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

@@ -70,6 +70,7 @@ export default class Widget extends Com {
 
 				console.log('check ev pass condition', ev)
 				if (!messageSentDict[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),
 					)

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

@@ -1474,6 +1474,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
+}

package/src/util/common.test.js

@@ -1,157 +1,72 @@
+import {createRequire} from 'module'
+const require = createRequire(import.meta.url)
+global.require = require
+global.XMLHttpRequest = {
+	prototype: {
+		open: function () {},
+	},
+}
+global.document = {
+	JSON: JSON,
+	// document.documentElement.appendChild
+	// f.contentDocument.createElement
+	body: {
+		appendChild: function () {},
+	},
+	documentElement: {
+		appendChild: function () {},
+	},
+	createElement: function () {
+		return {
+			contentWindow: global,
+			contentDocument: global.document,
+			style: {display: false},
+		}
+	},
+}
 const test = require('tape')
 const util = require('./common.js')
 
-test('util.getNotiDescription', t => {
+test('util.checkUrlCondition', (t) => {
 	var tcs = [
 		{
-			desc: 'not a message sent',
-			event: { type: 'conversation_updated' },
-			text: '',
-		},
-		{
-			desc: 'an email',
-			event: {
-				type: 'message_sent',
-				data: {
-					message: {
-						fields: [
-							{ key: 'from', value: '"thanh"' },
-							{ key: 'to', value: '"van"' },
-						],
-					},
-				},
-			},
-			text: 'sent an email',
-		},
-		{ desc: 'empty msg', event: {}, text: '' },
-		{
-			desc: 'markdown',
-			event: {
-				type: 'message_sent',
-				data: {
-					message: {
-						format: 'markdown',
-						text: 'xin chao',
-					},
-				},
-			},
-			text: 'sent a message',
-		},
-		{
-			desc: 'html',
-			event: {
-				type: 'message_sent',
-				data: {
-					message: {
-						format: 'html',
-						text: '<b>xin chao</b>',
-					},
-				},
-			},
-			text: 'sent a message',
-		},
-		{
-			desc: 'multiple attachemnts',
-			event: {
-				type: 'message_sent',
-				data: {
-					message: {
-						attachments: [{}, {}, {}],
-					},
-				},
-			},
-			text: 'sent a message with 3 attachments',
-		},
-		{
-			desc: 'text with attachment',
-			event: {
-				type: 'message_sent',
-				data: {
-					message: {
-						type: 'text',
-						text: 'xin chao',
-						attachments: [{}],
-					},
-				},
-			},
-			text: 'sent a message with 1 attachments',
-		},
-		{
-			desc: '1 attachment no type',
-			event: {
-				type: 'message_sent',
-				data: {
-					message: {
-						attachments: [{}],
-					},
-				},
-			},
-			text: 'sent an attachment',
-		},
-		{
-			desc: 'audio ',
-			event: {
-				type: 'message_sent',
-				data: {
-					message: {
-						attachments: [{ mimetype: 'audio/mp3' }],
-					},
-				},
-			},
-			text: 'sent an audio',
-		},
-		{
-			desc: 'video',
-			event: {
-				type: 'message_sent',
-				data: {
-					message: {
-						attachments: [{ mimetype: 'video/ogg' }],
-					},
-				},
-			},
-			text: 'sent a video',
-		},
-		{
-			desc: 'image',
-			event: {
-				type: 'message_sent',
-				data: {
-					message: {
-						attachments: [{ mimetype: 'image/jpeg' }],
-					},
-				},
+			name: 'minvoice',
+			cond: {
+				key: 'url',
+				urls: ['qlhd.minvoice.com.vn'],
+				exclude_urls: ['minvoice.com.vn', 'minvoice.net', 'hdt.minvoice.com.vn'],
 			},
-			text: 'sent a picture',
+			href: 'https://qlhd.minvoice.com.vn/#/login',
+			pass: true,
 		},
 	]
 
-	tcs.map(tc => {
+	tcs.map((tc) => {
 		// if (tc.desc !== 'multiple attachemnts') return
-		var out = util.getNotiDescription(tc.event)
-		t.equal(out, tc.text)
+		var out = util.checkUrlCondition(tc.cond, tc.href)
+		t.equal(out, tc.pass)
 	})
 	t.end()
 })
 
-test('util.randomString', t => {
+test('util.randomString', (t) => {
 	t.equal(10, util.randomString(10).length)
 	t.equal(11, util.randomString(11).length)
 	t.equal(12, util.randomString(12).length)
 	t.end()
 })
 
-test('convert message event first msg send', t => {
+test('convert message event first msg send', (t) => {
 	var events = [
-		{ by: { id: 1 }, type: 'message_sent', created: 1100 },
-		{ by: { id: 1 }, type: 'message_sent', created: 1200 },
-		{ by: { id: 1 }, type: 'message_sent', created: 1300 },
+		{by: {id: 1}, type: 'message_sent', created: 1100},
+		{by: {id: 1}, type: 'message_sent', created: 1200},
+		{by: {id: 1}, type: 'message_sent', created: 1300},
 	]
 
 	var expect = [
-		{ by: { id: 1 }, type: 'message_sent', created: 1100, mode: 'lead', show_time: true },
-		{ by: { id: 1 }, type: 'message_sent', created: 1200, mode: 'follow', show_time: false },
-		{ by: { id: 1 }, type: 'message_sent', created: 1300, mode: 'follow', show_time: false },
+		{by: {id: 1}, type: 'message_sent', created: 1100, mode: 'lead', show_time: true},
+		{by: {id: 1}, type: 'message_sent', created: 1200, mode: 'follow', show_time: false},
+		{by: {id: 1}, type: 'message_sent', created: 1300, mode: 'follow', show_time: false},
 	]
 
 	util.convertMessageEvent(events, 0)
@@ -162,33 +77,33 @@ test('convert message event first msg send', t => {
 	t.end()
 })
 
-test('convert message event message tag', t => {
+test('convert message event message tag', (t) => {
 	var events = [
-		{ type: 'conversation_state_updated' },
-		{ type: 'conversation_tagged' },
-		{ type: 'conversation_tagged' },
-		{ type: 'conversation_tagged' },
-		{ type: 'conversation_state_updated' },
+		{type: 'conversation_state_updated'},
+		{type: 'conversation_tagged'},
+		{type: 'conversation_tagged'},
+		{type: 'conversation_tagged'},
+		{type: 'conversation_state_updated'},
 	]
 
 	var expect = [
-		{ type: 'conversation_state_updated' },
-		{ type: 'conversation_tagged', mode: 'hide' },
-		{ type: 'conversation_tagged', mode: 'hide' },
-		{ type: 'conversation_tagged', mode: 'combine' },
-		{ type: 'conversation_state_updated' },
+		{type: 'conversation_state_updated'},
+		{type: 'conversation_tagged', mode: 'hide'},
+		{type: 'conversation_tagged', mode: 'hide'},
+		{type: 'conversation_tagged', mode: 'combine'},
+		{type: 'conversation_state_updated'},
 	]
 
 	events.map((_, i) => util.convertMessageEvent(events, i))
 
 	t.equal(JSON.stringify(events), JSON.stringify(expect))
 
-	var events = [{ type: 'conversation_tagged' }, { type: 'conversation_tagged' }, { type: 'conversation_tagged' }]
+	var events = [{type: 'conversation_tagged'}, {type: 'conversation_tagged'}, {type: 'conversation_tagged'}]
 
 	var expect = [
-		{ type: 'conversation_tagged', mode: 'hide' },
-		{ type: 'conversation_tagged', mode: 'hide' },
-		{ type: 'conversation_tagged', mode: 'combine' },
+		{type: 'conversation_tagged', mode: 'hide'},
+		{type: 'conversation_tagged', mode: 'hide'},
+		{type: 'conversation_tagged', mode: 'combine'},
 	]
 
 	events.map((_, i) => util.convertMessageEvent(events, i))
@@ -196,25 +111,25 @@ test('convert message event message tag', t => {
 	t.end()
 })
 
-test('convert message event message tag, msg_sent mixup', t => {
+test('convert message event message tag, msg_sent mixup', (t) => {
 	var events = [
-		{ type: 'conversation_state_updated' },
-		{ type: 'conversation_tagged' },
-		{ by: { id: 1 }, type: 'message_sent' },
-		{ by: { id: 2 }, type: 'message_sent' },
-		{ type: 'conversation_tagged' },
-		{ type: 'conversation_tagged' },
-		{ type: 'conversation_state_updated' },
+		{type: 'conversation_state_updated'},
+		{type: 'conversation_tagged'},
+		{by: {id: 1}, type: 'message_sent'},
+		{by: {id: 2}, type: 'message_sent'},
+		{type: 'conversation_tagged'},
+		{type: 'conversation_tagged'},
+		{type: 'conversation_state_updated'},
 	]
 
 	var expect = [
-		{ type: 'conversation_state_updated' },
-		{ type: 'conversation_tagged', mode: 'combine' },
-		{ by: { id: 1 }, type: 'message_sent', mode: 'lead', show_time: false },
-		{ by: { id: 2 }, type: 'message_sent', mode: 'lead', show_time: false },
-		{ type: 'conversation_tagged', mode: 'hide' },
-		{ type: 'conversation_tagged', mode: 'combine' },
-		{ type: 'conversation_state_updated' },
+		{type: 'conversation_state_updated'},
+		{type: 'conversation_tagged', mode: 'combine'},
+		{by: {id: 1}, type: 'message_sent', mode: 'lead', show_time: false},
+		{by: {id: 2}, type: 'message_sent', mode: 'lead', show_time: false},
+		{type: 'conversation_tagged', mode: 'hide'},
+		{type: 'conversation_tagged', mode: 'combine'},
+		{type: 'conversation_state_updated'},
 	]
 
 	events.map((_, i) => util.convertMessageEvent(events, i))
@@ -223,49 +138,49 @@ test('convert message event message tag, msg_sent mixup', t => {
 	t.end()
 })
 
-test('test insert message', t => {
+test('test insert message', (t) => {
 	var events = [
-		{ type: 'conversation_state_updated' },
-		{ id: 1, type: 'conversation_tagged' },
-		{ by: { id: 1 }, type: 'message_sent' },
-		{ by: { id: 2 }, type: 'message_sent' },
-		{ type: 'conversation_tagged' },
-		{ type: 'conversation_tagged' },
-		{ type: 'conversation_state_updated' },
+		{type: 'conversation_state_updated'},
+		{id: 1, type: 'conversation_tagged'},
+		{by: {id: 1}, type: 'message_sent'},
+		{by: {id: 2}, type: 'message_sent'},
+		{type: 'conversation_tagged'},
+		{type: 'conversation_tagged'},
+		{type: 'conversation_state_updated'},
 	]
 
 	events.map((_, i) => util.convertMessageEvent(events, i))
 
-	events.splice(2, 0, { id: 2, type: 'conversation_tagged' })
+	events.splice(2, 0, {id: 2, type: 'conversation_tagged'})
 	util.convertUpdatedOrDeletedMessageEvent(events, 2)
 	var expect = [
-		{ type: 'conversation_state_updated' },
-		{ id: 1, type: 'conversation_tagged', mode: 'hide' },
-		{ id: 2, type: 'conversation_tagged', mode: 'combine' },
-		{ by: { id: 1 }, type: 'message_sent', mode: 'lead', show_time: false },
-		{ by: { id: 2 }, type: 'message_sent', mode: 'lead', show_time: false },
-		{ type: 'conversation_tagged', mode: 'hide' },
-		{ type: 'conversation_tagged', mode: 'combine' },
-		{ type: 'conversation_state_updated' },
+		{type: 'conversation_state_updated'},
+		{id: 1, type: 'conversation_tagged', mode: 'hide'},
+		{id: 2, type: 'conversation_tagged', mode: 'combine'},
+		{by: {id: 1}, type: 'message_sent', mode: 'lead', show_time: false},
+		{by: {id: 2}, type: 'message_sent', mode: 'lead', show_time: false},
+		{type: 'conversation_tagged', mode: 'hide'},
+		{type: 'conversation_tagged', mode: 'combine'},
+		{type: 'conversation_state_updated'},
 	]
 
 	t.equal(JSON.stringify(events), JSON.stringify(expect))
 	t.end()
 })
 
-test('mapizeDeep a map', t => {
+test('mapizeDeep a map', (t) => {
 	var topicM = {
-		'0': {
+		0: {
 			topic: 'account.acqcsmrppbftadjzxnvo.conversation.csqlxnairroppcktrg',
 			read: false,
 			updated: 1570586074000,
 		},
-		'1': {
+		1: {
 			topic: 'account.acqcsmrppbftadjzxnvo.conversation.csqlxmkozwryrgjvag',
 			read: false,
 			updated: 1570551305000,
 		},
-		'2': {
+		2: {
 			topic: 'account.acqcsmrppbftadjzxnvo.conversation.csqlvkqgspihkfzsnm',
 			read: false,
 			updated: 1570289320000,
@@ -294,24 +209,24 @@ test('mapizeDeep a map', t => {
 	t.end()
 })
 
-test('mapize a map', t => {
+test('mapize a map', (t) => {
 	var topicM = {
-		'0': { topic: 't1', updated: 157 },
-		'1': { topic: 't2', updated: 158 },
+		0: {topic: 't1', updated: 157},
+		1: {topic: 't2', updated: 158},
 	}
 
 	var out = util.mapize(topicM, 'topic')
-	t.deepEqual(out, { t1: { topic: 't1', updated: 157 }, t2: { topic: 't2', updated: 158 } })
+	t.deepEqual(out, {t1: {topic: 't1', updated: 157}, t2: {topic: 't2', updated: 158}})
 	t.end()
 })
 
-test('mapize', t => {
+test('mapize', (t) => {
 	var arr = [
-		{ id: 0, value: 0 },
-		{ id: 1, value: 1 },
-		{ id: 2, value: 2 },
-		{ id: 3, value: 3 },
-		{ id: 4, value: 4 },
+		{id: 0, value: 0},
+		{id: 1, value: 1},
+		{id: 2, value: 2},
+		{id: 3, value: 3},
+		{id: 4, value: 4},
 	]
 	var m = util.mapize(arr, 'id')
 	for (var i = 0; i < arr.length; i++) {
@@ -320,12 +235,12 @@ test('mapize', t => {
 	t.end()
 })
 
-test('convo id from topic', t => {
+test('convo id from topic', (t) => {
 	t.equal('csqldpucwamyuaetjf', util.convoIdFromTopic('account.acqcsmrppbftadjzxnvo.conversation.csqldpucwamyuaetjf'))
 	t.end()
 })
 
-test('user of convo', t => {
+test('user of convo', (t) => {
 	var convo = {
 		id: 'csqlmhetrpccwprnms',
 		account_id: 'acqcsmrppbftadjzxnvo',