@subiz/widget-v4 4.1.77 → 4.1.79

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.77",
+	"version": "4.1.79",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -22,15 +22,15 @@
 		"preact": "10.19.3"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.24.5",
-		"@babel/core": "^7.24.5",
+		"@babel/cli": "^7.24.7",
+		"@babel/core": "^7.24.7",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
-		"@babel/plugin-transform-react-jsx": "^7.23.4",
-		"@babel/preset-env": "^7.24.5",
+		"@babel/plugin-transform-react-jsx": "^7.24.7",
+		"@babel/preset-env": "^7.24.7",
 		"babel-loader": "^9.1.3",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.6.0",
-		"puppeteer": "^22.9.0",
+		"puppeteer": "^22.10.0",
 		"webpack": "^5.91.0",
 		"webpack-bundle-analyzer": "^4.10.2",
 		"webpack-cli": "^5.1.4",

package/src/chatbox/ChatButton.js

@@ -32,7 +32,12 @@ export default class ChatButton extends Com {
 			})
 			if (isquickreplies) return
 
-			this.setState({displayPreview: true, previewEvent: ev})
+			// only set preview have content ev
+			var tags = sb.filter(
+				sb.map(this.renderMessagePreview(ev), (tag) => sb.trim(tag)),
+				(a) => a,
+			)
+			if (sb.size(tags) > 0) this.setState({displayPreview: true, previewEvent: ev})
 		})
 	}
 
@@ -195,7 +200,7 @@ export default class ChatButton extends Com {
 		let cls = 'widget-preview widget-preview--' + position
 		if (!this.state.displayPreview) cls += ' widget-preview--hidden'
 
-		var tags = this.renderMessagePreview(this.state.previewEvent, this.props.t('sent_you_a_message'))
+		var tags = this.renderMessagePreview(this.state.previewEvent)
 		if (sb.size(tags) === 0) cls += ' widget-preview--hidden'
 
 		return (
@@ -371,7 +376,7 @@ export default class ChatButton extends Com {
 	}
 
 	renderMessagePreview(ev, defmsg) {
-		defmsg = defmsg || 'Sent you a message'
+		defmsg = defmsg || this.props.t('sent_you_a_message')
 
 		let message = sb.get(ev, 'data.message.text')
 		var format = sb.get(ev, 'data.message.format')
@@ -394,7 +399,7 @@ export default class ChatButton extends Com {
 	}
 
 	renderDeltaMessagePreview(ev, defmsg) {
-		defmsg = defmsg || 'Sent you a message'
+		defmsg = defmsg || this.props.t('sent_you_a_message')
 
 		let message = sb.get(ev, 'data.message.quill_delta')
 		if (!message && sb.size(sb.get(ev, 'data.message.attachments')) > 0) message = defmsg

package/src/chatbox/Events.js

@@ -161,6 +161,7 @@ export default class Events extends Com {
 		let events = this.props.store.listEvents(this.props.cid)
 		if (sb.size(events) === 0) {
 			let cid = this.props.cid
+
 			let {error} = await this.props.store.fetchMoreEvents(cid)
 			this.setState({loading: false})
 			if (cid !== this.props.cid) return // out dated
@@ -173,7 +174,6 @@ export default class Events extends Com {
 		this.props.store.fetchMoreEvents(this.props.cid)
 		this.setState({error: false})
 		this.scrollToBottom()
-
 		sb.setTimeout(() => this.setState({loading: false}), 50)
 	}
 

package/src/store/store.js

@@ -316,26 +316,39 @@ export default class Store {
 	list_districts = (p) => this.api.list_districts(p)
 	list_wards = (p) => this.api.list_wards(p)
 
+	outofmsgM = {}
+
 	listEvents = (id) => {
 		if (!id || id === '*' || typeof id !== 'string') return
-		if (!this.isInsync('events' + id)) {
-			sb.setTimeout(async () => {
-				await this.readyGate.entry()
-				await this.reconnectGate.entry(undefined, true)
-				if (this.isInsync('events' + id)) return this.reconnectGate.open()
-				this.markSync('events' + id)
-				await this.chain.reload(id, (type, anchor, limit) => this.listmessageapi(type, anchor, limit))
-				this.pubsub.publish('account')
-				return this.reconnectGate.open()
-			}, 10)
-		}
 		return this.chain.listM(id)
 	}
 
 	fetchMoreEvents = async (convoid) => {
-		let {error} = await this.chain.fetchMore(convoid, 50, (type, anchor, limit) =>
-			this.listmessageapi(type, anchor, limit),
-		)
+		if (!this.isInsync('events' + convoid)) {
+			await this.readyGate.entry()
+			await this.reconnectGate.entry(undefined, true)
+			if (this.isInsync('events' + convoid)) return this.reconnectGate.open()
+			this.markSync('events' + convoid)
+
+			// reset anchor
+			await this.chain.reload(convoid, () => {
+				return [[], '']
+			})
+			let out = await this._doFetchMsg(convoid)
+			this.reconnectGate.open()
+			return out
+		}
+
+		return this._doFetchMsg(convoid)
+	}
+
+	_doFetchMsg = async (convoid) => {
+		let {error} = await this.chain.fetchMore(convoid, 150, async (type, anchor, limit) => {
+			if (this.outofmsgM[convoid]) return [[], '']
+			let [events, newanchor, error, outofmsg] = await this.listmessageapi(type, anchor, limit)
+			if (outofmsg) this.outofmsgM[convoid] = true
+			return [events, newanchor, error]
+		})
 		this.pubsub.publish('account')
 		return {error}
 	}
@@ -754,8 +767,8 @@ export default class Store {
 			let members = sb.get(ev, 'data.conversation.members', [])
 			let me = sb.find(members, (m) => m.id === this.cache.match('user').id)
 			if (me) {
-				await this.chain.reload(cid, (type, anchor, limit) => this.listmessageapi(type, anchor, limit))
-				this.markSync('events' + cid)
+				// await this.chain.reload(cid, (type, anchor, limit) => this.listmessageapi(type, anchor, limit)) // ?
+				// this.markSync('events' + cid)
 				if (!alreadyFetched) {
 					let {body: apiconvo} = await this.api.getConversation(cid)
 					if (apiconvo) {
@@ -769,7 +782,10 @@ export default class Store {
 
 		if (ev.type === 'message_sent') {
 			if (sb.get(ev, 'by.id') !== user.id) {
-				this.api.markAsReceived(cid, ev.id)
+				if (!this._alreadyReceived[ev.id]) {
+					this._alreadyReceived[ev.id] = true
+					this.api.markAsReceived(cid, ev.id)
+				}
 			}
 		}
 
@@ -782,6 +798,7 @@ export default class Store {
 		}
 	}
 
+	_alreadyReceived = {} // dont dup receive
 	async restConvoEvent(ev) {
 		let user = this.cache.match('user')
 		let cid = sb.convoOfEv(ev)
@@ -1068,11 +1085,15 @@ export default class Store {
 
 			let pongbyme = sb.find(sb.get(ev, 'data.message.pongs'), (p) => p.member_id === user.id)
 			if (pongbyme) break
-			this.api.markAsReceived(convoid, ev.id)
+			if (!this._alreadyReceived[ev.id]) {
+				this._alreadyReceived[ev.id] = true
+				this.api.markAsReceived(convoid, ev.id)
+			}
 			break
 		}
 
-		return [events, anchor]
+		let outofmsg = sb.size(events) < limit
+		return [events, anchor, undefined, outofmsg]
 	}
 
 	timeDiff = 0
@@ -1244,7 +1265,6 @@ function getGaTrackingIds() {
 
 function sendToFBPixel(category, action, label) {
 	if (!window.fbq) return
-
 	window.fbq('trackCustom', category, {action: action, label: label})
 }