@subiz/widget-v4 4.1.165 → 4.1.167

package/dist/HASH

@@ -1 +1 @@
-198a3089a0c
+198a3614cdc

package/dist/screenshoot.js

@@ -420,6 +420,7 @@ module.exports = ajax
 var localStorageMemory = {};
 var cache = {};
 localStorageMemory.length = 0;
+localStorageMemory.cache = cache;
 localStorageMemory.getItem = function (key) {
   if (key in cache) return cache[key];
   return null;
@@ -4093,10 +4094,14 @@ const LIMIT = 80;
     }
   }
   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 = {};
   }
@@ -4823,6 +4828,7 @@ var cookie = __webpack_require__(5672);
 cookie.defaults.path = '/';
 cookie.expiresMultiplier = 60 * 60 * 24;
 cookie.defaults.expires = 3650;
+let store_memlocalStorage = __webpack_require__(450);
 const MAX_CONVO = 20;
 const page_loaded = util/* default */.A.Date.now();
 class Store {
@@ -4833,6 +4839,7 @@ class Store {
     store_defineProperty(this, "_currentViewingProduct", {});
     store_defineProperty(this, "new_visitor", true);
     store_defineProperty(this, "matchUser", () => {
+      if (!this.cache) return undefined;
       this._touchAcc();
       return this.cache.match('user');
     });
@@ -4841,6 +4848,7 @@ class Store {
     store_defineProperty(this, "matchPaymentMethods", () => this.cache.match('payment_methods'));
     store_defineProperty(this, "matchUnread", () => {
       let user = this.matchUser();
+      if (!user || !user.id) return;
       let allconvos = this.matchConvo('*');
       let unreadcount = 0;
       util/* default */.A.map(allconvos, convo => {
@@ -4971,6 +4979,7 @@ class Store {
       this.seenQueue.push(id);
     });
     store_defineProperty(this, "onUpdate", (o, cb) => this.pubsub.on2(o, 'account', cb));
+    store_defineProperty(this, "onDestroyed", (o, cb) => this.pubsub.on2(o, 'destroy', cb));
     store_defineProperty(this, "onConnection", (o, cb) => this.pubsub.on2(o, 'connection', cb));
     store_defineProperty(this, "onResetCSS", (o, cb) => this.pubsub.on2(o, 'resetCSS', cb));
     store_defineProperty(this, "onHighlight", (o, cb) => this.pubsub.on2(o, 'highlight', cb));
@@ -5007,7 +5016,6 @@ class Store {
     this.FileURL = FileURL;
     this._track_page_view = true;
     this.device_type = 'desktop';
-    this.lightConvos = {};
     if (this.fake) this.api = new api_fake(ApiURL, FileURL);else this.api = new api(ApiURL, FileURL);
     if (!inmem) {
       try {
@@ -5272,7 +5280,12 @@ class Store {
         }
       }
     }
-    if (this.cookie.get('__sbref', userRef) != userRef) cleanMyLocalStorage();
+    if (this.cookie.get('__sbref', userRef) != userRef) {
+      cleanMyLocalStorage();
+      this.clearBrowserData();
+    }
+    this.lightConvos = {};
+    this.cache = new kv(new lsdb('sbz2023', true), 'kv');
     this.api.setAuth({
       accid: accid
     });
@@ -5345,6 +5358,7 @@ class Store {
     util/* default */.A.clearInterval(this._seenInterval);
     this._seenInterval = util/* default */.A.setInterval(() => {
       if (this._die) return util/* default */.A.clearInterval(this._seenInterval);
+      if (!this.cache) return;
       this.seenQueue = [...new Set(this.seenQueue)];
       let user = this.cache.match('user') || {};
       util/* default */.A.map(this.seenQueue, id => {
@@ -5378,7 +5392,7 @@ class Store {
           let user = this.matchUser();
           if (!old) return;
           let mem = util/* default */.A.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;
@@ -5951,7 +5965,7 @@ class Store {
   async loopTime() {
     if (this._die) return;
     let startms = this.now();
-    if (!util/* default */.A.get(this.cache.match('user'), 'id')) return util/* default */.A.setTimeout(() => this.loopTime(), 240000);
+    if (!this.cache || !util/* default */.A.get(this.cache.match('user'), 'id')) return util/* default */.A.setTimeout(() => this.loopTime(), 240000);
     let {
       body: t,
       error
@@ -5988,15 +6002,17 @@ class Store {
     util/* default */.A.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();
     util/* default */.A.clearInterval(this._seenInterval);
     if (this.realtime) this.realtime.stop();
     this.readyGate.close();
@@ -6132,6 +6148,7 @@ let cleanLocalStorage = () => {
     for (var key in localStorage) {
       if (key && (key.startsWith('cbz2020') || key.startsWith('sbz2020'))) {
         localStorage.removeItem(key);
+        store_memlocalStorage.removeItem(key);
       }
     }
   });
@@ -6146,6 +6163,7 @@ let cleanMyLocalStorage = () => {
     for (var key in localStorage) {
       if (key && (key.startsWith('cbz2020') || key.startsWith('sbz2020') || key.startsWith('sbz2022') || key.startsWith('sbz2023'))) {
         localStorage.removeItem(key);
+        store_memlocalStorage.removeItem(key);
       }
     }
   });
@@ -6337,6 +6355,9 @@ class ChatButton extends common/* Com */.Mw {
     let lastview = this.props.store.matchLastview();
     if (util/* default */.A.get(lastview, 'view')) {
       if (lastview.view !== 'list' || util/* default */.A.size(this.props.store.matchConvo('*')) > 0) {
+        if (lastview.view == 'chat' && !util/* default */.A.get(lastview, 'opts.cid')) {
+          return this.onPreviewClick();
+        }
         return this.props.onClick && this.props.onClick(Object.assign({}, lastview.opts, {
           view: lastview.view
         }));
@@ -6367,6 +6388,7 @@ class ChatButton extends common/* Com */.Mw {
   }
   renderPreview() {
     let account = this.props.store.matchAccount();
+    if (!account) return null;
     let accountSetting = this.props.plugin.chatbox;
     let byid = util/* default */.A.get(this.state.previewEvent, 'by.display_id', util/* default */.A.get(this.state.previewEvent, 'by.id'));
     let agent = this.props.store.matchAgent(byid);
@@ -6933,6 +6955,7 @@ Vui lòng hỏi chúng tôi bất cứ điều gì hoặc chia sẻ phản hồi
     if (util/* default */.A.size(allconvos) === 0) return null;
     var $unreadcount = null;
     let user = this.props.store.matchUser();
+    if (!user || !user.id) return null;
     let unreadcount = 0;
     util/* default */.A.map(allconvos, convo => {
       if (convo.id == this.props.cid) return;
@@ -9948,7 +9971,7 @@ class Widget extends common/* Com */.Mw {
           creating: true
         });
         let botid = cid.split('_')[0].slice(7);
-        let oldconvo = this.props.store.matchConvo(this.props.cid);
+        let oldconvo = this.props.store.matchConvo(this.props.cid) || {};
         const {
           convo,
           error
@@ -11080,6 +11103,12 @@ class Main extends common/* Com */.Mw {
     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/inject.html

@@ -4,8 +4,17 @@
 	</head>
 	<body style="background: #ffca7a; display: flex; margin: 0">
 		<div
-			style="margin: auto; overflow: hidden; position: relative ; width: 750px; height: 100vh; background: #ffe2b7; border-left: 3px dashed #ffa92a; border-right: 3px dashed #ffa92a"
+			style="
+				margin: auto;
+				overflow: hidden;
+				position: relative;
+				width: 750px;
+				height: 100vh;
+				background: #ffe2b7;
+				border-left: 3px dashed #ffa92a;
+				border-right: 3px dashed #ffa92a;
+			"
 			class="container"
-			></div>
+		></div>
 	</body>
 </html>

package/package.json

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

package/src/chatbox/Event.js

@@ -411,7 +411,8 @@ export default class Event extends Com {
 	renderAIDevNote() {
 		if (!this.props.isLast) return null
 		if (!this.props.store.isAIDevMode()) return null
-
+		let cid = sb.get(this.props.event.ev, 'data.message.conversation_id', '')
+		if (cid.startsWith('cslight')) return null
 		let ev = sb.get(this.props.event, 'ev') || {}
 		let pongs = sb.get(ev, 'data.message.pongs') || []
 		let hasLike = this.hasLike()

package/src/lib.js

@@ -57,7 +57,6 @@ class Widget {
 
 	async login(accid, user_id, tokenGenerator, $container) {
 		let user = await this.store.login(accid, user_id, tokenGenerator)
-
 		if (!$container) $container = document.body
 		this.pluginMgr = new PluginMgr(this, $container)
 

package/src/store/api.js

@@ -358,7 +358,10 @@ export default class {
 	updateUser = (data) => this.apireq.post(`/accounts/${this.accid}/users/${this.uid}`, data)
 
 	getUser = (_) => this.apireq.get(`/accounts/${this.accid}/users/${this.uid}`)
-	getAccountSetting = () => this.apireq.get(`/accounts/${this.accid}/settings`)
+	getAccountSetting = () => {
+		let href = sb.get(document, 'location.href') // send full href, this could be used to select which bot (ai-agent) should be returned
+		return this.apireq.addQuery('url', href).get(`/accounts/${this.accid}/settings`)
+	}
 
 	sendImpression = (impression) =>
 		this.apireq.post(`/accounts/${this.accid}/campaigns/${impression.campaign_id}/impressions`, impression)

package/src/store/store.js

@@ -124,6 +124,7 @@ export default class Store {
 				this.setUser({attributes: [{type: 'text', text: ga_client_id, key: 'ga_client_id'}]})
 			}
 		}, 2000)
+		this.loopCheckConnectionStatus()
 	}
 
 	async loopCheckConnectionStatus() {
@@ -498,10 +499,7 @@ export default class Store {
 	now = () => sb.Date.now() + this.timeDiff // millisecond on server
 
 	async init(accid, mask, userRef, options) {
-		this.readyGate.close()
-		accid = (accid || '').trim()
 		this.g_sync = {}
-
 		if (!options || !options.use_subdomain_cookie) {
 			if (window && window.location && window.location.hostname) {
 				cookie.defaults.domain = '.' + window.location.hostname
@@ -543,22 +541,34 @@ export default class Store {
 			cleanMyLocalStorage()
 			this.clearBrowserData()
 		}
-		this.lightConvos = {} // convo that have not been created, for faking bot conversation
-		this.cache = new KV(new LSDB('sbz2023', true), 'kv')
 
 		this.api.setAuth({accid: accid})
 		// set cookie forever
 		if (userRef) this.cookie.set('__sbref', userRef)
-		let user = await this.api.setAuth({accid: accid, mask: mask, ref: userRef})
+
+		return this._initResource(
+			accid,
+			{accid: accid, mask: mask, ref: userRef},
+			{account_id: accid, user_ref: userRef, user_mask: mask},
+		)
+	}
+
+	async _initResource(accid, auth, realtimep) {
+		this.g_sync = {}
+
+		let user = await this.api.setAuth(auth)
 		if (user.error) {
 			console.error(user)
 			return user
 		}
 
+		this.readyGate.close()
+		accid = (accid || '').trim()
+		this.lightConvos = this.kv.match('light_convos') || {}
+		this.cache = new KV(new LSDB('sbz2023', true), 'kv')
 		if (this.realtime) this.realtime.stop()
 		if (this.fake) this.realtime = new RealtimeFake()
-		else
-			this.realtime = new Realtime(this.RealtimeURL, {account_id: accid, user_ref: userRef, user_mask: mask}, xhrsend)
+		else this.realtime = new Realtime(this.RealtimeURL, realtimep, xhrsend)
 
 		this.realtime.onEvent(this.onWs.bind(this))
 		this.realtime.onInterrupted(async () => {
@@ -566,43 +576,24 @@ 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()
 		this.reconnectWs(accid, user.id)
-		this.loopCheckConnectionStatus()
 		return user
 	}
 
 	async login(accid, user_id, tokenGenerator) {
 		if (this._die) return dieErr
-		let user = await this.api.setAuth({accid: accid, profile_id: user_id, tokenGenerator: tokenGenerator})
-		if (user.error) return user
-
+		cleanMyLocalStorage()
 		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(async () => {
-			await this.reconnectWs(accid, user.id)
-			this.reconnect()
-		})
-
-		this.seenLoop()
-		await this.reconnect()
-		this.readyGate.open()
-		this.reconnectWs(accid, user.id)
-
-		return user
+		return this._initResource(
+			accid,
+			{accid: accid, profile_id: user_id, tokenGenerator: tokenGenerator},
+			{getAccessToken: () => this.api.token_generator()},
+		)
 	}
 
 	logout(userRef) {