mirror of
https://codeberg.org/PLG-Development/PLG-MuDiCS
synced 2026-07-07 01:07:10 +00:00
@@ -26,7 +26,7 @@
|
||||
close_pinned_display
|
||||
}: {
|
||||
display_id_group: DisplayIdGroup;
|
||||
get_display_menu_options: (display_id: string) => MenuOption[];
|
||||
get_display_menu_options: (display_id: string, display_version: string|undefined) => MenuOption[];
|
||||
close_pinned_display: () => void;
|
||||
} = $props();
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
close_pinned_display
|
||||
}: {
|
||||
display_id_object: DisplayIdObject;
|
||||
get_display_menu_options: (display_id: string) => MenuOption[];
|
||||
get_display_menu_options: (display_id: string, display_version: string|undefined) => MenuOption[];
|
||||
close_pinned_display: () => void;
|
||||
} = $props();
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
click_function={(e) => {
|
||||
e.stopPropagation();
|
||||
}}
|
||||
menu_options={get_display_menu_options(display_id_object.id)}
|
||||
menu_options={get_display_menu_options(display_id_object.id, $display?.version)}
|
||||
>
|
||||
<Menu />
|
||||
</Button>
|
||||
|
||||
@@ -186,15 +186,21 @@ export async function get_thumbnail_blob(ip: string, path_to_file: string): Prom
|
||||
return raw_response.blob;
|
||||
}
|
||||
|
||||
export async function ping_ip(ip: string): Promise<DisplayStatus> {
|
||||
export async function ping_ip(ip: string): Promise<{ status: DisplayStatus; version?: string }> {
|
||||
const raw_response = await request_control(`/ping?ip=${ip}`, { method: 'GET' });
|
||||
if (!raw_response.ok || !raw_response.json) return null;
|
||||
if (!raw_response.ok || !raw_response.json) return { status: null };
|
||||
|
||||
const status = raw_response.json.status;
|
||||
if (typeof status === 'string') {
|
||||
return to_display_status(status);
|
||||
const raw_status = raw_response.json.status;
|
||||
if (typeof raw_status === 'string') {
|
||||
const status = to_display_status(raw_status);
|
||||
const version = raw_response.json.version;
|
||||
if (typeof version === 'string') {
|
||||
return { status, version };
|
||||
} else {
|
||||
return { status };
|
||||
}
|
||||
}
|
||||
return null;
|
||||
return { status: null };
|
||||
}
|
||||
|
||||
async function request_display(
|
||||
|
||||
@@ -40,22 +40,26 @@ async function update_all_display_status(only_loading_displays: boolean) {
|
||||
}
|
||||
|
||||
export async function update_display_status(display: Display): Promise<DisplayStatus> {
|
||||
const new_status = await ping_ip(display.ip);
|
||||
if (new_status === null && display.status !== null) return null;
|
||||
if (new_status !== display.status) {
|
||||
const resp = await ping_ip(display.ip);
|
||||
if (resp.version && display.version !== resp.version) {
|
||||
display.version = resp.version;
|
||||
await db.displays.put(display); // save
|
||||
}
|
||||
if (resp.status === null && display.status !== null) return null;
|
||||
if (resp.status !== display.status) {
|
||||
// status change
|
||||
if (new_status === 'app_offline') {
|
||||
if (resp.status === 'app_offline') {
|
||||
loading_display_ids.push(display.id);
|
||||
} else {
|
||||
remove_display_from_loading_displays(display.id);
|
||||
if (new_status === 'app_online') {
|
||||
if (resp.status === 'app_online') {
|
||||
on_display_start(display);
|
||||
}
|
||||
}
|
||||
display.status = new_status;
|
||||
display.status = resp.status;
|
||||
await db.displays.put(display); // save
|
||||
}
|
||||
return new_status;
|
||||
return resp.status;
|
||||
}
|
||||
|
||||
export function remove_display_from_loading_displays(display_id: string) {
|
||||
|
||||
@@ -96,6 +96,7 @@ export type Display = {
|
||||
group_id: string;
|
||||
name: string;
|
||||
status: DisplayStatus;
|
||||
version?: string;
|
||||
};
|
||||
|
||||
export type DisplayGroup = {
|
||||
|
||||
Reference in New Issue
Block a user