@subiz/widget-v4 4.1.93 → 4.1.95

package/package.json

@@ -1,12 +1,13 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.93",
+	"version": "4.1.95",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
 		"build": "rm -rf dist && npx webpack --config webpack.screenshoot.js && npx webpack --config webpack.prod.js",
 		"report": "npx webpack --config webpack.report.js",
-		"lib": "rm -rf compiled_src && npx babel --out-dir=compiled_src src"
+		"lib": "rm -rf compiled_src && npx babel --out-dir=compiled_src src",
+		"publish": "npm run build && npm publish"
 	},
 	"dependencies": {
 		"@subiz/ajax": "^3.0.18",
@@ -14,7 +15,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",
@@ -22,16 +23,16 @@
 		"preact": "10.19.3"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.24.8",
+		"@babel/cli": "^7.25.6",
 		"@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/screenshoot.js

@@ -49,7 +49,7 @@ function main() {
 			]
 		}
 	}
-
+	plugin.enabled = true
 	plugin.account_id = accid
 	widget._overridePlugin([plugin])
 	// widget._overrideDeviceType('mobile')

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/plugin.js

@@ -33,7 +33,6 @@ function Plugin(plugin, store, $container, lib) {
 	var run = async function () {
 		if (_destroy) return
 		if (state !== 'hold') return
-		// dont run converted plugin twice
 		if (plugin.type === 'popup' && store.isConverted(plugin.id)) return
 
 		let lastrun = store.matchLastPluginRun(plugin.id)