@subiz/widget-v4 4.0.66 → 4.0.69

package/compiled_src/lib.js

@@ -24,7 +24,7 @@ _index.default.preloadWebfonts(['Roboto'], [400, 500]);
 
 class Widget {
   constructor(ApiURL, FileURL, RealtimeURL, inmem, fake, agenttoken) {
-    _defineProperty(this, "version", () => '4.4');
+    _defineProperty(this, "version", () => '4.5');
 
     _defineProperty(this, "setSetting", setting => this.store.setSetting({
       account_setting: setting
@@ -108,7 +108,21 @@ class Widget {
   }
 
   async sendMessage(convoid, message) {
-    this.store.sendConvoEvent(convoid, 'message_sent', {
+    if (!convoid) {
+      const {
+        convo,
+        error
+      } = await this.store.startConvo({
+        message: message.text,
+        initial_by: this.store.matchUser().id
+      });
+      if (error) return {
+        error
+      };
+      convoid = convo.id;
+    }
+
+    return this.store.sendConvoEvent(convoid, 'message_sent', {
       message
     });
   }
@@ -127,11 +141,11 @@ class Widget {
     this.pluginMgr.hideCurrentGreeting();
   }
 
-  async showWidget(view, convo) {
+  async showWidget(view, cid) {
     await this.domGate.entry();
     this.pluginMgr.showCurrentChatbox({
       view,
-      cid: convo
+      cid: cid
     });
   }
 

package/compiled_src/store/store.js

@@ -29,6 +29,14 @@ cookie.defaults.path = '/';
 cookie.expiresMultiplier = 60 * 60 * 24;
 cookie.defaults.expires = 3650;
 const MAX_CONVO = 20;
+const ga_client_id = '';
+setTimeout(() => {
+  if (window.gtag) {
+    window.gtag('get', 'UA-XXXXXXXX-Y', 'client_id', clientid => {
+      ga_client_id = clientid;
+    });
+  }
+}, 100);
 
 const page_loaded = _index.default.Date.now();
 
@@ -920,6 +928,7 @@ class Store {
     }
 
     this.kv.put('last_msg_sent', _index.default.Date.now());
+    return ret;
   }
 
   _setConvo(convo) {
@@ -1181,16 +1190,16 @@ const inmemCookie = {
 };
 
 function getGaClientId() {
-  var clientId = '';
-  if (!hasGA()) return clientId;
+  if (ga_client_id) return ga_client_id;
+  if (!hasGA()) return ga_client_id;
   var allTrackers = window.ga.getAll() || [];
   allTrackers.forEach(function (tracker) {
-    clientId = tracker.get('clientId');
+    ga_client_id = tracker.get('clientId');
   });
-  return clientId;
+  return ga_client_id;
 }
 
-const hasGA = () => !!(window.ga && window.ga.getAll);
+const hasGA = () => !!(window.ga && window.ga.getAll || window.gtag);
 
 function getGaTrackingIds() {
   var trackingIds = [];
@@ -1213,11 +1222,19 @@ function sendToFBPixel(category, action, label) {
 
 function sendToGA(category, action, label) {
   if (!hasGA()) return;
-  const allTrackers = window.ga.getAll() || [];
-  allTrackers.forEach(function (tracker) {
-    const name = tracker.get('name');
-    window.ga(name + '.send', 'event', category, action, label);
-  });
+
+  if (window.gtag) {
+    window.gtag('event', category + '.' + action, label);
+    return;
+  }
+
+  if (window.ga) {
+    const allTrackers = window.ga.getAll() || [];
+    allTrackers.forEach(function (tracker) {
+      const name = tracker.get('name');
+      window.ga(name + '.send', 'event', category, action, label);
+    });
+  }
 }
 
 function sendEventToThirdParty(category, action, label) {

package/compiled_src/util/common.js

@@ -422,7 +422,7 @@ function isURL(url) {
 }
 
 function isNumber(num) {
-  var reg = /^\d+$/;
+  var re = /^\d+$/;
   return re.test(String(num));
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@subiz/widget-v4",
-	"version": "4.0.66",
+	"version": "4.0.69",
 	"main": "./compiled_src/lib.js",
 	"scripts": {
 		"dev": "npx webpack serve --config webpack.dev.js",
@@ -14,16 +14,16 @@
 		"@subiz/storage": "0.0.8",
 		"@subiz/wsclient": "^3.1.7",
 		"cookie_js": "1.4.2",
-		"core-js": "^3.21.1",
+		"core-js": "^3.22.0",
 		"css-loader": "5.2.7",
 		"file-loader": "^6.2.0",
 		"less": "^4.1.2",
 		"less-loader": "^10.2.0",
-		"marked": "^4.0.12",
-		"preact": "^10.7.0"
+		"marked": "^4.0.14",
+		"preact": "^10.7.1"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.17.8",
+		"@babel/core": "^7.17.9",
 		"@babel/plugin-proposal-class-properties": "^7.16.7",
 		"@babel/plugin-transform-react-jsx": "^7.17.3",
 		"@babel/preset-env": "^7.16.11",
@@ -32,9 +32,9 @@
 		"babel-plugin-syntax-jsx": "^6.18.0",
 		"html-webpack-plugin": "^5.5.0",
 		"puppeteer": "^13.5.2",
-		"webpack": "^5.70.0",
+		"webpack": "^5.72.0",
 		"webpack-bundle-analyzer": "^4.5.0",
 		"webpack-cli": "^4.9.2",
-		"webpack-dev-server": "^4.7.4"
+		"webpack-dev-server": "^4.8.1"
 	}
 }

package/src/lib.js

@@ -85,7 +85,15 @@ class Widget {
 	}
 
 	async sendMessage(convoid, message) {
-		this.store.sendConvoEvent(convoid, 'message_sent', {message})
+		if (!convoid) {
+			const {convo, error} = await this.store.startConvo({
+				message: message.text,
+				initial_by: this.store.matchUser().id,
+			})
+			if (error) return {error}
+			convoid = convo.id
+		}
+		return this.store.sendConvoEvent(convoid, 'message_sent', {message})
 	}
 
 	startConvo(req) {
@@ -102,9 +110,10 @@ class Widget {
 		this.pluginMgr.hideCurrentGreeting()
 	}
 
-	async showWidget(view, convo) {
+	// view could be: chat, list, offline_form
+	async showWidget(view, cid) {
 		await this.domGate.entry()
-		this.pluginMgr.showCurrentChatbox({view, cid: convo})
+		this.pluginMgr.showCurrentChatbox({view, cid: cid})
 	}
 
 	async hideWidget() {
@@ -112,7 +121,7 @@ class Widget {
 		this.pluginMgr.hideCurrentChatbox()
 	}
 
-	version = () => '4.4'
+	version = () => '4.5'
 
 	setSetting = (setting) => this.store.setSetting({account_setting: setting})
 	getSetting = (_) => ({account_setting: sb.cloneDeep(this.store.matchAccountSetting())})

package/src/store/store.js

@@ -11,6 +11,15 @@ cookie.expiresMultiplier = 60 * 60 * 24 // days
 cookie.defaults.expires = 3650 // 10 year
 
 const MAX_CONVO = 20
+const ga_client_id = ''
+
+setTimeout(() => {
+	if (window.gtag) {
+		window.gtag('get', 'UA-XXXXXXXX-Y', 'client_id', (clientid) => {
+			ga_client_id = clientid
+		})
+	}
+}, 100)
 
 const page_loaded = sb.Date.now()
 
@@ -824,6 +833,7 @@ export default class Store {
 		}
 
 		this.kv.put('last_msg_sent', sb.Date.now())
+		return ret
 	}
 
 	onConvoEvent = (o, cb) => this.pubsub.on2(o, 'events', cb)
@@ -1090,19 +1100,18 @@ const inmemCookie = {
 // getGaClientId returns ID of the client in Google Analytics
 // return empty string if GA is not installed
 function getGaClientId() {
-	var clientId = ''
-	if (!hasGA()) return clientId
-
+	if (ga_client_id) return ga_client_id
+	if (!hasGA()) return ga_client_id
 	var allTrackers = window.ga.getAll() || []
 	allTrackers.forEach(function (tracker) {
-		clientId = tracker.get('clientId')
+		ga_client_id = tracker.get('clientId')
 	})
 
-	return clientId
+	return ga_client_id
 }
 
 // hasGA tells if the website is using Google Analytics or not
-const hasGA = () => !!(window.ga && window.ga.getAll)
+const hasGA = () => !!((window.ga && window.ga.getAll) || window.gtag)
 
 // getGaTrackingIds returns all tracking ids in Google Analytics
 // return empty array if GA is not installed
@@ -1128,11 +1137,18 @@ function sendToFBPixel(category, action, label) {
 function sendToGA(category, action, label) {
 	if (!hasGA()) return
 
-	const allTrackers = window.ga.getAll() || []
-	allTrackers.forEach(function (tracker) {
-		const name = tracker.get('name')
-		window.ga(name + '.send', 'event', category, action, label)
-	})
+	if (window.gtag) {
+		window.gtag('event', category + '.' + action, label)
+		return
+	}
+
+	if (window.ga) {
+		const allTrackers = window.ga.getAll() || []
+		allTrackers.forEach(function (tracker) {
+			const name = tracker.get('name')
+			window.ga(name + '.send', 'event', category, action, label)
+		})
+	}
 }
 
 function sendEventToThirdParty(category, action, label) {

package/src/util/common.js

@@ -326,7 +326,7 @@ export function isURL(url) {
 }
 
 export function isNumber(num) {
-	var reg = /^\d+$/
+	var re = /^\d+$/
 	return re.test(String(num))
 }