- Fix: Ensure AbortError sent to IDBOpenDBRequest.onerror upon a

transaction aborting or a connection being closed within an upgrade transaction - Fix: Set `IDBOpenDBRequest.transaction` to `null` upon `AbortError` due to closed connection
indexeddbshim · Oct 27, 2016 · a53531d · a53531d
1 parent 47b5099
commit a53531d
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 20 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -27,6 +27,11 @@
     also remove unused `__multiEntryOffset`
 - Deprecate: Numeric constants as second arguments to
     `IDBDatabase.prototype.transaction` (use `readonly`/`readwrite` instead).
+- Fix: Ensure `AbortError` sent to `IDBOpenDBRequest.onerror` upon a
+    transaction aborting or a connection being closed within an upgrade
+    transaction
+- Fix: Set `IDBOpenDBRequest.transaction` to `null` upon `AbortError` due to
+    closed connection
 - Fix: Set `error` property of `IDBTransaction` for certain tx aborts
 - Fix: 'error' and 'abort' bubbling events
    ((`IDBRequest`->) `IDBTransaction`->`IDBDatabase`),

diff --git a/dist/indexeddbshim-UnicodeIdentifiers-node.js b/dist/indexeddbshim-UnicodeIdentifiers-node.js
@@ -18097,11 +18097,17 @@ IDBFactory.prototype.open = function (name, version) {
                                 req.transaction.on__beforecomplete = function () {
                                     req.result.__versionTransaction = null;
                                 };
+                                req.transaction.on__abort = function () {
+                                    var err = (0, _DOMException.createDOMException)('AbortError', 'The upgrade transaction was aborted.');
+                                    dbCreateError(err);
+                                };
                                 req.transaction.on__complete = function () {
+                                    req.__transaction = null;
                                     if (req.__result.__closed) {
+                                        var _err = (0, _DOMException.createDOMException)('AbortError', 'The connection has been closed.');
+                                        dbCreateError(_err);
                                         return;
                                     }
-                                    req.__transaction = null;
                                     var e = (0, _Event.createEvent)('success');
                                     req.dispatchEvent(e);
                                 };
@@ -20138,6 +20144,7 @@ IDBTransaction.prototype.__abortTransaction = function (err) {
             var evt = (0, _Event.createEvent)('abort', err, { bubbles: true, cancelable: false });
             me.dispatchEvent(evt);
             me.__storeClones = {};
+            me.dispatchEvent((0, _Event.createEvent)('__abort'));
         });
     }
 

diff --git a/dist/indexeddbshim-UnicodeIdentifiers-node.min.js b/dist/indexeddbshim-UnicodeIdentifiers-node.min.js
diff --git a/dist/indexeddbshim-UnicodeIdentifiers.js b/dist/indexeddbshim-UnicodeIdentifiers.js
@@ -10600,11 +10600,17 @@ IDBFactory.prototype.open = function (name, version) {
                                 req.transaction.on__beforecomplete = function () {
                                     req.result.__versionTransaction = null;
                                 };
+                                req.transaction.on__abort = function () {
+                                    var err = (0, _DOMException.createDOMException)('AbortError', 'The upgrade transaction was aborted.');
+                                    dbCreateError(err);
+                                };
                                 req.transaction.on__complete = function () {
+                                    req.__transaction = null;
                                     if (req.__result.__closed) {
+                                        var _err = (0, _DOMException.createDOMException)('AbortError', 'The connection has been closed.');
+                                        dbCreateError(_err);
                                         return;
                                     }
-                                    req.__transaction = null;
                                     var e = (0, _Event.createEvent)('success');
                                     req.dispatchEvent(e);
                                 };
@@ -12641,6 +12647,7 @@ IDBTransaction.prototype.__abortTransaction = function (err) {
             var evt = (0, _Event.createEvent)('abort', err, { bubbles: true, cancelable: false });
             me.dispatchEvent(evt);
             me.__storeClones = {};
+            me.dispatchEvent((0, _Event.createEvent)('__abort'));
         });
     }
 

diff --git a/dist/indexeddbshim-UnicodeIdentifiers.min.js b/dist/indexeddbshim-UnicodeIdentifiers.min.js
diff --git a/dist/indexeddbshim-node.js b/dist/indexeddbshim-node.js
@@ -18097,11 +18097,17 @@ IDBFactory.prototype.open = function (name, version) {
                                 req.transaction.on__beforecomplete = function () {
                                     req.result.__versionTransaction = null;
                                 };
+                                req.transaction.on__abort = function () {
+                                    var err = (0, _DOMException.createDOMException)('AbortError', 'The upgrade transaction was aborted.');
+                                    dbCreateError(err);
+                                };
                                 req.transaction.on__complete = function () {
+                                    req.__transaction = null;
                                     if (req.__result.__closed) {
+                                        var _err = (0, _DOMException.createDOMException)('AbortError', 'The connection has been closed.');
+                                        dbCreateError(_err);
                                         return;
                                     }
-                                    req.__transaction = null;
                                     var e = (0, _Event.createEvent)('success');
                                     req.dispatchEvent(e);
                                 };
@@ -20138,6 +20144,7 @@ IDBTransaction.prototype.__abortTransaction = function (err) {
             var evt = (0, _Event.createEvent)('abort', err, { bubbles: true, cancelable: false });
             me.dispatchEvent(evt);
             me.__storeClones = {};
+            me.dispatchEvent((0, _Event.createEvent)('__abort'));
         });
     }
 

diff --git a/dist/indexeddbshim-node.min.js b/dist/indexeddbshim-node.min.js
diff --git a/dist/indexeddbshim-node.min.js.map b/dist/indexeddbshim-node.min.js.map
diff --git a/dist/indexeddbshim.js b/dist/indexeddbshim.js
@@ -10600,11 +10600,17 @@ IDBFactory.prototype.open = function (name, version) {
                                 req.transaction.on__beforecomplete = function () {
                                     req.result.__versionTransaction = null;
                                 };
+                                req.transaction.on__abort = function () {
+                                    var err = (0, _DOMException.createDOMException)('AbortError', 'The upgrade transaction was aborted.');
+                                    dbCreateError(err);
+                                };
                                 req.transaction.on__complete = function () {
+                                    req.__transaction = null;
                                     if (req.__result.__closed) {
+                                        var _err = (0, _DOMException.createDOMException)('AbortError', 'The connection has been closed.');
+                                        dbCreateError(_err);
                                         return;
                                     }
-                                    req.__transaction = null;
                                     var e = (0, _Event.createEvent)('success');
                                     req.dispatchEvent(e);
                                 };
@@ -12641,6 +12647,7 @@ IDBTransaction.prototype.__abortTransaction = function (err) {
             var evt = (0, _Event.createEvent)('abort', err, { bubbles: true, cancelable: false });
             me.dispatchEvent(evt);
             me.__storeClones = {};
+            me.dispatchEvent((0, _Event.createEvent)('__abort'));
         });
     }
 

diff --git a/dist/indexeddbshim.min.js b/dist/indexeddbshim.min.js
diff --git a/dist/indexeddbshim.min.js.map b/dist/indexeddbshim.min.js.map
diff --git a/src/IDBFactory.js b/src/IDBFactory.js
@@ -100,11 +100,17 @@ IDBFactory.prototype.open = function (name, version) {
                                 req.transaction.on__beforecomplete = function () {
                                     req.result.__versionTransaction = null;
                                 };
+                                req.transaction.on__abort = function () {
+                                    const err = createDOMException('AbortError', 'The upgrade transaction was aborted.');
+                                    dbCreateError(err);
+                                };
                                 req.transaction.on__complete = function () {
+                                    req.__transaction = null;
                                     if (req.__result.__closed) {
+                                        const err = createDOMException('AbortError', 'The connection has been closed.');
+                                        dbCreateError(err);
                                         return;
                                     }
-                                    req.__transaction = null;
                                     const e = createEvent('success');
                                     req.dispatchEvent(e);
                                 };

diff --git a/src/IDBTransaction.js b/src/IDBTransaction.js
@@ -345,6 +345,7 @@ IDBTransaction.prototype.__abortTransaction = function (err) {
             const evt = createEvent('abort', err, {bubbles: true, cancelable: false});
             me.dispatchEvent(evt);
             me.__storeClones = {};
+            me.dispatchEvent(createEvent('__abort'));
         });
     }