@obsidiane/meridiane 2.0.10 → 2.0.12

package/templates/{_lib_template → angular-bridge}/README.md

@@ -67,6 +67,10 @@ export class AppModule {}
 - `debug` (logs runtime) ;
 - `extraInterceptors` (interceptors Angular additionnels).
 
+Les comportements HTTP internes du bridge s'appliquent uniquement aux requêtes
+appartenant à l'origine et au chemin de `baseUrl`. Les interceptors personnalisés
+restent responsables de leur propre périmètre.
+
 ### Cookies / `withCredentials`
 
 Le bridge peut envoyer des cookies (sessions) côté HTTP et SSE.
@@ -105,6 +109,11 @@ provideBridge({
 - `{ type: 'bearer', getToken }` (sync ou async),
 - ou un `HttpInterceptorFn` custom.
 
+Le Bearer intégré est ajouté uniquement aux requêtes dont l’origine et le chemin
+appartiennent au `baseUrl` configuré. Une requête vers un autre service conserve
+donc ses en-têtes d’origine. Un interceptor custom garde le comportement Angular
+standard et reste responsable de son propre périmètre.
+
 ```ts
 import {provideBridge} from '__PACKAGE_NAME__';
 

package/templates/angular-bridge/src/lib/bridge/rest/api-platform.adapter.ts

@@ -0,0 +1,82 @@
+import {HttpClient} from '@angular/common/http';
+import {Observable} from 'rxjs';
+import {toHttpParams} from './query-builder';
+import {buildHttpRequestOptions, resolveHttpCallOptions} from './http-request.options';
+import {
+  Collection,
+  HttpCallOptions,
+  HttpRequestConfig,
+  Iri,
+  IriRequired,
+  Item,
+  AnyQuery,
+  ResourceRepository,
+} from '../../ports/resource-repository.port';
+import {resolveUrl} from '../../utils/url';
+
+export class ApiPlatformRestRepository<T extends Item> implements ResourceRepository<T> {
+  constructor(
+    private readonly http: HttpClient,
+    private readonly apiBase: string,
+    private readonly resourcePath: Iri,
+    private readonly httpWithCredentialsDefault: boolean,
+  ) {
+  }
+
+  getCollection$(query?: AnyQuery, options?: HttpCallOptions): Observable<Collection<T>> {
+    return this.http.get<Collection<T>>(this.resolveUrl(this.resourcePath), {
+      ...resolveHttpCallOptions(options, this.httpWithCredentialsDefault),
+      params: toHttpParams(query),
+    });
+  }
+
+  get$(iri: IriRequired, options?: HttpCallOptions): Observable<T> {
+    return this.http.get<T>(this.resolveUrl(iri), resolveHttpCallOptions(options, this.httpWithCredentialsDefault));
+  }
+
+  post$(payload: Partial<T>, options?: HttpCallOptions): Observable<T> {
+    return this.http.post<T>(
+      this.resolveUrl(this.resourcePath),
+      payload,
+      resolveHttpCallOptions(options, this.httpWithCredentialsDefault)
+    );
+  }
+
+  patch$(iri: IriRequired, changes: Partial<T>, options?: HttpCallOptions): Observable<T> {
+    return this.http.patch<T>(
+      this.resolveUrl(iri),
+      changes,
+      resolveHttpCallOptions(options, this.httpWithCredentialsDefault)
+    );
+  }
+
+  put$(iri: IriRequired, payload: Partial<T>, options?: HttpCallOptions): Observable<T> {
+    return this.http.put<T>(
+      this.resolveUrl(iri),
+      payload,
+      resolveHttpCallOptions(options, this.httpWithCredentialsDefault)
+    );
+  }
+
+  delete$(iri: IriRequired, options?: HttpCallOptions): Observable<void> {
+    return this.http.delete<void>(
+      this.resolveUrl(iri),
+      resolveHttpCallOptions(options, this.httpWithCredentialsDefault)
+    );
+  }
+
+  request$<R = unknown, B = unknown>(request: HttpRequestConfig<B>): Observable<R> {
+    // Low-level escape hatch for non-standard endpoints (custom controllers, uploads, etc.).
+    const {method, url} = request;
+
+    const targetUrl = this.resolveUrl(url ?? this.resourcePath);
+    const mergedOptions = buildHttpRequestOptions(request, {withCredentialsDefault: this.httpWithCredentialsDefault});
+    return this.http.request<R>(method, targetUrl, mergedOptions as {observe: 'body'});
+  }
+
+  private resolveUrl(path?: Iri): string {
+    const effectivePath = path ?? this.resourcePath;
+    if (!effectivePath) throw new Error('ApiPlatformRestRepository: missing url and resourcePath');
+    return resolveUrl(this.apiBase, effectivePath);
+  }
+}

package/templates/angular-bridge/src/lib/bridge/rest/http-request.options.ts

@@ -0,0 +1,30 @@
+import {HttpCallOptions, HttpRequestConfig} from '../../ports/resource-repository.port';
+import {toHttpParams} from './query-builder';
+
+export function resolveHttpCallOptions(options: HttpCallOptions | undefined, withCredentialsDefault: boolean) {
+  return {
+    headers: options?.headers,
+    withCredentials: options?.withCredentials ?? withCredentialsDefault,
+  };
+}
+
+export function buildHttpRequestOptions(
+  req: HttpRequestConfig,
+  {withCredentialsDefault}: {withCredentialsDefault: boolean}
+): Record<string, unknown> {
+  const {query, body, headers, responseType, withCredentials, options = {}} = req;
+  const mergedOptions: Record<string, unknown> = {...options};
+
+  if (headers) mergedOptions['headers'] = headers;
+  if (query) mergedOptions['params'] = toHttpParams(query);
+  if (body !== undefined) mergedOptions['body'] = body;
+
+  const inheritedResponseType = mergedOptions['responseType'];
+  const inheritedWithCredentials = mergedOptions['withCredentials'];
+
+  mergedOptions['responseType'] = responseType ?? inheritedResponseType ?? 'json';
+  mergedOptions['withCredentials'] = withCredentials ?? inheritedWithCredentials ?? withCredentialsDefault;
+  mergedOptions['observe'] = 'body';
+
+  return mergedOptions;
+}

package/templates/{_lib_template → angular-bridge}/src/lib/bridge/rest/query-builder.ts

@@ -1,14 +1,14 @@
 import {HttpParams} from '@angular/common/http';
 import {AnyQuery, Query, QueryParamValue} from '../../ports/resource-repository.port';
 
-export function toHttpParams(q: AnyQuery | undefined): HttpParams {
-  if (!q) return new HttpParams();
-  if (q instanceof HttpParams) return q;
+export function toHttpParams(query: AnyQuery | undefined): HttpParams {
+  if (!query) return new HttpParams();
+  if (query instanceof HttpParams) return query;
 
   const fromObject: Record<string, string | string[]> = {};
 
   const consumed = new Set<string>();
-  const maybeQuery = q as Query;
+  const maybeQuery = query as Query;
   if (maybeQuery.page != null) {
     fromObject['page'] = String(maybeQuery.page);
     consumed.add('page');
@@ -18,16 +18,16 @@ export function toHttpParams(q: AnyQuery | undefined): HttpParams {
     consumed.add('itemsPerPage');
   }
 
-  if (q.filters) {
+  if (query.filters) {
     consumed.add('filters');
-    for (const [k, v] of Object.entries(q.filters)) {
-      assign(fromObject, k, v);
+    for (const [key, value] of Object.entries(query.filters)) {
+      assign(fromObject, key, value);
     }
   }
 
-  for (const [k, v] of Object.entries(q as Record<string, QueryParamValue>)) {
-    if (consumed.has(k)) continue;
-    assign(fromObject, k, v);
+  for (const [key, value] of Object.entries(query as Record<string, QueryParamValue>)) {
+    if (consumed.has(key)) continue;
+    assign(fromObject, key, value);
   }
 
   return new HttpParams({fromObject});

package/templates/angular-bridge/src/lib/bridge/sse/mercure-connections.ts

@@ -0,0 +1,255 @@
+import {BehaviorSubject, Observable, Subject} from 'rxjs';
+import {takeUntil} from 'rxjs/operators';
+import {
+  BridgeLogger,
+  MercureConnectionMode,
+  RealtimeDiagnostics,
+} from '../../bridge.types';
+import {RealtimeStatus} from '../../ports/realtime.port';
+import {EventSourceWrapper} from './eventsource-wrapper';
+import {MercureUrlBuilder} from './mercure-url.builder';
+
+export type IncomingMessage = {type: string; data: string; lastEventId?: string};
+
+type ConnectionScope = 'shared' | 'dedicated';
+
+type ManagedConnection = {
+  id: string;
+  key: string;
+  scope: ConnectionScope;
+  groupId?: string;
+  topics: ReadonlySet<string>;
+  urlLength: number;
+  wrapper: EventSourceWrapper;
+  stop$: Subject<void>;
+  status: RealtimeStatus;
+};
+
+type ConnectionTarget = Subject<IncomingMessage>;
+
+type ConnectionManagerOptions = {
+  hubUrl?: string;
+  withCredentials: boolean;
+  mode: MercureConnectionMode;
+  maxUrlLength: number;
+  logger?: BridgeLogger;
+  destroy$: Observable<void>;
+  nextId: (prefix: string) => string;
+};
+
+export class MercureConnectionManager {
+  private readonly urlBuilder = new MercureUrlBuilder();
+  private readonly connections = new Map<string, ManagedConnection>();
+  private readonly sharedConnections = new Map<string, ManagedConnection>();
+  private readonly dedicatedGroups = new Map<string, Set<string>>();
+  private readonly lastEventIdByKey = new Map<string, string>();
+
+  private readonly statusSubject = new BehaviorSubject<RealtimeStatus>('closed');
+  private readonly diagnosticsSubject: BehaviorSubject<RealtimeDiagnostics>;
+
+  readonly status$ = this.statusSubject.asObservable();
+  readonly diagnostics$: Observable<RealtimeDiagnostics>;
+
+  constructor(private readonly options: ConnectionManagerOptions) {
+    this.diagnosticsSubject = new BehaviorSubject<RealtimeDiagnostics>(this.createDiagnostics());
+    this.diagnostics$ = this.diagnosticsSubject.asObservable();
+  }
+
+  reconcileShared(topics: Iterable<string>, target: ConnectionTarget): void {
+    if (!this.options.hubUrl) {
+      this.closeShared();
+      return;
+    }
+
+    const desiredConnections = new Map<string, ReadonlySet<string>>();
+    for (const partition of this.partitionTopics(topics)) {
+      const partitionTopics = new Set(partition);
+      desiredConnections.set(this.connectionKey(partitionTopics, 'shared'), partitionTopics);
+    }
+
+    for (const [key, connection] of [...this.sharedConnections.entries()]) {
+      if (!desiredConnections.has(key)) this.close(connection.id);
+    }
+
+    for (const [key, partitionTopics] of desiredConnections) {
+      if (this.sharedConnections.has(key)) continue;
+      const connection = this.open({key, scope: 'shared', topics: partitionTopics, target});
+      this.sharedConnections.set(key, connection);
+    }
+  }
+
+  openDedicated(groupId: string, topics: Iterable<string>, target: ConnectionTarget): void {
+    this.dedicatedGroups.set(groupId, new Set());
+
+    for (const partition of this.partitionTopics(topics)) {
+      const partitionTopics = new Set(partition);
+      const key = this.connectionKey(partitionTopics, 'dedicated', groupId);
+      const connection = this.open({key, scope: 'dedicated', groupId, topics: partitionTopics, target});
+      this.dedicatedGroups.get(groupId)?.add(connection.id);
+    }
+  }
+
+  closeShared(): void {
+    for (const connection of [...this.sharedConnections.values()]) this.close(connection.id);
+  }
+
+  closeDedicated(groupId: string): void {
+    const connectionIds = this.dedicatedGroups.get(groupId);
+    if (!connectionIds) return;
+
+    for (const connectionId of [...connectionIds]) this.close(connectionId);
+    this.dedicatedGroups.delete(groupId);
+  }
+
+  closeAll(): void {
+    for (const connection of [...this.connections.values()]) this.close(connection.id);
+    this.sharedConnections.clear();
+    this.dedicatedGroups.clear();
+    this.updateStatus();
+  }
+
+  complete(): void {
+    this.statusSubject.complete();
+    this.diagnosticsSubject.complete();
+  }
+
+  private partitionTopics(topics: Iterable<string>): string[][] {
+    if (!this.options.hubUrl) return [];
+    return this.urlBuilder.partitionTopics(
+      this.options.hubUrl,
+      topics,
+      this.options.maxUrlLength,
+      this.options.mode === 'auto'
+    );
+  }
+
+  private open(params: {
+    key: string;
+    scope: ConnectionScope;
+    topics: ReadonlySet<string>;
+    target: ConnectionTarget;
+    groupId?: string;
+  }): ManagedConnection {
+    const {hubUrl, withCredentials, logger, destroy$, nextId} = this.options;
+    if (!hubUrl) throw new Error('Mercure hub URL is required to open a realtime connection.');
+
+    const lastEventId = this.lastEventIdByKey.get(params.key);
+    const url = this.urlBuilder.build(hubUrl, params.topics, lastEventId);
+
+    logger?.debug?.('[Mercure] connect', {
+      mode: this.options.mode,
+      scope: params.scope,
+      key: params.key,
+      urlLength: url.length,
+      topics: [...params.topics],
+      lastEventId,
+    });
+
+    const wrapper = new EventSourceWrapper(url, {withCredentials}, logger);
+    const stop$ = new Subject<void>();
+    const connection: ManagedConnection = {
+      id: nextId('conn'),
+      key: params.key,
+      scope: params.scope,
+      groupId: params.groupId,
+      topics: params.topics,
+      urlLength: url.length,
+      wrapper,
+      stop$,
+      status: 'connecting',
+    };
+
+    this.connections.set(connection.id, connection);
+
+    wrapper.status$
+      .pipe(takeUntil(stop$), takeUntil(destroy$))
+      .subscribe((status) => {
+        connection.status = status;
+        this.updateStatus();
+      });
+
+    wrapper.events$
+      .pipe(takeUntil(stop$), takeUntil(destroy$))
+      .subscribe((event) => {
+        if (event.lastEventId) this.lastEventIdByKey.set(params.key, event.lastEventId);
+        params.target.next({type: event.type, data: event.data, lastEventId: event.lastEventId});
+      });
+
+    try {
+      wrapper.open();
+      this.updateStatus();
+      return connection;
+    } catch (error) {
+      this.close(connection.id);
+      throw error;
+    }
+  }
+
+  private close(connectionId: string): void {
+    const connection = this.connections.get(connectionId);
+    if (!connection) return;
+
+    connection.status = 'closed';
+    connection.wrapper.close();
+    connection.stop$.next();
+    connection.stop$.complete();
+    this.connections.delete(connectionId);
+
+    if (connection.scope === 'shared') this.sharedConnections.delete(connection.key);
+    if (connection.scope === 'dedicated' && connection.groupId) {
+      const group = this.dedicatedGroups.get(connection.groupId);
+      group?.delete(connection.id);
+      if (group?.size === 0) this.dedicatedGroups.delete(connection.groupId);
+      this.lastEventIdByKey.delete(connection.key);
+    }
+
+    this.updateStatus();
+  }
+
+  private connectionKey(topics: ReadonlySet<string>, scope: ConnectionScope, groupId = ''): string {
+    const {hubUrl = '', withCredentials, mode} = this.options;
+    return [
+      scope,
+      groupId,
+      hubUrl,
+      withCredentials ? '1' : '0',
+      mode,
+      [...topics].sort().join('|'),
+    ].join('::');
+  }
+
+  private updateStatus(): void {
+    const statuses = [...this.connections.values()].map((connection) => connection.status);
+    this.statusSubject.next(aggregateStatus(statuses));
+    this.diagnosticsSubject.next(this.createDiagnostics());
+  }
+
+  private createDiagnostics(): RealtimeDiagnostics {
+    const connections = [...this.connections.values()]
+      .map((connection) => ({
+        id: connection.id,
+        scope: connection.scope,
+        status: connection.status,
+        topicCount: connection.topics.size,
+        topics: [...connection.topics].sort(),
+        urlLength: connection.urlLength,
+      }))
+      .sort((left, right) => left.scope.localeCompare(right.scope) || left.id.localeCompare(right.id));
+    const sharedConnections = connections.filter((connection) => connection.scope === 'shared').length;
+
+    return {
+      mode: this.options.mode,
+      maxUrlLength: this.options.maxUrlLength,
+      totalConnections: connections.length,
+      sharedConnections,
+      dedicatedConnections: connections.length - sharedConnections,
+      connections,
+    };
+  }
+}
+
+function aggregateStatus(statuses: RealtimeStatus[]): RealtimeStatus {
+  if (statuses.includes('connected')) return 'connected';
+  if (statuses.includes('connecting')) return 'connecting';
+  return 'closed';
+}

package/templates/angular-bridge/src/lib/bridge/sse/mercure-payload.ts

@@ -0,0 +1,82 @@
+import {BridgeLogger} from '../../bridge.types';
+import {SubscribeFilter} from '../../ports/realtime.port';
+import {Item} from '../../ports/resource-repository.port';
+import {MercureTopicMapper} from './mercure-topic.mapper';
+
+export function parseMercurePayload(raw: string, logger?: BridgeLogger): Item | undefined {
+  try {
+    const value: unknown = JSON.parse(raw);
+    return isRecord(value) ? value as Item : undefined;
+  } catch {
+    logger?.debug?.('[Mercure] invalid JSON payload ignored', {raw});
+    return undefined;
+  }
+}
+
+export function createPayloadTopicMatcher(
+  iris: string[],
+  filter: SubscribeFilter | undefined,
+  topicMapper: MercureTopicMapper
+): (payload: Item) => string | undefined {
+  const subscribedTopics = iris.map((iri) => normalizeIri(topicMapper.toPayloadIri(iri)));
+  const fieldPaths = [
+    ...(filter?.fields?.filter((field): field is string => typeof field === 'string' && field.length > 0) ?? []),
+    ...(typeof filter?.field === 'string' && filter.field.length > 0 ? [filter.field] : []),
+  ];
+  const includeSelf = filter?.includeSelf ?? fieldPaths.length === 0;
+
+  return (payload) => {
+    for (const fieldPath of fieldPaths) {
+      const relationIris = readRelationIris(payload, fieldPath)
+        .map((iri) => normalizeIri(topicMapper.toPayloadIri(iri)));
+      for (const relationIri of relationIris) {
+        const match = findClosestTopic(relationIri, subscribedTopics);
+        if (match) return match;
+      }
+    }
+
+    if (!includeSelf) return undefined;
+
+    const payloadIri = payload['@id'];
+    if (typeof payloadIri !== 'string') return undefined;
+    return findClosestTopic(normalizeIri(topicMapper.toPayloadIri(payloadIri)), subscribedTopics);
+  };
+}
+
+function readRelationIris(payload: Item, path: string): string[] {
+  const value = path
+    .split('.')
+    .filter(Boolean)
+    .reduce<unknown>((current, key) => isIndexable(current) ? current[key] : undefined, payload);
+
+  return extractIris(value);
+}
+
+function extractIris(value: unknown): string[] {
+  if (!value) return [];
+  if (typeof value === 'string') return value.length > 0 ? [value] : [];
+  if (isIndexable(value) && typeof value['@id'] === 'string') return [value['@id']];
+  if (Array.isArray(value)) return value.flatMap(extractIris);
+  return [];
+}
+
+function findClosestTopic(candidate: string, subscribedTopics: string[]): string | undefined {
+  let closest: string | undefined;
+  for (const topic of subscribedTopics) {
+    if (candidate !== topic && !candidate.startsWith(`${topic}/`)) continue;
+    if (!closest || topic.length > closest.length) closest = topic;
+  }
+  return closest;
+}
+
+function normalizeIri(iri: string): string {
+  return iri.endsWith('/') ? iri.slice(0, -1) : iri;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+
+function isIndexable(value: unknown): value is Record<string, unknown> {
+  return !!value && typeof value === 'object';
+}

package/templates/angular-bridge/src/lib/bridge/sse/mercure-url.builder.ts

@@ -0,0 +1,39 @@
+export class MercureUrlBuilder {
+  /**
+   * Builds the Mercure hub URL with one `topic=` parameter per topic.
+   * The adapter is responsible for canonicalising topics beforehand.
+   */
+  build(hubUrl: string, topics: ReadonlySet<string>, lastEventId?: string): string {
+    const url = new URL(hubUrl);
+    if (lastEventId) {
+      url.searchParams.set('lastEventID', lastEventId);
+    }
+    url.searchParams.delete('topic');
+    for (const topic of topics) {
+      url.searchParams.append('topic', topic);
+    }
+    return url.toString();
+  }
+
+  partitionTopics(hubUrl: string, topics: Iterable<string>, maxUrlLength: number, allowSplit: boolean): string[][] {
+    const sortedTopics = [...new Set(topics)].sort();
+    if (sortedTopics.length === 0) return [];
+    if (!allowSplit) return [sortedTopics];
+
+    const partitions: string[][] = [];
+    let current: string[] = [];
+
+    for (const topic of sortedTopics) {
+      const candidate = [...current, topic];
+      if (current.length > 0 && this.build(hubUrl, new Set(candidate)).length > maxUrlLength) {
+        partitions.push(current);
+        current = [topic];
+      } else {
+        current = candidate;
+      }
+    }
+
+    if (current.length > 0) partitions.push(current);
+    return partitions;
+  }
+}