Skip to content

A self-hosted media server and file management system

Include ws config in runtime and use the same directory for logs across instances

aminnausin2d203117e1bb
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index f6a19c00..55a4c521 100755
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -421,7 +421,11 @@ class DirectoryController extends Controller {
'duration' => $duration < 0 ? $duration * -1 : $duration,
]);
- broadcast(new TaskEnded($task));
+ try {
+ broadcast(new TaskEnded($task));
+ } catch (\Throwable $th) {
+ Log::error($th->getMessage());
+ }
})->before(function (Batch $batch) use ($task) {
$this->taskService->updateTask($task->id, [
'status' => TaskStatus::PROCESSING,
diff --git a/docker-compose.yaml b/docker-compose.yaml
index a79e5e59..1e9e513d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -4,6 +4,7 @@ services:
container_name: MediaServer
volumes:
- ./data:/var/www/html/storage/app/public
+ - ./logs:/var/www/html/storage/logs
- ./docker/etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
ports:
- '8086:8086'
@@ -28,6 +29,7 @@ services:
command: ['php', '/var/www/html/artisan', 'queue:work', '--tries=3']
volumes:
- ./data:/var/www/html/storage/app/public
+ - ./logs:/var/www/html/storage/logs
depends_on:
postgres:
condition: service_healthy
@@ -44,6 +46,7 @@ services:
command: ['php', '/var/www/html/artisan', 'queue:work', '--queue=high', '--tries=3']
volumes:
- ./data:/var/www/html/storage/app/public
+ - ./logs:/var/www/html/storage/logs
depends_on:
postgres:
condition: service_healthy
@@ -59,6 +62,7 @@ services:
command: ['php', '/var/www/html/artisan', 'schedule:work']
volumes:
- ./data:/var/www/html/storage/app/public
+ - ./logs:/var/www/html/storage/logs
depends_on:
postgres:
condition: service_healthy
@@ -74,6 +78,7 @@ services:
command: php artisan reverb:start
volumes:
- ./data:/var/www/html/storage/app/public
+ - ./logs:/var/www/html/storage/logs
ports:
- 6001:6001
expose:
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
deleted file mode 100644
index abe01e57..00000000
--- a/docker/entrypoint.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-
-# Exit immediately if a command exits with a non-zero status
-set -e
-
-# if [ -z "$APP_KEY" ] || [ "$APP_KEY" = "base64:" ]; then
-# echo "No APP_KEY detected, generating one..."
-# php artisan key:generate
-# else
-# echo "APP_KEY already set, skipping key generation."
-# fi
-
-php artisan reverb:generate
-
-# echo "Waiting for PostgreSQL to be ready..."
-
-# # Loop until PostgreSQL is ready
-# until PGPASSWORD=$DB_PASSWORD psql -h "$DB_HOST" -U "$DB_USERNAME" -d "$DB_DATABASE" -c "SELECT 1" > /dev/null 2>&1; do
-# echo "PostgreSQL is unavailable - sleeping..."
-# sleep 2
-# done
-
-# php artisan migrate
-
-# Start Supervisor in the background
-# echo "Starting Supervisor..."
-
-exec "$@"
diff --git a/resources/js/echo.ts b/resources/js/echo.ts
index 3e48cd58..0fa19178 100644
--- a/resources/js/echo.ts
+++ b/resources/js/echo.ts
@@ -2,6 +2,8 @@ import Pusher from 'pusher-js';
window.Pusher = Pusher;
+const reverbConfig = JSON.parse(document.getElementById('reverb-config')?.dataset?.reverbConfig ?? '');
+
export let echoInstance = null;
export const EchoConfig: {
@@ -14,11 +16,11 @@ export const EchoConfig: {
enabledTransports: string[];
} = {
broadcaster: 'reverb',
- key: import.meta.env.VITE_REVERB_APP_KEY,
- wsHost: import.meta.env.VITE_REVERB_HOST,
- wsPort: import.meta.env.VITE_REVERB_PORT ?? 80,
- wssPort: import.meta.env.VITE_REVERB_PORT ?? 443,
- forceTLS: (import.meta.env.VITE_REVERB_SCHEME ?? 'https') === 'https',
+ key: reverbConfig.key ?? import.meta.env.VITE_REVERB_APP_KEY,
+ wsHost: reverbConfig.host ?? import.meta.env.VITE_REVERB_HOST,
+ wsPort: reverbConfig.port ?? import.meta.env.VITE_REVERB_PORT ?? 80,
+ wssPort: reverbConfig.port ?? import.meta.env.VITE_REVERB_PORT ?? 443,
+ forceTLS: (reverbConfig.scheme ?? import.meta.env.VITE_REVERB_SCHEME ?? 'https') === 'https',
enabledTransports: ['ws', 'wss'],
};
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index ab0952f4..68e44b95 100755
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -18,6 +18,9 @@
</head>
<body class="bg-primary-950 dark:bg-primary-dark-950 dark:text-[#e2e0e2] font-sans text-gray-900 antialiased dark:[color-scheme:dark]" id="root"> <!-- dark:bg-[#121216] dark:text-[#e2e0e2] text-gray-900 -->
+ <div id="reverb-config" data-reverb-config='
+ @json(["key" => env("REVERB_APP_KEY"), "host" => env("REVERB_HOST"), "port" => env("REVERB_PORT")])'></div>
+
@vite('resources/js/app.ts')
<div id='app'></div>
{{ $slot }}
diff --git a/startDocker.bat b/startDocker.bat
index cb974849..d8372793 100644
--- a/startDocker.bat
+++ b/startDocker.bat
@@ -1,4 +1,6 @@
@echo off
+docker compose down
+
echo Checking required files and folders...
:: Ensure .docker-compose.yaml exists -> Holds app setup
@@ -56,5 +58,14 @@ if not exist "data" (
echo Found ./data directory
)
+:: Ensure the ./logs directory exists
+if not exist "logs" (
+ echo Missing ./logs directory! Creating it...
+ mkdir -p ./logs
+ echo ./logs directory created.
+) else (
+ echo Found ./logs directory
+)
+
echo Setup complete
-docker-compose up -d
+docker compose up -d
diff --git a/startDocker.sh b/startDocker.sh
index e737328d..f5e202c9 100644
--- a/startDocker.sh
+++ b/startDocker.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+docker compose down
# Ensure the script is executed in the project root
cd "$(dirname "$0")"
@@ -52,13 +53,25 @@ if [ ! -f ".env" ]; then
fi
# Ensure the ./data directory exists
-if [ ! -d "./data" ]; then
+if [ ! -d "./data/media" ]; then
echo "Missing ./data directory! Creating it..."
mkdir -p ./data
+ mkdir -p ./data/media
+ mkdir -p ./data/avatars
+ mkdir -p ./data/thumbnails
echo "./data directory created."
else
echo "Found ./data directory"
fi
+# Ensure the ./logs directory exists
+if [ ! -d "./logs" ]; then
+ echo "Missing ./logs directory! Creating it..."
+ mkdir -p ./logs
+ echo "./logs directory created."
+else
+ echo "Found ./logs directory"
+fi
+
echo "Setup complete"
-docker-compose up -d
+docker compose up -d
diff --git a/vite.config.js.timestamp-1735501271331-455aa6932cfdb.mjs b/vite.config.js.timestamp-1735501271331-455aa6932cfdb.mjs
deleted file mode 100644
index 7b691d95..00000000
--- a/vite.config.js.timestamp-1735501271331-455aa6932cfdb.mjs
+++ /dev/null
@@ -1,35 +0,0 @@
-// vite.config.js
-import { defineConfig } from "file:///O:/Documents/Projects/mediaServer/node_modules/vite/dist/node/index.js";
-import laravel from "file:///O:/Documents/Projects/mediaServer/node_modules/laravel-vite-plugin/dist/index.js";
-import Icons from "file:///O:/Documents/Projects/mediaServer/node_modules/unplugin-icons/dist/vite.js";
-import vue from "file:///O:/Documents/Projects/mediaServer/node_modules/@vitejs/plugin-vue/dist/index.mjs";
-var vite_config_default = defineConfig({
- plugins: [
- laravel({
- input: ["resources/css/app.css", "resources/js/app.ts"],
- refresh: true
- }),
- vue({
- template: {
- transformAssetUrls: {
- base: null,
- includeAbsolute: false
- }
- }
- }),
- Icons({
- // experimental
- autoInstall: true
- })
- ],
- resolve: {
- alias: {
- vue: "vue/dist/vue.esm-bundler.js"
- // '@': fileURLToPath(new URL('./src', import.meta.url)),
- }
- }
-});
-export {
- vite_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcuanMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJPOlxcXFxEb2N1bWVudHNcXFxcUHJvamVjdHNcXFxcbWVkaWFTZXJ2ZXJcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIk86XFxcXERvY3VtZW50c1xcXFxQcm9qZWN0c1xcXFxtZWRpYVNlcnZlclxcXFx2aXRlLmNvbmZpZy5qc1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vTzovRG9jdW1lbnRzL1Byb2plY3RzL21lZGlhU2VydmVyL3ZpdGUuY29uZmlnLmpzXCI7Ly8gaW1wb3J0IHsgZmlsZVVSTFRvUGF0aCwgVVJMIH0gZnJvbSAnbm9kZTp1cmwnO1xuaW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSAndml0ZSc7XG5cbmltcG9ydCBsYXJhdmVsIGZyb20gJ2xhcmF2ZWwtdml0ZS1wbHVnaW4nO1xuaW1wb3J0IEljb25zIGZyb20gJ3VucGx1Z2luLWljb25zL3ZpdGUnO1xuaW1wb3J0IHZ1ZSBmcm9tICdAdml0ZWpzL3BsdWdpbi12dWUnO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmVDb25maWcoe1xuICAgIHBsdWdpbnM6IFtcbiAgICAgICAgbGFyYXZlbCh7XG4gICAgICAgICAgICBpbnB1dDogWydyZXNvdXJjZXMvY3NzL2FwcC5jc3MnLCAncmVzb3VyY2VzL2pzL2FwcC50cyddLFxuICAgICAgICAgICAgcmVmcmVzaDogdHJ1ZSxcbiAgICAgICAgfSksXG4gICAgICAgIHZ1ZSh7XG4gICAgICAgICAgICB0ZW1wbGF0ZToge1xuICAgICAgICAgICAgICAgIHRyYW5zZm9ybUFzc2V0VXJsczoge1xuICAgICAgICAgICAgICAgICAgICBiYXNlOiBudWxsLFxuICAgICAgICAgICAgICAgICAgICBpbmNsdWRlQWJzb2x1dGU6IGZhbHNlLFxuICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICB9LFxuICAgICAgICB9KSxcbiAgICAgICAgSWNvbnMoe1xuICAgICAgICAgICAgLy8gZXhwZXJpbWVudGFsXG4gICAgICAgICAgICBhdXRvSW5zdGFsbDogdHJ1ZSxcbiAgICAgICAgfSksXG4gICAgXSxcbiAgICByZXNvbHZlOiB7XG4gICAgICAgIGFsaWFzOiB7XG4gICAgICAgICAgICB2dWU6ICd2dWUvZGlzdC92dWUuZXNtLWJ1bmRsZXIuanMnLFxuICAgICAgICAgICAgLy8gJ0AnOiBmaWxlVVJMVG9QYXRoKG5ldyBVUkwoJy4vc3JjJywgaW1wb3J0Lm1ldGEudXJsKSksXG4gICAgICAgIH0sXG4gICAgfSxcbn0pO1xuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUNBLFNBQVMsb0JBQW9CO0FBRTdCLE9BQU8sYUFBYTtBQUNwQixPQUFPLFdBQVc7QUFDbEIsT0FBTyxTQUFTO0FBRWhCLElBQU8sc0JBQVEsYUFBYTtBQUFBLEVBQ3hCLFNBQVM7QUFBQSxJQUNMLFFBQVE7QUFBQSxNQUNKLE9BQU8sQ0FBQyx5QkFBeUIscUJBQXFCO0FBQUEsTUFDdEQsU0FBUztBQUFBLElBQ2IsQ0FBQztBQUFBLElBQ0QsSUFBSTtBQUFBLE1BQ0EsVUFBVTtBQUFBLFFBQ04sb0JBQW9CO0FBQUEsVUFDaEIsTUFBTTtBQUFBLFVBQ04saUJBQWlCO0FBQUEsUUFDckI7QUFBQSxNQUNKO0FBQUEsSUFDSixDQUFDO0FBQUEsSUFDRCxNQUFNO0FBQUE7QUFBQSxNQUVGLGFBQWE7QUFBQSxJQUNqQixDQUFDO0FBQUEsRUFDTDtBQUFBLEVBQ0EsU0FBUztBQUFBLElBQ0wsT0FBTztBQUFBLE1BQ0gsS0FBSztBQUFBO0FBQUEsSUFFVDtBQUFBLEVBQ0o7QUFDSixDQUFDOyIsCiAgIm5hbWVzIjogW10KfQo=