[pull] main from AzuraCast:main

Dockerfile

@@ -8,11 +8,11 @@ FROM golang:1.23-bookworm AS go-dependencies
 RUN apt-get update \
     && apt-get install -y --no-install-recommends openssl git
 
-RUN go install github.com/jwilder/dockerize@v0.9.1
+RUN go install github.com/jwilder/dockerize@v0.9.2
 
 RUN go install github.com/aptible/supercronic@v0.2.33
 
-RUN go install github.com/centrifugal/centrifugo/v5@v5.4.9
+RUN go install github.com/centrifugal/centrifugo/v6@v6.0.0
 
 RUN strip /go/bin/*
 

composer.json

@@ -93,7 +93,7 @@
     "vlucas/phpdotenv": "^5.3",
     "voku/portable-utf8": "^6.0",
     "wikimedia/composer-merge-plugin": "dev-master",
-    "zircote/swagger-php": "^4.9.2"
+    "zircote/swagger-php": "^5"
   },
   "replace": {
     "symfony/polyfill-iconv": "1.99",

frontend/components/Admin/Index.vue

@@ -203,24 +203,33 @@ const {state: stats, isLoading} = useAutoRefreshingAsyncState<AdminStats>(
     {
         cpu: {
             total: {
-                name: 'Total',
-                steal: 0,
-                io_wait: 0,
-                usage: 0
+                name: "Total",
+                usage: "",
+                idle: "",
+                io_wait: "",
+                steal: "",
             },
             cores: [],
             load: [0, 0, 0]
         },
         memory: {
             bytes: {
                 total: "0",
+                free: "0",
+                buffers: "0",
+                cached: "0",
+                sReclaimable: "0",
+                shmem: "0",
                 used: "0",
-                cached: "0"
             },
             readable: {
                 total: "",
+                free: "",
+                buffers: "",
+                cached: "",
+                sReclaimable: "",
+                shmem: "",
                 used: "",
-                cached: ""
             }
         },
         swap: {

frontend/components/Admin/Stations/Form/BackendForm.vue

@@ -308,10 +308,8 @@ import {FormTabEmits, FormTabProps, useVuelidateOnFormTab} from "~/functions/use
 import {decimal, numeric, required} from "@vuelidate/validators";
 import {useAzuraCast} from "~/vendor/azuracast";
 import Tab from "~/components/Common/Tab.vue";
-import {Station} from "~/entities/ApiInterfaces.ts";
 
 interface StationBackendFormProps extends FormTabProps {
-    station: Station,
     isStereoToolInstalled: boolean
 }
 

frontend/components/Admin/Stations/Form/HlsForm.vue

@@ -91,13 +91,8 @@ import {FormTabEmits, FormTabProps, useVuelidateOnFormTab} from "~/functions/use
 import {numeric} from "@vuelidate/validators";
 import {useAzuraCast} from "~/vendor/azuracast";
 import Tab from "~/components/Common/Tab.vue";
-import {Station} from "~/entities/ApiInterfaces.ts";
 
-interface StationHlsFormProps extends FormTabProps {
-    station: Station,
-}
-
-const props = defineProps<StationHlsFormProps>();
+const props = defineProps<FormTabProps>();
 const emit = defineEmits<FormTabEmits>();
 
 const {enableAdvancedFeatures} = useAzuraCast();

frontend/components/Admin/Stations/Form/RequestsForm.vue

@@ -62,13 +62,8 @@ import {computed} from "vue";
 import {FormTabEmits, FormTabProps, useVuelidateOnFormTab} from "~/functions/useVuelidateOnFormTab";
 import {numeric} from "@vuelidate/validators";
 import Tab from "~/components/Common/Tab.vue";
-import {Station} from "~/entities/ApiInterfaces.ts";
 
-interface StationRequestsFormProps extends FormTabProps {
-    station: Station,
-}
-
-const props = defineProps<StationRequestsFormProps>();
+const props = defineProps<FormTabProps>();
 const emit = defineEmits<FormTabEmits>();
 
 const {form, v$, tabClass} = useVuelidateOnFormTab(

frontend/components/Admin/Stations/Form/StreamersForm.vue

@@ -137,13 +137,8 @@ import {numeric} from "@vuelidate/validators";
 import {useAzuraCast} from "~/vendor/azuracast";
 import Tab from "~/components/Common/Tab.vue";
 import BitrateOptions from "~/components/Common/BitrateOptions.vue";
-import {Station} from "~/entities/ApiInterfaces.ts";
 
-interface StationStreamersFormProps extends FormTabProps {
-    station: Station,
-}
-
-const props = defineProps<StationStreamersFormProps>();
+const props = defineProps<FormTabProps>();
 const emit = defineEmits<FormTabEmits>();
 
 const {enableAdvancedFeatures} = useAzuraCast();

frontend/components/Admin/Stations/StationForm.vue

@@ -26,23 +26,19 @@
 
                 <admin-stations-backend-form
                     v-model:form="form"
-                    :station="station"
                     :is-stereo-tool-installed="isStereoToolInstalled"
                 />
 
                 <admin-stations-hls-form
                     v-model:form="form"
-                    :station="station"
                 />
 
                 <admin-stations-requests-form
                     v-model:form="form"
-                    :station="station"
                 />
 
                 <admin-stations-streamers-form
                     v-model:form="form"
-                    :station="station"
                 />
 
                 <admin-stations-admin-form
@@ -94,7 +90,6 @@ import {useNotify} from "~/functions/useNotify";
 import {useAxios} from "~/vendor/axios";
 import mergeExisting from "~/functions/mergeExisting";
 import {useVuelidateOnForm} from "~/functions/useVuelidateOnForm";
-import {useResettableRef} from "~/functions/useResettableRef";
 import Loading from '~/components/Common/Loading.vue';
 import Tabs from "~/components/Common/Tabs.vue";
 import {GlobalPermission, userAllowed} from "~/acl";
@@ -120,7 +115,12 @@ const props = withDefaults(
     }
 );
 
-const emit = defineEmits(['error', 'submitted', 'loadingUpdate', 'validUpdate']);
+const emit = defineEmits<{
+    (e: 'error', error: string): void,
+    (e: 'submitted'): void,
+    (e: 'loadingUpdate', loading: boolean): void,
+    (e: 'validUpdate', valid: boolean): void
+}>();
 
 const showAdminTab = userAllowed(GlobalPermission.Stations);
 
@@ -142,35 +142,21 @@ watch(isLoading, (newValue) => {
 
 const error = ref(null);
 
-const blankStation = {
-    stereo_tool_configuration_file_path: null,
-    links: {
-        stereo_tool_configuration: null
-    }
-};
-
-const {record: station, reset: resetStation} = useResettableRef(blankStation);
-
 const clear = () => {
     resetForm();
-    resetStation();
 
     isLoading.value = false;
     error.value = null;
 };
 
-const populateForm = (data) => {
-    form.value = mergeExisting(form.value, data);
-};
-
 const {notifySuccess} = useNotify();
 const {axios} = useAxios();
 
 const doLoad = () => {
     isLoading.value = true;
 
-    axios.get(props.editUrl).then((resp) => {
-        populateForm(resp.data);
+    axios.get(props.editUrl).then(({data}) => {
+        form.value = mergeExisting(form.value, data);
     }).catch((err) => {
         emit('error', err);
     }).finally(() => {

frontend/components/Admin/Updates.vue

@@ -162,14 +162,22 @@ import {getApiUrl} from "~/router";
 import {IconInfo, IconSync, IconUpdate, IconUpload} from "~/components/Common/icons";
 import {useDialog} from "~/functions/useDialog.ts";
 
+interface UpdateInfo {
+    needs_release_update?: boolean,
+    needs_rolling_update?: boolean,
+}
+
 const props = withDefaults(
     defineProps<{
         releaseChannel: string,
-        initialUpdateInfo?: object,
+        initialUpdateInfo?: UpdateInfo,
         enableWebUpdates: boolean,
     }>(),
     {
-        initialUpdateInfo: () => ({})
+        initialUpdateInfo: () => ({
+            needs_release_update: false,
+            needs_rolling_update: false,
+        })
     }
 );
 

frontend/components/Common/BitrateOptions.vue

@@ -70,14 +70,17 @@
     </form-group>
 </template>
 
-<script setup lang="ts" generic="T = string | number">
+<script setup lang="ts">
 import {FormFieldEmits, FormFieldProps, useFormField} from "~/components/Form/useFormField";
 import {computed, useSlots, WritableComputedRef} from "vue";
 import {includes, map} from "lodash";
 import useSlotsExcept from "~/functions/useSlotsExcept.ts";
 import FormMultiCheck from "~/components/Form/FormMultiCheck.vue";
 import FormLabel, {FormLabelParentProps} from "~/components/Form/FormLabel.vue";
 import FormGroup from "~/components/Form/FormGroup.vue";
+import {SimpleFormOptionInput} from "~/functions/objectToFormOptions.ts";
+
+type T = number | null
 
 interface BitrateOptionsProps extends FormFieldProps<T>, FormLabelParentProps {
     id: string,
@@ -99,20 +102,20 @@ const radioBitrates = [
     32, 48, 64, 96, 128, 192, 256, 320
 ].filter((bitrate) => props.maxBitrate === 0 || bitrate <= props.maxBitrate);
 
-const customField: WritableComputedRef<number | null> = computed({
+const customField: WritableComputedRef<T> = computed({
     get() {
-        return includes(radioBitrates, model.value)
-            ? ''
+        return includes(radioBitrates, Number(model.value))
+            ? null
             : model.value;
     },
     set(newValue) {
         model.value = newValue;
     }
 });
 
-const radioField: WritableComputedRef<number | string | null> = computed({
+const radioField: WritableComputedRef<"custom" | T> = computed({
     get() {
-        return includes(radioBitrates, model.value)
+        return includes(radioBitrates, Number(model.value))
             ? model.value
             : 'custom';
     },
@@ -123,7 +126,7 @@ const radioField: WritableComputedRef<number | string | null> = computed({
     }
 });
 
-const bitrateOptions = map(
+const bitrateOptions: SimpleFormOptionInput = map(
     radioBitrates,
     (val: number) => {
         return {

frontend/components/Common/DateRangeDropdown.vue

@@ -71,7 +71,11 @@ const dateRange = computed({
 const {$gettext} = useTranslate();
 
 const ranges = computed(() => {
-    const nowTz = DateTime.now().setZone(props.options?.timezone ?? "UTC");
+    const tz: string = (props.options && "timezone" in props.options)
+        ? (typeof props.options.timezone === "string" ? props.options.timezone : props.options.timezone.timezone)
+        : 'UTC';
+
+    const nowTz = DateTime.now().setZone(tz);
     const nowAtMidnightDate = nowTz.endOf('day').toJSDate();
 
     return [

frontend/components/Common/Toast.vue

@@ -46,12 +46,10 @@
 </template>
 
 <script setup lang="ts">
+import {ToastProps} from "~/functions/useNotify.ts";
+
 const props = withDefaults(
-    defineProps<{
-        message: string,
-        title?: string,
-        variant?: string,
-    }>(),
+    defineProps<ToastProps>(),
     {
         variant: 'info',
     }

frontend/components/Form/FormGroupCheckbox.vue

@@ -51,14 +51,16 @@
     </form-group>
 </template>
 
-<script setup lang="ts" generic="T = boolean | null">
+<script setup lang="ts">
 import VuelidateError from "./VuelidateError.vue";
 import FormLabel, {FormLabelParentProps} from "~/components/Form/FormLabel.vue";
 import FormGroup from "~/components/Form/FormGroup.vue";
 import {FormFieldEmits, FormFieldProps, useFormField} from "~/components/Form/useFormField";
 import {useSlots} from "vue";
 import FormCheckbox from "~/components/Form/FormCheckbox.vue";
 
+type T = boolean | null
+
 interface FormGroupCheckboxProps extends FormFieldProps<T>, FormLabelParentProps {
     id: string,
     name?: string,
@@ -73,8 +75,7 @@ const props = withDefaults(
         name: null,
         label: null,
         description: null,
-        inputAttrs: () => {
-        }
+        inputAttrs: () => ({})
     }
 );
 

frontend/components/Form/FormGroupField.vue

@@ -78,18 +78,14 @@
     </form-group>
 </template>
 
-<script setup lang="ts" generic="T extends any = ModelFormField">
+<script setup lang="ts">
 import VuelidateError from "./VuelidateError.vue";
-import {computed, ComputedRef, nextTick, onMounted, reactive, Reactive, ref} from "vue";
+import {computed, nextTick, onMounted, reactive, Reactive, ref, WritableComputedRef} from "vue";
 import FormGroup from "~/components/Form/FormGroup.vue";
 import FormLabel, {FormLabelParentProps} from "~/components/Form/FormLabel.vue";
-import {
-    FormFieldEmits,
-    FormFieldProps,
-    ModelFormField,
-    useFormField,
-    VuelidateField
-} from "~/components/Form/useFormField";
+import {FormFieldEmits, FormFieldProps, useFormField, VuelidateField} from "~/components/Form/useFormField";
+
+type T = string | number | null;
 
 interface FormGroupFieldProps extends FormFieldProps<T>, FormLabelParentProps {
     id: string,
@@ -106,7 +102,7 @@ interface FormGroupFieldProps extends FormFieldProps<T>, FormLabelParentProps {
 }
 
 interface FilteredModelObject {
-    $model: T
+    $model: WritableComputedRef<T>
 }
 
 const props = withDefaults(
@@ -127,8 +123,10 @@ const slots = defineSlots<{
     default?: (props: {
         id: string,
         field?: VuelidateField<T>,
-        model: FilteredModelObject,
-        fieldClass: ComputedRef<string | null>
+        model: {
+            $model: T
+        },
+        fieldClass: string | null
     }) => any,
     description?: () => any,
 }>();
@@ -150,7 +148,7 @@ const model = computed({
             parentModel.value = null;
         } else {
             if (props.inputTrim && null !== newValue) {
-                newValue = newValue.replace(/^\s+|\s+$/gm, '');
+                newValue = String(newValue).replace(/^\s+|\s+$/gm, '');
             }
 
             if (isNumeric.value) {