@subiz/widget-v4 4.0.91 → 4.0.93

package/src/store/store.js

@@ -15,8 +15,7 @@ const page_loaded = sb.Date.now()
 
 // available localstorage key mask, user, hasManuallyClosed, isopen, close_preview_at, lastview, bot_run_logs, plugin_run_logs
 export default class Store {
-	constructor(ApiURL, FileURL, RealtimeURL, inmem, fakeapi, agenttoken) {
-		this.agent_token = agenttoken
+	constructor(ApiURL, FileURL, RealtimeURL, inmem, fakeapi) {
 		this.g_sync = {}
 		this.forceDevice = null
 		this.forcePlugins = {}
@@ -354,9 +353,6 @@ export default class Store {
 		// trust cookie, remove localstorage
 		if (mask && localstorageMask && mask !== localstorageMask) this.clearBrowserData()
 
-		// use this mask
-		if (this.agent_token) mask = await this.api.createAgentUser(this.agent_token)
-
 		var userId = ''
 		if (mask) {
 			let parts = mask.split('@')
@@ -396,6 +392,36 @@ export default class Store {
 		return mask
 	}
 
+	async login(accid, user_id, tokenGenerator) {
+		let user = await this.api.setTokenGenerator(accid, user_id, tokenGenerator)
+		if (user.error) return user
+
+		this.clearBrowserData()
+		this.readyGate.close()
+		accid = (accid || '').trim()
+
+		this.g_sync = {}
+		this.new_visitor = false // for checking returning or new visitor
+
+		if (this.realtime) this.realtime.stop()
+		if (this.fake) this.realtime = new RealtimeFake()
+		else this.realtime = new Realtime(this.RealtimeURL, {getAccessToken: () => this.api.token_generator()})
+
+		this.realtime.onEvent(this.onWs.bind(this))
+		this.realtime.onInterrupted(() => this.reconnectWs(accid, user.id))
+
+		this.seenLoop()
+		await this.reconnect()
+		this.readyGate.open()
+		this.reconnectWs(accid, user.id)
+
+		return user
+	}
+
+	logout(user_id) {
+		this.api.setTokenGenerator(undefined, undefined, undefined)
+	}
+
 	seenQueue = [] // convoid will be seen
 	seenLoop() {
 		// periodically send seen
@@ -618,8 +644,6 @@ export default class Store {
 
 		// convo events
 		let user = this.kv.match('user') || {}
-		const INTEGRATION_ID = sb.getIntegrationId(user.account_id)
-
 		let cid = sb.convoOfEv(ev)
 		let convo
 		if (cid) {
@@ -633,10 +657,10 @@ export default class Store {
 
 		if (!convo) return
 
-		// ignore wrong integration
-		let integrationId = sb.get(convo, 'integration.id', '')
-		if (!integrationId) integrationId = sb.get(ev, 'data.message.integration_id', '')
-		if (!integrationId || integrationId !== INTEGRATION_ID) return
+		// ignore wrong channel
+		let channel = sb.get(ev, 'touchpoint.channel', '')
+		if (channel && channel != 'subiz') return
+
 		this.pubsub.publish('events', ev)
 
 		// server doesn't send events before conversation_joined occur
@@ -867,9 +891,9 @@ export default class Store {
 
 		// ignore invalid conversation
 		let user = this.kv.match('user')
-		const INTEGRATION_ID = sb.getIntegrationId(user.account_id)
-		let integrationId = sb.get(convo, 'integration.id', '')
-		if (!integrationId || integrationId !== INTEGRATION_ID) return
+
+		let channel = sb.get(convo, 'touchpoint.channel', '')
+		if (channel && channel != 'subiz') return
 		let allconvo = {}
 		// trim
 		sb.map(this.cache.all(), (value, key) => {

package/src/util/common.js

@@ -311,10 +311,6 @@ export function orderBy(a, k, d) {
 	return clone
 }
 
-export function getIntegrationId(accid) {
-	return `${accid}.subizv4.subikon`
-}
-
 export function isPhone(phone) {
 	var re = /^[\+]?[(]?[0-9]{3}[)]?[-\s\.]?[0-9]{3}[-\s\.]?[0-9]{4,6}$/im
 	return re.test(String(phone))

package/src/util/index.js

@@ -18,6 +18,7 @@ import * as common from './common.js'
 sb = Object.assign(sb, common)
 
 sb.Gate = require('./gate.js').default
+sb.Mutex = require('./mutex.js').default
 
 var op = require('./op.js')
 sb.get = op.get

package/src/util/mutex.js

@@ -0,0 +1,27 @@
+export default class Mutex {
+	constructor() {
+		this.isOpen = true
+		this.cbs = []
+	}
+
+	_check() {
+		if (!this.isOpen) return
+		let cb = this.cbs.pop()
+		if (!cb) return
+		this.isOpen = false
+		cb()
+	}
+
+	lock() {
+		return new Promise((resolve) => {
+			this.cbs.push(resolve)
+			this._check()
+		})
+	}
+
+	unlock() {
+		if (this.isOpen) return
+		this.isOpen = true
+		this._check()
+	}
+}

package/dist/0b82fa7e5c3b07b40a44.png

@@ -1 +0,0 @@
-module.exports = __webpack_public_path__ + "assets/img/emoji/messenger/sub_58.824_78.431.f910f2a.png";

package/dist/0f4af006e38ee8b93633.png

@@ -1 +0,0 @@
-module.exports = __webpack_public_path__ + "assets/img/emoji/messenger/sub_60.784_29.412.e36d284.png";