🥅 Catch API request errors

upptime · Nov 17, 2020 · 537c4ab · 537c4ab
1 parent 4a9bb09
commit 537c4ab
Show file tree

Hide file tree

Showing 8 changed files with 129 additions and 93 deletions.
diff --git a/src/components/ActiveIncidents.svelte b/src/components/ActiveIncidents.svelte
@@ -2,7 +2,7 @@
   import Loading from "../components/Loading.svelte";
   import { onMount } from "svelte";
   import config from "../data/config.json";
-  import { createOctokit } from "../utils/createOctokit";
+  import { createOctokit, handleError } from "../utils/createOctokit";
 
   let loading = true;
   const octokit = createOctokit();
@@ -11,24 +11,28 @@
   let incidents = [];
 
   onMount(async () => {
-    incidents = (
-      await octokit.issues.listForRepo({
-        owner,
-        repo,
-        state: "open",
-        filter: "all",
-        sort: "created",
-        direction: "desc",
-        labels: "status",
-      })
-    ).data;
-    incidents = incidents.map((incident, index) => {
-      incident.showHeading =
-        index === 0 ||
-        new Date(incidents[index - 1].created_at).toLocaleDateString() !==
-          new Date(incident.created_at).toLocaleDateString();
-      return incident;
-    });
+    try {
+      incidents = (
+        await octokit.issues.listForRepo({
+          owner,
+          repo,
+          state: "open",
+          filter: "all",
+          sort: "created",
+          direction: "desc",
+          labels: "status",
+        })
+      ).data;
+      incidents = incidents.map((incident, index) => {
+        incident.showHeading =
+          index === 0 ||
+          new Date(incidents[index - 1].created_at).toLocaleDateString() !==
+            new Date(incident.created_at).toLocaleDateString();
+        return incident;
+      });
+    } catch (error) {
+      handleError(error);
+    }
     loading = false;
   });
 </script>

diff --git a/src/components/Graph.svelte b/src/components/Graph.svelte
@@ -3,7 +3,7 @@
   import { onMount } from "svelte";
   import config from "../data/config.json";
   import Line from "svelte-chartjs/src/Line.svelte";
-  import { createOctokit } from "../utils/createOctokit";
+  import { createOctokit, handleError } from "../utils/createOctokit";
 
   export let slug;
   let loading = true;
@@ -15,14 +15,18 @@
   let data = [];
 
   onMount(async () => {
-    commits = (
-      await octokit.repos.listCommits({
-        owner,
-        repo,
-        path: `history/${slug}.yml`,
-        per_page: 28,
-      })
-    ).data;
+    try {
+      commits = (
+        await octokit.repos.listCommits({
+          owner,
+          repo,
+          path: `history/${slug}.yml`,
+          per_page: 28,
+        })
+      ).data;
+    } catch (error) {
+      handleError(error);
+    }
     commits = commits.map((commit, index) => {
       commit.showHeading =
         index === 0 ||

diff --git a/src/components/History.svelte b/src/components/History.svelte
@@ -2,7 +2,7 @@
   import Loading from "../components/Loading.svelte";
   import { onMount } from "svelte";
   import config from "../data/config.json";
-  import { createOctokit } from "../utils/createOctokit";
+  import { createOctokit, handleError } from "../utils/createOctokit";
 
   export let slug;
   let loading = true;
@@ -12,17 +12,21 @@
   let incidents = [];
 
   onMount(async () => {
-    incidents = (
-      await octokit.issues.listForRepo({
-        owner,
-        repo,
-        state: "closed",
-        filter: "all",
-        sort: "created",
-        direction: "desc",
-        labels: `status,${slug}`,
-      })
-    ).data;
+    try {
+      incidents = (
+        await octokit.issues.listForRepo({
+          owner,
+          repo,
+          state: "closed",
+          filter: "all",
+          sort: "created",
+          direction: "desc",
+          labels: `status,${slug}`,
+        })
+      ).data;
+    } catch (error) {
+      handleError(error);
+    }
     incidents = incidents.map((incident, index) => {
       incident.showHeading =
         index === 0 ||

diff --git a/src/components/Incident.svelte b/src/components/Incident.svelte
@@ -3,7 +3,7 @@
   import { onMount } from "svelte";
   import snarkdown from "snarkdown";
   import config from "../data/config.json";
-  import { createOctokit } from "../utils/createOctokit";
+  import { createOctokit, handleError } from "../utils/createOctokit";
 
   export let number;
 
@@ -18,23 +18,31 @@
   let incident = {};
 
   onMount(async () => {
-    incident = (
-      await octokit.issues.get({
-        owner,
-        repo,
-        issue_number: number,
-        sort: "created",
-        direction: "desc",
-      })
-    ).data;
+    try {
+      incident = (
+        await octokit.issues.get({
+          owner,
+          repo,
+          issue_number: number,
+          sort: "created",
+          direction: "desc",
+        })
+      ).data;
+    } catch (error) {
+      handleError(error);
+    }
     loadingIncident = false;
-    comments = (
-      await octokit.issues.listComments({
-        owner,
-        repo,
-        issue_number: number,
-      })
-    ).data.reverse();
+    try {
+      comments = (
+        await octokit.issues.listComments({
+          owner,
+          repo,
+          issue_number: number,
+        })
+      ).data.reverse();
+    } catch (error) {
+      handleError(error);
+    }
     loading = false;
   });
 </script>

diff --git a/src/components/Incidents.svelte b/src/components/Incidents.svelte
@@ -2,7 +2,7 @@
   import Loading from "../components/Loading.svelte";
   import { onMount } from "svelte";
   import config from "../data/config.json";
-  import { createOctokit } from "../utils/createOctokit";
+  import { createOctokit, handleError } from "../utils/createOctokit";
 
   let loading = true;
   const octokit = createOctokit();
@@ -11,17 +11,21 @@
   let incidents = [];
 
   onMount(async () => {
-    incidents = (
-      await octokit.issues.listForRepo({
-        owner,
-        repo,
-        state: "closed",
-        filter: "all",
-        sort: "created",
-        direction: "desc",
-        labels: "status",
-      })
-    ).data;
+    try {
+      incidents = (
+        await octokit.issues.listForRepo({
+          owner,
+          repo,
+          state: "closed",
+          filter: "all",
+          sort: "created",
+          direction: "desc",
+          labels: "status",
+        })
+      ).data;
+    } catch (error) {
+      handleError(error);
+    }
     incidents = incidents.map((incident, index) => {
       incident.showHeading =
         index === 0 ||

diff --git a/src/components/LiveStatus.svelte b/src/components/LiveStatus.svelte
@@ -2,7 +2,7 @@
   import Loading from "../components/Loading.svelte";
   import { onMount } from "svelte";
   import config from "../data/config.json";
-  import { createOctokit } from "../utils/createOctokit";
+  import { createOctokit, handleError } from "../utils/createOctokit";
 
   let loading = true;
   const octokit = createOctokit();
@@ -16,17 +16,21 @@
   const graphsBaseUrl = `${userContentBaseUrl}/${owner}/${repo}/master/graphs`;
 
   onMount(async () => {
-    sites = JSON.parse(
-      atob(
-        (
-          await octokit.repos.getContent({
-            owner,
-            repo,
-            path: "history/summary.json",
-          })
-        ).data.content.replace(/\n/g, "")
-      )
-    );
+    try {
+      sites = JSON.parse(
+        atob(
+          (
+            await octokit.repos.getContent({
+              owner,
+              repo,
+              path: "history/summary.json",
+            })
+          ).data.content.replace(/\n/g, "")
+        )
+      );
+    } catch (error) {
+      handleError(error);
+    }
     loading = false;
   });
 </script>

diff --git a/src/components/Summary.svelte b/src/components/Summary.svelte
@@ -2,7 +2,7 @@
   import Loading from "../components/Loading.svelte";
   import { onMount } from "svelte";
   import config from "../data/config.json";
-  import { createOctokit } from "../utils/createOctokit";
+  import { createOctokit, handleError } from "../utils/createOctokit";
 
   export let slug;
   let loading = true;
@@ -12,17 +12,21 @@
   let summary = null;
 
   onMount(async () => {
-    summary = JSON.parse(
-      atob(
-        (
-          await octokit.repos.getContent({
-            owner,
-            repo,
-            path: "history/summary.json",
-          })
-        ).data.content
-      )
-    ).find((item) => item.slug === slug);
+    try {
+      summary = JSON.parse(
+        atob(
+          (
+            await octokit.repos.getContent({
+              owner,
+              repo,
+              path: "history/summary.json",
+            })
+          ).data.content
+        )
+      ).find((item) => item.slug === slug);
+    } catch (error) {
+      handleError(error);
+    }
     loading = false;
   });
 </script>

diff --git a/src/utils/createOctokit.js b/src/utils/createOctokit.js
@@ -18,3 +18,7 @@ export const createOctokit = () => {
     auth: token || undefined,
   });
 };
+
+export const handleError = (error) => {
+  console.log("Error handler 123", error);
+};