no log sentry error during maintenance on (#3675)

shopsys · Jan 15, 2025 · 4c72919 · 4c72919
2 parents b5d6fc4 + cce5750
commit 4c72919
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 1 deletion.
diff --git a/storefront/pages/_error.tsx b/storefront/pages/_error.tsx
@@ -41,7 +41,7 @@ ErrorPage.getInitialProps = getServerSidePropsWrapper(({ redisClient, domainConf
         err = JSON.stringify({ name: err.name, message: err.message, stack: err.stack, cause: err.cause });
     }
 
-    if (statusCode !== 404 || isWithErrorDebugging) {
+    if ((statusCode !== 404 || isWithErrorDebugging) && statusCode !== 503) {
         logException({
             message: err,
             statusCode,

diff --git a/storefront/urql/errorExchange.ts b/storefront/urql/errorExchange.ts
@@ -27,6 +27,11 @@ export const getErrorExchange =
                         return;
                     }
 
+                    const isMaintenance = error.response?.status === 503;
+                    if (isMaintenance) {
+                        return;
+                    }
+
                     if (isWithErrorDebugging && operation.kind === 'mutation') {
                         handleErrorMessagesForMutation(error);
 

diff --git a/storefront/urql/fetcher.ts b/storefront/urql/fetcher.ts
@@ -74,11 +74,24 @@ export const fetcher =
                 body,
             });
 
+            const isJsonContentType = result.headers.get('content-type')?.includes('application/json');
+
+            if (!isJsonContentType) {
+                return Promise.resolve(
+                    new Response(JSON.stringify({}), {
+                        statusText: result.statusText,
+                        status: result.status,
+                        headers: { 'Content-Type': 'application/json' },
+                    }),
+                );
+            }
+
             const res = await result.json();
 
             if (res.data !== undefined && res.error === undefined) {
                 await redisClient.set(hash, JSON.stringify(res.data), { EX: ttl });
             }
+
             return Promise.resolve(
                 new Response(JSON.stringify(res), {
                     statusText: 'OK',

diff --git a/storefront/vitest/utils/urql/fetcher.test.ts b/storefront/vitest/utils/urql/fetcher.test.ts
@@ -108,6 +108,9 @@ describe('fetcher test', () => {
         vi.stubEnv('REDIS_PREFIX', 'TEST_PREFIX');
         mockFetch.mockImplementation(() =>
             Promise.resolve({
+                headers: new Headers({
+                    'content-type': 'application/json',
+                }),
                 json: () => Promise.resolve({ data: TEST_RESPONSE_BODY }),
             }),
         );
@@ -125,6 +128,24 @@ describe('fetcher test', () => {
         vi.unstubAllEnvs();
     });
 
+    test('should handle non-JSON content-type responses', async () => {
+        (isClientGetter as Mock).mockImplementation(() => false);
+        mockFetch.mockImplementation(() =>
+            Promise.resolve({
+                headers: new Headers({
+                    'content-type': 'text/html',
+                }),
+            }),
+        );
+
+        const testFetcher = fetcher(mockRedisClient);
+        const response = await testFetcher(TEST_URL, REQUEST_WITH_DIRECTIVE);
+        const responseBody = await response.json();
+
+        expect(responseBody).toStrictEqual({});
+        expect(response.headers.get('content-type')).toBe('application/json');
+    });
+
     test('using fetcher on an already cached query should get it from Redis', async () => {
         mockRedisClientGet.mockImplementation(() => JSON.stringify(TEST_RESPONSE_BODY));
         (isClientGetter as Mock).mockImplementation(() => false);