Merge pull request #180 from NativeScript/iiivanov/update-analytics

Update analytics and proxy support

Author: ivanovit

package.json

@@ -27,7 +27,7 @@
   "dependencies": {
     "lodash": "^4.17.10",
     "semver": "^5.5.0",
-    "universal-analytics": "0.4.13",
+    "universal-analytics": "0.4.15",
     "uuid": "^3.2.1",
     "vscode-chrome-debug-core": "^3.23.11",
     "vscode-debugadapter": "^1.28.0-pre.2"
@@ -36,6 +36,7 @@
     "@types/lodash": "^4.14.109",
     "@types/mocha": "^5.2.1",
     "@types/node": "6.0.46",
+    "@types/universal-analytics": "0.4.1",
     "mocha": "^5.2.0",
     "sinon": "^5.0.10",
     "tslint": "5.10.0",

src/analytics/guaService.ts

@@ -5,11 +5,14 @@ import { IAnalyticsBaseInfo, OperatingSystem } from './analyticsBaseInfo';
  * Google Universal Analytics Service
  */
 export class GUAService {
-    private _visitor: any;
+    private _visitor: ua.Visitor;
     private _getBasePayload: () => any;
 
     constructor(trackingId: string, baseInfo: IAnalyticsBaseInfo) {
-        this._visitor = ua(trackingId, baseInfo.clientId, { requestOptions: {}, strictCidFormat: false });
+        const proxy = process.env.HTTP_PROXY || process.env.HTTPS_PROXY;
+        const requestOptions = proxy ? { proxy } : {};
+
+        this._visitor = ua(trackingId, baseInfo.clientId, { requestOptions, strictCidFormat: false });
         this._getBasePayload = () => {
             return {
                 cd5: baseInfo.cliVersion,

src/custom-typings/universal-analytics/ua.d.ts

@@ -16,7 +16,6 @@
     "include": [
         "./tests/**/*.ts",
         "./debug-adapter/nativeScriptDebug.ts",
-        "./main.ts",
-        "custom-typings/universal-analytics/ua.d.ts"
+        "./main.ts"
     ]
 }