feat: marketplace (#5226)

Allows subscribing to marketplace items such as themes and scripts which are automatically being installed and updated.

Introduces:
- `.marketplace list <type> [featured]`
- `.marketplace subscribe <id>`
- `.marketplace unsubscribe <id>`
- `.marketplace update [id]`
- `.marketplace revisions list <id>`

All item creation and editing commands are currently commented out because it will be easier to maintain them through https://liquidbounce.net/marketplace in the future. This commit also introduces an automatic theme upload workflow to the LiquidBounce Marketplace and improved README for the theme workspace.

Author: 1zun4

build.gradle.kts

@@ -155,7 +155,7 @@ dependencies {
 
     // JCEF Support
     includeModDependency("com.github.CCBlueX:mcef:${project.property("mcef_version")}")
-    includeDependency("net.ccbluex:netty-httpserver:2.2.1")
+    includeDependency("net.ccbluex:netty-httpserver:2.2.2")
 
     // Discord RPC Support
     includeDependency("com.github.CCBlueX:DiscordIPC:4.0.0")

src-theme/.github/workflows/build.yml

@@ -1,16 +1,24 @@
 name: Build
-
 on:
   push:
     branches:
       - main
 
+permissions:
+  contents: write
+
+env:
+  ZIP_NAME: theme            # Name for the distribution archive
+  MARKETPLACE_ITEM_ID: 12345        # Replace with your actual marketplace item ID
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -24,23 +32,23 @@ jobs:
       - name: Build project
         run: npm run build
 
-      - name: Upload dist artifact
+      - name: Create dist archive
+        run: zip -r ${{ env.ZIP_NAME }}.zip dist/
+
+      - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: dist
-          path: dist/
+          name: ${{ env.ZIP_NAME }}
+          path: ${{ env.ZIP_NAME }}.zip
 
-      # Uncomment the sections below if you want to create GitHub releases
-      # 
-      # - name: Create dist archive
-      #   run: zip -r dist.zip dist/
-      #
-      # - name: Generate version tag
-      #   id: version_tag
-      #   run: |
-      #     COMMIT_HASH=$(git rev-parse --short HEAD)
-      #     TAG="build-$COMMIT_HASH-$(date +'%Y%m%d%H%M%S')"
-      #     echo "version=$TAG" >> $GITHUB_OUTPUT
+      - name: Generate version tag
+        id: version_tag
+        run: |
+          COMMIT_HASH=$(git rev-parse --short HEAD)
+          TAG="build-$COMMIT_HASH-$(date +'%Y%m%d%H%M%S')"
+          echo "version=$TAG" >> $GITHUB_OUTPUT
+
+      # Uncomment the sections below to enable GitHub releases and marketplace publishing
       #
       # - name: Create and push Git tag
       #   run: |
@@ -52,8 +60,18 @@ jobs:
       # - name: Upload to GitHub Release
       #   uses: softprops/action-gh-release@v1
       #   with:
-      #     files: dist.zip
-      #     token: ${{ secrets.GITHUB_TOKEN }}
+      #     files: ${{ env.ZIP_NAME }}.zip
       #     tag_name: ${{ steps.version_tag.outputs.version }}
-      #     prerelease: false
+      #     prerelease: true
       #     name: "Build Release ${{ steps.version_tag.outputs.version }}"
+      #
+      # - name: Upload to LiquidBounce Marketplace
+      #   run: |
+      #     curl -X POST \
+      #       "https://api.liquidbounce.net/api/v3/marketplace/${{ env.MARKETPLACE_ITEM_ID }}/revisions" \
+      #       -H "Authorization: Bearer ${{ secrets.API_TOKEN }}" \
+      #       -F "file=@${{ env.ZIP_NAME }}.zip" \
+      #       -F "version=${{ steps.version_tag.outputs.version }}" \
+      #       -F "changelog=Automated build from commit ${{ github.sha }}" \
+      #       -F "channel=alpha" \
+      #       --fail-with-body

src-theme/README.md

@@ -1,15 +1,74 @@
 # LiquidBounce Default Theme
 
-This directory contains the source code of LiquidBounce's default theme made with [Svelte](https://svelte.dev/).
+This directory contains the source code of LiquidBounce's default theme built with [Svelte](https://svelte.dev/).
 
 ## Development
 
-**This development setup is temporary and will be improved in the future!**
+### Prerequisites
+- [Node.js](https://nodejs.org/en) (latest or stable version)
 
-1. Install [Node.js](https://nodejs.org/en) on your computer (either latest or stable should be fine).
-2. Install required dependencies using `npm install`.
-3. Set `IN_DEV` in [host.ts](https://github.com/CCBlueX/LiquidBounce/blob/nextgen/src-theme/src/integration/host.ts) to `true`.
-4. Launch the client.
-5. Run `npm run dev` to start a development server.
+### Setup
 
-Make sure not to push the changes made to `host.ts` and `NettyServer.kt`!
+1. **Install dependencies**
+   ```bash
+   npm install
+   ```
+
+2. **Configure development mode**
+    - Set `IN_DEV` to `true` in [host.ts](https://github.com/CCBlueX/LiquidBounce/blob/nextgen/src-theme/src/integration/host.ts)
+
+3. **Launch the client**
+
+4. **Start development server**
+   ```bash
+   npm run dev
+   ```
+
+5. **Set theme in client**
+    - `.client theme set http://localhost:5173/`
+
+**Important**: Do not commit changes made to `host.ts` and `NettyServer.kt` when pushing to the repository.
+
+## Building for Production
+
+To build the theme for production use, follow these steps:
+
+1. **Ensure development mode is disabled**
+    - Set `IN_DEV` to `false` in [host.ts](https://github.com/CCBlueX/LiquidBounce/blob/nextgen/src-theme/src/integration/host.ts)
+
+2. **Build the theme**
+   ```bash
+   npm run build
+   ```
+
+3. **Locate build output**
+    - The production build will be generated in the `dist` folder
+    - This folder contains all the optimized and minified theme files
+
+4. **Deploy to themes directory**
+    - Copy the entire `dist` folder to your themes directory
+    - You can open the themes directory by typing `.client theme browse` in the client
+    - Rename the `dist` folder to your preferred theme name
+
+5. **Apply the theme**
+   ```
+   .client theme set <your-theme-name>
+   ```
+
+## Marketplace Publishing
+
+1. **Get API token**
+    - Go to [https://liquidbounce.net/account](https://liquidbounce.net/account)
+    - Generate your API token
+
+2. **Get marketplace item ID**
+    - Navigate to [https://liquidbounce.net/marketplace](https://liquidbounce.net/marketplace)
+    - Go to your item page
+    - Copy the ID from the "Item ID" field on the right side
+
+3. **Configure repository**
+    - Add `API_TOKEN` as a repository secret in Settings → Secrets and variables → Actions
+    - Update `MARKETPLACE_ITEM_ID` and `ZIP_NAME` in the workflow file with your values
+
+4. **Enable publishing**
+    - Uncomment the GitHub release and marketplace upload sections in `.github/workflows/build.yml`

src/main/kotlin/net/ccbluex/liquidbounce/LiquidBounce.kt

@@ -45,6 +45,7 @@ import net.ccbluex.liquidbounce.features.cosmetic.ClientAccountManager
 import net.ccbluex.liquidbounce.features.cosmetic.CosmeticService
 import net.ccbluex.liquidbounce.features.itemgroup.ClientItemGroups
 import net.ccbluex.liquidbounce.features.itemgroup.groups.heads
+import net.ccbluex.liquidbounce.features.marketplace.MarketplaceManager
 import net.ccbluex.liquidbounce.features.misc.AccountManager
 import net.ccbluex.liquidbounce.features.misc.FriendManager
 import net.ccbluex.liquidbounce.features.misc.proxy.ProxyManager
@@ -230,6 +231,7 @@ object LiquidBounce : EventListener {
         ConfigSystem.root(LanguageManager)
         ConfigSystem.root(ClientAccountManager)
         ConfigSystem.root(SpooferManager)
+        ConfigSystem.root(MarketplaceManager)
         PostRotationExecutor
         ServerObserver
         ItemImageAtlas
@@ -298,7 +300,7 @@ object LiquidBounce : EventListener {
                         ClientAccountManager.clientAccount = ClientAccount.EMPTY_ACCOUNT
                     }.onSuccess {
                         logger.info("Successfully renewed client account token.")
-                        ConfigSystem.storeConfigurable(ClientAccountManager)
+                        ConfigSystem.store(ClientAccountManager)
                     }
                 }
             },
@@ -353,6 +355,19 @@ object LiquidBounce : EventListener {
                     logger.info("Failed to initialize deep learning.", exception)
                 }
             }
+
+            launch("Marketplace") { task ->
+                runCatching {
+                    // Preload marketplace items
+                    ConfigSystem.load(MarketplaceManager)
+                    MarketplaceManager.updateAll(task)
+                    ConfigSystem.store(MarketplaceManager)
+                }.onFailure { exception ->
+                    logger.error("Failed to update marketplace items.", exception)
+                }
+
+                task.isCompleted = true
+            }
         }
 
         // Prepare glyph manager

src/main/kotlin/net/ccbluex/liquidbounce/api/core/BaseApi.kt

@@ -83,7 +83,8 @@ abstract class BaseApi(protected val baseUrl: String) {
 
     protected suspend inline fun <reified T> delete(
         endpoint: String,
+        body: RequestBody? = null,
         crossinline headers: Headers.Builder.() -> Unit = {}
-    ): T = request(endpoint, HttpMethod.DELETE, headers)
+    ): T = request(endpoint, HttpMethod.DELETE, headers, body)
 
 }

src/main/kotlin/net/ccbluex/liquidbounce/api/core/HttpClient.kt

@@ -23,8 +23,8 @@ import kotlinx.coroutines.*
 import net.ccbluex.liquidbounce.LiquidBounce
 import net.ccbluex.liquidbounce.config.gson.accessibleInteropGson
 import net.ccbluex.liquidbounce.config.gson.util.decode
+import net.ccbluex.liquidbounce.mcef.listeners.OkHttpProgressInterceptor
 import net.ccbluex.liquidbounce.utils.client.logger
-import net.ccbluex.liquidbounce.mcef.utils.FileUtils as McefFileUtils
 import net.minecraft.client.texture.NativeImage
 import net.minecraft.client.texture.NativeImageBackedTexture
 import net.minecraft.util.Util
@@ -38,6 +38,7 @@ import java.io.IOException
 import java.io.InputStream
 import java.io.Reader
 import java.util.concurrent.TimeUnit
+import net.ccbluex.liquidbounce.mcef.utils.FileUtils as McefFileUtils
 
 val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
@@ -83,12 +84,14 @@ object HttpClient {
         }
         .build().also(McefFileUtils::setOkHttpClient)
 
+    @Suppress("LongParameterList")
     suspend fun request(
         url: String,
         method: HttpMethod,
         agent: String = DEFAULT_AGENT,
         headers: Headers.Builder.() -> Unit = {},
-        body: RequestBody? = null
+        body: RequestBody? = null,
+        progressListener: OkHttpProgressInterceptor.ProgressListener? = null
     ): Response = withContext(Dispatchers.IO) {
         val request = Request.Builder()
             .url(url)
@@ -97,11 +100,22 @@ object HttpClient {
             .header("User-Agent", agent)
             .build()
 
-        client.newCall(request).execute()
+        if (progressListener == null) {
+            client.newCall(request).execute()
+        } else {
+            client.newBuilder()
+                .addNetworkInterceptor(OkHttpProgressInterceptor(progressListener))
+                .build()
+                .newCall(request).execute()
+        }
     }
 
-    suspend fun download(url: String, file: File, agent: String = DEFAULT_AGENT) =
-        request(url, HttpMethod.GET, agent).toFile(file)
+    suspend fun download(
+        url: String,
+        file: File,
+        agent: String = DEFAULT_AGENT,
+        progressListener: OkHttpProgressInterceptor.ProgressListener? = null
+    ) = request(url, HttpMethod.GET, agent, progressListener = progressListener).toFile(file)
 
 }
 

src/main/kotlin/net/ccbluex/liquidbounce/api/models/auth/ClientAccount.kt

@@ -39,7 +39,7 @@ data class ClientAccount(
     @Exclude
     var cosmetics: Set<Cosmetic>? = null
 ) {
-    private suspend fun takeSession(): OAuthSession = session?.takeIf { !it.accessToken.isExpired() } ?: run {
+    suspend fun takeSession(): OAuthSession = session?.takeIf { !it.accessToken.isExpired() } ?: run {
         renew()
         session ?: error("No session")
     }

src/main/kotlin/net/ccbluex/liquidbounce/api/models/marketplace/MarketplaceItem.kt

@@ -0,0 +1,36 @@
+/*
+ * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce)
+ *
+ * Copyright (c) 2015 - 2025 CCBlueX
+ *
+ * LiquidBounce is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LiquidBounce is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LiquidBounce. If not, see <https://www.gnu.org/licenses/>.
+ */
+package net.ccbluex.liquidbounce.api.models.marketplace
+
+import com.google.gson.annotations.SerializedName
+
+data class MarketplaceItem(
+    val id: Int,
+    val uid: String,
+    val type: MarketplaceItemType,
+    val name: String,
+    val branch: String,
+    val description: String,
+    @SerializedName("thumbnail_pid")
+    val thumbnailPid: String?,
+    val featured: Boolean,
+    @SerializedName("created_at")
+    val createdAt: String,
+    val status: MarketplaceItemStatus
+)

src/main/kotlin/net/ccbluex/liquidbounce/api/models/marketplace/MarketplaceItemRevision.kt

@@ -0,0 +1,34 @@
+/*
+ * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce)
+ *
+ * Copyright (c) 2015 - 2025 CCBlueX
+ *
+ * LiquidBounce is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LiquidBounce is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LiquidBounce. If not, see <https://www.gnu.org/licenses/>.
+ */
+package net.ccbluex.liquidbounce.api.models.marketplace
+
+import com.google.gson.annotations.SerializedName
+
+data class MarketplaceItemRevision(
+    val id: Int,
+    @SerializedName("item_id")
+    val itemId: Int,
+    val version: String,
+    @SerializedName("file_pid")
+    val filePid: String,
+    val changelog: String?,
+    @SerializedName("created_at")
+    val createdAt: String,
+    val status: MarketplaceItemStatus
+)