@subiz/widget-v4 4.1.172 → 4.1.174

package/dist/HASH

@@ -1 +1 @@
-198b082f7d0
+198c50be7a7

package/dist/screenshoot.js

@@ -2470,7 +2470,7 @@ XMLHttpRequest.prototype.send = function (body) {
         response: this.responseText
       });
     }
-    old(a, b, c);
+    if (typeof old == 'function') old(a, b, c);
   };
   return _originalSend.apply(this, arguments);
 };
@@ -3896,8 +3896,11 @@ function jsonifyTextPlain(param, done) {
     _defineProperty(this, "time", _ => ajax.setBaseUrl(this.ApiURL).withCredentials(true).setParser('json').get('/time'));
     _defineProperty(this, "updateUser", data => this.apireq.post(`/accounts/${this.accid}/users/${this.uid}`, data));
     _defineProperty(this, "getUser", _ => this.apireq.get(`/accounts/${this.accid}/users/${this.uid}`));
-    _defineProperty(this, "getAccountSetting", () => {
+    _defineProperty(this, "getAccountSetting", p => {
       let href = util/* default */.A.get(document, 'location.href');
+      if (p && p.bot_id) {
+        return this.apireq.addQuery('url', href).addQuery('bot_id', p.bot_id).get(`/accounts/${this.accid}/settings`);
+      }
       return this.apireq.addQuery('url', href).get(`/accounts/${this.accid}/settings`);
     });
     _defineProperty(this, "sendImpression", impression => this.apireq.post(`/accounts/${this.accid}/campaigns/${impression.campaign_id}/impressions`, impression));
@@ -5187,6 +5190,10 @@ class Store {
     await this.readyGate.entry();
     this.reconnect();
   }
+  async overrideBotId(botid) {
+    this.forceBotId = botid;
+    await this.readyGate.entry();
+  }
   async overrideChatbox(chatbox) {
     this.forceChatbox = chatbox;
     await this.readyGate.entry();
@@ -5431,7 +5438,9 @@ class Store {
     let fetchuser = p && p.user ? Promise.resolve({
       body: p.user
     }) : this.api.getUser();
-    let outs = await Promise.all([fetchuser, this.api.getAccountSetting()]);
+    let outs = await Promise.all([fetchuser, this.api.getAccountSetting({
+      bot_id: this.forceBotId
+    })]);
     let error = util/* default */.A.find(outs, out => out.error);
     if (error) return console.error(error);
     let set = outs[1].body;
@@ -5670,17 +5679,17 @@ class Store {
       this.chain.put(cid, oldev.id, util/* default */.A.getMs(oldev.created), oldev);
       this.pubsub.publish('events', oldev);
     }
-    if (ev.type === 'message_sent') {
-      let idemkey = util/* default */.A.get(ev, 'data.message.idempotency_key');
-      let found = util/* default */.A.find(this.listEvents(cid), oldev => oldev.id === idemkey);
-      if (found) {
-        this.chain.del(cid, found.id);
-        ev.created = found.created;
-      }
-      convo.last_message_sent = ev;
-    }
     if (ev.type !== 'message_pong' && ev.type !== 'conversation_typing') {
       this.chain.put(cid, ev.id, util/* default */.A.getMs(ev.created), ev);
+      if (ev.type === 'message_sent') {
+        let idemkey = util/* default */.A.get(ev, 'data.message.idempotency_key');
+        let found = util/* default */.A.find(this.listEvents(cid), oldev => oldev.id === idemkey);
+        if (found) {
+          this.chain.del(cid, found.id);
+          ev.created = found.created;
+        }
+        convo.last_message_sent = ev;
+      }
     }
     this._setConvo(convo);
     this.pubsub.publish('account');
@@ -6009,7 +6018,9 @@ class Store {
     src = src.replace('http://file.subiz.com/', this.FileURL);
     src = src.replace('https://file.mysubiz.com/', this.FileURL);
     src = src.replace('http://file.mysubiz.com/', this.FileURL);
-    return src.replace('vcdn.subiz-cdn.com', 'cdn.subiz.net');
+    return src;
+    // removed by dead control flow
+{}
   }
   clearBrowserData() {
     util/* default */.A.each(this.cookie.all(), (v, k) => {
@@ -6463,6 +6474,7 @@ class ChatButton extends common/* Com */.Mw {
     this._buttonLoaded = true;
   }
   renderButton() {
+    if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_button = util/* default */.A.Date.now();
     let accountSetting = this.props.plugin.chatbox;
     accountSetting = this.fixMissingSetting(accountSetting);
     let imgsrc = util/* default */.A.get(accountSetting, 'desktop_button.background_image_url') || util/* default */.A.get(accountSetting, 'desktop_button.background_mask_url') || defaultBubble;
@@ -11139,9 +11151,19 @@ class Main extends common/* Com */.Mw {
     }
   }
   render() {
-    if (!this.state.cssready) return null;
-    if (util/* default */.A.isUserBanned(this.props.store.matchUser())) return null;
-    if (!this.props.t) return null;
+    if (!this.state.cssready) {
+      if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_css_not_ready = util/* default */.A.Date.now();
+      return null;
+    }
+    if (util/* default */.A.isUserBanned(this.props.store.matchUser())) {
+      if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_user_is_banned = util/* default */.A.Date.now();
+      return null;
+    }
+    if (!this.props.t) {
+      if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_no_t = util/* default */.A.Date.now();
+      return null;
+    }
+    if (typeof sbz_info != 'undefined') sbz_info.render_chatbox_main = util/* default */.A.Date.now();
     return (0,preact_module.h)("div", {
       class: this.props.store.isMobile() ? 'mobile' : 'desktop'
     }, (0,preact_module.h)(ChatButton, {
@@ -11650,6 +11672,9 @@ class lib_Widget {
   logout(userref) {
     return this.store.logout(userref);
   }
+  overrideBotId(botid) {
+    this.store.overrideBotId(botid);
+  }
   async init(param, $container) {
     param = param || {};
     let accid = param.account_id;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.1.172",
+	"version": "4.1.174",
 	"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.45.0",
+		"core-js": "^3.45.1",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
-		"less": "^4.4.0",
+		"less": "^4.4.1",
 		"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.4",
-		"puppeteer": "^24.16.2",
-		"webpack": "^5.101.2",
+		"puppeteer": "^24.17.0",
+		"webpack": "^5.101.3",
 		"webpack-bundle-analyzer": "^4.10.2",
 		"webpack-cli": "^6.0.1",
 		"webpack-dev-server": "^5.2.2"

package/src/chatbox/Widget.js

@@ -785,6 +785,7 @@ export default class Widget extends Com {
 			let botid = cid.split('_')[0].slice(7) // 6 = len(cslight)
 			let oldconvo = this.props.store.matchConvo(this.props.cid) || {}
 			const {convo, error} = await this.props.store.startConvo({
+				state: 'active', // so it would not run through rule
 				locale: this.props.t.locale(),
 				message: text,
 				members: [{type: 'bot', id: botid, bot_version: oldconvo.bot_version}],

package/src/lib.js

@@ -74,6 +74,10 @@ class Widget {
 		return this.store.logout(userref)
 	}
 
+  overrideBotId (botid) {
+    this.store.overrideBotId(botid)
+  }
+
 	async init(param, $container) {
 		param = param || {}
 		let accid = param.account_id

package/src/store/api.js

@@ -357,8 +357,11 @@ 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 = () => {
+	getAccountSetting = (p) => {
 		let href = sb.get(document, 'location.href') // send full href, this could be used to select which bot (ai-agent) should be returned
+		if (p && p.bot_id) {
+			return this.apireq.addQuery('url', href).addQuery('bot_id', p.bot_id).get(`/accounts/${this.accid}/settings`)
+		}
 		return this.apireq.addQuery('url', href).get(`/accounts/${this.accid}/settings`)
 	}
 

package/src/store/store.js

@@ -220,6 +220,12 @@ export default class Store {
 		this.reconnect()
 	}
 
+	async overrideBotId(botid) {
+		this.forceBotId = botid
+		await this.readyGate.entry()
+    //this.reconnect()
+	}
+
 	async overrideChatbox(chatbox) {
 		this.forceChatbox = chatbox
 		await this.readyGate.entry()
@@ -689,7 +695,7 @@ export default class Store {
 		this.markSync('account')
 
 		let fetchuser = p && p.user ? Promise.resolve({body: p.user}) : this.api.getUser()
-		let outs = await Promise.all([fetchuser, this.api.getAccountSetting()])
+		let outs = await Promise.all([fetchuser, this.api.getAccountSetting({bot_id: this.forceBotId})])
 
 		let error = sb.find(outs, (out) => out.error)
 		if (error) return console.error(error)
@@ -1343,6 +1349,7 @@ export default class Store {
 
 		src = src.replace('https://file.mysubiz.com/', this.FileURL)
 		src = src.replace('http://file.mysubiz.com/', this.FileURL)
+			return src
 		return src.replace('vcdn.subiz-cdn.com', 'cdn.subiz.net')
 	}
 

package/src/util/common.js

@@ -253,7 +253,7 @@ XMLHttpRequest.prototype.send = function (body) {
 					response: this.responseText,
 				})
 		}
-		old(a, b, c)
+		if (typeof old == 'function') old(a, b, c)
 	}
 	return _originalSend.apply(this, arguments)
 }