feat: improvements (#204)

Author: PalmDevs

bun.lock

@@ -40,6 +40,8 @@
     },
     "dependencies": {
         "@gullerya/object-observer": "^6.1.4",
+        "@revenge-mod/devtools-client": "^1.1.3",
+        "@revenge-mod/devtools-shared": "^1.0.2",
         "@shopify/react-native-skia": "^1.12.4",
         "@tanstack/react-query": "^5.83.0",
         "@types/chroma-js": "~2.4.5",

package.json

@@ -10,7 +10,7 @@ export function getPackageName() {
 export function isADBAvailableAndAppInstalled() {
     try {
         const out = execSync(`adb shell pm list packages ${packageName}`);
-        return out.toString().trimEnd() === `package:${packageName}`;
+        return out.toString().trim().split("\n").includes(`package:${packageName}`);
     } catch {
         return false;
     }

scripts/adb.mjs

@@ -5,12 +5,12 @@ import { execFileSync, execSync } from "child_process";
 import crypto from "crypto";
 import { build } from "esbuild";
 import globalPlugin from "esbuild-plugin-globals";
+import { readFile } from "fs/promises";
 import path from "path";
 import { fileURLToPath } from "url";
 import yargs from "yargs-parser";
 
 import { printBuildSuccess } from "./util.mjs";
-import { readFile } from "fs/promises";
 
 /** @type string[] */
 const metroDeps = await (async () => {
@@ -34,7 +34,9 @@ const config = {
     outfile: "dist/revenge.js",
     format: "iife",
     splitting: false,
-    external: [],
+    external: [
+        "node:*"
+    ],
     supported: {
         // Hermes does not actually support const and let, even though it syntactically
         // accepts it, but it's treated just like 'var' and causes issues
@@ -123,22 +125,22 @@ export async function buildBundle(overrideConfig = {}) {
     await build({ ...config, ...overrideConfig });
 
     const paths = {
-        win32: 'win64-bin/hermesc.exe',
-        darwin: 'osx-bin/hermesc',
-        linux: 'linux64-bin/hermesc',
-    }
+        win32: "win64-bin/hermesc.exe",
+        darwin: "osx-bin/hermesc",
+        linux: "linux64-bin/hermesc",
+    };
 
     if (!(process.platform in paths))
-        throw new Error(`Unsupported platform: ${process.platform}`)
+        throw new Error(`Unsupported platform: ${process.platform}`);
 
-    const sdksDir = './node_modules/react-native/sdks'
-    const binPath = `${sdksDir}/hermesc/${paths[process.platform]}`
+    const sdksDir = "./node_modules/react-native/sdks";
+    const binPath = `${sdksDir}/hermesc/${paths[process.platform]}`;
 
     const actualFile = overrideConfig.outfile ?? config.outfile;
 
-    execFileSync(binPath, ['-finline', '-strict', '-O', '-g1', '-reuse-prop-cache', '-optimized-eval', '-emit-binary', '-Wno-undefined-variable', '-out', actualFile], {
+    execFileSync(binPath, ["-finline", "-strict", "-O", "-g1", "-reuse-prop-cache", "-optimized-eval", "-emit-binary", "-Wno-undefined-variable", "-out", actualFile], {
         input: await readFile(actualFile),
-        stdio: 'pipe'
+        stdio: "pipe"
     });
 
     return {

scripts/build.mjs

@@ -6,16 +6,16 @@
     "ARE_YOU_SURE_TO_DELETE_THEME": "Are you sure you wish to delete {name}?",
     "ASSET_BROWSER": "Asset Browser",
     "BRAND": "Brand",
-    "BUNNY": "Revenge",
     "BUNNY_URL": "Revenge URL",
+    "BUNNY": "Revenge",
     "BYTECODE": "Bytecode",
     "CANCEL": "Cancel",
-    "CLEAR": "Clear",
-    "CLEAR_BUNDLE": "Clear JS Bundle",
     "CLEAR_BUNDLE_DESC": "Clear the cached bundle. This will force a re-download of the bundle next app launch.",
-    "CLEAR_DATA": "Clear Data",
+    "CLEAR_BUNDLE": "Clear JS Bundle",
     "CLEAR_DATA_FAILED": "Failed to clear data for {name}",
     "CLEAR_DATA_SUCCESSFUL": "Cleared data for {name}",
+    "CLEAR_DATA": "Clear Data",
+    "CLEAR": "Clear",
     "CODENAME": "Codename",
     "COMMAND_DEBUG_DESC": "Send debug information",
     "COMMAND_DEBUG_OPT_EPHEMERALLY": "Send the message ephemerally",
@@ -26,23 +26,29 @@
     "COMMAND_PLUGINS_OPT_EPHEMERALLY": "Send the message ephemerally",
     "COMPONENT": "Component",
     "CONFIRMATION_LINK_IS_A_TYPE": "This link is a **{urlType, select, plugin {Plugin} theme {Theme} other {Add-on}}**, would you like to install it?",
-    "CONNECT_TO_DEBUG_WEBSOCKET": "Connect to debug WebSocket",
+    "CONNECT_TO_DEBUG_WEBSOCKET": "Connect to DevTools",
     "CONNECT_TO_REACT_DEVTOOLS": "Connect to React DevTools",
+    "CONNECTED_TO_DEBUGGER": "Connected to DevTools",
+    "CONNECTED_TO_REACT_DEVTOOLS": "Connected to React DevTools",
     "CONTINUE": "Continue",
     "COPIED_TO_CLIPBOARD": "Copied to clipboard",
     "COPY_URL": "Copy URL",
     "DEBUG": "Debug",
+    "DEBUGGER_AUTOCONNECT_DESC": "Automatically connect to the DevTools during startup",
+    "DEBUGGER_AUTOCONNECT": "Auto-connect to DevTools",
     "DEBUGGER_URL": "Debugger URL",
     "DELETE": "Delete",
     "DESC_EXTRACT_FONTS_FROM_THEME": "Looks out for \"fonts\" field in your currently applied theme and install it.",
-    "DEVELOPER": "Developer",
     "DEVELOPER_SETTINGS": "Developer Settings",
+    "DEVELOPER": "Developer",
     "DISABLE_THEME": "Disable Theme",
     "DISABLE_UPDATES": "Disable Updates",
+    "DISCONNECT_FROM_DEBUG_WEBSOCKET": "Disconnect from DevTools",
+    "DISCONNECT_FROM_REACT_DEVTOOLS": "Disconnect from React DevTools",
     "DISCORD_SERVER": "Discord Server",
     "DONE": "Done",
-    "ENABLE_EVAL_COMMAND": "Enable /eval command",
     "ENABLE_EVAL_COMMAND_DESC": "Evaluate JavaScript directly from a command. Be cautious when using this command as it may pose a security risk. Make sure to know what you are doing.",
+    "ENABLE_EVAL_COMMAND": "Enable /eval command",
     "ENABLE_UPDATES": "Enable Updates",
     "ERROR_BOUNDARY_TOOLS_LABEL": "ErrorBoundary Tools",
     "EXTRACT": "Extract",
@@ -52,26 +58,26 @@
     "GITHUB": "GitHub",
     "HOLD_UP": "Hold Up",
     "INFO": "Info",
-    "INSTALL": "Install",
     "INSTALL_ADDON": "Install an add-on",
     "INSTALL_FONT": "Install a font",
     "INSTALL_PLUGIN": "Install a plugin",
     "INSTALL_REACT_DEVTOOLS": "Install React DevTools",
     "INSTALL_THEME": "Install a theme",
+    "INSTALL": "Install",
     "LABEL_EXTRACT_FONTS_FROM_THEME": "Extract font from theme",
     "LINKS": "Links",
-    "LOAD_FROM_CUSTOM_URL": "Load from custom URL",
     "LOAD_FROM_CUSTOM_URL_DEC": "Load Revenge from a custom endpoint",
+    "LOAD_FROM_CUSTOM_URL": "Load from custom URL",
     "LOAD_REACT_DEVTOOLS": "Load React DevTools",
     "LOADER": "Loader",
     "MACHINE_ID": "Machine ID",
     "MANUFACTURER": "Manufacturer",
     "MESSAGE": "Message",
     "MISCELLANEOUS": "Miscellaneous",
-    "MODAL_RELOAD_REQUIRED": "Reload app?",
     "MODAL_RELOAD_REQUIRED_DESC": "A reload is required to see the changes. Do you want to reload now?",
-    "MODAL_THEME_REFETCHED": "Theme refetched",
+    "MODAL_RELOAD_REQUIRED": "Reload app?",
     "MODAL_THEME_REFETCHED_DESC": "A reload is required to see the changes. Do you want to reload now?",
+    "MODAL_THEME_REFETCHED": "Theme refetched",
     "MODAL_UNPROXIED_PLUGIN_DESC": "The plugin you are trying to install has not been proxied/verified by staff. Are you sure you want to continue?",
     "MODAL_UNPROXIED_PLUGIN_HEADER": "Unproxied Plugin",
     "MODEL": "Model",
@@ -83,36 +89,36 @@
     "PLUGIN_REFETCH_SUCCESSFUL": "Successfully refetched plugin",
     "PLUGINS": "Plugins",
     "REFETCH": "Refetch",
-    "RELOAD": "Reload",
     "RELOAD_DISCORD": "Reload Discord",
-    "RELOAD_IN_NORMAL_MODE": "Reload in Normal Mode",
     "RELOAD_IN_NORMAL_MODE_DESC": "Safe mode currently enabled, tap to reload in normal mode",
-    "RELOAD_IN_SAFE_MODE": "Reload in Safe Mode",
+    "RELOAD_IN_NORMAL_MODE": "Reload in Normal Mode",
     "RELOAD_IN_SAFE_MODE_DESC": "Tap to reload Discord without loading addons",
+    "RELOAD_IN_SAFE_MODE": "Reload in Safe Mode",
+    "RELOAD": "Reload",
     "REMOVE": "Remove",
     "RESTART_REQUIRED_TO_TAKE_EFFECT": "Restart is required to take effect",
-    "RETRY": "Retry",
     "RETRY_RENDER": "Retry Render",
-    "SAFE_MODE": "Safe Mode",
+    "RETRY": "Retry",
     "SAFE_MODE_NOTICE_FONTS": "You are in safe mode, meaning fonts have been temporarily disabled. {enabled, select, true {If a font appears to be causing the issue, you can press below to disable it persistently.} other {}}",
     "SAFE_MODE_NOTICE_PLUGINS": "You are in safe mode, so plugins cannot be loaded. Disable any misbehaving plugins, then return to Normal Mode from the General settings page.",
     "SAFE_MODE_NOTICE_THEMES": "You are in safe mode, meaning themes have been temporarily disabled. {enabled, select, true {If a theme appears to be causing the issue, you can press below to disable it persistently.} other {}}",
+    "SAFE_MODE": "Safe Mode",
     "SEARCH": "Search",
     "SEPARATOR": ", ",
-    "SETTINGS_ACTIVATE_DISCORD_EXPERIMENTS": "Activate Discord Experiments",
     "SETTINGS_ACTIVATE_DISCORD_EXPERIMENTS_DESC": "Warning: Messing with this feature may lead to account termination. We are not responsible for what you do with this feature.",
+    "SETTINGS_ACTIVATE_DISCORD_EXPERIMENTS": "Activate Discord Experiments",
     "STACK_TRACE": "Stack Trace",
     "SUCCESSFULLY_INSTALLED": "Successfully installed",
     "THEME_EXTRACTOR_DESC": "This pack overrides the following: {fonts}",
     "THEME_REFETCH_FAILED": "Failed to refetch theme",
     "THEME_REFETCH_SUCCESSFUL": "Successfully refetched theme",
-    "THEMES": "Themes",
     "THEMES_RELOAD_FOR_CHANGES": "Reload the app to fully apply changes",
+    "THEMES": "Themes",
     "TOASTS_INSTALLED_PLUGIN": "Installed plugin",
     "TOASTS_PLUGIN_UPDATE": "{update, select, true {Enabled} other {Disabled}} updates for {name}",
     "UH_OH": "Uh Oh",
-    "UNINSTALL": "Uninstall",
     "UNINSTALL_TITLE": "Uninstall {title}",
+    "UNINSTALL": "Uninstall",
     "URL_PLACEHOLDER": "https://github.com/revenge-mod",
     "VERSION": "Version",
     "VERSIONS": "Versions"

src/core/i18n/default.json

@@ -77,7 +77,7 @@ function useInstaller(thread: any, firstMessage = null, actionSheet = false): [t
         try {
             await postMap[postType].installOrRemove(url);
         } catch (e: any) {
-            showToast(e.message, findAssetId("Small"));
+            showToast(e.message, findAssetId("XSmallIcon"));
         } finally {
             setIsInstalling(false);
         }
@@ -96,7 +96,7 @@ function useInstaller(thread: any, firstMessage = null, actionSheet = false): [t
 
 //     actions.unshift(<ActionsSection key="install">
 //         <ActionSheetRow
-//             icon={<ActionSheetRow.Icon source={getAssetIDByName(installed ? "ic_message_delete" : "DownloadIcon")} />}
+//             icon={<ActionSheetRow.Icon source={getAssetIDByName(installed ? "TrashIcon" : "DownloadIcon")} />}
 //             label={formatString(installed ? "UNINSTALL_TITLE" : "INSTALL_TITLE", { title: postType })}
 //             disabled={loading}
 //             onPress={installOrRemove}
@@ -119,7 +119,7 @@ const installButtonPatch = () => after("MostCommonForumPostReaction", forumReact
                 variant={installed ? "secondary" : "primary"}
                 text={installed ? Strings.UNINSTALL : Strings.INSTALL}
                 onPress={installOrRemove}
-                icon={findAssetId(installed ? "ic_message_delete" : "DownloadIcon")}
+                icon={findAssetId(installed ? "TrashIcon" : "DownloadIcon")}
                 style={{ marginLeft: 8 }}
             />
         </ErrorBoundary>

src/core/plugins/quickinstall/forumPost.tsx

@@ -30,10 +30,10 @@ function typeFromUrl(url: string) {
 function installWithToast(type: "plugin" | "theme", url: string) {
     (type === "plugin" ? VdPluginManager.installPlugin.bind(VdPluginManager) : installTheme)(url)
         .then(() => {
-            showToast(Strings.SUCCESSFULLY_INSTALLED, findAssetId("Check"));
+            showToast(Strings.SUCCESSFULLY_INSTALLED, findAssetId("DownloadIcon"));
         })
         .catch((e: Error) => {
-            showToast(e.message, findAssetId("Small"));
+            showToast(e.message, findAssetId("XSmallIcon"));
         });
 }
 

src/core/plugins/quickinstall/url.tsx

@@ -21,11 +21,12 @@ export function useFileExists(path: string, prefix?: string): [CheckState, typeo
             if (typeof val !== "function") return;
 
             return (...args: any[]) => {
-                const promise = (check(), val(...args));
+                const promise = val(...args);
                 if (promise?.constructor?.name === "Promise") {
                     setState(CheckState.LOADING);
                     promise.finally(check);
                 }
+
                 return promise;
             };
         },