Revert "Merge pull request #33 from amplitude/migrate_cookie_local_storage"

This reverts commit 176629b, reversing
changes made to fbb218a.

Author: djih

amplitude.js

@@ -1,7 +1,7 @@
 var Cookie = require('./cookie');
 var JSON = require('json'); // jshint ignore:line
 var language = require('./language');
-var Storage = require('./storage'); // jshint ignore:line
+var localStorage = require('./localstorage');  // jshint ignore:line
 var md5 = require('JavaScript-MD5');
 var object = require('object');
 var Request = require('./xhr');
@@ -30,25 +30,19 @@ var DEFAULT_OPTIONS = {
   savedMaxCount: 1000,
   saveEvents: true,
   sessionTimeout: 30 * 60 * 1000,
+  unsentKey: 'amplitude_unsent',
+  unsentIdentifyKey: 'amplitude_unsent_identify',
   uploadBatchSize: 100,
   batchEvents: false,
   eventUploadThreshold: 30,
   eventUploadPeriodMillis: 30 * 1000 // 30s
 };
-
-var StorageKeys = {
+var LocalStorageKeys = {
   LAST_EVENT_ID: 'amplitude_lastEventId',
   LAST_IDENTIFY_ID: 'amplitude_lastIdentifyId',
   LAST_SEQUENCE_NUMBER: 'amplitude_lastSequenceNumber',
   LAST_EVENT_TIME: 'amplitude_lastEventTime',
-  SESSION_ID: 'amplitude_sessionId',
-  UNSENT_EVENTS: 'amplitude_unsent',
-  UNSENT_IDENTIFYS: 'amplitude_unsent_identify',
-
-  // Previously stored in cookie
-  DEVICE_ID: 'amplitude_deviceId',
-  USER_ID: 'amplitude_userId',
-  OPT_OUT: 'amplitude_optOut'
+  SESSION_ID: 'amplitude_sessionId'
 };
 
 /*
@@ -59,7 +53,6 @@ var Amplitude = function() {
   this._unsentIdentifys = [];
   this._ua = new UAParser(navigator.userAgent).getResult();
   this.options = object.merge({}, DEFAULT_OPTIONS);
-  this.storage = new Storage().getStorage();
   this._q = []; // queue for proxied functions before script load
 };
 
@@ -116,17 +109,42 @@ Amplitude.prototype.init = function(apiKey, opt_userId, opt_config, callback) {
       domain: this.options.domain
     });
     this.options.domain = Cookie.options().domain;
-    this._upgradeStoredData();
-    this._loadStoredData();
 
-    this.setUserId(opt_userId || this.options.userId || null);
-    this.setDeviceId((opt_config && opt_config.deviceId) || this.options.deviceId || UUID());
+    _loadCookieData(this);
+
+    this.options.deviceId = (opt_config && opt_config.deviceId !== undefined &&
+        opt_config.deviceId !== null && opt_config.deviceId) ||
+        this.options.deviceId || UUID();
+    this.options.userId = (opt_userId !== undefined && opt_userId !== null && opt_userId) || this.options.userId || null;
+    _saveCookieData(this);
+
+    //log('initialized with apiKey=' + apiKey);
+    //opt_userId !== undefined && opt_userId !== null && log('initialized with userId=' + opt_userId);
+
+    if (this.options.saveEvents) {
+      this._loadSavedUnsentEvents(this.options.unsentKey, '_unsentEvents');
+      this._loadSavedUnsentEvents(this.options.unsentIdentifyKey, '_unsentIdentifys');
+    }
 
     this._sendEventsIfReady();
 
     if (this.options.includeUtm) {
       this._initUtmData();
     }
+
+    this._lastEventTime = parseInt(localStorage.getItem(LocalStorageKeys.LAST_EVENT_TIME)) || null;
+    this._sessionId = parseInt(localStorage.getItem(LocalStorageKeys.SESSION_ID)) || null;
+    this._eventId = localStorage.getItem(LocalStorageKeys.LAST_EVENT_ID) || 0;
+    this._identifyId = localStorage.getItem(LocalStorageKeys.LAST_IDENTIFY_ID) || 0;
+    this._sequenceNumber = localStorage.getItem(LocalStorageKeys.LAST_SEQUENCE_NUMBER) || 0;
+    var now = new Date().getTime();
+    if (!this._sessionId || !this._lastEventTime || now - this._lastEventTime > this.options.sessionTimeout) {
+      this._newSession = true;
+      this._sessionId = now;
+      localStorage.setItem(LocalStorageKeys.SESSION_ID, this._sessionId);
+    }
+    this._lastEventTime = now;
+    localStorage.setItem(LocalStorageKeys.LAST_EVENT_TIME, this._lastEventTime);
   } catch (e) {
     log(e);
   }
@@ -146,135 +164,15 @@ Amplitude.prototype.runQueuedFunctions = function () {
   this._q = []; // clear function queue after running
 };
 
-/**
- * Set an item in local storage. Decorate item key with the api key
- * to avoid collisions.
- *
- * @property item: name of the item to store
- * @property value: the value to store
- */
-Amplitude.prototype.setInStorage = function(item, value) {
-  var key = item + '_' + this.options.apiKey.slice(0, 6);
-  if (value) {
-    this.storage.setItem(key, value);
-    return;
-  }
-  // if value is null, then remove from storage
-  this.storage.removeItem(key);
-};
-
-/**
- * Fetch an item from local storage. Decorate item key with api key
- * to avoid collisions.
- *
- * @property item: name of the item to fetch
- * @property defaultValue: default value to return if the item does not exist
- */
-Amplitude.prototype.getFromStorage = function(item, defaultValue) {
-  var key = item + '_' + this.options.apiKey.slice(0, 6);
-  return this.storage.getItem(key) || defaultValue;
-};
-
-Amplitude.prototype._upgradeStoredData = function() {
-  // migrate data from cookie to local storage
-  var cookieData = Cookie.get(this.options.cookieName);
-  if (cookieData) {
-    if (cookieData.deviceId) {
-      this.setInStorage(StorageKeys.DEVICE_ID, cookieData.deviceId);
-    }
-    if (cookieData.userId) {
-      this.setInStorage(StorageKeys.USER_ID, cookieData.userId);
-    }
-    if (cookieData.optOut !== undefined) {
-      this.setInStorage(StorageKeys.OPT_OUT, cookieData.optOut);
-    }
-    Cookie.remove(this.options.cookieName);
-  }
-
-  // update local storage keys to prevent conflicts
-  var lastEventId = localStorage.getItem(StorageKeys.LAST_EVENT_ID);
-  if (lastEventId) {
-    this.setInStorage(StorageKeys.LAST_EVENT_ID, lastEventId);
-    localStorage.removeItem(StorageKeys.LAST_EVENT_ID);
-  }
-
-  var lastIdentifyId = localStorage.getItem(StorageKeys.LAST_IDENTIFY_ID);
-  if (lastIdentifyId) {
-    this.setInStorage(StorageKeys.LAST_IDENTIFY_ID, lastIdentifyId);
-    localStorage.removeItem(StorageKeys.LAST_IDENTIFY_ID);
-  }
-
-  var lastSequenceNumber = localStorage.getItem(StorageKeys.LAST_SEQUENCE_NUMBER);
-  if (lastSequenceNumber) {
-    this.setInStorage(StorageKeys.LAST_SEQUENCE_NUMBER, lastSequenceNumber);
-    localStorage.removeItem(StorageKeys.LAST_SEQUENCE_NUMBER);
-  }
-
-  var lastEventTime  = localStorage.getItem(StorageKeys.LAST_EVENT_TIME);
-  if (lastEventTime) {
-    this.setInStorage(StorageKeys.LAST_EVENT_TIME, lastEventTime);
-    localStorage.removeItem(StorageKeys.LAST_EVENT_TIME);
-  }
-
-  var sessionId = localStorage.getItem(StorageKeys.SESSION_ID);
-  if (sessionId) {
-    this.setInStorage(StorageKeys.SESSION_ID, sessionId);
-    localStorage.removeItem(StorageKeys.SESSION_ID);
-  }
-
-  var unsentEventsString = localStorage.getItem(StorageKeys.UNSENT_EVENTS);
-  if (unsentEventsString) {
-    this.setInStorage(StorageKeys.UNSENT_EVENTS, unsentEventsString);
-    localStorage.removeItem(StorageKeys.UNSENT_EVENTS);
-  }
-
-  var unsentIdentifysString = localStorage.getItem(StorageKeys.UNSENT_IDENTIFYS);
-  if (unsentIdentifysString) {
-    this.setInStorage(StorageKeys.UNSENT_IDENTIFYS, unsentIdentifysString);
-    localStorage.removeItem(StorageKeys.UNSENT_IDENTIFYS);
-  }
-};
-
-Amplitude.prototype._loadStoredData = function() {
-  if (this.options.saveEvents) {
-    this._unsentEvents = this._loadSavedUnsentEvents(StorageKeys.UNSENT_EVENTS);
-    this._unsentIdentifys = this._loadSavedUnsentEvents(StorageKeys.UNSENT_IDENTIFYS);
-  }
-
-  try {
-    this.options.deviceId = this.getFromStorage(StorageKeys.DEVICE_ID, this.options.deviceId);
-    this.options.userId = this.getFromStorage(StorageKeys.USER_ID, this.options.userId);
-    this.options.optOut = (this.getFromStorage(StorageKeys.OPT_OUT, String(this.options.optOut || false)) === 'true');
-
-    this._lastEventTime = parseInt(this.getFromStorage(StorageKeys.LAST_EVENT_TIME));
-    this._sessionId = parseInt(this.getFromStorage(StorageKeys.SESSION_ID));
-    this._eventId = parseInt(this.getFromStorage(StorageKeys.LAST_EVENT_ID, 0));
-    this._identifyId = parseInt(this.getFromStorage(StorageKeys.LAST_IDENTIFY_ID, 0));
-    this._sequenceNumber = parseInt(this.getFromStorage(StorageKeys.LAST_SEQUENCE_NUMBER, 0));
-
-    var now = new Date().getTime();
-    if (!this._sessionId || !this._lastEventTime || now - this._lastEventTime > this.options.sessionTimeout) {
-      this._newSession = true;
-      this._sessionId = now;
-      this.setInStorage(StorageKeys.SESSION_ID, this._sessionId);
-    }
-    this._lastEventTime = now;
-    this.setInStorage(StorageKeys.LAST_EVENT_TIME, this._lastEventTime);
-  } catch (e) {
-    log(e);
-  }
-};
-
-Amplitude.prototype._loadSavedUnsentEvents = function(unsentKey) {
-  var savedUnsentEventsString = this.getFromStorage(unsentKey);
+Amplitude.prototype._loadSavedUnsentEvents = function(unsentKey, queue) {
+  var savedUnsentEventsString = localStorage.getItem(unsentKey);
   if (savedUnsentEventsString) {
     try {
-      return JSON.parse(savedUnsentEventsString);
+      this[queue] = JSON.parse(savedUnsentEventsString);
     } catch (e) {
       //log(e);
     }
   }
-  return [];
 };
 
 Amplitude.prototype.isNewSession = function() {
@@ -330,6 +228,29 @@ Amplitude.prototype._sendEventsIfReady = function(callback) {
   return false;
 };
 
+var _loadCookieData = function(scope) {
+  var cookieData = Cookie.get(scope.options.cookieName);
+  if (cookieData) {
+    if (cookieData.deviceId) {
+      scope.options.deviceId = cookieData.deviceId;
+    }
+    if (cookieData.userId) {
+      scope.options.userId = cookieData.userId;
+    }
+    if (cookieData.optOut !== undefined) {
+      scope.options.optOut = cookieData.optOut;
+    }
+  }
+};
+
+var _saveCookieData = function(scope) {
+  Cookie.set(scope.options.cookieName, {
+    deviceId: scope.options.deviceId,
+    userId: scope.options.userId,
+    optOut: scope.options.optOut
+  });
+};
+
 Amplitude._getUtmParam = function(name, query) {
   name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
   var regex = new RegExp("[\\?&]" + name + "=([^&#]*)");
@@ -378,8 +299,8 @@ Amplitude.prototype._getReferringDomain = function() {
 
 Amplitude.prototype.saveEvents = function() {
   try {
-    this.setInStorage(StorageKeys.UNSENT_EVENTS, JSON.stringify(this._unsentEvents));
-    this.setInStorage(StorageKeys.UNSENT_IDENTIFYS, JSON.stringify(this._unsentIdentifys));
+    localStorage.setItem(this.options.unsentKey, JSON.stringify(this._unsentEvents));
+    localStorage.setItem(this.options.unsentIdentifyKey, JSON.stringify(this._unsentIdentifys));
   } catch (e) {
     //log(e);
   }
@@ -391,10 +312,8 @@ Amplitude.prototype.setDomain = function(domain) {
       domain: domain
     });
     this.options.domain = Cookie.options().domain;
-
-    this._upgradeStoredData();
-    this._loadStoredData();
-
+    _loadCookieData(this);
+    _saveCookieData(this);
     //log('set domain=' + domain);
   } catch (e) {
     log(e);
@@ -404,7 +323,7 @@ Amplitude.prototype.setDomain = function(domain) {
 Amplitude.prototype.setUserId = function(userId) {
   try {
     this.options.userId = (userId !== undefined && userId !== null && ('' + userId)) || null;
-    this.setInStorage(StorageKeys.USER_ID, this.options.userId);
+    _saveCookieData(this);
     //log('set userId=' + userId);
   } catch (e) {
     log(e);
@@ -414,7 +333,7 @@ Amplitude.prototype.setUserId = function(userId) {
 Amplitude.prototype.setOptOut = function(enable) {
   try {
     this.options.optOut = enable;
-    this.setInStorage(StorageKeys.OPT_OUT, this.options.optOut);
+    _saveCookieData(this);
     //log('set optOut=' + enable);
   } catch (e) {
     log(e);
@@ -425,7 +344,7 @@ Amplitude.prototype.setDeviceId = function(deviceId) {
   try {
     if (deviceId) {
       this.options.deviceId = ('' + deviceId);
-      this.setInStorage(StorageKeys.DEVICE_ID, this.options.deviceId);
+      _saveCookieData(this);
     }
   } catch (e) {
     log(e);
@@ -515,19 +434,19 @@ Amplitude.prototype._logEvent = function(eventType, eventProperties, apiProperti
     var eventId;
     if (eventType === IDENTIFY_EVENT) {
       eventId = this.nextIdentifyId();
-      this.setInStorage(StorageKeys.LAST_IDENTIFY_ID, eventId);
+      localStorage.setItem(LocalStorageKeys.LAST_IDENTIFY_ID, eventId);
     } else {
       eventId = this.nextEventId();
-      this.setInStorage(StorageKeys.LAST_EVENT_ID, eventId);
+      localStorage.setItem(LocalStorageKeys.LAST_EVENT_ID, eventId);
     }
     var eventTime = new Date().getTime();
     var ua = this._ua;
     if (!this._sessionId || !this._lastEventTime || eventTime - this._lastEventTime > this.options.sessionTimeout) {
       this._sessionId = eventTime;
-      this.setInStorage(StorageKeys.SESSION_ID, this._sessionId);
+      localStorage.setItem(LocalStorageKeys.SESSION_ID, this._sessionId);
     }
     this._lastEventTime = eventTime;
-    this.setInStorage(StorageKeys.LAST_EVENT_TIME, this._lastEventTime);
+    localStorage.setItem(LocalStorageKeys.LAST_EVENT_TIME, this._lastEventTime);
 
     userProperties = userProperties || {};
     // Only add utm properties to user properties for events