Fix server suspension statuses (#3100)

* chore: correctly type suspension reason Signed-off-by: Evan Song <[email protected]> * fix: faulty suspension condition allowing for fallthrough Signed-off-by: Evan Song <[email protected]> * fix: here as well Signed-off-by: Evan Song <[email protected]> * chore: add support suspension reason Signed-off-by: Evan Song <[email protected]> * feat: handle support suspensions Signed-off-by: Evan Song <[email protected]> * chore: patch pyroservers to handle 503 Signed-off-by: Evan Song <[email protected]> * feat: handle 503 in server root Signed-off-by: Evan Song <[email protected]> * chore: dont make pyroservers errors scream at me anymore Signed-off-by: Evan Song <[email protected]> --------- Signed-off-by: Evan Song <[email protected]>
modrinth · Jan 7, 2025 · d5f2ada · d5f2ada
1 parent a01da54
commit d5f2ada
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 9 deletions.
diff --git a/apps/frontend/src/components/ui/servers/ServerListing.vue b/apps/frontend/src/components/ui/servers/ServerListing.vue
@@ -61,7 +61,15 @@
       Your server's hardware is currently being upgraded and will be back online shortly.
     </div>
     <div
-      v-else-if="status === 'suspended'"
+      v-if="status === 'suspended' && suspension_reason === 'support'"
+      class="relative -mt-4 flex w-full flex-row items-center gap-2 rounded-b-3xl bg-bg-blue p-4 text-sm font-bold text-contrast"
+    >
+      <HammerIcon />
+      You recently requested support for your server and we are actively working on it. It will be
+      back online shortly.
+    </div>
+    <div
+      v-else-if="status === 'suspended' && suspension_reason !== 'upgrading'"
       class="relative -mt-4 flex w-full flex-row items-center gap-2 rounded-b-3xl bg-bg-red p-4 text-sm font-bold text-contrast"
     >
       <UiServersIconsPanelErrorIcon class="!size-5" />
@@ -72,7 +80,7 @@
 </template>
 
 <script setup lang="ts">
-import { ChevronRightIcon, LockIcon } from "@modrinth/assets";
+import { ChevronRightIcon, HammerIcon, LockIcon } from "@modrinth/assets";
 import type { Project, Server } from "~/types/servers";
 
 const props = defineProps<Partial<Server>>();

diff --git a/apps/frontend/src/composables/pyroServers.ts b/apps/frontend/src/composables/pyroServers.ts
@@ -67,10 +67,10 @@ async function PyroFetch<T>(path: string, options: PyroFetchOptions = {}): Promi
     });
     return response;
   } catch (error) {
-    console.error("[PYROSERVERS]:", error);
+    console.error("[PyroServers/PyroFetch]:", error);
     if (error instanceof FetchError) {
       const statusCode = error.response?.status;
-      const statusText = error.response?.statusText || "Unknown error";
+      const statusText = error.response?.statusText || "[no status text available]";
       const errorMessages: { [key: number]: string } = {
         400: "Bad Request",
         401: "Unauthorized",
@@ -80,15 +80,16 @@ async function PyroFetch<T>(path: string, options: PyroFetchOptions = {}): Promi
         429: "Too Many Requests",
         500: "Internal Server Error",
         502: "Bad Gateway",
+        503: "Service Unavailable",
       };
       const message =
         statusCode && statusCode in errorMessages
           ? errorMessages[statusCode]
-          : `HTTP Error: ${statusCode || "unknown"} ${statusText}`;
-      throw new PyroFetchError(`[PYROSERVERS][PYRO] ${message}`, statusCode, error);
+          : `HTTP Error: ${statusCode || "[unhandled status code]"} ${statusText}`;
+      throw new PyroFetchError(`[PyroServers/PyroFetch] ${message}`, statusCode, error);
     }
     throw new PyroFetchError(
-      "[PYROSERVERS][PYRO] An unexpected error occurred during the fetch operation.",
+      "[PyroServers/PyroFetch] An unexpected error occurred during the fetch operation.",
       undefined,
       error as Error,
     );
@@ -168,7 +169,15 @@ interface General {
   backup_quota: number;
   used_backup_quota: number;
   status: string;
-  suspension_reason: string;
+  suspension_reason:
+    | "moderated"
+    | "paymentfailed"
+    | "cancelled"
+    | "other"
+    | "transferring"
+    | "upgrading"
+    | "support"
+    | (string & {});
   loader: string;
   loader_version: string;
   mc_version: string;

diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -19,7 +19,26 @@
       </div>
     </div>
     <div
-      v-else-if="serverData?.status === 'suspended'"
+      v-if="serverData?.status === 'suspended' && serverData.suspension_reason === 'support'"
+      class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
+    >
+      <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
+        <div class="flex flex-col items-center text-center">
+          <div class="flex flex-col items-center gap-4">
+            <div class="grid place-content-center rounded-full bg-bg-blue p-4">
+              <TransferIcon class="size-12 text-blue" />
+            </div>
+            <h1 class="m-0 mb-2 w-fit text-4xl font-bold">We're working on your server</h1>
+          </div>
+          <p class="text-lg text-secondary">
+            You recently contacted Modrinth Support, and we're actively working on your server. It
+            will be back online shortly.
+          </p>
+        </div>
+      </div>
+    </div>
+    <div
+      v-else-if="serverData?.status === 'suspended' && serverData.suspension_reason !== 'upgrading'"
       class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
     >
       <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
@@ -69,6 +88,58 @@
         </ButtonStyled>
       </div>
     </div>
+    <div
+      v-else-if="server.error && server.error.message.includes('Service Unavailable')"
+      class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
+    >
+      <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
+        <div class="flex flex-col items-center text-center">
+          <div class="flex flex-col items-center gap-4">
+            <div class="grid place-content-center rounded-full bg-bg-red p-4">
+              <PanelErrorIcon class="size-12 text-red" />
+            </div>
+            <h1 class="m-0 mb-4 w-fit text-4xl font-bold">Server Node Unavailable</h1>
+          </div>
+          <p class="m-0 mb-4 leading-[170%] text-secondary">
+            Your server's node, where your Modrinth Server is physically hosted, is experiencing
+            issues. We are working with our datacenter to resolve the issue as quickly as possible.
+          </p>
+          <p class="m-0 mb-4 leading-[170%] text-secondary">
+            Your data is safe and will not be lost, and your server will be back online as soon as
+            the issue is resolved.
+          </p>
+          <p class="m-0 mb-4 leading-[170%] text-secondary">
+            For updates, please join the Modrinth Discord or contact Modrinth Support via the chat
+            bubble in the bottom right corner and we'll be happy to help.
+          </p>
+
+          <div class="flex flex-col gap-2">
+            <UiCopyCode :text="'Server ID: ' + server.serverId" />
+            <UiCopyCode :text="'Node: ' + server.general?.datacenter" />
+          </div>
+        </div>
+        <ButtonStyled
+          size="large"
+          color="standard"
+          @click="
+            () =>
+              navigateTo('https://discord.modrinth.com', {
+                external: true,
+              })
+          "
+        >
+          <button class="mt-6 !w-full">Join Modrinth Discord</button>
+        </ButtonStyled>
+        <ButtonStyled
+          :disabled="formattedTime !== '00'"
+          size="large"
+          color="standard"
+          @click="() => reloadNuxtApp()"
+        >
+          <button class="mt-3 !w-full">Reload</button>
+        </ButtonStyled>
+      </div>
+    </div>
     <div
       v-else-if="server.error"
       class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
@@ -324,6 +395,7 @@ import { Intercom, shutdown } from "@intercom/messenger-js-sdk";
 import { reloadNuxtApp } from "#app";
 import type { ServerState, Stats, WSEvent, WSInstallationResultEvent } from "~/types/servers";
 import { usePyroConsole } from "~/store/console.ts";
+import PanelErrorIcon from "~/components/ui/servers/icons/PanelErrorIcon.vue";
 
 const socket = ref<WebSocket | null>(null);
 const isReconnecting = ref(false);