Prevent errors from listmonk from crashing the app

LetsChurch · Dec 20, 2024 · 065c7d4 · 065c7d4
1 parent 9e9b160
commit 065c7d4
Show file tree

Hide file tree

Showing 10 changed files with 126 additions and 45 deletions.
diff --git a/apps/web-next/src/__generated__/graphql-types.ts b/apps/web-next/src/__generated__/graphql-types.ts
diff --git a/apps/web-next/src/routes/(root)/(watch).tsx b/apps/web-next/src/routes/(root)/(watch).tsx
@@ -26,7 +26,16 @@ const getHomepageData = query(async function () {
       ${UploadCardFields}
 
       query HomepageData($loggedIn: Boolean!) {
-        newsletterListIds
+        newsletterListIds {
+          ... on QueryNewsletterListIdsSuccess {
+            __typename
+            data
+          }
+          ... on Error {
+            __typename
+            message
+          }
+        }
         subscriptionUploads: mySubscriptionUploadRecords(first: 8)
           @include(if: $loggedIn) {
           pageInfo {
@@ -80,6 +89,16 @@ export default function WatchRoute() {
   const data = createAsync(() => getHomepageData());
   const user = useUser();
 
+  const newsletterListIds = () => {
+    const res = data()?.newsletterListIds;
+
+    if (res?.__typename === 'QueryNewsletterListIdsSuccess') {
+      return res.data;
+    }
+
+    return [];
+  };
+
   return (
     <>
       <Og
@@ -116,7 +135,7 @@ export default function WatchRoute() {
       <UploadGrid edges={data()?.trendingUploads?.edges ?? []} />
       <SeeMoreLink to="trending" />
       <Show when={!user()?.subscribedToNewsletter}>
-        <Newsletter listIds={data()?.newsletterListIds ?? []} />
+        <Newsletter listIds={newsletterListIds()} />
       </Show>
     </>
   );

diff --git a/apps/web-next/src/routes/(root)/__generated__/(watch).d.ts b/apps/web-next/src/routes/(root)/__generated__/(watch).d.ts
diff --git a/apps/web/src/__generated__/graphql-types.ts b/apps/web/src/__generated__/graphql-types.ts
diff --git a/apps/web/src/routes/(root)/(watch).tsx b/apps/web/src/routes/(root)/(watch).tsx
@@ -27,7 +27,16 @@ export function routeData() {
           ${UploadCardFields}
 
           query HomepageData($loggedIn: Boolean!) {
-            newsletterListIds
+            newsletterListIds {
+              ... on QueryNewsletterListIdsSuccess {
+                __typename
+                data
+              }
+              ... on Error {
+                __typename
+                message
+              }
+            }
             subscriptionUploads: mySubscriptionUploadRecords(first: 5)
               @include(if: $loggedIn) {
               pageInfo {
@@ -84,6 +93,16 @@ export default function WatchRoute() {
   const data = useRouteData<typeof routeData>();
   const user = useUser();
 
+  const newsletterListIds = () => {
+    const res = data()?.newsletterListIds;
+
+    if (res?.__typename === 'QueryNewsletterListIdsSuccess') {
+      return res.data;
+    }
+
+    return [];
+  };
+
   return (
     <>
       <Og
@@ -120,7 +139,7 @@ export default function WatchRoute() {
       <UploadGrid edges={data()?.trendingUploads?.edges ?? []} />
       <SeeMoreLink to="trending" />
       <Show when={!user()?.subscribedToNewsletter}>
-        <Newsletter listIds={data()?.newsletterListIds ?? []} />
+        <Newsletter listIds={newsletterListIds()} />
       </Show>
     </>
   );

diff --git a/apps/web/src/routes/(root)/__generated__/(watch).d.ts b/apps/web/src/routes/(root)/__generated__/(watch).d.ts
diff --git a/services/gateway/bun.lockb b/services/gateway/bun.lockb
diff --git a/services/gateway/package.json b/services/gateway/package.json
@@ -136,6 +136,7 @@
     "subtitle": "^4.2.1",
     "tiny-invariant": "^1.3.3",
     "uuid": "^11.0.3",
+    "valibot": "^1.0.0-beta.9",
     "wait-on": "^8.0.1",
     "xss": "^1.0.15",
     "zod": "^3.24.1"

diff --git a/services/gateway/src/schema/builder.ts b/services/gateway/src/schema/builder.ts
@@ -68,40 +68,40 @@ export default new SchemaBuilder<{
       nullable: false,
     },
   },
-  tracing: {
-    default:
-      process.env['NODE_ENV'] === 'development'
-        ? true
-        : (config) => isRootField(config),
-    wrap: (resolver, _options, config) => (source, args, context, info) =>
-      runFunction(
-        () => resolver(source, args, context, info),
-        (error, duration) => {
-          const bindings = {
-            graphql: {
-              kind: config.kind,
-              parentType: config.parentType,
-              args: JSON.stringify(
-                Object.fromEntries(
-                  Object.entries(args).map(([key, value]) => [
-                    key,
-                    key === 'password' ? '********' : value,
-                  ]),
-                ),
-              ),
-            },
-            duration,
-          };
-
-          if (error) {
-            moduleLogger.error(
-              bindings,
-              error instanceof Error ? error.message : `${error}`,
-            );
-          } else {
-            moduleLogger.info(bindings);
-          }
-        },
-      ),
-  },
+  // tracing: {
+  //   default:
+  //     process.env['NODE_ENV'] === 'development'
+  //       ? true
+  //       : (config) => isRootField(config),
+  //   wrap: (resolver, _options, config) => (source, args, context, info) =>
+  //     runFunction(
+  //       () => resolver(source, args, context, info),
+  //       (error, duration) => {
+  //         const bindings = {
+  //           graphql: {
+  //             kind: config.kind,
+  //             parentType: config.parentType,
+  //             args: JSON.stringify(
+  //               Object.fromEntries(
+  //                 Object.entries(args).map(([key, value]) => [
+  //                   key,
+  //                   key === 'password' ? '********' : value,
+  //                 ]),
+  //               ),
+  //             ),
+  //           },
+  //           duration,
+  //         };
+  //
+  //         if (error) {
+  //           moduleLogger.error(
+  //             bindings,
+  //             error instanceof Error ? error.message : `${error}`,
+  //           );
+  //         } else {
+  //           moduleLogger.info(bindings);
+  //         }
+  //       },
+  //     ),
+  // },
 });
diff --git a/services/gateway/src/schema/types/query.ts b/services/gateway/src/schema/types/query.ts
@@ -1,8 +1,10 @@
 import ExpiryMap from 'expiry-map';
 import pMem from 'p-memoize';
 import envariant from '@knpwrs/envariant';
+import * as v from 'valibot';
 import prisma from '../../util/prisma';
 import builder from '../builder';
+import logger from '../../util/logger';
 
 builder.queryType();
 
@@ -58,14 +60,30 @@ builder.queryField('stats', (t) =>
   }),
 );
 
+const ListmonkResultSchema = v.object({
+  data: v.object({
+    results: v.array(v.object({ uuid: v.pipe(v.string(), v.uuid()) })),
+  }),
+});
+
+builder.objectType(Error, {
+  name: 'Error',
+  fields: (t) => ({
+    message: t.exposeString('message'),
+  }),
+});
+
 builder.queryField('newsletterListIds', (t) =>
   t.field({
     type: ['String'],
+    errors: {
+      types: [Error],
+    },
     resolve: async () => {
       const res = await fetch(
         envariant('LISTMONK_INTERNAL_URL') + '/api/lists?tag=default',
       );
-      const json = await res.json();
+      const json = v.parse(ListmonkResultSchema, await res.json());
       return json.data.results.map(
         (l: { uuid: string }) => l.uuid,
       ) as Array<string>;