@subiz/widget-v4 4.1.153 → 4.1.156

package/dist/HASH

@@ -1 +1 @@
-197f55a88dc
+1986e37f014

package/dist/malicious-app.js

@@ -1,15 +1,17 @@
-let hash = 'XXXXXXXX' // do not change, will be replaced to real hash
+if (!window._subiz_init_2094850928430) {
+	let hash = 'XXXXXXXX' // do not change, will be replaced to real hash
 
-window._subiz_init_2094850928430 = true
-window._subiz_init_2094850928430_keep_loading = true
-var tag = document.createElement('script')
-tag.async = 1
-tag.defer = true
-tag.src = 'https://public-gcs.subiz-cdn.com/widget-v4/public/' + hash + '.app.js'
-document.body.appendChild(tag)
+	window._subiz_init_2094850928430 = true
+	window._subiz_init_2094850928430_keep_loading = true
+	var tag = document.createElement('script')
+	tag.async = 1
+	tag.defer = true
+	tag.src = 'https://public-gcs.subiz-cdn.com/widget-v4/public/' + hash + '.app.js'
+	document.body.appendChild(tag)
 
-if (document.readyState === 'interactive' || document.readyState === 'complete') document.body.appendChild(tag)
-else
-	document.addEventListener('DOMContentLoaded', function (event) {
-		document.body.appendChild(tag)
-	}) //
+	if (document.readyState === 'interactive' || document.readyState === 'complete') document.body.appendChild(tag)
+	else
+		document.addEventListener('DOMContentLoaded', function (event) {
+			document.body.appendChild(tag)
+		}) //
+}

package/dist/screenshoot.js

@@ -3753,7 +3753,7 @@ function jsonifyTextPlain(param, done) {
     _defineProperty(this, "markAsReceived", (cid, messageId) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/messages/${messageId}/receive`));
     _defineProperty(this, "markAsSeen", (cid, messageId) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/messages/${messageId}/seen`));
     _defineProperty(this, "getConversation", cid => this.apireq.get(`/accounts/${this.accid}/conversations/${cid}`));
-    _defineProperty(this, "getLocaleContent", locale => this.apireq.get(`/accounts/${this.accid}/locales/${locale}`));
+    _defineProperty(this, "getLocaleContent", locale => this.apireq.get(`/accounts/${this.accid}/languages/${locale}`));
     _defineProperty(this, "sendEvent", data => this.apireq.addQuery('shorten', true).addQuery('x-referer', util/* default */.A.get(location, 'origin', '')).post(`/accounts/${this.accid}/users/${this.uid}/events`, data));
     _defineProperty(this, "submitForm", (form_id, page_url, device, data, user) => this.apireq.addQuery('x-referer', util/* default */.A.get(location, 'origin', '')).post(`/accounts/${this.accid}/users/${this.uid}/events`, {
       by: {
@@ -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;
@@ -10990,12 +11041,24 @@ function restoreViewport() {
 function modifyViewport() {
   if (document.body && document.body.classList) document.body.classList.add('sbz_no_scroll');
   if (document.documentElement && document.documentElement.classList) document.documentElement.classList.add('sbz_no_scroll');
-  let metatag = document.createElement('meta');
-  metatag.httpEquiv = 'X-UA-Compatible';
-  metatag.name = 'viewport';
-  metatag.id = 'subiz-meta-viewport';
-  metatag.content = 'maximum-scale=1.0, user-scalable=no, width=device-width, initial-scale=1.0';
-  document.getElementsByTagName('head')[0].appendChild(metatag);
+  let currentMetas = document.querySelectorAll('meta[name="viewport"]');
+  let shouldAddMetaTag = true;
+  for (let i = 0; i < currentMetas.length; i++) {
+    let meta = currentMetas[i];
+    let content = meta.getAttribute('content') || '';
+    if (content.indexOf('maximum-scale') > -1) {
+      shouldAddMetaTag = false;
+      break;
+    }
+  }
+  if (shouldAddMetaTag) {
+    let metatag = document.createElement('meta');
+    metatag.httpEquiv = 'X-UA-Compatible';
+    metatag.name = 'viewport';
+    metatag.id = 'subiz-meta-viewport';
+    metatag.content = 'maximum-scale=1.0, user-scalable=no, width=device-width, initial-scale=1.0';
+    document.getElementsByTagName('head')[0].appendChild(metatag);
+  }
 }
 ;// ./src/plugin.js
 

package/malicious-app.js

@@ -1,15 +1,17 @@
-let hash = 'XXXXXXXX' // do not change, will be replaced to real hash
+if (!window._subiz_init_2094850928430) {
+	let hash = 'XXXXXXXX' // do not change, will be replaced to real hash
 
-window._subiz_init_2094850928430 = true
-window._subiz_init_2094850928430_keep_loading = true
-var tag = document.createElement('script')
-tag.async = 1
-tag.defer = true
-tag.src = 'https://public-gcs.subiz-cdn.com/widget-v4/public/' + hash + '.app.js'
-document.body.appendChild(tag)
+	window._subiz_init_2094850928430 = true
+	window._subiz_init_2094850928430_keep_loading = true
+	var tag = document.createElement('script')
+	tag.async = 1
+	tag.defer = true
+	tag.src = 'https://public-gcs.subiz-cdn.com/widget-v4/public/' + hash + '.app.js'
+	document.body.appendChild(tag)
 
-if (document.readyState === 'interactive' || document.readyState === 'complete') document.body.appendChild(tag)
-else
-	document.addEventListener('DOMContentLoaded', function (event) {
-		document.body.appendChild(tag)
-	}) //
+	if (document.readyState === 'interactive' || document.readyState === 'complete') document.body.appendChild(tag)
+	else
+		document.addEventListener('DOMContentLoaded', function (event) {
+			document.body.appendChild(tag)
+		}) //
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.153",
+	"version": "4.1.156",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -13,10 +13,10 @@
 		"@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.3.0",
+		"less": "^4.4.0",
 		"less-loader": "^12.3.0",
 		"preact": "10.19.3"
 	},
@@ -29,8 +29,8 @@
 		"babel-loader": "^10.0.0",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.6.3",
-		"puppeteer": "^24.12.1",
-		"webpack": "^5.100.1",
+		"puppeteer": "^24.16.0",
+		"webpack": "^5.101.0",
 		"webpack-bundle-analyzer": "^4.10.2",
 		"webpack-cli": "^6.0.1",
 		"webpack-dev-server": "^5.2.2"

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/chatbox/main.js

@@ -217,10 +217,23 @@ function modifyViewport() {
 	if (document.body && document.body.classList) document.body.classList.add('sbz_no_scroll')
 	if (document.documentElement && document.documentElement.classList)
 		document.documentElement.classList.add('sbz_no_scroll')
-	let metatag = document.createElement('meta')
-	metatag.httpEquiv = 'X-UA-Compatible'
-	metatag.name = 'viewport'
-	metatag.id = 'subiz-meta-viewport'
-	metatag.content = 'maximum-scale=1.0, user-scalable=no, width=device-width, initial-scale=1.0'
-	document.getElementsByTagName('head')[0].appendChild(metatag)
+
+	let currentMetas = document.querySelectorAll('meta[name="viewport"]')
+	let shouldAddMetaTag = true
+	for (let i = 0; i < currentMetas.length; i++) {
+		let meta = currentMetas[i]
+		let content = meta.getAttribute('content') || ''
+		if (content.indexOf('maximum-scale') > -1) {
+			shouldAddMetaTag = false
+			break
+		}
+	}
+	if (shouldAddMetaTag) {
+		let metatag = document.createElement('meta')
+		metatag.httpEquiv = 'X-UA-Compatible'
+		metatag.name = 'viewport'
+		metatag.id = 'subiz-meta-viewport'
+		metatag.content = 'maximum-scale=1.0, user-scalable=no, width=device-width, initial-scale=1.0'
+		document.getElementsByTagName('head')[0].appendChild(metatag)
+	}
 }

package/src/store/api.js

@@ -15,7 +15,7 @@ export default class {
 		this.FileURL = FileURL
 		this.ApiURL = ApiURL
 		this.api41 = ajax
-			.setBaseUrl('https://api5.subiz.com.vn/4.1')
+			.setBaseUrl('https://api.sbz.vn/4.1')
 			.withCredentials(true)
 			.setContentType('text/plain')
 			.beforeHook(jsonifyTextPlain)
@@ -270,6 +270,55 @@ export default class {
 	}
 
 	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
+
+		// Step 2: Upload the file to the signed_url
+		let err = await new Promise((resolve) => {
+			const xhr = new sb.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}
+
+		// Step 3: Notify server of upload completion
+		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: sb.get(body, 'file.url', '')}
+	}
+
+	uploadToS32 = async (file) => {
 		var {body, error} = await ajax
 			.setBaseUrl('https://api5.subiz.com.vn/4.1')
 			.withCredentials(true)