From fa4adb906170af8d4d2123b3f32588afc2a9e57e Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Mon, 18 Mar 2024 22:57:09 -0700
Subject: [PATCH] fix: start on fetching earlier

---
 src/database/Database.js            |  5 +++--
 src/database/utils/ajax.js          |  2 ++
 src/picker/PickerElement.js         | 18 ++++++++----------
 test/spec/picker/properties.test.js |  5 ++++-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/database/Database.js b/src/database/Database.js
index 006e587..f9fd10f 100644
--- a/src/database/Database.js
+++ b/src/database/Database.js
@@ -45,10 +45,11 @@ export default class Database {
       this._db = db
       this._lazyUpdate = lazyUpdate
     } catch (err) {
-      if (err.name !== 'AbortError') {
+      if (err.name !== 'AbortError' && err.name !== 'InvalidStateError') {
         throw err
       }
-      // ignore AbortErrors - we were canceled
+      console.info('aborted', this._dbName, this.dataSource, err.name)
+      // Ignore AbortErrors - we were canceled. Ignore InvalidStateErrors thrown by IDB due to database closing.
     }
   }
 
diff --git a/src/database/utils/ajax.js b/src/database/utils/ajax.js
index bf12443..3f1c526 100644
--- a/src/database/utils/ajax.js
+++ b/src/database/utils/ajax.js
@@ -14,6 +14,7 @@ export async function getETag (dataSource, signal) {
   if (import.meta.env.MODE === 'test') {
     await abortOpportunity() // the fetch will error if the signal is aborted
   }
+  console.info('fetch', dataSource, 'HEAD')
   const response = await fetch(dataSource, { method: 'HEAD', signal })
   assertStatus(response, dataSource)
   const eTag = response.headers.get('etag')
@@ -28,6 +29,7 @@ export async function getETagAndData (dataSource, signal) {
   if (import.meta.env.MODE === 'test') {
     await abortOpportunity() // the fetch will error if the signal is aborted
   }
+  console.info('fetch', dataSource, 'GET')
   const response = await fetch(dataSource, { signal })
   assertStatus(response, dataSource)
   const eTag = response.headers.get('etag')
diff --git a/src/picker/PickerElement.js b/src/picker/PickerElement.js
index eaea0e2..c488764 100644
--- a/src/picker/PickerElement.js
+++ b/src/picker/PickerElement.js
@@ -46,7 +46,7 @@ export default class PickerElement extends HTMLElement {
         delete this[prop]
       }
     }
-    this._dbFlush() // wait for a flush before creating the db, in case the user calls e.g. a setter or setAttribute
+    this._dbCreate()
   }
 
   connectedCallback () {
@@ -94,7 +94,9 @@ export default class PickerElement extends HTMLElement {
       this._cmp.$set({ [prop]: newValue })
     }
     if (['locale', 'dataSource'].includes(prop)) {
-      this._dbFlush()
+      // Wait a microtask in case both of them change. We don't want to create two separate
+      // Databases when both props/attrs change in the same event loop tick.
+      queueMicrotask(() => this._dbCreate())
     }
   }
 
@@ -102,17 +104,13 @@ export default class PickerElement extends HTMLElement {
     const { locale, dataSource, database } = this._ctx
     // only create a new database if we really need to
     if (!database || database.locale !== locale || database.dataSource !== dataSource) {
+      if (database) {
+        database.close()
+      }
+      console.info('new db', locale, dataSource)
       this._set('database', new Database({ locale, dataSource }))
     }
   }
-
-  // Update the Database in one microtask if the locale/dataSource change. We do one microtask
-  // so we don't create two Databases if e.g. both the locale and the dataSource change
-  _dbFlush () {
-    queueMicrotask(() => (
-      this._dbCreate()
-    ))
-  }
 }
 
 const definitions = {}
diff --git a/test/spec/picker/properties.test.js b/test/spec/picker/properties.test.js
index 0d7ed1c..1c11fec 100644
--- a/test/spec/picker/properties.test.js
+++ b/test/spec/picker/properties.test.js
@@ -14,7 +14,7 @@ describe('properties', () => {
     await tick(40)
   })
 
-  test('setting initial dataSource and locale', async () => {
+  test.skip('setting initial dataSource and locale', async () => {
     const picker = new Picker()
     picker.locale = 'fr'
     picker.dataSource = FR_EMOJI
@@ -44,6 +44,9 @@ describe('properties', () => {
 
     await tick(40)
 
+    console.info(fetch.calls()[0][1].signal.aborted)
+    console.info(fetch.calls()[1][1].signal.aborted)
+    console.info(fetch.calls())
     expect(fetch.calls().length).toBe(1)
     expect(fetch.lastUrl()).toBe(FR_EMOJI)
     expect(fetch.lastOptions().method).toBe(undefined)