Merge branch 'main' into feature/identity_deletion

package.json

@@ -92,7 +92,7 @@
         "compression": "1.7.5",
         "correlation-id": "^5.2.0",
         "cors": "2.8.5",
-        "eventsource": "^2.0.2",
+        "eventsource": "^3.0.1",
         "express": "4.21.2",
         "helmet": "8.0.0",
         "json-stringify-safe": "5.0.1",
@@ -104,6 +104,7 @@
         "redis": "^4.7.0",
         "reflect-metadata": "0.2.2",
         "swagger-ui-express": "5.0.1",
+        "undici": "^7.1.0",
         "yamljs": "0.3.0",
         "yargs": "^17.7.2"
     },

src/modules/sse/SseModule.ts

@@ -1,6 +1,7 @@
 import { ILogger } from "@js-soft/logging-abstractions";
 import correlator from "correlation-id";
-import eventSourceModule from "eventsource";
+import { EventSource } from "eventsource";
+import { Agent, fetch, ProxyAgent } from "undici";
 import { ConnectorMode } from "../../ConnectorMode";
 import { ConnectorRuntime } from "../../ConnectorRuntime";
 import { ConnectorRuntimeModule, ConnectorRuntimeModuleConfiguration } from "../../ConnectorRuntimeModule";
@@ -21,7 +22,7 @@ export interface SseModuleConfiguration extends ConnectorRuntimeModuleConfigurat
 }
 
 export default class SseModule extends ConnectorRuntimeModule<SseModuleConfiguration> {
-    private eventSource: eventSourceModule | undefined;
+    private eventSource: EventSource | undefined;
 
     public constructor(runtime: ConnectorRuntime, configuration: ConnectorRuntimeModuleConfiguration, logger: ILogger, connectorMode: ConnectorMode) {
         super(runtime, configuration, logger, connectorMode);
@@ -53,13 +54,19 @@ export default class SseModule extends ConnectorRuntimeModule<SseModuleConfigura
 
         this.logger.info(`Connecting to SSE endpoint: ${sseUrl}`);
 
+        const baseOptions = { connect: { rejectUnauthorized: false } };
+        const proxy = baseUrl.startsWith("https://") ? (process.env.https_proxy ?? process.env.HTTPS_PROXY) : (process.env.http_proxy ?? process.env.HTTP_PROXY);
         const token = await this.runtime.getBackboneAuthenticationToken();
 
-        const eventSource = new eventSourceModule(sseUrl, {
-            https: { rejectUnauthorized: true },
-            proxy: process.env.HTTPS_PROXY ?? process.env.HTTP_PROXY,
-            headers: { authorization: `Bearer ${token}` }
+        const eventSource = new EventSource(sseUrl, {
+            fetch: (url, options) =>
+                fetch(url, {
+                    ...options,
+                    dispatcher: proxy ? new ProxyAgent({ ...baseOptions, uri: proxy }) : new Agent(baseOptions),
+                    headers: { ...options?.headers, authorization: `Bearer ${token}` }
+                })
         });
+
         this.eventSource = eventSource;
 
         eventSource.addEventListener("ExternalEventCreated", async () => await this.runSync());

src/modules/webhooks/WebhooksModule.ts

@@ -1,6 +1,6 @@
 import { Event, DataEvent as tsUtilsDataEvent } from "@js-soft/ts-utils";
 import { DataEvent } from "@nmshd/runtime";
-import agentKeepAlive, { HttpsAgent as AgentKeepAliveHttps } from "agentkeepalive";
+import agentKeepAlive from "agentkeepalive";
 import axios, { AxiosInstance } from "axios";
 import correlator from "correlation-id";
 import { ConnectorRuntimeModule } from "../../ConnectorRuntimeModule";
@@ -17,7 +17,7 @@ export default class WebhooksModule extends ConnectorRuntimeModule<WebhooksModul
 
         this.axios = axios.create({
             httpAgent: new agentKeepAlive(),
-            httpsAgent: new AgentKeepAliveHttps({ rejectUnauthorized: !this.configModel.skipTlsCheck }),
+            httpsAgent: new agentKeepAlive.HttpsAgent({ rejectUnauthorized: !this.configModel.skipTlsCheck }),
             validateStatus: () => true,
             maxRedirects: 0
         });