Make sure IDB and service worker work without cookies

tomayac · Aug 29, 2022 · b9d2c59 · b9d2c59
1 parent 50a3875
commit b9d2c59
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 28 deletions.
diff --git a/docs/assets/collect.0c9e4ac7.js → docs/assets/collect.caba0611.js b/docs/assets/collect.0c9e4ac7.js → docs/assets/collect.caba0611.js
diff --git a/docs/assets/filehandling.e52f5903.js → docs/assets/filehandling.ab6add74.js b/docs/assets/filehandling.e52f5903.js → docs/assets/filehandling.ab6add74.js
diff --git a/docs/assets/index.a1ccdec1.js → docs/assets/index.c9eeed59.js b/docs/assets/index.a1ccdec1.js → docs/assets/index.c9eeed59.js
diff --git a/docs/assets/install.409b18f2.js → docs/assets/install.b3c48fc5.js b/docs/assets/install.409b18f2.js → docs/assets/install.b3c48fc5.js
diff --git a/docs/assets/share.232178b4.js b/docs/assets/share.232178b4.js
diff --git a/docs/assets/share.518e5a0f.js b/docs/assets/share.518e5a0f.js
diff --git a/docs/assets/windowcontrols.14d8428d.js → docs/assets/windowcontrols.4a9fcc0c.js b/docs/assets/windowcontrols.14d8428d.js → docs/assets/windowcontrols.4a9fcc0c.js
diff --git a/docs/index.html b/docs/index.html
@@ -100,7 +100,7 @@
       }
     </script>
     <base target="_blank" />
-    <script type="module" crossorigin src="/assets/index.a1ccdec1.js"></script>
+    <script type="module" crossorigin src="/assets/index.c9eeed59.js"></script>
     <link rel="stylesheet" href="/assets/style.713cd514.css">
   <link rel="manifest" href="/manifest.webmanifest"></head>
   <body>

diff --git a/docs/sw.js b/docs/sw.js
diff --git a/src/js/filesystem.js b/src/js/filesystem.js
@@ -121,7 +121,13 @@ saveSVGButton.addEventListener('click', async () => {
   };
 
   try {
-    const fileName = getSuggestedFileName(await get(FILE_HANDLE));
+    let fileHandle = false;
+    try {
+      fileHandle = await get(FILE_HANDLE);
+    } catch (err) {
+      // Do nothing. The user probably blocks cookies.
+    }
+    const fileName = getSuggestedFileName(fileHandle);
     await fileSave(createPromiseBlob(), {
       fileName,
       description: 'SVG file',

diff --git a/src/js/main.js b/src/js/main.js
@@ -52,9 +52,14 @@ if ('share' in navigator && 'canShare' in navigator) {
 
 if ('serviceWorker' in navigator) {
   window.addEventListener('load', async () => {
-    await navigator.serviceWorker.register('./sharetargetsw.js', {
-      scope: '/share-target/',
-    });
+    try {
+      await navigator.serviceWorker.register('./sharetargetsw.js', {
+        scope: '/share-target/',
+      });
+    } catch (err) {
+      console.error(err.name, err.message);
+      showToast(err.message);
+    }
 
     if (location.search.includes('share-target')) {
       const keys = await caches.keys();

diff --git a/src/js/share.js b/src/js/share.js
@@ -31,8 +31,15 @@ shareSVGButton.addEventListener('click', async () => {
   showToast(i18n.t('optimizingSVG'), Infinity);
   svg = await optimizeSVG(svg);
   clearToast();
-  const suggestedFileName =
-    getSuggestedFileName(await get(FILE_HANDLE)) || 'Untitled.svg';
+  let fileHandle = false;
+  try {
+    fileHandle = await get(FILE_HANDLE);
+  } catch (err) {
+    // Do nothing. The user probably blocks cookies.
+  }
+  const suggestedFileName = fileHandle
+    ? getSuggestedFileName(fileHandle)
+    : 'Untitled.svg';
   const file = new File([svg], suggestedFileName, { type: 'image/svg+xml' });
   const data = {
     files: [file],

diff --git a/src/js/ui.js b/src/js/ui.js
@@ -383,9 +383,20 @@ const initUI = async () => {
   onMaxWidthMatch();
   mediaQueryList.addEventListener('change', onMaxWidthMatch);
 
-  colorRadio.checked = (await get(colorRadio.id)) ?? colorRadio.defaultChecked;
-  monochromeRadio.checked =
-    (await get(monochromeRadio.id)) ?? monochromeRadio.defaultChecked;
+  try {
+    colorRadio.checked =
+      (await get(colorRadio.id)) ?? colorRadio.defaultChecked;
+  } catch (err) {
+    // The user probably blocks cookies.
+    colorRadio.checked = colorRadio.defaultChecked;
+  }
+  try {
+    monochromeRadio.checked =
+      (await get(monochromeRadio.id)) ?? monochromeRadio.defaultChecked;
+  } catch (err) {
+    // The user probably blocks cookies.
+    monochromeRadio.checked = monochromeRadio.defaultChecked;
+  }
   if (colorRadio.checked) {
     svgOutput.classList.add(COLOR);
   }
@@ -663,13 +674,18 @@ const resetSettings = async () => {
 };
 
 const getSettings = async () => {
-  const settings = colorRadio.checked
-    ? await get(COLOR_SETTINGS)
-    : await get(MONOCHROME_SETTINGS);
-  if (settings) {
-    return settings;
+  try {
+    const settings = colorRadio.checked
+      ? await get(COLOR_SETTINGS)
+      : await get(MONOCHROME_SETTINGS);
+    if (settings) {
+      return settings;
+    }
+    return {};
+  } catch (err) {
+    // The user probably blocks cookies.
+    return {};
   }
-  return {};
 };
 
 const storeSettings = async (input) => {