refacotrs

apps/api-v2/src/index.ts

@@ -9,6 +9,7 @@ import buildTasksRouter from "./routers/tasks";
 import buildStatsRouter from "./routers/stats";
 import { loggerOptions } from "./logging";
 import responseTime from "response-time";
+import { errorHandler } from "./mws";
 
 export const createApp = () => {
   const app = express();
@@ -22,6 +23,7 @@ export const createApp = () => {
       credentials: true, // accept cookies from clients
     })
   );
+  app.use(errorHandler);
   app.use(cookieParser()); // parses the cookies because apparently express doesn't do this by default
   app.use(express.json()); // parses the request body
   const responseTimeMws = responseTime();

apps/api-v2/src/mws.ts

@@ -70,7 +70,7 @@ export const authenticateJWTMiddleware = async (
       );
     }
   } catch (err) {
-    console.error("Could not connect to Redis: " + err);
+    logger.error("Could not connect to Redis: " + err);
     return res.status(500).send(
       new SupernovaResponse({
         error: "Internal Server Error",
@@ -106,13 +106,31 @@ export const validateRequestSchema =
         );
       }
       // log the error because this is unknown
-      logger.error(error);
-      return res.status(500).json(
+      res.status(500).json(
         new SupernovaResponse({
           message: "Internal Server Error",
           error:
             "An error occurred while validating the request; this is on us, not you. Please try again later.",
         })
       );
+      next(error);
     }
   };
+
+/**
+ * Generic error handler for the application.
+ * Expect to have handled error response before this middleware
+ * @param err
+ * @param req
+ * @param res
+ * @param next
+ */
+export function errorHandler(
+  err: Error,
+  req: Request,
+  res: Response,
+  next: NextFunction
+) {
+  logger.error(err);
+  next();
+}

apps/api-v2/src/routers/tasks.ts

@@ -13,7 +13,7 @@ import {
 export default function buildTasksRouter(): Router {
   const router = Router();
 
-  router.get("/tasks", authenticateJWTMiddleware, async (req, res) => {
+  router.get("/tasks", authenticateJWTMiddleware, async (req, res, next) => {
     try {
       const authCtx = getAuthContext(req);
       // get all tasks for the user
@@ -43,16 +43,14 @@ export default function buildTasksRouter(): Router {
           data: tasks,
         })
       );
-    } catch (err) {
-      if (err instanceof Error) {
-        console.error(err);
-        return res.status(500).json(
-          new SupernovaResponse({
-            message: "Something went wrong. Please try again later.",
-            error: "Internal Server Error",
-          })
-        );
-      }
+    } catch (e) {
+      res.status(500).json(
+        new SupernovaResponse({
+          message: "Something went wrong. Please try again later.",
+          error: "Internal Server Error",
+        })
+      );
+      next(e);
     }
   });
 
@@ -61,7 +59,7 @@ export default function buildTasksRouter(): Router {
     "/tasks",
     authenticateJWTMiddleware,
     validateRequestSchema(createTaskRequestSchema),
-    async (req, res) => {
+    async (req, res, next) => {
       try {
         const authCtx = getAuthContext(req);
         const task = await prisma.task.create({
@@ -81,15 +79,13 @@ export default function buildTasksRouter(): Router {
           })
         );
       } catch (e) {
-        if (e instanceof Error) {
-          console.error(e);
-          return res.status(500).json(
-            new SupernovaResponse({
-              message: "Something went wrong. Please try again later.",
-              error: "Internal Server Error",
-            })
-          );
-        }
+        res.status(500).json(
+          new SupernovaResponse({
+            message: "Something went wrong. Please try again later.",
+            error: "Internal Server Error",
+          })
+        );
+        next(e);
       }
     }
   );
@@ -100,7 +96,7 @@ export default function buildTasksRouter(): Router {
     "/tasks/:id",
     authenticateJWTMiddleware,
     validateRequestSchema(updateTaskRequestSchema),
-    async (req, res) => {
+    async (req, res, next) => {
       try {
         const authCtx = getAuthContext(req);
         const task = await prisma.task.update({
@@ -123,15 +119,13 @@ export default function buildTasksRouter(): Router {
           })
         );
       } catch (e) {
-        if (e instanceof Error) {
-          console.error(e);
-          return res.status(500).json(
-            new SupernovaResponse({
-              message: "Something went wrong. Please try again later.",
-              error: "Internal Server Error",
-            })
-          );
-        }
+        res.status(500).json(
+          new SupernovaResponse({
+            message: "Something went wrong. Please try again later.",
+            error: "Internal Server Error",
+          })
+        );
+        next(e);
       }
     }
   );
@@ -141,7 +135,7 @@ export default function buildTasksRouter(): Router {
     "/tasks/:id",
     authenticateJWTMiddleware,
     validateRequestSchema(deleteTaskRequestSchema),
-    async (req, res) => {
+    async (req, res, next) => {
       try {
         const authCtx = getAuthContext(req);
         const task = await prisma.task.update({
@@ -160,15 +154,13 @@ export default function buildTasksRouter(): Router {
           })
         );
       } catch (e) {
-        if (e instanceof Error) {
-          console.error(e);
-          return res.status(500).json(
-            new SupernovaResponse({
-              message: "Something went wrong. Please try again later.",
-              error: "Internal Server Error",
-            })
-          );
-        }
+        res.status(500).json(
+          new SupernovaResponse({
+            message: "Something went wrong. Please try again later.",
+            error: "Internal Server Error",
+          })
+        );
+        next(e);
       }
     }
   );
@@ -178,7 +170,7 @@ export default function buildTasksRouter(): Router {
     "/tasks/:id/toggle-complete",
     authenticateJWTMiddleware,
     validateRequestSchema(toggleCompleteTaskRequestSchema),
-    async (req, res) => {
+    async (req, res, next) => {
       try {
         const authCtx = getAuthContext(req);
         // find the task
@@ -213,15 +205,13 @@ export default function buildTasksRouter(): Router {
           })
         );
       } catch (e) {
-        if (e instanceof Error) {
-          console.error(e);
-          return res.status(500).json(
-            new SupernovaResponse({
-              message: "Something went wrong. Please try again later.",
-              error: "Internal Server Error",
-            })
-          );
-        }
+        res.status(500).json(
+          new SupernovaResponse({
+            message: "Something went wrong. Please try again later.",
+            error: "Internal Server Error",
+          })
+        );
+        next(e);
       }
     }
   );

apps/desktop-v2/.gitignore

@@ -33,3 +33,6 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+
+# Sentry Auth Token
+.sentryclirc

apps/desktop-v2/hooks/useSupernovaTasksUI.tsx

@@ -79,8 +79,7 @@ export default function useSupernovaTasksUI() {
           });
         }
         console.log("updated successfully");
-      } catch (e: any) {
-        console.error(e);
+      } catch (e) {
         // TODO: show error toast
         makeToast("Something went wrong", "error", {
           description: `This is something on our side.`,
@@ -143,29 +142,31 @@ export default function useSupernovaTasksUI() {
         };
         // optimistically update the task in the frontend
         setTasks(
-          tasks.map((task) => {
-            if (task.id === chosenTask.id) {
-              return {
-                ...task,
-                title: newTask.title,
-                originalBuildText: newTask.originalBuildText,
-                description: newTask.description,
-                startTime:
-                  updatePayload.startAt === null
-                    ? undefined
-                    : updatePayload.startAt === undefined
-                    ? chosenTask.startTime
-                    : newTask.startTime, // if it's null, then cleared, else if undefined then don't update
-                expectedDurationSeconds:
-                  updatePayload.expectedDurationSeconds === null
-                    ? undefined
-                    : updatePayload.expectedDurationSeconds === undefined
-                    ? chosenTask.expectedDurationSeconds
-                    : newTask.expectedDurationSeconds, // if it's null, then cleared, else if undefined then don't update
-              };
-            }
-            return task;
-          })
+          reorderTaskList(
+            tasks.map((task) => {
+              if (task.id === chosenTask.id) {
+                return {
+                  ...task,
+                  title: newTask.title,
+                  originalBuildText: newTask.originalBuildText,
+                  description: newTask.description,
+                  startTime:
+                    updatePayload.startAt === null
+                      ? undefined
+                      : updatePayload.startAt === undefined
+                      ? chosenTask.startTime
+                      : newTask.startTime, // if it's null, then cleared, else if undefined then don't update
+                  expectedDurationSeconds:
+                    updatePayload.expectedDurationSeconds === null
+                      ? undefined
+                      : updatePayload.expectedDurationSeconds === undefined
+                      ? chosenTask.expectedDurationSeconds
+                      : newTask.expectedDurationSeconds, // if it's null, then cleared, else if undefined then don't update
+                };
+              }
+              return task;
+            })
+          )
         );
         makeToast("Task updated successfully", "success");
 

apps/desktop-v2/next.config.js

@@ -4,4 +4,38 @@ const nextConfig = {
     transpilePackages: ["@supernova/api-client"],
 }
 
-module.exports = nextConfig
+// Injected content via Sentry wizard below
+
+const { withSentryConfig } = require("@sentry/nextjs");
+
+module.exports = withSentryConfig(
+  nextConfig,
+  {
+    // For all available options, see:
+    // https://github.com/getsentry/sentry-webpack-plugin#options
+
+    // Suppresses source map uploading logs during build
+    silent: true,
+    org: "supernova-0z",
+    project: "javascript-nextjs",
+  },
+  {
+    // For all available options, see:
+    // https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
+
+    // Upload a larger set of source maps for prettier stack traces (increases build time)
+    widenClientFileUpload: true,
+
+    // Transpiles SDK to be compatible with IE11 (increases bundle size)
+    transpileClientSDK: true,
+
+    // Routes browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers (increases server load)
+    tunnelRoute: "/monitoring",
+
+    // Hides source maps from generated client bundles
+    hideSourceMaps: true,
+
+    // Automatically tree-shake Sentry logger statements to reduce bundle size
+    disableLogger: true,
+  }
+);

apps/desktop-v2/package.json

@@ -13,6 +13,7 @@
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-icons": "^1.3.0",
+    "@sentry/nextjs": "^7.72.0",
     "@supernova/api-client": "workspace:*",
     "@supernova/types": "workspace:*",
     "@tauri-apps/api": "^1.4.0",

apps/desktop-v2/sentry.client.config.ts

@@ -0,0 +1,30 @@
+// This file configures the initialization of Sentry on the client.
+// The config you add here will be used whenever a users loads a page in their browser.
+// https://docs.sentry.io/platforms/javascript/guides/nextjs/
+
+import * as Sentry from "@sentry/nextjs";
+
+Sentry.init({
+  dsn: "https://6f6f7fe2b894e163826396f63d7a2eec@o4505948505702400.ingest.sentry.io/4505948506816512",
+
+  // Adjust this value in production, or use tracesSampler for greater control
+  tracesSampleRate: 1,
+
+  // Setting this option to true will print useful information to the console while you're setting up Sentry.
+  debug: false,
+
+  replaysOnErrorSampleRate: 1.0,
+
+  // This sets the sample rate to be 10%. You may want this to be 100% while
+  // in development and sample at a lower rate in production
+  replaysSessionSampleRate: 0.1,
+
+  // You can remove this option if you're not planning to use the Sentry Session Replay feature:
+  integrations: [
+    new Sentry.Replay({
+      // Additional Replay configuration goes in here, for example:
+      maskAllText: true,
+      blockAllMedia: true,
+    }),
+  ],
+});

apps/desktop-v2/sentry.edge.config.ts

@@ -0,0 +1,16 @@
+// This file configures the initialization of Sentry for edge features (middleware, edge routes, and so on).
+// The config you add here will be used whenever one of the edge features is loaded.
+// Note that this config is unrelated to the Vercel Edge Runtime and is also required when running locally.
+// https://docs.sentry.io/platforms/javascript/guides/nextjs/
+
+import * as Sentry from "@sentry/nextjs";
+
+Sentry.init({
+  dsn: "https://6f6f7fe2b894e163826396f63d7a2eec@o4505948505702400.ingest.sentry.io/4505948506816512",
+
+  // Adjust this value in production, or use tracesSampler for greater control
+  tracesSampleRate: 1,
+
+  // Setting this option to true will print useful information to the console while you're setting up Sentry.
+  debug: false,
+});