@subiz/widget-v4 4.1.2 → 4.1.4

package/compiled_src/chatbox/ChatButton.js

@@ -310,6 +310,7 @@ class ChatButton extends _common.Com {
     defmsg = defmsg || 'Sent you a message';
     let message = _index.default.get(ev, 'data.message.text');
     var format = _index.default.get(ev, 'data.message.format');
+    if (format === 'delta') return this.renderDeltaMessagePreview(ev, defmsg);
     if (format && format !== 'plaintext') message = defmsg;
     if (!message && _index.default.size(_index.default.get(ev, 'data.message.attachments')) > 0) message = defmsg;
     if (!message) return null;
@@ -323,6 +324,30 @@ class ChatButton extends _common.Com {
     });
     return tags;
   }
+  renderDeltaMessagePreview(ev, defmsg) {
+    defmsg = defmsg || 'Sent you a message';
+    let message = _index.default.get(ev, 'data.message.quill_delta');
+    if (!message && _index.default.size(_index.default.get(ev, 'data.message.attachments')) > 0) message = defmsg;
+    if (!message) return;
+    let quilldeltas = _index.default.parseJSON(message) || {};
+    if (!quilldeltas || _index.default.size(quilldeltas.ops) === 0) return null;
+    let $deltas = _index.default.map(quilldeltas.ops, delta => {
+      let html = '';
+      let insert = delta.insert;
+      let attributes = delta.attributes;
+      if (insert.dynamicField) {
+        return _index.default.get(insert, 'dynamicField.text', '');
+      }
+      if (insert.emoji) return (0, _preact.h)(_Emoji.default, {
+        emojiCode: `:${insert.emoji}:`
+      });
+      if (typeof insert === 'string') {
+        return insert;
+      }
+      return null;
+    });
+    return $deltas;
+  }
   closePreview(e) {
     if (e) {
       e.preventDefault();

package/compiled_src/lib.js

@@ -51,12 +51,27 @@ class Widget {
     this.domGate.open();
     return user;
   }
-  logout(accid) {
-    return this.store.logout();
+  logout(userref) {
+    return this.store.logout(userref);
+  }
+  async init(param, $container) {
+    param = param || {};
+    let accid = param.account_id;
+    let ref = param.ref;
+    let user = await this.store.init(accid, undefined, ref);
+    if (!$container) $container = document.body || document;
+    this.pluginMgr = new _plugin.default(this, $container);
+    let clean = setInterval(() => {
+      if ($container && $container.isConnected) return;
+      this.pluginMgr.destroy();
+      clearInterval(clean);
+    }, 1000);
+    this.domGate.open();
+    return user;
   }
   async setAccount(id, $container, mask, cb) {
     let outmask = await this.store.init(id, mask);
-    if (!$container) $container = document.body;
+    if (!$container) $container = document.body || document;
     this.pluginMgr = new _plugin.default(this, $container);
     let clean = setInterval(() => {
       if ($container && $container.isConnected) return;

package/compiled_src/store/api.js

@@ -11,7 +11,6 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const ajax = require('@subiz/ajax/src/ajax.js');
 ajax.env.XMLHttpRequest = window.XMLHttpRequest;
-const findAnswer = challenge => challenge.answer;
 function jsonifyTextPlain(param, done) {
   let req = param.request;
   if (req.content_type === 'text/plain' && req.body !== undefined) req.body = _index.default.stringify(req.body);
@@ -19,8 +18,8 @@ function jsonifyTextPlain(param, done) {
 }
 class _default {
   constructor(ApiURL, FileURL) {
-    _defineProperty(this, "listConversations", _ => this.apireq.addQuery('user_id', this.uid).addQuery('integration_id', `${this.accid}.subizv4.subikon`).get('/conversations'));
-    _defineProperty(this, "listMessages", (cid, limit, start_id) => this.apireq.addQuery('limit', limit).addQuery('start_id', start_id).get(`/conversations/${cid}/messages`));
+    _defineProperty(this, "listConversations", _ => this.apireq.addQuery('user_id', this.uid).addQuery('integration_id', `${this.accid}.subizv4.subikon`).get(`/accounts/${this.accid}/conversations`));
+    _defineProperty(this, "listMessages", (cid, limit, start_id) => this.apireq.addQuery('limit', limit).addQuery('start_id', start_id).get(`/accounts/${this.accid}/conversations/${cid}/messages`));
     _defineProperty(this, "ajax", ajax);
     _defineProperty(this, "start", extraData => {
       let data = {
@@ -34,16 +33,16 @@ class _default {
       _index.default.each(extraData, (v, k) => {
         data[k] = v;
       });
-      return this.apireq.post('/conversations', data);
+      return this.apireq.post(`/accounts/${this.accid}/conversations`, data);
     });
     _defineProperty(this, "sendConvoEvent", (cid, ev) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/events`, ev));
     _defineProperty(this, "createPostback", (cid, p) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/postbacks`, p));
-    _defineProperty(this, "markAsReceived", (cid, messageId) => this.apireq.post(`/conversations/${cid}/messages/${messageId}/receive`));
-    _defineProperty(this, "markAsSeen", (cid, messageId) => this.apireq.post(`/conversations/${cid}/messages/${messageId}/seen`));
-    _defineProperty(this, "getConversation", cid => this.apireq.get(`/conversations/${cid}`));
+    _defineProperty(this, "markAsReceived", (cid, messageId) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/messages/${messageId}/receive`));
+    _defineProperty(this, "markAsSeen", (cid, messageId) => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/messages/${messageId}/seen`));
+    _defineProperty(this, "getConversation", cid => this.apireq.get(`/accounts/${this.accid}/conversations/${cid}`));
     _defineProperty(this, "getLocaleContent", locale => this.apireq.get(`/accounts/${this.accid}/locales/${locale}`));
-    _defineProperty(this, "sendEvent", data => this.apireq.post(`/users/${this.uid}/events`, data));
-    _defineProperty(this, "sendTyping", cid => this.apireq.post(`/conversations/${cid}/typing`));
+    _defineProperty(this, "sendEvent", data => this.apireq.post(`/accounts/${this.accid}/users/${this.uid}/events`, data));
+    _defineProperty(this, "sendTyping", cid => this.apireq.post(`/accounts/${this.accid}/conversations/${cid}/typing`));
     _defineProperty(this, "sendLostFocus", (device, productid, source_id, sku) => this.sendEvent({
       by: {
         id: this.uid,
@@ -95,9 +94,8 @@ class _default {
         url: this.FileURL + body.url
       };
     });
-    _defineProperty(this, "getChallenge", accid => this.apireq.post(`/accounts/${accid}/scrypt-challenges`));
-    _defineProperty(this, "time", _ => this.apireq.get('/time'));
-    _defineProperty(this, "updateUser", data => this.apireq.post(`/users/${this.uid}`, data));
+    _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", () => this.apireq.get(`/accounts/${this.accid}/settings`));
     _defineProperty(this, "getIsOnline", () => this.apireq.get(`/accounts/${this.accid}/is_online`));
@@ -129,99 +127,130 @@ class _default {
         });
         return;
       }
-      if (this.mask) param.request = param.request.addQuery('x-user-mask', this.mask);
+      if (this.ref) param.request = param.request.addQuery('x-user-ref', this.ref);else if (this.mask) param.request = param.request.addQuery('x-user-mask', this.mask);
       return done(true);
     });
   }
   setAgentId(agid) {
     this.agentid = agid;
   }
-  setAuth(obj) {
-    this.accid = obj.accid;
+  async setAuth(obj) {
+    if (obj.accid) this.accid = obj.accid;
+    if (obj.ref) this.ref = obj.ref;
     this.mask = obj.mask;
-    this.uid = obj.uid;
-  }
-  async setTokenGenerator(accid, uid, tokenGenerator) {
-    this.tokensession = this.tokensession || 0;
-    this.tokensession++;
-    let tokensession = this.tokensession;
-    if (!accid || !_index.default.startsWith(accid, 'ac')) return {
-      error: 'invalid_account_id'
-    };
-    if (!uid) return {
-      error: 'invalid_user_id'
-    };
-    if (typeof tokenGenerator !== 'function') return {
-      error: 'invalid_token_generator'
-    };
-    this.accid = accid;
-    this.profile_id = uid;
-    this.token_generator = async force => {
-      await this.refreshLock.lock();
-      if (tokensession != this.tokensession) {
-        this.refreshLock.unlock();
-        return;
+    this.profile_id = obj.profile_id;
+    if (obj.ref) {
+      let outuser;
+      for (let i = 0; true; i++) {
+        outuser = await ajax.setBaseUrl(this.ApiURL).withCredentials(true).addQuery('v', '6').addQuery('x-user-ref', this.ref).setParser('json').get(`/accounts/${this.accid}/users/${this.ref}`);
+        if (!_index.default.get(outuser, 'body.id')) {
+          let sleeptime = Math.min(2000 + i * 200, 60000);
+          await _index.default.sleep(sleeptime);
+          continue;
+        }
+        break;
       }
-      let age = (_index.default.Date.now() - (this.last_token_at || 0)) / 1000;
-      if (!force && this.last_token && age < 1800) {
-        this.refreshLock.unlock();
-        return this.last_token;
+      if (outuser.error) {
+        if (_index.default.get(outuser.body.code)) return {
+          error: outuser.body.code
+        };
+        return outuser;
       }
-      if (!force && this.last_token && age < 3000) {
-        if (this.token_generator) setTimeout(async () => {
-          let token, err;
-          try {
-            token = await tokenGenerator(uid);
-          } catch (e) {
-            err = e;
-          }
-          if (tokensession != this.tokensession) {
+      this.uid = outuser.body.id;
+      return outuser.body;
+    }
+    if (obj.tokenGenerator) {
+      this.tokensession = this.tokensession || 0;
+      this.tokensession++;
+      let tokensession = this.tokensession;
+      if (!this.accid || !_index.default.startsWith(this.accid, 'ac')) return {
+        error: 'invalid_account_id'
+      };
+      if (!this.profile_id) return {
+        error: 'invalid_profile_id'
+      };
+      if (typeof this.tokenGenerator !== 'function') return {
+        error: 'invalid_token_generator'
+      };
+      let profile_id = this.profile_id;
+      this.token_generator = async force => {
+        await this.refreshLock.lock();
+        if (tokensession != this.tokensession) {
+          this.refreshLock.unlock();
+          return;
+        }
+        let age = (_index.default.Date.now() - (this.last_token_at || 0)) / 1000;
+        if (!force && this.last_token && age < 1800) {
+          this.refreshLock.unlock();
+          return this.last_token;
+        }
+        if (!force && this.last_token && age < 3000) {
+          if (this.token_generator) setTimeout(async () => {
+            let token, err;
+            try {
+              token = await tokenGenerator(profile_id);
+            } catch (e) {
+              err = e;
+            }
+            if (tokensession != this.tokensession) {
+              this.refreshLock.unlock();
+              return;
+            }
+            if (err) this.last_token = 'error';else this.last_token = token;
+            this.last_token_at = _index.default.Date.now();
             this.refreshLock.unlock();
-            return;
-          }
-          if (err) this.last_token = 'error';else this.last_token = token;
-          this.last_token_at = _index.default.Date.now();
+          });
+          return this.last_token;
+        }
+        let token;
+        let err;
+        try {
+          token = await tokenGenerator(profile_id);
+        } catch (e) {
+          err = e;
+        }
+        if (tokensession != this.tokensession) {
           this.refreshLock.unlock();
-        });
-        return this.last_token;
-      }
-      let token;
-      let err;
-      try {
-        token = await tokenGenerator(uid);
-      } catch (e) {
-        err = e;
-      }
-      if (tokensession != this.tokensession) {
+          return;
+        }
+        if (err) this.last_token = 'error';else this.last_token = token;
+        this.last_token_at = _index.default.Date.now();
         this.refreshLock.unlock();
-        return;
+        return this.last_token;
+      };
+      let outuser;
+      for (let i = 0; true; i++) {
+        await this.token_generator(true);
+        if (tokensession != this.tokensession) break;
+        outuser = await ajax.setBaseUrl(this.ApiURL).withCredentials(true).addQuery('v', '6').addQuery('x-access-token', this.last_token).setParser('json').get(`/accounts/${accid}/users/${profile_id}`);
+        if (!_index.default.get(outuser, 'body.id')) {
+          let sleeptime = Math.min(2000 + i * 100, 120000);
+          await _index.default.sleep(sleeptime);
+          continue;
+        }
+        break;
       }
-      if (err) this.last_token = 'error';else this.last_token = token;
-      this.last_token_at = _index.default.Date.now();
-      this.refreshLock.unlock();
-      return this.last_token;
-    };
-    let outuser;
-    for (let i = 0; true; i++) {
-      await this.token_generator(true);
-      if (tokensession != this.tokensession) break;
-      outuser = await ajax.setBaseUrl(this.ApiURL).withCredentials(true).addQuery('v', '6').addQuery('x-access-token', this.last_token).setParser('json').get(`/accounts/${accid}/users/${uid}`);
-      if (!_index.default.get(outuser, 'body.id')) {
-        let sleeptime = Math.min(2000 + i * 100, 120000);
-        await _index.default.sleep(sleeptime);
-        continue;
+      if (outuser.error) {
+        if (_index.default.get(outuser.body.code)) return {
+          error: outuser.body.code
+        };
+        return outuser;
       }
-      break;
+      this.uid = outuser.body.id;
+      return outuser.body;
     }
-    if (outuser.error) {
-      if (_index.default.get(outuser.body.code)) return {
-        error: outuser.body.code
+    if (this.mask) {
+      let parts = this.mask.split('@');
+      this.uid = parts[1];
+      return {
+        id: this.uid
       };
-      return outuser;
     }
-    this.uid = outuser.body.id;
-    return outuser.body;
+    return {
+      error: 'invalid_auth'
+    };
   }
+  async setTokenGenerator(accid, uid, tokenGenerator) {}
   sendContentView(device, pageUrl, pageTitle, id, source_id, sku) {
     if (!id) id = undefined;
     if (!source_id) source_id = undefined;
@@ -243,26 +272,5 @@ class _default {
       }
     });
   }
-  async createUser(accid) {
-    for (var i = 0; i < 10; i++) {
-      const {
-        body: challenge
-      } = await this.getChallenge(accid);
-      const answer = findAnswer(challenge);
-      const data = {
-        challenge_id: challenge.id,
-        answer: '' + answer
-      };
-      let {
-        body: user,
-        error
-      } = await this.apireq.post(`/accounts/${accid}/scrypt-challenges/users`, data);
-      if (error) {
-        await _index.default.sleep(1000);
-        continue;
-      }
-      return user;
-    }
-  }
 }
 exports.default = _default;

package/compiled_src/store/api_fake.js

@@ -56,11 +56,6 @@ class _default {
     _defineProperty(this, "sendContent", data => OK200);
     _defineProperty(this, "uploadToS3", async file => OK200);
     _defineProperty(this, "getChallenge", accid => OK200);
-    _defineProperty(this, "createUser", accid => Promise.resolve({
-      account_id: accid,
-      id: 'usqzgtgfake',
-      mask: 'fakemask'
-    }));
     _defineProperty(this, "time", _ => Promise.resolve({
       code: 200,
       body: new _index.default.Date().toISOString()
@@ -89,6 +84,10 @@ class _default {
     this.accid = obj.accid;
     this.mask = obj.mask;
     this.uid = obj.uid;
+    return {
+      account_id: accid,
+      id: 'usqzgtgfake'
+    };
   }
 }
 exports.default = _default;

package/compiled_src/store/store.js

@@ -167,6 +167,13 @@ class Store {
       this.inmem = inmem;
       this.cookie = inmemCookie;
     }
+    if (!inmem) {
+      try {
+        this.cookie.get('_', '');
+      } catch (e) {
+        inmem = true;
+      }
+    }
     this.pubsub = new _index.default.Pubsub();
     this.kv = new _storage.default.kv(new _storage.default.lsdb('sbz2020', this.inmem), 'kv');
     this.cache = new _storage.default.kv(new _storage.default.lsdb('sbz2020', true), 'kv');
@@ -302,58 +309,64 @@ class Store {
     await this.readyGate.entry();
     if (!this.isInsync('account')) this.reconnect();
   }
-  async init(accid, mask) {
+  async init(accid, mask, userRef) {
     this.readyGate.close();
     accid = (accid || '').trim();
     this.api.setAuth({
       accid: accid
     });
     this.g_sync = {};
-    if (!mask) {
+    if (!userRef) {
       try {
-        mask = this.cookie.get('__sbmask', '');
+        userRef = this.cookie.get('__sbref', '');
       } catch (e) {}
+      if (!userRef) {
+        if (!mask) {
+          try {
+            mask = this.cookie.get('__sbmask', '');
+          } catch (e) {}
+        }
+        if (mask) {
+          let parts = mask.split('@');
+          if (parts[0] != accid) {
+            userRef = _index.default.randomString(40);
+            this.new_visitor = true;
+          }
+          this.new_visitor = false;
+          this.cookie.set('__sbmask', mask);
+        } else {
+          userRef = _index.default.randomString(40);
+          this.new_visitor = true;
+        }
+      }
     }
-    let localstorageMask = this.kv.match('mask');
-    if (!mask && localstorageMask) mask = localstorageMask;
-    if (mask && localstorageMask && mask !== localstorageMask) this.clearBrowserData();
-    var userId = '';
-    if (mask) {
-      let parts = mask.split('@');
-      if (parts[0] != accid) {
-        mask = '';
-        this.clearBrowserData();
-      } else userId = parts[1];
-    }
-    if (!mask) {
-      let user = await this.api.createUser(accid);
-      this.new_visitor = true;
-      mask = user.mask;
-      userId = user.id;
-    } else {
-      this.new_visitor = false;
-    }
-    this.cookie.set('__sbmask', mask);
-    this.kv.put('mask', mask);
+    if (userRef) this.cookie.set('__sbref', userRef);
+    let user = await this.api.setAuth({
+      accid: accid,
+      mask: mask,
+      ref: userRef
+    });
+    if (user.error) return;
     if (this.realtime) this.realtime.stop();
     if (this.fake) this.realtime = new _realtime_fake.default();else this.realtime = new Realtime(this.RealtimeURL, {
+      account_id: accid,
+      user_ref: userRef,
       user_mask: mask
     });
     this.realtime.onEvent(this.onWs.bind(this));
-    this.realtime.onInterrupted(() => this.reconnectWs(accid, userId));
-    this.api.setAuth({
-      accid: accid,
-      uid: userId,
-      mask: mask
-    });
+    this.realtime.onInterrupted(() => this.reconnectWs(accid, user.id));
     this.seenLoop();
     await this.reconnect();
     this.readyGate.open();
-    this.reconnectWs(accid, userId);
-    return mask;
+    this.reconnectWs(accid, user.id);
+    return user;
   }
   async login(accid, user_id, tokenGenerator) {
-    let user = await this.api.setTokenGenerator(accid, user_id, tokenGenerator);
+    let user = await this.api.setAuth({
+      accid: accid,
+      profile_id: user_id,
+      tokenGenerator: tokenGenerator
+    });
     if (user.error) return user;
     this.clearBrowserData();
     this.readyGate.close();
@@ -372,8 +385,10 @@ class Store {
     this.reconnectWs(accid, user.id);
     return user;
   }
-  logout(user_id) {
-    this.api.setTokenGenerator(undefined, undefined, undefined);
+  logout(userRef) {
+    return this.api.setAuth({
+      ref: userRef
+    });
   }
   seenLoop() {
     this.seenQueue = [];