fix: swarm.localStorage mimics window.localStorage with null and unde…

…fined set (#72)
ethersphere · Nov 29, 2021 · 700ac0c · 700ac0c
1 parent e6b78d4
commit 700ac0c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 deletions.
diff --git a/src/background/dapp-session.manager.ts b/src/background/dapp-session.manager.ts
@@ -35,22 +35,17 @@ class DappSecurityContext {
 
   /** STORAGE FUNCTIONS */
 
-  public setStorageItem(keyName: string, keyValue: unknown): Promise<void> {
+  public async setStorageItem(keyName: string, keyValue: unknown): Promise<void> {
     const key = this.enrichStorageKey(keyName)
 
-    return new Promise(resolve => this.storage.set({ [key]: keyValue, resolve }))
+    await new Promise(resolve => this.storage.set({ [key]: keyValue }, () => resolve(true)))
   }
 
   public getStorageItem(keyName: string): Promise<unknown> {
     const key = this.enrichStorageKey(keyName)
 
-    return new Promise((resolve, reject) =>
+    return new Promise(resolve =>
       this.storage.get([key], result => {
-        console.log('result', result)
-
-        if (!result[key]) {
-          reject(`LocalStorage: ${key} does not exist`)
-        }
         resolve(result[key])
       }),
     )

diff --git a/src/background/feeder/local-storage.feeder.ts b/src/background/feeder/local-storage.feeder.ts
@@ -57,7 +57,7 @@ export class LocalStorageFeeder {
   ) {
     console.log(`LocalStorageFeeder: store set -> ${payload}`)
 
-    if (!payload || !payload[0] || !payload[1]) {
+    if (!payload || !payload[0]) {
       response.error = `LocalStorageFeeder: wrong payload: Got ${payload}`
 
       return response

diff --git a/src/contentscript/document-start/messenger.interceptor.ts b/src/contentscript/document-start/messenger.interceptor.ts
@@ -73,13 +73,9 @@ export class MessengerInterceptor {
       throw new Error(message.error)
     }
 
-    if (!message.answer) {
-      throw new Error(`No answer from message handler at key "${message.key}"`)
-    }
-
     return {
       key: message.key,
-      answer: message.answer,
+      answer: message.answer as T,
       target: 'content',
       sender: 'background',
     }

diff --git a/src/contentscript/swarm-library/local-storage.ts b/src/contentscript/swarm-library/local-storage.ts
@@ -57,13 +57,7 @@ export class LocalStorage extends MessengerInpage implements ILocalStorageMessag
         // handle message
         if (response.data.error) reject(response.data.error)
 
-        if (response.data.answer === undefined) {
-          const errorMessage = `LocalStorage: no answer. EventID: ${response.data.eventId}`
-          console.error(errorMessage, response)
-          reject(errorMessage)
-        } else {
-          resolve(response.data.answer)
-        }
+        resolve(response.data.answer)
       }
 
       window.addEventListener('message', handler)