fix: failed to fetch commandline when a version/hotfix is deployed (@fehmer) (monkeytypegame#6507)

Author: fehmer

frontend/src/ts/event-handlers/footer.ts

@@ -2,7 +2,7 @@ import Config, * as UpdateConfig from "../config";
 import { isAuthenticated } from "../firebase";
 import * as DB from "../db";
 import * as Notifications from "../elements/notifications";
-import { getCommandline } from "../utils/async-modules";
+import * as Commandline from "../commandline/commandline";
 import * as SupportPopup from "../modals/support";
 import * as ContactModal from "../modals/contact";
 import * as VersionHistoryModal from "../modals/version-history";
@@ -11,7 +11,7 @@ import { envConfig } from "../constants/env-config";
 document
   .querySelector("footer #commandLineMobileButton")
   ?.addEventListener("click", async () => {
-    (await getCommandline()).show({
+    Commandline.show({
       singleListOverride: false,
     });
   });
@@ -54,7 +54,7 @@ document
       UpdateConfig.setCustomTheme(true);
     } else {
       const subgroup = Config.customTheme ? "customThemesList" : "themes";
-      (await getCommandline()).show({
+      Commandline.show({
         subgroupOverride: subgroup,
       });
     }

frontend/src/ts/event-handlers/global.ts

@@ -2,7 +2,7 @@ import * as Misc from "../utils/misc";
 import * as PageTransition from "../states/page-transition";
 import Config from "../config";
 import * as TestWords from "../test/test-words";
-import { getCommandline } from "../utils/async-modules";
+import * as Commandline from "../commandline/commandline";
 import * as Notifications from "../elements/notifications";
 
 document.addEventListener("keydown", async (e) => {
@@ -24,7 +24,7 @@ document.addEventListener("keydown", async (e) => {
     e.preventDefault();
     const popupVisible = Misc.isAnyPopupVisible();
     if (!popupVisible) {
-      (await getCommandline()).show();
+      Commandline.show();
     }
   }
 });

frontend/src/ts/event-handlers/keymap.ts

@@ -1,7 +1,7 @@
-import { getCommandline } from "../utils/async-modules";
+import * as Commandline from "../commandline/commandline";
 
 $("#keymap").on("click", ".r5 .layoutIndicator", async () => {
-  (await getCommandline()).show({
+  Commandline.show({
     subgroupOverride: "keymapLayouts",
   });
 });

frontend/src/ts/event-handlers/test.ts

@@ -1,4 +1,4 @@
-import { getCommandline } from "../utils/async-modules";
+import * as Commandline from "../commandline/commandline";
 import * as CustomWordAmount from "../modals/custom-word-amount";
 import Config from "../config";
 import * as DB from "../db";
@@ -18,13 +18,13 @@ import { getMode2 } from "../utils/misc";
 $(".pageTest").on("click", "#testModesNotice .textButton", async (event) => {
   const attr = $(event.currentTarget).attr("commands");
   if (attr === undefined) return;
-  (await getCommandline()).show({ subgroupOverride: attr });
+  Commandline.show({ subgroupOverride: attr });
 });
 
 $(".pageTest").on("click", "#testModesNotice .textButton", async (event) => {
   const attr = $(event.currentTarget).attr("commandId");
   if (attr === undefined) return;
-  (await getCommandline()).show({ commandOverride: attr });
+  Commandline.show({ commandOverride: attr });
 });
 
 $(".pageTest").on("click", "#testConfig .wordCount .textButton", (e) => {

frontend/src/ts/modals/support.ts

@@ -1,5 +1,5 @@
 import AnimatedModal from "../utils/animated-modal";
-import { getCommandline } from "../utils/async-modules";
+import * as Commandline from "../commandline/commandline";
 
 export function show(): void {
   void modal.show();
@@ -9,8 +9,7 @@ const modal = new AnimatedModal({
   dialogId: "supportModal",
   setup: async (modalEl): Promise<void> => {
     modalEl.querySelector("button.ads")?.addEventListener("click", async () => {
-      const commandline = await getCommandline();
-      commandline.show(
+      Commandline.show(
         { subgroupOverride: "enableAds" },
         {
           modalChain: modal,

frontend/src/ts/utils/async-modules.ts

@@ -3,35 +3,6 @@ import * as Notifications from "../elements/notifications";
 import { createErrorMessage } from "./misc";
 import * as Skeleton from "../utils/skeleton";
 
-Skeleton.save("commandLine");
-
-export async function getCommandline(): Promise<
-  typeof import("../commandline/commandline.js")
-> {
-  try {
-    Loader.show();
-    // eslint-disable-next-line import/no-unresolved
-    const module = await import("../commandline/commandline.js");
-    Loader.hide();
-    return module;
-  } catch (e) {
-    Loader.hide();
-    if (
-      e instanceof Error &&
-      e.message.includes("Failed to fetch dynamically imported module")
-    ) {
-      Notifications.add(
-        "Failed to load commandline module: could not fetch",
-        -1
-      );
-    } else {
-      const msg = createErrorMessage(e, "Failed to load commandline module");
-      Notifications.add(msg, -1);
-    }
-    throw e;
-  }
-}
-
 Skeleton.save("devOptionsModal");
 
 export async function getDevOptionsModal(): Promise<