From 5518e2681acb0db40ad59e5c5e5524633dc6a966 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Thu, 30 Nov 2017 08:31:28 -0500
Subject: [PATCH] remove obsolete indexedDB transition-related code

---
 platform/webext/vapi-cachestorage.js | 63 ++++++----------------------
 1 file changed, 13 insertions(+), 50 deletions(-)

diff --git a/platform/webext/vapi-cachestorage.js b/platform/webext/vapi-cachestorage.js
index ca945f50f..a842f3b70 100644
--- a/platform/webext/vapi-cachestorage.js
+++ b/platform/webext/vapi-cachestorage.js
@@ -108,8 +108,6 @@ vAPI.cacheStorage = (function() {
         }
         pending.push(callback);
         if ( pending.length !== 1 ) { return; }
-        // This will fail in private browsing mode.
-        var req = indexedDB.open(STORAGE_NAME, 1);
         // https://github.com/gorhill/uBlock/issues/3156
         //   I have observed that no event was fired in Tor Browser 7.0.7 +
         //   medium security level after the request to open the database was
@@ -119,15 +117,20 @@ vAPI.cacheStorage = (function() {
         //   necessary when reading the `error` property because we are not
         //   allowed to read this propery outside of event handlers in newer
         //   implementation of IDBRequest (my understanding).
+        var req;
         try {
+            req = indexedDB.open(STORAGE_NAME, 1);
             if ( req.error ) {
                 console.log(req.error);
-                processPendings();
-                pending = undefined;
-                return;
+                req = undefined;
             }
         } catch(ex) {
         }
+        if ( req === undefined ) {
+            processPendings();
+            pending = undefined;
+            return;
+        }
         req.onupgradeneeded = function(ev) {
             req = undefined;
             db = ev.target.result;
@@ -152,11 +155,9 @@ vAPI.cacheStorage = (function() {
     function getFromDb(keys, store, callback) {
         if ( typeof callback !== 'function' ) { return; }
         if ( keys.length === 0 ) { return callback(store); }
-        var notfoundKeys = new Set(keys);
         var gotOne = function() {
             if ( typeof this.result === 'object' ) {
                 store[this.result.key] = this.result.value;
-                notfoundKeys.delete(this.result.key);
             }
         };
         getDb(function(db) {
@@ -165,55 +166,18 @@ vAPI.cacheStorage = (function() {
             transaction.oncomplete =
             transaction.onerror =
             transaction.onabort = function() {
-                // TODO: remove once storage.local is clean
-                if ( notfoundKeys.size === 0 ) {
-                    vAPI.storage.remove(keys);
-                    return callback(store);
-                }
-                maybeMigrate(Array.from(notfoundKeys), store, callback);
+                return callback(store);
             };
             var table = transaction.objectStore(STORAGE_NAME);
             for ( var key of keys ) {
                 var req = table.get(key);
                 req.onsuccess = gotOne;
                 req.onerror = noopfn;
+                req = undefined;
             }
         });
     }
 
-    // Migrate from storage API
-    // TODO: removes once all users are migrated to the new cacheStorage.
-    function maybeMigrate(keys, store, callback) {
-        var toMigrate = new Set(),
-            i = keys.length;
-        while ( i-- ) {
-            var key = keys[i];
-            toMigrate.add(key);
-            // If migrating a compiled list, also migrate the non-compiled
-            // counterpart.
-            if ( /^cache\/compiled\//.test(key) ) {
-                toMigrate.add(key.replace('/compiled', ''));
-            }
-        }
-        vAPI.storage.get(Array.from(toMigrate), function(bin) {
-            if ( bin instanceof Object === false ) {
-                return callback(store);
-            }
-            var migratedKeys = Object.keys(bin);
-            if ( migratedKeys.length === 0 ) {
-                return callback(store);
-            }
-            var i = migratedKeys.length;
-            while ( i-- ) {
-                var key = migratedKeys[i];
-                store[key] = bin[key];
-            }
-            vAPI.storage.remove(migratedKeys);
-            vAPI.cacheStorage.set(bin);
-            callback(store);
-        });
-    }
-
     function getAllFromDb(callback) {
         if ( typeof callback !== 'function' ) {
             callback = noopfn;
@@ -250,12 +214,13 @@ vAPI.cacheStorage = (function() {
             transaction.oncomplete =
             transaction.onerror =
             transaction.onabort = callback;
-            var table = transaction.objectStore(STORAGE_NAME),
-                entry = {};
+            var table = transaction.objectStore(STORAGE_NAME);
             for ( var key of keys ) {
+                var entry = {};
                 entry.key = key;
                 entry.value = input[key];
                 table.put(entry);
+                entry = undefined;
             }
         });
     }
@@ -277,8 +242,6 @@ vAPI.cacheStorage = (function() {
                 table.delete(key);
             }
         });
-        // TODO: removes once all users are migrated to the new cacheStorage.
-        vAPI.storage.remove(keys);
     }
 
     function clearDb(callback) {