@subiz/widget-v4 4.1.163 → 4.1.165

package/dist/HASH

@@ -1 +1 @@
-198a2dde018
+198a3089a0c

package/dist/screenshoot.js

@@ -2216,6 +2216,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   isBlockEmpty: () => (/* binding */ isBlockEmpty),
 /* harmony export */   isConvoSeen: () => (/* binding */ isConvoSeen),
 /* harmony export */   isEmail: () => (/* binding */ isEmail),
+/* harmony export */   isEmptyBlock: () => (/* binding */ isEmptyBlock),
+/* harmony export */   isEmptyMessage: () => (/* binding */ isEmptyMessage),
 /* harmony export */   isNumber: () => (/* binding */ isNumber),
 /* harmony export */   isPhone: () => (/* binding */ isPhone),
 /* harmony export */   isURL: () => (/* binding */ isURL),
@@ -3475,6 +3477,15 @@ function absLink(url) {
   if (!url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('//')) return 'http://' + url;
   return url;
 }
+function isEmptyBlock(block) {
+  if (!block || !block.type) return true;
+  let hasContent = size(filter(map(block.content, block => isEmptyBlock(block)), isEmpty => !isEmpty)) > 0;
+  return !trim(block.text) && !hasContent;
+}
+function isEmptyMessage(msg) {
+  if (!msg) return true;
+  if (!msg.text && isEmptyBlock(msg.block) && !size(msg.attachments)) return true;
+}
 
 /***/ })
 
@@ -8548,7 +8559,7 @@ class TextMessage extends common/* Com */.Mw {
     }, tags);
   }
   renderBlock(block) {
-    if (isEmptyBlock(block)) return null;
+    if (util/* default */.A.isEmptyBlock(block)) return null;
     let t = new util/* default */.A.Date(util/* default */.A.get(this.props.ev, 'created')).toLocaleString();
     let byType = util/* default */.A.get(this.props.ev, 'by.type');
     if (byType !== 'user') byType = 'agent';
@@ -8574,11 +8585,6 @@ class TextMessage extends common/* Com */.Mw {
     }));
   }
 }
-function isEmptyBlock(block) {
-  if (!block || !block.type) return true;
-  let hasContent = util/* default */.A.size(util/* default */.A.filter(util/* default */.A.map(block.content, block => isEmptyBlock(block)), isEmpty => !isEmpty)) > 0;
-  return !util/* default */.A.trim(block.text) && !hasContent;
-}
 ;// ./src/chatbox/InfoMessage.js
 
 function getRateLang(rating) {
@@ -8855,7 +8861,7 @@ class Event extends common/* Com */.Mw {
     let ev = this.props.event.ev;
     let attachments = util/* default */.A.get(ev, 'data.message.attachments');
     let hasForm = util/* default */.A.find(attachments, att => att.type === 'form');
-    if (isEmptyMessage(util/* default */.A.get(ev, 'data.message'))) return null;
+    if (util/* default */.A.isEmptyMessage(util/* default */.A.get(ev, 'data.message'))) return null;
     this.tryLoadOrder(ev);
     let t = new util/* default */.A.Date(ev.created).toLocaleString();
     if (util/* default */.A.get(ev, 'by.type') !== 'user') {
@@ -9124,10 +9130,6 @@ class Event extends common/* Com */.Mw {
     return acc.name;
   }
 }
-function isEmptyMessage(msg) {
-  if (!msg) return true;
-  if (!msg.text && !msg.block && !util/* default */.A.size(msg.attachments)) return true;
-}
 ;// ./src/chatbox/Events.js
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.163",
+	"version": "4.1.165",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",

package/src/chatbox/ChatButton.js

@@ -171,6 +171,10 @@ export default class ChatButton extends Com {
 			// if lastview is list, make sure we have at least one convo or fallback
 			// to preview click
 			if (lastview.view !== 'list' || sb.size(this.props.store.matchConvo('*')) > 0) {
+				if (lastview.view == 'chat' && !sb.get(lastview, 'opts.cid')) {
+					// dont have last view => equal preview click
+					return this.onPreviewClick()
+				}
 				return this.props.onClick && this.props.onClick(Object.assign({}, lastview.opts, {view: lastview.view})) // last view
 			}
 		}
@@ -181,7 +185,6 @@ export default class ChatButton extends Com {
 
 	onPreviewClick(e) {
 		let cid = sb.convoOfEv(this.state.previewEvent)
-
 		if (!cid) {
 			let convos = sb.map(this.props.store.matchConvo('*'))
 			let convo = sb.find(convos, (convo) => !sb.isConvoSeen(convo, this.props.store.matchUser().id))
@@ -200,6 +203,7 @@ export default class ChatButton extends Com {
 
 	renderPreview() {
 		let account = this.props.store.matchAccount()
+		if (!account) return null
 		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)) || {}

package/src/chatbox/Header.js

@@ -209,6 +209,7 @@ Vui lòng hỏi chúng tôi bất cứ điều gì hoặc chia sẻ phản hồi
 
 		var $unreadcount = null
 		let user = this.props.store.matchUser()
+		if (!user || !user.id) return null
 
 		let unreadcount = 0
 		sb.map(allconvos, (convo) => {

package/src/chatbox/Widget.js

@@ -783,7 +783,7 @@ export default class Widget extends Com {
 			let _creating = this._creating
 			this.setState({creating: true})
 			let botid = cid.split('_')[0].slice(7) // 6 = len(cslight)
-			let oldconvo = this.props.store.matchConvo(this.props.cid)
+			let oldconvo = this.props.store.matchConvo(this.props.cid) || {}
 			const {convo, error} = await this.props.store.startConvo({
 				locale: this.props.t.locale(),
 				message: text,

package/src/chatbox/main.js

@@ -52,6 +52,12 @@ export default class Main extends Com {
 		this.props.store.onResetCSS(this, () => this.refreshCSS())
 		this.props.store.onConvoEvent(this, (ev) => this.onConvoEvent(ev))
 		this.props.store.onUpdate(this, (_) => this.checkExpand())
+		this.props.store.onDestroyed(this, (_) => {
+			this.setState({
+				widgetView: '',
+				widgetConvoId: '',
+			})
+		})
 		await this.refreshCSS()
 		this.setState({cssready: true})
 

package/src/store/inmem_localstorage.js

@@ -3,6 +3,7 @@ var localStorageMemory = {}
 var cache = {}
 
 localStorageMemory.length = 0
+localStorageMemory.cache = cache
 
 localStorageMemory.getItem = function (key) {
 	if (key in cache) return cache[key]

package/src/store/kv.js

@@ -31,7 +31,6 @@ export default class {
 			inmemItemM[item.key] = item.value
 		})
 		this.cache = inmemItemM
-
 		// If the cache is full. Randomly remove half of the cache. credit to thanos
 		// this is so simple since we don't need to keep track of last modified time
 		// for each key. Implementing a LRU cache won't add much value.

package/src/store/lsdb.js

@@ -44,10 +44,15 @@ export default class {
 	}
 
 	clear(table) {
+		var keys = []
 		for (var i = 0; i < this.localStorage.length; i++) {
 			let key = this.localStorage.key(i)
 			if (!key.startsWith(this.schema + '#' + table + '#')) continue
-			this.localStorage.removeItem(key)
+			keys.push(key)
+		}
+
+		for (var i = 0; i < keys.length; i++) {
+			this.localStorage.removeItem(keys[i])
 		}
 		this.allkeys = {}
 	}

package/src/store/store.js

@@ -11,7 +11,7 @@ var cookie = require('cookie_js')
 cookie.defaults.path = '/'
 cookie.expiresMultiplier = 60 * 60 * 24 // days
 cookie.defaults.expires = 3650 // 10 year
-
+let memlocalStorage = require('./inmem_localstorage.js')
 const MAX_CONVO = 20
 const page_loaded = sb.Date.now()
 
@@ -35,7 +35,6 @@ 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)
 
@@ -331,6 +330,7 @@ export default class Store {
 
 	// must ensure only call this function after init is done
 	matchUser = () => {
+		if (!this.cache) return undefined
 		this._touchAcc()
 		return this.cache.match('user')
 	}
@@ -342,6 +342,7 @@ export default class Store {
 
 	matchUnread = () => {
 		let user = this.matchUser()
+		if (!user || !user.id) return // not init
 		let allconvos = this.matchConvo('*')
 		let unreadcount = 0
 		sb.map(allconvos, (convo) => {
@@ -538,8 +539,13 @@ export default class Store {
 				}
 			}
 		}
+		if (this.cookie.get('__sbref', userRef) != userRef) {
+			cleanMyLocalStorage()
+			this.clearBrowserData()
+		}
+		this.lightConvos = {} // convo that have not been created, for faking bot conversation
+		this.cache = new KV(new LSDB('sbz2023', true), 'kv')
 
-		if (this.cookie.get('__sbref', userRef) != userRef) cleanMyLocalStorage()
 		this.api.setAuth({accid: accid})
 		// set cookie forever
 		if (userRef) this.cookie.set('__sbref', userRef)
@@ -611,6 +617,7 @@ export default class Store {
 		sb.clearInterval(this._seenInterval)
 		this._seenInterval = sb.setInterval(() => {
 			if (this._die) return sb.clearInterval(this._seenInterval)
+			if (!this.cache) return // not init
 			// deduplicate
 			this.seenQueue = [...new Set(this.seenQueue)]
 			let user = this.cache.match('user') || {}
@@ -647,7 +654,7 @@ export default class Store {
 					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()
+					if (mem) mem.seen_at = this.now()
 					this.kv.put('light_convos', this.lightConvos)
 					this.g_haveSentSeenM[lastmsgsent.id] = true
 					return
@@ -1196,6 +1203,7 @@ export default class Store {
 	}
 
 	onUpdate = (o, cb) => this.pubsub.on2(o, 'account', cb)
+	onDestroyed = (o, cb) => this.pubsub.on2(o, 'destroy', cb)
 	onConnection = (o, cb) => this.pubsub.on2(o, 'connection', cb)
 	onResetCSS = (o, cb) => this.pubsub.on2(o, 'resetCSS', cb)
 	onHighlight = (o, cb) => this.pubsub.on2(o, 'highlight', cb)
@@ -1310,7 +1318,7 @@ export default class Store {
 		let startms = this.now()
 
 		// store not init
-		if (!sb.get(this.cache.match('user'), 'id')) return sb.setTimeout(() => this.loopTime(), 240000)
+		if (!this.cache || !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)
@@ -1352,16 +1360,18 @@ export default class Store {
 		sb.each(this.cookie.all(), (v, k) => {
 			if ((k || '').startsWith('__sb')) this.cookie.remove(k)
 		})
-		this.kv.destroy()
+		if (this.kv) this.kv.destroy()
 		this.kv = new KV(new LSDB('sbz2023', this.inmem), 'kv')
-		this.chain.destroy()
+		if (this.chain) this.chain.destroy()
 		this.chain = new Chain(new LSDB('cbz2023', true), 'ch')
+		if (this.realtime) this.realtime.stop()
+		if (this.cache) this.cache.destroy()
+		this.pubsub.publish('destroy')
 	}
 
 	destroy() {
 		this._die = true
-		if (this.kv) this.kv.destroy()
-		if (this.chain) this.chain.destroy()
+		this.clearBrowserData()
 		sb.clearInterval(this._seenInterval)
 		if (this.realtime) this.realtime.stop()
 		this.readyGate.close()
@@ -1511,6 +1521,7 @@ let cleanLocalStorage = () => {
 		for (var key in localStorage) {
 			if (key && (key.startsWith('cbz2020') || key.startsWith('sbz2020'))) {
 				localStorage.removeItem(key)
+				memlocalStorage.removeItem(key)
 			}
 		}
 	})
@@ -1532,6 +1543,7 @@ let cleanMyLocalStorage = () => {
 					key.startsWith('sbz2023'))
 			) {
 				localStorage.removeItem(key)
+				memlocalStorage.removeItem(key)
 			}
 		}
 	})

package/tracking.js

@@ -22,6 +22,7 @@ setTimeout(() => {
 	// Collect device and browser info
 	var info = {
 		status: status,
+		href: window.location.href,
 		userAgent: navigator.userAgent,
 		platform: navigator.platform,
 		language: navigator.language,
@@ -41,4 +42,4 @@ setTimeout(() => {
 	}
 
 	xhr.send(JSON.stringify(info))
-}, 10000)
+}, 15000)