added ftp controlservice health check and fixed gallery js error
This commit is contained in:
@@ -147,6 +147,12 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- dokploy-network
|
- dokploy-network
|
||||||
- photobooth-network
|
- photobooth-network
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "wget", "-qO-", "http://127.0.0.1:8080/health"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
start_period: 10s
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "nc", "-z", "localhost", "21"]
|
test: ["CMD", "nc", "-z", "localhost", "21"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ The control service is a lightweight sidecar responsible for provisioning vsftpd
|
|||||||
- **Scheme:** Bearer token.
|
- **Scheme:** Bearer token.
|
||||||
- **Header:** `Authorization: Bearer ${PHOTOBOOTH_CONTROL_TOKEN}`.
|
- **Header:** `Authorization: Bearer ${PHOTOBOOTH_CONTROL_TOKEN}`.
|
||||||
- **Timeout:** Configurable via `PHOTOBOOTH_CONTROL_TIMEOUT` (default 5 s).
|
- **Timeout:** Configurable via `PHOTOBOOTH_CONTROL_TIMEOUT` (default 5 s).
|
||||||
|
- **Token generation:** `openssl rand -hex 32` (or `php -r "echo bin2hex(random_bytes(32)), "`); store in `.env`/Dokploy secrets as `PHOTOBOOTH_CONTROL_TOKEN`.
|
||||||
|
|
||||||
## Endpoints
|
## Endpoints
|
||||||
|
|
||||||
@@ -43,6 +44,8 @@ Implementation tips:
|
|||||||
- Apply the rate limit token-bucket before writing to disk (or integrate with HAProxy).
|
- Apply the rate limit token-bucket before writing to disk (or integrate with HAProxy).
|
||||||
- Store `expires_at` and automatically disable the account when reached (in addition to Laravel’s scheduled cleanup).
|
- Store `expires_at` and automatically disable the account when reached (in addition to Laravel’s scheduled cleanup).
|
||||||
|
|
||||||
|
Reference implementation (current stack): `photobooth-ftp` builds from `docker/photobooth-control`, starts pure-ftpd and a Node-based control API on port 8080. Healthcheck: `GET /health` on 8080 (wired in docker-compose.dokploy.yml). Rate-limit/expiry enforcement inside the FTP tier is still to be implemented.
|
||||||
|
|
||||||
### `POST /users/{username}/rotate`
|
### `POST /users/{username}/rotate`
|
||||||
|
|
||||||
```json
|
```json
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { getDeviceId } from '../lib/device';
|
import { getDeviceId } from '../lib/device';
|
||||||
|
import { DEFAULT_LOCALE } from '../i18n/messages';
|
||||||
|
|
||||||
export interface EventBrandingPayload {
|
export interface EventBrandingPayload {
|
||||||
primary_color?: string | null;
|
primary_color?: string | null;
|
||||||
@@ -149,6 +150,31 @@ export class FetchEventError extends Error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function coerceLocalized(value: unknown, fallback: string): string {
|
||||||
|
if (typeof value === 'string' && value.trim() !== '') {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value && typeof value === 'object') {
|
||||||
|
const obj = value as Record<string, unknown>;
|
||||||
|
const preferredKeys = ['de', 'en'];
|
||||||
|
|
||||||
|
for (const key of preferredKeys) {
|
||||||
|
const candidate = obj[key];
|
||||||
|
if (typeof candidate === 'string' && candidate.trim() !== '') {
|
||||||
|
return candidate;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const firstString = Object.values(obj).find((candidate) => typeof candidate === 'string' && candidate.trim() !== '');
|
||||||
|
if (typeof firstString === 'string') {
|
||||||
|
return firstString;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
|
||||||
const API_ERROR_CODES: FetchEventErrorCode[] = [
|
const API_ERROR_CODES: FetchEventErrorCode[] = [
|
||||||
'invalid_token',
|
'invalid_token',
|
||||||
'token_expired',
|
'token_expired',
|
||||||
@@ -231,7 +257,24 @@ export async function fetchEvent(eventKey: string): Promise<EventData> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return await res.json();
|
const json = await res.json();
|
||||||
|
|
||||||
|
const normalized: EventData = {
|
||||||
|
...json,
|
||||||
|
name: coerceLocalized(json?.name, 'Fotospiel Event'),
|
||||||
|
default_locale: typeof json?.default_locale === 'string' && json.default_locale.trim() !== ''
|
||||||
|
? json.default_locale
|
||||||
|
: DEFAULT_LOCALE,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (json?.type) {
|
||||||
|
normalized.type = {
|
||||||
|
...json.type,
|
||||||
|
name: coerceLocalized(json.type?.name, 'Event'),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return normalized;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof FetchEventError) {
|
if (error instanceof FetchEventError) {
|
||||||
throw error;
|
throw error;
|
||||||
|
|||||||
Reference in New Issue
Block a user