mixpanel-browser 2.43.0 → 2.45.0

package/mixpanel-jslib-snippet.js

@@ -68,8 +68,8 @@ var MIXPANEL_LIB_URL = '//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js';
 
                 function _set_and_defer_chained(fn_name) {
                     mock_group[fn_name] = function() {
-                        call2_args = arguments;
-                        call2 = [fn_name].concat(Array.prototype.slice.call(call2_args, 0));
+                        var call2_args = arguments;
+                        var call2 = [fn_name].concat(Array.prototype.slice.call(call2_args, 0));
                         target.push([call1, call2]);
                     };
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixpanel-browser",
-  "version": "2.43.0",
+  "version": "2.45.0",
   "description": "The official Mixpanel JavaScript browser client library",
   "main": "dist/mixpanel.cjs.js",
   "directories": {

package/src/config.js

@@ -1,6 +1,6 @@
 var Config = {
     DEBUG: false,
-    LIB_VERSION: '2.43.0'
+    LIB_VERSION: '2.45.0'
 };
 
 export default Config;

package/src/mixpanel-core.js

@@ -4,7 +4,6 @@ import { _, console, userAgent, window, document, navigator, slice } from './uti
 import { FormTracker, LinkTracker } from './dom-trackers';
 import { RequestBatcher } from './request-batcher';
 import { MixpanelGroup } from './mixpanel-group';
-import { MixpanelNotification } from './mixpanel-notification';
 import { MixpanelPeople } from './mixpanel-people';
 import {
     MixpanelPersistence,
@@ -93,6 +92,7 @@ var DEFAULT_CONFIG = {
     'cdn':                               'https://cdn.mxpnl.com',
     'cross_site_cookie':                 false,
     'cross_subdomain_cookie':            true,
+    'error_reporter':                    NOOP_FUNC,
     'persistence':                       'cookie',
     'persistence_name':                  '',
     'cookie_domain':                     '',
@@ -117,8 +117,6 @@ var DEFAULT_CONFIG = {
     'opt_out_tracking_cookie_prefix':    null,
     'property_blacklist':                [],
     'xhr_headers':                       {}, // { header: value, header2: value }
-    'inapp_protocol':                    '//',
-    'inapp_link_new_window':             false,
     'ignore_dnt':                        false,
     'batch_requests':                    true,
     'batch_size':                        50,
@@ -160,8 +158,6 @@ var create_mplib = function(token, config, name) {
     }
 
     instance._cached_groups = {}; // cache groups in a pool
-    instance._user_decide_check_complete = false;
-    instance._events_tracked_before_user_decide_check_complete = [];
 
     instance._init(token, config, name);
 
@@ -204,11 +200,11 @@ var create_mplib = function(token, config, name) {
  */
 MixpanelLib.prototype.init = function (token, config, name) {
     if (_.isUndefined(name)) {
-        console.error('You must name your new library: init(token, config, name)');
+        this.report_error('You must name your new library: init(token, config, name)');
         return;
     }
     if (name === PRIMARY_INSTANCE_NAME) {
-        console.error('You must initialize the main mixpanel object right after you include the Mixpanel js snippet');
+        this.report_error('You must initialize the main mixpanel object right after you include the Mixpanel js snippet');
         return;
     }
 
@@ -231,7 +227,6 @@ MixpanelLib.prototype._init = function(token, config, name) {
 
     this['__loaded'] = true;
     this['config'] = {};
-    this['_triggered_notifs'] = [];
 
     var variable_features = {};
 
@@ -350,7 +345,7 @@ MixpanelLib.prototype._dom_loaded = function() {
 
 MixpanelLib.prototype._track_dom = function(DomClass, args) {
     if (this.get_config('img')) {
-        console.error('You can\'t use DOM tracking functions with img = true.');
+        this.report_error('You can\'t use DOM tracking functions with img = true.');
         return false;
     }
 
@@ -452,6 +447,7 @@ MixpanelLib.prototype._send_request = function(url, data, options, callback) {
 
     url += '?' + _.HTTPBuildQuery(data);
 
+    var lib = this;
     if ('img' in data) {
         var img = document.createElement('img');
         img.src = url;
@@ -460,7 +456,7 @@ MixpanelLib.prototype._send_request = function(url, data, options, callback) {
         try {
             succeeded = sendBeacon(url, body_data);
         } catch (e) {
-            console.error(e);
+            lib.report_error(e);
             succeeded = false;
         }
         try {
@@ -468,7 +464,7 @@ MixpanelLib.prototype._send_request = function(url, data, options, callback) {
                 callback(succeeded ? 1 : 0);
             }
         } catch (e) {
-            console.error(e);
+            lib.report_error(e);
         }
     } else if (USE_XHR) {
         try {
@@ -500,7 +496,7 @@ MixpanelLib.prototype._send_request = function(url, data, options, callback) {
                                 try {
                                     response = _.JSONDecode(req.responseText);
                                 } catch (e) {
-                                    console.error(e);
+                                    lib.report_error(e);
                                     if (options.ignore_json_errors) {
                                         response = req.responseText;
                                     } else {
@@ -523,7 +519,7 @@ MixpanelLib.prototype._send_request = function(url, data, options, callback) {
                         } else {
                             error = 'Bad HTTP status: ' + req.status + ' ' + req.statusText;
                         }
-                        console.error(error);
+                        lib.report_error(error);
                         if (callback) {
                             if (verbose_mode) {
                                 callback({status: 0, error: error, xhr_req: req});
@@ -536,7 +532,7 @@ MixpanelLib.prototype._send_request = function(url, data, options, callback) {
             };
             req.send(body_data);
         } catch (e) {
-            console.error(e);
+            lib.report_error(e);
             succeeded = false;
         }
     } else {
@@ -626,7 +622,9 @@ MixpanelLib.prototype.init_batchers = function() {
                     }, this),
                     beforeSendHook: _.bind(function(item) {
                         return this._run_hook('before_send_' + attrs.type, item);
-                    }, this)
+                    }, this),
+                    errorReporter: this.get_config('error_reporter'),
+                    stopAllBatchingFunc: _.bind(this.stop_batch_senders, this)
                 }
             );
         }, this);
@@ -783,7 +781,7 @@ MixpanelLib.prototype.track = addOptOutCheckMixpanelLib(function(event_name, pro
     }
 
     if (_.isUndefined(event_name)) {
-        console.error('No event name provided to mixpanel.track');
+        this.report_error('No event name provided to mixpanel.track');
         return;
     }
 
@@ -824,7 +822,7 @@ MixpanelLib.prototype.track = addOptOutCheckMixpanelLib(function(event_name, pro
             delete properties[blacklisted_prop];
         });
     } else {
-        console.error('Invalid value for property_blacklist config: ' + property_blacklist);
+        this.report_error('Invalid value for property_blacklist config: ' + property_blacklist);
     }
 
     var data = {
@@ -840,8 +838,6 @@ MixpanelLib.prototype.track = addOptOutCheckMixpanelLib(function(event_name, pro
         send_request_options: options
     }, callback);
 
-    this._check_and_handle_triggered_notifications(data);
-
     return ret;
 });
 
@@ -1069,7 +1065,7 @@ MixpanelLib.prototype.track_forms = function() {
  */
 MixpanelLib.prototype.time_event = function(event_name) {
     if (_.isUndefined(event_name)) {
-        console.error('No event name provided to mixpanel.time_event');
+        this.report_error('No event name provided to mixpanel.time_event');
         return;
     }
 
@@ -1252,7 +1248,6 @@ MixpanelLib.prototype.identify = function(
         this.unregister(ALIAS_ID_KEY);
         this.register({'distinct_id': new_distinct_id});
     }
-    this._check_and_handle_notifications(this.get_distinct_id());
     this._flags.identify_called = true;
     // Flush any queued up people requests
     this['people']._flush(_set_callback, _add_callback, _append_callback, _set_once_callback, _union_callback, _unset_callback, _remove_callback);
@@ -1342,7 +1337,7 @@ MixpanelLib.prototype.alias = function(alias, original) {
     // mixpanel.people.identify() call made for this user. It is VERY BAD to make an alias with
     // this ID, as it will duplicate users.
     if (alias === this.get_property(PEOPLE_DISTINCT_ID_KEY)) {
-        console.critical('Attempting to create alias for existing People user - aborting.');
+        this.report_error('Attempting to create alias for existing People user - aborting.');
         return -2;
     }
 
@@ -1362,7 +1357,7 @@ MixpanelLib.prototype.alias = function(alias, original) {
             _this.identify(alias);
         });
     } else {
-        console.error('alias matches current distinct_id - skipping api call.');
+        this.report_error('alias matches current distinct_id - skipping api call.');
         this.identify(alias);
         return -1;
     }
@@ -1489,14 +1484,6 @@ MixpanelLib.prototype.name_tag = function(name_tag) {
  *       // the format {'Header-Name': value}
  *       xhr_headers: {}
  *
- *       // protocol for fetching in-app message resources, e.g.
- *       // 'https://' or 'http://'; defaults to '//' (which defers to the
- *       // current page's protocol)
- *       inapp_protocol: '//'
- *
- *       // whether to open in-app message link in new tab/window
- *       inapp_link_new_window: false
- *
  *       // whether to ignore or respect the web browser's Do Not Track setting
  *       ignore_dnt: false
  *     }
@@ -1545,7 +1532,7 @@ MixpanelLib.prototype.get_config = function(prop_name) {
 MixpanelLib.prototype._run_hook = function(hook_name) {
     var ret = (this['config']['hooks'][hook_name] || IDENTITY_FUNC).apply(this, slice.call(arguments, 1));
     if (typeof ret === 'undefined') {
-        console.error(hook_name + ' hook did not return a value');
+        this.report_error(hook_name + ' hook did not return a value');
         ret = null;
     }
     return ret;
@@ -1587,75 +1574,6 @@ MixpanelLib.prototype._event_is_disabled = function(event_name) {
         _.include(this.__disabled_events, event_name);
 };
 
-MixpanelLib.prototype._check_and_handle_triggered_notifications = addOptOutCheckMixpanelLib(function(event_data) {
-    if (!this._user_decide_check_complete) {
-        this._events_tracked_before_user_decide_check_complete.push(event_data);
-    } else {
-        var arr = this['_triggered_notifs'];
-        for (var i = 0; i < arr.length; i++) {
-            var notif = new MixpanelNotification(arr[i], this);
-            if (notif._matches_event_data(event_data)) {
-                this._show_notification(arr[i]);
-                return;
-            }
-        }
-    }
-});
-
-MixpanelLib.prototype._check_and_handle_notifications = addOptOutCheckMixpanelLib(function(distinct_id) {
-    if (
-        !distinct_id ||
-        this._flags.identify_called ||
-        this.get_config('disable_notifications')
-    ) {
-        return;
-    }
-
-    console.log('MIXPANEL NOTIFICATION CHECK');
-
-    var data = {
-        'verbose':     true,
-        'version':     '3',
-        'lib':         'web',
-        'token':       this.get_config('token'),
-        'distinct_id': distinct_id
-    };
-    this._send_request(
-        this.get_config('api_host') + '/decide/',
-        data,
-        {method: 'GET', transport: 'XHR'},
-        this._prepare_callback(_.bind(function(result) {
-            if (result['notifications'] && result['notifications'].length > 0) {
-                this['_triggered_notifs'] = [];
-                var notifications = [];
-                _.each(result['notifications'], function(notif) {
-                    (notif['display_triggers'] && notif['display_triggers'].length > 0 ? this['_triggered_notifs'] : notifications).push(notif);
-                }, this);
-                if (notifications.length > 0) {
-                    this._show_notification.call(this, notifications[0]);
-                }
-            }
-            this._handle_user_decide_check_complete();
-        }, this))
-    );
-});
-
-MixpanelLib.prototype._handle_user_decide_check_complete = function() {
-    this._user_decide_check_complete = true;
-
-    // check notifications against events that were tracked before decide call completed
-    var events = this._events_tracked_before_user_decide_check_complete;
-    while (events.length > 0) {
-        var data = events.shift(); // replay in the same order they came in
-        this._check_and_handle_triggered_notifications(data);
-    }
-};
-
-MixpanelLib.prototype._show_notification = function(notif_data) {
-    var notification = new MixpanelNotification(notif_data, this);
-    notification.show();
-};
-
 // perform some housekeeping around GDPR opt-in/out state
 MixpanelLib.prototype._gdpr_init = function() {
     var is_localStorage_requested = this.get_config('opt_out_tracking_persistence_type') === 'localStorage';
@@ -1901,6 +1819,18 @@ MixpanelLib.prototype.clear_opt_in_out_tracking = function(options) {
     this._gdpr_update_persistence(options);
 };
 
+MixpanelLib.prototype.report_error = function(msg, err) {
+    console.error.apply(console.error, arguments);
+    try {
+        if (!err && !(msg instanceof Error)) {
+            msg = new Error(msg);
+        }
+        this.get_config('error_reporter')(msg, err);
+    } catch(err) {
+        console.error(err);
+    }
+};
+
 // EXPORTS (for closure compiler)
 
 // MixpanelLib Exports
@@ -1923,9 +1853,6 @@ MixpanelLib.prototype['get_config']                         = MixpanelLib.protot
 MixpanelLib.prototype['get_property']                       = MixpanelLib.prototype.get_property;
 MixpanelLib.prototype['get_distinct_id']                    = MixpanelLib.prototype.get_distinct_id;
 MixpanelLib.prototype['toString']                           = MixpanelLib.prototype.toString;
-MixpanelLib.prototype['_check_and_handle_notifications']    = MixpanelLib.prototype._check_and_handle_notifications;
-MixpanelLib.prototype['_handle_user_decide_check_complete'] = MixpanelLib.prototype._handle_user_decide_check_complete;
-MixpanelLib.prototype['_show_notification']                 = MixpanelLib.prototype._show_notification;
 MixpanelLib.prototype['opt_out_tracking']                   = MixpanelLib.prototype.opt_out_tracking;
 MixpanelLib.prototype['opt_in_tracking']                    = MixpanelLib.prototype.opt_in_tracking;
 MixpanelLib.prototype['has_opted_out_tracking']             = MixpanelLib.prototype.has_opted_out_tracking;
@@ -1946,8 +1873,6 @@ MixpanelPersistence.prototype['update_referrer_info']  = MixpanelPersistence.pro
 MixpanelPersistence.prototype['get_cross_subdomain']   = MixpanelPersistence.prototype.get_cross_subdomain;
 MixpanelPersistence.prototype['clear']                 = MixpanelPersistence.prototype.clear;
 
-_.safewrap_class(MixpanelLib, ['identify', '_check_and_handle_notifications', '_show_notification']);
-
 
 var instances = {};
 var extend_mp = function() {

package/src/mixpanel-persistence.js

@@ -9,7 +9,6 @@ import {
     REMOVE_ACTION,
     UNION_ACTION
 } from './api-actions';
-import Config from './config';
 import { _, console } from './utils';
 
 /*
@@ -25,7 +24,6 @@ import { _, console } from './utils';
 // This key is deprecated, but we want to check for it to see whether aliasing is allowed.
 /** @const */ var PEOPLE_DISTINCT_ID_KEY = '$people_distinct_id';
 /** @const */ var ALIAS_ID_KEY           = '__alias';
-/** @const */ var CAMPAIGN_IDS_KEY       = '__cmpns';
 /** @const */ var EVENT_TIMERS_KEY       = '__timers';
 /** @const */ var RESERVED_PROPERTIES = [
     SET_QUEUE_KEY,
@@ -37,7 +35,6 @@ import { _, console } from './utils';
     UNION_QUEUE_KEY,
     PEOPLE_DISTINCT_ID_KEY,
     ALIAS_ID_KEY,
-    CAMPAIGN_IDS_KEY,
     EVENT_TIMERS_KEY
 ];
 
@@ -151,7 +148,6 @@ MixpanelPersistence.prototype.upgrade = function(config) {
 
 MixpanelPersistence.prototype.save = function() {
     if (this.disabled) { return; }
-    this._expire_notification_campaigns();
     this.storage.set(
         this.name,
         _.JSONEncode(this['props']),
@@ -223,22 +219,6 @@ MixpanelPersistence.prototype.unregister = function(prop) {
     }
 };
 
-MixpanelPersistence.prototype._expire_notification_campaigns = _.safewrap(function() {
-    var campaigns_shown = this['props'][CAMPAIGN_IDS_KEY],
-        EXPIRY_TIME = Config.DEBUG ? 60 * 1000 : 60 * 60 * 1000; // 1 minute (Config.DEBUG) / 1 hour (PDXN)
-    if (!campaigns_shown) {
-        return;
-    }
-    for (var campaign_id in campaigns_shown) {
-        if (1 * new Date() - campaigns_shown[campaign_id] > EXPIRY_TIME) {
-            delete campaigns_shown[campaign_id];
-        }
-    }
-    if (_.isEmptyObject(campaigns_shown)) {
-        delete this['props'][CAMPAIGN_IDS_KEY];
-    }
-});
-
 MixpanelPersistence.prototype.update_campaign_params = function() {
     if (!this.campaign_params_saved) {
         this.register_once(_.info.campaignParams());
@@ -501,6 +481,5 @@ export {
     UNION_QUEUE_KEY,
     PEOPLE_DISTINCT_ID_KEY,
     ALIAS_ID_KEY,
-    CAMPAIGN_IDS_KEY,
     EVENT_TIMERS_KEY
 };

package/src/request-batcher.js

@@ -13,17 +13,23 @@ var logger = console_with_prefix('batch');
  * @constructor
  */
 var RequestBatcher = function(storageKey, options) {
-    this.queue = new RequestQueue(storageKey, {storage: options.storage});
+    this.errorReporter = options.errorReporter;
+    this.queue = new RequestQueue(storageKey, {
+        errorReporter: _.bind(this.reportError, this),
+        storage: options.storage
+    });
 
     this.libConfig = options.libConfig;
     this.sendRequest = options.sendRequestFunc;
     this.beforeSendHook = options.beforeSendHook;
+    this.stopAllBatching = options.stopAllBatchingFunc;
 
     // seed variable batch size + flush interval with configured values
     this.batchSize = this.libConfig['batch_size'];
     this.flushInterval = this.libConfig['batch_flush_interval_ms'];
 
     this.stopped = !this.libConfig['batch_autostart'];
+    this.consecutiveRemovalFailures = 0;
 };
 
 /**
@@ -39,6 +45,7 @@ RequestBatcher.prototype.enqueue = function(item, cb) {
  */
 RequestBatcher.prototype.start = function() {
     this.stopped = false;
+    this.consecutiveRemovalFailures = 0;
     this.flush();
 };
 
@@ -143,7 +150,7 @@ RequestBatcher.prototype.flush = function(options) {
                     res.error === 'timeout' &&
                     new Date().getTime() - startTime >= timeoutMS
                 ) {
-                    logger.error('Network timeout; retrying');
+                    this.reportError('Network timeout; retrying');
                     this.flush();
                 } else if (
                     _.isObject(res) &&
@@ -160,17 +167,17 @@ RequestBatcher.prototype.flush = function(options) {
                         }
                     }
                     retryMS = Math.min(MAX_RETRY_INTERVAL_MS, retryMS);
-                    logger.error('Error; retry in ' + retryMS + ' ms');
+                    this.reportError('Error; retry in ' + retryMS + ' ms');
                     this.scheduleFlush(retryMS);
                 } else if (_.isObject(res) && res.xhr_req && res.xhr_req['status'] === 413) {
                     // 413 Payload Too Large
                     if (batch.length > 1) {
                         var halvedBatchSize = Math.max(1, Math.floor(currentBatchSize / 2));
                         this.batchSize = Math.min(this.batchSize, halvedBatchSize, batch.length - 1);
-                        logger.error('413 response; reducing batch size to ' + this.batchSize);
+                        this.reportError('413 response; reducing batch size to ' + this.batchSize);
                         this.resetFlush();
                     } else {
-                        logger.error('Single-event request too large; dropping', batch);
+                        this.reportError('Single-event request too large; dropping', batch);
                         this.resetBatchSize();
                         removeItemsFromQueue = true;
                     }
@@ -183,12 +190,25 @@ RequestBatcher.prototype.flush = function(options) {
                 if (removeItemsFromQueue) {
                     this.queue.removeItemsByID(
                         _.map(batch, function(item) { return item['id']; }),
-                        _.bind(this.flush, this) // handle next batch if the queue isn't empty
+                        _.bind(function(succeeded) {
+                            if (succeeded) {
+                                this.consecutiveRemovalFailures = 0;
+                                this.flush(); // handle next batch if the queue isn't empty
+                            } else {
+                                this.reportError('Failed to remove items from queue');
+                                if (++this.consecutiveRemovalFailures > 5) {
+                                    this.reportError('Too many queue failures; disabling batching system.');
+                                    this.stopAllBatching();
+                                } else {
+                                    this.resetFlush();
+                                }
+                            }
+                        }, this)
                     );
                 }
 
             } catch(err) {
-                logger.error('Error handling API response', err);
+                this.reportError('Error handling API response', err);
                 this.resetFlush();
             }
         }, this);
@@ -205,9 +225,26 @@ RequestBatcher.prototype.flush = function(options) {
         this.sendRequest(dataForRequest, requestOptions, batchSendCallback);
 
     } catch(err) {
-        logger.error('Error flushing request queue', err);
+        this.reportError('Error flushing request queue', err);
         this.resetFlush();
     }
 };
 
+/**
+ * Log error to global logger and optional user-defined logger.
+ */
+RequestBatcher.prototype.reportError = function(msg, err) {
+    logger.error.apply(logger.error, arguments);
+    if (this.errorReporter) {
+        try {
+            if (!(err instanceof Error)) {
+                err = new Error(msg);
+            }
+            this.errorReporter(msg, err);
+        } catch(err) {
+            logger.error(err);
+        }
+    }
+};
+
 export { RequestBatcher };

package/src/request-queue.js

@@ -1,5 +1,5 @@
 import { SharedLock } from './shared-lock';
-import { cheap_guid, console_with_prefix, JSONParse, JSONStringify, _ } from './utils'; // eslint-disable-line camelcase
+import { cheap_guid, console_with_prefix, localStorageSupported, JSONParse, JSONStringify, _ } from './utils'; // eslint-disable-line camelcase
 
 var logger = console_with_prefix('batch');
 
@@ -23,6 +23,7 @@ var RequestQueue = function(storageKey, options) {
     options = options || {};
     this.storageKey = storageKey;
     this.storage = options.storage || window.localStorage;
+    this.reportError = options.errorReporter || _.bind(logger.error, logger);
     this.lock = new SharedLock(storageKey, {storage: this.storage});
 
     this.pid = options.pid || null; // pass pid to test out storage lock contention scenarios
@@ -60,18 +61,18 @@ RequestQueue.prototype.enqueue = function(item, flushInterval, cb) {
                 this.memQueue.push(queueEntry);
             }
         } catch(err) {
-            logger.error('Error enqueueing item', item);
+            this.reportError('Error enqueueing item', item);
             succeeded = false;
         }
         if (cb) {
             cb(succeeded);
         }
-    }, this), function lockFailure(err) {
-        logger.error('Error acquiring storage lock', err);
+    }, this), _.bind(function lockFailure(err) {
+        this.reportError('Error acquiring storage lock', err);
         if (cb) {
             cb(false);
         }
-    }, this.pid);
+    }, this), this.pid);
 };
 
 /**
@@ -131,25 +132,61 @@ RequestQueue.prototype.removeItemsByID = function(ids, cb) {
     _.each(ids, function(id) { idSet[id] = true; });
 
     this.memQueue = filterOutIDsAndInvalid(this.memQueue, idSet);
-    this.lock.withLock(_.bind(function lockAcquired() {
+
+    var removeFromStorage = _.bind(function() {
         var succeeded;
         try {
             var storedQueue = this.readFromStorage();
             storedQueue = filterOutIDsAndInvalid(storedQueue, idSet);
             succeeded = this.saveToStorage(storedQueue);
+
+            // an extra check: did storage report success but somehow
+            // the items are still there?
+            if (succeeded) {
+                storedQueue = this.readFromStorage();
+                for (var i = 0; i < storedQueue.length; i++) {
+                    var item = storedQueue[i];
+                    if (item['id'] && !!idSet[item['id']]) {
+                        this.reportError('Item not removed from storage');
+                        return false;
+                    }
+                }
+            }
         } catch(err) {
-            logger.error('Error removing items', ids);
+            this.reportError('Error removing items', ids);
             succeeded = false;
         }
+        return succeeded;
+    }, this);
+
+    this.lock.withLock(function lockAcquired() {
+        var succeeded = removeFromStorage();
         if (cb) {
             cb(succeeded);
         }
-    }, this), function lockFailure(err) {
-        logger.error('Error acquiring storage lock', err);
+    }, _.bind(function lockFailure(err) {
+        var succeeded = false;
+        this.reportError('Error acquiring storage lock', err);
+        if (!localStorageSupported(this.storage, true)) {
+            // Looks like localStorage writes have stopped working sometime after
+            // initialization (probably full), and so nobody can acquire locks
+            // anymore. Consider it temporarily safe to remove items without the
+            // lock, since nobody's writing successfully anyway.
+            succeeded = removeFromStorage();
+            if (!succeeded) {
+                // OK, we couldn't even write out the smaller queue. Try clearing it
+                // entirely.
+                try {
+                    this.storage.removeItem(this.storageKey);
+                } catch(err) {
+                    this.reportError('Error clearing queue', err);
+                }
+            }
+        }
         if (cb) {
-            cb(false);
+            cb(succeeded);
         }
-    }, this.pid);
+    }, this), this.pid);
 };
 
 // internal helper for RequestQueue.updatePayloads
@@ -184,18 +221,18 @@ RequestQueue.prototype.updatePayloads = function(itemsToUpdate, cb) {
             storedQueue = updatePayloads(storedQueue, itemsToUpdate);
             succeeded = this.saveToStorage(storedQueue);
         } catch(err) {
-            logger.error('Error updating items', itemsToUpdate);
+            this.reportError('Error updating items', itemsToUpdate);
             succeeded = false;
         }
         if (cb) {
             cb(succeeded);
         }
-    }, this), function lockFailure(err) {
-        logger.error('Error acquiring storage lock', err);
+    }, this), _.bind(function lockFailure(err) {
+        this.reportError('Error acquiring storage lock', err);
         if (cb) {
             cb(false);
         }
-    }, this.pid);
+    }, this), this.pid);
 };
 
 /**
@@ -209,12 +246,12 @@ RequestQueue.prototype.readFromStorage = function() {
         if (storageEntry) {
             storageEntry = JSONParse(storageEntry);
             if (!_.isArray(storageEntry)) {
-                logger.error('Invalid storage entry:', storageEntry);
+                this.reportError('Invalid storage entry:', storageEntry);
                 storageEntry = null;
             }
         }
     } catch (err) {
-        logger.error('Error retrieving queue', err);
+        this.reportError('Error retrieving queue', err);
         storageEntry = null;
     }
     return storageEntry || [];
@@ -228,7 +265,7 @@ RequestQueue.prototype.saveToStorage = function(queue) {
         this.storage.setItem(this.storageKey, JSONStringify(queue));
         return true;
     } catch (err) {
-        logger.error('Error saving queue', err);
+        this.reportError('Error saving queue', err);
         return false;
     }
 };