Merge branch 'main' into dev

.github/workflows/build.yml

@@ -26,13 +26,13 @@ jobs:
             with:
                 node-version: 20
 
-          - name: Install dependencies
+          - name: Install pnpm and dependencies
             run: |
                 npm i -g pnpm
-                pnpm i
+                pnpm i\
 
           - name: Build
-            run: pnpm build
+            run: pnpm build --release-branch=${{ github.ref_name }} --build-minify
 
           # TODO: Check for linting?
 
@@ -49,5 +49,5 @@ jobs:
 
           - name: Purge CDN cache
             run: |
-                curl https://purge.jsdelivr.net/gh/pyoncord/bunny-builds@${{ github.ref_name }}/bunny.js
+                curl https://purge.jsdelivr.net/gh/pyoncord/bunny-build-infos@${{ github.ref_name }}/bunny.js
                 

package.json

@@ -1,23 +1,16 @@
 {
     "name": "bunny",
-    "version": "1.0.0",
-    "description": "A mod for Discord's mobile apps, fork of Vendetta.",
+    "private": true,
+    "author": {
+        "name": "Pyoncord Team",
+        "url": "https://github.com/pyoncord"
+    },
     "scripts": {
-        "dev": "node build.mjs",
-        "build": "node build.mjs --release",
-        "serve": "node build.mjs --serve",
-        "watch": "node build.mjs --watch",
+        "build": "node scripts/build.mjs",
+        "serve": "node scripts/serve.mjs",
+        "serve:adb": "pnpm run serve --adb",
         "lint": "eslint ./src --ext .js,.jsx,.ts,.tsx"
     },
-    "keywords": [
-        "discord",
-        "android",
-        "ios",
-        "react native",
-        "vendetta",
-        "bunny"
-    ],
-    "author": "pylixonly, Team Vendetta",
     "license": "BSD-3-Clause",
     "devDependencies": {
         "@react-native-clipboard/clipboard": "1.10.0",
@@ -29,7 +22,7 @@
         "@types/node": "^20.11.25",
         "@types/react": "~18.2.0",
         "@types/react-native": "~0.72.0",
-        "@types/spark-md5": "^3.0.4",
+        "@types/yargs-parser": "^21.0.3",
         "@typescript-eslint/eslint-plugin": "^7.1.1",
         "@typescript-eslint/parser": "^7.1.1",
         "@typescript-eslint/typescript-estree": "^7.1.1",
@@ -43,9 +36,10 @@
         "moment": "2.22.2",
         "type-fest": "^4.12.0",
         "typescript": "^5.4.5",
-        "typescript-transform-paths": "^3.4.7"
+        "yargs-parser": "^21.1.1"
     },
     "dependencies": {
+        "chalk": "^5.3.0",
         "fuzzysort": "^2.0.4",
         "spitroast": "^1.4.4"
     },
@@ -57,4 +51,4 @@
             ]
         }
     }
-}
+}

scripts/adb.mjs

@@ -0,0 +1,29 @@
+// @ts-nocheck
+import { execSync } from "child_process";
+
+const packageName = process.env.DISCORD_PACKAGE_NAME ?? "com.discord";
+
+export function getPackageName() {
+    return packageName;
+}
+
+export function isADBAvailableAndAppInstalled() {
+    try {
+        const out = execSync(`adb shell pm list packages ${packageName}`);
+        return out.toString().trimEnd() === `package:${packageName}`;
+    } catch {
+        return false;
+    }
+}
+export async function restartAppFromADB(reversePort) {
+    if (typeof reversePort === "number") {
+        await execSync(`adb reverse tcp:${reversePort} tcp:${reversePort}`);
+    }
+
+    await forceStopAppFromADB();
+    await execSync(`adb shell am start ${packageName}/com.discord.main.MainActivity`);
+}
+
+export async function forceStopAppFromADB() {
+    await execSync(`adb shell am force-stop ${packageName}`);
+}