- @for (badge of getPartitionBadges(disk.diskNumber, image.partitionNumber); track badge.id + '-' + badge.type + '-' + badge.label) {
+ @for (badge of getPartitionBadges(disk.diskNumber, image.partitionNumber); track badge.id + '-' + badge.type + '-' + badge.label + '-' + (badge.tooltip || '')) {
{{ badge.icon }} {{ badge.label }}
diff --git a/ogWebconsole/src/app/services/plugin.service.ts b/ogWebconsole/src/app/services/plugin.service.ts
index 68484f6..99bf27e 100644
--- a/ogWebconsole/src/app/services/plugin.service.ts
+++ b/ogWebconsole/src/app/services/plugin.service.ts
@@ -1,6 +1,6 @@
-import { Injectable, inject } from '@angular/core';
+import { Injectable, NgZone, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
-import { BehaviorSubject, Observable, forkJoin, of } from 'rxjs';
+import { BehaviorSubject, Observable, Subject, forkJoin, of } from 'rxjs';
import { catchError, map, switchMap, tap } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
import { ConfigService } from './config.service';
@@ -115,12 +115,16 @@ export class PluginService {
private configService = inject(ConfigService);
private translateService = inject(TranslateService);
private authService = inject(AuthService);
+ private ngZone = inject(NgZone);
private allPlugins: PluginManifest[] = [];
private activePlugins: PluginManifest[] = [];
private pluginsSubject = new BehaviorSubject
([]);
public plugins$ = this.pluginsSubject.asObservable();
+ private statusUpdatesSubject = new Subject<{ plugin: string; clientId?: string; status: string; metadata?: any }>();
+ public statusUpdates$ = this.statusUpdatesSubject.asObservable();
+
// Dynamic state cache: key is `${pluginName}:${clientIdOrUuid}` -> status string
private clientPluginStatusMap = new Map();
// Dynamic metadata cache: key is `${pluginName}:${clientIdOrUuid}` -> extra attributes (e.g. dni, remaining_minutes)
@@ -184,95 +188,104 @@ export class PluginService {
try {
this.mercureEventSource = new EventSource(`${mercureUrl}?topic=` + encodeURIComponent('plugins'));
this.mercureEventSource.onmessage = (event) => {
- try {
- const data = JSON.parse(event.data);
- if (data && data.plugin && data.status) {
- const disk = data.disk ?? data.disk_number ?? data.diskNumber;
- const part = data.partition ?? data.partition_number ?? data.partitionNumber;
+ this.ngZone.run(() => {
+ try {
+ const data = JSON.parse(event.data);
+ if (data && data.plugin && data.status) {
+ const disk = data.disk ?? data.disk_number ?? data.diskNumber;
+ const part = data.partition ?? data.partition_number ?? data.partitionNumber;
- const clearEntriesForPrefix = (prefix: string) => {
- for (const key of Array.from(this.clientPluginStatusMap.keys())) {
- if (key.startsWith(prefix)) {
- this.clientPluginStatusMap.delete(key);
+ const clearEntriesForPrefix = (prefix: string) => {
+ for (const key of Array.from(this.clientPluginStatusMap.keys())) {
+ if (key.startsWith(prefix)) {
+ this.clientPluginStatusMap.delete(key);
+ }
}
- }
- for (const key of Array.from(this.clientPluginMetadataMap.keys())) {
- if (key.startsWith(prefix)) {
- this.clientPluginMetadataMap.delete(key);
+ for (const key of Array.from(this.clientPluginMetadataMap.keys())) {
+ if (key.startsWith(prefix)) {
+ this.clientPluginMetadataMap.delete(key);
+ }
}
- }
- };
+ };
- if (data.status === 'NONE') {
- if (data.clientId !== undefined && data.clientId !== null) {
- const idStr = String(data.clientId);
- this.clientPluginMetadataMap.delete(this.getStatusKey(data.plugin, idStr));
- if (disk !== undefined && disk !== null && part !== undefined && part !== null) {
- this.clientPluginStatusMap.delete(this.getPartitionStatusKey(data.plugin, idStr, Number(disk), Number(part)));
- const curGlobal = this.clientPluginStatusMap.get(this.getStatusKey(data.plugin, idStr));
- if (curGlobal && ['REMOVING', 'CHECKING', 'FREEZING', 'UNFREEZING'].includes(curGlobal.toUpperCase())) {
+ if (data.status === 'NONE') {
+ if (data.clientId !== undefined && data.clientId !== null) {
+ const idStr = String(data.clientId);
+ this.clientPluginMetadataMap.delete(this.getStatusKey(data.plugin, idStr));
+ if (disk !== undefined && disk !== null && part !== undefined && part !== null) {
+ this.clientPluginStatusMap.delete(this.getPartitionStatusKey(data.plugin, idStr, Number(disk), Number(part)));
+ const curGlobal = this.clientPluginStatusMap.get(this.getStatusKey(data.plugin, idStr));
+ if (curGlobal && ['REMOVING', 'CHECKING', 'FREEZING', 'UNFREEZING'].includes(curGlobal.toUpperCase())) {
+ this.clientPluginStatusMap.delete(this.getStatusKey(data.plugin, idStr));
+ }
+ } else if (disk !== undefined && disk !== null) {
+ clearEntriesForPrefix(`${data.plugin}:${idStr}:${disk}:`);
+ } else {
this.clientPluginStatusMap.delete(this.getStatusKey(data.plugin, idStr));
+ clearEntriesForPrefix(`${data.plugin}:${idStr}:`);
}
- } else if (disk !== undefined && disk !== null) {
- clearEntriesForPrefix(`${data.plugin}:${idStr}:${disk}:`);
- } else {
- this.clientPluginStatusMap.delete(this.getStatusKey(data.plugin, idStr));
- clearEntriesForPrefix(`${data.plugin}:${idStr}:`);
}
- }
- if (data.clientUuid) {
- const uuidStr = data.clientUuid;
- this.clientPluginMetadataMap.delete(this.getStatusKey(data.plugin, uuidStr));
- if (disk !== undefined && disk !== null && part !== undefined && part !== null) {
- this.clientPluginStatusMap.delete(this.getPartitionStatusKey(data.plugin, uuidStr, Number(disk), Number(part)));
- const curGlobal = this.clientPluginStatusMap.get(this.getStatusKey(data.plugin, uuidStr));
- if (curGlobal && ['REMOVING', 'CHECKING', 'FREEZING', 'UNFREEZING'].includes(curGlobal.toUpperCase())) {
+ if (data.clientUuid) {
+ const uuidStr = data.clientUuid;
+ this.clientPluginMetadataMap.delete(this.getStatusKey(data.plugin, uuidStr));
+ if (disk !== undefined && disk !== null && part !== undefined && part !== null) {
+ this.clientPluginStatusMap.delete(this.getPartitionStatusKey(data.plugin, uuidStr, Number(disk), Number(part)));
+ const curGlobal = this.clientPluginStatusMap.get(this.getStatusKey(data.plugin, uuidStr));
+ if (curGlobal && ['REMOVING', 'CHECKING', 'FREEZING', 'UNFREEZING'].includes(curGlobal.toUpperCase())) {
+ this.clientPluginStatusMap.delete(this.getStatusKey(data.plugin, uuidStr));
+ }
+ } else if (disk !== undefined && disk !== null) {
+ clearEntriesForPrefix(`${data.plugin}:${uuidStr}:${disk}:`);
+ } else {
this.clientPluginStatusMap.delete(this.getStatusKey(data.plugin, uuidStr));
+ clearEntriesForPrefix(`${data.plugin}:${uuidStr}:`);
}
- } else if (disk !== undefined && disk !== null) {
- clearEntriesForPrefix(`${data.plugin}:${uuidStr}:${disk}:`);
- } else {
- this.clientPluginStatusMap.delete(this.getStatusKey(data.plugin, uuidStr));
- clearEntriesForPrefix(`${data.plugin}:${uuidStr}:`);
}
- }
- } else {
- // Extraer metadatos contextuales (p. ej. dni, remainingMinutes, remaining_minutes)
- const metadata: any = {};
- for (const [k, v] of Object.entries(data)) {
- if (!['plugin', 'status', 'clientId', 'clientUuid', 'disk', 'disk_number', 'diskNumber', 'partition', 'partition_number', 'partitionNumber', 'action', 'timestamp'].includes(k) && v !== null && v !== undefined) {
- metadata[k] = v;
+ this.statusUpdatesSubject.next({ plugin: data.plugin, status: 'NONE' });
+ } else {
+ // Extraer metadatos contextuales (p. ej. dni, remainingMinutes, remaining_minutes)
+ const metadata: any = {};
+ for (const [k, v] of Object.entries(data)) {
+ if (!['plugin', 'status', 'clientId', 'clientUuid', 'disk', 'disk_number', 'diskNumber', 'partition', 'partition_number', 'partitionNumber', 'action', 'timestamp'].includes(k) && v !== null && v !== undefined) {
+ metadata[k] = v;
+ }
}
- }
- const hasMeta = Object.keys(metadata).length > 0;
+ const hasMeta = Object.keys(metadata).length > 0;
- if (data.clientId !== undefined && data.clientId !== null) {
- const idStr = String(data.clientId);
- this.setPluginStatus(data.plugin, idStr, data.status);
- if (hasMeta && data.status !== 'FREE') {
- this.setPluginMetadata(data.plugin, idStr, metadata);
- } else if (data.status === 'FREE') {
- this.clearPluginMetadata(data.plugin, idStr);
+ if (data.clientId !== undefined && data.clientId !== null) {
+ const idStr = String(data.clientId);
+ this.setPluginStatus(data.plugin, idStr, data.status);
+ if (hasMeta && data.status !== 'FREE') {
+ this.setPluginMetadata(data.plugin, idStr, metadata);
+ } else if (data.status === 'FREE') {
+ this.clearPluginMetadata(data.plugin, idStr);
+ }
+ if (disk !== undefined && disk !== null && part !== undefined && part !== null) {
+ this.setPartitionPluginStatus(data.plugin, idStr, Number(disk), Number(part), data.status);
+ }
}
- if (disk !== undefined && disk !== null && part !== undefined && part !== null) {
- this.setPartitionPluginStatus(data.plugin, idStr, Number(disk), Number(part), data.status);
- }
- }
- if (data.clientUuid) {
- this.setPluginStatus(data.plugin, data.clientUuid, data.status);
- if (hasMeta && data.status !== 'FREE') {
- this.setPluginMetadata(data.plugin, data.clientUuid, metadata);
- } else if (data.status === 'FREE') {
- this.clearPluginMetadata(data.plugin, data.clientUuid);
- }
- if (disk !== undefined && disk !== null && part !== undefined && part !== null) {
- this.setPartitionPluginStatus(data.plugin, data.clientUuid, Number(disk), Number(part), data.status);
+ if (data.clientUuid) {
+ this.setPluginStatus(data.plugin, data.clientUuid, data.status);
+ if (hasMeta && data.status !== 'FREE') {
+ this.setPluginMetadata(data.plugin, data.clientUuid, metadata);
+ } else if (data.status === 'FREE') {
+ this.clearPluginMetadata(data.plugin, data.clientUuid);
+ }
+ if (disk !== undefined && disk !== null && part !== undefined && part !== null) {
+ this.setPartitionPluginStatus(data.plugin, data.clientUuid, Number(disk), Number(part), data.status);
+ }
}
+ this.statusUpdatesSubject.next({
+ plugin: data.plugin,
+ clientId: data.clientId ? String(data.clientId) : data.clientUuid,
+ status: data.status,
+ metadata
+ });
}
}
+ } catch {
}
- } catch {
- }
+ });
};
} catch {
}
@@ -422,7 +435,12 @@ export class PluginService {
);
});
- return forkJoin(requests).pipe(map(() => undefined));
+ return forkJoin(requests).pipe(
+ tap(() => {
+ this.statusUpdatesSubject.next({ plugin: 'all', status: 'REFRESHED' });
+ }),
+ map(() => undefined)
+ );
}
getPlugins(): PluginManifest[] {