Merge pull request #3517 from KBVE/beta

Preparing Release Branch

.github/ISSUE_TEMPLATE/bounty.md

@@ -0,0 +1,29 @@
+---
+name: Bounty & Invoice System!
+about: Create a bounty or invoice for KBVE.
+title: '[Bounty] : Describe The Bounty'
+labels: ["0", "bounty", "invoice"]
+projects: ["kbve/5"]
+assignees: 'h0lybyte'
+---
+
+**Bounty Report**
+
+This is a simple bounty claim or invoice tracking!
+Please do not include the invoice directly in this issue ticket but rather use this issue ticket number in the invoice you generate.
+
+* * *
+
+**Additional Information**
+
+Please include any additional information below:
+
+* * *
+
+**Post Submit**
+
+After submitting the issue ticket, please head over to the [invoice system](https://kbve.com/invoice/#claim) and submit the invoice URL and the issue ticke that was created.
+
+The claim should be the issue ticket that gets generated, your stripe, paypal or invoice URL and the amount.
+Afterwards, once it gets processed on our end, the results and additional information will be placed into the issue ticket.
+Thanks!

.github/workflows/ci-alpha.yml

@@ -71,6 +71,7 @@ jobs:
             rustapiprofile: ${{ steps.delta.outputs.rustapiprofile_any_changed  }}
             expolcagents: ${{ steps.delta.outputs.expolcagents_any_changed }}
             kilonet: ${{ steps.delta.outputs.kilonet_any_changed }}
+            rustrareicongameserver: ${{ steps.delta.outputs.rustrareicongameserver_any_changed }}
 
         steps:
             - name: Checkout the repository using git
@@ -99,6 +100,8 @@ jobs:
                           - 'apps/expo-lcagents/**'
                       kilonet:
                           - 'packages/kilonet/README.md'
+                      rustrareicongameserver:
+                          - 'apps/rust_rareicon_gameserver/README.md'
 
     expo-lcagents-web-build:
         needs: ['alter', 'globals']
@@ -255,7 +258,8 @@ jobs:
                   buildChannel: webgl
 
     rareicon_gameserver:
-        needs: ['kilonet-rareicon-build']
+        needs: ['alter', 'globals']
+        if: needs.alter.outputs.rustrareicongameserver == 'true'
         name: RareIcon Game Server
         runs-on: 'ubuntu-latest'
         permissions:

.github/workflows/ci-dev.yml

@@ -161,6 +161,8 @@ jobs:
             api: ${{ steps.delta.outputs.api_any_changed  }}
             rustapiprofile: ${{ steps.delta.outputs.rustapiprofile_any_changed  }}
             kilobase: ${{ steps.delta.outputs.kilobase_any_changed}}
+            fudster: ${{ steps.delta.outputs.fudster_any_changed}}
+
             ##  [PACKAGES]
         steps:
             - name: Checkout the repository using git
@@ -189,6 +191,8 @@ jobs:
                           - 'apps/rust_api_profile/**'
                       kilobase:
                           - 'apps/kilobase/Cargo.toml'
+                      fudster:
+                          - 'apps/fudster/README.md'
 
     deploy:
         needs: alter
@@ -231,6 +235,66 @@ jobs:
               run: |
                   pnpm nx report
 
+    fudster_dev_cicd:
+        needs: ['handle', 'deploy', 'alter']
+        name: Fudster Dev CI-CD
+        if: needs.alter.outputs.fudster == 'true'
+        runs-on: 'ubuntu-latest'
+        permissions:
+            contents: read
+            packages: write
+
+        steps:
+            - name: Checkout the monorepo using git
+              uses: actions/checkout@v4
+
+            - name: Setup Node v20
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20
+
+            - name: Setup pnpm
+              uses: pnpm/action-setup@v3
+              with:
+                  version: 9
+                  run_install: false
+
+            - name: Get pnpm Store
+              shell: bash
+              run: |
+                  echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+            - name: Setup pnpm Cache
+              uses: actions/cache@v4
+              with:
+                  path: ${{ env.STORE_PATH }}
+                  key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+                  restore-keys: |
+                      ${{ runner.os }}-pnpm-store-
+
+            - name: Install pnpm dependencies
+              shell: bash
+              run: |
+                  pnpm install
+
+            - name: Set up QEMU
+              uses: docker/setup-qemu-action@v3
+
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v3
+
+            - name: Login to Docker Hub
+              uses: docker/login-action@v3
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+            - name: Build Docker container with Nx
+              env:
+                  INPUT_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  pnpm nx run fudster:container --configuration=production  --push
+
     kilobase_dev_cicd:
         needs: ['deploy', 'alter']
         name: KiloBase Dev CI-CD
@@ -258,8 +322,8 @@ jobs:
             - name: Get pnpm Store
               shell: bash
               run: |
-                    echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-                  
+                  echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
             - name: Setup pnpm Cache
               uses: actions/cache@v4
               with:
@@ -291,12 +355,12 @@ jobs:
 
             # - name: Install PGRX
             #   run: cargo install cargo-pgrx --version 0.12.3 --locked
-        
+
             # - name: Get PostgreSQL 15 pg_config path
             #   run: |
             #     PG_CONFIG_PATH=$(find /usr/lib/postgresql/15/ -name pg_config)
             #     echo "PG_CONFIG_PATH=$PG_CONFIG_PATH" >> $GITHUB_ENV
-                            
+
             # - name: Initialize PGRX
             #   run: cargo pgrx init --pg15 $PG_CONFIG_PATH
 
@@ -314,7 +378,7 @@ jobs:
 
             - name: Build Docker container with Nx
               env:
-                INPUT_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  INPUT_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: |
                   pnpm nx run kilobase:container --configuration=production  --push
 
@@ -324,4 +388,4 @@ jobs:
 
             # - name: Push Docker image to Docker Hub
             #   run: |
-            #       docker push ${{ secrets.DOCKERHUB_USERNAME }}/kilobase:15.1
+            #       docker push ${{ secrets.DOCKERHUB_USERNAME }}/kilobase:15.1

apps/atlas/README.md

@@ -25,54 +25,3 @@ pnpm nx container atlas
 docker run -p 3000:3000 -p 3001:3001 -p 8086:8086 kbve/atlas:1.42
 
 ```
-
-```json
-
-    {
-            "channel": "default",
-            "content": {
-                "command": "execute",
-                "packageName": "net.runelite.client.plugins.microbot.kbve",
-                "className": "KBVEScripts",
-                "method": "AcceptEULA",
-                "args": [300, 301],
-                "priority": 1
-            }
-    },
-
-    {
-            "channel": "default",
-            "content": {
-                "command": "execute",
-                "packageName": "net.runelite.client.plugins.microbot.util.security",
-                "className": "Login",
-                "method": "setWorld",
-                "args": [308],
-                "priority": 1
-            }
-    },
-
-    {
-        "channel": "default",
-        "content": {
-                "command": "execute",
-                "packageName": "net.runelite.client.plugins.microbot.kbve",
-                "className": "KBVEScripts",
-                "method": "SafeLogin",
-                "args": ["myUsername", "myPassword", "0000", 301],
-                "priority": 1
-            }
-    },
-
-    {
-        "channel": "default",
-        "content": {
-                "command": "login",
-                "username": "myUsername",
-                "password": "myPassword",
-                "bankpin": "0000",
-                "world": "301"
-            }
-    }
-
-```

apps/fudster/Dockerfile

@@ -39,7 +39,7 @@ WORKDIR /root/microbot
 RUN mkdir -p /root/microbot/runelite-client/src/main/java/net/runelite/client/plugins/microbot/kbve
 COPY ./plugin /root/microbot/runelite-client/src/main/java/net/runelite/client/plugins/microbot/kbve
 
-ENV MAVEN_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
+ENV MAVEN_OPTS="-Xmx2048m -XX:+TieredCompilation -XX:TieredStopAtLevel=1"
 #   RUN mvn clean package -T 1C -DskipTests -Dmaven.test.skip=true -Dparallel=all
 RUN mvn clean package -T 1C -DskipTests -Dmaven.test.skip=true -Dparallel=all
 

apps/fudster/README.md

@@ -6,6 +6,7 @@ A python library that helps with mL application development through using REST/W
 ## Dev
 
 These are notes for the development of the Fudster package.
+The docker image is released under `kbve/fudster`.
 
 ### Packages
 
@@ -35,4 +36,99 @@ or to run them isolated:
 pnpm nx container fudster
 docker run -p 3000:3000 -p 3001:3001 -p 8086:8086 kbve/fudster:1.03
 
+```
+
+## JSON Commands
+
+This is just for test casing the different commands that would be sent.
+For world 
+
+### Functional Commands
+
+World Switching
+
+```json
+
+    {
+            "channel": "default",
+            "content": {
+                "command": "execute",
+                "packageName": "net.runelite.client.plugins.microbot.kbve",
+                "className": "KBVEScripts",
+                "method": "AcceptEULA",
+                "args": [300, 301],
+                "priority": 1
+            }
+    }
+
+```
+
+Login 
+
+```json
+
+    {
+        "channel": "default",
+        "content": {
+                "command": "login",
+                "username": "myUsername",
+                "password": "myPassword",
+                "bankpin": "0000",
+                "world": "301"
+            }
+    }
+
+```
+
+#### General Debug Commands
+
+```json
+
+    {
+            "channel": "default",
+            "content": {
+                "command": "execute",
+                "packageName": "net.runelite.client.plugins.microbot.kbve",
+                "className": "KBVEScripts",
+                "method": "AcceptEULA",
+                "args": [300, 301],
+                "priority": 1
+            }
+    },
+
+    {
+            "channel": "default",
+            "content": {
+                "command": "execute",
+                "packageName": "net.runelite.client.plugins.microbot.util.security",
+                "className": "Login",
+                "method": "setWorld",
+                "args": [308],
+                "priority": 1
+            }
+    },
+
+    {
+        "channel": "default",
+        "content": {
+                "command": "execute",
+                "packageName": "net.runelite.client.plugins.microbot.kbve",
+                "className": "KBVEScripts",
+                "method": "SafeLogin",
+                "args": ["myUsername", "myPassword", "0000", 301],
+                "priority": 1
+            }
+    },
+
+    {
+        "channel": "default",
+        "content": {
+                "command": "login",
+                "username": "myUsername",
+                "password": "myPassword",
+                "bankpin": "0000",
+                "world": "301"
+            }
+    }
+
 ```

apps/fudster/main.py

@@ -23,11 +23,11 @@ async def lifespan(app: FastAPI):
 
 CORS(app)
 
-@app.websocket("/")
+@app.websocket("/ws")
 async def websocket_handshake(websocket: WebSocket):
     await ws_handler.handle_websocket(websocket)
 
-routes.render("/", "home.html")
-routes.get("/start-runelite", RuneLiteClient, "start_runelite_async")
-routes.get("/stop-runelite", RuneLiteClient, "stop_runelite_async")
-routes.get("/status", RuneLiteClient, "status_runelite")
+routes.render("/ws/", "home.html")
+routes.get("/ws/start-runelite", RuneLiteClient, "start_runelite_async")
+routes.get("/ws/stop-runelite", RuneLiteClient, "stop_runelite_async")
+routes.get("/ws/status", RuneLiteClient, "status_runelite")