HPNP updates.

.github/workflows/default.yml

@@ -87,8 +87,6 @@ jobs:
           path: vendor
           key: ${{ runner.OS }}-build-${{ hashFiles('composer.lock') }}
 
-      - uses: oven-sh/setup-bun@v1
-
       - name: Set console permissions and clear static assets.
         run: |
           rm -rf web/static/vite_dist
@@ -102,7 +100,7 @@ jobs:
       - name: Generate new translations from existing code.
         run: |
           cd frontend
-          bun install
+          npm ci --include=dev
           
           cd ..
           bin/console locale:generate

Dockerfile

@@ -100,7 +100,7 @@ RUN composer install --no-ansi --no-interaction
 
 WORKDIR /var/azuracast/www/frontend
 
-RUN bun install
+RUN npm ci --include=dev
 
 WORKDIR /var/azuracast/www
 
@@ -160,14 +160,15 @@ COPY --chown=azuracast:azuracast . .
 
 RUN composer dump-autoload --optimize --classmap-authoritative
 
-WORKDIR /var/azuracast/www/frontend
-
-RUN bun install --production
-
-WORKDIR /var/azuracast/www
-
 USER root
 
+COPY ./util/docker/common /bd_build/
+COPY ./util/docker/hpnp /bd_build/hpnp
+
+RUN bash /bd_build/hpnp/setup.sh \
+    && bash /bd_build/cleanup.sh \
+    && rm -rf /bd_build
+
 EXPOSE 80 443 2022
 EXPOSE 8000-8999
 

frontend/package.json

@@ -8,7 +8,7 @@
     "generate-locales": "vue-gettext-extract",
     "generate-api": "swagger-typescript-api --path http://localhost/api/openapi.yml --output ./src/entities --name ApiInterfaces.ts --no-client",
     "hpnp-dev": "bun --hot ./src/hpnp/index.ts",
-    "hpnp-prod": "bun ./src/hpnp/index.ts"
+    "build-hpnp": "bun build --compile --minify --outfile ./hpnp ./src/hpnp/index.ts"
   },
   "dependencies": {
     "@codemirror/lang-css": "^6.0.1",
@@ -34,6 +34,7 @@
     "chartjs-plugin-zoom": "^2.0.0",
     "codemirror": "^6",
     "codemirror-lang-liquidsoap": "^0.2.5",
+    "esbuild": "^0.19.8",
     "hls.js": "^1.1.5",
     "leaflet": "^1.7.1",
     "leaflet-fullscreen": "^1.0.2",
@@ -44,6 +45,7 @@
     "qrcode": "^1.5.3",
     "roboto-fontface": "^0.10.0",
     "sweetalert2": "11.4.8",
+    "typescript": "^5.3.2",
     "vue": "^3.2",
     "vue-axios": "^3.5",
     "vue-codemirror6": "^1",
@@ -72,7 +74,6 @@
     "sass": "^1.39.2",
     "svg.js": "^2.7.1",
     "swagger-typescript-api": "^13.0.3",
-    "typescript": "^5.1.6",
     "vite": "^5",
     "vite-plugin-eslint": "^1.8.1",
     "vue-eslint-parser": "^9.3.1",

frontend/tsconfig.json

@@ -37,5 +37,8 @@
     "src/**/*.d.ts",
     "src/**/*.tsx",
     "src/**/*.vue"
+  ],
+  "exclude": [
+    "node_modules"
   ]
 }

util/docker/dev/service.full/hpnp.conf

@@ -1,6 +1,6 @@
 [program:hpnp]
 directory=/var/azuracast/www/frontend
-command=bun run hpnp-dev
+command=npm run hpnp-dev
 user=azuracast
 priority=700
 numprocs=1

util/docker/hpnp/service.full/hpnp.conf

@@ -1,6 +1,6 @@
 [program:hpnp]
-directory=/var/azuracast/www/frontend
-command=bun run hpnp-prod
+directory=/var/azuracast/
+command=hpnp
 user=azuracast
 priority=700
 numprocs=1

util/docker/hpnp/setup.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+set -x
+
+curl -fsSL https://bun.sh/install | gosu azuracast bash
+ln -s /var/azuracast/.bun/bin/bun /usr/local/bin/bun
+ln -s /var/azuracast/.bun/bin/bunx /usr/local/bin/bunx
+
+cd /var/azuracast/www/frontend
+gosu azuracast npm ci
+gosu azuracast npm run build-hpnp
+
+mv ./hpnp /usr/local/bin/hpnp
+chmod a+x /usr/local/bin/hpnp
+
+rm -rf /var/azuracast/www/frontend/node_modules
+rm -rf /var/azuracast/.bun
+rm -rf /usr/local/bin/bun
+rm -rf /usr/local/bin/bunx
+
+cp -rT /bd_build/hpnp/service.full/. /etc/supervisor/full.conf.d/