Various updates

Author: Kevin Friedman

api/controllers/create.js

@@ -10,12 +10,14 @@ const gaConfig = require('./../../config/ga_config.js');
 function create(req, res) {
   res
     .status(200)
-    .header('Content-Type', 'image/gif')
     .header('Access-Control-Allow-Origin', '*')
+    .header('Access-Control-Allow-Headers', 'Content-Type')
     .header('Cache-Control', 'no-cache, no-store, must-revalidate')
-    .send();
+    .sendFile(gaConfig.pixelPath);
 
   if (req.query.firstVisit) {
+    gaConfig.logger.info(req.query, 'Successfully tracked first visit');
+
     cloudwatch.recordMetric(req, gaConfig.visitMetricName);
   }
 }

api/controllers/javascript.js

@@ -1,5 +1,3 @@
-const fs = require('fs');
-
 /**
  * getJavascript(req, res)
  *
@@ -10,6 +8,7 @@ function getJavascript(req, res) {
   res
     .status(200)
     .header('Access-Control-Allow-Origin', '*')
+    .header('Access-Control-Allow-Headers', 'Content-Type')
     .header('Content-Type', 'application/javascript')
     .header('Cache-Control', 'max-age=600')
     .render('gap', {

api/controllers/send.js

@@ -15,14 +15,6 @@ function checkMinimumParameters (req) {
   if (!req.query.clientId) throw new Error('Client ID was not specified.')
 }
 
-/**
- * getReturnPixel(req)
- *
- * @return string
- */
-function getReturnPixel () {
-}
-
 /**
  * sendPageView(req, res)
  *
@@ -50,18 +42,18 @@ function sendPageView (req, res) {
     headers: {}
   })
     .then(response => {
-      gaConfig.logger.info('Successfully tracked page view (' + req.query.page + ').');
+      gaConfig.logger.info(payLoad, 'Successfully tracked page view');
     })
     .catch(response => {
-      gaConfig.logger.error('Error tracking pageview: ' + response.message);
+      gaConfig.logger.error(payLoad, response, 'Error tracking pageview');
     });
 
   res
     .status(200)
-    .header('Content-Type', 'image/gif')
     .header('Cache-Control', 'no-cache, no-store, must-revalidate')
     .header('Access-Control-Allow-Origin', '*')
-    .send(getReturnPixel());
+    .header('Access-Control-Allow-Headers', 'Content-Type')
+    .sendFile(gaConfig.pixelPath);
 
   cloudwatch.recordMetric(req, gaConfig.pageViewMetricName);
 }
@@ -97,18 +89,18 @@ function sendEvent (req, res) {
     headers: {}
   })
     .then(response => {
-      gaConfig.logger.info('Successfully tracked event (' + req.query.eventCategory + ').');
+      gaConfig.logger.info(payLoad, 'Successfully tracked event');
     })
     .catch(response => {
-      gaConfig.logger.error('Error tracking event: ' + response.message);
+      gaConfig.logger.error(payLoad, response, 'Error tracking event');
     });
 
   res
     .status(200)
-    .header('Content-Type', 'image/gif')
     .header('Cache-Control', 'no-cache, no-store, must-revalidate')
     .header('Access-Control-Allow-Origin', '*')
-    .send(getReturnPixel());
+    .header('Access-Control-Allow-Headers', 'Content-Type')
+    .sendFile(gaConfig.pixelPath);
 
   cloudwatch.recordMetric(req, gaConfig.pageViewMetricName);
 }

app.js

@@ -1,59 +1,57 @@
-'use strict';
+'use strict'
 
-const express = require('express');
+const express = require('express')
 
-require('dotenv').config();
+require('dotenv').config()
 
-const logger = require('winston')
-const minify = require('express-minify');
+const minify = require('express-minify')
 
-const create = require('./api/controllers/create.js');
-const send = require('./api/controllers/send.js');
-const javascript = require('./api/controllers/javascript.js');
+const gaConfig = require('./config/ga_config.js');
+const create = require('./api/controllers/create.js')
+const send = require('./api/controllers/send.js')
+const javascript = require('./api/controllers/javascript.js')
 
-const app = express();
+const app = express()
 
-app.set('view engine', 'ejs');
-app.use(minify());
+app.set('view engine', 'ejs')
+app.use(minify())
 
 app.options('*', function (req, res) {
   res
     .status(200)
     .header('Access-Control-Allow-Headers', 'Content-Type')
     .header('Access-Control-Allow-Origin', '*')
-    .send();
+    .send()
 })
 
-
-let router = express.Router();
-app.use(process.env.BASE_PATH, router);
+let router = express.Router()
+app.use(process.env.BASE_PATH, router)
 
 router.route('/swagger')
   .get(function (req, res) {
     res
       .status(200)
       .header('Access-Control-Allow-Headers', 'Content-Type')
       .header('Access-Control-Allow-Origin', '*')
-      .sendFile(__dirname + '/swagger/v0.1.json');
-  });
+      .sendFile(__dirname + '/swagger/v0.1.json')
+  })
 
 router.route('/javascript/gaproxy.js')
-  .get(javascript.getJavascript);
+  .get(javascript.getJavascript)
 
 router.route('/create')
-  .get(create.create);
+  .get(create.create)
 
 router.route('/send/pageview')
-  .get(send.sendPageView);
+  .get(send.sendPageView)
 
 router.route('/send/event')
-  .get(send.sendEvent);
-
+  .get(send.sendEvent)
 
 if (!process.env.AWS_LAMBDA_FUNCTION_NAME) {
-  logger.info('Using ' + process.env.BASE_PATH + ' for base path.');
-  logger.info('Server listing on port ' + (process.env.PORT || 3001) + ' at ' + process.env.BASE_PATH + '.');
-  app.listen(process.env.PORT || 3001);
+  gaConfig.logger.info('Using ' + process.env.BASE_PATH + ' for base path.')
+  gaConfig.logger.info('Server listing on port ' + (process.env.PORT || 3001) + ' at ' + process.env.BASE_PATH + '.')
+  app.listen(process.env.PORT || 3001)
 }
 
-module.exports = app;
+module.exports = app

config/ga_config.js

@@ -1,14 +1,12 @@
-const winston = require('winston');
+const bunyan = require('bunyan')
+const path = require('path');
 
 module.exports = {
   googleBaseUrl: 'https://www.google-analytics.com',
   visitMetricName: 'Visit',
   pageViewMetricName: 'PageView',
-  logger: new winston.Logger({
-    transports: [
-      new winston.transports.Console({
-        json: true
-      })
-    ]
-  })
+  logger: bunyan.createLogger({
+    name: 'App'
+  }),
+  pixelPath: path.resolve(__dirname + '/../static/collect.gif')
 };

index.js

@@ -2,6 +2,11 @@
 
 const awsServerlessExpress = require('aws-serverless-express');
 const app = require('./app');
-const server = awsServerlessExpress.createServer(app);
+
+const binaryTypes = [
+  'image/gif'
+]
+
+const server = awsServerlessExpress.createServer(app, null, binaryTypes);
 
 exports.handler = (event, context) => awsServerlessExpress.proxy(server, event, context);

package.json

@@ -28,7 +28,7 @@
     "express-minify": "^0.2.0",
     "serverless": "^1.9.0",
     "serverless-plugin-write-env-vars": "^1.0.1",
-    "winston": "^2.3.1"
+    "bunyan": "^1.8.10"
   },
   "devDependencies": {
     "supertest": "1.0.0"

swagger/v0.1.json

@@ -17,7 +17,7 @@
     }
   ],
   "paths": {
-    "/v0.1/javascript/gaproxy.js": {
+    "/v0.1/ga-proxy/javascript/gaproxy.js": {
       "get": {
         "tags": [
           "gaproxy"

views/gap.ejs

@@ -10,6 +10,7 @@ var gaProxyApp = {
     data.trackingId = this.trackingId;
     data.clientId = this.clientId;
     data.metricNameSpace = this.metricNameSpace;
+    data.c = new Date().getTime();
 
     this.img = document.createElement('img');
     this.img.src = this.serviceBaseUrl + '/' + action.join('/') + '?' + this.serialize(data);