feat: improve error handling in new APIs

api/network-explorer.js

@@ -7,6 +7,7 @@ import {loadBlockIndex} from './loaders/blocks/index';
 import {loadBlockDetail} from './loaders/blocks/detail';
 import {loadTransactionIndex} from './loaders/transactions/index';
 import {loadTransactionDetail} from './loaders/transactions/detail';
+import {FriendlyGet} from './friendlyGet';
 
 function prettify(req, data) {
   const isPretty = req.query && req.query.pretty === 'true';
@@ -35,19 +36,33 @@ export function addNetworkExplorerRoutes(redisX, app) {
     const start = q.start || '+';
     const count = q.count ? parseInt(q.count) : DEFAULT_PAGE_SIZE;
     const direction = q.direction || '-';
-    const rawData = await loadBlockIndex(redisX, start, count, direction);
+    const {__errors__, rawData} = await new FriendlyGet()
+      .with('rawData', loadBlockIndex(redisX, start, count, direction), {})
+      .get();
 
-    res.send(prettify(req, new BlockIndexView().asVersion(rawData, version)));
+    res.send(
+      prettify(
+        req,
+        new BlockIndexView().asVersion(rawData, __errors__, version),
+      ),
+    );
   });
 
   // Network Explorer Block Detail
   app.get('/explorer/blocks/:id', async (req, res) => {
     const q = req.query || {};
 
     const version = q.v || 'BlockDetailView@latest';
-    const rawData = await loadBlockDetail(redisX, req.params.id, version);
+    const {__errors__, rawData} = await new FriendlyGet()
+      .with('rawData', loadBlockDetail(redisX, req.params.id, version), {})
+      .get();
 
-    res.send(prettify(req, new BlockDetailView().asVersion(rawData, version)));
+    res.send(
+      prettify(
+        req,
+        new BlockDetailView().asVersion(rawData, __errors__, version),
+      ),
+    );
   });
 
   // Network Explorer Transaction Index
@@ -58,10 +73,19 @@ export function addNetworkExplorerRoutes(redisX, app) {
     const start = q.start || '+';
     const count = q.count ? parseInt(q.count) : DEFAULT_PAGE_SIZE;
     const direction = q.direction || '-';
-    const rawData = await loadTransactionIndex(redisX, start, count, direction);
+    const {__errors__, rawData} = await new FriendlyGet()
+      .with(
+        'rawData',
+        loadTransactionIndex(redisX, start, count, direction),
+        {},
+      )
+      .get();
 
     res.send(
-      prettify(req, new TransactionIndexView().asVersion(rawData, version)),
+      prettify(
+        req,
+        new TransactionIndexView().asVersion(rawData, __errors__, version),
+      ),
     );
   });
 
@@ -70,10 +94,19 @@ export function addNetworkExplorerRoutes(redisX, app) {
     const q = req.query || {};
 
     const version = q.v || 'TransactionDetailView@latest';
-    const rawData = await loadTransactionDetail(redisX, req.params.id, version);
+    const {__errors__, rawData} = await new FriendlyGet()
+      .with(
+        'rawData',
+        loadTransactionDetail(redisX, req.params.id, version),
+        {},
+      )
+      .get();
 
     res.send(
-      prettify(req, new TransactionDetailView().asVersion(rawData, version)),
+      prettify(
+        req,
+        new TransactionDetailView().asVersion(rawData, __errors__, version),
+      ),
     );
   });
 }

api/views/blocks/detail.js

@@ -7,7 +7,14 @@
 const __VERSION__ = '[email protected]';
 
 export class BlockDetailView {
-  asVersion(rawData, version) {
+  asVersion(rawData, __errors__, version) {
+    if (__errors__) {
+      return {
+        __VERSION__,
+        __errors__,
+      };
+    }
+
     const entries = rawData.entries;
     const blockData = rawData.block;
 

api/views/blocks/index.js

@@ -8,7 +8,14 @@ import _ from 'lodash';
  */
 const __VERSION__ = '[email protected]';
 export class BlockIndexView {
-  asVersion(rawData, version) {
+  asVersion(rawData, __errors__, version) {
+    if (__errors__) {
+      return {
+        __VERSION__,
+        __errors__,
+      };
+    }
+
     const timelineData = rawData.timelinePage;
     const timelineInfo = rawData.timelineInfo;
 

api/views/transactions/detail.js

@@ -8,7 +8,14 @@ import _ from 'lodash';
  */
 const __VERSION__ = '[email protected]';
 export class TransactionDetailView {
-  asVersion(rawData, version) {
+  asVersion(rawData, __errors__, version) {
+    if (__errors__) {
+      return {
+        __VERSION__,
+        __errors__,
+      };
+    }
+
     const transactionData = rawData.transaction;
     const entryData = rawData.entry;
     const blockData = rawData.block;

api/views/transactions/index.js

@@ -8,7 +8,14 @@ import _ from 'lodash';
  */
 const __VERSION__ = '[email protected]';
 export class TransactionIndexView {
-  asVersion(rawData, version) {
+  asVersion(rawData, __errors__, version) {
+    if (__errors__) {
+      return {
+        __VERSION__,
+        __errors__,
+      };
+    }
+
     const timelineData = rawData.timelinePage;
     const timelineInfo = rawData.timelineInfo;