Skip to content

Commit cc490da

Browse files
committed
Fix indexedDB error messages
1 parent 78e06ca commit cc490da

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

src/lib/tw-local-backpack-api.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,21 @@ const openDB = () => new Promise((resolve, reject) => {
6868

6969
const request = indexedDB.open(DATABASE_NAME, DATABASE_VERSION);
7070

71-
request.onupgradeneeded = e => {
72-
const db = e.target.result;
71+
request.onupgradeneeded = event => {
72+
const db = event.target.result;
7373
db.createObjectStore(STORE_NAME, {
7474
keyPath: 'id',
7575
autoIncrement: true
7676
});
7777
};
7878

79-
request.onsuccess = e => {
80-
_db = e.target.result;
79+
request.onsuccess = event => {
80+
_db = event.target.result;
8181
resolve(_db);
8282
};
8383

84-
request.onerror = () => {
85-
reject(new Error(`DB error: ${request.error}`));
84+
request.onerror = event => {
85+
reject(new Error(`DB error: ${event.target.error}`));
8686
};
8787
});
8888

@@ -93,8 +93,8 @@ const getBackpackContents = async ({
9393
const db = await openDB();
9494
return new Promise((resolve, reject) => {
9595
const transaction = db.transaction(STORE_NAME, 'readonly');
96-
transaction.onerror = () => {
97-
reject(new Error(`Transaction error: ${transaction.error}`));
96+
transaction.onerror = event => {
97+
reject(new Error(`Transaction error: ${event.target.error}`));
9898
};
9999
const store = transaction.objectStore(STORE_NAME);
100100
const items = [];
@@ -132,8 +132,8 @@ const saveBackpackObject = async ({
132132
const db = await openDB();
133133
return new Promise((resolve, reject) => {
134134
const transaction = db.transaction(STORE_NAME, 'readwrite');
135-
transaction.onerror = () => {
136-
reject(new Error(`Transaction error: ${transaction.error}`));
135+
transaction.onerror = event => {
136+
reject(new Error(`Transaction error: ${event.target.error}`));
137137
};
138138
const store = transaction.objectStore(STORE_NAME);
139139
const bodyData = base64ToArrayBuffer(body);
@@ -161,8 +161,8 @@ const deleteBackpackObject = async ({
161161
const db = await openDB();
162162
return new Promise((resolve, reject) => {
163163
const transaction = db.transaction(STORE_NAME, 'readwrite');
164-
transaction.onerror = () => {
165-
reject(new Error(`Transaction error: ${transaction.error}`));
164+
transaction.onerror = event => {
165+
reject(new Error(`Transaction error: ${event.target.error}`));
166166
};
167167
const store = transaction.objectStore(STORE_NAME);
168168
// Convert string IDs to number IDs
@@ -181,8 +181,8 @@ const updateBackpackObject = async ({
181181
const db = await openDB();
182182
return new Promise((resolve, reject) => {
183183
const transaction = db.transaction(STORE_NAME, 'readwrite');
184-
transaction.onerror = () => {
185-
reject(new Error(`Transaction error: ${transaction.error}`));
184+
transaction.onerror = event => {
185+
reject(new Error(`Transaction error: ${event.target.error}`));
186186
};
187187
const store = transaction.objectStore(STORE_NAME);
188188
const getRequest = store.get(id);

src/lib/tw-restore-point-api.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ const removeExtraneousData = transaction => new Promise(resolve => {
160160
*/
161161
const removeExtraneousRestorePoints = () => openDB().then(db => new Promise((resolveTransaction, rejectTransaction) => {
162162
const transaction = db.transaction(ALL_STORES, 'readwrite');
163-
transaction.onerror = () => {
164-
rejectTransaction(new Error(`Transaction error: ${transaction.error}`));
163+
transaction.onerror = event => {
164+
rejectTransaction(new Error(`Transaction error: ${event.target.error}`));
165165
};
166166

167167
// Figuring out which restore points to keep and which to remove is non-trivial.
@@ -310,8 +310,8 @@ const createRestorePoint = (
310310

311311
generateThumbnail(vm).then(thumbnailData => {
312312
const transaction = db.transaction(ALL_STORES, 'readwrite');
313-
transaction.onerror = () => {
314-
rejectTransaction(new Error(`Transaction error: ${transaction.error}`));
313+
transaction.onerror = event => {
314+
rejectTransaction(new Error(`Transaction error: ${event.target.error}`));
315315
};
316316

317317
// Will be generated by database
@@ -397,8 +397,8 @@ const createRestorePoint = (
397397
*/
398398
const deleteRestorePoint = id => openDB().then(db => new Promise((resolve, reject) => {
399399
const transaction = db.transaction(ALL_STORES, 'readwrite');
400-
transaction.onerror = () => {
401-
reject(new Error(`Transaction error: ${transaction.error}`));
400+
transaction.onerror = event => {
401+
reject(new Error(`Transaction error: ${event.target.error}`));
402402
};
403403

404404
const metadataStore = transaction.objectStore(METADATA_STORE);
@@ -414,8 +414,8 @@ const deleteRestorePoint = id => openDB().then(db => new Promise((resolve, rejec
414414
*/
415415
const deleteAllRestorePoints = () => openDB().then(db => new Promise((resolveTransaction, rejectTransaction) => {
416416
const transaction = db.transaction(ALL_STORES, 'readwrite');
417-
transaction.onerror = () => {
418-
rejectTransaction(new Error(`Transaction error: ${transaction.error}`));
417+
transaction.onerror = event => {
418+
rejectTransaction(new Error(`Transaction error: ${event.target.error}`));
419419
};
420420

421421
const deleteEverything = async () => {
@@ -448,8 +448,8 @@ const loadRestorePoint = (vm, id) => openDB().then(db => new Promise((resolvePro
448448
const storageHelper = {
449449
load: (assetType, assetId, dataFormat) => new Promise((resolveFetch, rejectFetch) => {
450450
const transaction = db.transaction([ASSET_STORE], 'readonly');
451-
transaction.onerror = () => {
452-
rejectFetch(new Error(`Transaction error: ${transaction.error}`));
451+
transaction.onerror = event => {
452+
rejectFetch(new Error(`Transaction error: ${event.target.error}`));
453453
};
454454

455455
const md5ext = `${assetId}.${dataFormat}`;
@@ -474,8 +474,8 @@ const loadRestorePoint = (vm, id) => openDB().then(db => new Promise((resolvePro
474474

475475
const loadProjectJSON = () => {
476476
const transaction = db.transaction([PROJECT_STORE], 'readonly');
477-
transaction.onerror = () => {
478-
rejectProject(new Error(`Transaction error: ${transaction.error}`));
477+
transaction.onerror = event => {
478+
rejectProject(new Error(`Transaction error: ${event.target.error}`));
479479
};
480480

481481
const projectStore = transaction.objectStore(PROJECT_STORE);
@@ -508,8 +508,8 @@ const loadRestorePoint = (vm, id) => openDB().then(db => new Promise((resolvePro
508508
*/
509509
const getAllRestorePoints = () => openDB().then(db => new Promise((resolve, reject) => {
510510
const transaction = db.transaction([METADATA_STORE], 'readonly');
511-
transaction.onerror = () => {
512-
reject(new Error(`Transaction error: ${transaction.error}`));
511+
transaction.onerror = event => {
512+
reject(new Error(`Transaction error: ${event.target.error}`));
513513
};
514514

515515
/** @type {Metadata[]} */
@@ -552,8 +552,8 @@ const getAllRestorePoints = () => openDB().then(db => new Promise((resolve, reje
552552
*/
553553
const getThumbnail = id => openDB().then(db => new Promise((resolve, reject) => {
554554
const transaction = db.transaction([THUMBNAIL_STORE], 'readonly');
555-
transaction.onerror = () => {
556-
reject(new Error(`Transaction error: ${transaction.error}`));
555+
transaction.onerror = event => {
556+
reject(new Error(`Transaction error: ${event.target.error}`));
557557
};
558558

559559
const thumbnailStore = transaction.objectStore(THUMBNAIL_STORE);

0 commit comments

Comments
 (0)