gsadmin/sencho
1
0
Fork 0
mirror of https://github.com/Studio-Saelix/sencho.git synced 2026-08-13 04:06:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(notifications): prevent self-container stack routing (#1242)

Browse Source 
* fix(notifications): prevent self-container stack routing

* fix(stack-files): stabilize download metrics in CI
This commit is contained in:
Anso
2026-05-28 12:45:10 -04:00
committed by GitHub
parent e57dbb8da7
commit 265fece988
9 changed files with 704 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/DatabaseService.ts
+32
View File
@@ -2046,6 +2046,38 @@ export class DatabaseService {
};
}
public clearSelfContainerNotificationRouting(
nodeId: number,
self: { containerName?: string | null; composeProjectName?: string | null },
): number {
const containerName = self.containerName?.trim() || null;
const composeProjectName = self.composeProjectName?.trim() || null;
if (!containerName && !composeProjectName) return 0;
const predicates: string[] = [];
const args: (number | string)[] = [nodeId];
if (containerName) {
predicates.push('container_name = ?');
args.push(containerName);
}
if (composeProjectName) {
predicates.push('(container_name IS NULL AND stack_name = ?)');
args.push(composeProjectName);
}
const result = this.db.prepare(`
UPDATE notification_history
SET stack_name = NULL,
container_name = NULL
WHERE node_id = ?
AND actor_username = 'system:docker-events'
AND category = 'monitor_alert'
AND (stack_name IS NOT NULL OR container_name IS NOT NULL)
AND (${predicates.join(' OR ')})
`).run(...args);
return result.changes;
}
public getStackActivity(nodeId: number, stackName: string, opts: { limit: number; before?: number; beforeId?: number }): NotificationHistory[] {
// Composite (timestamp, id) cursor: pure timestamp pagination drops rows
// on same-millisecond bursts (Docker events from one compose up).
backend/src/services/DockerEventService.ts
+37 -11
View File
@@ -2,6 +2,7 @@ import Docker from 'dockerode';
import { NodeRegistry } from './NodeRegistry';
import { NotificationCategory, NotificationService } from './NotificationService';
import { DatabaseService } from './DatabaseService';
import SelfIdentityService from './SelfIdentityService';
import {
classifyDie,
classifyGapExit,
@@ -79,6 +80,7 @@ const SETTINGS_CACHE_MS = 500;
interface InternalContainerState extends ContainerLifecycleState {
name?: string;
stackName?: string;
isSelf?: boolean;
lastCrashAlertAt?: number;
lastActivityAt: number;
healthStatus?: 'healthy' | 'unhealthy' | 'starting';
@@ -341,9 +343,10 @@ export class DockerEventService {
const name = inspect.Name?.replace(/^\//, '') ?? containerId.slice(0, 12);
const stackName = inspect.Config?.Labels?.[COMPOSE_PROJECT_LABEL];
const exitCode = inspect.State?.ExitCode ?? 0;
const isSelf = this.isSelfContainer(containerId, name);
// Gap exits have no in-memory state, so there's no dedup to bump.
await this.emitClassification(classification, null, { name, exitCode, stackName });
await this.emitClassification(classification, null, { name, exitCode, stackName, isSelf });
} catch (err) {
if (isDebugEnabled()) {
console.log(`[DockerEvents:${this.nodeName}:diag] gap inspect failed:`,
@@ -379,6 +382,8 @@ export class DockerEventService {
const action = event.Action ?? '';
const id = event.Actor?.ID;
if (!id) return;
const attrs = event.Actor?.Attributes ?? {};
const isSelf = this.isSelfContainer(id, attrs.name);
// Normalize: `health_status: unhealthy` -> base action
const baseAction = action.startsWith('health_status') ? 'health_status' : action;
@@ -387,12 +392,12 @@ export class DockerEventService {
// refetch stack statuses immediately on a real container event,
// without waiting for the next polling tick. This is fire-and-forget
// and is NOT persisted to the alerts history.
if (STATE_INVALIDATE_ACTIONS.has(baseAction)) {
if (STATE_INVALIDATE_ACTIONS.has(baseAction) && !isSelf) {
this.notifier.broadcastEvent({
type: 'state-invalidate',
scope: 'stack',
nodeId: this.nodeId,
stackName: event.Actor?.Attributes?.[COMPOSE_PROJECT_LABEL] ?? null,
stackName: attrs[COMPOSE_PROJECT_LABEL] ?? null,
containerId: id,
action: baseAction,
ts: Date.now(),
@@ -449,12 +454,12 @@ export class DockerEventService {
state.healthStatus = 'unhealthy';
if (!this.isCrashAlertsEnabled()) return;
const name = state.name ?? id.slice(0, 12);
const stackName = state.stackName;
void this.emitError(
'monitor_alert',
`Healthcheck failed: ${name} is unhealthy.`,
stackName,
state.stackName,
state.name,
state.isSelf === true,
);
} else {
state.unhealthySince = undefined;
@@ -534,6 +539,7 @@ export class DockerEventService {
name: state.name ?? id.slice(0, 12),
exitCode: exitCode ?? 0,
stackName: state.stackName,
isSelf: state.isSelf === true,
});
}
@@ -544,7 +550,7 @@ export class DockerEventService {
private async emitClassification(
classification: Classification,
state: InternalContainerState | null,
info: { name: string; exitCode: number; stackName?: string },
info: { name: string; exitCode: number; stackName?: string; isSelf?: boolean },
): Promise<void> {
// Respect the existing global crash-alerts toggle so users who have
// disabled these notifications in Settings remain opted out.
@@ -564,7 +570,7 @@ export class DockerEventService {
// rate-suppressed alerts don't silently lock out the next real crash.
if (state) state.lastCrashAlertAt = Date.now();
await this.emitError('monitor_alert', message, info.stackName, info.name);
await this.emitError('monitor_alert', message, info.stackName, info.name, info.isSelf === true);
}
private isCrashAlertsEnabled(): boolean {
@@ -649,9 +655,19 @@ export class DockerEventService {
const project = attrs[COMPOSE_PROJECT_LABEL];
if (project && !state.stackName) state.stackName = project;
}
if (this.isSelfContainer(id, state.name)) {
state.isSelf = true;
}
return state;
}
private isSelfContainer(id?: string, name?: string): boolean {
const self = SelfIdentityService.getInstance();
if (id && self.isOwnContainer(id)) return true;
const normalizedName = name?.replace(/^\//, '');
return normalizedName ? self.isOwnContainer(normalizedName) : false;
}
private eventTimeMs(event: DockerEventPayload): number {
if (typeof event.timeNano === 'number') return Math.floor(event.timeNano / 1_000_000);
if (typeof event.time === 'number') return event.time * 1000;
@@ -672,16 +688,26 @@ export class DockerEventService {
// Notification wrappers (prefix with node name for multi-node clarity)
// ========================================================================
private async emitError(category: NotificationCategory, message: string, stackName?: string, containerName?: string): Promise<void> {
return this.notifier.dispatchAlert('error', category, this.prefix(message), { stackName, containerName, actor: 'system:docker-events' });
private buildAlertOptions(
stackName?: string,
containerName?: string,
systemOnly = false,
): { stackName?: string; containerName?: string; actor: string } {
return systemOnly
? { actor: 'system:docker-events' }
: { stackName, containerName, actor: 'system:docker-events' };
}
private async emitError(category: NotificationCategory, message: string, stackName?: string, containerName?: string, systemOnly = false): Promise<void> {
return this.notifier.dispatchAlert('error', category, this.prefix(message), this.buildAlertOptions(stackName, containerName, systemOnly));
}
private async emitWarning(category: NotificationCategory, message: string, stackName?: string, containerName?: string): Promise<void> {
return this.notifier.dispatchAlert('warning', category, this.prefix(message), { stackName, containerName, actor: 'system:docker-events' });
return this.notifier.dispatchAlert('warning', category, this.prefix(message), this.buildAlertOptions(stackName, containerName));
}
private async emitInfo(category: NotificationCategory, message: string, stackName?: string, containerName?: string): Promise<void> {
return this.notifier.dispatchAlert('info', category, this.prefix(message), { stackName, containerName, actor: 'system:docker-events' });
return this.notifier.dispatchAlert('info', category, this.prefix(message), this.buildAlertOptions(stackName, containerName));
}
private prefix(message: string): string {
backend/src/services/SelfIdentityService.ts
+15 -1
View File
@@ -24,11 +24,13 @@ class SelfIdentityService {
private static instance: SelfIdentityService;
private containerId: string | null = null;
private containerName: string | null = null;
private composeProjectName: string | null = null;
private imageIdHex: string | null = null;
private networkIds = new Set<string>();
private networkNames = new Set<string>();
private volumeNames = new Set<string>();
private initialized = false;
private initializePromise: Promise<void> | null = null;
public static getInstance(): SelfIdentityService {
if (!SelfIdentityService.instance) {
@@ -38,15 +40,23 @@ class SelfIdentityService {
}
async initialize(): Promise<void> {
if (this.initializePromise) return this.initializePromise;
if (this.initialized) return;
this.initialized = true;
this.initializePromise = this.initializeInternal().finally(() => {
this.initialized = true;
this.initializePromise = null;
});
return this.initializePromise;
}
private async initializeInternal(): Promise<void> {
const docker = DockerController.getInstance().getDocker();
const info = await this.resolveSelfInspect(docker);
if (!info) return;
this.containerId = info.Id ?? null;
this.containerName = (info.Name || '').replace(/^\//, '') || null;
this.composeProjectName = info.Config?.Labels?.['com.docker.compose.project'] ?? null;
this.imageIdHex = SelfIdentityService.stripSha(info.Image ?? '') || null;
const nets = info.NetworkSettings?.Networks ?? {};
@@ -148,6 +158,7 @@ class SelfIdentityService {
getIdentity(): {
containerId: string | null;
containerName: string | null;
composeProjectName: string | null;
imageId: string | null;
networkNames: string[];
volumeNames: string[];
@@ -155,6 +166,7 @@ class SelfIdentityService {
return {
containerId: this.containerId,
containerName: this.containerName,
composeProjectName: this.composeProjectName,
imageId: this.imageIdHex,
networkNames: [...this.networkNames],
volumeNames: [...this.volumeNames],
@@ -165,11 +177,13 @@ class SelfIdentityService {
resetForTesting(): void {
this.containerId = null;
this.containerName = null;
this.composeProjectName = null;
this.imageIdHex = null;
this.networkIds.clear();
this.networkNames.clear();
this.volumeNames.clear();
this.initialized = false;
this.initializePromise = null;
}
private static stripSha(s: string): string {