fix: loader config not restoring correctly in some cases

revenge-mod · Mar 19, 2024 · 0db174a · 0db174a
1 parent ec63ce0
commit 0db174a
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 41 deletions.
diff --git a/src/def.d.ts b/src/def.d.ts
@@ -197,7 +197,7 @@ interface Settings {
 
 interface ExtendedVeryPrivateSoonToBeMovedSettings extends Settings {
   developmentBuildEnabled: boolean;
-  __previousCustomLoadUrlConfig?: LoaderConfig['customLoadUrl']
+  __previousCustomLoadUrlConfig?: LoaderConfig["customLoadUrl"];
 }
 
 interface ApplicationCommand {

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
@@ -5,7 +5,8 @@ export const THEMES_CHANNEL_ID = "1091880434939482202";
 export const GITHUB = "https://github.com/revenge-mod";
 export const PROXY_PREFIX = "https://vd-plugins.github.io/proxy";
 export const PROXY_PREFIXES = ["https://vd-plugins.github.io/proxy"];
-export const DEVELOPMENT_DISTRIBUTION_URL = "https://raw.githubusercontent.com/revenge-mod/builds/dev/revenge.js"
+export const DEVELOPMENT_DISTRIBUTION_URL =
+  "https://raw.githubusercontent.com/revenge-mod/builds/dev/revenge.js";
 export const HTTP_REGEX =
   /^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_+.~#?&/=]*)$/;
 export const HTTP_REGEX_MULTI =

diff --git a/src/lib/debug.ts b/src/lib/debug.ts
@@ -1,12 +1,16 @@
 import { DEVELOPMENT_DISTRIBUTION_URL } from "@lib/constants";
 import logger from "@lib/logger";
-import { BundleUpdaterManager, ClientInfoManager, DeviceManager } from "@lib/native";
+import {
+  BundleUpdaterManager,
+  ClientInfoManager,
+  DeviceManager
+} from "@lib/native";
 import { after } from "@lib/patcher";
 import settings, { loaderConfig } from "@lib/settings";
 import { getCurrentTheme, selectTheme } from "@lib/themes";
 import { ReactNative as RN } from "@metro/common";
 import { ButtonColors, type RNConstants } from "@types";
-import { showConfirmationAlert } from '@ui/alerts'
+import { showConfirmationAlert } from "@ui/alerts";
 import { getAssetIDByName } from "@ui/assets";
 import { showToast } from "@ui/toasts";
 import { removeCachedScript } from "./storage";
@@ -144,7 +148,10 @@ export function getDebugInfo() {
   };
 }
 
-export async function setDevelopmentBuildEnabled(enabled: boolean, showReloadPopup = true) {
+export async function setDevelopmentBuildEnabled(
+  enabled: boolean,
+  showReloadPopup = true
+) {
   if (enabled) {
     settings.__previousCustomLoadUrlConfig = loaderConfig.customLoadUrl;
     loaderConfig.customLoadUrl = {
@@ -166,13 +173,13 @@ export async function setDevelopmentBuildEnabled(enabled: boolean, showReloadPop
 
   await removeCachedScript();
 
-  if (showReloadPopup) showConfirmationAlert({
-    title: "Reload required",
-    content:
-      "Changes will only apply next time the app launches or reloads.",
-    confirmText: "Reload now",
-    cancelText: "Later",
-    confirmColor: ButtonColors.PRIMARY,
-    onConfirm: BundleUpdaterManager.reload
-  });
+  if (showReloadPopup)
+    showConfirmationAlert({
+      title: "Reload required",
+      content: "Changes will only apply next time the app launches or reloads.",
+      confirmText: "Reload now",
+      cancelText: "Later",
+      confirmColor: ButtonColors.PRIMARY,
+      onConfirm: BundleUpdaterManager.reload
+    });
 }
diff --git a/src/lib/settings.ts b/src/lib/settings.ts
@@ -4,10 +4,15 @@ import {
   createStorage,
   wrapSync
 } from "@lib/storage";
-import type { LoaderConfig, ExtendedVeryPrivateSoonToBeMovedSettings } from "@types";
+import type {
+  ExtendedVeryPrivateSoonToBeMovedSettings,
+  LoaderConfig
+} from "@types";
 
 export default wrapSync(
-  createStorage<ExtendedVeryPrivateSoonToBeMovedSettings>(createMMKVBackend("VENDETTA_SETTINGS"))
+  createStorage<ExtendedVeryPrivateSoonToBeMovedSettings>(
+    createMMKVBackend("VENDETTA_SETTINGS")
+  )
 );
 export const loaderConfig = wrapSync(
   createStorage<LoaderConfig>(createFileBackend("vendetta_loader.json"))

diff --git a/src/ui/settings/pages/General.tsx b/src/ui/settings/pages/General.tsx
@@ -148,9 +148,12 @@ export default function General() {
             leading={
               <FormRow.Icon source={getAssetIDByName("ic_message_retry")} />
             }
-            onPress={() =>
-              setDevelopmentBuildEnabled(settings.developmentBuildEnabled)
-            }
+            onPress={() => {
+              // Workaround so it restores the config correctly even when the dev build option is turned off
+              settings.__previousCustomLoadUrlConfig =
+                loaderConfig.customLoadUrl;
+              setDevelopmentBuildEnabled(settings.developmentBuildEnabled);
+            }}
           />
           <FormDivider />
           <FormSwitchRow

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,24 +1,24 @@
 {
-  "include": ["src"],
-  "exclude": ["node_modules"],
-  "compilerOptions": {
-    "baseUrl": ".",
-    "sourceMap": true,
-    "module": "ESNext",
-    "target": "ESNext",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "jsx": "react",
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "skipLibCheck": true,
-    "paths": {
-      "@/*": ["src/*"],
-      "@types": ["src/def.d.ts"],
-      "@lib/*": ["src/lib/*"],
-      "@metro/*": ["src/lib/metro/*"],
-      "@ui/*": ["src/ui/*"]
-    }
-  }
+	"include": ["src"],
+	"exclude": ["node_modules"],
+	"compilerOptions": {
+		"baseUrl": ".",
+		"sourceMap": true,
+		"module": "ESNext",
+		"target": "ESNext",
+		"moduleResolution": "node",
+		"esModuleInterop": true,
+		"jsx": "react",
+		"strict": true,
+		"forceConsistentCasingInFileNames": true,
+		"resolveJsonModule": true,
+		"skipLibCheck": true,
+		"paths": {
+			"@/*": ["src/*"],
+			"@types": ["src/def.d.ts"],
+			"@lib/*": ["src/lib/*"],
+			"@metro/*": ["src/lib/metro/*"],
+			"@ui/*": ["src/ui/*"]
+		}
+	}
 }