🐛 fixed a bug that results were not returned in case of error

src/background/messages/block.ts

@@ -5,9 +5,17 @@ const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
   const { session, subjectDid } = req.body
   const client = BskyClient.createAgentFromSession(session)
 
+  try {
     res.send({
       result: await client.block(subjectDid)
     })
+  } catch (e) {
+    res.send({
+      error: {
+        message: e.message,
+      }
+    })
+  }
 }
 
 export default handler

src/background/messages/follow.ts

@@ -5,9 +5,17 @@ const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
   const { session, subjectDid } = req.body
   const client = BskyClient.createAgentFromSession(session)
 
+  try {
     res.send({
       result: await client.follow(subjectDid)
     })
+  } catch (e) {
+    res.send({
+      error: {
+        message: e.message,
+      }
+    })
+  }
 }
 
 export default handler

src/background/messages/login.ts

@@ -4,6 +4,7 @@ import { BskyClient } from "../../lib/bskyClient";
 const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
   const { identifier, password }  = req.body
 
+  try {
     const agent = await BskyClient.createAgent({
       identifier,
       password,
@@ -12,6 +13,13 @@ const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
     res.send({
       session: agent.session,
     })
+  } catch (e) {
+    res.send({
+      error: {
+        message: e.message,
+      }
+    })
+  }
 }
 
 export default handler

src/background/messages/searchUser.ts

@@ -5,12 +5,20 @@ const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
   const { session, term, limit } = req.body
   const client = BskyClient.createAgentFromSession(session)
 
+  try {
     res.send({
       actors: await client.searchUser({
         term,
         limit,
       })
     })
+  } catch (e) {
+    res.send({
+      error: {
+        message: e.message,
+      }
+    })
+  }
 }
 
 export default handler

src/background/messages/unblock.ts

@@ -5,9 +5,17 @@ const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
   const { session, blockUri } = req.body
   const client = BskyClient.createAgentFromSession(session)
 
+  try {
     res.send({
       result: await client.unblock(blockUri)
     })
+  } catch (e) {
+    res.send({
+      error: {
+        message: e.message,
+      }
+    })
+  }
 }
 
 export default handler

src/background/messages/unfollow.ts

@@ -5,9 +5,17 @@ const handler: PlasmoMessaging.MessageHandler = async (req, res) => {
   const { session, followUri } = req.body
   const client = BskyClient.createAgentFromSession(session)
 
+  try {
     res.send({
       result: await client.unfollow(followUri)
     })
+  } catch (e) {
+    res.send({
+      error: {
+        message: e.message,
+      }
+    })
+  }
 }
 
 export default handler

src/lib/bskyServiceWorkerClient.ts

@@ -16,13 +16,15 @@ export class BskyServiceWorkerClient {
     password,
   }: BskyLoginParams): Promise<BskyServiceWorkerClient> {
     const client = new BskyServiceWorkerClient();
-    const { session } = await sendToBackground({
+    const { session, error } = await sendToBackground({
       name: "login",
       body: {
         identifier,
         password,
       }
     })
+    if(error) throw new Error(error.message)
+
     client.session = session
     return client;
   }
@@ -34,7 +36,7 @@ export class BskyServiceWorkerClient {
     term: string;
     limit: number;
   }) => {
-    const { actors } = await sendToBackground({
+    const { actors, error } = await sendToBackground({
       name: "searchUser",
       body: {
         session: this.session,
@@ -42,51 +44,61 @@ export class BskyServiceWorkerClient {
         limit,
       }
     })
+    if(error) throw new Error(error.message)
+
     return actors;
   };
 
   public follow = async (subjectDid: string) => {
-    const { result } = await sendToBackground({
+    const { result, error } = await sendToBackground({
       name: "follow",
       body: {
         session: this.session,
         subjectDid
       }
     })
+    if(error) throw new Error(error.message)
+
     return result;
   }
 
   public unfollow = async (followUri: string) => {
-    const { result } = await sendToBackground({
+    const { result, error } = await sendToBackground({
       name: "unfollow",
       body: {
         session: this.session,
         followUri
       }
     })
+    if(error) throw new Error(error.message)
+
     return result;
   }
 
   public block = async (subjectDid: string) => {
-    const { result } = await sendToBackground({
+    const { result, error } = await sendToBackground({
       name: "block",
       body: {
         session: this.session,
         subjectDid
       }
     })
+    if(error) throw new Error(error.message)
+
     return result;
   }
 
   public unblock = async (blockUri: string) => {
     // TODO: unblock is not working. Need to fix it.
-    const { result } = await sendToBackground({
+    const { result, error } = await sendToBackground({
       name: "unblock",
       body: {
         session: this.session,
         blockUri
       }
     })
+    if(error) throw new Error(error.message)
+
     return result;
   }
 }