patch: feat enhancement + bug fixes

.github/actions/setup/action.yml

@@ -13,10 +13,6 @@ runs:
               node-version: 18
               registry-url: https://registry.npmjs.org/
 
-        - name: Install dependencies
-          shell: bash
-          run: pnpm i
-
         - name: Restore Turborepo Cache
           uses: actions/cache@v3
           with:

.github/workflows/build-client.yaml

@@ -3,11 +3,11 @@ name: Build and Release Desktop Client
 on:
   workflow_dispatch:
     inputs:
-      serverip:
-        default: '0.0.0.0:4000'
+      server_url:
+        default: 'http://127.0.0.1:4000'
         required: false
         type: string
-        description: 'Server IP (with port) for RCS CTF API Server'
+        description: 'Server URL (with port) for RCS CTF API Server'
       release_version:
         default: '0.0.0-dev'
         required: false
@@ -53,11 +53,14 @@ jobs:
 
       - name: Setup Environment
         uses: ./.github/actions/setup
-
+      
       - name: Copy before build
         run: |
-          cd packages/deployer-url
-          node entrypoint.js ${{ github.event.inputs.serverip }}
+          bash bootstrap.sh ${{ github.event.inputs.server_url }}
+
+      - name: Install dependencies
+        shell: bash
+        run: pnpm i
 
       - name: Build
         run: pnpm build:client

.github/workflows/build.yaml

@@ -24,5 +24,13 @@ jobs:
       - name: Setup Environment
         uses: ./.github/actions/setup
 
+      - name: Run before install
+        run: |
+          bash bootstrap.sh http://127.0.0.1:4000
+
+      - name: Install dependencies
+        shell: bash
+        run: pnpm i
+
       - name: Install Dependencies
         run: pnpm build

apps/web/package.json

@@ -5,8 +5,9 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
+    "dev:client": "cross-env VITE_CL_MODE=client vite",
     "build": "vite build",
-    "build:client": "cross-env MODE=client vite build",
+    "build:client": "cross-env VITE_CL_MODE=client vite build",
     "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview"
   },

apps/web/src/libs/api.client.js

@@ -1,10 +1,10 @@
-import ip from "deployer-url"
+import customhost from "deployer-url"
 import axios from 'axios';
 
-let url;
+export let url;
 
-if (import.meta.env.MODE == "client") {
-    url = ip;
+if (import.meta.env.VITE_CL_MODE == "client") {
+    url = customhost;
 } else {
     url = import.meta.env.VITE_API_URL;
 }

apps/web/src/pages/about.jsx

@@ -1,6 +1,7 @@
 import '../App.css'
 import 'react-toastify/dist/ReactToastify.css';
 import Navbar from '../components/navbar';
+import { url } from '../libs/api.client';
 
 function Home() {
     return (
@@ -16,6 +17,11 @@ function Home() {
                 <div className="action-card">
                     <a href="https://www.youtube.com/watch?v=9Pzj7Aj25lw">How to use the scoreboard</a>
                 </div>
+
+                <h2>API URL</h2>
+                <div className="action-card">
+                    {url}
+                </div>
             </div>
         </>
     )

bootstrap.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd packages/deployer-url || exit
+node entrypoint.js "$@"

packages/deployer-url/.gitignore

@@ -0,0 +1 @@
+host.js

packages/deployer-url/entrypoint.js

@@ -1,8 +1,14 @@
-import fs from 'node:fs';
+/* eslint-disable unicorn/prefer-node-protocol */
+import fs from "fs";
 
 const processargs = process.argv.slice(2);
-const ip = processargs[0];
+const host = processargs[0];
 
-fs.writeFileSync('./config.json', JSON.stringify({ ip }));
+let data = `
+let hostname = "${host}";
+export default hostname;
+`;
 
-console.log("Deployer URL set to " + ip + ".");
+fs.writeFileSync('./host.js', data);
+
+console.log("Deployer URL set to " + host + ".");

packages/deployer-url/package.json

@@ -1,7 +1,7 @@
 {
   "name": "deployer-url",
   "version": "1.0.0",
-  "main": "index.js",
+  "main": "host.js",
   "license": "MIT",
   "type": "module"
 }

scripts/build-client.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 cd apps/web || exit
-pnpm run build
+pnpm run build:client
 cd ../..
 mkdir -p apps/desktop/dist
 cp -r apps/web/dist/* apps/desktop/dist

tsconfig.json

@@ -1,3 +1,9 @@
 {
-    "extends": "@bravo68web/tsconfig/base.json"
+    "extends": "@bravo68web/tsconfig/base.json",
+    "exclude": [
+        "apps/web",
+        "apps/desktop/dist",
+        "packages/api/dist",
+        "packages/deployer-url",
+    ]
 }