Merge pull request #42 from MacFJA/handle-sandboxed

Fix sandboxed storage

Author: MacFJA

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fix error with sandboxed storage (`localStorage` + `sessionStorage`) ([Issue#41])
 - (doc) Typo in README ([PR#39]) + outdated example ([PR#40])
 - (dev) Wrong typing ([PR#38])
 
@@ -185,6 +186,7 @@ First version
 [Issue#26]: https://github.com/MacFJA/svelte-persistent-store/issues/26
 [Issue#31]: https://github.com/MacFJA/svelte-persistent-store/issues/31
 [Issue#32]: https://github.com/MacFJA/svelte-persistent-store/issues/32
+[Issue#41]: https://github.com/MacFJA/svelte-persistent-store/issues/41
 [PR#8]: https://github.com/MacFJA/svelte-persistent-store/pull/8
 [PR#38]: https://github.com/MacFJA/svelte-persistent-store/pull/38
 [PR#39]: https://github.com/MacFJA/svelte-persistent-store/pull/39

src/core.ts

@@ -251,12 +251,20 @@ function getBrowserStorage(browserStorage: Storage, listenExternalChanges = fals
  }
 }
 
+function windowStorageAvailable(name: "localStorage" | "sessionStorage" | "indexedDB"): boolean {
+ try {
+ return typeof window[name] === "object"
+ } catch (e) {
+ return false
+ }
+}
+
 /**
  * Storage implementation that use the browser local storage
  * @param {boolean} listenExternalChanges Update the store if the localStorage is updated from another page
  */
 export function createLocalStorage<T>(listenExternalChanges = false): StorageInterface<T> {
- if (typeof window !== "undefined" && window?.localStorage) {
+ if (windowStorageAvailable("localStorage")) {
  return getBrowserStorage(window.localStorage, listenExternalChanges)
  }
  warnStorageNotFound("window.localStorage")
@@ -268,7 +276,7 @@ export function createLocalStorage<T>(listenExternalChanges = false): StorageInt
  * @param {boolean} listenExternalChanges Update the store if the sessionStorage is updated from another page
  */
 export function createSessionStorage<T>(listenExternalChanges = false): StorageInterface<T> {
- if (typeof window !== "undefined" && window?.sessionStorage) {
+ if (windowStorageAvailable("sessionStorage")) {
  return getBrowserStorage(window.sessionStorage, listenExternalChanges)
  }
  warnStorageNotFound("window.sessionStorage")
@@ -302,7 +310,7 @@ export function createCookieStorage(): StorageInterface<any> {
  * Storage implementation that use the browser IndexedDB
  */
 export function createIndexedDBStorage<T>(): SelfUpdateStorageInterface<T> {
- if (typeof indexedDB !== "object" || typeof window === "undefined" || typeof window?.indexedDB !== "object") {
+ if (typeof indexedDB !== "object" || !windowStorageAvailable("indexedDB")) {
  warnStorageNotFound("IndexedDB")
  return createNoopSelfUpdateStorage()
  }