@subiz/widget-v4 4.1.13 → 4.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.13",
+	"version": "4.1.14",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,7 +14,7 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^3.1.9",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.27.0",
+		"core-js": "^3.27.1",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.1.3",
@@ -24,11 +24,11 @@
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.20.7",
-		"@babel/core": "^7.20.7",
+		"@babel/core": "^7.20.12",
 		"@babel/plugin-proposal-class-properties": "^7.18.6",
 		"@babel/plugin-transform-react-jsx": "^7.20.7",
 		"@babel/preset-env": "^7.20.2",
-		"babel-loader": "^9.1.0",
+		"babel-loader": "^9.1.2",
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.0",
 		"prettier": "^2.8.1",

package/src/store/store.js

@@ -47,10 +47,11 @@ export default class Store {
 			this.cookie = inmemCookie
 		}
 
+		cleanLocalStorage()
 		this.pubsub = new sb.Pubsub()
-		this.kv = new stor8.kv(new stor8.lsdb('sbz2020', this.inmem), 'kv')
-		this.cache = new stor8.kv(new stor8.lsdb('sbz2020', true), 'kv')
-		this.chain = new stor8.chain(new stor8.lsdb('cbz2020', true), 'ch')
+		this.kv = new stor8.kv(new stor8.lsdb('sbz2023', this.inmem), 'kv')
+		this.cache = new stor8.kv(new stor8.lsdb('sbz2023', true), 'kv')
+		this.chain = new stor8.chain(new stor8.lsdb('cbz2023', true), 'ch')
 		this.getLocaleContent = this.api.getLocaleContent
 
 		// dont dupplicate seen
@@ -60,9 +61,9 @@ export default class Store {
 		window.addEventListener('focus', () => this.sendPresence())
 
 		// faster send rate when has focus
-		setInterval(() => this.browserVisibility === 'visible' && document.hasFocus() && this.sendPresence(), 20000) // dont bother delete this
+		sb.setInterval(() => this.browserVisibility === 'visible' && document.hasFocus() && this.sendPresence(), 20000) // dont bother delete this
 		// slower send rate send when no focus
-		setInterval(() => (this.browserVisibility !== 'visible' || document.hasFocus()) && this.sendPresence(), 60000) // dont bother delete this
+		sb.setInterval(() => (this.browserVisibility !== 'visible' || document.hasFocus()) && this.sendPresence(), 60000) // dont bother delete this
 
 		onVisibilityChange((val) => {
 			this.browserVisibility = val
@@ -73,8 +74,8 @@ export default class Store {
 		this.device = this.getDeviceInfo()
 
 		// try to get Google Analytics tracking id and client id by periodically checking it after an interval
-		const _gaInterval = setInterval(() => {
-			let user = this.kv.match('user') || {}
+		const _gaInterval = sb.setInterval(() => {
+			let user = this.cache.match('user') || {}
 			if (!user.id) return // store not init
 			var dev = this.getDeviceInfo()
 			if (!dev.ga_tracking_ids || !dev.ga_client_id) return
@@ -142,7 +143,7 @@ export default class Store {
 		await this.readyGate.entry()
 		this.disconnect('account')
 		await this.reconnect()
-		setTimeout(this.pubsub.publish('resetCSS'), 10)
+		sb.setTimeout(this.pubsub.publish('resetCSS'), 10)
 	}
 
 	getDeviceInfo() {
@@ -225,7 +226,7 @@ export default class Store {
 	// must ensure only call this function after init is done
 	matchUser = () => {
 		this._touchAcc()
-		return this.kv.match('user')
+		return this.cache.match('user')
 	}
 
 	suggest_addresses = (keyword) => this.api.suggest_address(keyword)
@@ -293,7 +294,7 @@ export default class Store {
 	listEvents = (id) => {
 		if (!id || id === '*' || typeof id !== 'string') return
 		if (!this.isInsync('events' + id)) {
-			setTimeout(async () => {
+			sb.setTimeout(async () => {
 				await this.readyGate.entry()
 				await this.reconnectGate.entry(undefined, true)
 				if (this.isInsync('events' + id)) return this.reconnectGate.open()
@@ -324,7 +325,16 @@ export default class Store {
 	wsGate = new sb.Gate(true)
 
 	// last widget screen
-	matchLastview = () => this.kv.match('lastview') || {}
+	matchLastview = () => {
+		let lastView = this.kv.match('lastview') || {}
+
+		// make sure last view of correct user
+		let user = this.cache.match('user') || {}
+		if (!user.id) return {}
+		if (lastView.user_id != user.id) return {}
+		return lastView
+	}
+
 	matchIsOpen = () => !!this.kv.match('isopen') // is widget currently open
 	matchHasManuallyClosed = () => !!this.kv.match('hasManuallyClosed') // true if user has ever closed the widget
 	matchClosePreviewAt = () => this.kv.match('close_preview_at') || 0
@@ -332,8 +342,8 @@ export default class Store {
 	sendPresence = sb.throttle(
 		async () => {
 			await this.readyGate.entry()
-			if (!sb.get(this.kv.match('user'), 'id')) return // store not init
-			if (sb.isUserBanned(this.kv.match('user'))) return
+			if (!sb.get(this.cache.match('user'), 'id')) return // store not init
+			if (sb.isUserBanned(this.cache.match('user'))) return
 
 			let hasfocus = this.browserVisibility === 'visible' && document.hasFocus()
 			if (!hasfocus) {
@@ -454,10 +464,10 @@ export default class Store {
 		// periodically send seen
 		this.seenQueue = []
 		clearInterval(this._seenInterval)
-		this._seenInterval = setInterval(() => {
+		this._seenInterval = sb.setInterval(() => {
 			// deduplicate
 			this.seenQueue = [...new Set(this.seenQueue)]
-			let user = this.kv.match('user') || {}
+			let user = this.cache.match('user') || {}
 			sb.map(this.seenQueue, (id) => {
 				var events = this.listEvents(id)
 				if (!events) return
@@ -550,7 +560,7 @@ export default class Store {
 
 	_setUser(user) {
 		user = sb.cloneDeep(user)
-		let olduser = this.kv.match('user') || {}
+		let olduser = this.cache.match('user') || {}
 		var accid = olduser.account_id || user.account_id
 		var id = olduser.id || user.id
 
@@ -567,7 +577,7 @@ export default class Store {
 		olduser.account_id = accid
 		olduser.id = id
 
-		this.kv.put('user', olduser)
+		this.cache.put('user', olduser)
 		this.pubsub.publish('account')
 	}
 
@@ -666,7 +676,7 @@ export default class Store {
 		if (!ev || !ev.type) return
 		ev.created = sb.getMs(ev.created)
 		if (ev.type === 'user_info_updated') {
-			let user = sb.cloneDeep(this.kv.match('user'))
+			let user = sb.cloneDeep(this.cache.match('user'))
 			let attrs = sb.get(ev, 'data.user.attributes') || []
 			sb.map(attrs, (attr) => sb.setUserAttr(user, attr))
 			this._setUser(user)
@@ -674,7 +684,7 @@ export default class Store {
 		}
 
 		// convo events
-		let user = this.kv.match('user') || {}
+		let user = this.cache.match('user') || {}
 		let cid = sb.convoOfEv(ev)
 		let convo
 
@@ -702,7 +712,7 @@ export default class Store {
 		// so re-get events of this conversation to ensure we dont miss any event
 		if (ev.type === 'conversation_joined') {
 			let members = sb.get(ev, 'data.conversation.members', [])
-			let me = sb.find(members, (m) => m.id === this.kv.match('user').id)
+			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)
@@ -733,7 +743,7 @@ export default class Store {
 	}
 
 	async restConvoEvent(ev) {
-		let user = this.kv.match('user')
+		let user = this.cache.match('user')
 		let cid = sb.convoOfEv(ev)
 		let convo = this.cache.match('convo_' + cid) || {}
 		if (ev.type === 'conversation_state_updated') {
@@ -858,7 +868,7 @@ export default class Store {
 		await this.readyGate.entry()
 		var idempotency = sb.randomString(36)
 
-		let user = this.kv.match('user') || {}
+		let user = this.cache.match('user') || {}
 
 		var event = {
 			id: idempotency,
@@ -925,7 +935,7 @@ export default class Store {
 		let count = 0
 
 		// ignore invalid conversation
-		let user = this.kv.match('user')
+		let user = this.cache.match('user')
 
 		let channel = sb.get(convo, 'touchpoint.channel', '')
 		if (channel && channel != 'subiz') return
@@ -964,7 +974,11 @@ export default class Store {
 		}
 	}
 	closePreview = () => this.kv.put('close_preview_at', new sb.Date().getTime())
-	setLastview = (view, opts) => this.kv.put('lastview', {view, opts})
+	setLastview = (view, opts) => {
+		let user = this.cache.match('user') || {}
+		if (!user.id) return // store not init
+		this.kv.put('lastview', {user_id: user.id, view, opts})
+	}
 
 	matchLastPluginRun(pluginid) {
 		let log = this.kv.match('plugin_run_logs') || {}
@@ -983,7 +997,7 @@ export default class Store {
 	}
 
 	sendImpression(id) {
-		let user = this.kv.match('user') || {}
+		let user = this.cache.match('user') || {}
 		let log = this.kv.match('plugin_run_logs') || {}
 		log[id] = {web_plugin_id: id, created: this.now()}
 		this.kv.put('plugin_run_logs', log)
@@ -998,7 +1012,7 @@ export default class Store {
 	}
 
 	sendConversion(id, fields, impressionToken) {
-		let user = this.kv.match('user') || {}
+		let user = this.cache.match('user') || {}
 		let submission = {account_id: user.account_id, user_id: user.id, fields: fields}
 
 		let conv = this.kv.match('conversions') || {}
@@ -1034,7 +1048,7 @@ export default class Store {
 		})
 
 		// mark conversation as received
-		let user = this.kv.match('user') || {}
+		let user = this.cache.match('user') || {}
 		for (let i = 0; i < events.length; i++) {
 			let ev = events[i].value
 
@@ -1055,15 +1069,15 @@ export default class Store {
 		let startms = sb.Date.now()
 
 		// store not init
-		if (!sb.get(this.kv.match('user'), 'id')) return setTimeout(() => this.loopTime(), 240000)
+		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 setTimeout(() => this.loopTime(), 30000)
+		if (error) return sb.setTimeout(() => this.loopTime(), 30000)
 		var latences = Math.abs(sb.Date.now() - startms) / 2
 		var serverMs = new sb.Date(t).getTime() + latences
 		var localMs = sb.Date.now()
 		this.timeDiff = Math.floor(serverMs - localMs)
-		setTimeout(() => this.loopTime(), 240000)
+		sb.setTimeout(() => this.loopTime(), 240000)
 	}
 
 	replaceFileUrl(src) {
@@ -1098,9 +1112,9 @@ export default class Store {
 			if ((k || '').startsWith('__sb')) this.cookie.remove(k)
 		})
 		this.kv.destroy()
-		this.kv = new stor8.kv(new stor8.lsdb('sbz2020', this.inmem), 'kv')
+		this.kv = new stor8.kv(new stor8.lsdb('sbz2023', this.inmem), 'kv')
 		this.chain.destroy()
-		this.chain = new stor8.chain(new stor8.lsdb('cbz2020', true), 'ch')
+		this.chain = new stor8.chain(new stor8.lsdb('cbz2023', true), 'ch')
 	}
 
 	destroy() {
@@ -1245,3 +1259,18 @@ let tabletCheck =
 	/(ipad|tablet|(android(?!.*mobile))|(windows(?!.*phone)(.*touch))|kindle|playbook|silk|(puffin(?!.*(IP|AP|WP))))/.test(
 		navigator.userAgent,
 	)
+
+let cleanLocalStorage = () => {
+	try {
+		localStorage
+	} catch (e) {
+		return
+	}
+	sb.setTimeout(() => {
+		for (var key in localStorage) {
+			if ((key && key.startsWith('cbz2020')) || key.startsWith('sbz2020')) {
+				localStorage.removeItem(key)
+			}
+		}
+	})
+}

package/src/util/common.js

@@ -14,8 +14,8 @@ export var stringify = f.contentWindow.JSON.stringify
 var parse = f.contentWindow.JSON.parse
 export var Date = f.contentWindow.Date
 export var requestAnimationFrame = f.contentWindow.requestAnimationFrame
-export var setTimeout = f.contentWindow.setTimeout
-export var setInterval = f.contentWindow.setInterval
+export var setTimeout = f.contentWindow.setTimeout.bind(f.contentWindow)
+export var setInterval = f.contentWindow.setInterval.bind(f.contentWindow)
 
 // convoOfEv extracts the ID of the conversation
 // that event is sent to