[MIRROR] Ports Important TGUI Fix

tgui/packages/common/storage.js

@@ -44,45 +44,44 @@ class MemoryBackend {
     this.store = {};
   }
 
-  async get(key) {
+  get(key) {
     return this.store[key];
   }
 
-  async set(key, value) {
+  set(key, value) {
     this.store[key] = value;
   }
 
-  async remove(key) {
+  remove(key) {
     this.store[key] = undefined;
   }
 
-  async clear() {
+  clear() {
     this.store = {};
   }
 }
 
 class LocalStorageBackend {
   constructor() {
     this.impl = IMPL_LOCAL_STORAGE;
-    this.store = {};
   }
 
-  async get(key) {
+  get(key) {
     const value = localStorage.getItem(key);
     if (typeof value === 'string') {
       return JSON.parse(value);
     }
   }
 
-  async set(key, value) {
+  set(key, value) {
     localStorage.setItem(key, JSON.stringify(value));
   }
 
-  async remove(key) {
+  remove(key) {
     localStorage.removeItem(key);
   }
 
-  async clear() {
+  clear() {
     localStorage.clear();
   }
 }
@@ -150,8 +149,47 @@ class IndexedDbBackend {
   }
 }
 
-export const storage = (
-  testIndexedDb() && new IndexedDbBackend()
-  || testLocalStorage() && new LocalStorageBackend()
-  || new MemoryBackend()
-);
+/**
+ * Web Storage Proxy object, which selects the best backend available
+ * depending on the environment.
+ */
+class StorageProxy {
+  constructor() {
+    this.backendPromise = (async () => {
+      if (testIndexedDb()) {
+        try {
+          const backend = new IndexedDbBackend();
+          await backend.dbPromise;
+          return backend;
+        }
+        catch {}
+      }
+      if (testLocalStorage()) {
+        return new LocalStorageBackend();
+      }
+      return new MemoryBackend();
+    })();
+  }
+
+  async get(key) {
+    const backend = await this.backendPromise;
+    return backend.get(key);
+  }
+
+  async set(key, value) {
+    const backend = await this.backendPromise;
+    return backend.set(key, value);
+  }
+
+  async remove(key) {
+    const backend = await this.backendPromise;
+    return backend.remove(key);
+  }
+
+  async clear() {
+    const backend = await this.backendPromise;
+    return backend.clear();
+  }
+}
+
+export const storage = new StorageProxy();