From afd8dd3bbfdedd4a53e0ff6695b250a633484fb7 Mon Sep 17 00:00:00 2001
From: hatim boufnichel <boufni95@gmail.com>
Date: Sun, 27 Jun 2021 18:51:19 +0200
Subject: [PATCH] catch rpc

---
 src/routes.js | 68 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/routes.js b/src/routes.js
index b1ad588c..492087bd 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -3116,53 +3116,97 @@ module.exports = async (
   ap.get('/api/gun/once/:path', async (req, res) => {
     const publicKeyForDecryption = req.header(PUBKEY_FOR_DECRYPT_HEADER)
     const { path } = req.params
-    res.status(200).json({
-      data: await handleGunFetch({
+    try {
+      const data = await handleGunFetch({
         path,
         startFromUserGraph: false,
         type: 'once',
         publicKeyForDecryption
       })
-    })
+      res.status(200).json({
+        data
+      })
+    } catch (err) {
+      logger.error('error in rpc once')
+      logger.error(err)
+      res
+        .status(err.message === Common.Constants.ErrorCode.NOT_AUTH ? 401 : 500)
+        .json({
+          errorMessage: err.message
+        })
+    }
   })
 
   ap.get('/api/gun/load/:path', async (req, res) => {
     const publicKeyForDecryption = req.header(PUBKEY_FOR_DECRYPT_HEADER)
     const { path } = req.params
-    res.status(200).json({
-      data: await handleGunFetch({
+    try {
+      const data = await handleGunFetch({
         path,
         startFromUserGraph: false,
         type: 'load',
         publicKeyForDecryption
       })
-    })
+      res.status(200).json({
+        data
+      })
+    } catch (err) {
+      logger.error('error in rpc load')
+      logger.error(err)
+      res
+        .status(err.message === Common.Constants.ErrorCode.NOT_AUTH ? 401 : 500)
+        .json({
+          errorMessage: err.message
+        })
+    }
   })
 
   ap.get('/api/gun/user/once/:path', async (req, res) => {
     const publicKeyForDecryption = req.header(PUBKEY_FOR_DECRYPT_HEADER)
     const { path } = req.params
-    res.status(200).json({
-      data: await handleGunFetch({
+    try {
+      const data = await handleGunFetch({
         path,
         startFromUserGraph: true,
         type: 'once',
         publicKeyForDecryption
       })
-    })
+      res.status(200).json({
+        data
+      })
+    } catch (err) {
+      logger.error('error in rpc once user')
+      logger.error(err)
+      res
+        .status(err.message === Common.Constants.ErrorCode.NOT_AUTH ? 401 : 500)
+        .json({
+          errorMessage: err.message
+        })
+    }
   })
 
   ap.get('/api/gun/user/load/:path', async (req, res) => {
     const publicKeyForDecryption = req.header(PUBKEY_FOR_DECRYPT_HEADER)
     const { path } = req.params
-    res.status(200).json({
-      data: await handleGunFetch({
+    try {
+      const data = await handleGunFetch({
         path,
         startFromUserGraph: true,
         type: 'load',
         publicKeyForDecryption
       })
-    })
+      res.status(200).json({
+        data
+      })
+    } catch (err) {
+      logger.error('error in rpc load user')
+      logger.error(err)
+      res
+        .status(err.message === Common.Constants.ErrorCode.NOT_AUTH ? 401 : 500)
+        .json({
+          errorMessage: err.message
+        })
+    }
   })
 
   ap.get('/api/gun/otheruser/:publicKey/:type/:path', async (req, res) => {