web-manager 3.1.15 → 3.1.17

package/README.md

@@ -44,7 +44,7 @@ npm install web-manager
 * Firebase (Firebase app, Firestore, Auth, & Messaging)
 * Lazysizes to lazyload images
 * Sentry to report errors
-* Tawk to implement a chatbox
+* [Chatsy.ai](https://chatsy.ai) AI chatbot integration
 * Cookieconsent to comply with GDPR
 
 ## Example Setup

package/index.js

@@ -184,7 +184,7 @@ function Manager() {
         } else if (event.target.matches('.auth-forgot-email-btn')) {
           This.auth().forgot();
         } else if (event.target.matches('#prechat-btn')) {
-          load_tawk(This, This.properties.options);
+          load_chatsy(This, This.properties.options);
         } else if (event.target.matches('.auth-subscribe-notifications-btn')) {
           This.notifications().subscribe()
         }
@@ -549,12 +549,12 @@ function Manager() {
                   release: ''
                 }
               },
-              tawk: {
+              chatsy: {
                 enabled: true,
                 config: {
+                  accountId: '',
                   chatId: '',
-                  widgetId: 'default',
-                  prechatColor: '#02A84E'
+                  options: {},
                 }
               },
               cookieconsent: {
@@ -589,21 +589,22 @@ function Manager() {
           var options_user = {};
           function eachRecursive(obj, parent) {
             parent = (!parent) ? '' : parent;
-              for (var key in obj) {
-                if (typeof obj[key] === 'object' && obj[key] !== null && !Array.isArray(obj[key])) {
-                  eachRecursive(obj[key], parent + key + '.');
-                } else {
-                  utilities.set(options_user, parent + key, utilities.get(options_defaults, parent + key) );
-                  var t_globalItem = utilities.get(configuration, 'global.settings.' + parent + key, undefined);
-                  var t_pageItem = utilities.get(configuration, 'page.settings.' + parent + key, undefined);
-                  if (typeof t_globalItem !== 'undefined') {
-                    utilities.set(options_user, parent + key, t_globalItem);
-                  }
-                  if (typeof t_pageItem !== 'undefined') {
-                    utilities.set(options_user, parent + key, t_pageItem);
-                  }
+
+            for (var key in obj) {
+              if (typeof obj[key] === 'object' && obj[key] !== null && !Array.isArray(obj[key])) {
+                eachRecursive(obj[key], parent + key + '.');
+              } else {
+                utilities.set(options_user, parent + key, utilities.get(options_defaults, parent + key) );
+                var t_globalItem = utilities.get(configuration, 'global.settings.' + parent + key, undefined);
+                var t_pageItem = utilities.get(configuration, 'page.settings.' + parent + key, undefined);
+                if (typeof t_globalItem !== 'undefined') {
+                  utilities.set(options_user, parent + key, t_globalItem);
+                }
+                if (typeof t_pageItem !== 'undefined') {
+                  utilities.set(options_user, parent + key, t_pageItem);
                 }
               }
+            }
           }
 
           eachRecursive(options_defaults);
@@ -678,9 +679,9 @@ function Manager() {
               console.error(e);
             }
 
-            var tawkOps = options_user.libraries.tawk;
-            if (tawkOps.enabled) {
-              This.dom().select('#prechat-btn').css({background: tawkOps.config.prechatColor}).show();
+            var chatsyOps = options_user.libraries.chatsy;
+            if (chatsyOps.enabled) {
+              This.dom().select('#prechat-btn').css({background: chatsyOps.config.prechatColor}).show();
             }
 
             // load non-critical libraries
@@ -1406,24 +1407,29 @@ function Manager() {
     });
   }
 
-  var load_tawk = function(This, options) {
+  var load_chatsy = function(This, options) {
     var dom = This.dom();
     return new Promise(function(resolve, reject) {
-      // if (typeof window.Tawk_API !== 'undefined') {
-      //   return resolve();
-      // }
-      if (options.libraries.tawk.enabled === true) {
-        window.Tawk_API = window.Tawk_API || {}, window.Tawk_LoadStart = new Date();
-        window.Tawk_API.onLoad = function(){
-          dom.select('#prechat-btn').hide();
-          Tawk_API.maximize();
-        };
-        var tawkPath = 'libraries.tawk.config';
-        dom.loadScript({src: 'https://embed.tawk.to/' + utilities.get(options, tawkPath + '.chatId', '') + '/' + (utilities.get(options, tawkPath + '.widgetId') || 'default'), crossorigin: true}, function(e) {
+      if (options.libraries.chatsy.enabled === true) {
+        var chatsyPath = 'libraries.chatsy.config';
+
+        dom.loadScript({
+          // src: 'https://embed.tawk.to/' + utilities.get(options, tawkPath + '.chatId', '') + '/' + (utilities.get(options, tawkPath + '.widgetId') || 'default'), 
+          src: 'https://app.chatsy.ai/resources/script.js', 
+          // src: 'http://192.168.86.248:4001/resources/script.js', 
+          attributes: [
+            {name: 'data-account-id', value: utilities.get(options, chatsyPath + '.accountId', '')},
+            {name: 'data-chat-id', value: utilities.get(options, chatsyPath + '.chatId', '')},
+          ],
+          crossorigin: true,          
+        }, function(e) {
           if (e) {
             return reject(e);
           }
-          // This.log('Loaded tawk.');
+          // This.log('Loaded chatsy.');
+          chatsy.open();
+          dom.select('#prechat-btn').hide();
+
           resolve();
         })
 

package/lib/account.js

@@ -156,6 +156,9 @@ Account.prototype.resolve = function (account, options) {
   return new Promise(function(resolve, reject) {
     var currentUser = firebase.auth().currentUser;
 
+    account = account || {};
+    options = options || {};
+
     // If there is no user logged in or we choose not to fetch the account, resolve a default account
     if (!currentUser || !currentUser.uid || options.fetchNewAccount === false) {
       return resolve(self._resolveAccount(currentUser, account, options));

package/lib/dom.js

@@ -255,7 +255,11 @@ Dom.loadScript = function(options, callback) {
     options.async = typeof options.async === 'undefined' ? false : options.async;
     options.crossorigin = typeof options.crossorigin === 'undefined' ? false : options.crossorigin;
     options.cacheBreaker = typeof options.cacheBreaker === 'undefined' ? true : options.cacheBreaker;
+    options.attributes = typeof options.attributes === 'undefined' ? [] : options.attributes;
     
+    var s = document.createElement('script');
+
+    // Set the script cache breaker
     if (options.cacheBreaker) {
       var src = options.src.split('?');
       var query = new URLSearchParams(src[1])
@@ -264,12 +268,21 @@ Dom.loadScript = function(options, callback) {
       options.src = src[0] + '?' + query.toString();
     }
 
-    var s = document.createElement('script');
-    s.src = options.src;
-    s.async = options.async;
+    // If crossorigin is set, set the attribute
     if (options.crossorigin) {
-      s.setAttribute('crossorigin','*');
+      options.attributes.push({name: 'crossorigin', value: '*'});
     }
+
+    // Set the script attributes
+    options.attributes
+    .forEach(attribute => {
+      s.setAttribute(attribute.name, attribute.value);
+    });
+
+    // Set the script source
+    s.async = options.async;
+    s.src = options.src;
+
     s.onload = function() {
       if (callback) { callback(); }
       return resolve();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.1.15",
+  "version": "3.1.17",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {