@subiz/widget-v4 4.1.155 → 4.1.156

package/dist/HASH

@@ -1 +1 @@
-19816b2e8ca
+1986e37f014

package/dist/screenshoot.js

@@ -3775,6 +3775,57 @@ function jsonifyTextPlain(param, done) {
     _defineProperty(this, "sendTyping", cid => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/typing`));
     _defineProperty(this, "sendLostFocus", () => this.apireq.post(`/accounts/${this.accid}/focuses/${this.uid}/delete`));
     _defineProperty(this, "uploadToS3", async file => {
+      let name = file.name.replace(/\s+/g, '_');
+      var {
+        body,
+        error
+      } = await this.apireq.setBaseUrl('https://api5.subiz.com.vn/4.1').setQuery({
+        'account-id': this.accid,
+        description: 'upload\n user-client: web-widget',
+        name: name,
+        presign: true,
+        size: file.size,
+        type: file.type
+      }).post('/files');
+      if (error) return {
+        body,
+        error
+      };
+      let signedurl = body.signed_url;
+      let fileid = body.id;
+      let err = await new Promise(resolve => {
+        const xhr = new util/* default */.A.XMLHttpRequest();
+        xhr.open('PUT', signedurl, true);
+        xhr.setRequestHeader('Content-Type', file.mimetype);
+        xhr.onload = function () {
+          if (xhr.status === 200) {
+            resolve();
+          } else {
+            resolve(new Error(`Upload failed: ${xhr.statusText}`));
+          }
+        };
+        xhr.onerror = function () {
+          resolve(new Error('Network error during upload.'));
+        };
+        xhr.send(file);
+      });
+      if (err) return {
+        error: err
+      };
+      var {
+        body,
+        error
+      } = await this.apireq.setBaseUrl('https://api5.subiz.com.vn/4.1').setQuery({
+        'account-id': this.accid
+      }).post(`/files/${fileid}/uploaded`);
+      if (error) return {
+        error
+      };
+      return {
+        url: util/* default */.A.get(body, 'file.url', '')
+      };
+    });
+    _defineProperty(this, "uploadToS32", async file => {
       var {
         body,
         error
@@ -3830,7 +3881,7 @@ function jsonifyTextPlain(param, done) {
     this.refreshLock = new util/* default */.A.Mutex();
     this.FileURL = FileURL;
     this.ApiURL = ApiURL;
-    this.api41 = ajax.setBaseUrl('https://api5.subiz.com.vn/4.1').withCredentials(true).setContentType('text/plain').beforeHook(jsonifyTextPlain).setParser('json');
+    this.api41 = ajax.setBaseUrl('https://api.sbz.vn/4.1').withCredentials(true).setContentType('text/plain').beforeHook(jsonifyTextPlain).setParser('json');
     this.apireq = ajax.setBaseUrl(ApiURL).withCredentials(true).addQuery('v', '6').setContentType('text/plain').beforeHook(jsonifyTextPlain).setParser('json').beforeHook((param, done) => {
       if (this.token_generator) {
         let user_id = this.profile_id;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.155",
+	"version": "4.1.156",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -13,7 +13,7 @@
 		"@subiz/flow": "^1.1.0",
 		"@subiz/wsclient": "^4.0.34",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.44.0",
+		"core-js": "^3.45.0",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.4.0",
@@ -29,7 +29,7 @@
 		"babel-loader": "^10.0.0",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.6.3",
-		"puppeteer": "^24.15.0",
+		"puppeteer": "^24.16.0",
 		"webpack": "^5.101.0",
 		"webpack-bundle-analyzer": "^4.10.2",
 		"webpack-cli": "^6.0.1",

package/src/bot.js

@@ -11,7 +11,14 @@ export default function (store) {
 			run = () => true // dont run twice
 			let match = sb.checkRunConditions(bot.initiative_frequency, bot.conditions, store.matchLastBotRun(bot.id), store)
 			if (!match) return
-
+			if (bot.id.startsWith('at')) {
+				if (!bot.welcome_message) return
+				let {error} = await store.startLightConvo(bot.id, bot.welcome_message, common.getLocale(bot, sb.detectLang()))
+				if (error) return console.error(error)
+				store.logBotRun(bot.id)
+				return
+			}
+			// old bot, should deprecated
 			let {error} = await store.startConvo({
 				initial_by: bot.id,
 				locale: common.getLocale(bot, sb.detectLang()),

package/src/chatbox/AgentsAvatar.js

@@ -59,6 +59,10 @@ export default function AgentsAvatar(props) {
 	// 1 agent
 	if (agents.length === 1) {
 		var agent = agents[0]
+
+		let avatarurl =
+			agent.avatar_url || props.store.replaceFileUrl(acc.logo_url) || require('../../assets/img/image_default.png')
+
 		var groupClass = mode === 'primary' ? 'group-avatar--agent-middle' : 'group-avatar--agent-left'
 		return (
 			<div class={`group-avatar group-avatar--${mode}`}>
@@ -67,13 +71,7 @@ export default function AgentsAvatar(props) {
 					data-tooltip={agent.fullname || acc.name}
 					data-tooltip-position={tooltippos}
 				>
-					<img
-						width={35}
-						height={35}
-						class={`avatar ${groupClass}`}
-						alt='agent avatar'
-						src={props.store.replaceFileUrl(agent.avatar_url) || require('../../assets/img/default_avatar.png')}
-					/>
+					<img width={35} height={35} class={`avatar ${groupClass}`} alt='agent avatar' src={avatarurl} />
 				</div>
 			</div>
 		)
@@ -95,7 +93,11 @@ export default function AgentsAvatar(props) {
 						height={35}
 						alt='agent avatar left'
 						class='avatar group-avatar--agent-left'
-						src={props.store.replaceFileUrl(leftAgent.avatar_url) || require('../../assets/img/default_avatar.png')}
+						src={
+							props.store.replaceFileUrl(leftAgent.avatar_url) ||
+							props.store.replaceFileUrl(acc.logo_url) ||
+							require('../../assets/img/image_default.png')
+						}
 					/>
 				</div>
 				<div
@@ -108,7 +110,11 @@ export default function AgentsAvatar(props) {
 						width={35}
 						height={35}
 						class='avatar group-avatar--agent-right'
-						src={props.store.replaceFileUrl(rightAgent.avatar_url) || require('../../assets/img/default_avatar.png')}
+						src={
+							props.store.replaceFileUrl(rightAgent.avatar_url) ||
+							props.store.replaceFileUrl(acc.logo_url) ||
+							require('../../assets/img/image_default.png')
+						}
 					/>
 				</div>
 			</div>
@@ -132,7 +138,11 @@ export default function AgentsAvatar(props) {
 					height={35}
 					alt='agent avatar left'
 					class='avatar group-avatar--agent-left'
-					src={props.store.replaceFileUrl(leftAgent.avatar_url) || require('../../assets/img/default_avatar.png')}
+					src={
+						props.store.replaceFileUrl(leftAgent.avatar_url) ||
+						props.store.replaceFileUrl(acc.logo_url) ||
+						require('../../assets/img/image_default.png')
+					}
 				/>
 			</div>
 			<div
@@ -145,7 +155,11 @@ export default function AgentsAvatar(props) {
 					width={35}
 					height={35}
 					class='avatar group-avatar--agent-middle'
-					src={props.store.replaceFileUrl(middleAgent.avatar_url) || require('../../assets/img/default_avatar.png')}
+					src={
+						props.store.replaceFileUrl(middleAgent.avatar_url) ||
+						props.store.replaceFileUrl(acc.logo_url) ||
+						require('../../assets/img/image_default.png')
+					}
 				/>
 			</div>
 			<div
@@ -158,7 +172,11 @@ export default function AgentsAvatar(props) {
 					height={35}
 					alt='agent avatar right'
 					class='avatar group-avatar--agent-right'
-					src={props.store.replaceFileUrl(rightAgent.avatar_url) || require('../../assets/img/default_avatar.png')}
+					src={
+						props.store.replaceFileUrl(rightAgent.avatar_url) ||
+						props.store.replaceFileUrl(acc.logo_url) ||
+						require('../../assets/img/image_default.png')
+					}
 				/>
 			</div>
 		</div>

package/src/chatbox/ChatButton.js

@@ -22,7 +22,7 @@ export default class ChatButton extends Com {
 			if (sb.get(ev, 'type') !== 'message_sent') return
 
 			let bytype = sb.get(ev, 'by.type')
-			if (bytype !== 'system' && bytype !== 'agent') return
+			if (bytype !== 'system' && bytype !== 'agent' && bytype !== 'bot') return
 
 			let isquickreplies = false
 			sb.map(sb.get(ev, 'data.message.attachments', []), (att) => {
@@ -106,25 +106,38 @@ export default class ChatButton extends Com {
 		this.setState({displayPreview: false})
 	}
 
-	// this method could be call from the parent
-	ShowGreeting() {
-		// workaround for bao chau elect dont want show greeting in mobile
-		if (this.props.store.isMobile()) {
-			let accid = sb.get(this.props.plugin, 'chatbox.account_id', {})
-			if (accid === 'acqjeefqeaoiagyfprap') return
-		}
-		let greeting = sb.get(this.props.plugin, 'chatbox.greeting', {})
-		let agentM = this.props.store.matchAgent('*')
-		let byid = greeting.agent_id
-		if (!byid) byid = randomAgent(agentM).id
-
-		let text = this.props.t.i18n(sb.get(greeting, 'greeting', {})) || greeting.message
+	pickBestGreeting() {
+		let convoM = this.props.store.matchConvo('*')
+		let unseenConvo = sb
+			.filter(convoM, (convo) => {
+				let seen = sb.isConvoSeen(convo, this.props.store.matchUser().id)
+				return !seen
+			})
+			.sort((a, b) => sb.get(b, 'last_message_sent.created', 0) - sb.get(a, 'last_message_sent.created', 0))
+		if (sb.size(unseenConvo) == 0) {
+			// workaround for bao chau elect dont want show greeting in mobile
+			if (this.props.store.isMobile()) {
+				let accid = sb.get(this.props.plugin, 'chatbox.account_id', {})
+				if (accid === 'acqjeefqeaoiagyfprap') return
+			}
+			let greeting = sb.get(this.props.plugin, 'chatbox.greeting', {})
+			let agentM = this.props.store.matchAgent('*')
+			let byid = greeting.agent_id
+			if (!byid) byid = randomAgent(agentM).id
 
-		this.setState({
-			previewEvent: {
+			let text = this.props.t.i18n(sb.get(greeting, 'greeting', {})) || greeting.message
+			return {
 				by: {id: byid, type: 'agent'},
 				data: {message: {text, format: 'plaintext'}},
-			},
+			}
+		}
+		return unseenConvo[0].last_message_sent
+	}
+
+	// this method could be call from the parent
+	ShowGreeting() {
+		this.setState({
+			previewEvent: this.pickBestGreeting(),
 			displayPreview: true,
 		})
 	}

package/src/chatbox/Widget.js

@@ -776,6 +776,33 @@ export default class Widget extends Com {
 		}
 
 		let text = message.text
+
+		if (this.props.cid && this.props.cid.startsWith('cslight')) {
+			let cid = this.props.cid
+			this._creating = (this._creating || 0) + 1
+			let _creating = this._creating
+			this.setState({creating: true})
+			let botid = cid.split('_')[0].slice(7) // 6 = len(cslight)
+			const {convo, error} = await this.props.store.startConvo({
+				locale: this.props.t.locale(),
+				message: text,
+				members: [{type: 'bot', id: botid}],
+				initial_by: this.props.store.matchUser().id,
+			})
+			if (_creating != this._creating) return // outdated
+			if (error) {
+				this.setState({creating: false})
+				return
+				// show error and try again
+			}
+			this.props.store.deleteLightConvo(cid)
+			await this.props.store.sendConvoEvent(convo.id, 'message_sent', {message})
+			if (_creating != this._creating) return // outdated
+			this.props.onGo({view: 'chat', cid: convo.id})
+			this.setState({creating: false})
+			return
+		}
+
 		if (!this.props.cid) {
 			this._creating = (this._creating || 0) + 1
 			let _creating = this._creating

package/src/store/store.js

@@ -35,6 +35,7 @@ export default class Store {
 		this.FileURL = FileURL
 		this._track_page_view = true
 		this.device_type = 'desktop'
+		this.lightConvos = {} // convo that have not been created, for faking bot conversation
 		if (this.fake) this.api = new APIFake(ApiURL, FileURL)
 		else this.api = new API(ApiURL, FileURL)
 
@@ -63,9 +64,9 @@ export default class Store {
 
 		// dont dupplicate seen
 		this.g_haveSentSeenM = {}
-		this.last_focused = sb.Date.now() // 0 -> in focus, timestamp -> lost focus at
+		this.last_focused = this.now() // 0 -> in focus, timestamp -> lost focus at
 		window.addEventListener('blur', () => {
-			this.last_focused = sb.Date.now()
+			this.last_focused = this.now()
 			this.sendPresence()
 		})
 		window.addEventListener('focus', () => {
@@ -93,7 +94,7 @@ export default class Store {
 		this._presenceInterval2 = sb.setInterval(() => {
 			if (this._die) return sb.clearInterval(this._presenceInterval2)
 			if (this.browserVisibility === 'visible' && document.hasFocus()) return
-			if (this.last_focused && sb.Date.now() - this.last_focused > 30 * 60000) {
+			if (this.last_focused && this.now() - this.last_focused > 30 * 60000) {
 				// lost focus for more than 30 min
 				return // dont send presence
 			}
@@ -347,20 +348,23 @@ export default class Store {
 		return agentM[id]
 	}
 
-	// must ensure only call this function after init is done
 	matchConvo = (id) => {
 		if (!id) return
 
 		if (id === '*') {
 			this._touchAcc()
-			return sb.filter(this.cache.all(), (value, k) => k.startsWith('convo_'))
+			// combind with
+			return sb.filter(this.cache.all(), (value, k) => k.startsWith('convo_')).concat(sb.map(this.lightConvos))
 		}
 
+		if (id.startsWith('cslight')) return this.lightConvos[id]
 		if (!this.isInsync(id)) this.fetchConvo(id)
 		return this.cache.match('convo_' + id)
 	}
 
 	fetchConvo = async (cid) => {
+		if (!cid) return
+		if (cid.startsWith('cslight')) return
 		if (this._die) return dieErr
 		await this.readyGate.entry()
 		await this.reconnectGate.entry(undefined, true)
@@ -382,10 +386,13 @@ export default class Store {
 
 	listEvents = (id) => {
 		if (!id || id === '*' || typeof id !== 'string') return
+		if (id.startsWith('cslight')) return sb.get(this.lightConvos, [id, 'events'], [])
 		return this.chain.listM(id)
 	}
 
 	fetchMoreEvents = async (convoid) => {
+		if (!convoid) return
+		if (convoid.startsWith('cslight')) return [[], '']
 		if (!this.isInsync('events' + convoid)) {
 			await this.readyGate.entry()
 			await this.reconnectGate.entry(undefined, true)
@@ -535,6 +542,7 @@ export default class Store {
 			this.reconnect()
 		})
 
+		this.lightConvos = this.kv.match('light_convos') || {}
 		this.seenLoop()
 		await this.reconnect({user: user}) // already fetched
 		this.readyGate.open()
@@ -603,26 +611,36 @@ export default class Store {
 				// ignore sending message
 				if (lastmsgsent.id === lastmsgsent.data.message.idempotency_key) return
 
-				// send seen
-				this.api.markAsSeen(id, lastmsgsent.id)
-
 				// fire own event so guest code can update unread number
 				this.pubsub.publish('events', {
-					created: sb.Date.now(),
+					created: this.now(),
 					type: 'message_pong',
 					by: {type: 'user'},
 					data: {
 						message: {
 							conversation_id: id,
 							id: '*',
-							pongs: [{type: 'seen', created: sb.Date.now()}],
+							pongs: [{type: 'seen', created: this.now()}],
 						},
 					},
 				})
+				if (id.startsWith('cslight')) {
+					let old = this.lightConvos[id]
+					let user = this.matchUser()
+					if (!old) return
+					let mem = sb.find(old.members, (mem) => mem.type == 'user' && mem.id == user.id)
+					mem.seen_at = this.now()
+					this.kv.put('light_convos', this.lightConvos)
+					this.g_haveSentSeenM[lastmsgsent.id] = true
+					return
+				}
+
+				// send seen
+				this.api.markAsSeen(id, lastmsgsent.id)
 
 				let convo = this.cache.match('convo_' + id) || {}
 				let mem = sb.find(convo.members, (m) => m.id === user.id)
-				if (mem) mem.seen_at = sb.Date.now()
+				if (mem) mem.seen_at = this.now()
 				this._setConvo(convo)
 				this.g_haveSentSeenM[lastmsgsent.id] = true
 			})
@@ -838,7 +856,7 @@ export default class Store {
 		let convo
 
 		let alreadyFetched = false
-		if (cid) {
+		if (cid && !cid.startsWith('cslight')) {
 			convo = this.cache.match('convo_' + cid)
 			if (!convo || !convo.id) {
 				let {body: apiconvo, error} = await this.api.getConversation(cid)
@@ -849,6 +867,16 @@ export default class Store {
 			}
 		}
 
+		if (cid.startsWith('cslight')) {
+			convo = this.lightConvos[cid]
+			if (!convo) return
+			convo.events.push(ev)
+			convo.last_message_sent = ev
+			this.kv.put('light_convos', this.lightConvos)
+			this.pubsub.publish('events', ev)
+			return
+		}
+
 		if (!convo) return
 
 		// ignore wrong channel
@@ -962,11 +990,54 @@ export default class Store {
 
 	typing(cid) {
 		if (!cid) return
+		if (cid.startsWith('cslight')) return
 		this._typing(cid)
 	}
 
 	_typing = sb.throttle((convoid) => this.api.sendTyping(convoid), 3000, {trailing: false})
 
+	deleteLightConvo(id) {
+		delete this.lightConvos[id]
+		this.kv.put('light_convos', this.lightConvos)
+	}
+
+	startLightConvo(botid, message, locale) {
+		let convoid = 'cslight' + botid + '_' + this.now()
+		let user = this.cache.match('user') || {}
+
+		let old = this.lightConvos[convoid]
+		if (old) return {convo: old}
+		let now = this.now()
+		let ev = {}
+		ev.created = now
+		ev.event_time = now
+		ev.id = 'evfake' + now
+		ev.type = 'message_sent'
+		ev.by = {id: botid, type: 'bot'}
+		ev.data = {message: message}
+		ev.data.message.conversation_id = convoid
+		let newconvo = {
+			id: convoid,
+			locale: locale,
+			initial_by: botid,
+			created: now,
+			actived: now,
+			last_message_sent: ev,
+			members: [
+				{type: 'user', id: user.id},
+				{type: 'bot', id: botid, membership: 'active'},
+			],
+			state: 'active',
+			touchpoint: {id: convoid, channel: 'subiz', source: 'web'},
+			traffic_source: 'direct',
+			events: [ev],
+		}
+		this.pubsub.publish('events', ev)
+		this.lightConvos[convoid] = newconvo
+		this.kv.put('light_convos', this.lightConvos)
+		return {convo: newconvo}
+	}
+
 	async startConvo(req) {
 		if (!req) req = {}
 		await this.readyGate.entry()
@@ -990,17 +1061,18 @@ export default class Store {
 	}
 
 	createPostback(cid, postback) {
+		if (cid && cid.startsWith('cslight')) return
 		return this.api.createPostback(cid, postback)
 	}
 
 	sendReaction(cid, ev) {
+		if (cid && cid.startsWith('cslight')) return
 		return this.api.sendConvoEvent(cid, ev)
 	}
 
 	async sendConvoEvent(cid, type, data) {
 		await this.readyGate.entry()
 		var idempotency = sb.randomString(36)
-
 		let user = this.cache.match('user') || {}
 
 		var event = {
@@ -1044,6 +1116,8 @@ export default class Store {
 		})
 
 		if (event._error) return this.onWs(event) // dont send error msg
+		if (cid && cid.startsWith('cslight')) return
+
 		let {body: ret, error} = await this.api.sendConvoEvent(cid, event)
 		if (error) {
 			event._error = error
@@ -1059,7 +1133,7 @@ export default class Store {
 			dataLayer.push({event: 'SUBIZ Chat', event_action: 'Sent', event_label: 'User', first_interaction: 1})
 		}
 
-		this.kv.put('last_msg_sent', sb.Date.now())
+		this.kv.put('last_msg_sent', this.now())
 		return ret
 	}
 
@@ -1179,6 +1253,7 @@ export default class Store {
 
 	async listmessageapi(type, anchor, limit) {
 		let convoid = type
+		if (convoid && convoid.startsWith('cslight')) return [fakeevents, '', undefined, true]
 		let {body: events, code, error} = await this.api.listMessages(convoid, -limit, anchor)
 		if (error || code !== 200) return [[], anchor, error]
 		anchor = sb.get(sb.last(events), 'id')
@@ -1212,16 +1287,16 @@ export default class Store {
 	timeDiff = 0
 	async loopTime() {
 		if (this._die) return
-		let startms = sb.Date.now()
+		let startms = this.now()
 
 		// store not init
 		if (!sb.get(this.cache.match('user'), 'id')) return sb.setTimeout(() => this.loopTime(), 240000)
 
 		let {body: t, error} = await this.api.time()
 		if (error) return sb.setTimeout(() => this.loopTime(), 30000)
-		var latences = Math.abs(sb.Date.now() - startms) / 2
+		var latences = Math.abs(this.now() - startms) / 2
 		var serverMs = new sb.Date(t).getTime() + latences
-		var localMs = sb.Date.now()
+		var localMs = this.now()
 		this.timeDiff = Math.floor(serverMs - localMs)
 		sb.setTimeout(() => this.loopTime(), 240000)
 	}