@subiz/widget-v4 4.1.92 → 4.1.94

package/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 	<head>
 		<meta name="description" content="Subiz preview" />
@@ -46,6 +46,30 @@
 				button.id = 'test2'
 				document.body.appendChild(button)
 			}, 2000)
+
+			setTimeout(function () {
+				// only run when url contain ?bot=greeting
+				var urlParams = new URLSearchParams(window.location.search)
+				const greeting = urlParams.get('bot')
+				if (greeting !== 'greeting') return
+
+				let botid = '<botid>' ////////////////////// replace your bot id here. eg: bbrtilgagvnoehvpzg
+
+				// dont allow other bots to run
+				subiz('shrinkWidget')
+				subiz('stopAutobot')
+
+				subiz('waitReady', function () {
+					let kk = subiz('startConvo', {
+						initial_by: botid,
+						state: 'active',
+						members: [{id: botid, type: 'bot'}],
+					}).then(function (out) {
+						if (!out || !out.convo || !out.convo.id) return
+						subiz('showWidget', 'chat', out.convo.id)
+					})
+				})
+			})
 		</script>
 	</body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.92",
+	"version": "4.1.94",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,7 +14,7 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^4.0.27",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.37.1",
+		"core-js": "^3.38.1",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.2.0",
@@ -26,12 +26,12 @@
 		"@babel/core": "^7.25.2",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
 		"@babel/plugin-transform-react-jsx": "^7.25.2",
-		"@babel/preset-env": "^7.25.2",
+		"@babel/preset-env": "^7.25.4",
 		"babel-loader": "^9.1.3",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.6.0",
-		"puppeteer": "^22.14.0",
-		"webpack": "^5.93.0",
+		"puppeteer": "^23.2.1",
+		"webpack": "^5.94.0",
 		"webpack-bundle-analyzer": "^4.10.2",
 		"webpack-cli": "^5.1.4",
 		"webpack-dev-server": "^5.0.4"

package/src/bot.js

@@ -1,7 +1,8 @@
 import sb from './util/index.js'
 import * as common from './common.js'
 
-export default function(store) {
+export default function (store) {
+	if (!store.matchAutoStartBot()) return
 	let botM = store.matchBot()
 	if (Object.keys(botM).length === 0) return
 	sb.each(botM, (bot) => {

package/src/chatbox/ChatButton.js

@@ -183,7 +183,11 @@ export default class ChatButton extends Com {
 		let account = this.props.store.matchAccount()
 		let accountSetting = this.props.plugin.chatbox
 		let byid = sb.get(this.state.previewEvent, 'by.display_id', sb.get(this.state.previewEvent, 'by.id'))
-		let agent = sb.cloneDeep(this.props.store.matchAgent(byid)) || {}
+		// let agent = sb.cloneDeep(this.props.store.matchAgent(byid)) || {}
+		// somehow store.matchAgent(id) return undefined so we try to backup with store.matchAgent('*')[id]
+		let agent = this.props.store.matchAgent(byid)
+		if (!agent) agent = this.props.store.matchAgent('*')[byid] || {}
+		agent = sb.cloneDeep(agent)
 		agent.fullname = agent.fullname || sb.get(account, 'name') || this.props.t('agent')
 		agent.avatar_url = agent.avatar_url || defaultAvatar
 		let position = sb.get(accountSetting, 'desktop_button.position') || 'right'

package/src/chatbox/Rating.js

@@ -5,6 +5,7 @@ import ReleaseAnimation from './releaseAnimation.js'
 const POPUP_MAX_HEIGHT = 400
 const POPUP_HARD_MAX_HEIGHT = 500
 const POPUP_MIN_HEIGHT = 0
+const RATING_EXPIRED_TIME = 15 * 60_000
 
 import {Com} from '../common.js'
 import {h, createRef} from 'preact'
@@ -112,16 +113,20 @@ export default class Rating extends Com {
 	shoudDisplay() {
 		if (!this.props.cid) return false
 
-		var requested
-		var rated
-		var ended
+		let requested
+		let rated
+		let ended
+		let lastMessageSentAt = 0
 
 		let user = this.props.store.matchUser()
 		// user must send message
 		let foundUser = false
 		sb.map(this.props.store.listEvents(this.props.cid), (ev) => {
 			if (!ev || !ev.by) return
-			if (ev.by.type == 'user' && ev.type == 'message_sent') foundUser = true
+			if (ev.type === 'message_sent') {
+				if (sb.get(ev, 'by.type') === 'user') foundUser = true
+				if (ev.created > lastMessageSentAt) lastMessageSentAt = ev.created
+			}
 			if (ev.type === 'conversation_state_updated' && sb.get(ev, 'data.conversation.state') === 'ended') {
 				ended = ev
 			}
@@ -131,7 +136,14 @@ export default class Rating extends Com {
 		if (!foundUser) return false
 		if (rated) return false
 		let accountSetting = this.props.plugin.chatbox
-		var auto = accountSetting.auto_request_rating && ended
+		let auto = accountSetting.auto_request_rating && ended
+		if (auto) {
+			if (lastMessageSentAt) {
+				auto = auto && Date.now() - lastMessageSentAt < RATING_EXPIRED_TIME
+			} else {
+				auto = false
+			}
+		}
 		return requested || auto
 	}
 

package/src/chatbox/Widget.js

@@ -636,7 +636,9 @@ export default class Widget extends Com {
 
 		var $convos = sb.map(convos, (convo) => {
 			let ags = sb.filter(convo.members, (m) => {
-				return (m.type === 'agent' || m.type === 'bot') && m.membership === 'active'
+				//return (m.type === 'agent' || m.type === 'bot') && m.membership === 'active'
+				// somehow bot send greeting but membership is observer
+				return m.type === 'agent' || m.type === 'bot'
 			})
 			let agentids = sb.map(ags, (m) => m.id)
 			agentids = agentids || sb.agentsOfConvo(convo)[0]
@@ -929,7 +931,9 @@ export default class Widget extends Com {
 		let agentM = this.props.store.matchAgent('*')
 
 		let ags = sb.filter(convo.members, (m) => {
-			return (m.type === 'agent' || m.type === 'bot') && m.membership === 'active'
+			//return (m.type === 'agent' || m.type === 'bot') && m.membership === 'active'
+			// somehow bot send greeting but membership is observer
+			return m.type === 'agent' || m.type === 'bot'
 		})
 		let agentids = sb.map(ags, (m) => m.id)
 		agentids = agentids || sb.agentsOfConvo(convo)[0]

package/src/lib.js

@@ -306,6 +306,10 @@ class Widget {
 			this.pluginMgr.showCurrentGreeting()
 		}
 	}
+
+	stopAutobot() {
+		this.store.doNotStartBot()
+	}
 }
 
 // for debugging purpose

package/src/store/api.js

@@ -209,7 +209,10 @@ export default class {
 		return this.apireq.post(`/accounts/${this.accid}/conversations`, data)
 	}
 
-	sendConvoEvent = (cid, ev) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/events`, ev)
+	sendConvoEvent = (cid, ev) =>
+		this.apireq
+			.addQuery('x-referer', sb.get(location, 'origin', ''))
+			.post(`/accounts/${this.accid}/conversations/${cid}/events`, ev)
 	createPostback = (cid, p) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/postbacks`, p)
 	markAsReceived = (cid, messageId) =>
 		this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/messages/${messageId}/receive`)
@@ -219,23 +222,28 @@ 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.addQuery('shorten', true).post(`/accounts/${this.accid}/users/${this.uid}/events`, data)
+		this.apireq
+			.addQuery('shorten', true)
+			.addQuery('x-referer', sb.get(location, 'origin', ''))
+			.post(`/accounts/${this.accid}/users/${this.uid}/events`, data)
 
 	submitForm = (form_id, page_url, device, data, user) =>
-		this.apireq.post(`/accounts/${this.accid}/users/${this.uid}/events`, {
-			by: {id: this.uid, device: device},
-			type: 'form_submitted',
-			data: {
-				user: user,
-				form_submission: {
-					user_id: this.uid,
-					form_id: form_id,
-					page_url: page_url,
-					submitted_at: sb.Date.now(),
-					values: data,
+		this.apireq
+			.addQuery('x-referer', sb.get(location, 'origin', ''))
+			.post(`/accounts/${this.accid}/users/${this.uid}/events`, {
+				by: {id: this.uid, device: device},
+				type: 'form_submitted',
+				data: {
+					user: user,
+					form_submission: {
+						user_id: this.uid,
+						form_id: form_id,
+						page_url: page_url,
+						submitted_at: sb.Date.now(),
+						values: data,
+					},
 				},
-			},
-		})
+			})
 
 	sendTyping = (cid) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/typing`)
 

package/src/store/store.js

@@ -69,6 +69,16 @@ export default class Store {
 		})
 		window.addEventListener('beforeunload', () => this.api.sendLostFocus())
 
+		this.doNotStartBot = () => {
+			this._donotstartbot = true
+		}
+
+		this.autoStartBot = () => {
+			this._donotstartbot = false
+		}
+
+		this.matchAutoStartBot = () => !this._donotstartbot
+
 		// faster send rate when has focus
 		this._presenceInterval1 = sb.setInterval(() => {
 			if (this._die) return sb.clearInterval(this._presenceInterval1)