@subiz/widget-v4 4.1.156 → 4.1.157

package/dist/HASH

@@ -1 +1 @@
-1986e37f014
+19888eff7f5

package/dist/screenshoot.js

@@ -4854,12 +4854,15 @@ class Store {
       if (!id) return;
       if (id === '*') {
         this._touchAcc();
-        return util/* default */.A.filter(this.cache.all(), (value, k) => k.startsWith('convo_'));
+        return util/* default */.A.filter(this.cache.all(), (value, k) => k.startsWith('convo_')).concat(util/* default */.A.map(this.lightConvos));
       }
+      if (id.startsWith('cslight')) return this.lightConvos[id];
       if (!this.isInsync(id)) this.fetchConvo(id);
       return this.cache.match('convo_' + id);
     });
     store_defineProperty(this, "fetchConvo", async cid => {
+      if (!cid) return;
+      if (cid.startsWith('cslight')) return;
       if (this._die) return dieErr;
       await this.readyGate.entry();
       await this.reconnectGate.entry(undefined, true);
@@ -4878,9 +4881,12 @@ class Store {
     store_defineProperty(this, "outofmsgM", {});
     store_defineProperty(this, "listEvents", id => {
       if (!id || id === '*' || typeof id !== 'string') return;
+      if (id.startsWith('cslight')) return util/* default */.A.get(this.lightConvos, [id, 'events'], []);
       return this.chain.listM(id);
     });
     store_defineProperty(this, "fetchMoreEvents", async convoid => {
+      if (!convoid) return;
+      if (convoid.startsWith('cslight')) return [[], ''];
       if (!this.isInsync('events' + convoid)) {
         await this.readyGate.entry();
         await this.reconnectGate.entry(undefined, true);
@@ -4992,6 +4998,7 @@ 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 {
@@ -5012,9 +5019,9 @@ class Store {
     this.chain = new Chain(new lsdb('cbz2023', true), 'ch');
     this.getLocaleContent = this.api.getLocaleContent;
     this.g_haveSentSeenM = {};
-    this.last_focused = util/* default */.A.Date.now();
+    this.last_focused = this.now();
     window.addEventListener('blur', () => {
-      this.last_focused = util/* default */.A.Date.now();
+      this.last_focused = this.now();
       this.sendPresence();
     });
     window.addEventListener('focus', () => {
@@ -5036,7 +5043,7 @@ class Store {
     this._presenceInterval2 = util/* default */.A.setInterval(() => {
       if (this._die) return util/* default */.A.clearInterval(this._presenceInterval2);
       if (this.browserVisibility === 'visible' && document.hasFocus()) return;
-      if (this.last_focused && util/* default */.A.Date.now() - this.last_focused > 30 * 60000) {
+      if (this.last_focused && this.now() - this.last_focused > 30 * 60000) {
         return;
       }
       this.sendPresence();
@@ -5263,6 +5270,7 @@ class Store {
       await this.reconnectWs(accid, user.id);
       this.reconnect();
     });
+    this.lightConvos = this.kv.match('light_convos') || {};
     this.seenLoop();
     await this.reconnect({
       user: user
@@ -5321,9 +5329,8 @@ class Store {
         if (!lastmsgsent) return;
         if (this.g_haveSentSeenM[lastmsgsent.id]) return;
         if (lastmsgsent.id === lastmsgsent.data.message.idempotency_key) return;
-        this.api.markAsSeen(id, lastmsgsent.id);
         this.pubsub.publish('events', {
-          created: util/* default */.A.Date.now(),
+          created: this.now(),
           type: 'message_pong',
           by: {
             type: 'user'
@@ -5334,14 +5341,25 @@ class Store {
               id: '*',
               pongs: [{
                 type: 'seen',
-                created: util/* default */.A.Date.now()
+                created: this.now()
               }]
             }
           }
         });
+        if (id.startsWith('cslight')) {
+          let old = this.lightConvos[id];
+          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();
+          this.kv.put('light_convos', this.lightConvos);
+          this.g_haveSentSeenM[lastmsgsent.id] = true;
+          return;
+        }
+        this.api.markAsSeen(id, lastmsgsent.id);
         let convo = this.cache.match('convo_' + id) || {};
         let mem = util/* default */.A.find(convo.members, m => m.id === user.id);
-        if (mem) mem.seen_at = util/* default */.A.Date.now();
+        if (mem) mem.seen_at = this.now();
         this._setConvo(convo);
         this.g_haveSentSeenM[lastmsgsent.id] = true;
       });
@@ -5502,7 +5520,7 @@ class Store {
     let cid = util/* default */.A.convoOfEv(ev);
     let convo;
     let alreadyFetched = false;
-    if (cid) {
+    if (cid && !cid.startsWith('cslight')) {
       convo = this.cache.match('convo_' + cid);
       if (!convo || !convo.id) {
         let {
@@ -5515,6 +5533,15 @@ class Store {
         this._setConvo(convo);
       }
     }
+    if (cid.startsWith('cslight')) {
+      convo = this.lightConvos[cid];
+      if (!convo) return;
+      convo.events.push(ev);
+      convo.last_message_sent = ev;
+      this.kv.put('light_convos', this.lightConvos);
+      this.pubsub.publish('events', ev);
+      return;
+    }
     if (!convo) return;
     this.pubsub.publish('events', ev);
     if (ev.type === 'conversation_joined') {
@@ -5611,8 +5638,65 @@ class Store {
   }
   typing(cid) {
     if (!cid) return;
+    if (cid.startsWith('cslight')) return;
     this._typing(cid);
   }
+  deleteLightConvo(id) {
+    delete this.lightConvos[id];
+    this.kv.put('light_convos', this.lightConvos);
+  }
+  startLightConvo(botid, message, locale) {
+    let convoid = 'cslight' + botid + '_' + this.now();
+    let user = this.cache.match('user') || {};
+    let old = this.lightConvos[convoid];
+    if (old) return {
+      convo: old
+    };
+    let now = this.now();
+    let ev = {};
+    ev.created = now;
+    ev.event_time = now;
+    ev.id = 'evfake' + now;
+    ev.type = 'message_sent';
+    ev.by = {
+      id: botid,
+      type: 'bot'
+    };
+    ev.data = {
+      message: message
+    };
+    ev.data.message.conversation_id = convoid;
+    let newconvo = {
+      id: convoid,
+      locale: locale,
+      initial_by: botid,
+      created: now,
+      actived: now,
+      last_message_sent: ev,
+      members: [{
+        type: 'user',
+        id: user.id
+      }, {
+        type: 'bot',
+        id: botid,
+        membership: 'active'
+      }],
+      state: 'active',
+      touchpoint: {
+        id: convoid,
+        channel: 'subiz',
+        source: 'web'
+      },
+      traffic_source: 'direct',
+      events: [ev]
+    };
+    this.pubsub.publish('events', ev);
+    this.lightConvos[convoid] = newconvo;
+    this.kv.put('light_convos', this.lightConvos);
+    return {
+      convo: newconvo
+    };
+  }
   async startConvo(req) {
     if (!req) req = {};
     await this.readyGate.entry();
@@ -5638,9 +5722,11 @@ class Store {
     return this.api.lookupOrder(key);
   }
   createPostback(cid, postback) {
+    if (cid && cid.startsWith('cslight')) return;
     return this.api.createPostback(cid, postback);
   }
   sendReaction(cid, ev) {
+    if (cid && cid.startsWith('cslight')) return;
     return this.api.sendConvoEvent(cid, ev);
   }
   async sendConvoEvent(cid, type, data) {
@@ -5694,6 +5780,7 @@ class Store {
       att.url = url;
     });
     if (event._error) return this.onWs(event);
+    if (cid && cid.startsWith('cslight')) return;
     let {
       body: ret,
       error
@@ -5715,7 +5802,7 @@ class Store {
         first_interaction: 1
       });
     }
-    this.kv.put('last_msg_sent', util/* default */.A.Date.now());
+    this.kv.put('last_msg_sent', this.now());
     return ret;
   }
   _setConvo(convo) {
@@ -5800,6 +5887,7 @@ class Store {
   }
   async listmessageapi(type, anchor, limit) {
     let convoid = type;
+    if (convoid && convoid.startsWith('cslight')) return [fakeevents, '', undefined, true];
     let {
       body: events,
       code,
@@ -5833,16 +5921,16 @@ class Store {
   }
   async loopTime() {
     if (this._die) return;
-    let startms = util/* default */.A.Date.now();
+    let startms = this.now();
     if (!util/* default */.A.get(this.cache.match('user'), 'id')) return util/* default */.A.setTimeout(() => this.loopTime(), 240000);
     let {
       body: t,
       error
     } = await this.api.time();
     if (error) return util/* default */.A.setTimeout(() => this.loopTime(), 30000);
-    var latences = Math.abs(util/* default */.A.Date.now() - startms) / 2;
+    var latences = Math.abs(this.now() - startms) / 2;
     var serverMs = new util/* default */.A.Date(t).getTime() + latences;
-    var localMs = util/* default */.A.Date.now();
+    var localMs = this.now();
     this.timeDiff = Math.floor(serverMs - localMs);
     util/* default */.A.setTimeout(() => this.loopTime(), 240000);
   }
@@ -6088,7 +6176,7 @@ class ChatButton extends common/* Com */.Mw {
     this.props.store.onConvoEvent(this, ev => {
       if (util/* default */.A.get(ev, 'type') !== 'message_sent') return;
       let bytype = util/* default */.A.get(ev, 'by.type');
-      if (bytype !== 'system' && bytype !== 'agent') return;
+      if (bytype !== 'system' && bytype !== 'agent' && bytype !== 'bot') return;
       let isquickreplies = false;
       util/* default */.A.map(util/* default */.A.get(ev, 'data.message.attachments', []), att => {
         if (!att) return;
@@ -6157,18 +6245,23 @@ class ChatButton extends common/* Com */.Mw {
       displayPreview: false
     });
   }
-  ShowGreeting() {
-    if (this.props.store.isMobile()) {
-      let accid = util/* default */.A.get(this.props.plugin, 'chatbox.account_id', {});
-      if (accid === 'acqjeefqeaoiagyfprap') return;
-    }
-    let greeting = util/* default */.A.get(this.props.plugin, 'chatbox.greeting', {});
-    let agentM = this.props.store.matchAgent('*');
-    let byid = greeting.agent_id;
-    if (!byid) byid = randomAgent(agentM).id;
-    let text = this.props.t.i18n(util/* default */.A.get(greeting, 'greeting', {})) || greeting.message;
-    this.setState({
-      previewEvent: {
+  pickBestGreeting() {
+    let convoM = this.props.store.matchConvo('*');
+    let unseenConvo = util/* default */.A.filter(convoM, convo => {
+      let seen = util/* default */.A.isConvoSeen(convo, this.props.store.matchUser().id);
+      return !seen;
+    }).sort((a, b) => util/* default */.A.get(b, 'last_message_sent.created', 0) - util/* default */.A.get(a, 'last_message_sent.created', 0));
+    if (util/* default */.A.size(unseenConvo) == 0) {
+      if (this.props.store.isMobile()) {
+        let accid = util/* default */.A.get(this.props.plugin, 'chatbox.account_id', {});
+        if (accid === 'acqjeefqeaoiagyfprap') return;
+      }
+      let greeting = util/* default */.A.get(this.props.plugin, 'chatbox.greeting', {});
+      let agentM = this.props.store.matchAgent('*');
+      let byid = greeting.agent_id;
+      if (!byid) byid = randomAgent(agentM).id;
+      let text = this.props.t.i18n(util/* default */.A.get(greeting, 'greeting', {})) || greeting.message;
+      return {
         by: {
           id: byid,
           type: 'agent'
@@ -6179,7 +6272,13 @@ class ChatButton extends common/* Com */.Mw {
             format: 'plaintext'
           }
         }
-      },
+      };
+    }
+    return unseenConvo[0].last_message_sent;
+  }
+  ShowGreeting() {
+    this.setState({
+      previewEvent: this.pickBestGreeting(),
       displayPreview: true
     });
   }
@@ -6539,6 +6638,7 @@ function AgentsAvatar(props) {
   }
   if (agents.length === 1) {
     var agent = agents[0];
+    let avatarurl = agent.avatar_url || props.store.replaceFileUrl(acc.logo_url) || __webpack_require__(3582);
     var groupClass = mode === 'primary' ? 'group-avatar--agent-middle' : 'group-avatar--agent-left';
     return (0,preact_module.h)("div", {
       class: `group-avatar group-avatar--${mode}`
@@ -6551,7 +6651,7 @@ function AgentsAvatar(props) {
       height: 35,
       class: `avatar ${groupClass}`,
       alt: "agent avatar",
-      src: props.store.replaceFileUrl(agent.avatar_url) || __webpack_require__(2538)
+      src: avatarurl
     })));
   }
   if (agents.length === 2) {
@@ -6568,7 +6668,7 @@ function AgentsAvatar(props) {
       height: 35,
       alt: "agent avatar left",
       class: "avatar group-avatar--agent-left",
-      src: props.store.replaceFileUrl(leftAgent.avatar_url) || __webpack_require__(2538)
+      src: props.store.replaceFileUrl(leftAgent.avatar_url) || props.store.replaceFileUrl(acc.logo_url) || __webpack_require__(3582)
     })), (0,preact_module.h)("div", {
       class: "d-inline-block pos-relative",
       "data-tooltip": rightAgent.fullname || acc.name,
@@ -6578,7 +6678,7 @@ function AgentsAvatar(props) {
       width: 35,
       height: 35,
       class: "avatar group-avatar--agent-right",
-      src: props.store.replaceFileUrl(rightAgent.avatar_url) || __webpack_require__(2538)
+      src: props.store.replaceFileUrl(rightAgent.avatar_url) || props.store.replaceFileUrl(acc.logo_url) || __webpack_require__(3582)
     })));
   }
   let leftAgent = agents[0];
@@ -6595,7 +6695,7 @@ function AgentsAvatar(props) {
     height: 35,
     alt: "agent avatar left",
     class: "avatar group-avatar--agent-left",
-    src: props.store.replaceFileUrl(leftAgent.avatar_url) || __webpack_require__(2538)
+    src: props.store.replaceFileUrl(leftAgent.avatar_url) || props.store.replaceFileUrl(acc.logo_url) || __webpack_require__(3582)
   })), (0,preact_module.h)("div", {
     class: "d-inline-block pos-relative",
     "data-tooltip": middleAgent.fullname || acc.name,
@@ -6605,7 +6705,7 @@ function AgentsAvatar(props) {
     width: 35,
     height: 35,
     class: "avatar group-avatar--agent-middle",
-    src: props.store.replaceFileUrl(middleAgent.avatar_url) || __webpack_require__(2538)
+    src: props.store.replaceFileUrl(middleAgent.avatar_url) || props.store.replaceFileUrl(acc.logo_url) || __webpack_require__(3582)
   })), (0,preact_module.h)("div", {
     class: "d-inline-block pos-relative",
     "data-tooltip": rightAgent.fullname || acc.name,
@@ -6615,7 +6715,7 @@ function AgentsAvatar(props) {
     height: 35,
     alt: "agent avatar right",
     class: "avatar group-avatar--agent-right",
-    src: props.store.replaceFileUrl(rightAgent.avatar_url) || __webpack_require__(2538)
+    src: props.store.replaceFileUrl(rightAgent.avatar_url) || props.store.replaceFileUrl(acc.logo_url) || __webpack_require__(3582)
   })));
 }
 ;// ./src/chatbox/Header.js
@@ -9802,6 +9902,47 @@ class Widget extends common/* Com */.Mw {
         return;
       }
       let text = message.text;
+      if (this.props.cid && this.props.cid.startsWith('cslight')) {
+        let cid = this.props.cid;
+        this._creating = (this._creating || 0) + 1;
+        let _creating = this._creating;
+        this.setState({
+          creating: true
+        });
+        let botid = cid.split('_')[0].slice(7);
+        const {
+          convo,
+          error
+        } = await this.props.store.startConvo({
+          locale: this.props.t.locale(),
+          message: text,
+          members: [{
+            type: 'bot',
+            id: botid
+          }],
+          initial_by: this.props.store.matchUser().id
+        });
+        if (_creating != this._creating) return;
+        if (error) {
+          this.setState({
+            creating: false
+          });
+          return;
+        }
+        this.props.store.deleteLightConvo(cid);
+        await this.props.store.sendConvoEvent(convo.id, 'message_sent', {
+          message
+        });
+        if (_creating != this._creating) return;
+        this.props.onGo({
+          view: 'chat',
+          cid: convo.id
+        });
+        this.setState({
+          creating: false
+        });
+        return;
+      }
       if (!this.props.cid) {
         this._creating = (this._creating || 0) + 1;
         let _creating = this._creating;

package/package.json

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

package/src/chatbox/ChatButton.js

@@ -208,7 +208,7 @@ export default class ChatButton extends Com {
 		if (!agent) agent = this.props.store.matchAgent('*')[byid] || {}
 		agent = sb.cloneDeep(agent)
 		agent.fullname = agent.fullname || sb.get(account, 'name') || this.props.t('agent')
-		agent.avatar_url = agent.avatar_url || defaultAvatar
+		agent.avatar_url = agent.avatar_url || account.logo_url || require('../../assets/img/image_default.png')
 		let position = sb.get(accountSetting, 'desktop_button.position') || 'right'
 		if (this.props.store.isMobile()) {
 			position = sb.get(accountSetting, 'mobile_button.position') || position

package/src/store/kv.js

@@ -1,7 +1,7 @@
 let KvMaxSize = 500
 // A key-value database with a cache layer
 export default class {
-	constructor (db, schema) {
+	constructor(db, schema) {
 		this.name = schema
 		schema += '_kv'
 		this.dead = false
@@ -12,23 +12,22 @@ export default class {
 		this.init()
 	}
 
-	refreshCache () {
+	refreshCache() {
 		if (this.dead) return
 		let inmemItemM = {}
 		let allitems = this.db.all('items')
-		allitems.forEach(function(item) {
+		allitems.forEach(function (item) {
 			inmemItemM[item.key] = item.value
 		})
 		this.cache = inmemItemM
 	}
 
-	init () {
+	init() {
 		if (this.initialized) return
 		let inmemItemM = {}
 
-		console.time('KV' + this.name)
 		let allitems = this.db.all('items')
-		allitems.forEach(function(item) {
+		allitems.forEach(function (item) {
 			inmemItemM[item.key] = item.value
 		})
 		this.cache = inmemItemM
@@ -51,20 +50,18 @@ export default class {
 			}
 
 			this.db.removes('items', [removekeys])
-
 		}
 
 		this.initialized = true
-		console.timeEnd('KV' + this.name)
 	}
 
-	all () {
+	all() {
 		if (this.dead) return []
 		if (!this.initialized) return []
 		return this.cache
 	}
 
-	match (key) {
+	match(key) {
 		if (this.dead || !this.initialized) return
 		if (!key) return
 		return this.cache[key]
@@ -74,24 +71,24 @@ export default class {
 	// put('1', {id: '1', name: 'thanh'})
 	// put({id: '1', name: 'thanh'}, 'id')
 	// put([{id: '1', name: 'thanh'},{id: '2', name: 'van'}], 'id')
-	put (key, value) {
+	put(key, value) {
 		if (!key) return
 		if (this.dead) return []
 		if (!this.initialized) throw new Error('uninitialized')
 		// if multiple key
 		this.cache[key] = value
-		this.db.put('items', key, { key, value })
+		this.db.put('items', key, {key, value})
 	}
 
 	// delete an record in a schema
-	del (key) {
+	del(key) {
 		if (this.dead) return
 		if (!this.initialized) throw new Error('uninitialized')
 		delete this.cache[key]
 		this.db.removes('items', [key])
 	}
 
-	destroy () {
+	destroy() {
 		// clear all data
 		this.db.clear('items')
 

package/src/store/store.js

@@ -1032,9 +1032,9 @@ export default class Store {
 			traffic_source: 'direct',
 			events: [ev],
 		}
-		this.pubsub.publish('events', ev)
 		this.lightConvos[convoid] = newconvo
 		this.kv.put('light_convos', this.lightConvos)
+		this.pubsub.publish('events', ev)
 		return {convo: newconvo}
 	}