Add version and source

SadeghHayeri · Mar 12, 2020 · 7afd428 · 7afd428
1 parent c6afeb3
commit 7afd428
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/bin/gt.js b/bin/gt.js
@@ -107,7 +107,8 @@ async function main() {
 		dns: {
 			type: argv['dns-type'],
 			server: argv['dns-server']
-		}
+		},
+		source: 'CLI',
 	});
 
 	const exitTrap = async () => {

diff --git a/gui/main.js b/gui/main.js
@@ -78,7 +78,7 @@ async function turnOn() {
         await turnOff()
     }
 
-    proxy = new Proxy();
+    proxy = new Proxy({source: 'GUI'});
     await proxy.start({setProxy: true});
 
     win.webContents.send('changeStatus', isOn);

diff --git a/src/proxy.js b/src/proxy.js
@@ -15,6 +15,7 @@ export default class Proxy {
 		this.server = undefined;
 		this.isSystemProxySet = false;
 		this.initDNS();
+		appInit(customConfig.source);
 	}
 
 	initDNS() {
@@ -24,7 +25,6 @@ export default class Proxy {
 	}
 
 	async start(options = {}) {
-		appInit();
 		options.setProxy = options.setProxy === undefined ? false : options.setProxy;
 
 		this.server = net.createServer({pauseOnConnect: true}, clientSocket => {

diff --git a/src/utils/analytics.js b/src/utils/analytics.js
@@ -2,15 +2,24 @@ import ua from 'universal-analytics';
 import uuid from 'uuid/v4';
 import { JSONStorage } from 'node-localstorage';
 import appData from 'app-data-folder';
+import os from 'os';
+import packageJson from '../../package.json'
 
 const nodeStorage = new JSONStorage(appData('greentunnel'));
 const userId = nodeStorage.getItem('userid') || uuid();
 nodeStorage.setItem('userid', userId);
 
 var visitor = ua('UA-160385585-1', userId);
 
-function appInit() {
-  visitor.event("gt", "init").send()
+function appInit(source = 'OTHER') {
+  visitor.set('version', packageJson.version);
+  visitor.set('os', os.platform());
+  visitor.set('source', source);
+
+  visitor.event('gt-total', 'init').send();
+  visitor.event(`gt-${source}`, 'init').send();
+  visitor.event(`gt-${os.platform()}`, 'init').send();
+  visitor.event(`gt-${packageJson.version}`, 'init').send();
 }
 
 export {appInit};